Merge pull request #71 from locavell/feat/#57

[#57] 지역 이름 변경
locavell · Aug 19, 2024 · 938af9e · 938af9e
2 parents f637043 + df3eefb
commit 938af9e
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 28 deletions.
diff --git a/src/main/java/com/example/locavel/MakeInitData.java b/src/main/java/com/example/locavel/MakeInitData.java
@@ -15,79 +15,79 @@ public class MakeInitData {
     public CommandLineRunner loadRegionData(RegionRepository regionRepository) {
         return args -> {
             Region region1 = Region.builder()
-                    .name("강남구")
+                    .name("서울특별시 강남구")
                     .build();
             Region region2 = Region.builder()
-                    .name("강동구")
+                    .name("서울특별시 강동구")
                     .build();
             Region region3 = Region.builder()
-                    .name("강북구")
+                    .name("서울특별시 강북구")
                     .build();
             Region region4 = Region.builder()
-                    .name("강서구")
+                    .name("서울특별시 강서구")
                     .build();
             Region region5 = Region.builder()
-                    .name("관악구")
+                    .name("서울특별시 관악구")
                     .build();
             Region region6 = Region.builder()
-                    .name("광진구")
+                    .name("서울특별시 광진구")
                     .build();
             Region region7 = Region.builder()
-                    .name("구로구")
+                    .name("서울특별시 구로구")
                     .build();
             Region region8 = Region.builder()
-                    .name("금천구")
+                    .name("서울특별시 금천구")
                     .build();
             Region region9 = Region.builder()
-                    .name("노원구")
+                    .name("서울특별시 노원구")
                     .build();
             Region region10 = Region.builder()
-                    .name("도봉구")
+                    .name("서울특별시 도봉구")
                     .build();
             Region region11 = Region.builder()
-                    .name("동대문구")
+                    .name("서울특별시 동대문구")
                     .build();
             Region region12 = Region.builder()
-                    .name("동작구")
+                    .name("서울특별시 동작구")
                     .build();
             Region region13 = Region.builder()
-                    .name("마포구")
+                    .name("서울특별시 마포구")
                     .build();
             Region region14 = Region.builder()
-                    .name("서대문구")
+                    .name("서울특별시 서대문구")
                     .build();
             Region region15 = Region.builder()
-                    .name("서초구")
+                    .name("서울특별시 서초구")
                     .build();
             Region region16 = Region.builder()
-                    .name("성동구")
+                    .name("서울특별시 성동구")
                     .build();
             Region region17 = Region.builder()
-                    .name("성북구")
+                    .name("서울특별시 성북구")
                     .build();
             Region region18 = Region.builder()
-                    .name("송파구")
+                    .name("서울특별시 송파구")
                     .build();
             Region region19 = Region.builder()
-                    .name("양천구")
+                    .name("서울특별시 양천구")
                     .build();
             Region region20 = Region.builder()
-                    .name("영등포구")
+                    .name("서울특별시 영등포구")
                     .build();
             Region region21 = Region.builder()
-                    .name("용산구")
+                    .name("서울특별시 용산구")
                     .build();
             Region region22 = Region.builder()
-                    .name("은평구")
+                    .name("서울특별시 은평구")
                     .build();
             Region region23 = Region.builder()
-                    .name("종로구")
+                    .name("서울특별시 종로구")
                     .build();
             Region region24 = Region.builder()
-                    .name("중구")
+                    .name("서울특별시 중구")
                     .build();
             Region region25 = Region.builder()
-                    .name("중랑구")
+                    .name("서울특별시 중랑구")
                     .build();
             if (regionRepository.findByName(region1.getName()) == null) {
                 regionRepository.save(region1);

diff --git a/src/main/java/com/example/locavel/service/NaverMapService.java b/src/main/java/com/example/locavel/service/NaverMapService.java
@@ -52,8 +52,9 @@ private String parseAddressFromResponse(String responseBody) {
         ObjectMapper objectMapper = new ObjectMapper();
         try {
             JsonNode root = objectMapper.readTree(responseBody);
-            JsonNode addressNode = root.path("results").path(0).path("region").path("area2").path("name");
-            return addressNode.asText();
+            JsonNode addressNode1 = root.path("results").path(0).path("region").path("area1").path("name");
+            JsonNode addressNode2 = root.path("results").path(0).path("region").path("area2").path("name");
+            return addressNode1.asText() + " " + addressNode2.asText();
         } catch (Exception e) {
             e.printStackTrace();
             return "Address parsing failed";

diff --git a/src/main/java/com/example/locavel/service/RegionService.java b/src/main/java/com/example/locavel/service/RegionService.java
@@ -27,11 +27,12 @@ public Region findRegion(String address) {
 
     public static String extractDistrict(String address) {
         // 서울특별시 주소에서 구를 추출하는 정규 표현식
-        Pattern pattern = Pattern.compile("\\b[가-힣]+구\\b");
+        Pattern pattern = Pattern.compile("서울특별시\\s*[가-힣]+구");
         Matcher matcher = pattern.matcher(address);
 
         // 첫 번째 일치 항목 반환
         if (matcher.find()) {
+            System.out.println(matcher.group());
             return matcher.group();
         } else {
             return "없음";

diff --git a/src/main/java/com/example/locavel/service/userService/UserCommandService.java b/src/main/java/com/example/locavel/service/userService/UserCommandService.java
@@ -1,5 +1,6 @@
 package com.example.locavel.service.userService;
 
+import com.example.locavel.converter.UserConverter;
 import com.example.locavel.domain.User;
 import com.example.locavel.domain.enums.Grade;
 import com.example.locavel.web.dto.ReviewDTO.ReviewRequestDTO;
@@ -31,4 +32,6 @@ public interface UserCommandService {
 
     //User setMyArea(HttpServletRequest httpServletRequest, String roadNameAddress);
     User setMyArea(HttpServletRequest httpServletRequest, String roadNameAddress);
+
+    UserResponseDto.MyAreaResponseDto getMyArea(HttpServletRequest httpServletRequest);
 }
diff --git a/src/main/java/com/example/locavel/service/userService/UserCommandServiceImpl.java b/src/main/java/com/example/locavel/service/userService/UserCommandServiceImpl.java
@@ -228,4 +228,14 @@ public User setMyArea(HttpServletRequest httpServletRequest, String distinct) {
         userRepository.save(user);
         return user;
     }
+
+    @Override
+    public UserResponseDto.MyAreaResponseDto getMyArea(HttpServletRequest httpServletRequest) {
+        User user = getUser(httpServletRequest);
+        return UserResponseDto.MyAreaResponseDto.builder()
+                .userId(user.getId())
+                .regionId(user.getMy_area().getId())
+                .regionName(user.getMy_area().getName())
+                .build();
+    }
 }
diff --git a/src/main/java/com/example/locavel/web/controller/UserController.java b/src/main/java/com/example/locavel/web/controller/UserController.java
@@ -118,6 +118,13 @@ public ApiResponse<UserResponseDto.MyAreaResponseDto> updateUserArea(HttpServlet
         return ApiResponse.onSuccess(responseDto);
     }
 
+    @Operation(summary = "내 지역 조회", description = "내 지역을 조회합니다.")
+    @GetMapping("/api/users/my-area")
+    public ApiResponse<UserResponseDto.MyAreaResponseDto> getUserArea(HttpServletRequest httpServletRequest) {
+        UserResponseDto.MyAreaResponseDto responseDto = userCommandService.getMyArea(httpServletRequest);
+        return ApiResponse.onSuccess(responseDto);
+    }
+
     @Operation(summary = "내 지역에 속한 장소 조회", description = "내 지역에 속한 장소를 조회합니다.")
     @GetMapping("/api/users/my-area/places")
     public ApiResponse<List<PlaceResponseDTO.PlaceDetailDTO>> getPlaces(HttpServletRequest httpServletRequest) {