Skip to content

Commit 5432936

Browse files
authored
Merge pull request dotnet-architecture#120 from FDUdannychen/feature/ddd
use non generic repository interface
2 parents b07677a + 260df61 commit 5432936

7 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ protected override bool CreateResultForDuplicateRequest()
2424
public class CreateOrderCommandHandler
2525
: IAsyncRequestHandler<CreateOrderCommand, bool>
2626
{
27-
private readonly IBuyerRepository<Buyer> _buyerRepository;
28-
private readonly IOrderRepository<Order> _orderRepository;
27+
private readonly IBuyerRepository _buyerRepository;
28+
private readonly IOrderRepository _orderRepository;
2929
private readonly IIdentityService _identityService;
3030

3131
// Using DI to inject infrastructure persistence Repositories
32-
public CreateOrderCommandHandler(IBuyerRepository<Buyer> buyerRepository, IOrderRepository<Order> orderRepository, IIdentityService identityService)
32+
public CreateOrderCommandHandler(IBuyerRepository buyerRepository, IOrderRepository orderRepository, IIdentityService identityService)
3333
{
3434
_buyerRepository = buyerRepository ?? throw new ArgumentNullException(nameof(buyerRepository));
3535
_orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository));

src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/ApplicationModule.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ protected override void Load(ContainerBuilder builder)
2727
.InstancePerLifetimeScope();
2828

2929
builder.RegisterType<BuyerRepository>()
30-
.As<IBuyerRepository<Buyer>>()
30+
.As<IBuyerRepository>()
3131
.InstancePerLifetimeScope();
3232

3333
builder.RegisterType<OrderRepository>()
34-
.As<IOrderRepository<Order>>()
34+
.As<IOrderRepository>()
3535
.InstancePerLifetimeScope();
3636

3737
builder.RegisterType<RequestManager>()

src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/IBuyerRepository.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.B
66
//This is just the RepositoryContracts or Interface defined at the Domain Layer
77
//as requisite for the Buyer Aggregate
88

9-
public interface IBuyerRepository<T> : IRepository<T> where T : IAggregateRoot
9+
public interface IBuyerRepository : IRepository<Buyer>
1010
{
1111
Buyer Add(Buyer buyer);
1212

src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/IOrderRepository.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O
55
//This is just the RepositoryContracts or Interface defined at the Domain Layer
66
//as requisite for the Order Aggregate
77

8-
public interface IOrderRepository<T> : IRepository<T> where T : IAggregateRoot
8+
public interface IOrderRepository : IRepository<Order>
99
{
1010
Order Add(Order order);
1111
}

src/Services/Ordering/Ordering.Infrastructure/Repositories/BuyerRepository.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Repositories
99
{
1010
public class BuyerRepository
11-
: IBuyerRepository<Buyer>
11+
: IBuyerRepository
1212
{
1313
private readonly OrderingContext _context;
1414

src/Services/Ordering/Ordering.Infrastructure/Repositories/OrderRepository.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Repositories
66
{
77
public class OrderRepository
8-
: IOrderRepository<Order>
8+
: IOrderRepository
99
{
1010
private readonly OrderingContext _context;
1111

test/Services/UnitTest/Ordering/Application/NewOrderCommandHandlerTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ namespace UnitTest.Ordering.Application
1515
using Xunit;
1616
public class NewOrderRequestHandlerTest
1717
{
18-
private readonly Mock<IBuyerRepository<Buyer>> _buyerRepositoryMock;
19-
private readonly Mock<IOrderRepository<Order>> _orderRepositoryMock;
18+
private readonly Mock<IBuyerRepository> _buyerRepositoryMock;
19+
private readonly Mock<IOrderRepository> _orderRepositoryMock;
2020
private readonly Mock<IIdentityService> _identityServiceMock;
2121

2222
public NewOrderRequestHandlerTest()
2323
{
2424

25-
_buyerRepositoryMock = new Mock<IBuyerRepository<Buyer>>();
26-
_orderRepositoryMock = new Mock<IOrderRepository<Order>>();
25+
_buyerRepositoryMock = new Mock<IBuyerRepository>();
26+
_orderRepositoryMock = new Mock<IOrderRepository>();
2727
_identityServiceMock = new Mock<IIdentityService>();
2828
}
2929

0 commit comments

Comments
 (0)