Skip to content

Commit 4d8f3cb

Browse files
author
ericuss
committed
partial checkin
1 parent 9e97fb4 commit 4d8f3cb

7 files changed

Lines changed: 145 additions & 93 deletions

File tree

‎src/Services/Location/Locations.API/Model/Core/LocationPoint.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Threading.Tasks;
5+
6+
namespace Locations.API.Model.Core
7+
{
8+
public class LocationPoint
9+
{
10+
public LocationPoint()
11+
{
12+
}
13+
14+
public LocationPoint(double longitude, double latitude)
15+
{
16+
this.coordinates.Add(longitude);
17+
this.coordinates.Add(latitude);
18+
}
19+
20+
public string type { get; private set; } = "Point";
21+
22+
public List<double> coordinates { get; private set; } = new List<double>();
23+
}
24+
}

‎src/Services/Location/Locations.API/Model/Core/LocationPolygon.cs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using MongoDB.Driver.GeoJsonObjectModel;
2+
using System;
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
using System.Threading.Tasks;
6+
7+
namespace Locations.API.Model.Core
8+
{
9+
public class LocationPolygon
10+
{
11+
public LocationPolygon()
12+
{
13+
}
14+
15+
public LocationPolygon(List<GeoJson2DGeographicCoordinates> coordinatesList)
16+
{
17+
var coordinatesMapped = coordinatesList.Select(x => new List<double>() { x.Longitude, x.Latitude }).ToList();
18+
this.coordinates.Add(coordinatesMapped);
19+
}
20+
21+
public string type { get; private set; } = "Polygon";
22+
23+
public List<List<List<double>>> coordinates { get; private set; } = new List<List<List<double>>>();
24+
}
25+
}

‎src/Services/Location/Locations.API/Model/Locations.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace Microsoft.eShopOnContainers.Services.Locations.API.Model
22
{
3+
using global::Locations.API.Model.Core;
34
using MongoDB.Bson;
45
using MongoDB.Bson.Serialization.Attributes;
56
using MongoDB.Driver.GeoJsonObjectModel;
@@ -17,23 +18,23 @@ public class Locations
1718
public string Description { get; set; }
1819
public double Latitude { get; set; }
1920
public double Longitude { get; set; }
20-
public GeoJsonPoint<GeoJson2DGeographicCoordinates> Location { get; private set; }
21-
public GeoJsonPolygon<GeoJson2DGeographicCoordinates> Polygon { get; private set; }
21+
//public GeoJsonPoint<GeoJson2DGeographicCoordinates> Location { get; private set; }
22+
public LocationPoint Location { get; private set; }
23+
public LocationPolygon Polygon { get; private set; }
24+
//public GeoJsonPolygon<GeoJson2DGeographicCoordinates> Polygon { get; private set; }
2225
public void SetLocation(double lon, double lat) => SetPosition(lon, lat);
2326
public void SetArea(List<GeoJson2DGeographicCoordinates> coordinatesList) => SetPolygon(coordinatesList);
2427

2528
private void SetPosition(double lon, double lat)
2629
{
2730
Latitude = lat;
2831
Longitude = lon;
29-
Location = new GeoJsonPoint<GeoJson2DGeographicCoordinates>(
30-
new GeoJson2DGeographicCoordinates(lon, lat));
32+
Location = new LocationPoint(lon, lat);
3133
}
3234

3335
private void SetPolygon(List<GeoJson2DGeographicCoordinates> coordinatesList)
3436
{
35-
Polygon = new GeoJsonPolygon<GeoJson2DGeographicCoordinates>(new GeoJsonPolygonCoordinates<GeoJson2DGeographicCoordinates>(
36-
new GeoJsonLinearRingCoordinates<GeoJson2DGeographicCoordinates>(coordinatesList)));
37+
Polygon = new LocationPolygon(coordinatesList);
3738
}
3839
}
3940
}

‎src/Services/Location/Locations.API/Startup.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
154154
}
155155

