Skip to content

Commit e811bc1

Browse files
authored
Merge pull request #283 from PAW-KEY/feat/#282
[feat] 지역구 영역 좌표 조회 API 응답 구조 수정 및 유저 지역 수정 API 구현
2 parents 90290c9 + 23b00e9 commit e811bc1

File tree

5 files changed

+28
-25
lines changed

5 files changed

+28
-25
lines changed

src/main/java/org/sopt/pawkey/backendapi/domain/region/api/controller/RegionController.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.sopt.pawkey.backendapi.global.constants.AppConstants.*;
44

5+
import io.swagger.v3.oas.annotations.Parameter;
56
import org.sopt.pawkey.backendapi.domain.auth.annotation.UserId;
67
import org.sopt.pawkey.backendapi.domain.region.api.dto.GetRegionCoordinatesResponseDto;
78
import org.sopt.pawkey.backendapi.domain.region.api.dto.GetRegionListResponseDto;
@@ -57,7 +58,7 @@ public ResponseEntity<ApiResponse<GetRegionListResponseDto>> getRegionList() {
5758
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "현재 지역 리스트 조회")
5859
})
5960
public ResponseEntity<ApiResponse<GetRegionResponseDto>> getCurrentRegion(
60-
@UserId Long userId
61+
@Parameter(hidden = true) @UserId Long userId
6162
) {
6263
GetRegionResult result = getRegionFacade.execute(userId);
6364

@@ -71,14 +72,17 @@ public ResponseEntity<ApiResponse<GetRegionResponseDto>> getCurrentRegion(
7172
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "지역 범위 좌표 조회"),
7273
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "조회 실패 (U40401 또는 R40401 에러코드 확인)", content = @Content(mediaType = "application/json", schema = @Schema(implementation = BusinessException.class)))})
7374
public ResponseEntity<ApiResponse<GetRegionCoordinatesResponseDto>> getRegionCoordinates(
74-
@UserId Long userId,
75+
@Parameter(hidden = true) @UserId Long userId,
7576
@PathVariable("regionId") Long regionId
7677
) {
7778

78-
GetRegionCoordinatesResult result = getRegionCoordinatesFacade.execute(userId,
79-
GetRegionCoordinatesCommand.of(regionId));
79+
GetRegionCoordinatesResult result = getRegionCoordinatesFacade.execute(GetRegionCoordinatesCommand.of(regionId));
8080

8181
return ResponseEntity.ok(
8282
ApiResponse.success(GetRegionCoordinatesResponseDto.from(result)));
8383
}
84+
85+
86+
87+
8488
}

src/main/java/org/sopt/pawkey/backendapi/domain/region/api/dto/GetRegionCoordinatesResponseDto.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
@Builder
1010
public record GetRegionCoordinatesResponseDto(
11-
String regionName,
12-
String preRegionName,
13-
Map<String, Object> geometryDto
11+
Long regionId,
12+
String regionName,
13+
Map<String, Object> geometry
1414
) {
1515
public static GetRegionCoordinatesResponseDto from(GetRegionCoordinatesResult result) {
16-
return GetRegionCoordinatesResponseDto.builder()
17-
.preRegionName(result.preRegionName())
18-
.regionName(result.regionName())
19-
.geometryDto(result.geometryDto())
20-
.build();
16+
return new GetRegionCoordinatesResponseDto(
17+
result.regionId(),
18+
result.regionName(),
19+
result.geometry()
20+
);
2121
}
2222
}

src/main/java/org/sopt/pawkey/backendapi/domain/region/application/dto/result/GetRegionCoordinatesResult.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88

99
@Builder
1010
public record GetRegionCoordinatesResult(
11+
Long regionId,
1112
String regionName,
12-
String preRegionName,
13-
Map<String, Object> geometryDto
13+
Map<String, Object> geometry
1414
) {
15-
public static GetRegionCoordinatesResult from(String preRegionName, RegionEntity region) {
15+
public static GetRegionCoordinatesResult from(RegionEntity region) {
1616

1717
return GetRegionCoordinatesResult.builder()
18-
.preRegionName(preRegionName)
19-
.regionName(region.getFullRegionName())
20-
.geometryDto(region.getGeoJson())
21-
.build();
18+
.regionId(region.getRegionId())
19+
.regionName(region.getFullRegionName())
20+
.geometry(region.getGeoJson())
21+
.build();
2222
}
2323

2424
}

src/main/java/org/sopt/pawkey/backendapi/domain/region/application/facade/query/GetRegionCoordinatesFacade.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
public class GetRegionCoordinatesFacade {
1818

1919
private final RegionService regionService;
20-
private final UserService userService;
2120

22-
public GetRegionCoordinatesResult execute(Long userId,
23-
GetRegionCoordinatesCommand getRegionCoordinatesCommand) {
2421

25-
UserEntity user = userService.findById(userId);
26-
RegionEntity region = regionService.getRegionByIdOrThrow(getRegionCoordinatesCommand.regionId());
22+
public GetRegionCoordinatesResult execute(GetRegionCoordinatesCommand getRegionCoordinatesCommand) {
2723

28-
return GetRegionCoordinatesResult.from(user.getRegion().getFullRegionName(), region);
24+
RegionEntity region = regionService.getDongTypeRegionByIdOrThrow(getRegionCoordinatesCommand.regionId());
25+
26+
return GetRegionCoordinatesResult.from(region);
2927
}
3028
}

src/main/java/org/sopt/pawkey/backendapi/domain/user/api/controller/UserController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ public ResponseEntity<ApiResponse<ListResponseWrapper<ReviewCardResponseDto>>> g
173173
ListResponseWrapper<ReviewCardResponseDto> response = userWrittenPostQueryFacade.getMyReviews(userId);
174174
return ResponseEntity.ok(ApiResponse.success(response));
175175
}
176+
176177
}
177178

178179

0 commit comments

Comments
 (0)