Merge branch 'feature/marketing-read-model-data' into marketingcampaign

# Conflicts:
#	src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs
#	src/Services/Location/Locations.API/Model/UserLocation.cs

Author: christian147

docker-compose-windows.override.yml

@@ -95,4 +95,16 @@ services:
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
       - EventBusConnection=rabbitmq
     ports:
-      - "5109:80"
+      - "5109:80"
+
+  marketing.api:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
+      - EventBusConnection=rabbitmq
+      - MongoConnectionString=mongodb://nosql.data
+      - MongoDatabase=MarketingDb
+      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
+    ports:
+      - "5110:80"

docker-compose-windows.prod.yml

@@ -75,7 +75,19 @@ services:
       - BasketUrl=http://basket.api
     ports:
       - "5100:80"
-
+  
+  marketing.api:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Production
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
+      - EventBusConnection=rabbitmq
+      - MongoConnectionString=mongodb://nosql.data
+      - MongoDatabase=MarketingDb
+      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
+    ports:
+      - "5110:80"
+      
   sql.data:
     environment:
       - SA_PASSWORD=Pass@word

docker-compose-windows.yml

@@ -61,7 +61,19 @@ services:
       dockerfile: Dockerfile
     depends_on:
       - nosql.data
-      
+      - rabbitmq
+
+  marketing.api:
+    image: eshop/marketing.api
+    build:
+      context: ./src/Services/Marketing/Marketing.API
+      dockerfile: Dockerfile    
+    depends_on:
+      - sql.data
+      - nosql.data
+      - identity.api
+      - rabbitmq
+
   sql.data:
     image: microsoft/mssql-server-windows
 

docker-compose.override.yml

@@ -58,6 +58,9 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
+      - MongoConnectionString=mongodb://nosql.data
+      - MongoDatabase=MarketingDb
+      - EventBusConnection=rabbitmq
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
     ports:
       - "5110:80"

docker-compose.prod.yml

@@ -59,6 +59,9 @@ services:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
+      - MongoConnectionString=mongodb://nosql.data
+      - MongoDatabase=MarketingDb
+      - EventBusConnection=rabbitmq
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
     ports:
       - "5110:80"

docker-compose.yml

@@ -53,7 +53,9 @@ services:
       dockerfile: Dockerfile    
     depends_on:
       - sql.data
+      - nosql.data
       - identity.api
+      - rabbitmq
 
   webspa:
     image: eshop/webspa
@@ -112,3 +114,4 @@ services:
       dockerfile: Dockerfile
     depends_on:
       - nosql.data
+      - rabbitmq

src/Services/Location/Locations.API/Controllers/LocationsController.cs

