fix: property mapping in CentralApi contracts

5G-ERA · Mar 1, 2024 · 7a49087 · 7a49087
1 parent 4d32bc5
commit 7a49087
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/CentralApi/Mappings/ApiContractToDomainMapper.cs b/src/CentralApi/Mappings/ApiContractToDomainMapper.cs
@@ -12,7 +12,8 @@ public static Location ToLocation(this RegisterRequest x)
         {
             Name = x.Name,
             Organization = x.Organization,
-            Type = Enum.Parse<LocationType>(x.Type)
+            Type = Enum.Parse<LocationType>(x.Type),
+            Address = new (x.Address)
         };
     }
 }
diff --git a/src/CentralApi/Services/LocationService.cs b/src/CentralApi/Services/LocationService.cs
@@ -18,7 +18,7 @@ public LocationService(ILocationRepository locationRepository)
     public async Task<OneOf<Location, NotFound>> RegisterLocation(Location location)
     {
         // when location not found in db
-        var (found, loc) = await _locationRepository.ExistsAsync(location.Name);
+        var (found, loc) = await _locationRepository.ExistsAsync(location.Name, location.Organization);
 
 
         if (found == false)

diff --git a/src/DataAccess/Repositories/Abstract/ILocationRepository.cs b/src/DataAccess/Repositories/Abstract/ILocationRepository.cs
@@ -45,7 +45,7 @@ Task<List<Location>> OrderLocationsByUtilizationAsync(List<Location> locationsTo
     Task<bool> IsBusyAsync(Guid id);
     Task<ImmutableList<Location>> GetLocationsByOrganizationAsync(string organization);
 
-    Task<(bool, Location?)> ExistsAsync(string name);
+    Task<(bool, Location?)> ExistsAsync(string name, string organization);
 
     Task<(bool, Location?)> ExistsAsync(Guid id);
 

diff --git a/src/DataAccess/Repositories/Redis/RedisLocationRepository.cs b/src/DataAccess/Repositories/Redis/RedisLocationRepository.cs
@@ -123,9 +123,9 @@ public async Task<ImmutableList<Location>> GetLocationsByOrganizationAsync(strin
     }
 
     /// <inheritdoc />
-    public async Task<(bool, Location?)> ExistsAsync(string name)
+    public async Task<(bool, Location?)> ExistsAsync(string name, string organization)
     {
-        var loc = await FindSingleAsync(dto => dto.Name == name);
+        var loc = await FindSingleAsync(dto => dto.Name == name && dto.Organization == organization);
 
         return (loc is not null, loc);
     }

diff --git a/test/CentralApi.Tests.Unit/Services/LocationServiceTests.cs b/test/CentralApi.Tests.Unit/Services/LocationServiceTests.cs
@@ -49,7 +49,7 @@ public async Task RegisterLocation_ShouldMakeLocationOnlineAndUpdateAddress_When
             Type = LocationType.Cloud,
             IsOnline = true
         };
-        _locationRepository.ExistsAsync(Arg.Any<string>()).Returns((true, cloud));
+        _locationRepository.ExistsAsync(Arg.Any<string>(), Arg.Any<string>()).Returns((true, cloud));
 
         _locationRepository.AddAsync(Arg.Any<Location>()).ReturnsForAnyArgs(cloud);
         // act
@@ -76,7 +76,7 @@ public async Task RegisterLocation_ShouldRegisterNewBareLocation_WhenLocationIsN
             Organization = "MiddlewareTesting",
             Type = LocationType.Cloud
         };
-        _locationRepository.ExistsAsync(Arg.Any<string>()).Returns((false, null));
+        _locationRepository.ExistsAsync(Arg.Any<string>(), Arg.Any<string>()).Returns((false, null));
 
         // act
         var result = await _sut.RegisterLocation(paramLocation);