156156
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
157-
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
157+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
158158
{
159159
//loggerFactory.AddAzureWebAppDiagnostics();
160160
//loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
@@ -167,10 +167,9 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
167167

168168
app.UseCors("CorsPolicy");
169169

170+
app.UseRouting();
170171
ConfigureAuth(app);
171172

172-
app.UseAuthorization();
173-
app.UseRouting();
174173
app.UseEndpoints(endpoints =>
175174
{
176175
endpoints.MapDefaultControllerRoute();
@@ -230,6 +229,7 @@ protected virtual void ConfigureAuth(IApplicationBuilder app)
230229
}
231230

232231
app.UseAuthentication();
232+
app.UseAuthorization();
233233
}
234234

235235
private void RegisterEventBus(IServiceCollection services)

‎src/Services/Location/Locations.FunctionalTests/Locations.FunctionalTests.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,15 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.AspNetCore.App" />
21-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
20+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(Microsoft_AspNetCore_Mvc_Testing)" />
2221
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(Microsoft_NET_Test_Sdk)" />
2322
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(Microsoft_AspNetCore_TestHost)" />
2423
<PackageReference Include="xunit" Version="$(xunit)" />
2524
<PackageReference Include="xunit.runner.visualstudio" Version="$(xunit_runner_visualstudio)">
2625
<PrivateAssets>all</PrivateAssets>
2726
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2827
</PackageReference>
29-
28+
3029
</ItemGroup>
3130

3231
<ItemGroup>

‎src/Services/Location/Locations.FunctionalTests/LocationsScenarios.cs‎

Lines changed: 79 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,37 @@ namespace Locations.FunctionalTests
1212
public class LocationsScenarios
1313
: LocationsScenarioBase
1414
{
15-
[Fact]
16-
public async Task Set_new_user_seattle_location_response_ok_status_code()
17-
{
18-
using (var server = CreateServer())
19-
{
20-
var userId = "4611ce3f-380d-4db5-8d76-87a8689058ed";
21-
var content = new StringContent(BuildLocationsRequest(-122.315752, 47.604610), UTF8Encoding.UTF8, "application/json");
15+
//[Fact]
16+
//public async Task Set_new_user_seattle_location_response_ok_status_code()
17+
//{
18+
// using (var server = CreateServer())
19+
// {
20+
// var userId = "4611ce3f-380d-4db5-8d76-87a8689058ed";
21+
// var content = new StringContent(BuildLocationsRequest(-122.315752, 47.604610), UTF8Encoding.UTF8, "application/json");
2222

23-
// Expected result
24-
var expectedLocation = "SEAT";
23+
// // Expected result
24+
// var expectedLocation = "SEAT";
2525

26-
// Act
27-
var response = await server.CreateClient()
28-
.PostAsync(Post.AddNewLocation, content);
26+
// // Act
27+
// var response = await server.CreateClient()
28+
// .PostAsync(Post.AddNewLocation, content);
2929

30-
var userLocationResponse = await server.CreateClient()
31-
.GetAsync(Get.UserLocationBy(userId));
30+
// var userLocationResponse = await server.CreateClient()
31+
// .GetAsync(Get.UserLocationBy(userId));
3232

33-
var responseBody = await userLocationResponse.Content.ReadAsStringAsync();
34-
var userLocation = JsonConvert.DeserializeObject<UserLocation>(responseBody);
33+
// var responseBody = await userLocationResponse.Content.ReadAsStringAsync();
34+
// var userLocation = JsonConvert.DeserializeObject<UserLocation>(responseBody);
3535

36-
var locationResponse = await server.CreateClient()
37-
.GetAsync(Get.LocationBy(userLocation.LocationId));
36+
// var locationResponse = await server.CreateClient()
37+
// .GetAsync(Get.LocationBy(userLocation.LocationId));
3838

39-
responseBody = await locationResponse.Content.ReadAsStringAsync();
40-
var location = JsonConvert.DeserializeObject<Microsoft.eShopOnContainers.Services.Locations.API.Model.Locations>(responseBody);
39+
// responseBody = await locationResponse.Content.ReadAsStringAsync();
40+
// var location = JsonConvert.DeserializeObject<Microsoft.eShopOnContainers.Services.Locations.API.Model.Locations>(responseBody);
4141

42-
// Assert
43-
Assert.Equal(expectedLocation, location.Code);
44-
}
45-
}
42+
// // Assert
43+
// Assert.Equal(expectedLocation, location.Code);
44+
// }
45+
//}
4646

4747
[Fact]
4848
public async Task Set_new_user_readmond_location_response_ok_status_code()
@@ -52,53 +52,24 @@ public async Task Set_new_user_readmond_location_response_ok_status_code()
5252
var userId = "4611ce3f-380d-4db5-8d76-87a8689058ed";
5353
var content = new StringContent(BuildLocationsRequest(-122.119998, 47.690876), UTF8Encoding.UTF8, "application/json");
5454

55+
var client = server.CreateClient();
56+
5557
// Expected result
5658
var expectedLocation = "REDM";
5759

5860
// Act
59-
var response = await server.CreateClient()
60-
.PostAsync(Post.AddNewLocation, content);
61-
62-
var userLocationResponse = await server.CreateClient()
63-
.GetAsync(Get.UserLocationBy(userId));
64-
65-
var responseBody = await userLocationResponse.Content.ReadAsStringAsync();
66-
var userLocation = JsonConvert.DeserializeObject<UserLocation>(responseBody);
67-
68-
var locationResponse = await server.CreateClient()
69-
.GetAsync(Get.LocationBy(userLocation.LocationId));
70-
71-
responseBody = await locationResponse.Content.ReadAsStringAsync();
72-
var location = JsonConvert.DeserializeObject<Microsoft.eShopOnContainers.Services.Locations.API.Model.Locations>(responseBody);
7361

74-
// Assert
75-
Assert.Equal(expectedLocation, location.Code);
76-
}
77-
}
78-
79-
[Fact]
80-
public async Task Set_new_user_Washington_location_response_ok_status_code()
81-
{
82-
using (var server = CreateServer())
83-
{
84-
var userId = "4611ce3f-380d-4db5-8d76-87a8689058ed";
85-
var content = new StringContent(BuildLocationsRequest(-121.040360, 48.091631), UTF8Encoding.UTF8, "application/json");
86-
87-
// Expected result
88-
var expectedLocation = "WHT";
62+
var response = await client.PostAsync(Post.AddNewLocation, content);
8963

90-
// Act
91-
var response = await server.CreateClient()
92-
.PostAsync(Post.AddNewLocation, content);
93-
94-
var userLocationResponse = await server.CreateClient()
95-
.GetAsync(Get.UserLocationBy(userId));
64+
var userLocationResponse = await client.GetAsync(Get.UserLocationBy(userId));
65+
userLocationResponse.EnsureSuccessStatusCode();
9666

9767
var responseBody = await userLocationResponse.Content.ReadAsStringAsync();
9868
var userLocation = JsonConvert.DeserializeObject<UserLocation>(responseBody);
9969

100-
var locationResponse = await server.CreateClient()
101-
.GetAsync(Get.LocationBy(userLocation.LocationId));
70+
Assert.NotNull(userLocation);
71+
72+
var locationResponse = await client.GetAsync(Get.LocationBy(userLocation.LocationId));
10273

10374
responseBody = await locationResponse.Content.ReadAsStringAsync();
10475
var location = JsonConvert.DeserializeObject<Microsoft.eShopOnContainers.Services.Locations.API.Model.Locations>(responseBody);
@@ -108,21 +79,53 @@ public async Task Set_new_user_Washington_location_response_ok_status_code()
10879
}
10980
}
11081

