Merge branch 'marketingcampaign' into dev

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

eShopOnContainers-ServicesAndWebApps.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
+VisualStudioVersion = 15.0.26430.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}"
 EndProject

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

@@ -41,7 +41,7 @@ public async Task<IActionResult> GetAllLocations()
         //GET api/v1/[controller]/1
         [Route("{locationId}")]
         [HttpGet]
-        public async Task<IActionResult> GetLocation(string locationId)
+        public async Task<IActionResult> GetLocation(int locationId)
         {
             var location = await _locationsService.GetLocation(locationId);
             return Ok(location);
@@ -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/LocationsContextSeed.cs

@@ -32,7 +32,8 @@ static async Task SetUSLocations()
             var us = new Locations()
             {
                 Code = "US",
-                Description = "United States"
+                Description = "United States",
+                LocationId = 1
             };
             us.SetLocation(-101.357386, 41.650455);
             us.SetArea(GetUSPoligon());
@@ -46,7 +47,8 @@ static async Task SetWashingtonLocations(string parentId)
             {
                 Parent_Id = parentId,
                 Code = "WHT",
-                Description = "Washington"
+                Description = "Washington",
+                LocationId = 2
             };
             wht.SetLocation(-119.542781, 47.223652);
             wht.SetArea(GetWashingtonPoligon());
@@ -61,7 +63,8 @@ static async Task SetSeattleLocations(string parentId)
             {
                 Parent_Id = parentId,
                 Code = "SEAT",
-                Description = "Seattle"
+                Description = "Seattle",
+                LocationId = 3
             };
             stl.SetArea(GetSeattlePoligon());
             stl.SetLocation(-122.330747, 47.603111);
@@ -74,7 +77,8 @@ static async Task SetRedmondLocations(string parentId)
             {
                 Parent_Id = parentId,
                 Code = "REDM",
-                Description = "Redmond"
+                Description = "Redmond",
+                LocationId = 4
             };
             rdm.SetLocation(-122.122887, 47.674961);
             rdm.SetArea(GetRedmondPoligon());

src/Services/Location/Locations.API/Infrastructure/Repositories/ILocationsRepository.cs

@@ -7,7 +7,7 @@
 
     public interface ILocationsRepository
     {        
-        Task<Locations> GetAsync(string locationId);
+        Task<Locations> GetAsync(int locationId);
 
         Task<List<Locations>> GetLocationListAsync();