Adapt test cases to new order flow

Create new service test cases

Author: ramon-tomas-c

src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/OrderStartedIntegrationEventHandler.cs

@@ -1,5 +1,6 @@
 using Basket.API.IntegrationEvents.Events;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
 using Microsoft.eShopOnContainers.Services.Basket.API.Model;
 using System;
 using System.Threading.Tasks;

src/Services/Basket/Basket.API/IntegrationEvents/Events/OrderStartedIntegrationEvent.cs

@@ -7,9 +7,9 @@ namespace Basket.API.IntegrationEvents.Events
     // An Integration Event is an event that can cause side effects to other microsrvices, Bounded-Contexts or external systems.
     public class OrderStartedIntegrationEvent : IntegrationEvent
     {
-        public string UserId { get; }
+        public string UserId { get; set; }
 
-        public OrderStartedIntegrationEvent(string userId) =>
-            UserId = userId;
+        public OrderStartedIntegrationEvent(string userId)
+            => UserId = userId;            
     }
 }

src/Services/Basket/Basket.API/Startup.cs

@@ -1,30 +1,30 @@
-using Basket.API.Infrastructure.Filters;
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+using Basket.API.Infrastructure.Filters;
 using Basket.API.IntegrationEvents.EventHandling;
 using Basket.API.IntegrationEvents.Events;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ;
 using Microsoft.eShopOnContainers.Services.Basket.API.Auth.Server;
 using Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.EventHandling;
 using Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.Events;
 using Microsoft.eShopOnContainers.Services.Basket.API.Model;
+using Microsoft.eShopOnContainers.Services.Basket.API.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.HealthChecks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using RabbitMQ.Client;
 using StackExchange.Redis;
+using System;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using System;
-using Microsoft.eShopOnContainers.Services.Basket.API.Services;
-using Microsoft.AspNetCore.Http;
-using Autofac;
-using Autofac.Extensions.DependencyInjection;
 
 namespace Microsoft.eShopOnContainers.Services.Basket.API
 {
@@ -114,6 +114,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             services.AddTransient<IBasketRepository, RedisBasketRepository>();
             services.AddTransient<IIdentityService, IdentityService>();
             RegisterServiceBus(services);
+            services.AddOptions();
 
             var container = new ContainerBuilder();
             container.Populate(services);
@@ -127,7 +128,6 @@ private void RegisterServiceBus(IServiceCollection services)
 
             services.AddTransient<ProductPriceChangedIntegrationEventHandler>();
             services.AddTransient<OrderStartedIntegrationEventHandler>();
-
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -165,14 +165,13 @@ protected virtual void ConfigureAuth(IApplicationBuilder app)
 
         protected virtual void ConfigureEventBus(IApplicationBuilder app)
         {
-            var catalogPriceHandler = app.ApplicationServices
-                .GetService<IIntegrationEventHandler<ProductPriceChangedIntegrationEvent>>();
+            //var catalogPriceHandler = app.ApplicationServices
+            //    .GetService<IIntegrationEventHandler<ProductPriceChangedIntegrationEvent>>();
 
-            var orderStartedHandler = app.ApplicationServices
-                .GetService<IIntegrationEventHandler<OrderStartedIntegrationEvent>>();
+            //var orderStartedHandler = app.ApplicationServices
+            //    .GetService<IIntegrationEventHandler<OrderStartedIntegrationEvent>>();
 
             var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
-
             eventBus.Subscribe<ProductPriceChangedIntegrationEvent, ProductPriceChangedIntegrationEventHandler>();
             eventBus.Subscribe<OrderStartedIntegrationEvent, OrderStartedIntegrationEventHandler>();
         }

src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStartedIntegrationEvent.cs

@@ -11,9 +11,9 @@ namespace Ordering.API.Application.IntegrationEvents.Events
     // An Integration Event is an event that can cause side effects to other microsrvices, Bounded-Contexts or external systems.
     public class OrderStartedIntegrationEvent : IntegrationEvent
     {
-        public string UserId { get; }
+        public string UserId { get; set; }
 
-        public OrderStartedIntegrationEvent(string userId) =>
-            UserId = userId;
+        public OrderStartedIntegrationEvent(string userId)
+            => UserId = userId;
     }
 }

src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/UserCheckoutAcceptedIntegrationEvent.cs

