From 76a87f4bc8411c1d1132b4309f1ecd5a754699d6 Mon Sep 17 00:00:00 2001 From: Soumilgit Date: Sun, 7 Jun 2026 02:00:11 +0530 Subject: [PATCH 1/4] Fix: Credit Card Numbers are still an issue #979 --- src/ClientApp/Models/Orders/Order.cs | 11 +- src/ClientApp/Models/Orders/OrderCheckout.cs | 12 +- src/ClientApp/Models/User/PaymentInfo.cs | 15 --- src/ClientApp/Models/User/UserInfo.cs | 7 -- .../Services/Identity/IdentityMockService.cs | 3 - .../Services/Identity/IdentityService.cs | 4 - .../Services/Order/OrderMockService.cs | 49 +------- src/ClientApp/Services/Order/OrderService.cs | 6 +- src/ClientApp/ViewModels/CheckoutViewModel.cs | 15 +-- ...07000000_RemoveSensitiveCardProfileData.cs | 70 +++++++++++ .../ApplicationDbContextModelSnapshot.cs | 19 --- src/Identity.API/Models/ApplicationUser.cs | 10 -- src/Identity.API/Services/ProfileService.cs | 12 -- src/Identity.API/UsersSeed.cs | 14 +-- src/Ordering.API/Apis/OrdersApi.cs | 26 ++-- .../Commands/CreateOrderCommand.cs | 23 +--- .../Commands/CreateOrderCommandHandler.cs | 2 +- ...egateWhenOrderStartedDomainEventHandler.cs | 9 +- .../CreateOrderCommandValidator.cs | 11 +- .../AggregatesModel/BuyerAggregate/Buyer.cs | 8 +- .../BuyerAggregate/PaymentMethod.cs | 29 +---- .../AggregatesModel/OrderAggregate/Order.cs | 15 +-- .../Events/OrderStartedDomainEvent.cs | 6 +- .../PaymentMethodEntityTypeConfiguration.cs | 24 +--- ...000000_RemoveSensitivePaymentMethodData.cs | 111 ++++++++++++++++++ .../OrderingContextModelSnapshot.cs | 28 +---- .../Components/Pages/Checkout/Checkout.razor | 1 - src/WebApp/Services/BasketCheckoutInfo.cs | 11 +- src/WebApp/Services/BasketState.cs | 12 +- .../OrderingApiTests.cs | 3 +- .../IdentifiedCommandHandlerTest.cs | 6 +- .../Application/NewOrderCommandHandlerTest.cs | 11 +- tests/Ordering.UnitTests/Builders.cs | 6 +- .../Domain/BuyerAggregateTest.cs | 45 ++----- .../Domain/OrderAggregateTest.cs | 28 ++--- 35 files changed, 260 insertions(+), 402 deletions(-) delete mode 100644 src/ClientApp/Models/User/PaymentInfo.cs create mode 100644 src/Identity.API/Data/Migrations/20260607000000_RemoveSensitiveCardProfileData.cs create mode 100644 src/Ordering.Infrastructure/Migrations/20260607000000_RemoveSensitivePaymentMethodData.cs diff --git a/src/ClientApp/Models/Orders/Order.cs b/src/ClientApp/Models/Orders/Order.cs index ab8a6fd4f..7e49b9741 100644 --- a/src/ClientApp/Models/Orders/Order.cs +++ b/src/ClientApp/Models/Orders/Order.cs @@ -32,15 +32,8 @@ public Order() [JsonPropertyName("zipCode")] public string ShippingZipCode { get; set; } - public int CardTypeId { get; set; } - - public string CardNumber { get; set; } - - public string CardHolderName { get; set; } - - public DateTime CardExpiration { get; set; } - - public string CardSecurityNumber { get; set; } + [JsonPropertyName("paymentMethodId")] + public string PaymentMethodId { get; set; } [JsonPropertyName("items")] public List OrderItems { get; set; } diff --git a/src/ClientApp/Models/Orders/OrderCheckout.cs b/src/ClientApp/Models/Orders/OrderCheckout.cs index 344064e8d..44408dd55 100644 --- a/src/ClientApp/Models/Orders/OrderCheckout.cs +++ b/src/ClientApp/Models/Orders/OrderCheckout.cs @@ -16,17 +16,7 @@ public class OrderCheckout public string ZipCode { get; set; } [Required] - public string CardNumber { get; set; } - [Required] - public string CardHolderName { get; set; } - - [Required] - public DateTime CardExpiration { get; set; } - - [Required] - public string CardSecurityNumber { get; set; } - - public int CardTypeId { get; set; } + public string PaymentMethodId { get; set; } public string Buyer { get; set; } diff --git a/src/ClientApp/Models/User/PaymentInfo.cs b/src/ClientApp/Models/User/PaymentInfo.cs deleted file mode 100644 index f46841ac7..000000000 --- a/src/ClientApp/Models/User/PaymentInfo.cs +++ /dev/null @@ -1,15 +0,0 @@ -using eShop.ClientApp.Models.Orders; - -namespace eShop.ClientApp.Models.User; - -public class PaymentInfo -{ - public Guid Id { get; set; } - public string CardNumber { get; set; } - public string SecurityNumber { get; set; } - public int ExpirationMonth { get; set; } - public int ExpirationYear { get; set; } - public string CardHolderName { get; set; } - public CardType CardType { get; set; } - public string Expiration { get; set; } -} diff --git a/src/ClientApp/Models/User/UserInfo.cs b/src/ClientApp/Models/User/UserInfo.cs index b98be38db..6b7ed802d 100644 --- a/src/ClientApp/Models/User/UserInfo.cs +++ b/src/ClientApp/Models/User/UserInfo.cs @@ -13,13 +13,6 @@ public class UserInfo [JsonPropertyName("last_name")] public string LastName { get; set; } - [JsonPropertyName("card_number")] public string CardNumber { get; set; } - - [JsonPropertyName("card_holder")] public string CardHolder { get; set; } - - [JsonPropertyName("card_security_number")] - public string CardSecurityNumber { get; set; } - [JsonPropertyName("address_city")] public string Address { get; set; } [JsonPropertyName("address_country")] public string Country { get; set; } diff --git a/src/ClientApp/Services/Identity/IdentityMockService.cs b/src/ClientApp/Services/Identity/IdentityMockService.cs index 4e06f6f79..981c650cd 100644 --- a/src/ClientApp/Services/Identity/IdentityMockService.cs +++ b/src/ClientApp/Services/Identity/IdentityMockService.cs @@ -31,9 +31,6 @@ public Task GetUserInfoAsync() PreferredUsername = "sampleUser", Name = "Sample", LastName = "User", - CardNumber = "XXXXXXXXXXXX3456", - CardHolder = "Sample User", - CardSecurityNumber = "123", Address = "123 Sample Street", Country = "USA", State = "Washington", diff --git a/src/ClientApp/Services/Identity/IdentityService.cs b/src/ClientApp/Services/Identity/IdentityService.cs index 086759e26..dd3277b72 100644 --- a/src/ClientApp/Services/Identity/IdentityService.cs +++ b/src/ClientApp/Services/Identity/IdentityService.cs @@ -82,10 +82,6 @@ public async Task GetUserInfoAsync() userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "preferred_username")?.Value, Name = userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "name")?.Value, LastName = userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "last_name")?.Value, - CardNumber = userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "card_number")?.Value, - CardHolder = userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "card_holder")?.Value, - CardSecurityNumber = - userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "card_security_number")?.Value, PhoneNumberVerified = bool.Parse(userInfoWithClaims.Claims.FirstOrDefault(c => c.Type == "phone_number_verified") ?.Value ?? "false"), diff --git a/src/ClientApp/Services/Order/OrderMockService.cs b/src/ClientApp/Services/Order/OrderMockService.cs index f18219415..bdc47257d 100644 --- a/src/ClientApp/Services/Order/OrderMockService.cs +++ b/src/ClientApp/Services/Order/OrderMockService.cs @@ -1,12 +1,11 @@ using eShop.ClientApp.Models.Basket; using eShop.ClientApp.Models.Orders; -using eShop.ClientApp.Models.User; namespace eShop.ClientApp.Services.Order; public class OrderMockService : IOrderService { - private static readonly DateTime MockExpirationDate = DateTime.Now.AddYears(5); + private const string MockPaymentMethodId = "pm_mock_mobile"; private static readonly Address MockAdress = new() { @@ -22,22 +21,6 @@ public class OrderMockService : IOrderService ZipCode = "98101" }; - private static readonly PaymentInfo MockPaymentInfo = new() - { - Id = Guid.NewGuid(), - CardHolderName = "American Express", - CardNumber = "XXXXXXXXXXXX0005", - CardType = new CardType - { - Id = 3, - Name = "MasterCard" - }, - Expiration = MockExpirationDate.ToString(), - ExpirationMonth = MockExpirationDate.Month, - ExpirationYear = MockExpirationDate.Year, - SecurityNumber = "123" - }; - private static readonly List MockOrderItems = new() { new OrderItem @@ -64,11 +47,7 @@ public class OrderMockService : IOrderService private static readonly OrderCheckout MockOrderCheckout = new() { - CardExpiration = DateTime.UtcNow, - CardHolderName = "FakeCardHolderName", - CardNumber = "XXXXXXXXXXXX3224", - CardSecurityNumber = "1234", - CardTypeId = 1, + PaymentMethodId = MockPaymentMethodId, City = "FakeCity", Country = "FakeCountry", ZipCode = "FakeZipCode", @@ -84,11 +63,7 @@ public class OrderMockService : IOrderService OrderDate = DateTime.Now, OrderStatus = "Submitted", OrderItems = MockOrderItems, - CardTypeId = MockPaymentInfo.CardType.Id, - CardHolderName = MockPaymentInfo.CardHolderName, - CardNumber = MockPaymentInfo.CardNumber, - CardSecurityNumber = MockPaymentInfo.SecurityNumber, - CardExpiration = new DateTime(MockPaymentInfo.ExpirationYear, MockPaymentInfo.ExpirationMonth, 1), + PaymentMethodId = MockPaymentMethodId, ShippingCity = MockAdress.City, ShippingState = MockAdress.State, ShippingCountry = MockAdress.Country, @@ -102,11 +77,7 @@ public class OrderMockService : IOrderService OrderDate = DateTime.Now, OrderStatus = "Paid", OrderItems = MockOrderItems, - CardTypeId = MockPaymentInfo.CardType.Id, - CardHolderName = MockPaymentInfo.CardHolderName, - CardNumber = MockPaymentInfo.CardNumber, - CardSecurityNumber = MockPaymentInfo.SecurityNumber, - CardExpiration = new DateTime(MockPaymentInfo.ExpirationYear, MockPaymentInfo.ExpirationMonth, 1), + PaymentMethodId = MockPaymentMethodId, ShippingCity = MockAdress.City, ShippingState = MockAdress.State, ShippingCountry = MockAdress.Country, @@ -120,11 +91,7 @@ public class OrderMockService : IOrderService OrderDate = DateTime.Now, OrderStatus = "Cancelled", OrderItems = MockOrderItems, - CardTypeId = MockPaymentInfo.CardType.Id, - CardHolderName = MockPaymentInfo.CardHolderName, - CardNumber = MockPaymentInfo.CardNumber, - CardSecurityNumber = MockPaymentInfo.SecurityNumber, - CardExpiration = new DateTime(MockPaymentInfo.ExpirationYear, MockPaymentInfo.ExpirationMonth, 1), + PaymentMethodId = MockPaymentMethodId, ShippingCity = MockAdress.City, ShippingState = MockAdress.State, ShippingCountry = MockAdress.Country, @@ -138,11 +105,7 @@ public class OrderMockService : IOrderService OrderDate = DateTime.Now, OrderStatus = "Shipped", OrderItems = MockOrderItems, - CardTypeId = MockPaymentInfo.CardType.Id, - CardHolderName = MockPaymentInfo.CardHolderName, - CardNumber = MockPaymentInfo.CardNumber, - CardSecurityNumber = MockPaymentInfo.SecurityNumber, - CardExpiration = new DateTime(MockPaymentInfo.ExpirationYear, MockPaymentInfo.ExpirationMonth, 1), + PaymentMethodId = MockPaymentMethodId, ShippingCity = MockAdress.City, ShippingState = MockAdress.State, ShippingCountry = MockAdress.Country, diff --git a/src/ClientApp/Services/Order/OrderService.cs b/src/ClientApp/Services/Order/OrderService.cs index d7f6a9887..627dbfadd 100644 --- a/src/ClientApp/Services/Order/OrderService.cs +++ b/src/ClientApp/Services/Order/OrderService.cs @@ -113,11 +113,7 @@ public OrderCheckout MapOrderToBasket(Models.Orders.Order order) { return new OrderCheckout { - CardExpiration = order.CardExpiration, - CardHolderName = order.CardHolderName, - CardNumber = order.CardNumber, - CardSecurityNumber = order.CardSecurityNumber, - CardTypeId = order.CardTypeId, + PaymentMethodId = order.PaymentMethodId, City = order.ShippingCity, State = order.ShippingState, Country = order.ShippingCountry, diff --git a/src/ClientApp/ViewModels/CheckoutViewModel.cs b/src/ClientApp/ViewModels/CheckoutViewModel.cs index b02c5f3e9..f005541a5 100644 --- a/src/ClientApp/ViewModels/CheckoutViewModel.cs +++ b/src/ClientApp/ViewModels/CheckoutViewModel.cs @@ -55,15 +55,6 @@ await IsBusyFor( City = userInfo?.Address }; - // Create Payment Info - var paymentInfo = new PaymentInfo - { - CardNumber = userInfo?.CardNumber, - CardHolderName = userInfo?.CardHolder, - CardType = new CardType {Id = 3, Name = "MasterCard"}, - SecurityNumber = userInfo?.CardSecurityNumber - }; - var orderItems = CreateOrderItems(basketItems); // Create new Order @@ -76,11 +67,7 @@ await IsBusyFor( OrderItems = orderItems, OrderStatus = "Submitted", OrderDate = DateTime.Now, - CardHolderName = paymentInfo.CardHolderName, - CardNumber = paymentInfo.CardNumber, - CardSecurityNumber = paymentInfo.SecurityNumber, - CardExpiration = DateTime.UtcNow.AddYears(5), - CardTypeId = paymentInfo.CardType.Id, + PaymentMethodId = "pm_sample_mobile", ShippingState = ShippingAddress.State, ShippingCountry = ShippingAddress.Country, ShippingStreet = ShippingAddress.Street, diff --git a/src/Identity.API/Data/Migrations/20260607000000_RemoveSensitiveCardProfileData.cs b/src/Identity.API/Data/Migrations/20260607000000_RemoveSensitiveCardProfileData.cs new file mode 100644 index 000000000..4d089f1aa --- /dev/null +++ b/src/Identity.API/Data/Migrations/20260607000000_RemoveSensitiveCardProfileData.cs @@ -0,0 +1,70 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace eShop.Identity.API.Data.Migrations +{ + public partial class RemoveSensitiveCardProfileData : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "CardHolderName", + table: "AspNetUsers"); + + migrationBuilder.DropColumn( + name: "CardNumber", + table: "AspNetUsers"); + + migrationBuilder.DropColumn( + name: "CardType", + table: "AspNetUsers"); + + migrationBuilder.DropColumn( + name: "Expiration", + table: "AspNetUsers"); + + migrationBuilder.DropColumn( + name: "SecurityNumber", + table: "AspNetUsers"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "CardHolderName", + table: "AspNetUsers", + type: "text", + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "CardNumber", + table: "AspNetUsers", + type: "text", + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "CardType", + table: "AspNetUsers", + type: "integer", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "Expiration", + table: "AspNetUsers", + type: "text", + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "SecurityNumber", + table: "AspNetUsers", + type: "text", + nullable: false, + defaultValue: ""); + } + } +} diff --git a/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs index 92d3a0943..a55eaecb4 100644 --- a/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -162,17 +162,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("AccessFailedCount") .HasColumnType("integer"); - b.Property("CardHolderName") - .IsRequired() - .HasColumnType("text"); - - b.Property("CardNumber") - .IsRequired() - .HasColumnType("text"); - - b.Property("CardType") - .HasColumnType("integer"); - b.Property("City") .IsRequired() .HasColumnType("text"); @@ -192,10 +181,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("EmailConfirmed") .HasColumnType("boolean"); - b.Property("Expiration") - .IsRequired() - .HasColumnType("text"); - b.Property("LastName") .IsRequired() .HasColumnType("text"); @@ -227,10 +212,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("PhoneNumberConfirmed") .HasColumnType("boolean"); - b.Property("SecurityNumber") - .IsRequired() - .HasColumnType("text"); - b.Property("SecurityStamp") .HasColumnType("text"); diff --git a/src/Identity.API/Models/ApplicationUser.cs b/src/Identity.API/Models/ApplicationUser.cs index 11a151a1f..40c390365 100644 --- a/src/Identity.API/Models/ApplicationUser.cs +++ b/src/Identity.API/Models/ApplicationUser.cs @@ -3,16 +3,6 @@ // Add profile data for application users by adding properties to the ApplicationUser class public class ApplicationUser : IdentityUser { - [Required] - public string CardNumber { get; set; } - [Required] - public string SecurityNumber { get; set; } - [Required] - [RegularExpression(@"(0[1-9]|1[0-2])\/[0-9]{2}", ErrorMessage = "Expiration should match a valid MM/YY value")] - public string Expiration { get; set; } - [Required] - public string CardHolderName { get; set; } - public int CardType { get; set; } [Required] public string Street { get; set; } [Required] diff --git a/src/Identity.API/Services/ProfileService.cs b/src/Identity.API/Services/ProfileService.cs index f42a50fad..6c4341247 100644 --- a/src/Identity.API/Services/ProfileService.cs +++ b/src/Identity.API/Services/ProfileService.cs @@ -67,18 +67,6 @@ private IEnumerable GetClaimsFromUser(ApplicationUser user) if (!string.IsNullOrWhiteSpace(user.LastName)) claims.Add(new Claim("last_name", user.LastName)); - if (!string.IsNullOrWhiteSpace(user.CardNumber)) - claims.Add(new Claim("card_number", user.CardNumber)); - - if (!string.IsNullOrWhiteSpace(user.CardHolderName)) - claims.Add(new Claim("card_holder", user.CardHolderName)); - - if (!string.IsNullOrWhiteSpace(user.SecurityNumber)) - claims.Add(new Claim("card_security_number", user.SecurityNumber)); - - if (!string.IsNullOrWhiteSpace(user.Expiration)) - claims.Add(new Claim("card_expiration", user.Expiration)); - if (!string.IsNullOrWhiteSpace(user.City)) claims.Add(new Claim("address_city", user.City)); diff --git a/src/Identity.API/UsersSeed.cs b/src/Identity.API/UsersSeed.cs index 881cc097f..ea94ed15b 100644 --- a/src/Identity.API/UsersSeed.cs +++ b/src/Identity.API/UsersSeed.cs @@ -14,20 +14,15 @@ public async Task SeedAsync(ApplicationDbContext context) UserName = "alice", Email = "AliceSmith@email.com", EmailConfirmed = true, - CardHolderName = "Alice Smith", - CardNumber = "XXXXXXXXXXXX1881", - CardType = 1, City = "Redmond", Country = "U.S.", - Expiration = "12/24", Id = Guid.NewGuid().ToString(), LastName = "Smith", Name = "Alice", PhoneNumber = "1234567890", ZipCode = "98052", State = "WA", - Street = "15703 NE 61st Ct", - SecurityNumber = "123" + Street = "15703 NE 61st Ct" }; var result = await userManager.CreateAsync(alice, "Pass123$"); @@ -59,20 +54,15 @@ public async Task SeedAsync(ApplicationDbContext context) UserName = "bob", Email = "BobSmith@email.com", EmailConfirmed = true, - CardHolderName = "Bob Smith", - CardNumber = "XXXXXXXXXXXX1881", - CardType = 1, City = "Redmond", Country = "U.S.", - Expiration = "12/24", Id = Guid.NewGuid().ToString(), LastName = "Smith", Name = "Bob", PhoneNumber = "1234567890", ZipCode = "98052", State = "WA", - Street = "15703 NE 61st Ct", - SecurityNumber = "456" + Street = "15703 NE 61st Ct" }; var result = await userManager.CreateAsync(bob, "Pass123$"); diff --git a/src/Ordering.API/Apis/OrdersApi.cs b/src/Ordering.API/Apis/OrdersApi.cs index b8c339cf8..2e34cc7ec 100644 --- a/src/Ordering.API/Apis/OrdersApi.cs +++ b/src/Ordering.API/Apis/OrdersApi.cs @@ -121,36 +121,34 @@ public static async Task>> CreateOrderAsync( [AsParameters] OrderServices services) { - //mask the credit card number - services.Logger.LogInformation( "Sending command: {CommandName} - {IdProperty}: {CommandId}", request.GetGenericTypeName(), nameof(request.UserId), - request.UserId); //don't log the request as it has CC number + request.UserId); if (requestId == Guid.Empty) { - services.Logger.LogWarning("Invalid IntegrationEvent - RequestId is missing - {@IntegrationEvent}", request); + services.Logger.LogWarning( + "Invalid IntegrationEvent - RequestId is missing - UserId: {UserId}", + request.UserId); return TypedResults.BadRequest("RequestId is missing."); } using (services.Logger.BeginScope(new List> { new("IdentifiedCommandId", requestId) })) { - var maskedCCNumber = request.CardNumber.Substring(request.CardNumber.Length - 4).PadLeft(request.CardNumber.Length, 'X'); var createOrderCommand = new CreateOrderCommand(request.Items, request.UserId, request.UserName, request.City, request.Street, request.State, request.Country, request.ZipCode, - maskedCCNumber, request.CardHolderName, request.CardExpiration, - request.CardSecurityNumber, request.CardTypeId); + request.PaymentMethodId); var requestCreateOrder = new IdentifiedCommand(createOrderCommand, requestId); services.Logger.LogInformation( - "Sending command: {CommandName} - {IdProperty}: {CommandId} ({@Command})", + "Sending command: {CommandName} - {IdProperty}: {CommandId} - RequestId: {RequestId}", requestCreateOrder.GetGenericTypeName(), - nameof(requestCreateOrder.Id), - requestCreateOrder.Id, - requestCreateOrder); + nameof(requestCreateOrder.Command.UserId), + requestCreateOrder.Command.UserId, + requestCreateOrder.Id); var result = await services.Mediator.Send(requestCreateOrder); @@ -176,10 +174,6 @@ public record CreateOrderRequest( string State, string Country, string ZipCode, - string CardNumber, - string CardHolderName, - DateTime CardExpiration, - string CardSecurityNumber, - int CardTypeId, + string PaymentMethodId, string Buyer, List Items); diff --git a/src/Ordering.API/Application/Commands/CreateOrderCommand.cs b/src/Ordering.API/Application/Commands/CreateOrderCommand.cs index 61f46c124..c2d4e4e7a 100644 --- a/src/Ordering.API/Application/Commands/CreateOrderCommand.cs +++ b/src/Ordering.API/Application/Commands/CreateOrderCommand.cs @@ -41,19 +41,7 @@ public class CreateOrderCommand public string ZipCode { get; private set; } [DataMember] - public string CardNumber { get; private set; } - - [DataMember] - public string CardHolderName { get; private set; } - - [DataMember] - public DateTime CardExpiration { get; private set; } - - [DataMember] - public string CardSecurityNumber { get; private set; } - - [DataMember] - public int CardTypeId { get; private set; } + public string PaymentMethodId { get; private set; } [DataMember] public IEnumerable OrderItems => _orderItems; @@ -64,8 +52,7 @@ public CreateOrderCommand() } public CreateOrderCommand(List basketItems, string userId, string userName, string city, string street, string state, string country, string zipcode, - string cardNumber, string cardHolderName, DateTime cardExpiration, - string cardSecurityNumber, int cardTypeId) + string paymentMethodId) { _orderItems = basketItems.ToOrderItemsDTO().ToList(); UserId = userId; @@ -75,11 +62,7 @@ public CreateOrderCommand(List basketItems, string userId, string us State = state; Country = country; ZipCode = zipcode; - CardNumber = cardNumber; - CardHolderName = cardHolderName; - CardExpiration = cardExpiration; - CardSecurityNumber = cardSecurityNumber; - CardTypeId = cardTypeId; + PaymentMethodId = paymentMethodId; } } diff --git a/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs b/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs index 8a0365ee0..6d9a5071c 100644 --- a/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs +++ b/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs @@ -37,7 +37,7 @@ public async Task Handle(CreateOrderCommand message, CancellationToken can // methods and constructor so validations, invariants and business logic // make sure that consistency is preserved across the whole aggregate var address = new Address(message.Street, message.City, message.State, message.Country, message.ZipCode); - var order = new Order(message.UserId, message.UserName, address, message.CardTypeId, message.CardNumber, message.CardSecurityNumber, message.CardHolderName, message.CardExpiration); + var order = new Order(message.UserId, message.UserName, address, message.PaymentMethodId); foreach (var item in message.OrderItems) { diff --git a/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs b/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs index 8cde0d406..42859217e 100644 --- a/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs +++ b/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs @@ -19,7 +19,6 @@ public ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler( public async Task Handle(OrderStartedDomainEvent domainEvent, CancellationToken cancellationToken) { - var cardTypeId = domainEvent.CardTypeId != 0 ? domainEvent.CardTypeId : 1; var buyer = await _buyerRepository.FindAsync(domainEvent.UserId); var buyerExisted = buyer is not null; @@ -31,12 +30,8 @@ public async Task Handle(OrderStartedDomainEvent domainEvent, CancellationToken // REVIEW: The event this creates needs to be sent after SaveChanges has propagated the buyer Id. It currently only // works by coincidence. If we remove HiLo or if anything decides to yield earlier, it will break. - buyer.VerifyOrAddPaymentMethod(cardTypeId, - $"Payment Method on {DateTime.UtcNow}", - domainEvent.CardNumber, - domainEvent.CardSecurityNumber, - domainEvent.CardHolderName, - domainEvent.CardExpiration, + buyer.VerifyOrAddPaymentMethod($"Payment Method on {DateTime.UtcNow}", + domainEvent.PaymentMethodId, domainEvent.Order.Id); if (!buyerExisted) diff --git a/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs b/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs index 4781ca264..d9ff190ba 100644 --- a/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs +++ b/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs @@ -8,11 +8,7 @@ public CreateOrderCommandValidator(ILogger logger) RuleFor(command => command.State).NotEmpty(); RuleFor(command => command.Country).NotEmpty(); RuleFor(command => command.ZipCode).NotEmpty(); - RuleFor(command => command.CardNumber).NotEmpty().Length(12, 19); - RuleFor(command => command.CardHolderName).NotEmpty(); - RuleFor(command => command.CardExpiration).NotEmpty().Must(BeValidExpirationDate).WithMessage("Please specify a valid card expiration date"); - RuleFor(command => command.CardSecurityNumber).NotEmpty().Length(3); - RuleFor(command => command.CardTypeId).NotEmpty(); + RuleFor(command => command.PaymentMethodId).NotEmpty().MaximumLength(200); RuleFor(command => command.OrderItems).Must(ContainOrderItems).WithMessage("No order items found"); if (logger.IsEnabled(LogLevel.Trace)) @@ -21,11 +17,6 @@ public CreateOrderCommandValidator(ILogger logger) } } - private bool BeValidExpirationDate(DateTime dateTime) - { - return dateTime >= DateTime.UtcNow; - } - private bool ContainOrderItems(IEnumerable orderItems) { return orderItems.Any(); diff --git a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs index 825cdc73a..3bca5641d 100644 --- a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs +++ b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs @@ -26,12 +26,10 @@ public Buyer(string identity, string name) : this() Name = !string.IsNullOrWhiteSpace(name) ? name : throw new ArgumentNullException(nameof(name)); } - public PaymentMethod VerifyOrAddPaymentMethod( - int cardTypeId, string alias, string cardNumber, - string securityNumber, string cardHolderName, DateTime expiration, int orderId) + public PaymentMethod VerifyOrAddPaymentMethod(string alias, string paymentMethodId, int orderId) { var existingPayment = _paymentMethods - .SingleOrDefault(p => p.IsEqualTo(cardTypeId, cardNumber, expiration)); + .SingleOrDefault(p => p.IsEqualTo(paymentMethodId)); if (existingPayment != null) { @@ -40,7 +38,7 @@ public PaymentMethod VerifyOrAddPaymentMethod( return existingPayment; } - var payment = new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration); + var payment = new PaymentMethod(alias, paymentMethodId); _paymentMethods.Add(payment); diff --git a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs index c6964291f..fcd20f60e 100644 --- a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs +++ b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs @@ -7,37 +7,18 @@ public class PaymentMethod : Entity [Required] private string _alias; [Required] - private string _cardNumber; - private string _securityNumber; - [Required] - private string _cardHolderName; - private DateTime _expiration; - - private int _cardTypeId; - public CardType CardType { get; private set; } + private string _paymentMethodId; protected PaymentMethod() { } - public PaymentMethod(int cardTypeId, string alias, string cardNumber, string securityNumber, string cardHolderName, DateTime expiration) + public PaymentMethod(string alias, string paymentMethodId) { - _cardNumber = !string.IsNullOrWhiteSpace(cardNumber) ? cardNumber : throw new OrderingDomainException(nameof(cardNumber)); - _securityNumber = !string.IsNullOrWhiteSpace(securityNumber) ? securityNumber : throw new OrderingDomainException(nameof(securityNumber)); - _cardHolderName = !string.IsNullOrWhiteSpace(cardHolderName) ? cardHolderName : throw new OrderingDomainException(nameof(cardHolderName)); - - if (expiration < DateTime.UtcNow) - { - throw new OrderingDomainException(nameof(expiration)); - } - _alias = alias; - _expiration = expiration; - _cardTypeId = cardTypeId; + _paymentMethodId = !string.IsNullOrWhiteSpace(paymentMethodId) ? paymentMethodId : throw new OrderingDomainException(nameof(paymentMethodId)); } - public bool IsEqualTo(int cardTypeId, string cardNumber, DateTime expiration) + public bool IsEqualTo(string paymentMethodId) { - return _cardTypeId == cardTypeId - && _cardNumber == cardNumber - && _expiration == expiration; + return _paymentMethodId == paymentMethodId; } } diff --git a/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs b/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs index 3f51f71c2..ea8fbce9b 100644 --- a/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs +++ b/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs @@ -49,19 +49,17 @@ protected Order() _isDraft = false; } - public Order(string userId, string userName, Address address, int cardTypeId, string cardNumber, string cardSecurityNumber, - string cardHolderName, DateTime cardExpiration, int? buyerId = null, int? paymentMethodId = null) : this() + public Order(string userId, string userName, Address address, string paymentMethodId, int? buyerId = null, int? paymentMethodRecordId = null) : this() { BuyerId = buyerId; - PaymentId = paymentMethodId; + PaymentId = paymentMethodRecordId; OrderStatus = OrderStatus.Submitted; OrderDate = DateTime.UtcNow; Address = address; // Add the OrderStarterDomainEvent to the domain events collection // to be raised/dispatched when committing changes into the Database [ After DbContext.SaveChanges() ] - AddOrderStartedDomainEvent(userId, userName, cardTypeId, cardNumber, - cardSecurityNumber, cardHolderName, cardExpiration); + AddOrderStartedDomainEvent(userId, userName, paymentMethodId); } // DDD Patterns comment @@ -167,12 +165,9 @@ public void SetCancelledStatusWhenStockIsRejected(IEnumerable orderStockRej } } - private void AddOrderStartedDomainEvent(string userId, string userName, int cardTypeId, string cardNumber, - string cardSecurityNumber, string cardHolderName, DateTime cardExpiration) + private void AddOrderStartedDomainEvent(string userId, string userName, string paymentMethodId) { - var orderStartedDomainEvent = new OrderStartedDomainEvent(this, userId, userName, cardTypeId, - cardNumber, cardSecurityNumber, - cardHolderName, cardExpiration); + var orderStartedDomainEvent = new OrderStartedDomainEvent(this, userId, userName, paymentMethodId); this.AddDomainEvent(orderStartedDomainEvent); } diff --git a/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs b/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs index 7bb0b17e4..c600afe57 100644 --- a/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs +++ b/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs @@ -8,8 +8,4 @@ public record class OrderStartedDomainEvent( Order Order, string UserId, string UserName, - int CardTypeId, - string CardNumber, - string CardSecurityNumber, - string CardHolderName, - DateTime CardExpiration) : INotification; + string PaymentMethodId) : INotification; diff --git a/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs b/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs index cd6697acd..a4729a456 100644 --- a/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs +++ b/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs @@ -14,33 +14,15 @@ public void Configure(EntityTypeBuilder paymentConfiguration) paymentConfiguration.Property("BuyerId"); - paymentConfiguration - .Property("_cardHolderName") - .HasColumnName("CardHolderName") - .HasMaxLength(200); - paymentConfiguration .Property("_alias") .HasColumnName("Alias") .HasMaxLength(200); paymentConfiguration - .Property("_cardNumber") - .HasColumnName("CardNumber") - .HasMaxLength(25) + .Property("_paymentMethodId") + .HasColumnName("PaymentMethodId") + .HasMaxLength(200) .IsRequired(); - - paymentConfiguration - .Property("_expiration") - .HasColumnName("Expiration") - .HasMaxLength(25); - - paymentConfiguration - .Property("_cardTypeId") - .HasColumnName("CardTypeId"); - - paymentConfiguration.HasOne(p => p.CardType) - .WithMany() - .HasForeignKey("_cardTypeId"); } } diff --git a/src/Ordering.Infrastructure/Migrations/20260607000000_RemoveSensitivePaymentMethodData.cs b/src/Ordering.Infrastructure/Migrations/20260607000000_RemoveSensitivePaymentMethodData.cs new file mode 100644 index 000000000..54ca72414 --- /dev/null +++ b/src/Ordering.Infrastructure/Migrations/20260607000000_RemoveSensitivePaymentMethodData.cs @@ -0,0 +1,111 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Ordering.Infrastructure.Migrations +{ + public partial class RemoveSensitivePaymentMethodData : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_paymentmethods_cardtypes_CardTypeId", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.DropIndex( + name: "IX_paymentmethods_CardTypeId", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.DropColumn( + name: "CardHolderName", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.DropColumn( + name: "CardNumber", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.DropColumn( + name: "CardTypeId", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.DropColumn( + name: "Expiration", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.AddColumn( + name: "PaymentMethodId", + schema: "ordering", + table: "paymentmethods", + type: "character varying(200)", + maxLength: 200, + nullable: false, + defaultValue: ""); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "PaymentMethodId", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.AddColumn( + name: "CardHolderName", + schema: "ordering", + table: "paymentmethods", + type: "character varying(200)", + maxLength: 200, + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "CardNumber", + schema: "ordering", + table: "paymentmethods", + type: "character varying(25)", + maxLength: 25, + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "CardTypeId", + schema: "ordering", + table: "paymentmethods", + type: "integer", + nullable: false, + defaultValue: 1); + + migrationBuilder.AddColumn( + name: "Expiration", + schema: "ordering", + table: "paymentmethods", + type: "timestamp with time zone", + maxLength: 25, + nullable: false, + defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc)); + + migrationBuilder.CreateIndex( + name: "IX_paymentmethods_CardTypeId", + schema: "ordering", + table: "paymentmethods", + column: "CardTypeId"); + + migrationBuilder.AddForeignKey( + name: "FK_paymentmethods_cardtypes_CardTypeId", + schema: "ordering", + table: "paymentmethods", + column: "CardTypeId", + principalSchema: "ordering", + principalTable: "cardtypes", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + } + } +} diff --git a/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs b/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs index cd26856d7..12d412caf 100644 --- a/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs +++ b/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs @@ -122,33 +122,16 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("character varying(200)") .HasColumnName("Alias"); - b.Property("_cardHolderName") + b.Property("_paymentMethodId") .IsRequired() .HasMaxLength(200) .HasColumnType("character varying(200)") - .HasColumnName("CardHolderName"); - - b.Property("_cardNumber") - .IsRequired() - .HasMaxLength(25) - .HasColumnType("character varying(25)") - .HasColumnName("CardNumber"); - - b.Property("_cardTypeId") - .HasColumnType("integer") - .HasColumnName("CardTypeId"); - - b.Property("_expiration") - .HasMaxLength(25) - .HasColumnType("timestamp with time zone") - .HasColumnName("Expiration"); + .HasColumnName("PaymentMethodId"); b.HasKey("Id"); b.HasIndex("BuyerId"); - b.HasIndex("_cardTypeId"); - b.ToTable("paymentmethods", "ordering"); }); @@ -257,13 +240,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.CardType", "CardType") - .WithMany() - .HasForeignKey("_cardTypeId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("CardType"); }); modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => diff --git a/src/WebApp/Components/Pages/Checkout/Checkout.razor b/src/WebApp/Components/Pages/Checkout/Checkout.razor index b0f6bbed5..d0ea7fb8c 100644 --- a/src/WebApp/Components/Pages/Checkout/Checkout.razor +++ b/src/WebApp/Components/Pages/Checkout/Checkout.razor @@ -110,7 +110,6 @@ private async Task HandleValidSubmitAsync() { - Info.CardTypeId = 1; await Basket.CheckoutAsync(Info); Nav.NavigateTo("user/orders"); } diff --git a/src/WebApp/Services/BasketCheckoutInfo.cs b/src/WebApp/Services/BasketCheckoutInfo.cs index e1fd8afe3..132cfd9cc 100644 --- a/src/WebApp/Services/BasketCheckoutInfo.cs +++ b/src/WebApp/Services/BasketCheckoutInfo.cs @@ -19,15 +19,8 @@ public class BasketCheckoutInfo [Required] public string? ZipCode { get; set; } - public string? CardNumber { get; set; } - - public string? CardHolderName { get; set; } - - public string? CardSecurityNumber { get; set; } - - public DateTime? CardExpiration { get; set; } - - public int CardTypeId { get; set; } + [Required] + public string PaymentMethodId { get; set; } = "pm_sample_visa"; public string? Buyer { get; set; } public Guid RequestId { get; set; } diff --git a/src/WebApp/Services/BasketState.cs b/src/WebApp/Services/BasketState.cs index 551cd281d..ed4e5975f 100644 --- a/src/WebApp/Services/BasketState.cs +++ b/src/WebApp/Services/BasketState.cs @@ -97,11 +97,7 @@ public async Task CheckoutAsync(BasketCheckoutInfo checkoutInfo) State: checkoutInfo.State!, Country: checkoutInfo.Country!, ZipCode: checkoutInfo.ZipCode!, - CardNumber: "1111222233334444", - CardHolderName: "TESTUSER", - CardExpiration: DateTime.UtcNow.AddYears(1), - CardSecurityNumber: "111", - CardTypeId: checkoutInfo.CardTypeId, + PaymentMethodId: checkoutInfo.PaymentMethodId, Buyer: buyerId, Items: [.. orderItems]); await orderingService.CreateOrder(request, checkoutInfo.RequestId); @@ -166,10 +162,6 @@ public record CreateOrderRequest( string State, string Country, string ZipCode, - string CardNumber, - string CardHolderName, - DateTime CardExpiration, - string CardSecurityNumber, - int CardTypeId, + string PaymentMethodId, string Buyer, List Items); diff --git a/tests/Ordering.FunctionalTests/OrderingApiTests.cs b/tests/Ordering.FunctionalTests/OrderingApiTests.cs index 9b96d9de3..6bd95f5a5 100644 --- a/tests/Ordering.FunctionalTests/OrderingApiTests.cs +++ b/tests/Ordering.FunctionalTests/OrderingApiTests.cs @@ -146,8 +146,7 @@ public async Task AddNewOrder() Quantity = 1, PictureUrl = null }; - var cardExpirationDate = Convert.ToDateTime("2023-12-22T12:34:24.334Z"); - var OrderRequest = new CreateOrderRequest("1", "TestUser", null, null, null, null, null, "XXXXXXXXXXXX0005", "Test User", cardExpirationDate, "test buyer", 1, null, new List { item }); + var OrderRequest = new CreateOrderRequest("1", "TestUser", null, null, null, null, null, "pm_test_123", null, new List { item }); var content = new StringContent(JsonSerializer.Serialize(OrderRequest), UTF8Encoding.UTF8, "application/json") { Headers = { { "x-requestid", Guid.NewGuid().ToString() } } diff --git a/tests/Ordering.UnitTests/Application/IdentifiedCommandHandlerTest.cs b/tests/Ordering.UnitTests/Application/IdentifiedCommandHandlerTest.cs index 60f419661..80ebdbb26 100644 --- a/tests/Ordering.UnitTests/Application/IdentifiedCommandHandlerTest.cs +++ b/tests/Ordering.UnitTests/Application/IdentifiedCommandHandlerTest.cs @@ -68,10 +68,6 @@ private CreateOrderCommand FakeOrderRequest(Dictionary args = nu state: args != null && args.ContainsKey("state") ? (string)args["state"] : null, country: args != null && args.ContainsKey("country") ? (string)args["country"] : null, zipcode: args != null && args.ContainsKey("zipcode") ? (string)args["zipcode"] : null, - cardNumber: args != null && args.ContainsKey("cardNumber") ? (string)args["cardNumber"] : "1234", - cardExpiration: args != null && args.ContainsKey("cardExpiration") ? (DateTime)args["cardExpiration"] : DateTime.MinValue, - cardSecurityNumber: args != null && args.ContainsKey("cardSecurityNumber") ? (string)args["cardSecurityNumber"] : "123", - cardHolderName: args != null && args.ContainsKey("cardHolderName") ? (string)args["cardHolderName"] : "XXX", - cardTypeId: args != null && args.ContainsKey("cardTypeId") ? (int)args["cardTypeId"] : 0); + paymentMethodId: args != null && args.ContainsKey("paymentMethodId") ? (string)args["paymentMethodId"] : "pm_test_123"); } } diff --git a/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs b/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs index 8a66f4ceb..73b108f0d 100644 --- a/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs +++ b/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs @@ -25,8 +25,7 @@ public async Task Handle_return_false_if_order_is_not_persisted() { var buyerId = "1234"; - var fakeOrderCmd = FakeOrderRequestWithBuyer(new Dictionary - { ["cardExpiration"] = DateTime.UtcNow.AddYears(1) }); + var fakeOrderCmd = FakeOrderRequestWithBuyer(); _orderRepositoryMock.GetAsync(Arg.Any()) .Returns(Task.FromResult(FakeOrder())); @@ -60,7 +59,7 @@ private Buyer FakeBuyer() private Order FakeOrder() { - return new Order("1", "fakeName", new Address("street", "city", "state", "country", "zipcode"), 1, "12", "111", "fakeName", DateTime.UtcNow.AddYears(1)); + return new Order("1", "fakeName", new Address("street", "city", "state", "country", "zipcode"), "pm_test_123"); } private CreateOrderCommand FakeOrderRequestWithBuyer(Dictionary args = null) @@ -74,10 +73,6 @@ private CreateOrderCommand FakeOrderRequestWithBuyer(Dictionary state: args != null && args.ContainsKey("state") ? (string)args["state"] : null, country: args != null && args.ContainsKey("country") ? (string)args["country"] : null, zipcode: args != null && args.ContainsKey("zipcode") ? (string)args["zipcode"] : null, - cardNumber: args != null && args.ContainsKey("cardNumber") ? (string)args["cardNumber"] : "1234", - cardExpiration: args != null && args.ContainsKey("cardExpiration") ? (DateTime)args["cardExpiration"] : DateTime.MinValue, - cardSecurityNumber: args != null && args.ContainsKey("cardSecurityNumber") ? (string)args["cardSecurityNumber"] : "123", - cardHolderName: args != null && args.ContainsKey("cardHolderName") ? (string)args["cardHolderName"] : "XXX", - cardTypeId: args != null && args.ContainsKey("cardTypeId") ? (int)args["cardTypeId"] : 0); + paymentMethodId: args != null && args.ContainsKey("paymentMethodId") ? (string)args["paymentMethodId"] : "pm_test_123"); } } diff --git a/tests/Ordering.UnitTests/Builders.cs b/tests/Ordering.UnitTests/Builders.cs index 1b52f2abe..c0690339a 100644 --- a/tests/Ordering.UnitTests/Builders.cs +++ b/tests/Ordering.UnitTests/Builders.cs @@ -20,11 +20,7 @@ public OrderBuilder(Address address) "userId", "fakeName", address, - cardTypeId: 5, - cardNumber: "12", - cardSecurityNumber: "123", - cardHolderName: "name", - cardExpiration: DateTime.UtcNow); + paymentMethodId: "pm_test_123"); } public OrderBuilder AddOne( diff --git a/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs b/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs index 58af6b514..ed94efd9d 100644 --- a/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs +++ b/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs @@ -35,19 +35,15 @@ public void Create_buyer_item_fail() public void add_payment_success() { //Arrange - var cardTypeId = 1; var alias = "fakeAlias"; - var cardNumber = "124"; - var securityNumber = "1234"; - var cardHolderName = "FakeHolderNAme"; - var expiration = DateTime.UtcNow.AddYears(1); + var paymentMethodId = "pm_test_123"; var orderId = 1; var name = "fakeUser"; var identity = new Guid().ToString(); var fakeBuyerItem = new Buyer(identity, name); //Act - var result = fakeBuyerItem.VerifyOrAddPaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration, orderId); + var result = fakeBuyerItem.VerifyOrAddPaymentMethod(alias, paymentMethodId, orderId); //Assert Assert.IsNotNull(result); @@ -57,50 +53,37 @@ public void add_payment_success() public void create_payment_method_success() { //Arrange - var cardTypeId = 1; var alias = "fakeAlias"; - var cardNumber = "124"; - var securityNumber = "1234"; - var cardHolderName = "FakeHolderNAme"; - var expiration = DateTime.UtcNow.AddYears(1); - var fakePaymentMethod = new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration); + var paymentMethodId = "pm_test_123"; //Act - var result = new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration); + var result = new PaymentMethod(alias, paymentMethodId); //Assert Assert.IsNotNull(result); } [TestMethod] - public void create_payment_method_expiration_fail() + public void create_payment_method_empty_reference_fail() { //Arrange - var cardTypeId = 1; var alias = "fakeAlias"; - var cardNumber = "124"; - var securityNumber = "1234"; - var cardHolderName = "FakeHolderNAme"; - var expiration = DateTime.UtcNow.AddYears(-1); + var paymentMethodId = string.Empty; //Act - Assert - Assert.ThrowsExactly(() => new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration)); + Assert.ThrowsExactly(() => new PaymentMethod(alias, paymentMethodId)); } [TestMethod] public void payment_method_isEqualTo() { //Arrange - var cardTypeId = 1; var alias = "fakeAlias"; - var cardNumber = "124"; - var securityNumber = "1234"; - var cardHolderName = "FakeHolderNAme"; - var expiration = DateTime.UtcNow.AddYears(1); + var paymentMethodId = "pm_test_123"; //Act - var fakePaymentMethod = new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration); - var result = fakePaymentMethod.IsEqualTo(cardTypeId, cardNumber, expiration); + var fakePaymentMethod = new PaymentMethod(alias, paymentMethodId); + var result = fakePaymentMethod.IsEqualTo(paymentMethodId); //Assert Assert.IsTrue(result); @@ -112,17 +95,13 @@ public void Add_new_PaymentMethod_raises_new_event() //Arrange var alias = "fakeAlias"; var orderId = 1; - var cardTypeId = 5; - var cardNumber = "12"; - var cardSecurityNumber = "123"; - var cardHolderName = "FakeName"; - var cardExpiration = DateTime.UtcNow.AddYears(1); + var paymentMethodId = "pm_test_123"; var expectedResult = 1; var name = "fakeUser"; //Act var fakeBuyer = new Buyer(Guid.NewGuid().ToString(), name); - fakeBuyer.VerifyOrAddPaymentMethod(cardTypeId, alias, cardNumber, cardSecurityNumber, cardHolderName, cardExpiration, orderId); + fakeBuyer.VerifyOrAddPaymentMethod(alias, paymentMethodId, orderId); //Assert Assert.HasCount(expectedResult, fakeBuyer.DomainEvents); diff --git a/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs b/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs index f0af353a1..e91cf7dbe 100644 --- a/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs +++ b/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs @@ -114,15 +114,11 @@ public void Add_new_Order_raises_new_event() var state = "fakeState"; var country = "fakeCountry"; var zipcode = "FakeZipCode"; - var cardTypeId = 5; - var cardNumber = "12"; - var cardSecurityNumber = "123"; - var cardHolderName = "FakeName"; - var cardExpiration = DateTime.UtcNow.AddYears(1); + var paymentMethodId = "pm_test_123"; var expectedResult = 1; //Act - var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), cardTypeId, cardNumber, cardSecurityNumber, cardHolderName, cardExpiration); + var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), paymentMethodId); //Assert Assert.HasCount(expectedResult, fakeOrder.DomainEvents); @@ -137,16 +133,12 @@ public void Add_event_Order_explicitly_raises_new_event() var state = "fakeState"; var country = "fakeCountry"; var zipcode = "FakeZipCode"; - var cardTypeId = 5; - var cardNumber = "12"; - var cardSecurityNumber = "123"; - var cardHolderName = "FakeName"; - var cardExpiration = DateTime.UtcNow.AddYears(1); + var paymentMethodId = "pm_test_123"; var expectedResult = 2; //Act - var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), cardTypeId, cardNumber, cardSecurityNumber, cardHolderName, cardExpiration); - fakeOrder.AddDomainEvent(new OrderStartedDomainEvent(fakeOrder, "fakeName", "1", cardTypeId, cardNumber, cardSecurityNumber, cardHolderName, cardExpiration)); + var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), paymentMethodId); + fakeOrder.AddDomainEvent(new OrderStartedDomainEvent(fakeOrder, "fakeName", "1", paymentMethodId)); //Assert Assert.HasCount(expectedResult, fakeOrder.DomainEvents); } @@ -160,13 +152,9 @@ public void Remove_event_Order_explicitly() var state = "fakeState"; var country = "fakeCountry"; var zipcode = "FakeZipCode"; - var cardTypeId = 5; - var cardNumber = "12"; - var cardSecurityNumber = "123"; - var cardHolderName = "FakeName"; - var cardExpiration = DateTime.UtcNow.AddYears(1); - var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), cardTypeId, cardNumber, cardSecurityNumber, cardHolderName, cardExpiration); - var @fakeEvent = new OrderStartedDomainEvent(fakeOrder, "1", "fakeName", cardTypeId, cardNumber, cardSecurityNumber, cardHolderName, cardExpiration); + var paymentMethodId = "pm_test_123"; + var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), paymentMethodId); + var @fakeEvent = new OrderStartedDomainEvent(fakeOrder, "1", "fakeName", paymentMethodId); var expectedResult = 1; //Act From 00c9f81037cd479a7e947634b44e4b3f4c2bb0f6 Mon Sep 17 00:00:00 2001 From: Soumilgit Date: Tue, 17 Nov 2026 18:01:12 +0530 Subject: [PATCH 2/4] Address payment data PR review feedback --- src/ClientApp/Models/Orders/CardType.cs | 7 - ...RemoveSensitiveCardProfileData.Designer.cs | 305 ++++++++++++++++++ ...7122754_RemoveSensitiveCardProfileData.cs} | 7 +- .../ApplicationDbContextModelSnapshot.cs | 4 +- src/Ordering.API/Apis/OrdersApi.cs | 8 - ...egateWhenOrderStartedDomainEventHandler.cs | 2 +- .../Application/Queries/IOrderQueries.cs | 1 - .../Application/Queries/OrderQueries.cs | 2 - .../Application/Queries/OrderViewModel.cs | 6 - .../Infrastructure/OrderingContextSeed.cs | 19 +- .../BuyerAggregate/CardType.cs | 7 - .../AggregatesModel/OrderAggregate/Order.cs | 10 +- .../Events/OrderStartedDomainEvent.cs | 2 +- .../CardTypeEntityTypeConfiguration.cs | 17 - ...moveSensitivePaymentMethodData.Designer.cs | 291 +++++++++++++++++ ...22654_RemoveSensitivePaymentMethodData.cs} | 36 ++- .../OrderingContextModelSnapshot.cs | 75 ++--- .../OrderingContext.cs | 2 - .../OrderingApiTests.cs | 12 - .../Application/OrdersWebApiTest.cs | 15 - 20 files changed, 667 insertions(+), 161 deletions(-) delete mode 100644 src/ClientApp/Models/Orders/CardType.cs create mode 100644 src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.Designer.cs rename src/Identity.API/Data/Migrations/{20260607000000_RemoveSensitiveCardProfileData.cs => 20261117122754_RemoveSensitiveCardProfileData.cs} (92%) delete mode 100644 src/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs delete mode 100644 src/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs create mode 100644 src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.Designer.cs rename src/Ordering.Infrastructure/Migrations/{20260607000000_RemoveSensitivePaymentMethodData.cs => 20261117122654_RemoveSensitivePaymentMethodData.cs} (80%) diff --git a/src/ClientApp/Models/Orders/CardType.cs b/src/ClientApp/Models/Orders/CardType.cs deleted file mode 100644 index 6534ffbc3..000000000 --- a/src/ClientApp/Models/Orders/CardType.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace eShop.ClientApp.Models.Orders; - -public class CardType -{ - public int Id { get; set; } - public string Name { get; set; } -} diff --git a/src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.Designer.cs b/src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.Designer.cs new file mode 100644 index 000000000..4890aba48 --- /dev/null +++ b/src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.Designer.cs @@ -0,0 +1,305 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using eShop.Identity.API.Data; + +#nullable disable + +namespace Identity.API.Data.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("20261117122754_RemoveSensitiveCardProfileData")] + partial class RemoveSensitiveCardProfileData + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "10.0.5") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("text"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("ProviderKey") + .HasColumnType("text"); + + b.Property("ProviderDisplayName") + .HasColumnType("text"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("RoleId") + .HasColumnType("text"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("eShop.Identity.API.Models.ApplicationUser", b => + { + b.Property("Id") + .HasColumnType("text"); + + b.Property("AccessFailedCount") + .HasColumnType("integer"); + + b.Property("City") + .IsRequired() + .HasColumnType("text"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Country") + .IsRequired() + .HasColumnType("text"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("boolean"); + + b.Property("LastName") + .IsRequired() + .HasColumnType("text"); + + b.Property("LockoutEnabled") + .HasColumnType("boolean"); + + b.Property("LockoutEnd") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("PasswordHash") + .HasColumnType("text"); + + b.Property("PhoneNumber") + .HasColumnType("text"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("boolean"); + + b.Property("SecurityStamp") + .HasColumnType("text"); + + b.Property("State") + .IsRequired() + .HasColumnType("text"); + + b.Property("Street") + .IsRequired() + .HasColumnType("text"); + + b.Property("TwoFactorEnabled") + .HasColumnType("boolean"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("ZipCode") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Identity.API/Data/Migrations/20260607000000_RemoveSensitiveCardProfileData.cs b/src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.cs similarity index 92% rename from src/Identity.API/Data/Migrations/20260607000000_RemoveSensitiveCardProfileData.cs rename to src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.cs index 4d089f1aa..72edf32f3 100644 --- a/src/Identity.API/Data/Migrations/20260607000000_RemoveSensitiveCardProfileData.cs +++ b/src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.cs @@ -1,11 +1,13 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace eShop.Identity.API.Data.Migrations +namespace Identity.API.Data.Migrations { + /// public partial class RemoveSensitiveCardProfileData : Migration { + /// protected override void Up(MigrationBuilder migrationBuilder) { migrationBuilder.DropColumn( @@ -29,6 +31,7 @@ protected override void Up(MigrationBuilder migrationBuilder) table: "AspNetUsers"); } + /// protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.AddColumn( diff --git a/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs index a55eaecb4..b561123fc 100644 --- a/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -3,8 +3,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using eShop.Identity.API.Data; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using eShop.Identity.API.Data; #nullable disable @@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.0-rc.1.23419.6") + .HasAnnotation("ProductVersion", "10.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); diff --git a/src/Ordering.API/Apis/OrdersApi.cs b/src/Ordering.API/Apis/OrdersApi.cs index 2e34cc7ec..27d493d31 100644 --- a/src/Ordering.API/Apis/OrdersApi.cs +++ b/src/Ordering.API/Apis/OrdersApi.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Http.HttpResults; -using CardType = eShop.Ordering.API.Application.Queries.CardType; using Order = eShop.Ordering.API.Application.Queries.Order; public static class OrdersApi @@ -12,7 +11,6 @@ public static RouteGroupBuilder MapOrdersApiV1(this IEndpointRouteBuilder app) api.MapPut("/ship", ShipOrderAsync); api.MapGet("{orderId:int}", GetOrderAsync); api.MapGet("/", GetOrdersByUserAsync); - api.MapGet("/cardtypes", GetCardTypesAsync); api.MapPost("/draft", CreateOrderDraftAsync); api.MapPost("/", CreateOrderAsync); @@ -97,12 +95,6 @@ public static async Task>> GetOrdersByUserAsync([As return TypedResults.Ok(orders); } - public static async Task>> GetCardTypesAsync(IOrderQueries orderQueries) - { - var cardTypes = await orderQueries.GetCardTypesAsync(); - return TypedResults.Ok(cardTypes); - } - public static async Task CreateOrderDraftAsync(CreateOrderDraftCommand command, [AsParameters] OrderServices services) { services.Logger.LogInformation( diff --git a/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs b/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs index 42859217e..3f090cd07 100644 --- a/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs +++ b/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs @@ -31,7 +31,7 @@ public async Task Handle(OrderStartedDomainEvent domainEvent, CancellationToken // works by coincidence. If we remove HiLo or if anything decides to yield earlier, it will break. buyer.VerifyOrAddPaymentMethod($"Payment Method on {DateTime.UtcNow}", - domainEvent.PaymentMethodId, + domainEvent.PaymentProviderToken, domainEvent.Order.Id); if (!buyerExisted) diff --git a/src/Ordering.API/Application/Queries/IOrderQueries.cs b/src/Ordering.API/Application/Queries/IOrderQueries.cs index 3dc0fcc7f..d12a584d8 100644 --- a/src/Ordering.API/Application/Queries/IOrderQueries.cs +++ b/src/Ordering.API/Application/Queries/IOrderQueries.cs @@ -6,5 +6,4 @@ public interface IOrderQueries Task> GetOrdersFromUserAsync(string userId); - Task> GetCardTypesAsync(); } diff --git a/src/Ordering.API/Application/Queries/OrderQueries.cs b/src/Ordering.API/Application/Queries/OrderQueries.cs index 93891d1c1..d74040e3d 100644 --- a/src/Ordering.API/Application/Queries/OrderQueries.cs +++ b/src/Ordering.API/Application/Queries/OrderQueries.cs @@ -48,6 +48,4 @@ public async Task> GetOrdersFromUserAsync(string userI .ToListAsync(); } - public async Task> GetCardTypesAsync() => - await context.CardTypes.Select(c=> new CardType { Id = c.Id, Name = c.Name }).ToListAsync(); } diff --git a/src/Ordering.API/Application/Queries/OrderViewModel.cs b/src/Ordering.API/Application/Queries/OrderViewModel.cs index 084c2816d..68756d057 100644 --- a/src/Ordering.API/Application/Queries/OrderViewModel.cs +++ b/src/Ordering.API/Application/Queries/OrderViewModel.cs @@ -30,9 +30,3 @@ public record OrderSummary public string Status { get; init; } public double Total { get; init; } } - -public record CardType -{ - public int Id { get; init; } - public string Name { get; init; } -} diff --git a/src/Ordering.API/Infrastructure/OrderingContextSeed.cs b/src/Ordering.API/Infrastructure/OrderingContextSeed.cs index b54ef84d7..7b6d40329 100644 --- a/src/Ordering.API/Infrastructure/OrderingContextSeed.cs +++ b/src/Ordering.API/Infrastructure/OrderingContextSeed.cs @@ -4,22 +4,5 @@ public class OrderingContextSeed: IDbSeeder { - public async Task SeedAsync(OrderingContext context) - { - if (!context.CardTypes.Any()) - { - context.CardTypes.AddRange(GetPredefinedCardTypes()); - - await context.SaveChangesAsync(); - } - - await context.SaveChangesAsync(); - } - - private static IEnumerable GetPredefinedCardTypes() - { - yield return new CardType { Id = 1, Name = "Amex" }; - yield return new CardType { Id = 2, Name = "Visa" }; - yield return new CardType { Id = 3, Name = "MasterCard" }; - } + public Task SeedAsync(OrderingContext context) => Task.CompletedTask; } diff --git a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs deleted file mode 100644 index f01eacea0..000000000 --- a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace eShop.Ordering.Domain.AggregatesModel.BuyerAggregate; - -public sealed class CardType -{ - public int Id { get; init; } - public required string Name { get; init; } -} diff --git a/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs b/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs index ea8fbce9b..8e18e642c 100644 --- a/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs +++ b/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs @@ -49,17 +49,17 @@ protected Order() _isDraft = false; } - public Order(string userId, string userName, Address address, string paymentMethodId, int? buyerId = null, int? paymentMethodRecordId = null) : this() + public Order(string userId, string userName, Address address, string paymentProviderToken, int? buyerId = null, int? paymentMethodId = null) : this() { BuyerId = buyerId; - PaymentId = paymentMethodRecordId; + PaymentId = paymentMethodId; OrderStatus = OrderStatus.Submitted; OrderDate = DateTime.UtcNow; Address = address; // Add the OrderStarterDomainEvent to the domain events collection // to be raised/dispatched when committing changes into the Database [ After DbContext.SaveChanges() ] - AddOrderStartedDomainEvent(userId, userName, paymentMethodId); + AddOrderStartedDomainEvent(userId, userName, paymentProviderToken); } // DDD Patterns comment @@ -165,9 +165,9 @@ public void SetCancelledStatusWhenStockIsRejected(IEnumerable orderStockRej } } - private void AddOrderStartedDomainEvent(string userId, string userName, string paymentMethodId) + private void AddOrderStartedDomainEvent(string userId, string userName, string paymentProviderToken) { - var orderStartedDomainEvent = new OrderStartedDomainEvent(this, userId, userName, paymentMethodId); + var orderStartedDomainEvent = new OrderStartedDomainEvent(this, userId, userName, paymentProviderToken); this.AddDomainEvent(orderStartedDomainEvent); } diff --git a/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs b/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs index c600afe57..7e471e786 100644 --- a/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs +++ b/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs @@ -8,4 +8,4 @@ public record class OrderStartedDomainEvent( Order Order, string UserId, string UserName, - string PaymentMethodId) : INotification; + string PaymentProviderToken) : INotification; diff --git a/src/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs b/src/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs deleted file mode 100644 index 40d5e900d..000000000 --- a/src/Ordering.Infrastructure/EntityConfigurations/CardTypeEntityTypeConfiguration.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace eShop.Ordering.Infrastructure.EntityConfigurations; - -class CardTypeEntityTypeConfiguration - : IEntityTypeConfiguration -{ - public void Configure(EntityTypeBuilder cardTypesConfiguration) - { - cardTypesConfiguration.ToTable("cardtypes"); - - cardTypesConfiguration.Property(ct => ct.Id) - .ValueGeneratedNever(); - - cardTypesConfiguration.Property(ct => ct.Name) - .HasMaxLength(200) - .IsRequired(); - } -} diff --git a/src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.Designer.cs b/src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.Designer.cs new file mode 100644 index 000000000..f6076533d --- /dev/null +++ b/src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.Designer.cs @@ -0,0 +1,291 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using eShop.Ordering.Infrastructure; + +#nullable disable + +namespace Ordering.Infrastructure.Migrations +{ + [DbContext(typeof(OrderingContext))] + [Migration("20261117122654_RemoveSensitivePaymentMethodData")] + partial class RemoveSensitivePaymentMethodData + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasDefaultSchema("ordering") + .HasAnnotation("ProductVersion", "10.0.5") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.HasSequence("buyerseq") + .IncrementsBy(10); + + modelBuilder.HasSequence("orderitemseq") + .IncrementsBy(10); + + modelBuilder.HasSequence("orderseq") + .IncrementsBy(10); + + modelBuilder.HasSequence("paymentseq") + .IncrementsBy(10); + + modelBuilder.Entity("eShop.IntegrationEventLogEF.IntegrationEventLogEntry", b => + { + b.Property("EventId") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Content") + .IsRequired() + .HasColumnType("text"); + + b.Property("CreationTime") + .HasColumnType("timestamp with time zone"); + + b.Property("EventTypeName") + .IsRequired() + .HasColumnType("text"); + + b.Property("State") + .HasColumnType("integer"); + + b.Property("TimesSent") + .HasColumnType("integer"); + + b.Property("TransactionId") + .HasColumnType("uuid"); + + b.HasKey("EventId"); + + b.ToTable("IntegrationEventLog", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "buyerseq"); + + b.Property("IdentityGuid") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("Name") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("IdentityGuid") + .IsUnique(); + + b.ToTable("buyers", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "paymentseq"); + + b.Property("BuyerId") + .HasColumnType("integer"); + + b.Property("_alias") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)") + .HasColumnName("Alias"); + + b.Property("_paymentMethodId") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)") + .HasColumnName("PaymentMethodId"); + + b.HasKey("Id"); + + b.HasIndex("BuyerId"); + + b.ToTable("paymentmethods", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "orderseq"); + + b.Property("BuyerId") + .HasColumnType("integer"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("OrderDate") + .HasColumnType("timestamp with time zone"); + + b.Property("OrderStatus") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("character varying(30)"); + + b.Property("PaymentId") + .HasColumnType("integer") + .HasColumnName("PaymentMethodId"); + + b.HasKey("Id"); + + b.HasIndex("BuyerId"); + + b.HasIndex("PaymentId"); + + b.ToTable("orders", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "orderitemseq"); + + b.Property("Discount") + .HasColumnType("numeric"); + + b.Property("OrderId") + .HasColumnType("integer"); + + b.Property("PictureUrl") + .HasColumnType("text"); + + b.Property("ProductId") + .HasColumnType("integer"); + + b.Property("ProductName") + .IsRequired() + .HasColumnType("text"); + + b.Property("UnitPrice") + .HasColumnType("numeric"); + + b.Property("Units") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("OrderId"); + + b.ToTable("orderItems", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Infrastructure.Idempotency.ClientRequest", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("Time") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.ToTable("requests", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", null) + .WithMany("PaymentMethods") + .HasForeignKey("BuyerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", "Buyer") + .WithMany() + .HasForeignKey("BuyerId"); + + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", null) + .WithMany() + .HasForeignKey("PaymentId") + .OnDelete(DeleteBehavior.Restrict); + + b.OwnsOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Address", "Address", b1 => + { + b1.Property("OrderId") + .HasColumnType("integer"); + + b1.Property("City") + .HasColumnType("text"); + + b1.Property("Country") + .HasColumnType("text"); + + b1.Property("State") + .HasColumnType("text"); + + b1.Property("Street") + .HasColumnType("text"); + + b1.Property("ZipCode") + .HasColumnType("text"); + + b1.HasKey("OrderId"); + + b1.ToTable("orders", "ordering"); + + b1.WithOwner() + .HasForeignKey("OrderId"); + }); + + b.Navigation("Address") + .IsRequired(); + + b.Navigation("Buyer"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", null) + .WithMany("OrderItems") + .HasForeignKey("OrderId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => + { + b.Navigation("PaymentMethods"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + b.Navigation("OrderItems"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Ordering.Infrastructure/Migrations/20260607000000_RemoveSensitivePaymentMethodData.cs b/src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.cs similarity index 80% rename from src/Ordering.Infrastructure/Migrations/20260607000000_RemoveSensitivePaymentMethodData.cs rename to src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.cs index 54ca72414..248ac7230 100644 --- a/src/Ordering.Infrastructure/Migrations/20260607000000_RemoveSensitivePaymentMethodData.cs +++ b/src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.cs @@ -1,12 +1,14 @@ -using System; +using System; using Microsoft.EntityFrameworkCore.Migrations; #nullable disable namespace Ordering.Infrastructure.Migrations { + /// public partial class RemoveSensitivePaymentMethodData : Migration { + /// protected override void Up(MigrationBuilder migrationBuilder) { migrationBuilder.DropForeignKey( @@ -14,28 +16,32 @@ protected override void Up(MigrationBuilder migrationBuilder) schema: "ordering", table: "paymentmethods"); + migrationBuilder.DropTable( + name: "cardtypes", + schema: "ordering"); + migrationBuilder.DropIndex( name: "IX_paymentmethods_CardTypeId", schema: "ordering", table: "paymentmethods"); migrationBuilder.DropColumn( - name: "CardHolderName", + name: "CardNumber", schema: "ordering", table: "paymentmethods"); migrationBuilder.DropColumn( - name: "CardNumber", + name: "CardTypeId", schema: "ordering", table: "paymentmethods"); migrationBuilder.DropColumn( - name: "CardTypeId", + name: "Expiration", schema: "ordering", table: "paymentmethods"); migrationBuilder.DropColumn( - name: "Expiration", + name: "CardHolderName", schema: "ordering", table: "paymentmethods"); @@ -47,8 +53,11 @@ protected override void Up(MigrationBuilder migrationBuilder) maxLength: 200, nullable: false, defaultValue: ""); + + migrationBuilder.Sql("UPDATE ordering.paymentmethods SET \"PaymentMethodId\" = 'legacy-' || \"Id\"::text"); } + /// protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.DropColumn( @@ -80,7 +89,7 @@ protected override void Down(MigrationBuilder migrationBuilder) table: "paymentmethods", type: "integer", nullable: false, - defaultValue: 1); + defaultValue: 0); migrationBuilder.AddColumn( name: "Expiration", @@ -89,7 +98,20 @@ protected override void Down(MigrationBuilder migrationBuilder) type: "timestamp with time zone", maxLength: 25, nullable: false, - defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc)); + defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); + + migrationBuilder.CreateTable( + name: "cardtypes", + schema: "ordering", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false), + Name = table.Column(type: "character varying(200)", maxLength: 200, nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_cardtypes", x => x.Id); + }); migrationBuilder.CreateIndex( name: "IX_paymentmethods_CardTypeId", diff --git a/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs b/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs index 12d412caf..22272278f 100644 --- a/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs +++ b/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs @@ -18,7 +18,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder .HasDefaultSchema("ordering") - .HasAnnotation("ProductVersion", "8.0.0") + .HasAnnotation("ProductVersion", "10.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); @@ -90,21 +90,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("buyers", "ordering"); }); - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.CardType", b => - { - b.Property("Id") - .HasColumnType("integer"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("character varying(200)"); - - b.HasKey("Id"); - - b.ToTable("cardtypes", "ordering"); - }); - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => { b.Property("Id") @@ -143,31 +128,29 @@ protected override void BuildModel(ModelBuilder modelBuilder) NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "orderseq"); + b.Property("BuyerId") + .HasColumnType("integer"); + b.Property("Description") .HasColumnType("text"); + b.Property("OrderDate") + .HasColumnType("timestamp with time zone"); + b.Property("OrderStatus") .IsRequired() .HasMaxLength(30) .HasColumnType("character varying(30)"); - b.Property("_buyerId") - .HasColumnType("integer") - .HasColumnName("BuyerId"); - - b.Property("_orderDate") - .HasColumnType("timestamp with time zone") - .HasColumnName("OrderDate"); - - b.Property("_paymentMethodId") + b.Property("PaymentId") .HasColumnType("integer") .HasColumnName("PaymentMethodId"); b.HasKey("Id"); - b.HasIndex("_buyerId"); + b.HasIndex("BuyerId"); - b.HasIndex("_paymentMethodId"); + b.HasIndex("PaymentId"); b.ToTable("orders", "ordering"); }); @@ -180,32 +163,27 @@ protected override void BuildModel(ModelBuilder modelBuilder) NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "orderitemseq"); + b.Property("Discount") + .HasColumnType("numeric"); + b.Property("OrderId") .HasColumnType("integer"); + b.Property("PictureUrl") + .HasColumnType("text"); + b.Property("ProductId") .HasColumnType("integer"); - b.Property("_discount") - .HasColumnType("numeric") - .HasColumnName("Discount"); - - b.Property("_pictureUrl") - .HasColumnType("text") - .HasColumnName("PictureUrl"); - - b.Property("_productName") + b.Property("ProductName") .IsRequired() - .HasColumnType("text") - .HasColumnName("ProductName"); + .HasColumnType("text"); - b.Property("_unitPrice") - .HasColumnType("numeric") - .HasColumnName("UnitPrice"); + b.Property("UnitPrice") + .HasColumnType("numeric"); - b.Property("_units") - .HasColumnType("integer") - .HasColumnName("Units"); + b.Property("Units") + .HasColumnType("integer"); b.HasKey("Id"); @@ -239,18 +217,17 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasForeignKey("BuyerId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - }); modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => { - b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", null) + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", "Buyer") .WithMany() - .HasForeignKey("_buyerId"); + .HasForeignKey("BuyerId"); b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", null) .WithMany() - .HasForeignKey("_paymentMethodId") + .HasForeignKey("PaymentId") .OnDelete(DeleteBehavior.Restrict); b.OwnsOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Address", "Address", b1 => @@ -283,6 +260,8 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Navigation("Address") .IsRequired(); + + b.Navigation("Buyer"); }); modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => diff --git a/src/Ordering.Infrastructure/OrderingContext.cs b/src/Ordering.Infrastructure/OrderingContext.cs index 0b265dee2..90defb9e3 100644 --- a/src/Ordering.Infrastructure/OrderingContext.cs +++ b/src/Ordering.Infrastructure/OrderingContext.cs @@ -13,7 +13,6 @@ public class OrderingContext : DbContext, IUnitOfWork public DbSet OrderItems { get; set; } public DbSet Payments { get; set; } public DbSet Buyers { get; set; } - public DbSet CardTypes { get; set; } private readonly IMediator _mediator; private IDbContextTransaction _currentTransaction; @@ -39,7 +38,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.ApplyConfiguration(new PaymentMethodEntityTypeConfiguration()); modelBuilder.ApplyConfiguration(new OrderEntityTypeConfiguration()); modelBuilder.ApplyConfiguration(new OrderItemEntityTypeConfiguration()); - modelBuilder.ApplyConfiguration(new CardTypeEntityTypeConfiguration()); modelBuilder.ApplyConfiguration(new BuyerEntityTypeConfiguration()); modelBuilder.UseIntegrationEventLogs(); } diff --git a/tests/Ordering.FunctionalTests/OrderingApiTests.cs b/tests/Ordering.FunctionalTests/OrderingApiTests.cs index 6bd95f5a5..fbe206416 100644 --- a/tests/Ordering.FunctionalTests/OrderingApiTests.cs +++ b/tests/Ordering.FunctionalTests/OrderingApiTests.cs @@ -94,18 +94,6 @@ public async Task ShipNonExistentOrderFails() Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); } - [Fact] - public async Task GetAllOrdersCardType() - { - // Act 1 - var response = await _httpClient.GetAsync("api/orders/cardtypes", TestContext.Current.CancellationToken); - var s = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken); - response.EnsureSuccessStatusCode(); - - // Assert - Assert.Equal(HttpStatusCode.OK, response.StatusCode); - } - [Fact] public async Task GetStoredOrdersWithOrderId() { diff --git a/tests/Ordering.UnitTests/Application/OrdersWebApiTest.cs b/tests/Ordering.UnitTests/Application/OrdersWebApiTest.cs index 3d66afb7b..4b76983fe 100644 --- a/tests/Ordering.UnitTests/Application/OrdersWebApiTest.cs +++ b/tests/Ordering.UnitTests/Application/OrdersWebApiTest.cs @@ -139,21 +139,6 @@ public async Task Get_order_fails() } [TestMethod] - public async Task Get_cardTypes_success() - { - // Arrange - var fakeDynamicResult = Enumerable.Empty(); - _orderQueriesMock.GetCardTypesAsync() - .Returns(Task.FromResult(fakeDynamicResult)); - - // Act - var result = await OrdersApi.GetCardTypesAsync(_orderQueriesMock); - - // Assert - Assert.IsInstanceOfType>>(result); - Assert.AreSame(fakeDynamicResult, result.Value); - } - [TestMethod] public async Task Cancel_order_returns_problem_when_command_fails() { From fbb74c195fcb582b39b6fac266b0a0f3b799e7c7 Mon Sep 17 00:00:00 2001 From: Soumilgit Date: Tue, 17 Nov 2026 18:35:31 +0530 Subject: [PATCH 3/4] Regenerate payment migrations with EF Core 11 --- Directory.Packages.props | 3 +- ...RemoveSensitiveCardProfileData.Designer.cs | 305 ------------ ...17122754_RemoveSensitiveCardProfileData.cs | 73 --- ...RemoveSensitiveCardProfileData.Designer.cs | 304 ++++++++++++ ...17125859_RemoveSensitiveCardProfileData.cs | 72 +++ .../ApplicationDbContextModelSnapshot.cs | 458 +++++++++--------- src/Identity.API/Identity.API.csproj | 4 + src/Ordering.API/Ordering.API.csproj | 6 +- ...moveSensitivePaymentMethodData.Designer.cs | 291 ----------- ...122654_RemoveSensitivePaymentMethodData.cs | 133 ----- ...moveSensitivePaymentMethodData.Designer.cs | 290 +++++++++++ ...125854_RemoveSensitivePaymentMethodData.cs | 154 ++++++ .../OrderingContextModelSnapshot.cs | 402 +++++++-------- .../Application/OrdersWebApiTest.cs | 1 - tests/Ordering.UnitTests/Builders.cs | 2 +- 15 files changed, 1266 insertions(+), 1232 deletions(-) delete mode 100644 src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.Designer.cs delete mode 100644 src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.cs create mode 100644 src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.Designer.cs create mode 100644 src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.cs delete mode 100644 src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.Designer.cs delete mode 100644 src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.cs create mode 100644 src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.Designer.cs create mode 100644 src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index 1e725f654..fb4f1ff4f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -40,6 +40,7 @@ + @@ -89,4 +90,4 @@ - \ No newline at end of file + diff --git a/src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.Designer.cs b/src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.Designer.cs deleted file mode 100644 index 4890aba48..000000000 --- a/src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.Designer.cs +++ /dev/null @@ -1,305 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using eShop.Identity.API.Data; - -#nullable disable - -namespace Identity.API.Data.Migrations -{ - [DbContext(typeof(ApplicationDbContext))] - [Migration("20261117122754_RemoveSensitiveCardProfileData")] - partial class RemoveSensitiveCardProfileData - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "10.0.5") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => - { - b.Property("Id") - .HasColumnType("text"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("text"); - - b.Property("Name") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); - - b.Property("NormalizedName") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName") - .IsUnique() - .HasDatabaseName("RoleNameIndex"); - - b.ToTable("AspNetRoles", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("ClaimType") - .HasColumnType("text"); - - b.Property("ClaimValue") - .HasColumnType("text"); - - b.Property("RoleId") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetRoleClaims", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("ClaimType") - .HasColumnType("text"); - - b.Property("ClaimValue") - .HasColumnType("text"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserClaims", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.Property("LoginProvider") - .HasColumnType("text"); - - b.Property("ProviderKey") - .HasColumnType("text"); - - b.Property("ProviderDisplayName") - .HasColumnType("text"); - - b.Property("UserId") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("LoginProvider", "ProviderKey"); - - b.HasIndex("UserId"); - - b.ToTable("AspNetUserLogins", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.Property("UserId") - .HasColumnType("text"); - - b.Property("RoleId") - .HasColumnType("text"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId"); - - b.ToTable("AspNetUserRoles", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.Property("UserId") - .HasColumnType("text"); - - b.Property("LoginProvider") - .HasColumnType("text"); - - b.Property("Name") - .HasColumnType("text"); - - b.Property("Value") - .HasColumnType("text"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AspNetUserTokens", (string)null); - }); - - modelBuilder.Entity("eShop.Identity.API.Models.ApplicationUser", b => - { - b.Property("Id") - .HasColumnType("text"); - - b.Property("AccessFailedCount") - .HasColumnType("integer"); - - b.Property("City") - .IsRequired() - .HasColumnType("text"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("text"); - - b.Property("Country") - .IsRequired() - .HasColumnType("text"); - - b.Property("Email") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); - - b.Property("EmailConfirmed") - .HasColumnType("boolean"); - - b.Property("LastName") - .IsRequired() - .HasColumnType("text"); - - b.Property("LockoutEnabled") - .HasColumnType("boolean"); - - b.Property("LockoutEnd") - .HasColumnType("timestamp with time zone"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("NormalizedEmail") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); - - b.Property("NormalizedUserName") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); - - b.Property("PasswordHash") - .HasColumnType("text"); - - b.Property("PhoneNumber") - .HasColumnType("text"); - - b.Property("PhoneNumberConfirmed") - .HasColumnType("boolean"); - - b.Property("SecurityStamp") - .HasColumnType("text"); - - b.Property("State") - .IsRequired() - .HasColumnType("text"); - - b.Property("Street") - .IsRequired() - .HasColumnType("text"); - - b.Property("TwoFactorEnabled") - .HasColumnType("boolean"); - - b.Property("UserName") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); - - b.Property("ZipCode") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasDatabaseName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .IsUnique() - .HasDatabaseName("UserNameIndex"); - - b.ToTable("AspNetUsers", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.cs b/src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.cs deleted file mode 100644 index 72edf32f3..000000000 --- a/src/Identity.API/Data/Migrations/20261117122754_RemoveSensitiveCardProfileData.cs +++ /dev/null @@ -1,73 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace Identity.API.Data.Migrations -{ - /// - public partial class RemoveSensitiveCardProfileData : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "CardHolderName", - table: "AspNetUsers"); - - migrationBuilder.DropColumn( - name: "CardNumber", - table: "AspNetUsers"); - - migrationBuilder.DropColumn( - name: "CardType", - table: "AspNetUsers"); - - migrationBuilder.DropColumn( - name: "Expiration", - table: "AspNetUsers"); - - migrationBuilder.DropColumn( - name: "SecurityNumber", - table: "AspNetUsers"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.AddColumn( - name: "CardHolderName", - table: "AspNetUsers", - type: "text", - nullable: false, - defaultValue: ""); - - migrationBuilder.AddColumn( - name: "CardNumber", - table: "AspNetUsers", - type: "text", - nullable: false, - defaultValue: ""); - - migrationBuilder.AddColumn( - name: "CardType", - table: "AspNetUsers", - type: "integer", - nullable: false, - defaultValue: 0); - - migrationBuilder.AddColumn( - name: "Expiration", - table: "AspNetUsers", - type: "text", - nullable: false, - defaultValue: ""); - - migrationBuilder.AddColumn( - name: "SecurityNumber", - table: "AspNetUsers", - type: "text", - nullable: false, - defaultValue: ""); - } - } -} diff --git a/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.Designer.cs b/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.Designer.cs new file mode 100644 index 000000000..e83596029 --- /dev/null +++ b/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.Designer.cs @@ -0,0 +1,304 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using eShop.Identity.API.Data; + +#nullable disable + +namespace Identity.API.Data.Migrations; + +[DbContext(typeof(ApplicationDbContext))] +[Migration("20261117125859_RemoveSensitiveCardProfileData")] +partial class _20261117125859_RemoveSensitiveCardProfileData +{ + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "11.0.0-rc.3.26522.148") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("text"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(id); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(id); + + b.Property("ClaimType") + .HasColumnType("text"); + + b.Property("ClaimValue") + .HasColumnType("text"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("ProviderKey") + .HasColumnType("text"); + + b.Property("ProviderDisplayName") + .HasColumnType("text"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("RoleId") + .HasColumnType("text"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("text"); + + b.Property("LoginProvider") + .HasColumnType("text"); + + b.Property("Name") + .HasColumnType("text"); + + b.Property("Value") + .HasColumnType("text"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("eShop.Identity.API.Models.ApplicationUser", b => + { + b.Property("Id") + .HasColumnType("text"); + + b.Property("AccessFailedCount") + .HasColumnType("integer"); + + b.Property("City") + .IsRequired() + .HasColumnType("text"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); + + b.Property("Country") + .IsRequired() + .HasColumnType("text"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("EmailConfirmed") + .HasColumnType("boolean"); + + b.Property("LastName") + .IsRequired() + .HasColumnType("text"); + + b.Property("LockoutEnabled") + .HasColumnType("boolean"); + + b.Property("LockoutEnd") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("PasswordHash") + .HasColumnType("text"); + + b.Property("PhoneNumber") + .HasColumnType("text"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("boolean"); + + b.Property("SecurityStamp") + .HasColumnType("text"); + + b.Property("State") + .IsRequired() + .HasColumnType("text"); + + b.Property("Street") + .IsRequired() + .HasColumnType("text"); + + b.Property("TwoFactorEnabled") + .HasColumnType("boolean"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("ZipCode") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } +} diff --git a/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.cs b/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.cs new file mode 100644 index 000000000..954adba51 --- /dev/null +++ b/src/Identity.API/Data/Migrations/20261117125859_RemoveSensitiveCardProfileData.cs @@ -0,0 +1,72 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Identity.API.Data.Migrations; + +/// +public partial class _20261117125859_RemoveSensitiveCardProfileData : Migration +{ + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "CardHolderName", + table: "AspNetUsers"); + + migrationBuilder.DropColumn( + name: "CardNumber", + table: "AspNetUsers"); + + migrationBuilder.DropColumn( + name: "CardType", + table: "AspNetUsers"); + + migrationBuilder.DropColumn( + name: "Expiration", + table: "AspNetUsers"); + + migrationBuilder.DropColumn( + name: "SecurityNumber", + table: "AspNetUsers"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "CardHolderName", + table: "AspNetUsers", + type: "text", + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "CardNumber", + table: "AspNetUsers", + type: "text", + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "CardType", + table: "AspNetUsers", + type: "integer", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "Expiration", + table: "AspNetUsers", + type: "text", + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "SecurityNumber", + table: "AspNetUsers", + type: "text", + nullable: false, + defaultValue: ""); + } +} diff --git a/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs index b561123fc..b276aca69 100644 --- a/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Identity.API/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -1,4 +1,4 @@ -// +// using System; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; @@ -8,295 +8,299 @@ #nullable disable -namespace eShop.Identity.API.Data.Migrations +namespace eShop.Identity.API.Data.Migrations; + +[DbContext(typeof(ApplicationDbContext))] +partial class ApplicationDbContextModelSnapshot : ModelSnapshot { - [DbContext(typeof(ApplicationDbContext))] - partial class ApplicationDbContextModelSnapshot : ModelSnapshot + // If you encounter a merge conflict in the line below, it means you need to + // discard one of the migration branches and recreate its migrations on top of + // the other branch. See https://aka.ms/efcore-docs-migrations-conflicts for more info. + public override string LastMigrationId => "20261117125859_RemoveSensitiveCardProfileData"; + + protected override void BuildModel(ModelBuilder modelBuilder) { - protected override void BuildModel(ModelBuilder modelBuilder) - { #pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "10.0.5") - .HasAnnotation("Relational:MaxIdentifierLength", 63); + modelBuilder + .HasAnnotation("ProductVersion", "11.0.0-rc.3.26522.148") + .HasAnnotation("Relational:MaxIdentifierLength", 63); - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => - { - b.Property("Id") - .HasColumnType("text"); + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("text"); - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("text"); + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); - b.Property("Name") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); - b.Property("NormalizedName") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("NormalizedName") - .IsUnique() - .HasDatabaseName("RoleNameIndex"); + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); - b.ToTable("AspNetRoles", (string)null); - }); + b.ToTable("AspNetRoles"); + }); - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(id); - b.Property("ClaimType") - .HasColumnType("text"); + b.Property("ClaimType") + .HasColumnType("text"); - b.Property("ClaimValue") - .HasColumnType("text"); + b.Property("ClaimValue") + .HasColumnType("text"); - b.Property("RoleId") - .IsRequired() - .HasColumnType("text"); + b.Property("RoleId") + .IsRequired() + .HasColumnType("text"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("RoleId"); + b.HasIndex("RoleId"); - b.ToTable("AspNetRoleClaims", (string)null); - }); + b.ToTable("AspNetRoleClaims"); + }); - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(id); - b.Property("ClaimType") - .HasColumnType("text"); + b.Property("ClaimType") + .HasColumnType("text"); - b.Property("ClaimValue") - .HasColumnType("text"); + b.Property("ClaimValue") + .HasColumnType("text"); - b.Property("UserId") - .IsRequired() - .HasColumnType("text"); + b.Property("UserId") + .IsRequired() + .HasColumnType("text"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("UserId"); + b.HasIndex("UserId"); - b.ToTable("AspNetUserClaims", (string)null); - }); + b.ToTable("AspNetUserClaims"); + }); - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.Property("LoginProvider") - .HasColumnType("text"); + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("text"); - b.Property("ProviderKey") - .HasColumnType("text"); + b.Property("ProviderKey") + .HasColumnType("text"); - b.Property("ProviderDisplayName") - .HasColumnType("text"); + b.Property("ProviderDisplayName") + .HasColumnType("text"); - b.Property("UserId") - .IsRequired() - .HasColumnType("text"); + b.Property("UserId") + .IsRequired() + .HasColumnType("text"); - b.HasKey("LoginProvider", "ProviderKey"); + b.HasKey("LoginProvider", "ProviderKey"); - b.HasIndex("UserId"); + b.HasIndex("UserId"); - b.ToTable("AspNetUserLogins", (string)null); - }); + b.ToTable("AspNetUserLogins"); + }); - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.Property("UserId") - .HasColumnType("text"); + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("text"); - b.Property("RoleId") - .HasColumnType("text"); + b.Property("RoleId") + .HasColumnType("text"); - b.HasKey("UserId", "RoleId"); + b.HasKey("UserId", "RoleId"); - b.HasIndex("RoleId"); + b.HasIndex("RoleId"); - b.ToTable("AspNetUserRoles", (string)null); - }); + b.ToTable("AspNetUserRoles"); + }); - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.Property("UserId") - .HasColumnType("text"); + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("text"); - b.Property("LoginProvider") - .HasColumnType("text"); + b.Property("LoginProvider") + .HasColumnType("text"); - b.Property("Name") - .HasColumnType("text"); + b.Property("Name") + .HasColumnType("text"); - b.Property("Value") - .HasColumnType("text"); + b.Property("Value") + .HasColumnType("text"); - b.HasKey("UserId", "LoginProvider", "Name"); + b.HasKey("UserId", "LoginProvider", "Name"); - b.ToTable("AspNetUserTokens", (string)null); - }); + b.ToTable("AspNetUserTokens"); + }); - modelBuilder.Entity("eShop.Identity.API.Models.ApplicationUser", b => - { - b.Property("Id") - .HasColumnType("text"); + modelBuilder.Entity("eShop.Identity.API.Models.ApplicationUser", b => + { + b.Property("Id") + .HasColumnType("text"); - b.Property("AccessFailedCount") - .HasColumnType("integer"); + b.Property("AccessFailedCount") + .HasColumnType("integer"); - b.Property("City") - .IsRequired() - .HasColumnType("text"); + b.Property("City") + .IsRequired() + .HasColumnType("text"); - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnType("text"); + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("text"); - b.Property("Country") - .IsRequired() - .HasColumnType("text"); + b.Property("Country") + .IsRequired() + .HasColumnType("text"); - b.Property("Email") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); - b.Property("EmailConfirmed") - .HasColumnType("boolean"); + b.Property("EmailConfirmed") + .HasColumnType("boolean"); - b.Property("LastName") - .IsRequired() - .HasColumnType("text"); + b.Property("LastName") + .IsRequired() + .HasColumnType("text"); - b.Property("LockoutEnabled") - .HasColumnType("boolean"); + b.Property("LockoutEnabled") + .HasColumnType("boolean"); - b.Property("LockoutEnd") - .HasColumnType("timestamp with time zone"); + b.Property("LockoutEnd") + .HasColumnType("timestamp with time zone"); - b.Property("Name") - .IsRequired() - .HasColumnType("text"); + b.Property("Name") + .IsRequired() + .HasColumnType("text"); - b.Property("NormalizedEmail") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); - b.Property("NormalizedUserName") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); - b.Property("PasswordHash") - .HasColumnType("text"); + b.Property("PasswordHash") + .HasColumnType("text"); - b.Property("PhoneNumber") - .HasColumnType("text"); + b.Property("PhoneNumber") + .HasColumnType("text"); - b.Property("PhoneNumberConfirmed") - .HasColumnType("boolean"); + b.Property("PhoneNumberConfirmed") + .HasColumnType("boolean"); - b.Property("SecurityStamp") - .HasColumnType("text"); + b.Property("SecurityStamp") + .HasColumnType("text"); - b.Property("State") - .IsRequired() - .HasColumnType("text"); - - b.Property("Street") - .IsRequired() - .HasColumnType("text"); - - b.Property("TwoFactorEnabled") - .HasColumnType("boolean"); - - b.Property("UserName") - .HasMaxLength(256) - .HasColumnType("character varying(256)"); - - b.Property("ZipCode") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasDatabaseName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .IsUnique() - .HasDatabaseName("UserNameIndex"); - - b.ToTable("AspNetUsers", (string)null); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => - { - b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => - { - b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => - { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + b.Property("State") + .IsRequired() + .HasColumnType("text"); + + b.Property("Street") + .IsRequired() + .HasColumnType("text"); + + b.Property("TwoFactorEnabled") + .HasColumnType("boolean"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("character varying(256)"); + + b.Property("ZipCode") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("eShop.Identity.API.Models.ApplicationUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); #pragma warning restore 612, 618 - } } } diff --git a/src/Identity.API/Identity.API.csproj b/src/Identity.API/Identity.API.csproj index a98007a75..4e961f194 100644 --- a/src/Identity.API/Identity.API.csproj +++ b/src/Identity.API/Identity.API.csproj @@ -16,6 +16,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Ordering.API/Ordering.API.csproj b/src/Ordering.API/Ordering.API.csproj index f37bea499..a9f166a1f 100644 --- a/src/Ordering.API/Ordering.API.csproj +++ b/src/Ordering.API/Ordering.API.csproj @@ -32,6 +32,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + @@ -42,4 +46,4 @@ - \ No newline at end of file + diff --git a/src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.Designer.cs b/src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.Designer.cs deleted file mode 100644 index f6076533d..000000000 --- a/src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.Designer.cs +++ /dev/null @@ -1,291 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; -using eShop.Ordering.Infrastructure; - -#nullable disable - -namespace Ordering.Infrastructure.Migrations -{ - [DbContext(typeof(OrderingContext))] - [Migration("20261117122654_RemoveSensitivePaymentMethodData")] - partial class RemoveSensitivePaymentMethodData - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("ordering") - .HasAnnotation("ProductVersion", "10.0.5") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - - modelBuilder.HasSequence("buyerseq") - .IncrementsBy(10); - - modelBuilder.HasSequence("orderitemseq") - .IncrementsBy(10); - - modelBuilder.HasSequence("orderseq") - .IncrementsBy(10); - - modelBuilder.HasSequence("paymentseq") - .IncrementsBy(10); - - modelBuilder.Entity("eShop.IntegrationEventLogEF.IntegrationEventLogEntry", b => - { - b.Property("EventId") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); - - b.Property("Content") - .IsRequired() - .HasColumnType("text"); - - b.Property("CreationTime") - .HasColumnType("timestamp with time zone"); - - b.Property("EventTypeName") - .IsRequired() - .HasColumnType("text"); - - b.Property("State") - .HasColumnType("integer"); - - b.Property("TimesSent") - .HasColumnType("integer"); - - b.Property("TransactionId") - .HasColumnType("uuid"); - - b.HasKey("EventId"); - - b.ToTable("IntegrationEventLog", "ordering"); - }); - - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "buyerseq"); - - b.Property("IdentityGuid") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("character varying(200)"); - - b.Property("Name") - .HasColumnType("text"); - - b.HasKey("Id"); - - b.HasIndex("IdentityGuid") - .IsUnique(); - - b.ToTable("buyers", "ordering"); - }); - - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "paymentseq"); - - b.Property("BuyerId") - .HasColumnType("integer"); - - b.Property("_alias") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("character varying(200)") - .HasColumnName("Alias"); - - b.Property("_paymentMethodId") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("character varying(200)") - .HasColumnName("PaymentMethodId"); - - b.HasKey("Id"); - - b.HasIndex("BuyerId"); - - b.ToTable("paymentmethods", "ordering"); - }); - - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "orderseq"); - - b.Property("BuyerId") - .HasColumnType("integer"); - - b.Property("Description") - .HasColumnType("text"); - - b.Property("OrderDate") - .HasColumnType("timestamp with time zone"); - - b.Property("OrderStatus") - .IsRequired() - .HasMaxLength(30) - .HasColumnType("character varying(30)"); - - b.Property("PaymentId") - .HasColumnType("integer") - .HasColumnName("PaymentMethodId"); - - b.HasKey("Id"); - - b.HasIndex("BuyerId"); - - b.HasIndex("PaymentId"); - - b.ToTable("orders", "ordering"); - }); - - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "orderitemseq"); - - b.Property("Discount") - .HasColumnType("numeric"); - - b.Property("OrderId") - .HasColumnType("integer"); - - b.Property("PictureUrl") - .HasColumnType("text"); - - b.Property("ProductId") - .HasColumnType("integer"); - - b.Property("ProductName") - .IsRequired() - .HasColumnType("text"); - - b.Property("UnitPrice") - .HasColumnType("numeric"); - - b.Property("Units") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("OrderId"); - - b.ToTable("orderItems", "ordering"); - }); - - modelBuilder.Entity("eShop.Ordering.Infrastructure.Idempotency.ClientRequest", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("Time") - .HasColumnType("timestamp with time zone"); - - b.HasKey("Id"); - - b.ToTable("requests", "ordering"); - }); - - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => - { - b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", null) - .WithMany("PaymentMethods") - .HasForeignKey("BuyerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => - { - b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", "Buyer") - .WithMany() - .HasForeignKey("BuyerId"); - - b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", null) - .WithMany() - .HasForeignKey("PaymentId") - .OnDelete(DeleteBehavior.Restrict); - - b.OwnsOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Address", "Address", b1 => - { - b1.Property("OrderId") - .HasColumnType("integer"); - - b1.Property("City") - .HasColumnType("text"); - - b1.Property("Country") - .HasColumnType("text"); - - b1.Property("State") - .HasColumnType("text"); - - b1.Property("Street") - .HasColumnType("text"); - - b1.Property("ZipCode") - .HasColumnType("text"); - - b1.HasKey("OrderId"); - - b1.ToTable("orders", "ordering"); - - b1.WithOwner() - .HasForeignKey("OrderId"); - }); - - b.Navigation("Address") - .IsRequired(); - - b.Navigation("Buyer"); - }); - - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => - { - b.HasOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", null) - .WithMany("OrderItems") - .HasForeignKey("OrderId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); - - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => - { - b.Navigation("PaymentMethods"); - }); - - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => - { - b.Navigation("OrderItems"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.cs b/src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.cs deleted file mode 100644 index 248ac7230..000000000 --- a/src/Ordering.Infrastructure/Migrations/20261117122654_RemoveSensitivePaymentMethodData.cs +++ /dev/null @@ -1,133 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace Ordering.Infrastructure.Migrations -{ - /// - public partial class RemoveSensitivePaymentMethodData : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_paymentmethods_cardtypes_CardTypeId", - schema: "ordering", - table: "paymentmethods"); - - migrationBuilder.DropTable( - name: "cardtypes", - schema: "ordering"); - - migrationBuilder.DropIndex( - name: "IX_paymentmethods_CardTypeId", - schema: "ordering", - table: "paymentmethods"); - - migrationBuilder.DropColumn( - name: "CardNumber", - schema: "ordering", - table: "paymentmethods"); - - migrationBuilder.DropColumn( - name: "CardTypeId", - schema: "ordering", - table: "paymentmethods"); - - migrationBuilder.DropColumn( - name: "Expiration", - schema: "ordering", - table: "paymentmethods"); - - migrationBuilder.DropColumn( - name: "CardHolderName", - schema: "ordering", - table: "paymentmethods"); - - migrationBuilder.AddColumn( - name: "PaymentMethodId", - schema: "ordering", - table: "paymentmethods", - type: "character varying(200)", - maxLength: 200, - nullable: false, - defaultValue: ""); - - migrationBuilder.Sql("UPDATE ordering.paymentmethods SET \"PaymentMethodId\" = 'legacy-' || \"Id\"::text"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropColumn( - name: "PaymentMethodId", - schema: "ordering", - table: "paymentmethods"); - - migrationBuilder.AddColumn( - name: "CardHolderName", - schema: "ordering", - table: "paymentmethods", - type: "character varying(200)", - maxLength: 200, - nullable: false, - defaultValue: ""); - - migrationBuilder.AddColumn( - name: "CardNumber", - schema: "ordering", - table: "paymentmethods", - type: "character varying(25)", - maxLength: 25, - nullable: false, - defaultValue: ""); - - migrationBuilder.AddColumn( - name: "CardTypeId", - schema: "ordering", - table: "paymentmethods", - type: "integer", - nullable: false, - defaultValue: 0); - - migrationBuilder.AddColumn( - name: "Expiration", - schema: "ordering", - table: "paymentmethods", - type: "timestamp with time zone", - maxLength: 25, - nullable: false, - defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); - - migrationBuilder.CreateTable( - name: "cardtypes", - schema: "ordering", - columns: table => new - { - Id = table.Column(type: "integer", nullable: false), - Name = table.Column(type: "character varying(200)", maxLength: 200, nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_cardtypes", x => x.Id); - }); - - migrationBuilder.CreateIndex( - name: "IX_paymentmethods_CardTypeId", - schema: "ordering", - table: "paymentmethods", - column: "CardTypeId"); - - migrationBuilder.AddForeignKey( - name: "FK_paymentmethods_cardtypes_CardTypeId", - schema: "ordering", - table: "paymentmethods", - column: "CardTypeId", - principalSchema: "ordering", - principalTable: "cardtypes", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - } - } -} diff --git a/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.Designer.cs b/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.Designer.cs new file mode 100644 index 000000000..414436856 --- /dev/null +++ b/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.Designer.cs @@ -0,0 +1,290 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using eShop.Ordering.Infrastructure; + +#nullable disable + +namespace Ordering.Infrastructure.Migrations; + +[DbContext(typeof(OrderingContext))] +[Migration("20261117125854_RemoveSensitivePaymentMethodData")] +partial class _20261117125854_RemoveSensitivePaymentMethodData +{ + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasDefaultSchema("ordering") + .HasAnnotation("ProductVersion", "11.0.0-rc.3.26522.148") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.HasSequence("buyerseq") + .IncrementsBy(10); + + modelBuilder.HasSequence("orderitemseq") + .IncrementsBy(10); + + modelBuilder.HasSequence("orderseq") + .IncrementsBy(10); + + modelBuilder.HasSequence("paymentseq") + .IncrementsBy(10); + + modelBuilder.Entity("eShop.IntegrationEventLogEF.IntegrationEventLogEntry", b => + { + b.Property("EventId") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Content") + .IsRequired() + .HasColumnType("text"); + + b.Property("CreationTime") + .HasColumnType("timestamp with time zone"); + + b.Property("EventTypeName") + .IsRequired() + .HasColumnType("text"); + + b.Property("State") + .HasColumnType("integer"); + + b.Property("TimesSent") + .HasColumnType("integer"); + + b.Property("TransactionId") + .HasColumnType("uuid"); + + b.HasKey("EventId"); + + b.ToTable("IntegrationEventLog", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "buyerseq"); + + b.Property("IdentityGuid") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("Name") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("IdentityGuid") + .IsUnique(); + + b.ToTable("buyers", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "paymentseq"); + + b.Property("BuyerId") + .HasColumnType("integer"); + + b.Property("_alias") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)") + .HasColumnName("Alias"); + + b.Property("_paymentMethodId") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)") + .HasColumnName("PaymentMethodId"); + + b.HasKey("Id"); + + b.HasIndex("BuyerId"); + + b.ToTable("paymentmethods", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "orderseq"); + + b.Property("BuyerId") + .HasColumnType("integer"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("OrderDate") + .HasColumnType("timestamp with time zone"); + + b.Property("OrderStatus") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("character varying(30)"); + + b.Property("PaymentId") + .HasColumnType("integer") + .HasColumnName("PaymentMethodId"); + + b.HasKey("Id"); + + b.HasIndex("BuyerId"); + + b.HasIndex("PaymentId"); + + b.ToTable("orders", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "orderitemseq"); + + b.Property("Discount") + .HasColumnType("numeric"); + + b.Property("OrderId") + .HasColumnType("integer"); + + b.Property("PictureUrl") + .HasColumnType("text"); + + b.Property("ProductId") + .HasColumnType("integer"); + + b.Property("ProductName") + .IsRequired() + .HasColumnType("text"); + + b.Property("UnitPrice") + .HasColumnType("numeric"); + + b.Property("Units") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("OrderId"); + + b.ToTable("orderItems", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Infrastructure.Idempotency.ClientRequest", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("Time") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.ToTable("requests", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", null) + .WithMany("PaymentMethods") + .HasForeignKey("BuyerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", "Buyer") + .WithMany() + .HasForeignKey("BuyerId"); + + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", null) + .WithMany() + .HasForeignKey("PaymentId") + .OnDelete(DeleteBehavior.Restrict); + + b.OwnsOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Address", "Address", b1 => + { + b1.Property("OrderId") + .HasColumnType("integer"); + + b1.Property("City") + .HasColumnType("text"); + + b1.Property("Country") + .HasColumnType("text"); + + b1.Property("State") + .HasColumnType("text"); + + b1.Property("Street") + .HasColumnType("text"); + + b1.Property("ZipCode") + .HasColumnType("text"); + + b1.HasKey("OrderId"); + + b1.ToTable("orders", "ordering"); + + b1.WithOwner() + .HasForeignKey("OrderId"); + }); + + b.Navigation("Address") + .IsRequired(); + + b.Navigation("Buyer"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", null) + .WithMany("OrderItems") + .HasForeignKey("OrderId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => + { + b.Navigation("PaymentMethods"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + b.Navigation("OrderItems"); + }); +#pragma warning restore 612, 618 + } +} diff --git a/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.cs b/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.cs new file mode 100644 index 000000000..246aafb16 --- /dev/null +++ b/src/Ordering.Infrastructure/Migrations/20261117125854_RemoveSensitivePaymentMethodData.cs @@ -0,0 +1,154 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Ordering.Infrastructure.Migrations; + +/// +public partial class _20261117125854_RemoveSensitivePaymentMethodData : Migration +{ + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_paymentmethods_cardtypes_CardTypeId", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.DropTable( + name: "cardtypes", + schema: "ordering"); + + migrationBuilder.DropIndex( + name: "IX_paymentmethods_CardTypeId", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.DropColumn( + name: "CardNumber", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.DropColumn( + name: "CardTypeId", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.DropColumn( + name: "Expiration", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.DropColumn( + name: "CardHolderName", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.AddColumn( + name: "PaymentMethodId", + schema: "ordering", + table: "paymentmethods", + type: "character varying(200)", + maxLength: 200, + nullable: true); + + migrationBuilder.Sql("UPDATE ordering.paymentmethods SET \"PaymentMethodId\" = 'legacy-' || \"Id\"::text"); + + migrationBuilder.AlterColumn( + name: "PaymentMethodId", + schema: "ordering", + table: "paymentmethods", + type: "character varying(200)", + maxLength: 200, + nullable: false, + oldClrType: typeof(string), + oldType: "character varying(200)", + oldMaxLength: 200, + oldNullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "PaymentMethodId", + schema: "ordering", + table: "paymentmethods"); + + migrationBuilder.AddColumn( + name: "CardHolderName", + schema: "ordering", + table: "paymentmethods", + type: "character varying(200)", + maxLength: 200, + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "CardNumber", + schema: "ordering", + table: "paymentmethods", + type: "character varying(25)", + maxLength: 25, + nullable: false, + defaultValue: ""); + + migrationBuilder.AddColumn( + name: "CardTypeId", + schema: "ordering", + table: "paymentmethods", + type: "integer", + nullable: false, + defaultValue: 1); + + migrationBuilder.AddColumn( + name: "Expiration", + schema: "ordering", + table: "paymentmethods", + type: "timestamp with time zone", + maxLength: 25, + nullable: false, + defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); + + migrationBuilder.CreateTable( + name: "cardtypes", + schema: "ordering", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false), + Name = table.Column(type: "character varying(200)", maxLength: 200, nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_cardtypes", x => x.Id); + }); + + migrationBuilder.InsertData( + schema: "ordering", + table: "cardtypes", + columns: new[] { "Id", "Name" }, + values: new object[,] + { + { 1, "Amex" }, + { 2, "Visa" }, + { 3, "MasterCard" } + }); + + migrationBuilder.CreateIndex( + name: "IX_paymentmethods_CardTypeId", + schema: "ordering", + table: "paymentmethods", + column: "CardTypeId"); + + migrationBuilder.AddForeignKey( + name: "FK_paymentmethods_cardtypes_CardTypeId", + schema: "ordering", + table: "paymentmethods", + column: "CardTypeId", + principalSchema: "ordering", + principalTable: "cardtypes", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + } +} diff --git a/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs b/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs index 22272278f..62c9bb497 100644 --- a/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs +++ b/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs @@ -1,4 +1,4 @@ -// +// using System; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; @@ -8,281 +8,285 @@ #nullable disable -namespace Ordering.Infrastructure.Migrations +namespace Ordering.Infrastructure.Migrations; + +[DbContext(typeof(OrderingContext))] +partial class OrderingContextModelSnapshot : ModelSnapshot { - [DbContext(typeof(OrderingContext))] - partial class OrderingContextModelSnapshot : ModelSnapshot + // If you encounter a merge conflict in the line below, it means you need to + // discard one of the migration branches and recreate its migrations on top of + // the other branch. See https://aka.ms/efcore-docs-migrations-conflicts for more info. + public override string LastMigrationId => "20261117125854_RemoveSensitivePaymentMethodData"; + + protected override void BuildModel(ModelBuilder modelBuilder) { - protected override void BuildModel(ModelBuilder modelBuilder) - { #pragma warning disable 612, 618 - modelBuilder - .HasDefaultSchema("ordering") - .HasAnnotation("ProductVersion", "10.0.5") - .HasAnnotation("Relational:MaxIdentifierLength", 63); + modelBuilder + .HasDefaultSchema("ordering") + .HasAnnotation("ProductVersion", "11.0.0-rc.3.26522.148") + .HasAnnotation("Relational:MaxIdentifierLength", 63); - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.HasSequence("buyerseq") - .IncrementsBy(10); + modelBuilder.HasSequence("buyerseq") + .IncrementsBy(10); - modelBuilder.HasSequence("orderitemseq") - .IncrementsBy(10); + modelBuilder.HasSequence("orderitemseq") + .IncrementsBy(10); - modelBuilder.HasSequence("orderseq") - .IncrementsBy(10); + modelBuilder.HasSequence("orderseq") + .IncrementsBy(10); - modelBuilder.HasSequence("paymentseq") - .IncrementsBy(10); + modelBuilder.HasSequence("paymentseq") + .IncrementsBy(10); - modelBuilder.Entity("eShop.IntegrationEventLogEF.IntegrationEventLogEntry", b => - { - b.Property("EventId") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); + modelBuilder.Entity("eShop.IntegrationEventLogEF.IntegrationEventLogEntry", b => + { + b.Property("EventId") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); - b.Property("Content") - .IsRequired() - .HasColumnType("text"); + b.Property("Content") + .IsRequired() + .HasColumnType("text"); - b.Property("CreationTime") - .HasColumnType("timestamp with time zone"); + b.Property("CreationTime") + .HasColumnType("timestamp with time zone"); - b.Property("EventTypeName") - .IsRequired() - .HasColumnType("text"); + b.Property("EventTypeName") + .IsRequired() + .HasColumnType("text"); - b.Property("State") - .HasColumnType("integer"); + b.Property("State") + .HasColumnType("integer"); - b.Property("TimesSent") - .HasColumnType("integer"); + b.Property("TimesSent") + .HasColumnType("integer"); - b.Property("TransactionId") - .HasColumnType("uuid"); + b.Property("TransactionId") + .HasColumnType("uuid"); - b.HasKey("EventId"); + b.HasKey("EventId"); - b.ToTable("IntegrationEventLog", "ordering"); - }); + b.ToTable("IntegrationEventLog", "ordering"); + }); - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); - NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "buyerseq"); + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "buyerseq"); - b.Property("IdentityGuid") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("character varying(200)"); + b.Property("IdentityGuid") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)"); - b.Property("Name") - .HasColumnType("text"); + b.Property("Name") + .HasColumnType("text"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("IdentityGuid") - .IsUnique(); + b.HasIndex("IdentityGuid") + .IsUnique(); - b.ToTable("buyers", "ordering"); - }); + b.ToTable("buyers", "ordering"); + }); - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); - NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "paymentseq"); + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "paymentseq"); - b.Property("BuyerId") - .HasColumnType("integer"); + b.Property("BuyerId") + .HasColumnType("integer"); - b.Property("_alias") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("character varying(200)") - .HasColumnName("Alias"); + b.Property("_alias") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)") + .HasColumnName("Alias"); - b.Property("_paymentMethodId") - .IsRequired() - .HasMaxLength(200) - .HasColumnType("character varying(200)") - .HasColumnName("PaymentMethodId"); + b.Property("_paymentMethodId") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)") + .HasColumnName("PaymentMethodId"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("BuyerId"); + b.HasIndex("BuyerId"); - b.ToTable("paymentmethods", "ordering"); - }); + b.ToTable("paymentmethods", "ordering"); + }); - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); - NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "orderseq"); + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "orderseq"); - b.Property("BuyerId") - .HasColumnType("integer"); + b.Property("BuyerId") + .HasColumnType("integer"); - b.Property("Description") - .HasColumnType("text"); + b.Property("Description") + .HasColumnType("text"); - b.Property("OrderDate") - .HasColumnType("timestamp with time zone"); + b.Property("OrderDate") + .HasColumnType("timestamp with time zone"); - b.Property("OrderStatus") - .IsRequired() - .HasMaxLength(30) - .HasColumnType("character varying(30)"); + b.Property("OrderStatus") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("character varying(30)"); - b.Property("PaymentId") - .HasColumnType("integer") - .HasColumnName("PaymentMethodId"); + b.Property("PaymentId") + .HasColumnType("integer") + .HasColumnName("PaymentMethodId"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("BuyerId"); + b.HasIndex("BuyerId"); - b.HasIndex("PaymentId"); + b.HasIndex("PaymentId"); - b.ToTable("orders", "ordering"); - }); + b.ToTable("orders", "ordering"); + }); - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); - NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property("Id"), "orderitemseq"); + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "orderitemseq"); - b.Property("Discount") - .HasColumnType("numeric"); + b.Property("Discount") + .HasColumnType("numeric"); - b.Property("OrderId") - .HasColumnType("integer"); + b.Property("OrderId") + .HasColumnType("integer"); - b.Property("PictureUrl") - .HasColumnType("text"); + b.Property("PictureUrl") + .HasColumnType("text"); - b.Property("ProductId") - .HasColumnType("integer"); + b.Property("ProductId") + .HasColumnType("integer"); - b.Property("ProductName") - .IsRequired() - .HasColumnType("text"); + b.Property("ProductName") + .IsRequired() + .HasColumnType("text"); - b.Property("UnitPrice") - .HasColumnType("numeric"); + b.Property("UnitPrice") + .HasColumnType("numeric"); - b.Property("Units") - .HasColumnType("integer"); + b.Property("Units") + .HasColumnType("integer"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("OrderId"); + b.HasIndex("OrderId"); - b.ToTable("orderItems", "ordering"); - }); + b.ToTable("orderItems", "ordering"); + }); - modelBuilder.Entity("eShop.Ordering.Infrastructure.Idempotency.ClientRequest", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("uuid"); + modelBuilder.Entity("eShop.Ordering.Infrastructure.Idempotency.ClientRequest", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); - b.Property("Name") - .IsRequired() - .HasColumnType("text"); + b.Property("Name") + .IsRequired() + .HasColumnType("text"); - b.Property("Time") - .HasColumnType("timestamp with time zone"); + b.Property("Time") + .HasColumnType("timestamp with time zone"); - b.HasKey("Id"); + b.HasKey("Id"); - b.ToTable("requests", "ordering"); - }); + b.ToTable("requests", "ordering"); + }); - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => - { - b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", null) - .WithMany("PaymentMethods") - .HasForeignKey("BuyerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", null) + .WithMany("PaymentMethods") + .HasForeignKey("BuyerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => - { - b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", "Buyer") - .WithMany() - .HasForeignKey("BuyerId"); + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", "Buyer") + .WithMany() + .HasForeignKey("BuyerId"); - b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", null) - .WithMany() - .HasForeignKey("PaymentId") - .OnDelete(DeleteBehavior.Restrict); + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", null) + .WithMany() + .HasForeignKey("PaymentId") + .OnDelete(DeleteBehavior.Restrict); - b.OwnsOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Address", "Address", b1 => - { - b1.Property("OrderId") - .HasColumnType("integer"); + b.OwnsOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Address", "Address", b1 => + { + b1.Property("OrderId") + .HasColumnType("integer"); - b1.Property("City") - .HasColumnType("text"); + b1.Property("City") + .HasColumnType("text"); - b1.Property("Country") - .HasColumnType("text"); + b1.Property("Country") + .HasColumnType("text"); - b1.Property("State") - .HasColumnType("text"); + b1.Property("State") + .HasColumnType("text"); - b1.Property("Street") - .HasColumnType("text"); + b1.Property("Street") + .HasColumnType("text"); - b1.Property("ZipCode") - .HasColumnType("text"); + b1.Property("ZipCode") + .HasColumnType("text"); - b1.HasKey("OrderId"); + b1.HasKey("OrderId"); - b1.ToTable("orders", "ordering"); + b1.ToTable("orders", "ordering"); - b1.WithOwner() - .HasForeignKey("OrderId"); - }); + b1.WithOwner() + .HasForeignKey("OrderId"); + }); - b.Navigation("Address") - .IsRequired(); + b.Navigation("Address") + .IsRequired(); - b.Navigation("Buyer"); - }); + b.Navigation("Buyer"); + }); - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => - { - b.HasOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", null) - .WithMany("OrderItems") - .HasForeignKey("OrderId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - }); + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", null) + .WithMany("OrderItems") + .HasForeignKey("OrderId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => - { - b.Navigation("PaymentMethods"); - }); + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => + { + b.Navigation("PaymentMethods"); + }); - modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => - { - b.Navigation("OrderItems"); - }); + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + b.Navigation("OrderItems"); + }); #pragma warning restore 612, 618 - } } } diff --git a/tests/Ordering.UnitTests/Application/OrdersWebApiTest.cs b/tests/Ordering.UnitTests/Application/OrdersWebApiTest.cs index 4b76983fe..47c061c66 100644 --- a/tests/Ordering.UnitTests/Application/OrdersWebApiTest.cs +++ b/tests/Ordering.UnitTests/Application/OrdersWebApiTest.cs @@ -138,7 +138,6 @@ public async Task Get_order_fails() Assert.IsInstanceOfType(result.Result); } - [TestMethod] [TestMethod] public async Task Cancel_order_returns_problem_when_command_fails() { diff --git a/tests/Ordering.UnitTests/Builders.cs b/tests/Ordering.UnitTests/Builders.cs index c0690339a..daccb1a9b 100644 --- a/tests/Ordering.UnitTests/Builders.cs +++ b/tests/Ordering.UnitTests/Builders.cs @@ -20,7 +20,7 @@ public OrderBuilder(Address address) "userId", "fakeName", address, - paymentMethodId: "pm_test_123"); + paymentProviderToken: "pm_test_123"); } public OrderBuilder AddOne( From cc0088aef35fa3dd10df4b4cb24f4c15eb0acffc Mon Sep 17 00:00:00 2001 From: Soumilgit Date: Tue, 17 Nov 2026 18:46:52 +0530 Subject: [PATCH 4/4] Use PaymentToken name consistently --- src/ClientApp/Models/Orders/Order.cs | 4 +- src/ClientApp/Models/Orders/OrderCheckout.cs | 2 +- .../Services/Order/OrderMockService.cs | 12 +- src/ClientApp/Services/Order/OrderService.cs | 2 +- src/ClientApp/ViewModels/CheckoutViewModel.cs | 2 +- src/Ordering.API/Apis/OrdersApi.cs | 4 +- .../Commands/CreateOrderCommand.cs | 6 +- .../Commands/CreateOrderCommandHandler.cs | 2 +- ...egateWhenOrderStartedDomainEventHandler.cs | 2 +- .../CreateOrderCommandValidator.cs | 2 +- .../AggregatesModel/BuyerAggregate/Buyer.cs | 6 +- .../BuyerAggregate/PaymentMethod.cs | 10 +- .../AggregatesModel/OrderAggregate/Order.cs | 8 +- .../Events/OrderStartedDomainEvent.cs | 2 +- .../PaymentMethodEntityTypeConfiguration.cs | 4 +- ...RenamePaymentMethodTokenColumn.Designer.cs | 290 ++++++++++++++++++ ...17131357_RenamePaymentMethodTokenColumn.cs | 29 ++ .../OrderingContextModelSnapshot.cs | 6 +- src/WebApp/Services/BasketCheckoutInfo.cs | 2 +- src/WebApp/Services/BasketState.cs | 4 +- .../IdentifiedCommandHandlerTest.cs | 2 +- .../Application/NewOrderCommandHandlerTest.cs | 2 +- tests/Ordering.UnitTests/Builders.cs | 2 +- .../Domain/BuyerAggregateTest.cs | 22 +- .../Domain/OrderAggregateTest.cs | 16 +- 25 files changed, 381 insertions(+), 62 deletions(-) create mode 100644 src/Ordering.Infrastructure/Migrations/20261117131357_RenamePaymentMethodTokenColumn.Designer.cs create mode 100644 src/Ordering.Infrastructure/Migrations/20261117131357_RenamePaymentMethodTokenColumn.cs diff --git a/src/ClientApp/Models/Orders/Order.cs b/src/ClientApp/Models/Orders/Order.cs index 7e49b9741..548a4ea99 100644 --- a/src/ClientApp/Models/Orders/Order.cs +++ b/src/ClientApp/Models/Orders/Order.cs @@ -32,8 +32,8 @@ public Order() [JsonPropertyName("zipCode")] public string ShippingZipCode { get; set; } - [JsonPropertyName("paymentMethodId")] - public string PaymentMethodId { get; set; } + [JsonPropertyName("paymentToken")] + public string PaymentToken { get; set; } [JsonPropertyName("items")] public List OrderItems { get; set; } diff --git a/src/ClientApp/Models/Orders/OrderCheckout.cs b/src/ClientApp/Models/Orders/OrderCheckout.cs index 44408dd55..ba6130939 100644 --- a/src/ClientApp/Models/Orders/OrderCheckout.cs +++ b/src/ClientApp/Models/Orders/OrderCheckout.cs @@ -16,7 +16,7 @@ public class OrderCheckout public string ZipCode { get; set; } [Required] - public string PaymentMethodId { get; set; } + public string PaymentToken { get; set; } public string Buyer { get; set; } diff --git a/src/ClientApp/Services/Order/OrderMockService.cs b/src/ClientApp/Services/Order/OrderMockService.cs index bdc47257d..4a8f41247 100644 --- a/src/ClientApp/Services/Order/OrderMockService.cs +++ b/src/ClientApp/Services/Order/OrderMockService.cs @@ -5,7 +5,7 @@ namespace eShop.ClientApp.Services.Order; public class OrderMockService : IOrderService { - private const string MockPaymentMethodId = "pm_mock_mobile"; + private const string MockPaymentToken = "pm_mock_mobile"; private static readonly Address MockAdress = new() { @@ -47,7 +47,7 @@ public class OrderMockService : IOrderService private static readonly OrderCheckout MockOrderCheckout = new() { - PaymentMethodId = MockPaymentMethodId, + PaymentToken = MockPaymentToken, City = "FakeCity", Country = "FakeCountry", ZipCode = "FakeZipCode", @@ -63,7 +63,7 @@ public class OrderMockService : IOrderService OrderDate = DateTime.Now, OrderStatus = "Submitted", OrderItems = MockOrderItems, - PaymentMethodId = MockPaymentMethodId, + PaymentToken = MockPaymentToken, ShippingCity = MockAdress.City, ShippingState = MockAdress.State, ShippingCountry = MockAdress.Country, @@ -77,7 +77,7 @@ public class OrderMockService : IOrderService OrderDate = DateTime.Now, OrderStatus = "Paid", OrderItems = MockOrderItems, - PaymentMethodId = MockPaymentMethodId, + PaymentToken = MockPaymentToken, ShippingCity = MockAdress.City, ShippingState = MockAdress.State, ShippingCountry = MockAdress.Country, @@ -91,7 +91,7 @@ public class OrderMockService : IOrderService OrderDate = DateTime.Now, OrderStatus = "Cancelled", OrderItems = MockOrderItems, - PaymentMethodId = MockPaymentMethodId, + PaymentToken = MockPaymentToken, ShippingCity = MockAdress.City, ShippingState = MockAdress.State, ShippingCountry = MockAdress.Country, @@ -105,7 +105,7 @@ public class OrderMockService : IOrderService OrderDate = DateTime.Now, OrderStatus = "Shipped", OrderItems = MockOrderItems, - PaymentMethodId = MockPaymentMethodId, + PaymentToken = MockPaymentToken, ShippingCity = MockAdress.City, ShippingState = MockAdress.State, ShippingCountry = MockAdress.Country, diff --git a/src/ClientApp/Services/Order/OrderService.cs b/src/ClientApp/Services/Order/OrderService.cs index 627dbfadd..0fc34f850 100644 --- a/src/ClientApp/Services/Order/OrderService.cs +++ b/src/ClientApp/Services/Order/OrderService.cs @@ -113,7 +113,7 @@ public OrderCheckout MapOrderToBasket(Models.Orders.Order order) { return new OrderCheckout { - PaymentMethodId = order.PaymentMethodId, + PaymentToken = order.PaymentToken, City = order.ShippingCity, State = order.ShippingState, Country = order.ShippingCountry, diff --git a/src/ClientApp/ViewModels/CheckoutViewModel.cs b/src/ClientApp/ViewModels/CheckoutViewModel.cs index f005541a5..9a8cde642 100644 --- a/src/ClientApp/ViewModels/CheckoutViewModel.cs +++ b/src/ClientApp/ViewModels/CheckoutViewModel.cs @@ -67,7 +67,7 @@ await IsBusyFor( OrderItems = orderItems, OrderStatus = "Submitted", OrderDate = DateTime.Now, - PaymentMethodId = "pm_sample_mobile", + PaymentToken = "pm_sample_mobile", ShippingState = ShippingAddress.State, ShippingCountry = ShippingAddress.Country, ShippingStreet = ShippingAddress.Street, diff --git a/src/Ordering.API/Apis/OrdersApi.cs b/src/Ordering.API/Apis/OrdersApi.cs index 27d493d31..b164b950a 100644 --- a/src/Ordering.API/Apis/OrdersApi.cs +++ b/src/Ordering.API/Apis/OrdersApi.cs @@ -131,7 +131,7 @@ public static async Task>> CreateOrderAsync( { var createOrderCommand = new CreateOrderCommand(request.Items, request.UserId, request.UserName, request.City, request.Street, request.State, request.Country, request.ZipCode, - request.PaymentMethodId); + request.PaymentToken); var requestCreateOrder = new IdentifiedCommand(createOrderCommand, requestId); @@ -166,6 +166,6 @@ public record CreateOrderRequest( string State, string Country, string ZipCode, - string PaymentMethodId, + string PaymentToken, string Buyer, List Items); diff --git a/src/Ordering.API/Application/Commands/CreateOrderCommand.cs b/src/Ordering.API/Application/Commands/CreateOrderCommand.cs index c2d4e4e7a..3c95e9638 100644 --- a/src/Ordering.API/Application/Commands/CreateOrderCommand.cs +++ b/src/Ordering.API/Application/Commands/CreateOrderCommand.cs @@ -41,7 +41,7 @@ public class CreateOrderCommand public string ZipCode { get; private set; } [DataMember] - public string PaymentMethodId { get; private set; } + public string PaymentToken { get; private set; } [DataMember] public IEnumerable OrderItems => _orderItems; @@ -52,7 +52,7 @@ public CreateOrderCommand() } public CreateOrderCommand(List basketItems, string userId, string userName, string city, string street, string state, string country, string zipcode, - string paymentMethodId) + string paymentToken) { _orderItems = basketItems.ToOrderItemsDTO().ToList(); UserId = userId; @@ -62,7 +62,7 @@ public CreateOrderCommand(List basketItems, string userId, string us State = state; Country = country; ZipCode = zipcode; - PaymentMethodId = paymentMethodId; + PaymentToken = paymentToken; } } diff --git a/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs b/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs index 6d9a5071c..d3659ebd3 100644 --- a/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs +++ b/src/Ordering.API/Application/Commands/CreateOrderCommandHandler.cs @@ -37,7 +37,7 @@ public async Task Handle(CreateOrderCommand message, CancellationToken can // methods and constructor so validations, invariants and business logic // make sure that consistency is preserved across the whole aggregate var address = new Address(message.Street, message.City, message.State, message.Country, message.ZipCode); - var order = new Order(message.UserId, message.UserName, address, message.PaymentMethodId); + var order = new Order(message.UserId, message.UserName, address, message.PaymentToken); foreach (var item in message.OrderItems) { diff --git a/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs b/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs index 3f090cd07..4552a6ca0 100644 --- a/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs +++ b/src/Ordering.API/Application/DomainEventHandlers/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs @@ -31,7 +31,7 @@ public async Task Handle(OrderStartedDomainEvent domainEvent, CancellationToken // works by coincidence. If we remove HiLo or if anything decides to yield earlier, it will break. buyer.VerifyOrAddPaymentMethod($"Payment Method on {DateTime.UtcNow}", - domainEvent.PaymentProviderToken, + domainEvent.PaymentToken, domainEvent.Order.Id); if (!buyerExisted) diff --git a/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs b/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs index d9ff190ba..af83d7a98 100644 --- a/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs +++ b/src/Ordering.API/Application/Validations/CreateOrderCommandValidator.cs @@ -8,7 +8,7 @@ public CreateOrderCommandValidator(ILogger logger) RuleFor(command => command.State).NotEmpty(); RuleFor(command => command.Country).NotEmpty(); RuleFor(command => command.ZipCode).NotEmpty(); - RuleFor(command => command.PaymentMethodId).NotEmpty().MaximumLength(200); + RuleFor(command => command.PaymentToken).NotEmpty().MaximumLength(200); RuleFor(command => command.OrderItems).Must(ContainOrderItems).WithMessage("No order items found"); if (logger.IsEnabled(LogLevel.Trace)) diff --git a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs index 3bca5641d..2d1d017eb 100644 --- a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs +++ b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs @@ -26,10 +26,10 @@ public Buyer(string identity, string name) : this() Name = !string.IsNullOrWhiteSpace(name) ? name : throw new ArgumentNullException(nameof(name)); } - public PaymentMethod VerifyOrAddPaymentMethod(string alias, string paymentMethodId, int orderId) + public PaymentMethod VerifyOrAddPaymentMethod(string alias, string paymentToken, int orderId) { var existingPayment = _paymentMethods - .SingleOrDefault(p => p.IsEqualTo(paymentMethodId)); + .SingleOrDefault(p => p.IsEqualTo(paymentToken)); if (existingPayment != null) { @@ -38,7 +38,7 @@ public PaymentMethod VerifyOrAddPaymentMethod(string alias, string paymentMethod return existingPayment; } - var payment = new PaymentMethod(alias, paymentMethodId); + var payment = new PaymentMethod(alias, paymentToken); _paymentMethods.Add(payment); diff --git a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs index fcd20f60e..32c43f338 100644 --- a/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs +++ b/src/Ordering.Domain/AggregatesModel/BuyerAggregate/PaymentMethod.cs @@ -7,18 +7,18 @@ public class PaymentMethod : Entity [Required] private string _alias; [Required] - private string _paymentMethodId; + private string _paymentToken; protected PaymentMethod() { } - public PaymentMethod(string alias, string paymentMethodId) + public PaymentMethod(string alias, string paymentToken) { _alias = alias; - _paymentMethodId = !string.IsNullOrWhiteSpace(paymentMethodId) ? paymentMethodId : throw new OrderingDomainException(nameof(paymentMethodId)); + _paymentToken = !string.IsNullOrWhiteSpace(paymentToken) ? paymentToken : throw new OrderingDomainException(nameof(paymentToken)); } - public bool IsEqualTo(string paymentMethodId) + public bool IsEqualTo(string paymentToken) { - return _paymentMethodId == paymentMethodId; + return _paymentToken == paymentToken; } } diff --git a/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs b/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs index 8e18e642c..3948d9094 100644 --- a/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs +++ b/src/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs @@ -49,7 +49,7 @@ protected Order() _isDraft = false; } - public Order(string userId, string userName, Address address, string paymentProviderToken, int? buyerId = null, int? paymentMethodId = null) : this() + public Order(string userId, string userName, Address address, string paymentToken, int? buyerId = null, int? paymentMethodId = null) : this() { BuyerId = buyerId; PaymentId = paymentMethodId; @@ -59,7 +59,7 @@ public Order(string userId, string userName, Address address, string paymentProv // Add the OrderStarterDomainEvent to the domain events collection // to be raised/dispatched when committing changes into the Database [ After DbContext.SaveChanges() ] - AddOrderStartedDomainEvent(userId, userName, paymentProviderToken); + AddOrderStartedDomainEvent(userId, userName, paymentToken); } // DDD Patterns comment @@ -165,9 +165,9 @@ public void SetCancelledStatusWhenStockIsRejected(IEnumerable orderStockRej } } - private void AddOrderStartedDomainEvent(string userId, string userName, string paymentProviderToken) + private void AddOrderStartedDomainEvent(string userId, string userName, string paymentToken) { - var orderStartedDomainEvent = new OrderStartedDomainEvent(this, userId, userName, paymentProviderToken); + var orderStartedDomainEvent = new OrderStartedDomainEvent(this, userId, userName, paymentToken); this.AddDomainEvent(orderStartedDomainEvent); } diff --git a/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs b/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs index 7e471e786..a1397b3db 100644 --- a/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs +++ b/src/Ordering.Domain/Events/OrderStartedDomainEvent.cs @@ -8,4 +8,4 @@ public record class OrderStartedDomainEvent( Order Order, string UserId, string UserName, - string PaymentProviderToken) : INotification; + string PaymentToken) : INotification; diff --git a/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs b/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs index a4729a456..1acc05f1e 100644 --- a/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs +++ b/src/Ordering.Infrastructure/EntityConfigurations/PaymentMethodEntityTypeConfiguration.cs @@ -20,8 +20,8 @@ public void Configure(EntityTypeBuilder paymentConfiguration) .HasMaxLength(200); paymentConfiguration - .Property("_paymentMethodId") - .HasColumnName("PaymentMethodId") + .Property("_paymentToken") + .HasColumnName("PaymentToken") .HasMaxLength(200) .IsRequired(); } diff --git a/src/Ordering.Infrastructure/Migrations/20261117131357_RenamePaymentMethodTokenColumn.Designer.cs b/src/Ordering.Infrastructure/Migrations/20261117131357_RenamePaymentMethodTokenColumn.Designer.cs new file mode 100644 index 000000000..c91005f28 --- /dev/null +++ b/src/Ordering.Infrastructure/Migrations/20261117131357_RenamePaymentMethodTokenColumn.Designer.cs @@ -0,0 +1,290 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using eShop.Ordering.Infrastructure; + +#nullable disable + +namespace Ordering.Infrastructure.Migrations; + +[DbContext(typeof(OrderingContext))] +[Migration("20261117131357_RenamePaymentMethodTokenColumn")] +partial class _20261117131357_RenamePaymentMethodTokenColumn +{ + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasDefaultSchema("ordering") + .HasAnnotation("ProductVersion", "11.0.0-rc.3.26522.148") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.HasSequence("buyerseq") + .IncrementsBy(10); + + modelBuilder.HasSequence("orderitemseq") + .IncrementsBy(10); + + modelBuilder.HasSequence("orderseq") + .IncrementsBy(10); + + modelBuilder.HasSequence("paymentseq") + .IncrementsBy(10); + + modelBuilder.Entity("eShop.IntegrationEventLogEF.IntegrationEventLogEntry", b => + { + b.Property("EventId") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Content") + .IsRequired() + .HasColumnType("text"); + + b.Property("CreationTime") + .HasColumnType("timestamp with time zone"); + + b.Property("EventTypeName") + .IsRequired() + .HasColumnType("text"); + + b.Property("State") + .HasColumnType("integer"); + + b.Property("TimesSent") + .HasColumnType("integer"); + + b.Property("TransactionId") + .HasColumnType("uuid"); + + b.HasKey("EventId"); + + b.ToTable("IntegrationEventLog", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "buyerseq"); + + b.Property("IdentityGuid") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("Name") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("IdentityGuid") + .IsUnique(); + + b.ToTable("buyers", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "paymentseq"); + + b.Property("BuyerId") + .HasColumnType("integer"); + + b.Property("_alias") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)") + .HasColumnName("Alias"); + + b.Property("_paymentToken") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)") + .HasColumnName("PaymentToken"); + + b.HasKey("Id"); + + b.HasIndex("BuyerId"); + + b.ToTable("paymentmethods", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "orderseq"); + + b.Property("BuyerId") + .HasColumnType("integer"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("OrderDate") + .HasColumnType("timestamp with time zone"); + + b.Property("OrderStatus") + .IsRequired() + .HasMaxLength(30) + .HasColumnType("character varying(30)"); + + b.Property("PaymentId") + .HasColumnType("integer") + .HasColumnName("PaymentMethodId"); + + b.HasKey("Id"); + + b.HasIndex("BuyerId"); + + b.HasIndex("PaymentId"); + + b.ToTable("orders", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => + { + var id = b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseHiLo(id, "orderitemseq"); + + b.Property("Discount") + .HasColumnType("numeric"); + + b.Property("OrderId") + .HasColumnType("integer"); + + b.Property("PictureUrl") + .HasColumnType("text"); + + b.Property("ProductId") + .HasColumnType("integer"); + + b.Property("ProductName") + .IsRequired() + .HasColumnType("text"); + + b.Property("UnitPrice") + .HasColumnType("numeric"); + + b.Property("Units") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("OrderId"); + + b.ToTable("orderItems", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Infrastructure.Idempotency.ClientRequest", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("Time") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.ToTable("requests", "ordering"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", null) + .WithMany("PaymentMethods") + .HasForeignKey("BuyerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", "Buyer") + .WithMany() + .HasForeignKey("BuyerId"); + + b.HasOne("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.PaymentMethod", null) + .WithMany() + .HasForeignKey("PaymentId") + .OnDelete(DeleteBehavior.Restrict); + + b.OwnsOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Address", "Address", b1 => + { + b1.Property("OrderId") + .HasColumnType("integer"); + + b1.Property("City") + .HasColumnType("text"); + + b1.Property("Country") + .HasColumnType("text"); + + b1.Property("State") + .HasColumnType("text"); + + b1.Property("Street") + .HasColumnType("text"); + + b1.Property("ZipCode") + .HasColumnType("text"); + + b1.HasKey("OrderId"); + + b1.ToTable("orders", "ordering"); + + b1.WithOwner() + .HasForeignKey("OrderId"); + }); + + b.Navigation("Address") + .IsRequired(); + + b.Navigation("Buyer"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.OrderItem", b => + { + b.HasOne("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", null) + .WithMany("OrderItems") + .HasForeignKey("OrderId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.BuyerAggregate.Buyer", b => + { + b.Navigation("PaymentMethods"); + }); + + modelBuilder.Entity("eShop.Ordering.Domain.AggregatesModel.OrderAggregate.Order", b => + { + b.Navigation("OrderItems"); + }); +#pragma warning restore 612, 618 + } +} diff --git a/src/Ordering.Infrastructure/Migrations/20261117131357_RenamePaymentMethodTokenColumn.cs b/src/Ordering.Infrastructure/Migrations/20261117131357_RenamePaymentMethodTokenColumn.cs new file mode 100644 index 000000000..1ef8253f7 --- /dev/null +++ b/src/Ordering.Infrastructure/Migrations/20261117131357_RenamePaymentMethodTokenColumn.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Ordering.Infrastructure.Migrations; + +/// +public partial class _20261117131357_RenamePaymentMethodTokenColumn : Migration +{ + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn( + name: "PaymentMethodId", + schema: "ordering", + table: "paymentmethods", + newName: "PaymentToken"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.RenameColumn( + name: "PaymentToken", + schema: "ordering", + table: "paymentmethods", + newName: "PaymentMethodId"); + } +} diff --git a/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs b/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs index 62c9bb497..c92d77a92 100644 --- a/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs +++ b/src/Ordering.Infrastructure/Migrations/OrderingContextModelSnapshot.cs @@ -16,7 +16,7 @@ partial class OrderingContextModelSnapshot : ModelSnapshot // If you encounter a merge conflict in the line below, it means you need to // discard one of the migration branches and recreate its migrations on top of // the other branch. See https://aka.ms/efcore-docs-migrations-conflicts for more info. - public override string LastMigrationId => "20261117125854_RemoveSensitivePaymentMethodData"; + public override string LastMigrationId => "20261117131357_RenamePaymentMethodTokenColumn"; protected override void BuildModel(ModelBuilder modelBuilder) { @@ -112,11 +112,11 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("character varying(200)") .HasColumnName("Alias"); - b.Property("_paymentMethodId") + b.Property("_paymentToken") .IsRequired() .HasMaxLength(200) .HasColumnType("character varying(200)") - .HasColumnName("PaymentMethodId"); + .HasColumnName("PaymentToken"); b.HasKey("Id"); diff --git a/src/WebApp/Services/BasketCheckoutInfo.cs b/src/WebApp/Services/BasketCheckoutInfo.cs index 132cfd9cc..4199a32cd 100644 --- a/src/WebApp/Services/BasketCheckoutInfo.cs +++ b/src/WebApp/Services/BasketCheckoutInfo.cs @@ -20,7 +20,7 @@ public class BasketCheckoutInfo public string? ZipCode { get; set; } [Required] - public string PaymentMethodId { get; set; } = "pm_sample_visa"; + public string PaymentToken { get; set; } = "pm_sample_visa"; public string? Buyer { get; set; } public Guid RequestId { get; set; } diff --git a/src/WebApp/Services/BasketState.cs b/src/WebApp/Services/BasketState.cs index ed4e5975f..96ab156f1 100644 --- a/src/WebApp/Services/BasketState.cs +++ b/src/WebApp/Services/BasketState.cs @@ -97,7 +97,7 @@ public async Task CheckoutAsync(BasketCheckoutInfo checkoutInfo) State: checkoutInfo.State!, Country: checkoutInfo.Country!, ZipCode: checkoutInfo.ZipCode!, - PaymentMethodId: checkoutInfo.PaymentMethodId, + PaymentToken: checkoutInfo.PaymentToken, Buyer: buyerId, Items: [.. orderItems]); await orderingService.CreateOrder(request, checkoutInfo.RequestId); @@ -162,6 +162,6 @@ public record CreateOrderRequest( string State, string Country, string ZipCode, - string PaymentMethodId, + string PaymentToken, string Buyer, List Items); diff --git a/tests/Ordering.UnitTests/Application/IdentifiedCommandHandlerTest.cs b/tests/Ordering.UnitTests/Application/IdentifiedCommandHandlerTest.cs index 80ebdbb26..fe3f02030 100644 --- a/tests/Ordering.UnitTests/Application/IdentifiedCommandHandlerTest.cs +++ b/tests/Ordering.UnitTests/Application/IdentifiedCommandHandlerTest.cs @@ -68,6 +68,6 @@ private CreateOrderCommand FakeOrderRequest(Dictionary args = nu state: args != null && args.ContainsKey("state") ? (string)args["state"] : null, country: args != null && args.ContainsKey("country") ? (string)args["country"] : null, zipcode: args != null && args.ContainsKey("zipcode") ? (string)args["zipcode"] : null, - paymentMethodId: args != null && args.ContainsKey("paymentMethodId") ? (string)args["paymentMethodId"] : "pm_test_123"); + paymentToken: args != null && args.ContainsKey("paymentToken") ? (string)args["paymentToken"] : "pm_test_123"); } } diff --git a/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs b/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs index 73b108f0d..ba80f42f6 100644 --- a/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs +++ b/tests/Ordering.UnitTests/Application/NewOrderCommandHandlerTest.cs @@ -73,6 +73,6 @@ private CreateOrderCommand FakeOrderRequestWithBuyer(Dictionary state: args != null && args.ContainsKey("state") ? (string)args["state"] : null, country: args != null && args.ContainsKey("country") ? (string)args["country"] : null, zipcode: args != null && args.ContainsKey("zipcode") ? (string)args["zipcode"] : null, - paymentMethodId: args != null && args.ContainsKey("paymentMethodId") ? (string)args["paymentMethodId"] : "pm_test_123"); + paymentToken: args != null && args.ContainsKey("paymentToken") ? (string)args["paymentToken"] : "pm_test_123"); } } diff --git a/tests/Ordering.UnitTests/Builders.cs b/tests/Ordering.UnitTests/Builders.cs index daccb1a9b..6b59a645e 100644 --- a/tests/Ordering.UnitTests/Builders.cs +++ b/tests/Ordering.UnitTests/Builders.cs @@ -20,7 +20,7 @@ public OrderBuilder(Address address) "userId", "fakeName", address, - paymentProviderToken: "pm_test_123"); + paymentToken: "pm_test_123"); } public OrderBuilder AddOne( diff --git a/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs b/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs index ed94efd9d..ed59e3679 100644 --- a/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs +++ b/tests/Ordering.UnitTests/Domain/BuyerAggregateTest.cs @@ -36,14 +36,14 @@ public void add_payment_success() { //Arrange var alias = "fakeAlias"; - var paymentMethodId = "pm_test_123"; + var paymentToken = "pm_test_123"; var orderId = 1; var name = "fakeUser"; var identity = new Guid().ToString(); var fakeBuyerItem = new Buyer(identity, name); //Act - var result = fakeBuyerItem.VerifyOrAddPaymentMethod(alias, paymentMethodId, orderId); + var result = fakeBuyerItem.VerifyOrAddPaymentMethod(alias, paymentToken, orderId); //Assert Assert.IsNotNull(result); @@ -54,10 +54,10 @@ public void create_payment_method_success() { //Arrange var alias = "fakeAlias"; - var paymentMethodId = "pm_test_123"; + var paymentToken = "pm_test_123"; //Act - var result = new PaymentMethod(alias, paymentMethodId); + var result = new PaymentMethod(alias, paymentToken); //Assert Assert.IsNotNull(result); @@ -68,10 +68,10 @@ public void create_payment_method_empty_reference_fail() { //Arrange var alias = "fakeAlias"; - var paymentMethodId = string.Empty; + var paymentToken = string.Empty; //Act - Assert - Assert.ThrowsExactly(() => new PaymentMethod(alias, paymentMethodId)); + Assert.ThrowsExactly(() => new PaymentMethod(alias, paymentToken)); } [TestMethod] @@ -79,11 +79,11 @@ public void payment_method_isEqualTo() { //Arrange var alias = "fakeAlias"; - var paymentMethodId = "pm_test_123"; + var paymentToken = "pm_test_123"; //Act - var fakePaymentMethod = new PaymentMethod(alias, paymentMethodId); - var result = fakePaymentMethod.IsEqualTo(paymentMethodId); + var fakePaymentMethod = new PaymentMethod(alias, paymentToken); + var result = fakePaymentMethod.IsEqualTo(paymentToken); //Assert Assert.IsTrue(result); @@ -95,13 +95,13 @@ public void Add_new_PaymentMethod_raises_new_event() //Arrange var alias = "fakeAlias"; var orderId = 1; - var paymentMethodId = "pm_test_123"; + var paymentToken = "pm_test_123"; var expectedResult = 1; var name = "fakeUser"; //Act var fakeBuyer = new Buyer(Guid.NewGuid().ToString(), name); - fakeBuyer.VerifyOrAddPaymentMethod(alias, paymentMethodId, orderId); + fakeBuyer.VerifyOrAddPaymentMethod(alias, paymentToken, orderId); //Assert Assert.HasCount(expectedResult, fakeBuyer.DomainEvents); diff --git a/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs b/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs index e91cf7dbe..2397831a1 100644 --- a/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs +++ b/tests/Ordering.UnitTests/Domain/OrderAggregateTest.cs @@ -114,11 +114,11 @@ public void Add_new_Order_raises_new_event() var state = "fakeState"; var country = "fakeCountry"; var zipcode = "FakeZipCode"; - var paymentMethodId = "pm_test_123"; + var paymentToken = "pm_test_123"; var expectedResult = 1; //Act - var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), paymentMethodId); + var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), paymentToken); //Assert Assert.HasCount(expectedResult, fakeOrder.DomainEvents); @@ -133,12 +133,12 @@ public void Add_event_Order_explicitly_raises_new_event() var state = "fakeState"; var country = "fakeCountry"; var zipcode = "FakeZipCode"; - var paymentMethodId = "pm_test_123"; + var paymentToken = "pm_test_123"; var expectedResult = 2; //Act - var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), paymentMethodId); - fakeOrder.AddDomainEvent(new OrderStartedDomainEvent(fakeOrder, "fakeName", "1", paymentMethodId)); + var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), paymentToken); + fakeOrder.AddDomainEvent(new OrderStartedDomainEvent(fakeOrder, "fakeName", "1", paymentToken)); //Assert Assert.HasCount(expectedResult, fakeOrder.DomainEvents); } @@ -152,9 +152,9 @@ public void Remove_event_Order_explicitly() var state = "fakeState"; var country = "fakeCountry"; var zipcode = "FakeZipCode"; - var paymentMethodId = "pm_test_123"; - var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), paymentMethodId); - var @fakeEvent = new OrderStartedDomainEvent(fakeOrder, "1", "fakeName", paymentMethodId); + var paymentToken = "pm_test_123"; + var fakeOrder = new Order("1", "fakeName", new Address(street, city, state, country, zipcode), paymentToken); + var @fakeEvent = new OrderStartedDomainEvent(fakeOrder, "1", "fakeName", paymentToken); var expectedResult = 1; //Act