Improving the structure of classes in Features

Author: Saman Azadi

src/OA.Service/Features/CustomerFeatures/Commands/CreateCustomerCommand.cs

@@ -16,28 +16,30 @@ public class CreateCustomerCommand : IRequest<int>
     public string Country { get; set; }
     public string Phone { get; set; }
     public string Fax { get; set; }
-    public class CreateCustomerCommandHandler(IApplicationDbContext context)
-        : IRequestHandler<CreateCustomerCommand, int>
+
+}
+
+public class CreateCustomerCommandHandler(IApplicationDbContext context)
+    : IRequestHandler<CreateCustomerCommand, int>
+{
+    public async Task<int> Handle(CreateCustomerCommand request, CancellationToken cancellationToken)
     {
-        public async Task<int> Handle(CreateCustomerCommand request, CancellationToken cancellationToken)
+        var customer = new Customer
         {
-            var customer = new Customer
-            {
-                CustomerName = request.CustomerName,
-                ContactName = request.ContactName,
-                Address = request.Address,
-                City = request.City,
-                Region = request.Region,
-                PostalCode = request.PostalCode,
-                Country = request.Country,
-                Phone = request.Phone,
-                Fax = request.Fax,
-                ContactTitle = request.ContactTitle
-            };
+            CustomerName = request.CustomerName,
+            ContactName = request.ContactName,
+            Address = request.Address,
+            City = request.City,
+            Region = request.Region,
+            PostalCode = request.PostalCode,
+            Country = request.Country,
+            Phone = request.Phone,
+            Fax = request.Fax,
+            ContactTitle = request.ContactTitle
+        };
 
-            context.Customers.Add(customer);
-            await context.SaveChangesAsync();
-            return customer.Id;
-        }
+        context.Customers.Add(customer);
+        await context.SaveChangesAsync();
+        return customer.Id;
     }
-}
+}

src/OA.Service/Features/CustomerFeatures/Commands/DeleteCustomerByIdCommand.cs

@@ -7,16 +7,17 @@ namespace OA.Service.Features.CustomerFeatures.Commands;
 public class DeleteCustomerByIdCommand : IRequest<int>
 {
     public int Id { get; set; }
-    public class DeleteCustomerByIdCommandHandler(IApplicationDbContext context)
-        : IRequestHandler<DeleteCustomerByIdCommand, int>
+}
+
+public class DeleteCustomerByIdCommandHandler(IApplicationDbContext context)
+    : IRequestHandler<DeleteCustomerByIdCommand, int>
+{
+    public async Task<int> Handle(DeleteCustomerByIdCommand request, CancellationToken cancellationToken)
     {
-        public async Task<int> Handle(DeleteCustomerByIdCommand request, CancellationToken cancellationToken)
-        {
-            var customer = await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
-            if (customer == null) return default;
-            context.Customers.Remove(customer);
-            await context.SaveChangesAsync();
-            return customer.Id;
-        }
+        var customer = await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
+        if (customer == null) return default;
+        context.Customers.Remove(customer);
+        await context.SaveChangesAsync();
+        return customer.Id;
     }
 }

src/OA.Service/Features/CustomerFeatures/Commands/UpdateCustomerCommand.cs

@@ -1,4 +1,5 @@
 using MediatR;
+using Microsoft.EntityFrameworkCore;
 using OA.Persistence;
 
 namespace OA.Service.Features.CustomerFeatures.Commands;
@@ -16,34 +17,33 @@ public class UpdateCustomerCommand : IRequest<int>
     public string Country { get; set; }
     public string Phone { get; set; }
     public string Fax { get; set; }
-    public class UpdateCustomerCommandHandler(IApplicationDbContext context)
-        : IRequestHandler<UpdateCustomerCommand, int>
+
+}
+
+public class UpdateCustomerCommandHandler(IApplicationDbContext context)
+    : IRequestHandler<UpdateCustomerCommand, int>
+{
+    public async Task<int> Handle(UpdateCustomerCommand request, CancellationToken cancellationToken)
     {
-        public async Task<int> Handle(UpdateCustomerCommand request, CancellationToken cancellationToken)
-        {
-            var cust = context.Customers.Where(a => a.Id == request.Id).FirstOrDefault();
-
-            if (cust == null)
-            {
-                return default;
-            }
-            else
-            {
-                cust.CustomerName = request.CustomerName;
-                cust.ContactName = request.ContactName;
-                cust.ContactTitle = request.ContactTitle;
-                cust.Address = request.Address;
-                cust.City = request.City;
-                cust.Region = request.Region;
-                cust.PostalCode = request.PostalCode;
-                cust.Country = request.Country;
-                cust.Fax= request.Fax;
-                cust.Phone= request.Phone;
-
-                context.Customers.Update(cust);
-                await context.SaveChangesAsync();
-                return cust.Id;
-            }
-        }
+        var customer = await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
+
+        if (customer == null)
+            return default;
+
+        customer.CustomerName = request.CustomerName;
+        customer.ContactName = request.ContactName;
+        customer.ContactTitle = request.ContactTitle;
+        customer.Address = request.Address;
+        customer.City = request.City;
+        customer.Region = request.Region;
+        customer.PostalCode = request.PostalCode;
+        customer.Country = request.Country;
+        customer.Fax = request.Fax;
+        customer.Phone = request.Phone;
+
+        context.Customers.Update(customer);
+        await context.SaveChangesAsync();
+
+        return customer.Id;
     }
-}
+}

src/OA.Service/Features/CustomerFeatures/Queries/GetAllCustomerQuery.cs

@@ -7,14 +7,15 @@ namespace OA.Service.Features.CustomerFeatures.Queries;
 
 public class GetAllCustomerQuery : IRequest<IEnumerable<Customer>>
 {
+}
 
-    public class GetAllCustomerQueryHandler(IApplicationDbContext context)
+public class GetAllCustomerQueryHandler(IApplicationDbContext context)
         : IRequestHandler<GetAllCustomerQuery, IEnumerable<Customer>>
+{
+    public async Task<IEnumerable<Customer>> Handle(GetAllCustomerQuery request, CancellationToken cancellationToken)
     {
-        public async Task<IEnumerable<Customer>> Handle(GetAllCustomerQuery request, CancellationToken cancellationToken)
-        {
-            var customerList = await context.Customers.ToListAsync(cancellationToken: cancellationToken);
-            return customerList.AsReadOnly();
-        }
+        var customerList = await context.Customers.ToListAsync(cancellationToken: cancellationToken);
+        return customerList.AsReadOnly();
     }
+
 }

src/OA.Service/Features/CustomerFeatures/Queries/GetCustomerByIdQuery.cs

@@ -8,12 +8,13 @@ namespace OA.Service.Features.CustomerFeatures.Queries;
 public class GetCustomerByIdQuery : IRequest<Customer>
 {
     public int Id { get; set; }
-    public class GetCustomerByIdQueryHandler(IApplicationDbContext context)
+}
+
+public class GetCustomerByIdQueryHandler(IApplicationDbContext context)
         : IRequestHandler<GetCustomerByIdQuery, Customer>
+{
+    public async Task<Customer> Handle(GetCustomerByIdQuery request, CancellationToken cancellationToken)
     {
-        public async Task<Customer> Handle(GetCustomerByIdQuery request, CancellationToken cancellationToken)
-        {
-            return await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
-        }
+        return await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
     }
-}
+}