Skip to content

Commit f5915a6

Browse files
AmitpnkAmitpnk
committed
Merge branch 'develop' of https://github.com/Amitpnk/Onion-architecture-ASP.NET-Core into dependabot/nuget/src/System.IdentityModel.Tokens.Jwt-8.1.1
2 parents 2d6dcec + fb95f35 commit f5915a6

File tree

8 files changed

+82
-76
lines changed

8 files changed

+82
-76
lines changed

‎src/OA.Infrastructure/OA.Infrastructure.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1919
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
2020
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2" />
21-
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="7.0.0" />
21+
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="7.0.1" />
2222
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
23-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
23+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
2424

2525
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="8.0.2" />
2626
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.2" />

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

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,30 @@ public class CreateCustomerCommand : IRequest<int>
1616
public string Country { get; set; }
1717
public string Phone { get; set; }
1818
public string Fax { get; set; }
19-
public class CreateCustomerCommandHandler(IApplicationDbContext context)
20-
: IRequestHandler<CreateCustomerCommand, int>
19+
20+
}
21+
22+
public class CreateCustomerCommandHandler(IApplicationDbContext context)
23+
: IRequestHandler<CreateCustomerCommand, int>
24+
{
25+
public async Task<int> Handle(CreateCustomerCommand request, CancellationToken cancellationToken)
2126
{
22-
public async Task<int> Handle(CreateCustomerCommand request, CancellationToken cancellationToken)
27+
var customer = new Customer
2328
{
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-
};
29+
CustomerName = request.CustomerName,
30+
ContactName = request.ContactName,
31+
Address = request.Address,
32+
City = request.City,
33+
Region = request.Region,
34+
PostalCode = request.PostalCode,
35+
Country = request.Country,
36+
Phone = request.Phone,
37+
Fax = request.Fax,
38+
ContactTitle = request.ContactTitle
39+
};
3740

38-
context.Customers.Add(customer);
39-
await context.SaveChangesAsync();
40-
return customer.Id;
41-
}
41+
context.Customers.Add(customer);
42+
await context.SaveChangesAsync();
43+
return customer.Id;
4244
}
43-
}
45+
}

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ namespace OA.Service.Features.CustomerFeatures.Commands;
77
public class DeleteCustomerByIdCommand : IRequest<int>
88
{
99
public int Id { get; set; }
10-
public class DeleteCustomerByIdCommandHandler(IApplicationDbContext context)
11-
: IRequestHandler<DeleteCustomerByIdCommand, int>
10+
}
11+
12+
public class DeleteCustomerByIdCommandHandler(IApplicationDbContext context)
13+
: IRequestHandler<DeleteCustomerByIdCommand, int>
14+
{
15+
public async Task<int> Handle(DeleteCustomerByIdCommand request, CancellationToken cancellationToken)
1216
{
13-
public async Task<int> Handle(DeleteCustomerByIdCommand request, CancellationToken cancellationToken)
14-
{
15-
var customer = await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
16-
if (customer == null) return default;
17-
context.Customers.Remove(customer);
18-
await context.SaveChangesAsync();
19-
return customer.Id;
20-
}
17+
var customer = await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
18+
if (customer == null) return default;
19+
context.Customers.Remove(customer);
20+
await context.SaveChangesAsync();
21+
return customer.Id;
2122
}
2223
}

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

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

