Minor improvements (#467)

* Use ArgumentNullException * Extend repository pattern (add new method GetOneAsync)
grandnode · Feb 11, 2024 · b1a94ce · b1a94ce
1 parent f6912b9
commit b1a94ce
Show file tree

Hide file tree

Showing 233 changed files with 1,026 additions and 2,174 deletions.
diff --git a/src/API/Grand.Api/ApiExplorer/MetadataApiDescriptionProvider.cs b/src/API/Grand.Api/ApiExplorer/MetadataApiDescriptionProvider.cs
@@ -58,10 +58,7 @@ public MetadataApiDescriptionProvider(
     /// <inheritdoc />
     public void OnProvidersExecuting(ApiDescriptionProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgumentNullException.ThrowIfNull(context);
 
         foreach (var action in context.Actions.OfType<ControllerActionDescriptor>())
         {

diff --git a/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs b/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
@@ -61,9 +61,7 @@ public AuthorizeApiAdminFilter(bool ignoreFilter, IPermissionService permissionS
             /// <param name="filterContext">Authorization filter context</param>
             public async Task OnAuthorizationAsync(AuthorizationFilterContext filterContext)
             {
-
-                if (filterContext == null)
-                    throw new ArgumentNullException(nameof(filterContext));
+                ArgumentNullException.ThrowIfNull(filterContext);
 
                 //check whether this filter has been overridden for the action
                 var actionFilter = filterContext.ActionDescriptor.FilterDescriptors

diff --git a/src/Business/Grand.Business.Authentication/Services/CookieAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/CookieAuthenticationService.cs
@@ -74,8 +74,7 @@ public CookieAuthenticationService(
         /// <param name="isPersistent">Whether the authentication session is persisted across multiple requests</param>
         public virtual async Task SignIn(Customer customer, bool isPersistent)
         {
-            if (customer == null)
-                throw new ArgumentNullException(nameof(customer));
+            ArgumentNullException.ThrowIfNull(customer);
 
             //create claims for customer's username and email
             var claims = new List<Claim>();

diff --git a/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs
@@ -252,8 +252,7 @@ public virtual bool AuthenticationProviderIsAvailable(string systemName)
         /// <returns>Result of an authentication</returns>
         public virtual async Task<IActionResult> Authenticate(ExternalAuthParam parameters, string returnUrl = null)
         {
-            if (parameters == null)
-                throw new ArgumentNullException(nameof(parameters));
+            ArgumentNullException.ThrowIfNull(parameters);
 
             if (!AuthenticationProviderIsAvailable(parameters.ProviderSystemName))
                 return Error(new[] { "External authentication method cannot be loaded" });
@@ -279,8 +278,7 @@ public virtual async Task<IActionResult> Authenticate(ExternalAuthParam paramete
         /// <param name="parameters">External authentication parameters</param>
         public virtual async Task AssociateCustomer(Customer customer, ExternalAuthParam parameters)
         {
-            if (customer == null)
-                throw new ArgumentNullException(nameof(customer));
+            ArgumentNullException.ThrowIfNull(customer);
 
             var externalAuthenticationRecord = new ExternalAuthentication {
                 CustomerId = customer.Id,
@@ -301,8 +299,7 @@ public virtual async Task AssociateCustomer(Customer customer, ExternalAuthParam
         /// <returns>Customer</returns>
         public virtual async Task<Customer> GetCustomer(ExternalAuthParam parameters)
         {
-            if (parameters == null)
-                throw new ArgumentNullException(nameof(parameters));
+            ArgumentNullException.ThrowIfNull(parameters);
 
             var associationRecord = (from q in _externalAuthenticationRecordRepository.Table
                                      where q.ExternalIdentifier.ToLowerInvariant() == parameters.Identifier
@@ -317,8 +314,8 @@ where q.ExternalIdentifier.ToLowerInvariant() == parameters.Identifier
 
         public virtual async Task<IList<ExternalAuthentication>> GetExternalIdentifiers(Customer customer)
         {
-            if (customer == null)
-                throw new ArgumentNullException(nameof(customer));
+            ArgumentNullException.ThrowIfNull(customer);
+
             var query = from p in _externalAuthenticationRecordRepository.Table
                         where p.CustomerId == customer.Id
                         select p;
@@ -331,8 +328,7 @@ public virtual async Task<IList<ExternalAuthentication>> GetExternalIdentifiers(
         /// <param name="externalAuthentication">External authentication</param>
         public virtual async Task DeleteExternalAuthentication(ExternalAuthentication externalAuthentication)
         {
-            if (externalAuthentication == null)
-                throw new ArgumentNullException(nameof(externalAuthentication));
+            ArgumentNullException.ThrowIfNull(externalAuthentication);
 
             await _externalAuthenticationRecordRepository.DeleteAsync(externalAuthentication);
         }

diff --git a/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs
@@ -74,8 +74,7 @@ public virtual Task<BrandLayout> GetBrandLayoutById(string brandLayoutId)
         /// <param name="brandLayout">Brand layout</param>
         public virtual async Task InsertBrandLayout(BrandLayout brandLayout)
         {
-            if (brandLayout == null)
-                throw new ArgumentNullException(nameof(brandLayout));
+            ArgumentNullException.ThrowIfNull(brandLayout);
 
             await _brandLayoutRepository.InsertAsync(brandLayout);
 
@@ -92,8 +91,7 @@ public virtual async Task InsertBrandLayout(BrandLayout brandLayout)
         /// <param name="brandLayout">Brand layout</param>
         public virtual async Task UpdateBrandLayout(BrandLayout brandLayout)
         {
-            if (brandLayout == null)
-                throw new ArgumentNullException(nameof(brandLayout));
+            ArgumentNullException.ThrowIfNull(brandLayout);
 
             await _brandLayoutRepository.UpdateAsync(brandLayout);
 
@@ -110,8 +108,7 @@ public virtual async Task UpdateBrandLayout(BrandLayout brandLayout)
         /// <param name="brandLayout">Brand layout</param>
         public virtual async Task DeleteBrandLayout(BrandLayout brandLayout)
         {
-            if (brandLayout == null)
-                throw new ArgumentNullException(nameof(brandLayout));
+            ArgumentNullException.ThrowIfNull(brandLayout);
 
             await _brandLayoutRepository.DeleteAsync(brandLayout);
 

diff --git a/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs b/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs
@@ -110,8 +110,7 @@ public virtual Task<Brand> GetBrandById(string brandId)
         /// <param name="brand">Brand</param>
         public virtual async Task InsertBrand(Brand brand)
         {
-            if (brand == null)
-                throw new ArgumentNullException(nameof(brand));
+            ArgumentNullException.ThrowIfNull(brand);
 
             await _brandRepository.InsertAsync(brand);
 
@@ -128,8 +127,7 @@ public virtual async Task InsertBrand(Brand brand)
         /// <param name="brand">Brand</param>
         public virtual async Task UpdateBrand(Brand brand)
         {
-            if (brand == null)
-                throw new ArgumentNullException(nameof(brand));
+            ArgumentNullException.ThrowIfNull(brand);
 
             await _brandRepository.UpdateAsync(brand);
 
@@ -145,8 +143,7 @@ public virtual async Task UpdateBrand(Brand brand)
         /// <param name="brand">Brand</param>
         public virtual async Task DeleteBrand(Brand brand)
         {
-            if (brand == null)
-                throw new ArgumentNullException(nameof(brand));
+            ArgumentNullException.ThrowIfNull(brand);
 
             await _cacheBase.RemoveByPrefix(CacheKey.BRANDS_PATTERN_KEY);
 

diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs
@@ -74,8 +74,7 @@ public virtual Task<CategoryLayout> GetCategoryLayoutById(string categoryLayoutI
         /// <param name="categoryLayout">Category layout</param>
         public virtual async Task InsertCategoryLayout(CategoryLayout categoryLayout)
         {
-            if (categoryLayout == null)
-                throw new ArgumentNullException(nameof(categoryLayout));
+            ArgumentNullException.ThrowIfNull(categoryLayout);
 
             await _categoryLayoutRepository.InsertAsync(categoryLayout);
 
@@ -92,8 +91,7 @@ public virtual async Task InsertCategoryLayout(CategoryLayout categoryLayout)
         /// <param name="categoryLayout">Category layout</param>
         public virtual async Task UpdateCategoryLayout(CategoryLayout categoryLayout)
         {
-            if (categoryLayout == null)
-                throw new ArgumentNullException(nameof(categoryLayout));
+            ArgumentNullException.ThrowIfNull(categoryLayout);
 
             await _categoryLayoutRepository.UpdateAsync(categoryLayout);
 
@@ -110,8 +108,7 @@ public virtual async Task UpdateCategoryLayout(CategoryLayout categoryLayout)
         /// <param name="categoryLayout">Category layout</param>
         public virtual async Task DeleteCategoryLayout(CategoryLayout categoryLayout)
         {
-            if (categoryLayout == null)
-                throw new ArgumentNullException(nameof(categoryLayout));
+            ArgumentNullException.ThrowIfNull(categoryLayout);
 
             await _categoryLayoutRepository.DeleteAsync(categoryLayout);
 

diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs
@@ -397,8 +397,7 @@ public virtual async Task<Category> GetCategoryById(string categoryId)
         /// <param name="category">Category</param>
         public virtual async Task InsertCategory(Category category)
         {
-            if (category == null)
-                throw new ArgumentNullException(nameof(category));
+            ArgumentNullException.ThrowIfNull(category);
 
             await _categoryRepository.InsertAsync(category);
 
@@ -416,8 +415,7 @@ public virtual async Task InsertCategory(Category category)
         /// <param name="category">Category</param>
         public virtual async Task UpdateCategory(Category category)
         {
-            if (category == null)
-                throw new ArgumentNullException(nameof(category));
+            ArgumentNullException.ThrowIfNull(category);
             if (string.IsNullOrEmpty(category.ParentCategoryId))
                 category.ParentCategoryId = "";
 
@@ -448,8 +446,7 @@ public virtual async Task UpdateCategory(Category category)
         /// <param name="category">Category</param>
         public virtual async Task DeleteCategory(Category category)
         {
-            if (category == null)
-                throw new ArgumentNullException(nameof(category));
+            ArgumentNullException.ThrowIfNull(category);
 
             //reset a "Parent category" property of all child subcategories
             var subcategories = await GetAllCategoriesByParentCategoryId(category.Id, true);

diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs
@@ -103,8 +103,7 @@ orderby pm.DisplayOrder
         /// <param name="productId">Product ident</param>
         public virtual async Task InsertProductCategory(ProductCategory productCategory, string productId)
         {
-            if (productCategory == null)
-                throw new ArgumentNullException(nameof(productCategory));
+            ArgumentNullException.ThrowIfNull(productCategory);
 
             await _productRepository.AddToSet(productId, x => x.ProductCategories, productCategory);
 
@@ -123,8 +122,7 @@ public virtual async Task InsertProductCategory(ProductCategory productCategory,
         /// <param name="productId">Product ident</param>
         public virtual async Task UpdateProductCategory(ProductCategory productCategory, string productId)
         {
-            if (productCategory == null)
-                throw new ArgumentNullException(nameof(productCategory));
+            ArgumentNullException.ThrowIfNull(productCategory);
 
             await _productRepository.UpdateToSet(productId, x => x.ProductCategories, z => z.Id, productCategory.Id, productCategory);
 
@@ -142,8 +140,7 @@ public virtual async Task UpdateProductCategory(ProductCategory productCategory,
         /// <param name="productId">Product ident</param>
         public virtual async Task DeleteProductCategory(ProductCategory productCategory, string productId)
         {
-            if (productCategory == null)
-                throw new ArgumentNullException(nameof(productCategory));
+            ArgumentNullException.ThrowIfNull(productCategory);
 
             await _productRepository.PullFilter(productId, x => x.ProductCategories, z => z.Id, productCategory.Id);
 

diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs
@@ -74,8 +74,7 @@ public virtual Task<CollectionLayout> GetCollectionLayoutById(string collectionL
         /// <param name="collectionLayout">Collection layout</param>
         public virtual async Task InsertCollectionLayout(CollectionLayout collectionLayout)
         {
-            if (collectionLayout == null)
-                throw new ArgumentNullException(nameof(collectionLayout));
+            ArgumentNullException.ThrowIfNull(collectionLayout);
 
             await _collectionLayoutRepository.InsertAsync(collectionLayout);
 
@@ -92,8 +91,7 @@ public virtual async Task InsertCollectionLayout(CollectionLayout collectionLayo
         /// <param name="collectionLayout">Collection layout</param>
         public virtual async Task UpdateCollectionLayout(CollectionLayout collectionLayout)
         {
-            if (collectionLayout == null)
-                throw new ArgumentNullException(nameof(collectionLayout));
+            ArgumentNullException.ThrowIfNull(collectionLayout);
 
             await _collectionLayoutRepository.UpdateAsync(collectionLayout);
 
@@ -110,8 +108,7 @@ public virtual async Task UpdateCollectionLayout(CollectionLayout collectionLayo
         /// <param name="collectionLayout">Collection layout</param>
         public virtual async Task DeleteCollectionLayout(CollectionLayout collectionLayout)
         {
-            if (collectionLayout == null)
-                throw new ArgumentNullException(nameof(collectionLayout));
+            ArgumentNullException.ThrowIfNull(collectionLayout);
 
             await _collectionLayoutRepository.DeleteAsync(collectionLayout);
 

diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs
@@ -136,8 +136,7 @@ public virtual Task<Collection> GetCollectionById(string collectionId)
         /// <param name="collection">Collection</param>
         public virtual async Task InsertCollection(Collection collection)
         {
-            if (collection == null)
-                throw new ArgumentNullException(nameof(collection));
+            ArgumentNullException.ThrowIfNull(collection);
 
             await _collectionRepository.InsertAsync(collection);
 
@@ -155,8 +154,7 @@ public virtual async Task InsertCollection(Collection collection)
         /// <param name="collection">Collection</param>
         public virtual async Task UpdateCollection(Collection collection)
         {
-            if (collection == null)
-                throw new ArgumentNullException(nameof(collection));
+            ArgumentNullException.ThrowIfNull(collection);
 
             await _collectionRepository.UpdateAsync(collection);
 
@@ -173,8 +171,7 @@ public virtual async Task UpdateCollection(Collection collection)
         /// <param name="collection">Collection</param>
         public virtual async Task DeleteCollection(Collection collection)
         {
-            if (collection == null)
-                throw new ArgumentNullException(nameof(collection));
+            ArgumentNullException.ThrowIfNull(collection);
 
             await _cacheBase.RemoveByPrefix(CacheKey.COLLECTIONS_PATTERN_KEY);
 

diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs
@@ -104,8 +104,7 @@ orderby pm.DisplayOrder
         /// <param name="productId">Product ident</param>
         public virtual async Task InsertProductCollection(ProductCollection productCollection, string productId)
         {
-            if (productCollection == null)
-                throw new ArgumentNullException(nameof(productCollection));
+            ArgumentNullException.ThrowIfNull(productCollection);
 
             await _productRepository.AddToSet(productId, x => x.ProductCollections, productCollection);
 
@@ -124,8 +123,7 @@ public virtual async Task InsertProductCollection(ProductCollection productColle
         /// <param name="productId">Product id</param>
         public virtual async Task UpdateProductCollection(ProductCollection productCollection, string productId)
         {
-            if (productCollection == null)
-                throw new ArgumentNullException(nameof(productCollection));
+            ArgumentNullException.ThrowIfNull(productCollection);
 
             await _productRepository.UpdateToSet(productId, x => x.ProductCollections, z => z.Id, productCollection.Id, productCollection);
 
@@ -144,8 +142,7 @@ public virtual async Task UpdateProductCollection(ProductCollection productColle
         /// <param name="productId">Product id</param>
         public virtual async Task DeleteProductCollection(ProductCollection productCollection, string productId)
         {
-            if (productCollection == null)
-                throw new ArgumentNullException(nameof(productCollection));
+            ArgumentNullException.ThrowIfNull(productCollection);
 
             await _productRepository.PullFilter(productId, x => x.ProductCollections, z => z.Id, productCollection.Id);