Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
ARCH-001 Phase 24: shrink Admin CurrencyController/LanguageController (#825)
Krzysztof Pajakecb7f73f7c47
diff --git a/src/Tests/Grand.Web.Admin.Tests/Services/CurrencyViewModelServiceTests.cs b/src/Tests/Grand.Web.Admin.Tests/Services/CurrencyViewModelServiceTests.csnew file mode 100644index 000000000..9e4caa617--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Services/CurrencyViewModelServiceTests.cs@@ -0,0 +1,142 @@+using Grand.Business.Core.Interfaces.Common.Configuration;+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Directory;+using Grand.Infrastructure.Caching;+using Grand.Web.AdminShared.Services;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;++namespace Grand.Web.Admin.Tests.Services;++[TestClass]+public class CurrencyViewModelServiceTests+{+ private Mock<ICurrencyService> _currencyServiceMock;+ private CurrencySettings _currencySettings;+ private Mock<ISettingService> _settingServiceMock;+ private Mock<ITranslationService> _translationServiceMock;+ private Mock<ICacheBase> _cacheBaseMock;+ private CurrencyViewModelService _service;++ [TestInitialize]+ public void Setup()+ {+ _currencyServiceMock = new Mock<ICurrencyService>();+ _currencySettings = new CurrencySettings();+ _settingServiceMock = new Mock<ISettingService>();+ _translationServiceMock = new Mock<ITranslationService>();+ _cacheBaseMock = new Mock<ICacheBase>();++ _service = new CurrencyViewModelService(+ _currencyServiceMock.Object,+ _currencySettings,+ _settingServiceMock.Object,+ _translationServiceMock.Object,+ _cacheBaseMock.Object);+ }++ [TestMethod]+ public async Task MarkAsPrimaryExchangeRateCurrency_SavesSettingAndClearsCache()+ {+ await _service.MarkAsPrimaryExchangeRateCurrency("currency-1");++ Assert.AreEqual("currency-1", _currencySettings.PrimaryExchangeRateCurrencyId);+ _settingServiceMock.Verify(s => s.SaveSetting(_currencySettings, It.IsAny<string>()), Times.Once);+ _cacheBaseMock.Verify(c => c.Clear(true), Times.Once);+ }++ [TestMethod]+ public async Task MarkAsPrimaryStoreCurrency_SavesSettingAndClearsCache()+ {+ await _service.MarkAsPrimaryStoreCurrency("currency-1");++ Assert.AreEqual("currency-1", _currencySettings.PrimaryStoreCurrencyId);+ _settingServiceMock.Verify(s => s.SaveSetting(_currencySettings, It.IsAny<string>()), Times.Once);+ _cacheBaseMock.Verify(c => c.Clear(true), Times.Once);+ }++ [TestMethod]+ public async Task ValidateCurrencyUnpublish_StillPublished_AlwaysCanProceed()+ {+ var (canProceed, message) = await _service.ValidateCurrencyUnpublish("currency-1", true);++ Assert.IsTrue(canProceed);+ Assert.AreEqual(string.Empty, message);+ _currencyServiceMock.Verify(c => c.GetAllCurrencies(It.IsAny<bool>(), It.IsAny<string>()), Times.Never);+ }++ [TestMethod]+ public async Task ValidateCurrencyUnpublish_LastCurrencyUnpublished_CannotProceed()+ {+ _currencyServiceMock.Setup(c => c.GetAllCurrencies(It.IsAny<bool>(), It.IsAny<string>()))+ .ReturnsAsync(new List<Currency> { new() { Id = "currency-1" } });++ var (canProceed, message) = await _service.ValidateCurrencyUnpublish("currency-1", false);++ Assert.IsFalse(canProceed);+ Assert.AreEqual("At least one published currency is required.", message);+ }++ [TestMethod]+ public async Task ValidateCurrencyUnpublish_OtherCurrenciesExist_CanProceed()+ {+ _currencyServiceMock.Setup(c => c.GetAllCurrencies(It.IsAny<bool>(), It.IsAny<string>()))+ .ReturnsAsync(new List<Currency> { new() { Id = "currency-1" }, new() { Id = "currency-2" } });++ var (canProceed, _) = await _service.ValidateCurrencyUnpublish("currency-1", false);++ Assert.IsTrue(canProceed);+ }++ [TestMethod]+ public async Task ValidateCurrencyDelete_PrimaryStoreCurrency_CannotDelete()+ {+ _currencySettings.PrimaryStoreCurrencyId = "currency-1";+ _translationServiceMock.Setup(t => t.GetResource("Admin.Configuration.Currencies.CantDeletePrimary"))+ .Returns("Cannot delete primary");++ var (canDelete, message) = await _service.ValidateCurrencyDelete(new Currency { Id = "currency-1" });++ Assert.IsFalse(canDelete);+ Assert.AreEqual("Cannot delete primary", message);+ }++ [TestMethod]+ public async Task ValidateCurrencyDelete_PrimaryExchangeRateCurrency_CannotDelete()+ {+ _currencySettings.PrimaryExchangeRateCurrencyId = "currency-1";+ _translationServiceMock.Setup(t => t.GetResource("Admin.Configuration.Currencies.CantDeleteExchange"))+ .Returns("Cannot delete exchange");++ var (canDelete, message) = await _service.ValidateCurrencyDelete(new Currency { Id = "currency-1" });++ Assert.IsFalse(canDelete);+ Assert.AreEqual("Cannot delete exchange", message);+ }++ [TestMethod]+ public async Task ValidateCurrencyDelete_LastCurrency_CannotDelete()+ {+ _currencyServiceMock.Setup(c => c.GetAllCurrencies(It.IsAny<bool>(), It.IsAny<string>()))+ .ReturnsAsync(new List<Currency> { new() { Id = "currency-1" } });++ var (canDelete, message) = await _service.ValidateCurrencyDelete(new Currency { Id = "currency-1" });++ Assert.IsFalse(canDelete);+ Assert.AreEqual("At least one published currency is required.", message);+ }++ [TestMethod]+ public async Task ValidateCurrencyDelete_NotPrimaryAndNotLast_CanDelete()+ {+ _currencyServiceMock.Setup(c => c.GetAllCurrencies(It.IsAny<bool>(), It.IsAny<string>()))+ .ReturnsAsync(new List<Currency> { new() { Id = "currency-1" }, new() { Id = "currency-2" } });++ var (canDelete, message) = await _service.ValidateCurrencyDelete(new Currency { Id = "currency-1" });++ Assert.IsTrue(canDelete);+ Assert.AreEqual(string.Empty, message);+ }+}diff --git a/src/Tests/Grand.Web.Admin.Tests/Services/LanguageViewModelServiceTests.cs b/src/Tests/Grand.Web.Admin.Tests/Services/LanguageViewModelServiceTests.csnew file mode 100644index 000000000..d30fdb93c--- /dev/null+++ b/src/Tests/Grand.Web.Admin.Tests/Services/LanguageViewModelServiceTests.cs@@ -0,0 +1,92 @@+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Domain.Localization;+using Grand.Web.AdminShared.Services;+using Microsoft.AspNetCore.Hosting;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;++namespace Grand.Web.Admin.Tests.Services;++[TestClass]+public class LanguageViewModelServiceTests+{+ private Mock<ILanguageService> _languageServiceMock;+ private Mock<ITranslationService> _translationServiceMock;+ private Mock<ICurrencyService> _currencyServiceMock;+ private Mock<IWebHostEnvironment> _hostingEnvironmentMock;+ private LanguageViewModelService _service;++ [TestInitialize]+ public void Setup()+ {+ _languageServiceMock = new Mock<ILanguageService>();+ _translationServiceMock = new Mock<ITranslationService>();+ _currencyServiceMock = new Mock<ICurrencyService>();+ _hostingEnvironmentMock = new Mock<IWebHostEnvironment>();++ _service = new LanguageViewModelService(+ _languageServiceMock.Object,+ _translationServiceMock.Object,+ _currencyServiceMock.Object,+ _hostingEnvironmentMock.Object);+ }++ [TestMethod]+ public async Task ValidateLanguageUnpublish_StillPublished_AlwaysCanProceed()+ {+ var (canProceed, message) = await _service.ValidateLanguageUnpublish("language-1", true);++ Assert.IsTrue(canProceed);+ Assert.AreEqual(string.Empty, message);+ _languageServiceMock.Verify(l => l.GetAllLanguages(It.IsAny<bool>(), It.IsAny<string>()), Times.Never);+ }++ [TestMethod]+ public async Task ValidateLanguageUnpublish_LastLanguageUnpublished_CannotProceed()+ {+ _languageServiceMock.Setup(l => l.GetAllLanguages(It.IsAny<bool>(), It.IsAny<string>()))+ .ReturnsAsync(new List<Language> { new() { Id = "language-1" } });++ var (canProceed, message) = await _service.ValidateLanguageUnpublish("language-1", false);++ Assert.IsFalse(canProceed);+ Assert.AreEqual("At least one published language is required.", message);+ }++ [TestMethod]+ public async Task ValidateLanguageUnpublish_OtherLanguagesExist_CanProceed()+ {+ _languageServiceMock.Setup(l => l.GetAllLanguages(It.IsAny<bool>(), It.IsAny<string>()))+ .ReturnsAsync(new List<Language> { new() { Id = "language-1" }, new() { Id = "language-2" } });++ var (canProceed, _) = await _service.ValidateLanguageUnpublish("language-1", false);++ Assert.IsTrue(canProceed);+ }++ [TestMethod]+ public async Task ValidateLanguageDelete_LastLanguage_CannotDelete()+ {+ _languageServiceMock.Setup(l => l.GetAllLanguages(It.IsAny<bool>(), It.IsAny<string>()))+ .ReturnsAsync(new List<Language> { new() { Id = "language-1" } });++ var (canDelete, message) = await _service.ValidateLanguageDelete(new Language { Id = "language-1" });++ Assert.IsFalse(canDelete);+ Assert.AreEqual("At least one published language is required.", message);+ }++ [TestMethod]+ public async Task ValidateLanguageDelete_OtherLanguagesExist_CanDelete()+ {+ _languageServiceMock.Setup(l => l.GetAllLanguages(It.IsAny<bool>(), It.IsAny<string>()))+ .ReturnsAsync(new List<Language> { new() { Id = "language-1" }, new() { Id = "language-2" } });++ var (canDelete, message) = await _service.ValidateLanguageDelete(new Language { Id = "language-1" });++ Assert.IsTrue(canDelete);+ Assert.AreEqual(string.Empty, message);+ }+}diff --git a/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs b/src/Web/Grand.Web.Admin/Controllers/CurrencyController.csindex 45d1b88e0..f6630714b 100644--- a/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs@@ -1,10 +1,9 @@-using Grand.Business.Core.Extensions;+using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Common.Configuration;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Permissions;using Grand.Domain.Directory;-using Grand.Infrastructure.Caching;using Grand.SharedKernel;using Grand.Web.AdminShared.Extensions.Mapping;using Grand.Web.AdminShared.Interfaces;@@ -31,8 +30,7 @@ public class CurrencyController : BaseAdminControllerISettingService settingService,IDateTimeService dateTimeService,ITranslationService translationService,- ILanguageService languageService,- ICacheBase cacheBase)+ ILanguageService languageService){_currencyService = currencyService;_exchangeRateService = exchangeRateService;@@ -42,7 +40,6 @@ public class CurrencyController : BaseAdminController_dateTimeService = dateTimeService;_translationService = translationService;_languageService = languageService;- _cacheBase = cacheBase;}#endregion@@ -57,17 +54,11 @@ public class CurrencyController : BaseAdminControllerprivate readonly IDateTimeService _dateTimeService;private readonly ITranslationService _translationService;private readonly ILanguageService _languageService;- private readonly ICacheBase _cacheBase;#endregion#region Methods- protected async Task ClearCache()- {- await _cacheBase.Clear();- }-public IActionResult Index(){return RedirectToAction("List");@@ -150,11 +141,7 @@ public class CurrencyController : BaseAdminController[PermissionAuthorizeAction(PermissionActionName.Edit)]public async Task<IActionResult> MarkAsPrimaryExchangeRateCurrency(string id){- _currencySettings.PrimaryExchangeRateCurrencyId = id;- await _settingService.SaveSetting(_currencySettings);-- //now clear cache- await ClearCache();+ await _currencyViewModelService.MarkAsPrimaryExchangeRateCurrency(id);return Json(new { result = true });}@@ -163,11 +150,7 @@ public class CurrencyController : BaseAdminController[PermissionAuthorizeAction(PermissionActionName.Edit)]public async Task<IActionResult> MarkAsPrimaryStoreCurrency(string id){- _currencySettings.PrimaryStoreCurrencyId = id;- await _settingService.SaveSetting(_currencySettings);-- //now clear cache- await ClearCache();+ await _currencyViewModelService.MarkAsPrimaryStoreCurrency(id);return Json(new { result = true });}@@ -233,12 +216,12 @@ public class CurrencyController : BaseAdminControllerif (ModelState.IsValid){- //ensure we have at least one published language- var allCurrencies = await _currencyService.GetAllCurrencies();- if (allCurrencies.Count == 1 && allCurrencies[0].Id == currency.Id &&- !model.Published)+ //ensure we have at least one published currency+ var (canProceed, message) =+ await _currencyViewModelService.ValidateCurrencyUnpublish(currency.Id, model.Published);+ if (!canProceed){- Error("At least one published currency is required.");+ Error(message);return RedirectToAction("Edit", new { id = currency.Id });}@@ -271,19 +254,10 @@ public class CurrencyController : BaseAdminControllertry{- if (currency.Id == _currencySettings.PrimaryStoreCurrencyId)- throw new GrandException(- _translationService.GetResource("Admin.Configuration.Currencies.CantDeletePrimary"));-- if (currency.Id == _currencySettings.PrimaryExchangeRateCurrencyId)- throw new GrandException(- _translationService.GetResource("Admin.Configuration.Currencies.CantDeleteExchange"));-- //ensure we have at least one published currency- var allCurrencies = await _currencyService.GetAllCurrencies();- if (allCurrencies.Count == 1 && allCurrencies[0].Id == currency.Id)+ var (canDelete, message) = await _currencyViewModelService.ValidateCurrencyDelete(currency);+ if (!canDelete){- Error("At least one published currency is required.");+ Error(message);return RedirectToAction("Edit", new { id = currency.Id });}@@ -306,4 +280,4 @@ public class CurrencyController : BaseAdminController}#endregion-}\ No newline at end of file+}diff --git a/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs b/src/Web/Grand.Web.Admin/Controllers/LanguageController.csindex 690e1aac4..e2025e40c 100644--- a/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs@@ -126,11 +126,11 @@ public class LanguageController : BaseAdminControllerif (ModelState.IsValid){//ensure we have at least one published language- var allLanguages = await _languageService.GetAllLanguages();- if (allLanguages.Count == 1 && allLanguages[0].Id == language.Id &&- !model.Published)+ var (canProceed, message) =+ await _languageViewModelService.ValidateLanguageUnpublish(language.Id, model.Published);+ if (!canProceed){- Error("At least one published language is required.");+ Error(message);return RedirectToAction("Edit", new { id = language.Id });}@@ -167,10 +167,10 @@ public class LanguageController : BaseAdminControllerreturn RedirectToAction("List");//ensure we have at least one published language- var allLanguages = await _languageService.GetAllLanguages();- if (allLanguages.Count == 1 && allLanguages[0].Id == language.Id)+ var (canDelete, message) = await _languageViewModelService.ValidateLanguageDelete(language);+ if (!canDelete){- Error("At least one published language is required.");+ Error(message);return RedirectToAction("Edit", new { id = language.Id });}diff --git a/src/Web/Grand.Web.AdminShared/Interfaces/ICurrencyViewModelService.cs b/src/Web/Grand.Web.AdminShared/Interfaces/ICurrencyViewModelService.csindex 035ca1d89..4cabc6706 100644--- a/src/Web/Grand.Web.AdminShared/Interfaces/ICurrencyViewModelService.cs+++ b/src/Web/Grand.Web.AdminShared/Interfaces/ICurrencyViewModelService.cs@@ -8,4 +8,8 @@ public interface ICurrencyViewModelServiceCurrencyModel PrepareCurrencyModel();Task<Currency> InsertCurrencyModel(CurrencyModel model);Task<Currency> UpdateCurrencyModel(Currency currency, CurrencyModel model);+ Task MarkAsPrimaryExchangeRateCurrency(string id);+ Task MarkAsPrimaryStoreCurrency(string id);+ Task<(bool canProceed, string message)> ValidateCurrencyUnpublish(string currencyId, bool published);+ Task<(bool canDelete, string message)> ValidateCurrencyDelete(Currency currency);}\ No newline at end of filediff --git a/src/Web/Grand.Web.AdminShared/Interfaces/ILanguageViewModelService.cs b/src/Web/Grand.Web.AdminShared/Interfaces/ILanguageViewModelService.csindex a53a2154e..878acae79 100644--- a/src/Web/Grand.Web.AdminShared/Interfaces/ILanguageViewModelService.cs+++ b/src/Web/Grand.Web.AdminShared/Interfaces/ILanguageViewModelService.cs@@ -14,4 +14,7 @@ public interface ILanguageViewModelServiceTask<(IEnumerable<LanguageResourceModel> languageResourceModels, int totalCount)> PrepareLanguageResourceModel(LanguageResourceFilterModel model, string languageId, int pageIndex, int pageSize);++ Task<(bool canProceed, string message)> ValidateLanguageUnpublish(string languageId, bool published);+ Task<(bool canDelete, string message)> ValidateLanguageDelete(Language language);}\ No newline at end of filediff --git a/src/Web/Grand.Web.AdminShared/Services/CurrencyViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/CurrencyViewModelService.csindex ba8938610..d33f6092d 100644--- a/src/Web/Grand.Web.AdminShared/Services/CurrencyViewModelService.cs+++ b/src/Web/Grand.Web.AdminShared/Services/CurrencyViewModelService.cs@@ -1,5 +1,8 @@-using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Configuration;+using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Domain.Directory;+using Grand.Infrastructure.Caching;using Grand.Web.AdminShared.Extensions.Mapping;using Grand.Web.AdminShared.Interfaces;using Grand.Web.AdminShared.Models.Directory;@@ -11,14 +14,26 @@ public class CurrencyViewModelService : ICurrencyViewModelService#region Fieldsprivate readonly ICurrencyService _currencyService;+ private readonly CurrencySettings _currencySettings;+ private readonly ISettingService _settingService;+ private readonly ITranslationService _translationService;+ private readonly ICacheBase _cacheBase;#endregion#region Constructors- public CurrencyViewModelService(ICurrencyService currencyService)+ public CurrencyViewModelService(ICurrencyService currencyService,+ CurrencySettings currencySettings,+ ISettingService settingService,+ ITranslationService translationService,+ ICacheBase cacheBase){_currencyService = currencyService;+ _currencySettings = currencySettings;+ _settingService = settingService;+ _translationService = translationService;+ _cacheBase = cacheBase;}#endregion@@ -47,4 +62,46 @@ public class CurrencyViewModelService : ICurrencyViewModelServiceawait _currencyService.UpdateCurrency(currency);return currency;}++ public virtual async Task MarkAsPrimaryExchangeRateCurrency(string id)+ {+ _currencySettings.PrimaryExchangeRateCurrencyId = id;+ await _settingService.SaveSetting(_currencySettings);+ await _cacheBase.Clear();+ }++ public virtual async Task MarkAsPrimaryStoreCurrency(string id)+ {+ _currencySettings.PrimaryStoreCurrencyId = id;+ await _settingService.SaveSetting(_currencySettings);+ await _cacheBase.Clear();+ }++ public virtual async Task<(bool canProceed, string message)> ValidateCurrencyUnpublish(string currencyId,+ bool published)+ {+ if (published)+ return (true, string.Empty);++ var allCurrencies = await _currencyService.GetAllCurrencies();+ if (allCurrencies.Count == 1 && allCurrencies[0].Id == currencyId)+ return (false, "At least one published currency is required.");++ return (true, string.Empty);+ }++ public virtual async Task<(bool canDelete, string message)> ValidateCurrencyDelete(Currency currency)+ {+ if (currency.Id == _currencySettings.PrimaryStoreCurrencyId)+ return (false, _translationService.GetResource("Admin.Configuration.Currencies.CantDeletePrimary"));++ if (currency.Id == _currencySettings.PrimaryExchangeRateCurrencyId)+ return (false, _translationService.GetResource("Admin.Configuration.Currencies.CantDeleteExchange"));++ var allCurrencies = await _currencyService.GetAllCurrencies();+ if (allCurrencies.Count == 1 && allCurrencies[0].Id == currency.Id)+ return (false, "At least one published currency is required.");++ return (true, string.Empty);+ }}\ No newline at end of filediff --git a/src/Web/Grand.Web.AdminShared/Services/LanguageViewModelService.cs b/src/Web/Grand.Web.AdminShared/Services/LanguageViewModelService.csindex 6f78e1c2f..98eae1b1e 100644--- a/src/Web/Grand.Web.AdminShared/Services/LanguageViewModelService.cs+++ b/src/Web/Grand.Web.AdminShared/Services/LanguageViewModelService.cs@@ -161,4 +161,26 @@ public class LanguageViewModelService : ILanguageViewModelServiceresources = resources.AsQueryable();return (resources.Skip((pageIndex - 1) * pageSize).Take(pageSize), resources.Count());}++ public virtual async Task<(bool canProceed, string message)> ValidateLanguageUnpublish(string languageId,+ bool published)+ {+ if (published)+ return (true, string.Empty);++ var allLanguages = await _languageService.GetAllLanguages();+ if (allLanguages.Count == 1 && allLanguages[0].Id == languageId)+ return (false, "At least one published language is required.");++ return (true, string.Empty);+ }++ public virtual async Task<(bool canDelete, string message)> ValidateLanguageDelete(Language language)+ {+ var allLanguages = await _languageService.GetAllLanguages();+ if (allLanguages.Count == 1 && allLanguages[0].Id == language.Id)+ return (false, "At least one published language is required.");++ return (true, string.Empty);+ }}\ No newline at end of file