Code refactoring for #1090 (#1092)

s04v · web-flow · commit c8a29a92601b · 2024-03-11T16:52:23.000+03:00
diff --git a/src/Modules/SimplCommerce.Module.Catalog/Areas/Catalog/Views/Product/ProductDetail.cshtml b/src/Modules/SimplCommerce.Module.Catalog/Areas/Catalog/Views/Product/ProductDetail.cshtml
@@ -203,7 +203,7 @@
                     <div class="back-in-stock-subscribe">
                         <form action="api/stocks/back-in-stock">
                             <div>
-                                @if (SignInManager.IsSignedIn(User))
+                                @if (User.Identity.IsAuthenticated)
                                 {
                                     <p>Subscribe and we'll notify you when the product is back in stock.</p>
                                     <div class="d-flex">
diff --git a/src/Modules/SimplCommerce.Module.Core/Extensions/WorkContext.cs b/src/Modules/SimplCommerce.Module.Core/Extensions/WorkContext.cs
@@ -33,10 +33,7 @@ public WorkContext(UserManager<User> userManager,
             _configuration = configuration;
         }
 
-        public string GetCurrentHostName()
-        {
-            return _httpContext.Request.Host.Value;
-        }
+        public string GetCurrentHostName() => _httpContext.Request.Host.Value;
 
         public async Task<User> GetCurrentUser()
         {
diff --git a/src/Modules/SimplCommerce.Module.Inventory/Areas/Inventory/Controllers/StockApiController.cs b/src/Modules/SimplCommerce.Module.Inventory/Areas/Inventory/Controllers/StockApiController.cs
@@ -24,9 +24,9 @@ public class StockApiController : Controller
         private readonly IWorkContext _workContext;
         private readonly IRepository<Warehouse> _warehouseRepository;
         private readonly IRepository<StockHistory> _stockHistoryRepository;
-        private readonly IRepository<BackInStockSubscription> _backInStockSubscriptionRepository;
+        private readonly IRepository<ProductBackInStockSubscription> _backInStockSubscriptionRepository;
 
-        public StockApiController(IRepository<Stock> stockRepository, IStockService stockService, IWorkContext workContext, IRepository<Warehouse> warehouseRepository, IRepository<StockHistory> stockHistoryRepository, IRepository<BackInStockSubscription> backInStockSubscriptionRepository, IStockSubscriptionService stockSubscriptionService)
+        public StockApiController(IRepository<Stock> stockRepository, IStockService stockService, IWorkContext workContext, IRepository<Warehouse> warehouseRepository, IRepository<StockHistory> stockHistoryRepository, IRepository<ProductBackInStockSubscription> backInStockSubscriptionRepository, IStockSubscriptionService stockSubscriptionService)
         {
             _stockRepository = stockRepository;
             _stockService = stockService;
@@ -145,13 +145,12 @@ public async Task<IActionResult> GetStockHistory(int warehouseId, int productId)
         public async Task<IActionResult> BackInStockSubscribe(long productId, string customerEmail)
         {
             if (await _backInStockSubscriptionRepository.Query()
-                .Where(o => o.ProductId == productId && o.CustomerEmail == customerEmail)
-                .AnyAsync())
+                .AnyAsync(o => o.ProductId == productId && o.CustomerEmail == customerEmail))
             {
                 return Conflict();
             }
 
-            await _stockSubscriptionService.BackInStockSubscribeAsync(productId, customerEmail);
+            await _stockSubscriptionService.ProductBackInStockSubscribeAsync(productId, customerEmail);
 
             return Ok();
         }
diff --git a/src/Modules/SimplCommerce.Module.Inventory/Areas/Inventory/Views/EmailTemplates/ProductBackInStockEmail.cshtml b/src/Modules/SimplCommerce.Module.Inventory/Areas/Inventory/Views/EmailTemplates/ProductBackInStockEmail.cshtml
diff --git a/src/Modules/SimplCommerce.Module.Inventory/Event/BackInStockSendEmailHandler.cs b/src/Modules/SimplCommerce.Module.Inventory/Event/BackInStockSendEmailHandler.cs
diff --git a/src/Modules/SimplCommerce.Module.Inventory/Event/ProductBackInStock.cs b/src/Modules/SimplCommerce.Module.Inventory/Event/ProductBackInStock.cs
@@ -7,7 +7,7 @@
 
 namespace SimplCommerce.Module.Inventory.Event
 {
-    public class BackInStock : INotification
+    public class ProductBackInStock : INotification
     {
         public long ProductId { get; set; }
     }
diff --git a/src/Modules/SimplCommerce.Module.Inventory/Event/ProductBackInStockSendEmailHandler.cs b/src/Modules/SimplCommerce.Module.Inventory/Event/ProductBackInStockSendEmailHandler.cs
@@ -0,0 +1,22 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediatR;
+using SimplCommerce.Module.Inventory.Services;
+
+namespace SimplCommerce.Module.Inventory.Event
+{
+    public class ProductBackInStockSendEmailHandler : INotificationHandler<ProductBackInStock>
+    {
+        public readonly IStockSubscriptionService _stockSubscriptionService;
+
+        public ProductBackInStockSendEmailHandler(IStockSubscriptionService stockSubscriptionService)
+            => _stockSubscriptionService = stockSubscriptionService;
+
+        public async Task Handle(ProductBackInStock notification, CancellationToken cancellationToken)
+            => await _stockSubscriptionService.ProductBackInStockSendNotificationsAsync(notification.ProductId);
+    }
+}
diff --git a/src/Modules/SimplCommerce.Module.Inventory/Models/ProductBackInStockSubscription.cs b/src/Modules/SimplCommerce.Module.Inventory/Models/ProductBackInStockSubscription.cs
@@ -7,9 +7,10 @@
 
 namespace SimplCommerce.Module.Inventory.Models
 {
-    public class BackInStockSubscription : EntityBase
+    public class ProductBackInStockSubscription : EntityBase
     {
         public long ProductId { get; set; }
+
         public string CustomerEmail { get; set; }
     }
 }
diff --git a/src/Modules/SimplCommerce.Module.Inventory/ModuleInitializer.cs b/src/Modules/SimplCommerce.Module.Inventory/ModuleInitializer.cs
@@ -17,8 +17,7 @@ public void ConfigureServices(IServiceCollection serviceCollection)
         {
             serviceCollection.AddTransient<IStockService, StockService>();
             serviceCollection.AddTransient<IStockSubscriptionService, StockSubscriptionService>();
-            serviceCollection.AddTransient<INotificationHandler<BackInStock>, BackInStockSendEmailHandler>();
-
+            serviceCollection.AddTransient<INotificationHandler<ProductBackInStock>, ProductBackInStockSendEmailHandler>();
 
             GlobalConfiguration.RegisterAngularModule("simplAdmin.inventory");
         }
diff --git a/src/Modules/SimplCommerce.Module.Inventory/Services/IStockSubscriptionService.cs b/src/Modules/SimplCommerce.Module.Inventory/Services/IStockSubscriptionService.cs
@@ -8,8 +8,8 @@ namespace SimplCommerce.Module.Inventory.Services
 {
     public interface IStockSubscriptionService
     {
-        Task BackInStockSubscribeAsync(long productId, string customerEmail);
+        Task ProductBackInStockSubscribeAsync(long productId, string customerEmail);
 
-        Task BackInStockSendNotificationsAsync(long productId);
+        Task ProductBackInStockSendNotificationsAsync(long productId);
     }
 }
diff --git a/src/Modules/SimplCommerce.Module.Inventory/Services/StockService.cs b/src/Modules/SimplCommerce.Module.Inventory/Services/StockService.cs
@@ -49,7 +49,6 @@ public async Task UpdateStock(StockUpdateRequest stockUpdateRequest)
             var stock = await _stockRepository.Query().FirstOrDefaultAsync(x => x.ProductId == stockUpdateRequest.ProductId && x.WarehouseId == stockUpdateRequest.WarehouseId);
 
             var prevStockQuantity = product.StockQuantity;
-
             stock.Quantity = stock.Quantity + stockUpdateRequest.AdjustedQuantity;
             product.StockQuantity = product.StockQuantity + stockUpdateRequest.AdjustedQuantity;
             var stockHistory = new StockHistory
@@ -67,7 +66,7 @@ public async Task UpdateStock(StockUpdateRequest stockUpdateRequest)
 
             if (prevStockQuantity <= 0 && product.StockQuantity > 0)
             {
-                await _mediator.Publish(new BackInStock { ProductId = product.Id });
+                await _mediator.Publish(new ProductBackInStock { ProductId = product.Id });
             }
         }
     }
diff --git a/src/Modules/SimplCommerce.Module.Inventory/Services/StockSubscriptionService.cs b/src/Modules/SimplCommerce.Module.Inventory/Services/StockSubscriptionService.cs
@@ -16,22 +16,22 @@ namespace SimplCommerce.Module.Inventory.Services
 {
     public class StockSubscriptionService : IStockSubscriptionService
     {
-        private readonly IRepository<BackInStockSubscription> _backInStockSubscriptionRepository;
+        private readonly IRepository<ProductBackInStockSubscription> _productBackInStockSubscriptionRepository;
         private readonly IRepository<Product> _productRepository;
         private readonly IEmailSender _emailSender;
         private readonly IRazorViewRenderer _viewRender;
 
-        public StockSubscriptionService(IRepository<BackInStockSubscription> backInStockSubscriptionRepository, IEmailSender emailSender, IRazorViewRenderer viewRender, IRepository<Product> productRepository)
+        public StockSubscriptionService(IRepository<ProductBackInStockSubscription> backInStockSubscriptionRepository, IEmailSender emailSender, IRazorViewRenderer viewRender, IRepository<Product> productRepository)
         {
-            _backInStockSubscriptionRepository = backInStockSubscriptionRepository;
+            _productBackInStockSubscriptionRepository = backInStockSubscriptionRepository;
             _emailSender = emailSender;
             _viewRender = viewRender;
             _productRepository = productRepository;
         }
 
-        public async Task BackInStockSendNotificationsAsync(long productId)
+        public async Task ProductBackInStockSendNotificationsAsync(long productId)
         {
-            var subscriptions = await _backInStockSubscriptionRepository
+            var subscriptions = await _productBackInStockSubscriptionRepository
                 .Query()
                 .Where(o => o.ProductId == productId)
                 .ToListAsync();
@@ -42,29 +42,30 @@ public async Task BackInStockSendNotificationsAsync(long productId)
                 .Include(o => o.ThumbnailImage)
                 .FirstOrDefaultAsync();
 
-            var emailBody = await _viewRender.RenderViewToStringAsync("/Areas/Inventory/Views/EmailTemplates/BackInStockEmail.cshtml", product);
+            var emailBody = await _viewRender.RenderViewToStringAsync("/Areas/Inventory/Views/EmailTemplates/ProductBackInStockEmail.cshtml", product);
             var emailSubject = $"Back in stock";
             
             foreach (var subscription in subscriptions)
             {
                 await _emailSender.SendEmailAsync(subscription.CustomerEmail, emailSubject, emailBody, true);
                 
-                _backInStockSubscriptionRepository.Remove(subscription);
+                _productBackInStockSubscriptionRepository.Remove(subscription);
             }
 
-            await _backInStockSubscriptionRepository.SaveChangesAsync();
+            await _productBackInStockSubscriptionRepository.SaveChangesAsync();
         }
 
-        public async Task BackInStockSubscribeAsync(long productId, string customerEmail)
+        public async Task ProductBackInStockSubscribeAsync(long productId, string customerEmail)
         {
-            var subscription = new BackInStockSubscription
+            var subscription = new ProductBackInStockSubscription
             {
                 ProductId = productId,
                 CustomerEmail = customerEmail
             };
 
-            _backInStockSubscriptionRepository.Add(subscription);
-            await _backInStockSubscriptionRepository.SaveChangesAsync();
+            _productBackInStockSubscriptionRepository.Add(subscription);
+
+            await _productBackInStockSubscriptionRepository.SaveChangesAsync();
         }
     }
 }
diff --git a/src/SimplCommerce.WebHost/Migrations/20240311113057_AddedProductBackInStockSubscription.Designer.cs b/src/SimplCommerce.WebHost/Migrations/20240311113057_AddedProductBackInStockSubscription.Designer.cs
diff --git a/src/SimplCommerce.WebHost/Migrations/20240311113057_AddedProductBackInStockSubscription.cs b/src/SimplCommerce.WebHost/Migrations/20240311113057_AddedProductBackInStockSubscription.cs
diff --git a/src/SimplCommerce.WebHost/Migrations/SimplDbContextModelSnapshot.cs b/src/SimplCommerce.WebHost/Migrations/SimplDbContextModelSnapshot.cs

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@`
`203`	`203`	`<div class="back-in-stock-subscribe">`
`204`	`204`	`<form action="api/stocks/back-in-stock">`
`205`	`205`	`<div>`
`206`		`- @if (SignInManager.IsSignedIn(User))`
	`206`	`+ @if (User.Identity.IsAuthenticated)`
`207`	`207`	`{`
`208`	`208`	`<p>Subscribe and we'll notify you when the product is back in stock.</p>`
`209`	`209`	`<div class="d-flex">`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,7 @@ public WorkContext(UserManager<User> userManager,`
`33`	`33`	`_configuration = configuration;`
`34`	`34`	`}`
`35`	`35`
`36`		`- public string GetCurrentHostName()`
`37`		`- {`
`38`		`- return _httpContext.Request.Host.Value;`
`39`		`- }`
	`36`	`+ public string GetCurrentHostName() => _httpContext.Request.Host.Value;`
`40`	`37`
`41`	`38`	`public async Task<User> GetCurrentUser()`
`42`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ public class StockApiController : Controller`
`24`	`24`	`private readonly IWorkContext _workContext;`
`25`	`25`	`private readonly IRepository<Warehouse> _warehouseRepository;`
`26`	`26`	`private readonly IRepository<StockHistory> _stockHistoryRepository;`
`27`		`- private readonly IRepository<BackInStockSubscription> _backInStockSubscriptionRepository;`
	`27`	`+ private readonly IRepository<ProductBackInStockSubscription> _backInStockSubscriptionRepository;`
`28`	`28`
`29`		`- public StockApiController(IRepository<Stock> stockRepository, IStockService stockService, IWorkContext workContext, IRepository<Warehouse> warehouseRepository, IRepository<StockHistory> stockHistoryRepository, IRepository<BackInStockSubscription> backInStockSubscriptionRepository, IStockSubscriptionService stockSubscriptionService)`
	`29`	`+ public StockApiController(IRepository<Stock> stockRepository, IStockService stockService, IWorkContext workContext, IRepository<Warehouse> warehouseRepository, IRepository<StockHistory> stockHistoryRepository, IRepository<ProductBackInStockSubscription> backInStockSubscriptionRepository, IStockSubscriptionService stockSubscriptionService)`
`30`	`30`	`{`
`31`	`31`	`_stockRepository = stockRepository;`
`32`	`32`	`_stockService = stockService;`
`@@ -145,13 +145,12 @@ public async Task<IActionResult> GetStockHistory(int warehouseId, int productId)`
`145`	`145`	`public async Task<IActionResult> BackInStockSubscribe(long productId, string customerEmail)`
`146`	`146`	`{`
`147`	`147`	`if (await _backInStockSubscriptionRepository.Query()`
`148`		`- .Where(o => o.ProductId == productId && o.CustomerEmail == customerEmail)`
`149`		`- .AnyAsync())`
	`148`	`+ .AnyAsync(o => o.ProductId == productId && o.CustomerEmail == customerEmail))`
`150`	`149`	`{`
`151`	`150`	`return Conflict();`
`152`	`151`	`}`
`153`	`152`
`154`		`- await _stockSubscriptionService.BackInStockSubscribeAsync(productId, customerEmail);`
	`153`	`+ await _stockSubscriptionService.ProductBackInStockSubscribeAsync(productId, customerEmail);`
`155`	`154`
`156`	`155`	`return Ok();`
`157`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace SimplCommerce.Module.Inventory.Event`
`9`	`9`	`{`
`10`		`- public class BackInStock : INotification`
	`10`	`+ public class ProductBackInStock : INotification`
`11`	`11`	`{`
`12`	`12`	`public long ProductId { get; set; }`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,10 @@`
`7`	`7`
`8`	`8`	`namespace SimplCommerce.Module.Inventory.Models`
`9`	`9`	`{`
`10`		`- public class BackInStockSubscription : EntityBase`
	`10`	`+ public class ProductBackInStockSubscription : EntityBase`
`11`	`11`	`{`
`12`	`12`	`public long ProductId { get; set; }`
	`13`	`+`
`13`	`14`	`public string CustomerEmail { get; set; }`
`14`	`15`	`}`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@ public void ConfigureServices(IServiceCollection serviceCollection)`
`17`	`17`	`{`
`18`	`18`	`serviceCollection.AddTransient<IStockService, StockService>();`
`19`	`19`	`serviceCollection.AddTransient<IStockSubscriptionService, StockSubscriptionService>();`
`20`		`- serviceCollection.AddTransient<INotificationHandler<BackInStock>, BackInStockSendEmailHandler>();`
`21`		`-`
	`20`	`+ serviceCollection.AddTransient<INotificationHandler<ProductBackInStock>, ProductBackInStockSendEmailHandler>();`
`22`	`21`
`23`	`22`	`GlobalConfiguration.RegisterAngularModule("simplAdmin.inventory");`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ namespace SimplCommerce.Module.Inventory.Services`
`8`	`8`	`{`
`9`	`9`	`public interface IStockSubscriptionService`
`10`	`10`	`{`
`11`		`- Task BackInStockSubscribeAsync(long productId, string customerEmail);`
	`11`	`+ Task ProductBackInStockSubscribeAsync(long productId, string customerEmail);`
`12`	`12`
`13`		`- Task BackInStockSendNotificationsAsync(long productId);`
	`13`	`+ Task ProductBackInStockSendNotificationsAsync(long productId);`
`14`	`14`	`}`
`15`	`15`	`}`