@@ -1,9 +1,6 @@
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
 using Ordering.API.Application.Models;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Ordering.API.Application.IntegrationEvents.Events
 {

src/Services/Ordering/Ordering.API/Application/Validations/CancelOrderCommandValidator.cs

@@ -0,0 +1,17 @@
+using FluentValidation;
+using Ordering.API.Application.Commands;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ordering.API.Application.Validations
+{
+    public class CancelOrderCommandValidator : AbstractValidator<CancelOrderCommand>
+    {
+        public CancelOrderCommandValidator()
+        {
+            RuleFor(order => order.OrderNumber).NotEmpty().WithMessage("No orderId found");
+        }
+    }
+}

src/Services/Ordering/Ordering.API/Application/Validations/ShipOrderCommandValidator.cs

@@ -0,0 +1,17 @@
+using FluentValidation;
+using Ordering.API.Application.Commands;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ordering.API.Application.Validations
+{
+    public class ShipOrderCommandValidator : AbstractValidator<ShipOrderCommand>
+    {
+        public ShipOrderCommandValidator()
+        {
+            RuleFor(order => order.OrderNumber).NotEmpty().WithMessage("No orderId found");
+        }
+    }
+}

src/Services/Ordering/Ordering.API/Startup.cs

@@ -5,11 +5,10 @@
     using Autofac.Extensions.DependencyInjection;
     using global::Ordering.API.Application.IntegrationCommands.Commands;
     using global::Ordering.API.Application.IntegrationEvents;
+    using global::Ordering.API.Application.IntegrationEvents.EventHandling;
     using global::Ordering.API.Application.IntegrationEvents.Events;
     using global::Ordering.API.Application.Sagas;
     using global::Ordering.API.Infrastructure.Middlewares;
-    using global::Ordering.API.Application.IntegrationCommands.Commands;
-    using global::Ordering.API.Application.Sagas;
     using Infrastructure;
     using Infrastructure.Auth;
     using Infrastructure.AutofacModules;
@@ -127,10 +126,10 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
 
             services.AddSingleton<IEventBus, EventBusRabbitMQ>();
             services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
-            services.AddTransient<IIntegrationEventHandler<UserCheckoutAcceptedIntegrationEvent>>();
+            services.AddTransient<UserCheckoutAcceptedIntegrationEventHandler>();
             services.AddTransient<IIntegrationEventHandler<ConfirmGracePeriodCommandMsg>, OrderProcessSaga>();
-            services.AddTransient<IIntegrationEventHandler<OrderStockConfirmedIntegrationEvent>>();
-            services.AddTransient<IIntegrationEventHandler<OrderStockNotConfirmedIntegrationEvent>>();
+            services.AddTransient<OrderStockConfirmedIntegrationEventHandler>();
+            services.AddTransient<OrderStockNotConfirmedIntegrationEventHandler>();
             services.AddOptions();
 
             //configure autofac
@@ -175,13 +174,13 @@ private void ConfigureEventBus(IApplicationBuilder app)
         {
             var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
 
-            eventBus.Subscribe<UserCheckoutAcceptedIntegrationEvent, IIntegrationEventHandler<UserCheckoutAcceptedIntegrationEvent>>();
+            eventBus.Subscribe<UserCheckoutAcceptedIntegrationEvent, UserCheckoutAcceptedIntegrationEventHandler>();
 
             eventBus.Subscribe<ConfirmGracePeriodCommandMsg, IIntegrationEventHandler<ConfirmGracePeriodCommandMsg>>();
 
-            eventBus.Subscribe<OrderStockConfirmedIntegrationEvent, IIntegrationEventHandler<OrderStockConfirmedIntegrationEvent>>();
+            eventBus.Subscribe<OrderStockConfirmedIntegrationEvent, OrderStockConfirmedIntegrationEventHandler>();
 
-            eventBus.Subscribe<OrderStockNotConfirmedIntegrationEvent, IIntegrationEventHandler<OrderStockNotConfirmedIntegrationEvent>>();
+            eventBus.Subscribe<OrderStockNotConfirmedIntegrationEvent, OrderStockNotConfirmedIntegrationEventHandler>();
         }
 
         protected virtual void ConfigureAuth(IApplicationBuilder app)

test/Services/FunctionalTests/Services/Basket/BasketScenariosBase.cs

@@ -29,6 +29,7 @@ public static string GetBasketByCustomer(string customerId)
         public static class Post
         {
             public static string CreateBasket = "/";
+            public static string Checkout = "/checkout";
         }
     }
 }