refactor(back-end): Code cleanup

CarlosPavajeau · Apr 28, 2021 · 6ce9564 · 6ce9564
1 parent a1519dd
commit 6ce9564
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 24 deletions.
diff --git a/Infrastructure.Test/Repositories/ApplicationUserRepositoryTest.cs b/Infrastructure.Test/Repositories/ApplicationUserRepositoryTest.cs
@@ -11,7 +11,7 @@ namespace Infrastructure.Test.Repositories
     [TestFixture]
     public class ApplicationUserRepositoryTest : BaseRepositoryTest
     {
-        public static string SavedUserId;
+        public static string SavedUserId { get; private set; }
 
         private IApplicationUserRepository _applicationUserRepository;
 

diff --git a/Infrastructure.Test/Services/MailTemplates/MailTemplateTest.cs b/Infrastructure.Test/Services/MailTemplates/MailTemplateTest.cs
@@ -14,9 +14,8 @@ namespace Infrastructure.Test.Services.MailTemplates
     public class MailTemplateTest
     {
         private IMailTemplate _mailTemplate;
-        private Mock<IHostEnvironment> _hostEnvironment;
 
-        protected ServiceProvider ServiceProvider { get; private set; }
+        private ServiceProvider ServiceProvider { get; set; }
 
         [OneTimeSetUp]
         public void Init()
@@ -30,12 +29,12 @@ public void Init()
         [SetUp]
         public void SetUp()
         {
-            _hostEnvironment = new Mock<IHostEnvironment>();
+            Mock<IHostEnvironment> hostEnvironment = new Mock<IHostEnvironment>();
 
-            string path = System.IO.Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-            _hostEnvironment.Setup(h => h.ContentRootPath).Returns(path);
+            string path = System.IO.Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
+            hostEnvironment.Setup(h => h.ContentRootPath).Returns(path);
 
-            _mailTemplate = new MailTemplate(_hostEnvironment.Object,
+            _mailTemplate = new MailTemplate(hostEnvironment.Object,
                 ServiceProvider.GetService<ILogger<MailTemplate>>());
         }
 
@@ -63,7 +62,7 @@ public void Load_Non_Existent_Template()
         {
             try
             {
-                string template = _mailTemplate.LoadTemplate("NonExistentTemplate.html");
+                _ = _mailTemplate.LoadTemplate("NonExistentTemplate.html");
                 Assert.Fail("The template to search should not exist.");
             }
             catch (ArgumentException e)

diff --git a/Infrastructure/Repositories/UnitWork.cs b/Infrastructure/Repositories/UnitWork.cs
@@ -21,7 +21,6 @@ public UnitWork(ApplicationDbContext applicationDbContext, IDomainEventDispatche
         public void Dispose()
         {
             Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
         private void Dispose(bool disposing)

diff --git a/Kaizen.Test/Helpers/TestAsyncEnumerable.cs b/Kaizen.Test/Helpers/TestAsyncEnumerable.cs
@@ -29,7 +29,7 @@ IDbAsyncEnumerator IDbAsyncEnumerable.GetAsyncEnumerator()
             return GetAsyncEnumerator();
         }
 
-        public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken)
+        public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken )
         {
             return new TestAsyncEnumerator<T>(this.AsEnumerable().GetEnumerator());
         }

diff --git a/Kaizen/DomainEvents/Handlers/SendNotificationWhenPaidInvoice.cs b/Kaizen/DomainEvents/Handlers/SendNotificationWhenPaidInvoice.cs
@@ -32,21 +32,16 @@ public async Task Handle(DomainEventNotification<PaidInvoice> notification,
         {
             await _statisticsRepository.RegisterProfits(notification.DomainEvent.Invoice.Total);
 
-            switch (notification.DomainEvent.Invoice)
+            if (notification.DomainEvent.Invoice is ProductInvoice productInvoice)
             {
-                case ProductInvoice productInvoice:
-                {
-                    await _invoiceHub.Clients.Group("Administrator")
-                        .SendAsync("OnPaidProductInvoice", _mapper.Map<ProductInvoiceViewModel>(productInvoice),
-                            cancellationToken);
-                    break;
-                }
-                case ServiceInvoice serviceInvoice:
-                {
-                    await _invoiceHub.Clients.Group("Administrator").SendAsync("OnPaidServiceInvoice",
-                        _mapper.Map<ServiceInvoiceViewModel>(serviceInvoice), cancellationToken);
-                    break;
-                }
+                await _invoiceHub.Clients.Group("Administrator")
+                    .SendAsync("OnPaidProductInvoice", _mapper.Map<ProductInvoiceViewModel>(productInvoice),
+                        cancellationToken);
+            }
+            else if (notification.DomainEvent.Invoice is ServiceInvoice serviceInvoice)
+            {
+                await _invoiceHub.Clients.Group("Administrator").SendAsync("OnPaidServiceInvoice",
+                    _mapper.Map<ServiceInvoiceViewModel>(serviceInvoice), cancellationToken);
             }
         }
     }