Created Marketing read data model

michaeljxf · Jun 13, 2017 · 9bf5670 · 9bf5670
1 parent 4be61ab
commit 9bf5670
Show file tree

Hide file tree

Showing 32 changed files with 430 additions and 39 deletions.
diff --git a/docker-compose-windows.override.yml b/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"
diff --git a/docker-compose-windows.prod.yml b/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

diff --git a/docker-compose-windows.yml b/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
 

diff --git a/docker-compose.override.yml b/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"

diff --git a/docker-compose.prod.yml b/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"

diff --git a/docker-compose.yml b/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
diff --git a/src/Services/Location/Locations.API/Controllers/LocationsController.cs b/src/Services/Location/Locations.API/Controllers/LocationsController.cs
@@ -21,11 +21,11 @@ public LocationsController(ILocationsService locationsService, IIdentityService
         }
 
         //GET api/v1/[controller]/user/1
-        [Route("user/{userId:int}")]
+        [Route("user/{userId:guid}")]
         [HttpGet]
-        public async Task<IActionResult> GetUserLocation(int userId)
+        public async Task<IActionResult> GetUserLocation(Guid userId)
         {
-            var userLocation = await _locationsService.GetUserLocation(userId);
+            var userLocation = await _locationsService.GetUserLocation(userId.ToString());
             return Ok(userLocation);
         }
 
@@ -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();

diff --git a/src/Services/Location/Locations.API/Infrastructure/Repositories/ILocationsRepository.cs b/src/Services/Location/Locations.API/Infrastructure/Repositories/ILocationsRepository.cs
@@ -11,7 +11,7 @@ public interface ILocationsRepository
 
         Task<List<Locations>> GetLocationListAsync();
 
-        Task<UserLocation> GetUserLocationAsync(int userId);
+        Task<UserLocation> GetUserLocationAsync(string userId);
 
         Task<List<Locations>> GetCurrentUserRegionsListAsync(LocationRequest currentPosition);
 

diff --git a/src/Services/Location/Locations.API/Infrastructure/Repositories/LocationsRepository.cs b/src/Services/Location/Locations.API/Infrastructure/Repositories/LocationsRepository.cs
@@ -28,7 +28,7 @@ public async Task<Locations> GetAsync(string locationId)
                                  .FirstOrDefaultAsync();
         }
 
-        public async Task<UserLocation> GetUserLocationAsync(int userId)
+        public async Task<UserLocation> GetUserLocationAsync(string userId)
         {
             var filter = Builders<UserLocation>.Filter.Eq("UserId", userId);
             return await _context.UserLocation

diff --git a/src/Services/Location/Locations.API/Infrastructure/Services/ILocationsService.cs b/src/Services/Location/Locations.API/Infrastructure/Services/ILocationsService.cs
@@ -9,7 +9,7 @@ public interface ILocationsService
     {
         Task<Locations> GetLocation(string locationId);
 
-        Task<UserLocation> GetUserLocation(int id);
+        Task<UserLocation> GetUserLocation(string id);
 
         Task<List<Locations>> GetAllLocation();
 

diff --git a/src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs b/src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs
@@ -8,22 +8,26 @@
     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(int id)
+        public async Task<UserLocation> GetUserLocation(string id)
         {
             return await _locationsRepository.GetUserLocationAsync(id);
         }
@@ -33,13 +37,8 @@ public async Task<List<Locations>> GetAllLocation()
             return await _locationsRepository.GetLocationListAsync();
         }
 
-        public async Task<bool> AddOrUpdateUserLocation(string id, LocationRequest currentPosition)
-        {
-            if (!int.TryParse(id, out int 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);
 
@@ -57,7 +56,33 @@ public async Task<bool> AddOrUpdateUserLocation(string id, LocationRequest curre
             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;
+        }
     }
 }
diff --git a/...es/Location/Locations.API/IntegrationEvents/Events/UserLocationUpdatedIntegrationEvent.cs b/...es/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;
+        }
+    }
+}
diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/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>
diff --git a/src/Services/Location/Locations.API/Model/UserLocation.cs b/src/Services/Location/Locations.API/Model/UserLocation.cs
@@ -9,7 +9,7 @@ public class UserLocation
         [BsonIgnoreIfDefault]
         [BsonRepresentation(BsonType.ObjectId)]
         public string Id { get; set; }
-        public int UserId { get; set; } = 0;
+        public string UserId { get; set; }
         [BsonRepresentation(BsonType.ObjectId)]
         public string LocationId { get; set; }
         public DateTime UpdateDate { get; set; }

diff --git a/src/Services/Location/Locations.API/Model/UserLocationDetails.cs b/src/Services/Location/Locations.API/Model/UserLocationDetails.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.eShopOnContainers.Services.Locations.API.Model
+{
+    public class UserLocationDetails
+    {
+        public string LocationId { get; set; }
+        public string Code { get; set; }
+        public string Description { get; set; }
+    }
+}
diff --git a/src/Services/Location/Locations.API/Startup.cs b/src/Services/Location/Locations.API/Startup.cs
@@ -1,17 +1,21 @@
-using Microsoft.AspNetCore.Builder;
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Http;
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ;
 using Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure;
+using Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Filters;
+using Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Repositories;
+using Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using RabbitMQ.Client;
 using System.Reflection;
 using System;
-using Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Services;
-using Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Repositories;
-using Microsoft.AspNetCore.Http;
-using Microsoft.eShopOnContainers.Services.Locations.API.Infrastructure.Filters;
 
 namespace Microsoft.eShopOnContainers.Services.Locations.API
 {
@@ -37,7 +41,7 @@ public Startup(IHostingEnvironment env)
         }
 
         // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
+        public IServiceProvider ConfigureServices(IServiceCollection services)
         {
             // Add framework services.
             services.AddMvc(options =>
@@ -46,7 +50,21 @@ public void ConfigureServices(IServiceCollection services)
             }).AddControllersAsServices();
 
             services.Configure<LocationSettings>(Configuration);
-
+
+            services.AddSingleton<IRabbitMQPersistentConnection>(sp =>
+            {
+                var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
+
+                var factory = new ConnectionFactory()
+                {
+                    HostName = Configuration["EventBusConnection"]
+                };
+
+                return new DefaultRabbitMQPersistentConnection(factory, logger);
+            });
+
+            RegisterServiceBus(services);
+
             // Add framework services.
             services.AddSwaggerGen(options =>
             {
@@ -72,7 +90,13 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             services.AddTransient<IIdentityService, IdentityService>();
             services.AddTransient<ILocationsService, LocationsService>();
-            services.AddTransient<ILocationsRepository, LocationsRepository>();           
+            services.AddTransient<ILocationsRepository, LocationsRepository>();
+
+            //configure autofac
+            var container = new ContainerBuilder();
+            container.Populate(services);
+
+            return new AutofacServiceProvider(container.Build());
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -109,5 +133,11 @@ protected virtual void ConfigureAuth(IApplicationBuilder app)
                 RequireHttpsMetadata = false
             });
         }
+
+        private void RegisterServiceBus(IServiceCollection services)
+        {
+            services.AddSingleton<IEventBus, EventBusRabbitMQ>();
+            services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
+        }        
     }
 }