From 226890fbce5a899a8c8491024a6f75fe4e2464d8 Mon Sep 17 00:00:00 2001 From: Marusyk Date: Thu, 29 Mar 2018 18:06:25 +0300 Subject: [PATCH] Location. Fixed async/await misuses --- .../Controllers/LocationsController.cs | 8 +- .../Infrastructure/LocationsContextSeed.cs | 132 +++++++++--------- .../Repositories/LocationsRepository.cs | 32 ++--- .../Services/ILocationsService.cs | 8 +- .../Services/LocationsService.cs | 14 +- 5 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/Services/Location/Locations.API/Controllers/LocationsController.cs b/src/Services/Location/Locations.API/Controllers/LocationsController.cs index 45f4d2ba7..79ce59129 100644 --- a/src/Services/Location/Locations.API/Controllers/LocationsController.cs +++ b/src/Services/Location/Locations.API/Controllers/LocationsController.cs @@ -29,7 +29,7 @@ namespace Locations.API.Controllers [ProducesResponseType(typeof(UserLocation), (int)HttpStatusCode.OK)] public async Task GetUserLocation(Guid userId) { - var userLocation = await _locationsService.GetUserLocation(userId.ToString()); + var userLocation = await _locationsService.GetUserLocationAsync(userId.ToString()); return Ok(userLocation); } @@ -39,7 +39,7 @@ namespace Locations.API.Controllers //[ProducesResponseType(typeof(List), (int)HttpStatusCode.OK)] public async Task GetAllLocations() { - var locations = await _locationsService.GetAllLocation(); + var locations = await _locationsService.GetAllLocationAsync(); return Ok(locations); } @@ -49,7 +49,7 @@ namespace Locations.API.Controllers //[ProducesResponseType(typeof(List), (int)HttpStatusCode.OK)] public async Task GetLocation(int locationId) { - var location = await _locationsService.GetLocation(locationId); + var location = await _locationsService.GetLocationAsync(locationId); return Ok(location); } @@ -61,7 +61,7 @@ namespace Locations.API.Controllers public async Task CreateOrUpdateUserLocation([FromBody]LocationRequest newLocReq) { var userId = _identityService.GetUserIdentity(); - var result = await _locationsService.AddOrUpdateUserLocation(userId, newLocReq); + var result = await _locationsService.AddOrUpdateUserLocationAsync(userId, newLocReq); return result ? (IActionResult)Ok() : diff --git a/src/Services/Location/Locations.API/Infrastructure/LocationsContextSeed.cs b/src/Services/Location/Locations.API/Infrastructure/LocationsContextSeed.cs index 91d00a4f3..76e636606 100644 --- a/src/Services/Location/Locations.API/Infrastructure/LocationsContextSeed.cs +++ b/src/Services/Location/Locations.API/Infrastructure/LocationsContextSeed.cs @@ -22,20 +22,20 @@ if (!ctx.Locations.Database.GetCollection(nameof(Locations)).AsQueryable().Any()) { - await SetIndexes(); - await SetNorthAmerica(); - await SetSouthAmerica(); - await SetAfrica(); - await SetEurope(); - await SetAsia(); - await SetAustralia(); - await SetBarcelonaLocations(); + await SetIndexesAsync(); + await SetNorthAmericaAsync(); + await SetSouthAmericaAsync(); + await SetAfricaAsync(); + await SetEuropeAsync(); + await SetAsiaAsync(); + await SetAustraliaAsync(); + await SetBarcelonaLocationsAsync(); } } - static async Task SetNorthAmerica() + private static async Task SetNorthAmericaAsync() { - var us = new Locations() + var us = new Locations { Code = "NA", Description = "North America", @@ -44,10 +44,10 @@ us.SetLocation(-103.219329, 48.803281); us.SetArea(GetNorthAmericaPoligon()); await ctx.Locations.InsertOneAsync(us); - await SetUSLocations(us.Id); + await SetUSLocationsAsync(us.Id); } - static async Task SetUSLocations(string parentId) + private static async Task SetUSLocationsAsync(string parentId) { var us = new Locations() { @@ -57,14 +57,14 @@ LocationId = 2 }; us.SetLocation(-101.357386, 41.650455); - us.SetArea(GetUSPoligon()); + us.SetArea(GetUsPoligon()); await ctx.Locations.InsertOneAsync(us); - await SetWashingtonLocations(us.Id); + await SetWashingtonLocationsAsync(us.Id); } - static async Task SetWashingtonLocations(string parentId) + private static async Task SetWashingtonLocationsAsync(string parentId) { - var wht = new Locations() + var wht = new Locations { Parent_Id = parentId, Code = "WHT", @@ -74,13 +74,13 @@ wht.SetLocation(-119.542781, 47.223652); wht.SetArea(GetWashingtonPoligon()); await ctx.Locations.InsertOneAsync(wht); - await SetSeattleLocations(wht.Id); - await SetRedmondLocations(wht.Id); + await SetSeattleLocationsAsync(wht.Id); + await SetRedmondLocationsAsync(wht.Id); } - static async Task SetSeattleLocations(string parentId) + private static Task SetSeattleLocationsAsync(string parentId) { - var stl = new Locations() + var stl = new Locations { Parent_Id = parentId, Code = "SEAT", @@ -89,12 +89,12 @@ }; stl.SetArea(GetSeattlePoligon()); stl.SetLocation(-122.330747, 47.603111); - await ctx.Locations.InsertOneAsync(stl); + return ctx.Locations.InsertOneAsync(stl); } - static async Task SetRedmondLocations(string parentId) + private static Task SetRedmondLocationsAsync(string parentId) { - var rdm = new Locations() + var rdm = new Locations { Parent_Id = parentId, Code = "REDM", @@ -103,12 +103,12 @@ }; rdm.SetLocation(-122.122887, 47.674961); rdm.SetArea(GetRedmondPoligon()); - await ctx.Locations.InsertOneAsync(rdm); + return ctx.Locations.InsertOneAsync(rdm); } - static async Task SetBarcelonaLocations() + private static Task SetBarcelonaLocationsAsync() { - var bcn = new Locations() + var bcn = new Locations { Code = "BCN", Description = "Barcelona", @@ -116,12 +116,12 @@ }; bcn.SetLocation(2.156453, 41.395226); bcn.SetArea(GetBarcelonaPoligon()); - await ctx.Locations.InsertOneAsync(bcn); + return ctx.Locations.InsertOneAsync(bcn); } - static async Task SetSouthAmerica() + private static Task SetSouthAmericaAsync() { - var sa = new Locations() + var sa = new Locations { Code = "SA", Description = "South America", @@ -129,12 +129,12 @@ }; sa.SetLocation(-60.328704, -16.809748); sa.SetArea(GetSouthAmericaPoligon()); - await ctx.Locations.InsertOneAsync(sa); + return ctx.Locations.InsertOneAsync(sa); } - static async Task SetAfrica() + private static Task SetAfricaAsync() { - var afc = new Locations() + var afc = new Locations { Code = "AFC", Description = "Africa", @@ -142,12 +142,12 @@ }; afc.SetLocation(19.475383, 13.063667); afc.SetArea(GetAfricaPoligon()); - await ctx.Locations.InsertOneAsync(afc); + return ctx.Locations.InsertOneAsync(afc); } - static async Task SetEurope() + private static Task SetEuropeAsync() { - var eu = new Locations() + var eu = new Locations { Code = "EU", Description = "Europe", @@ -155,12 +155,12 @@ }; eu.SetLocation(13.147258, 49.947844); eu.SetArea(GetEuropePoligon()); - await ctx.Locations.InsertOneAsync(eu); + return ctx.Locations.InsertOneAsync(eu); } - static async Task SetAsia() + private static Task SetAsiaAsync() { - var asa = new Locations() + var asa = new Locations { Code = "AS", Description = "Asia", @@ -168,12 +168,12 @@ }; asa.SetLocation(97.522257, 56.069107); asa.SetArea(GetAsiaPoligon()); - await ctx.Locations.InsertOneAsync(asa); + return ctx.Locations.InsertOneAsync(asa); } - static async Task SetAustralia() + private static Task SetAustraliaAsync() { - var aus = new Locations() + var aus = new Locations { Code = "AUS", Description = "Australia", @@ -181,20 +181,20 @@ }; aus.SetLocation(133.733195, -25.010726); aus.SetArea(GetAustraliaPoligon()); - await ctx.Locations.InsertOneAsync(aus); + return ctx.Locations.InsertOneAsync(aus); } - static async Task SetIndexes() + private static Task SetIndexesAsync() { // Set location indexes var builder = Builders.IndexKeys; var keys = builder.Geo2DSphere(prop => prop.Location); - await ctx.Locations.Indexes.CreateOneAsync(keys); + return ctx.Locations.Indexes.CreateOneAsync(keys); } - static List GetNorthAmericaPoligon() + private static List GetNorthAmericaPoligon() { - return new List() + return new List { new GeoJson2DGeographicCoordinates(-168.07786, 68.80277), new GeoJson2DGeographicCoordinates(-119.60378, 32.7561), @@ -207,9 +207,9 @@ }; } - static List GetSouthAmericaPoligon() + private static List GetSouthAmericaPoligon() { - return new List() + return new List { new GeoJson2DGeographicCoordinates(-91.43724, 13.29007), new GeoJson2DGeographicCoordinates(-87.96315, -27.15081), @@ -223,9 +223,9 @@ }; } - static List GetAfricaPoligon() + private static List GetAfricaPoligon() { - return new List() + return new List { new GeoJson2DGeographicCoordinates(-12.68724, 34.05892), new GeoJson2DGeographicCoordinates(-18.33301, 20.77313), @@ -241,9 +241,9 @@ }; } - static List GetEuropePoligon() + private static List GetEuropePoligon() { - return new List() + return new List { new GeoJson2DGeographicCoordinates(-11.73143, 35.27646), new GeoJson2DGeographicCoordinates(-10.84462, 35.25123), @@ -255,9 +255,9 @@ }; } - static List GetAsiaPoligon() + private static List GetAsiaPoligon() { - return new List() + return new List { new GeoJson2DGeographicCoordinates(31.1592, 45.91629), new GeoJson2DGeographicCoordinates(32.046, 45.89479), @@ -270,9 +270,9 @@ }; } - static List GetAustraliaPoligon() + private static List GetAustraliaPoligon() { - return new List() + return new List { new GeoJson2DGeographicCoordinates(100.76857, -45.74117), new GeoJson2DGeographicCoordinates(101.65538, -45.76273), @@ -285,9 +285,9 @@ }; } - static List GetUSPoligon() + static List GetUsPoligon() { - return new List() + return new List { new GeoJson2DGeographicCoordinates(-62.88205, 48.7985), new GeoJson2DGeographicCoordinates(-129.3132, 48.76513), @@ -298,9 +298,9 @@ }; } - static List GetSeattlePoligon() + private static List GetSeattlePoligon() { - return new List() + return new List { new GeoJson2DGeographicCoordinates(-122.36238,47.82929), new GeoJson2DGeographicCoordinates(-122.42091,47.6337), @@ -311,9 +311,9 @@ }; } - static List GetRedmondPoligon() + private static List GetRedmondPoligon() { - return new List() + return new List { new GeoJson2DGeographicCoordinates(-122.15432, 47.73148), new GeoJson2DGeographicCoordinates(-122.17673, 47.72559), @@ -326,9 +326,9 @@ }; } - static List GetWashingtonPoligon() + private static List GetWashingtonPoligon() { - return new List() + return new List { new GeoJson2DGeographicCoordinates(-124.68633, 48.8943), new GeoJson2DGeographicCoordinates(-124.32962, 45.66613), @@ -338,9 +338,9 @@ }; } - static List GetBarcelonaPoligon() + private static List GetBarcelonaPoligon() { - return new List() + return new List { new GeoJson2DGeographicCoordinates(2.033879, 41.383858), new GeoJson2DGeographicCoordinates(2.113741, 41.419068), diff --git a/src/Services/Location/Locations.API/Infrastructure/Repositories/LocationsRepository.cs b/src/Services/Location/Locations.API/Infrastructure/Repositories/LocationsRepository.cs index 9f8d42ad4..48f6e3ca3 100644 --- a/src/Services/Location/Locations.API/Infrastructure/Repositories/LocationsRepository.cs +++ b/src/Services/Location/Locations.API/Infrastructure/Repositories/LocationsRepository.cs @@ -19,44 +19,44 @@ _context = new LocationsContext(settings); } - public async Task GetAsync(int locationId) + public Task GetAsync(int locationId) { var filter = Builders.Filter.Eq("LocationId", locationId); - return await _context.Locations - .Find(filter) - .FirstOrDefaultAsync(); + return _context.Locations + .Find(filter) + .FirstOrDefaultAsync(); } - public async Task GetUserLocationAsync(string userId) + public Task GetUserLocationAsync(string userId) { var filter = Builders.Filter.Eq("UserId", userId); - return await _context.UserLocation - .Find(filter) - .FirstOrDefaultAsync(); + return _context.UserLocation + .Find(filter) + .FirstOrDefaultAsync(); } - public async Task> GetLocationListAsync() + public Task> GetLocationListAsync() { - return await _context.Locations.Find(new BsonDocument()).ToListAsync(); + return _context.Locations.Find(new BsonDocument()).ToListAsync(); } - public async Task> GetCurrentUserRegionsListAsync(LocationRequest currentPosition) + public Task> GetCurrentUserRegionsListAsync(LocationRequest currentPosition) { var point = GeoJson.Point(GeoJson.Geographic(currentPosition.Longitude, currentPosition.Latitude)); var orderByDistanceQuery = new FilterDefinitionBuilder().Near(x => x.Location, point); var withinAreaQuery = new FilterDefinitionBuilder().GeoIntersects("Polygon", point); var filter = Builders.Filter.And(orderByDistanceQuery, withinAreaQuery); - return await _context.Locations.Find(filter).ToListAsync(); + return _context.Locations.Find(filter).ToListAsync(); } - public async Task AddUserLocationAsync(UserLocation location) + public Task AddUserLocationAsync(UserLocation location) { - await _context.UserLocation.InsertOneAsync(location); + return _context.UserLocation.InsertOneAsync(location); } - public async Task UpdateUserLocationAsync(UserLocation userLocation) + public Task UpdateUserLocationAsync(UserLocation userLocation) { - await _context.UserLocation.ReplaceOneAsync( + return _context.UserLocation.ReplaceOneAsync( doc => doc.UserId == userLocation.UserId, userLocation, new UpdateOptions { IsUpsert = true }); diff --git a/src/Services/Location/Locations.API/Infrastructure/Services/ILocationsService.cs b/src/Services/Location/Locations.API/Infrastructure/Services/ILocationsService.cs index 5d55bb25e..11459492a 100644 --- a/src/Services/Location/Locations.API/Infrastructure/Services/ILocationsService.cs +++ b/src/Services/Location/Locations.API/Infrastructure/Services/ILocationsService.cs @@ -7,12 +7,12 @@ public interface ILocationsService { - Task GetLocation(int locationId); + Task GetLocationAsync(int locationId); - Task GetUserLocation(string id); + Task GetUserLocationAsync(string id); - Task> GetAllLocation(); + Task> GetAllLocationAsync(); - Task AddOrUpdateUserLocation(string userId, LocationRequest locRequest); + Task AddOrUpdateUserLocationAsync(string userId, LocationRequest locRequest); } } diff --git a/src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs b/src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs index 771a075d2..205c82297 100644 --- a/src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs +++ b/src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs @@ -21,22 +21,22 @@ _eventBus = eventBus ?? throw new ArgumentNullException(nameof(eventBus)); } - public async Task GetLocation(int locationId) + public Task GetLocationAsync(int locationId) { - return await _locationsRepository.GetAsync(locationId); + return _locationsRepository.GetAsync(locationId); } - public async Task GetUserLocation(string userId) + public Task GetUserLocationAsync(string userId) { - return await _locationsRepository.GetUserLocationAsync(userId); + return _locationsRepository.GetUserLocationAsync(userId); } - public async Task> GetAllLocation() + public Task> GetAllLocationAsync() { - return await _locationsRepository.GetLocationListAsync(); + return _locationsRepository.GetLocationListAsync(); } - public async Task AddOrUpdateUserLocation(string userId, LocationRequest currentPosition) + public async Task AddOrUpdateUserLocationAsync(string userId, LocationRequest currentPosition) { // Get the list of ordered regions the user currently is within var currentUserAreaLocationList = await _locationsRepository.GetCurrentUserRegionsListAsync(currentPosition);