Add functional test for integration events. Implement IDisposable for EventBusRabbitMQ.

Author: dsrodenas

docker-compose-external.yml

@@ -8,3 +8,8 @@ services:
     image: redis
     ports:
       - "6379:6379"
+
+  rabbitmq:
+    image: rabbitmq
+    ports:
+      - "5672:5672"

src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs

@@ -14,7 +14,7 @@
 
 namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
 {
-    public class EventBusRabbitMQ : IEventBus
+    public class EventBusRabbitMQ : IEventBus, IDisposable
     {
         private readonly string _brokerName = "eshop_event_bus";
         private readonly string _connectionString;
@@ -31,6 +31,7 @@ public EventBusRabbitMQ(string connectionString)
             _handlers = new Dictionary<string, List<IIntegrationEventHandler>>();
             _eventTypes = new List<Type>();
         }
+
         public void Publish(IntegrationEvent @event)
         {
             var eventName = @event.GetType().Name;
@@ -92,14 +93,24 @@ public void Unsubscribe<T>(IIntegrationEventHandler<T> handler) where T : Integr
                     if (_handlers.Keys.Count == 0)
                     {
                         _queueName = string.Empty;
-                        _connection.Item1.Close();
-                        _connection.Item2.Close();
+                        _connection.Item1.Dispose();
+                        _connection.Item2.Dispose();
                     }
 
                 }
             }
         }
 
+        public void Dispose()
+        {
+            if (_connection != null)
+            {
+                _handlers.Clear();
+                _connection.Item1.Dispose();
+                _connection.Item2.Dispose();
+            }
+        }
+
         private IModel GetChannel()
         {
             if (_connection != null)
@@ -151,5 +162,6 @@ private async Task ProcessEvent(string eventName, string message)
                 }
             }
         }
+
     }
 }

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

@@ -20,7 +20,7 @@ public async Task Handle(ProductPriceChangedEvent @event)
             foreach (var id in userIds)
             {
                 var basket = await _repository.GetBasket(id);
-                await UpdateBasket(@event.ProductId, @event.NewPrice, basket);
+                await UpdateBasket(@event.ProductId, @event.NewPrice, basket);                      
             }
         }
 
@@ -31,9 +31,12 @@ private async Task UpdateBasket(int productId, decimal newPrice, CustomerBasket
             {
                 foreach (var item in itemsToUpdate)
                 {
-                    var originalPrice = item.UnitPrice;
-                    item.UnitPrice = newPrice;
-                    item.OldUnitPrice = originalPrice;
+                    if(item.UnitPrice != newPrice)
+                    { 
+                        var originalPrice = item.UnitPrice;
+                        item.UnitPrice = newPrice;
+                        item.OldUnitPrice = originalPrice;
+                    }
                 }
                 await _repository.UpdateBasket(basket);
             }           

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

@@ -13,6 +13,7 @@
 using Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.Events;
 using Microsoft.eShopOnContainers.Services.Basket.API.IntegrationEvents.EventHandling;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ;
+using System;
 
 namespace Microsoft.eShopOnContainers.Services.Basket.API
 {
@@ -80,13 +81,8 @@ public void ConfigureServices(IServiceCollection services)
 
             var serviceProvider = services.BuildServiceProvider();
             var configuration = serviceProvider.GetRequiredService<IOptionsSnapshot<BasketSettings>>().Value;
-            var eventBus = new EventBusRabbitMQ(configuration.EventBusConnection);
-            services.AddSingleton<IEventBus>(eventBus);
+            services.AddSingleton<IEventBus>(provider => new EventBusRabbitMQ(configuration.EventBusConnection));
 
-            
-            var catalogPriceHandler = serviceProvider.GetService<IIntegrationEventHandler<ProductPriceChangedEvent>>();
-            eventBus.Subscribe<ProductPriceChangedEvent>(catalogPriceHandler);
-                    
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -100,20 +96,28 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             // Use frameworks
             app.UseCors("CorsPolicy");
 
-            var identityUrl = Configuration.GetValue<string>("IdentityUrl");
-
-            app.UseIdentityServerAuthentication(new IdentityServerAuthenticationOptions
-            {
-                Authority = identityUrl.ToString(),
-                ScopeName = "basket",
-                RequireHttpsMetadata = false
-            });
+            ConfigureAuth(app);
 
             app.UseMvcWithDefaultRoute();
 
             app.UseSwagger()
                 .UseSwaggerUi();
 
+            var catalogPriceHandler = app.ApplicationServices.GetService<IIntegrationEventHandler<ProductPriceChangedEvent>>();
+            var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
+            eventBus.Subscribe<ProductPriceChangedEvent>(catalogPriceHandler);
+
         }
+
+        protected virtual void ConfigureAuth(IApplicationBuilder app)
+        {
+            var identityUrl = Configuration.GetValue<string>("IdentityUrl");
+            app.UseIdentityServerAuthentication(new IdentityServerAuthenticationOptions
+            {
+                Authority = identityUrl.ToString(),
+                ScopeName = "basket",
+                RequireHttpsMetadata = false
+            });
+        }       
     }
 }

test/Services/FunctionalTests/FunctionalTests.csproj

@@ -13,12 +13,16 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Services\Basket\Basket.API\Basket.API.csproj" />
     <ProjectReference Include="..\..\..\src\Services\Catalog\Catalog.API\Catalog.API.csproj" />
     <ProjectReference Include="..\..\..\src\Services\Ordering\Ordering.API\Ordering.API.csproj" />
     <ProjectReference Include="..\..\..\src\Web\WebMVC\WebMVC.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="settings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

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

@@ -0,0 +1,34 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace FunctionalTests.Services.Basket
+{
+    public class BasketScenariosBase
+    {
+        public TestServer CreateServer()
+        {
+            var webHostBuilder = new WebHostBuilder();
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory());
+            webHostBuilder.UseStartup<BasketTestsStartup>();
+
+            return new TestServer(webHostBuilder);
+        }
+
+        public static class Get
+        {
+            public static string GetBasketByCustomer(string customerId)
+            {
+                return $"/{customerId}";
+            }
+        }
+
+        public static class Post
+        {
+            public static string CreateBasket = "/";
+        }
+    }
+}

test/Services/FunctionalTests/Services/Basket/BasketTestsStartup.cs

@@ -0,0 +1,29 @@
+using Microsoft.eShopOnContainers.Services.Basket.API;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Builder;
+using FunctionalTests.Middleware;
+
+namespace FunctionalTests.Services.Basket
+{
+    public class BasketTestsStartup : Startup
+    {
+        public BasketTestsStartup(IHostingEnvironment env) : base(env)
+        {
+        }
+
+        protected override void ConfigureAuth(IApplicationBuilder app)
+        {
+            if (Configuration["isTest"] == bool.TrueString.ToLowerInvariant())
+            {
+                app.UseMiddleware<AutoAuthorizeMiddleware>();
+            }
+            else
+            {
+                base.ConfigureAuth(app);
+            }
+        }        
+    }
+}

test/Services/FunctionalTests/Services/Catalog/CatalogScenarios.cs

@@ -24,6 +24,8 @@ public static class Get
         {
             public static string Orders = "api/v1/orders";
 
+            public static string Items = "api/v1/catalog/items";
+
             public static string ProductByName(string name)
             {
                 return $"api/v1/catalog/items/withname/{name}";