Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fad81c3

Browse files
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
1 parent 9c3865d commit fad81c3

File tree

8 files changed

+33
-26
lines changed

8 files changed

+33
-26
lines changed

‎src/OA.Service/Exceptions/ApiException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public ApiException() : base() { }
99
public ApiException(string message) : base(message) { }
1010

1111
public ApiException(string message, params object[] args)
12-
: base(String.Format(CultureInfo.CurrentCulture, message, args))
12+
: base(string.Format(CultureInfo.CurrentCulture, message, args))
1313
{
1414
}
1515
}

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,19 @@ public class CreateCustomerCommandHandler(IApplicationDbContext context)
2121
{
2222
public async Task<int> Handle(CreateCustomerCommand request, CancellationToken cancellationToken)
2323
{
24-
var customer = new Customer();
25-
customer.CustomerName = request.CustomerName;
26-
customer.ContactName = request.ContactName;
24+
var customer = new Customer
25+
{
26+
CustomerName = request.CustomerName,
27+
ContactName = request.ContactName,
28+
Address = request.Address,
29+
City = request.City,
30+
Region = request.Region,
31+
PostalCode = request.PostalCode,
32+
Country = request.Country,
33+
Phone = request.Phone,
34+
Fax = request.Fax,
35+
ContactTitle = request.ContactTitle
36+
};
2737

2838
context.Customers.Add(customer);
2939
await context.SaveChangesAsync();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class DeleteCustomerByIdCommandHandler(IApplicationDbContext context)
1212
{
1313
public async Task<int> Handle(DeleteCustomerByIdCommand request, CancellationToken cancellationToken)
1414
{
15-
var customer = await context.Customers.Where(a => a.Id == request.Id).FirstOrDefaultAsync();
15+
var customer = await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id,cancellationToken:cancellationToken);
1616
if (customer == null) return default;
1717
context.Customers.Remove(customer);
1818
await context.SaveChangesAsync();

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ public async Task<int> Handle(UpdateCustomerCommand request, CancellationToken c
3131
{
3232
cust.CustomerName = request.CustomerName;
3333
cust.ContactName = request.ContactName;
34+
cust.ContactTitle = request.ContactTitle;
35+
cust.Address = request.Address;
36+
cust.City = request.City;
37+
cust.Region = request.Region;
38+
cust.PostalCode = request.PostalCode;
39+
cust.Country = request.Country;
40+
cust.Fax= request.Fax;
41+
cust.Phone= request.Phone;
42+
3443
context.Customers.Update(cust);
3544
await context.SaveChangesAsync();
3645
return cust.Id;

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ public class GetAllCustomerQueryHandler(IApplicationDbContext context)
1313
{
1414
public async Task<IEnumerable<Customer>> Handle(GetAllCustomerQuery request, CancellationToken cancellationToken)
1515
{
16-
var customerList = await context.Customers.ToListAsync();
17-
if (customerList == null)
18-
{
19-
return null;
20-
}
16+
var customerList = await context.Customers.ToListAsync(cancellationToken: cancellationToken);
2117
return customerList.AsReadOnly();
2218
}
2319
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using MediatR;
2+
using Microsoft.EntityFrameworkCore;
23
using OA.Domain.Entities;
34
using OA.Persistence;
45

@@ -12,9 +13,7 @@ public class GetCustomerByIdQueryHandler(IApplicationDbContext context)
1213
{
1314
public async Task<Customer> Handle(GetCustomerByIdQuery request, CancellationToken cancellationToken)
1415
{
15-
var customer = context.Customers.Where(a => a.Id == request.Id).FirstOrDefault();
16-
if (customer == null) return null;
17-
return customer;
16+
return await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
1817
}
1918
}
2019
}

‎src/OA.Service/Implementation/AccountService.cs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,7 @@ private async Task<JwtSecurityToken> GenerateJWToken(ApplicationUser user)
101101
var userClaims = await userManager.GetClaimsAsync(user);
102102
var roles = await userManager.GetRolesAsync(user);
103103

104-
var roleClaims = new List<Claim>();
105-
106-
for (int i = 0; i < roles.Count; i++)
107-
{
108-
roleClaims.Add(new Claim("roles", roles[i]));
109-
}
104+
var roleClaims = roles.Select(t => new Claim("roles", t)).ToList();
110105

111106
string ipAddress = IpHelper.GetIpAddress();
112107

@@ -147,8 +142,8 @@ private async Task<string> SendVerificationEmail(ApplicationUser user, string or
147142
var code = await userManager.GenerateEmailConfirmationTokenAsync(user);
148143
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
149144
var route = "api/account/confirm-email/";
150-
var _enpointUri = new Uri(string.Concat($"{origin}/", route));
151-
var verificationUri = QueryHelpers.AddQueryString(_enpointUri.ToString(), "userId", user.Id);
145+
var endpointUri = new Uri(string.Concat($"{origin}/", route));
146+
var verificationUri = QueryHelpers.AddQueryString(endpointUri.ToString(), "userId", user.Id);
152147
verificationUri = QueryHelpers.AddQueryString(verificationUri, "code", code);
153148
//Email Service Call Here
154149
return verificationUri;
@@ -188,8 +183,6 @@ public async Task ForgotPassword(ForgotPasswordRequest model, string origin)
188183
if (account == null) return;
189184

190185
var code = await userManager.GeneratePasswordResetTokenAsync(account);
191-
var route = "api/account/reset-password/";
192-
var _enpointUri = new Uri(string.Concat($"{origin}/", route));
193186
var emailRequest = new MailRequest()
194187
{
195188
Body = $"You reset token is - {code}",

‎src/OA.Service/Implementation/MailService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ public async Task SendEmailAsync(MailRequest mailRequest)
2525
builder.HtmlBody = mailRequest.Body;
2626
email.Body = builder.ToMessageBody();
2727
using var smtp = new SmtpClient();
28-
smtp.Connect(mailSettings.Value.SmtpHost, mailSettings.Value.SmtpPort, SecureSocketOptions.StartTls);
29-
smtp.Authenticate(mailSettings.Value.SmtpUser, mailSettings.Value.SmtpPass);
28+
awaitsmtp.ConnectAsync(mailSettings.Value.SmtpHost, mailSettings.Value.SmtpPort, SecureSocketOptions.StartTls);
29+
awaitsmtp.AuthenticateAsync(mailSettings.Value.SmtpUser, mailSettings.Value.SmtpPass);
3030
await smtp.SendAsync(email);
31-
smtp.Disconnect(true);
31+
awaitsmtp.DisconnectAsync(true);
3232

3333
}
3434
catch (System.Exception ex)

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /