refactor some codes

Modified : src/OA.Service/Exceptions/ApiException.cs
Modified : src/OA.Service/Features/CustomerFeatures/Commands/CreateCustomerCommand.cs
Modified : src/OA.Service/Features/CustomerFeatures/Commands/DeleteCustomerByIdCommand.cs
Modified : src/OA.Service/Features/CustomerFeatures/Commands/UpdateCustomerCommand.cs
Modified : src/OA.Service/Features/CustomerFeatures/Queries/GetAllCustomerQuery.cs
Modified : src/OA.Service/Features/CustomerFeatures/Queries/GetCustomerByIdQuery.cs
Modified : src/OA.Service/Implementation/AccountService.cs
Modified : src/OA.Service/Implementation/MailService.cs

Author: samanazadi1996

src/OA.Service/Exceptions/ApiException.cs

@@ -9,7 +9,7 @@ public ApiException() : base() { }
     public ApiException(string message) : base(message) { }
 
     public ApiException(string message, params object[] args)
-        : base(String.Format(CultureInfo.CurrentCulture, message, args))
+        : base(string.Format(CultureInfo.CurrentCulture, message, args))
     {
     }
 }

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

@@ -21,9 +21,19 @@ public class CreateCustomerCommandHandler(IApplicationDbContext context)
     {
         public async Task<int> Handle(CreateCustomerCommand request, CancellationToken cancellationToken)
         {
-            var customer = new Customer();
-            customer.CustomerName = request.CustomerName;
-            customer.ContactName = request.ContactName;
+            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
+            };
 
             context.Customers.Add(customer);
             await context.SaveChangesAsync();

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

@@ -12,7 +12,7 @@ public class DeleteCustomerByIdCommandHandler(IApplicationDbContext context)
     {
         public async Task<int> Handle(DeleteCustomerByIdCommand request, CancellationToken cancellationToken)
         {
-            var customer = await context.Customers.Where(a => a.Id == request.Id).FirstOrDefaultAsync();
+            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();

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

@@ -31,6 +31,15 @@ public async Task<int> Handle(UpdateCustomerCommand request, CancellationToken c
             {
                 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;

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

@@ -13,11 +13,7 @@ public class GetAllCustomerQueryHandler(IApplicationDbContext context)
     {
         public async Task<IEnumerable<Customer>> Handle(GetAllCustomerQuery request, CancellationToken cancellationToken)
         {
-            var customerList = await context.Customers.ToListAsync();
-            if (customerList == null)
-            {
-                return null;
-            }
+            var customerList = await context.Customers.ToListAsync(cancellationToken: cancellationToken);
             return customerList.AsReadOnly();
         }
     }

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

@@ -1,4 +1,5 @@
 using MediatR;
+using Microsoft.EntityFrameworkCore;
 using OA.Domain.Entities;
 using OA.Persistence;
 
@@ -12,9 +13,7 @@ public class GetCustomerByIdQueryHandler(IApplicationDbContext context)
     {
         public async Task<Customer> Handle(GetCustomerByIdQuery request, CancellationToken cancellationToken)
         {
-            var customer = context.Customers.Where(a => a.Id == request.Id).FirstOrDefault();
-            if (customer == null) return null;
-            return customer;
+            return await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
         }
     }
 }

src/OA.Service/Implementation/AccountService.cs

@@ -101,12 +101,7 @@ private async Task<JwtSecurityToken> GenerateJWToken(ApplicationUser user)
         var userClaims = await userManager.GetClaimsAsync(user);
         var roles = await userManager.GetRolesAsync(user);
 
-        var roleClaims = new List<Claim>();
-
-        for (int i = 0; i < roles.Count; i++)
-        {
-            roleClaims.Add(new Claim("roles", roles[i]));
-        }
+        var roleClaims = roles.Select(t => new Claim("roles", t)).ToList();
 
         string ipAddress = IpHelper.GetIpAddress();
 
@@ -147,8 +142,8 @@ private async Task<string> SendVerificationEmail(ApplicationUser user, string or
         var code = await userManager.GenerateEmailConfirmationTokenAsync(user);
         code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
         var route = "api/account/confirm-email/";
-        var _enpointUri = new Uri(string.Concat($"{origin}/", route));
-        var verificationUri = QueryHelpers.AddQueryString(_enpointUri.ToString(), "userId", user.Id);
+        var endpointUri = new Uri(string.Concat($"{origin}/", route));
+        var verificationUri = QueryHelpers.AddQueryString(endpointUri.ToString(), "userId", user.Id);
         verificationUri = QueryHelpers.AddQueryString(verificationUri, "code", code);
         //Email Service Call Here
         return verificationUri;
@@ -188,8 +183,6 @@ public async Task ForgotPassword(ForgotPasswordRequest model, string origin)
         if (account == null) return;
 
         var code = await userManager.GeneratePasswordResetTokenAsync(account);
-        var route = "api/account/reset-password/";
-        var _enpointUri = new Uri(string.Concat($"{origin}/", route));
         var emailRequest = new MailRequest()
         {
             Body = $"You reset token is - {code}",

src/OA.Service/Implementation/MailService.cs

@@ -25,10 +25,10 @@ public async Task SendEmailAsync(MailRequest mailRequest)
             builder.HtmlBody = mailRequest.Body;
             email.Body = builder.ToMessageBody();
             using var smtp = new SmtpClient();
-            smtp.Connect(mailSettings.Value.SmtpHost, mailSettings.Value.SmtpPort, SecureSocketOptions.StartTls);
-            smtp.Authenticate(mailSettings.Value.SmtpUser, mailSettings.Value.SmtpPass);
+            await smtp.ConnectAsync(mailSettings.Value.SmtpHost, mailSettings.Value.SmtpPort, SecureSocketOptions.StartTls);
+            await smtp.AuthenticateAsync(mailSettings.Value.SmtpUser, mailSettings.Value.SmtpPass);
             await smtp.SendAsync(email);
-            smtp.Disconnect(true);
+            await smtp.DisconnectAsync(true);
 
         }
         catch (System.Exception ex)