@@ -54,6 +54,7 @@ public async Task<IActionResult> CreateOrUpdateUserLocation([FromBody]LocationRe
         {
             var userId = _identityService.GetUserIdentity();
             var result = await _locationsService.AddOrUpdateUserLocation(userId, newLocReq);
+           
             return result ? 
                 (IActionResult)Ok() : 
                 (IActionResult)BadRequest();

src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs

@@ -8,43 +8,37 @@
     using System.Linq;
     using Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Exceptions;
     using System.Collections.Generic;
+    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+    using Microsoft.eShopOnContainers.Services.Locations.API.IntegrationEvents.Events;
 
     public class LocationsService : ILocationsService
     {
-        private ILocationsRepository _locationsRepository;
+        private readonly ILocationsRepository _locationsRepository;
+        private readonly IEventBus _eventBus;
 
-        public LocationsService(ILocationsRepository locationsRepository)
+        public LocationsService(ILocationsRepository locationsRepository, IEventBus eventBus)
         {
             _locationsRepository = locationsRepository ?? throw new ArgumentNullException(nameof(locationsRepository));
+            _eventBus = eventBus ?? throw new ArgumentNullException(nameof(eventBus));
         }
 
         public async Task<Locations> GetLocation(string locationId)
         {
             return await _locationsRepository.GetAsync(locationId);
         }
 
-        public async Task<UserLocation> GetUserLocation(string id)
+        public async Task<UserLocation> GetUserLocation(string userId)
         {
-            if (!Guid.TryParse(id, out Guid userId))
-            {
-                throw new ArgumentException("Not valid userId");
-            }
-
-            return await _locationsRepository.GetUserLocationAsync(userId.ToString());
+            return await _locationsRepository.GetUserLocationAsync(id);
         }
 
         public async Task<List<Locations>> GetAllLocation()
         {
             return await _locationsRepository.GetLocationListAsync();
         }
 
-        public async Task<bool> AddOrUpdateUserLocation(string id, LocationRequest currentPosition)
-        {
-            if (!Guid.TryParse(id, out Guid userId))
-            {
-                throw new ArgumentException("Not valid userId");
-            }
-
+        public async Task<bool> AddOrUpdateUserLocation(string userId, LocationRequest currentPosition)
+        {            
             // Get the list of ordered regions the user currently is within
             var currentUserAreaLocationList = await _locationsRepository.GetCurrentUserRegionsListAsync(currentPosition);
 
@@ -55,14 +49,40 @@ public async Task<bool> AddOrUpdateUserLocation(string id, LocationRequest curre
 
             // If current area found, then update user location
             var locationAncestors = new List<string>();
-            var userLocation = await _locationsRepository.GetUserLocationAsync(userId.ToString());
+            var userLocation = await _locationsRepository.GetUserLocationAsync(userId);
             userLocation = userLocation ?? new UserLocation();
             userLocation.UserId = userId;
             userLocation.LocationId = currentUserAreaLocationList[0].Id;
             userLocation.UpdateDate = DateTime.UtcNow;
             await _locationsRepository.UpdateUserLocationAsync(userLocation);
 
+            // Publish integration event to update marketing read data model
+            // with the new locations updated
+            PublishNewUserLocationPositionIntegrationEvent(userId, currentUserAreaLocationList);
+
             return true;
         }
+
+        private void PublishNewUserLocationPositionIntegrationEvent(string userId, List<Locations> newLocations)
+        {
+            var newUserLocations = MapUserLocationDetails(newLocations);
+            var @event = new UserLocationUpdatedIntegrationEvent(userId, newUserLocations);
+            _eventBus.Publish(@event);
+        }
+
+        private List<UserLocationDetails> MapUserLocationDetails(List<Locations> newLocations)
+        {
+            var result = new List<UserLocationDetails>();
+            newLocations.ForEach(location => {
+                result.Add(new UserLocationDetails()
+                {
+                    LocationId = location.Id,
+                    Code = location.Code,
+                    Description = location.Description
+                });
+            });
+
+            return result;
+        }
     }
 }

src/Services/Location/Locations.API/IntegrationEvents/Events/UserLocationUpdatedIntegrationEvent.cs

@@ -0,0 +1,18 @@
+namespace Microsoft.eShopOnContainers.Services.Locations.API.IntegrationEvents.Events
+{
+    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+    using Microsoft.eShopOnContainers.Services.Locations.API.Model;
+    using System.Collections.Generic;
+
+    public class UserLocationUpdatedIntegrationEvent : IntegrationEvent
+    {
+        public string UserId { get; private set; }
+        public List<UserLocationDetails> LocationList { get; private set; }
+
+        public UserLocationUpdatedIntegrationEvent(string userId, List<UserLocationDetails> locationList)
+        {
+            UserId = userId;
+            LocationList = locationList;
+        }
+    }
+}

src/Services/Location/Locations.API/Locations.API.csproj

@@ -10,6 +10,7 @@
     <Folder Include="wwwroot\" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.2.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
@@ -37,5 +38,9 @@
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" />
+    <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" />
+  </ItemGroup>
 
 </Project>