45
namespace OA.Service.Features.CustomerFeatures.Commands;
@@ -16,34 +17,33 @@ public class UpdateCustomerCommand : IRequest<int>
1617
public string Country { get; set; }
1718
public string Phone { get; set; }
1819
public string Fax { get; set; }
19-
public class UpdateCustomerCommandHandler(IApplicationDbContext context)
20-
: IRequestHandler<UpdateCustomerCommand, int>
20+
21+
}
22+
23+
public class UpdateCustomerCommandHandler(IApplicationDbContext context)
24+
: IRequestHandler<UpdateCustomerCommand, int>
25+
{
26+
public async Task<int> Handle(UpdateCustomerCommand request, CancellationToken cancellationToken)
2127
{
22-
public async Task<int> Handle(UpdateCustomerCommand request, CancellationToken cancellationToken)
23-
{
24-
var cust = context.Customers.Where(a => a.Id == request.Id).FirstOrDefault();
25-
26-
if (cust == null)
27-
{
28-
return default;
29-
}
30-
else
31-
{
32-
cust.CustomerName = request.CustomerName;
33-
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-
43-
context.Customers.Update(cust);
44-
await context.SaveChangesAsync();
45-
return cust.Id;
46-
}
47-
}
28+
var customer = await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
29+
30+
if (customer == null)
31+
return default;
32+
33+
customer.CustomerName = request.CustomerName;
34+
customer.ContactName = request.ContactName;
35+
customer.ContactTitle = request.ContactTitle;
36+
customer.Address = request.Address;
37+
customer.City = request.City;
38+
customer.Region = request.Region;
39+
customer.PostalCode = request.PostalCode;
40+
customer.Country = request.Country;
41+
customer.Fax = request.Fax;
42+
customer.Phone = request.Phone;
43+
44+
context.Customers.Update(customer);
45+
await context.SaveChangesAsync();
46+
47+
return customer.Id;
4848
}
49-
}
49+
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ namespace OA.Service.Features.CustomerFeatures.Queries;
77

88
public class GetAllCustomerQuery : IRequest<IEnumerable<Customer>>
99
{
10+
}
1011

11-
public class GetAllCustomerQueryHandler(IApplicationDbContext context)
12+
public class GetAllCustomerQueryHandler(IApplicationDbContext context)
1213
: IRequestHandler<GetAllCustomerQuery, IEnumerable<Customer>>
14+
{
15+
public async Task<IEnumerable<Customer>> Handle(GetAllCustomerQuery request, CancellationToken cancellationToken)
1316
{
14-
public async Task<IEnumerable<Customer>> Handle(GetAllCustomerQuery request, CancellationToken cancellationToken)
15-
{
16-
var customerList = await context.Customers.ToListAsync(cancellationToken: cancellationToken);
17-
return customerList.AsReadOnly();
18-
}
17+
var customerList = await context.Customers.ToListAsync(cancellationToken: cancellationToken);
18+
return customerList.AsReadOnly();
1919
}
20+
2021
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ namespace OA.Service.Features.CustomerFeatures.Queries;
88
public class GetCustomerByIdQuery : IRequest<Customer>
99
{
1010
public int Id { get; set; }
11-
public class GetCustomerByIdQueryHandler(IApplicationDbContext context)
11+
}
12+
13+
public class GetCustomerByIdQueryHandler(IApplicationDbContext context)
1214
: IRequestHandler<GetCustomerByIdQuery, Customer>
15+
{
16+
public async Task<Customer> Handle(GetCustomerByIdQuery request, CancellationToken cancellationToken)
1317
{
14-
public async Task<Customer> Handle(GetCustomerByIdQuery request, CancellationToken cancellationToken)
15-
{
16-
return await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
17-
}
18+
return await context.Customers.FirstOrDefaultAsync(a => a.Id == request.Id, cancellationToken: cancellationToken);
1819
}
19-
}
20+
}

‎src/OA.Service/OA.Service.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<PackageReference Include="FluentValidation" Version="11.10.0" />
1212
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.10.0" />
1313
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
14-
<PackageReference Include="MailKit" Version="4.7.1.1" />
14+
<PackageReference Include="MailKit" Version="4.8.0" />
1515
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
1616
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.5.0" />
17-
<PackageReference Include="MimeKit" Version="4.7.1" />
17+
<PackageReference Include="MimeKit" Version="4.8.0" />
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />
1919
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2020
</ItemGroup>

‎src/OA/appsettings.Test.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"UseInMemoryDatabase": true,
33
"Serilog": {
44
"MinimumLevel": "Information",
5+
"WriteTo": [ "Console", "DiagnosticTrace" ],
56
"Properties": {
67
"Application": "Onion Architecture application"
78
}

0 commit comments

Comments
 (0)