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

christian147 · christian147 · commit b3e536286582 · 2017-06-14T16:26:28.000+02:00
# Conflicts:
#	src/Services/Location/Locations.API/Model/Locations.cs
diff --git a/src/Services/Location/Locations.API/Controllers/LocationsController.cs b/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);
diff --git a/src/Services/Location/Locations.API/Infrastructure/LocationsContextSeed.cs b/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());
diff --git a/src/Services/Location/Locations.API/Infrastructure/Repositories/ILocationsRepository.cs b/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();
 
diff --git a/src/Services/Location/Locations.API/Infrastructure/Repositories/LocationsRepository.cs b/src/Services/Location/Locations.API/Infrastructure/Repositories/LocationsRepository.cs
@@ -20,9 +20,9 @@ public LocationsRepository(IOptions<LocationSettings> settings)
             _context = new LocationsContext(settings);
         }        
         
-        public async Task<Locations> GetAsync(string locationId)
+        public async Task<Locations> GetAsync(int locationId)
         {
-            var filter = Builders<Locations>.Filter.Eq("Id", ObjectId.Parse(locationId));
+            var filter = Builders<Locations>.Filter.Eq("LocationId", locationId);
             return await _context.Locations
                                  .Find(filter)
                                  .FirstOrDefaultAsync();
diff --git a/src/Services/Location/Locations.API/Infrastructure/Services/ILocationsService.cs b/src/Services/Location/Locations.API/Infrastructure/Services/ILocationsService.cs
@@ -7,7 +7,7 @@
 
     public interface ILocationsService
     {
-        Task<Locations> GetLocation(string locationId);
+        Task<Locations> GetLocation(int locationId);
 
         Task<UserLocation> GetUserLocation(string id);
 
diff --git a/src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs b/src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs
@@ -22,7 +22,7 @@ public LocationsService(ILocationsRepository locationsRepository, IEventBus even
             _eventBus = eventBus ?? throw new ArgumentNullException(nameof(eventBus));
         }
 
-        public async Task<Locations> GetLocation(string locationId)
+        public async Task<Locations> GetLocation(int locationId)
         {
             return await _locationsRepository.GetAsync(locationId);
         }
@@ -76,7 +76,7 @@ private List<UserLocationDetails> MapUserLocationDetails(List<Locations> newLoca
             newLocations.ForEach(location => {
                 result.Add(new UserLocationDetails()
                 {
-                    LocationId = location.Id,
+                    LocationId = location.LocationId,
                     Code = location.Code,
                     Description = location.Description
                 });
diff --git a/src/Services/Location/Locations.API/Model/UserLocationDetails.cs b/src/Services/Location/Locations.API/Model/UserLocationDetails.cs
@@ -7,7 +7,7 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API.Model
 {
     public class UserLocationDetails
     {
-        public string LocationId { get; set; }
+        public int LocationId { get; set; }
         public string Code { get; set; }
         public string Description { get; set; }
     }
diff --git a/src/Services/Marketing/Marketing.API/Controllers/LocationsController.cs b/src/Services/Marketing/Marketing.API/Controllers/LocationsController.cs
@@ -20,7 +20,8 @@ public LocationsController(MarketingContext context)
         }
 
         [HttpGet]
-        [Route("api/v1/campaigns/{campaignId:int}/locations/{userLocationRuleId:int}")]
+        [Route("api/v1/campaigns/{campaignId:int}/locations/{userLocationRuleId:int}", 
+            Name = "GetLocationByCampaignAndLocationRuleId")]
         public IActionResult GetLocationByCampaignAndLocationRuleId(int campaignId, 
             int userLocationRuleId)
         {
@@ -83,7 +84,7 @@ public async Task<IActionResult> CreateLocation(int campaignId,
             await _context.Rules.AddAsync(locationRule);
             await _context.SaveChangesAsync();
 
-            return CreatedAtAction(nameof(GetLocationByCampaignAndLocationRuleId), 
+            return CreatedAtRoute(nameof(GetLocationByCampaignAndLocationRuleId), 
                 new { campaignId = campaignId, locationRuleId = locationRule.Id }, null);
         }
 
diff --git a/src/Services/Marketing/Marketing.API/Model/Location.cs b/src/Services/Marketing/Marketing.API/Model/Location.cs
@@ -9,8 +9,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Model
 {
     public class Location
     {
-        [BsonRepresentation(BsonType.ObjectId)]
-        public string LocationId { get; set; }
+        public int LocationId { get; set; }
         public string Code { get; set; }
         public string Description { get; set; }
     }
diff --git a/src/Services/Marketing/Marketing.API/Model/UserLocationDetails.cs b/src/Services/Marketing/Marketing.API/Model/UserLocationDetails.cs
@@ -2,7 +2,7 @@
 {
     public class UserLocationDetails
     {
-        public string LocationId { get; set; }
+        public int LocationId { get; set; }
         public string Code { get; set; }
         public string Description { get; set; }
     }
diff --git a/test/Services/IntegrationTests/Services/Marketing/appsettings.json b/test/Services/IntegrationTests/Services/Marketing/appsettings.json
@@ -1,5 +1,8 @@
 ﻿{
   "ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word",
+  "MongoConnectionString": "mongodb://localhost:27017",
+  "MongoDatabase": "MarketingDb",
   "IdentityUrl": "http://localhost:5105",
-  "isTest": "true"
+  "isTest": "true",
+  "EventBusConnection": "localhost"
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public async Task<IActionResult> GetAllLocations()`
`41`	`41`	`//GET api/v1/[controller]/1`
`42`	`42`	`[Route("{locationId}")]`
`43`	`43`	`[HttpGet]`
`44`		`- public async Task<IActionResult> GetLocation(string locationId)`
	`44`	`+ public async Task<IActionResult> GetLocation(int locationId)`
`45`	`45`	`{`
`46`	`46`	`var location = await _locationsService.GetLocation(locationId);`
`47`	`47`	`return Ok(location);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`public interface ILocationsRepository`
`9`	`9`	`{`
`10`		`- Task<Locations> GetAsync(string locationId);`
	`10`	`+ Task<Locations> GetAsync(int locationId);`
`11`	`11`
`12`	`12`	`Task<List<Locations>> GetLocationListAsync();`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ public LocationsRepository(IOptions<LocationSettings> settings)`
`20`	`20`	`_context = new LocationsContext(settings);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public async Task<Locations> GetAsync(string locationId)`
	`23`	`+ public async Task<Locations> GetAsync(int locationId)`
`24`	`24`	`{`
`25`		`- var filter = Builders<Locations>.Filter.Eq("Id", ObjectId.Parse(locationId));`
	`25`	`+ var filter = Builders<Locations>.Filter.Eq("LocationId", locationId);`
`26`	`26`	`return await _context.Locations`
`27`	`27`	`.Find(filter)`
`28`	`28`	`.FirstOrDefaultAsync();`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`public interface ILocationsService`
`9`	`9`	`{`
`10`		`- Task<Locations> GetLocation(string locationId);`
	`10`	`+ Task<Locations> GetLocation(int locationId);`
`11`	`11`
`12`	`12`	`Task<UserLocation> GetUserLocation(string id);`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public LocationsService(ILocationsRepository locationsRepository, IEventBus even`
`22`	`22`	`_eventBus = eventBus ?? throw new ArgumentNullException(nameof(eventBus));`
`23`	`23`	`}`
`24`	`24`
`25`		`- public async Task<Locations> GetLocation(string locationId)`
	`25`	`+ public async Task<Locations> GetLocation(int locationId)`
`26`	`26`	`{`
`27`	`27`	`return await _locationsRepository.GetAsync(locationId);`
`28`	`28`	`}`
`@@ -76,7 +76,7 @@ private List<UserLocationDetails> MapUserLocationDetails(List<Locations> newLoca`
`76`	`76`	`newLocations.ForEach(location => {`
`77`	`77`	`result.Add(new UserLocationDetails()`
`78`	`78`	`{`
`79`		`- LocationId = location.Id,`
	`79`	`+ LocationId = location.LocationId,`
`80`	`80`	`Code = location.Code,`
`81`	`81`	`Description = location.Description`
`82`	`82`	`});`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API.Model`
`7`	`7`	`{`
`8`	`8`	`public class UserLocationDetails`
`9`	`9`	`{`
`10`		`- public string LocationId { get; set; }`
	`10`	`+ public int LocationId { get; set; }`
`11`	`11`	`public string Code { get; set; }`
`12`	`12`	`public string Description { get; set; }`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ public LocationsController(MarketingContext context)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`[HttpGet]`
`23`		`- [Route("api/v1/campaigns/{campaignId:int}/locations/{userLocationRuleId:int}")]`
	`23`	`+ [Route("api/v1/campaigns/{campaignId:int}/locations/{userLocationRuleId:int}",`
	`24`	`+ Name = "GetLocationByCampaignAndLocationRuleId")]`
`24`	`25`	`public IActionResult GetLocationByCampaignAndLocationRuleId(int campaignId,`
`25`	`26`	`int userLocationRuleId)`
`26`	`27`	`{`
`@@ -83,7 +84,7 @@ public async Task<IActionResult> CreateLocation(int campaignId,`
`83`	`84`	`await _context.Rules.AddAsync(locationRule);`
`84`	`85`	`await _context.SaveChangesAsync();`
`85`	`86`
`86`		`- return CreatedAtAction(nameof(GetLocationByCampaignAndLocationRuleId),`
	`87`	`+ return CreatedAtRoute(nameof(GetLocationByCampaignAndLocationRuleId),`
`87`	`88`	`new { campaignId = campaignId, locationRuleId = locationRule.Id }, null);`
`88`	`89`	`}`
`89`	`90`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@ namespace Microsoft.eShopOnContainers.Services.Marketing.API.Model`
`9`	`9`	`{`
`10`	`10`	`public class Location`
`11`	`11`	`{`
`12`		`- [BsonRepresentation(BsonType.ObjectId)]`
`13`		`- public string LocationId { get; set; }`
	`12`	`+ public int LocationId { get; set; }`
`14`	`13`	`public string Code { get; set; }`
`15`	`14`	`public string Description { get; set; }`
`16`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`public class UserLocationDetails`
`4`	`4`	`{`
`5`		`- public string LocationId { get; set; }`
	`5`	`+ public int LocationId { get; set; }`
`6`	`6`	`public string Code { get; set; }`
`7`	`7`	`public string Description { get; set; }`
`8`	`8`	`}`