Merge pull request #242 from haedoang/feature/location-refact

Feature/location refact
bsideproject · Nov 8, 2023 · 79712d2 · 79712d2
2 parents 27faced + 8fff434
commit 79712d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/koliving/api/location/application/dto/LocationResponse.java b/src/main/java/com/koliving/api/location/application/dto/LocationResponse.java
@@ -4,13 +4,13 @@
 import com.koliving.api.location.domain.LocationType;
 
 
-public record LocationResponse(Long id, Long upperLocationId, String name, String displayName,
+public record LocationResponse(Long id, LocationResponse upperLocation, String name, String displayName,
                                LocationType locationType) {
 
     public static LocationResponse valueOf(Location entity) {
         return new LocationResponse(
             entity.getId(),
-            entity.getUpperLocationId(),
+            entity.getLocationType().isTopLocation() ? null : LocationResponse.valueOf(entity.getUpperLocation()),
             entity.getName(),
             entity.displayName(),
             entity.getLocationType()

diff --git a/src/main/java/com/koliving/api/my/ui/MyController.java b/src/main/java/com/koliving/api/my/ui/MyController.java
@@ -26,7 +26,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 
-@Tag(name = "MY API", description = "MY API")
+@Tag(name = "마이페이지 API", description = "MY API")
 @RestController
 @RequestMapping("api/v1/my")
 @RequiredArgsConstructor