111-
[Fact]
112-
public async Task Get_all_locations_response_ok_status_code()
113-
{
114-
using (var server = CreateServer())
115-
{
116-
var response = await server.CreateClient()
117-
.GetAsync(Get.Locations);
118-
119-
var responseBody = await response.Content.ReadAsStringAsync();
120-
var locations = JsonConvert.DeserializeObject<List<Microsoft.eShopOnContainers.Services.Locations.API.Model.Locations>>(responseBody);
121-
122-
// Assert
123-
Assert.NotEmpty(locations);
124-
}
125-
}
82+
//[Fact]
83+
//public async Task Set_new_user_Washington_location_response_ok_status_code()
84+
//{
85+
// using (var server = CreateServer())
86+
// {
87+
// var userId = "4611ce3f-380d-4db5-8d76-87a8689058ed";
88+
// var content = new StringContent(BuildLocationsRequest(-121.040360, 48.091631), UTF8Encoding.UTF8, "application/json");
89+
90+
// // Expected result
91+
// var expectedLocation = "WHT";
92+
93+
// // Act
94+
// var response = await server.CreateClient()
95+
// .PostAsync(Post.AddNewLocation, content);
96+
97+
// var userLocationResponse = await server.CreateClient()
98+
// .GetAsync(Get.UserLocationBy(userId));
99+
100+
// var responseBody = await userLocationResponse.Content.ReadAsStringAsync();
101+
// var userLocation = JsonConvert.DeserializeObject<UserLocation>(responseBody);
102+
103+
// var locationResponse = await server.CreateClient()
104+
// .GetAsync(Get.LocationBy(userLocation.LocationId));
105+
106+
// responseBody = await locationResponse.Content.ReadAsStringAsync();
107+
// var location = JsonConvert.DeserializeObject<Microsoft.eShopOnContainers.Services.Locations.API.Model.Locations>(responseBody);
108+
109+
// // Assert
110+
// Assert.Equal(expectedLocation, location.Code);
111+
// }
112+
//}
113+
114+
//[Fact]
115+
//public async Task Get_all_locations_response_ok_status_code()
116+
//{
117+
// using (var server = CreateServer())
118+
// {
119+
// var response = await server.CreateClient()
120+
// .GetAsync(Get.Locations);
121+
122+
// var responseBody = await response.Content.ReadAsStringAsync();
123+
// var locations = JsonConvert.DeserializeObject<List<Microsoft.eShopOnContainers.Services.Locations.API.Model.Locations>>(responseBody);
124+
125+
// // Assert
126+
// Assert.NotEmpty(locations);
127+
// }
128+
//}
126129

127130
string BuildLocationsRequest(double lon, double lat)
128131
{

‎src/_build/dependencies.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<Microsoft_AspNetCore_HealthChecks>1.0.0</Microsoft_AspNetCore_HealthChecks>
5757
<Microsoft_AspNetCore_Http_Abstractions>2.2.0</Microsoft_AspNetCore_Http_Abstractions>
5858
<Microsoft_AspNetCore_Mvc_Testing>3.0.0-preview6.19307.2</Microsoft_AspNetCore_Mvc_Testing>
59-
<Microsoft_AspNetCore_TestHost>3.0.0-preview6.19307.2</Microsoft_AspNetCore_TestHost>
59+
<Microsoft_AspNetCore_TestHost>3.0.0-preview7.19365.7</Microsoft_AspNetCore_TestHost>
6060
<Microsoft_AspNetCore_Identity_EntityFrameworkCore>3.0.0-preview7.19365.7</Microsoft_AspNetCore_Identity_EntityFrameworkCore>
6161
<Microsoft_AspNetCore_Diagnostics_EntityFrameworkCore>3.0.0-preview7.19365.7</Microsoft_AspNetCore_Diagnostics_EntityFrameworkCore>
6262
<Microsoft_AspNetCore_Hosting_Abstractions>3.0.0-preview4-19123-01</Microsoft_AspNetCore_Hosting_Abstractions>
@@ -80,10 +80,10 @@
8080
<Microsoft_Extensions_Logging>2.2.0</Microsoft_Extensions_Logging>
8181
<Microsoft_Extensions_Logging_AzureAppServices>3.0.0-preview7.19362.4</Microsoft_Extensions_Logging_AzureAppServices>
8282
<Microsoft_NET_Test_Sdk>16.0.1</Microsoft_NET_Test_Sdk>
83-
<mongocsharpdriver>2.5.0</mongocsharpdriver>
84-
<MongoDB_Bson>2.5.0</MongoDB_Bson>
85-
<MongoDB_Driver>2.5.0</MongoDB_Driver>
86-
<MongoDB_Driver_Core>2.5.0</MongoDB_Driver_Core>
83+
<mongocsharpdriver>2.9.0-beta2</mongocsharpdriver>
84+
<MongoDB_Bson>2.9.0-beta2</MongoDB_Bson>
85+
<MongoDB_Driver>2.9.0-beta2</MongoDB_Driver>
86+
<MongoDB_Driver_Core>2.9.0-beta2</MongoDB_Driver_Core>
8787
<Moq>4.10.1</Moq>
8888
<Newtonsoft_Json>12.0.2</Newtonsoft_Json>
8989
<Ocelot>12.0.1</Ocelot>

0 commit comments

Comments
 (0)