Refactor/#31 user interest recommend

docker-compose.yml

@@ -54,9 +54,6 @@
         - app-network
 
 
-  volumes:
-    redis-data:
-
   networks:
     app-network:
-      name: app-network
+      name: hyetaekon-network

src/main/java/com/hyetaekon/hyetaekon/UserInterest/controller/UserInterestController.java

@@ -1,7 +1,8 @@
 package com.hyetaekon.hyetaekon.UserInterest.controller;
 
-import com.hyetaekon.hyetaekon.UserInterest.dto.UserInterestRequestDto;
-import com.hyetaekon.hyetaekon.UserInterest.dto.UserInterestResponseDto;
+import com.hyetaekon.hyetaekon.UserInterest.dto.CategorizedInterestsResponseDto;
+import com.hyetaekon.hyetaekon.UserInterest.dto.CategorizedInterestsWithSelectionDto;
+import com.hyetaekon.hyetaekon.UserInterest.dto.InterestSelectionRequestDto;
 import com.hyetaekon.hyetaekon.UserInterest.entity.UserInterestEnum;
 import com.hyetaekon.hyetaekon.UserInterest.service.UserInterestService;
 import com.hyetaekon.hyetaekon.common.jwt.CustomUserDetails;
@@ -13,6 +14,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @RestController
@@ -24,31 +26,32 @@ public class UserInterestController {
 
     // 선택할 키워드 목록 조회
     @GetMapping
-    public ResponseEntity<UserInterestResponseDto> getAvailableInterests() {
-        // Enum에서 displayName 값 추출
-        List<String> Interests = Arrays.stream(UserInterestEnum.values())
-            .map(UserInterestEnum::getDisplayName)
-            .collect(Collectors.toList());
-        return ResponseEntity.ok(new UserInterestResponseDto(Interests));
+    public ResponseEntity<CategorizedInterestsResponseDto> getAvailableInterests() {
+        // Enum에서 카테고리별 displayName 값 추출
+        Map<String, List<String>> categorizedInterests = Arrays.stream(UserInterestEnum.values())
+            .collect(Collectors.groupingBy(
+                UserInterestEnum::getCategory,
+                Collectors.mapping(UserInterestEnum::getDisplayName, Collectors.toList())
+            ));
+        return ResponseEntity.ok(new CategorizedInterestsResponseDto(categorizedInterests));
     }
 
-
-    // 개인 키워드 목록 조회
+    // 모든 관심사와 사용자 선택 여부 조회
     @GetMapping("/me")
-    public ResponseEntity<UserInterestResponseDto> getMyInterest(@AuthenticationPrincipal CustomUserDetails userDetails) {
+    public ResponseEntity<CategorizedInterestsWithSelectionDto> getMyInterestsWithSelection(
+        @AuthenticationPrincipal CustomUserDetails userDetails) {
         Long userId = userDetails.getId();
-        return ResponseEntity.ok(userInterestService.getUserInterestsByUserId(userId));
+        return ResponseEntity.ok(userInterestService.getUserInterestsWithSelection(userId));
     }
 
-    // 선택한 키워드 목록 저장
+    // 선택한 관심사 저장
     @PostMapping("/me")
-    public ResponseEntity<Void> replaceInterests(
+    public ResponseEntity<Void> saveInterests(
         @AuthenticationPrincipal CustomUserDetails userDetails,
-        @RequestBody UserInterestRequestDto UserInterestRequest
+        @RequestBody InterestSelectionRequestDto requestDto
     ) {
         Long userId = userDetails.getId();
-        List<String> Interests = UserInterestRequest.getInterests();
-        userInterestService.replaceUserInterests(userId, Interests);
+        userInterestService.saveUserInterests(userId, requestDto.getAllInterests());
         return ResponseEntity.status(HttpStatus.OK).build();
     }
 }

src/main/java/com/hyetaekon/hyetaekon/UserInterest/dto/CategorizedInterestsResponseDto.java

@@ -0,0 +1,14 @@
+package com.hyetaekon.hyetaekon.UserInterest.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@AllArgsConstructor
+public class CategorizedInterestsResponseDto {
+    private Map<String, List<String>> categorizedInterests;
+}

src/main/java/com/hyetaekon/hyetaekon/UserInterest/dto/UserInterestResponseDto.java → src/main/java/com/hyetaekon/hyetaekon/UserInterest/dto/CategorizedInterestsWithSelectionDto.java

@@ -4,10 +4,10 @@
 import lombok.Getter;
 
 import java.util.List;
-
+import java.util.Map;
 
 @Getter
 @AllArgsConstructor
-public class UserInterestResponseDto {
-    private List<String> interests;
+public class CategorizedInterestsWithSelectionDto {
+    private Map<String, List<InterestItemDto>> categorizedInterests;
 }

src/main/java/com/hyetaekon/hyetaekon/UserInterest/dto/InterestItemDto.java

@@ -0,0 +1,11 @@
+package com.hyetaekon.hyetaekon.UserInterest.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class InterestItemDto {
+    private String name;      // 관심사 이름
+    private boolean selected; // 선택 여부
+}

src/main/java/com/hyetaekon/hyetaekon/UserInterest/dto/InterestSelectionRequestDto.java

@@ -0,0 +1,30 @@
+package com.hyetaekon.hyetaekon.UserInterest.dto;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Getter
+public class InterestSelectionRequestDto {
+    private Map<String, List<String>> categorizedInterests;
+
+    // 기존 필드 유지
+    private List<String> selectedInterests;
+
+    // categorizedInterests에서 모든 관심사를 추출하는 메소드
+    public List<String> getAllInterests() {
+        if (selectedInterests != null) {
+            return selectedInterests;
+        }
+
+        if (categorizedInterests == null) {
+            return new ArrayList<>();
+        }
+
+        List<String> allInterests = new ArrayList<>();
+        categorizedInterests.values().forEach(allInterests::addAll);
+        return allInterests;
+    }
+}

src/main/java/com/hyetaekon/hyetaekon/UserInterest/entity/UserInterestEnum.java

@@ -5,35 +5,36 @@
 @Getter
 public enum UserInterestEnum {
     // ServiceCategory 관련 관심사
-    CHILDCARE_EDUCATION("보육·교육"),
-    HOUSING_INDEPENDENCE("주거·자립"),
-    ADMINISTRATION_SAFETY("행정·안전"),
-    AGRICULTURE_FISHERY("농림축산어업"),
-    EMPLOYMENT_STARTUP("고용·창업"),
-    HEALTH_MEDICAL("보건·의료"),
-    CULTURE_ENVIRONMENT("문화·환경"),
-    LIFE_STABILITY("생활안정"),
+    CHILDCARE_EDUCATION("보육·교육", "관심주제"),
+    HOUSING_INDEPENDENCE("주거·자립", "관심주제"),
+    ADMINISTRATION_SAFETY("행정·안전", "관심주제"),
+    AGRICULTURE_FISHERY("농림축산어업", "관심주제"),
+    EMPLOYMENT_STARTUP("고용·창업", "관심주제"),
+    HEALTH_MEDICAL("보건·의료", "관심주제"),
+    CULTURE_ENVIRONMENT("문화·환경", "관심주제"),
+    LIFE_STABILITY("생활안정", "관심주제"),
 
     // SpecialGroup 관련 관심사
-    IS_MULTI_CULTURAL("다문화가족"),
-    IS_NORTH_KOREAN_DEFECTOR("북한이탈주민"),
-    IS_SINGLE_PARENT_FAMILY("한부모가정/조손가정"),
-    IS_SINGLE_MEMBER_HOUSEHOLD("1인가구"),
-    IS_DISABLED("장애인"),
-    IS_NATIONAL_MERIT_RECIPIENT("국가보훈대상자"),
-    IS_CHRONIC_ILLNESS("질병/질환자"),
+    IS_MULTI_CULTURAL("다문화가족", "가구형태"),
+    IS_NORTH_KOREAN_DEFECTOR("북한이탈주민", "가구형태"),
+    IS_SINGLE_PARENT_FAMILY("한부모가정/조손가정", "가구형태"),
+    IS_SINGLE_MEMBER_HOUSEHOLD("1인가구", "가구형태"),
+    IS_DISABLED("장애인", "가구형태"),
+    IS_NATIONAL_MERIT_RECIPIENT("국가보훈대상자", "가구형태"),
+    IS_CHRONIC_ILLNESS("질병/질환자", "가구형태"),
 
     // FamilyType 관련 관심사
-    // IS_NOT_APPLICABLE("해당사항 없음"),
-    IS_MULTI_CHILDREN_FAMILY("다자녀가구"),
-    IS_NON_HOUSING_HOUSEHOLD("무주택세대"),
-    IS_NEW_RESIDENCE("신규전입"),
-    IS_EXTENDED_FAMILY("확대가족");
+    // IS_NOT_APPLICABLE("해당사항 없음", "가구상황"),
+    IS_MULTI_CHILDREN_FAMILY("다자녀가구", "가구상황"),
+    IS_NON_HOUSING_HOUSEHOLD("무주택세대", "가구상황"),
+    IS_NEW_RESIDENCE("신규전입", "가구상황"),
+    IS_EXTENDED_FAMILY("확대가족", "가구상황");
 
     private final String displayName;
+    private final String category;
 
-    UserInterestEnum(String displayName) {
+    UserInterestEnum(String displayName, String category) {
         this.displayName = displayName;
+        this.category = category;
     }
-
 }

src/main/java/com/hyetaekon/hyetaekon/UserInterest/service/UserInterestService.java

@@ -1,7 +1,9 @@
 package com.hyetaekon.hyetaekon.UserInterest.service;
 
-import com.hyetaekon.hyetaekon.UserInterest.dto.UserInterestResponseDto;
+import com.hyetaekon.hyetaekon.UserInterest.dto.CategorizedInterestsWithSelectionDto;
+import com.hyetaekon.hyetaekon.UserInterest.dto.InterestItemDto;
 import com.hyetaekon.hyetaekon.UserInterest.entity.UserInterest;
+import com.hyetaekon.hyetaekon.UserInterest.entity.UserInterestEnum;
 import com.hyetaekon.hyetaekon.UserInterest.repository.UserInterestRepository;
 import com.hyetaekon.hyetaekon.common.exception.ErrorCode;
 import com.hyetaekon.hyetaekon.common.exception.GlobalException;
@@ -12,7 +14,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -21,26 +24,58 @@ public class UserInterestService {
     private final UserRepository userRepository;
     private final UserInterestRepository userInterestRepository;
 
-    // 나의 관심사 조회
+    // 모든 관심사 목록과 사용자 선택 여부 함께 조회
     @Transactional(readOnly = true)
-    public UserInterestResponseDto getUserInterestsByUserId(Long userId) {
+    public CategorizedInterestsWithSelectionDto getUserInterestsWithSelection(Long userId) {
         User user = userRepository.findByIdAndDeletedAtIsNull(userId)
             .orElseThrow(() -> new GlobalException(ErrorCode.USER_NOT_FOUND_BY_ID));
 
-        List<String> userInterests = user.getInterests().stream()
+        // 사용자가 선택한 관심사 목록
+        List<String> selectedInterests = user.getInterests().stream()
             .map(UserInterest::getInterest)
             .toList();
 
-        log.debug("회원 관심사 조회 - 유저 ID: {}, 관심사: {}", userId, userInterests);
-        return new UserInterestResponseDto(userInterests);
+        // 카테고리별로 모든 관심사를 포함하되, 선택 여부 표시
+        Map<String, List<InterestItemDto>> result = new HashMap<>();
+
+        Arrays.stream(UserInterestEnum.values())
+            .forEach(interestEnum -> {
+                String category = interestEnum.getCategory();
+                String displayName = interestEnum.getDisplayName();
+                boolean isSelected = selectedInterests.contains(displayName);
+
+                if (!result.containsKey(category)) {
+                    result.put(category, new ArrayList<>());
+                }
+
+                result.get(category).add(new InterestItemDto(displayName, isSelected));
+            });
+
+        log.debug("회원 관심사 조회 (선택 여부 포함) - 유저 ID: {}", userId);
+        return new CategorizedInterestsWithSelectionDto(result);
     }
 
+    // 선택한 관심사 저장
     @Transactional
-    public void replaceUserInterests(Long userId, List<String> Interests) {
-        // Validate Interest size (optional, assuming max 5)
-        if (Interests.size() > 5) {
-            throw new GlobalException(
-                ErrorCode.INTEREST_LIMIT_EXCEEDED); // Custom error for exceeding limit
+    public void saveUserInterests(Long userId, List<String> selectedInterests) {
+        if (selectedInterests == null) {
+            selectedInterests = new ArrayList<>(); // 빈 리스트로 초기화
+        }
+
+        // 최대 선택 개수 검증
+        if (selectedInterests.size() > 5) {
+            throw new GlobalException(ErrorCode.INTEREST_LIMIT_EXCEEDED);
+        }
+
+        // 유효한 관심사인지 검증
+        Set<String> validInterests = Arrays.stream(UserInterestEnum.values())
+            .map(UserInterestEnum::getDisplayName)
+            .collect(Collectors.toSet());
+
+        for (String interest : selectedInterests) {
+            if (!validInterests.contains(interest)) {
+                throw new GlobalException(ErrorCode.INVALID_INTEREST);
+            }
         }
 
         User user = userRepository.findByIdAndDeletedAtIsNull(userId)
@@ -50,14 +85,30 @@ public void replaceUserInterests(Long userId, List<String> Interests) {
         user.getInterests().clear();
 
         // 새 관심사 추가
-        for (String Interest : Interests) {
+        for (String interest : selectedInterests) {
             UserInterest newInterest = UserInterest.builder()
                 .user(user)
-                .interest(Interest)
+                .interest(interest)
                 .build();
             userInterestRepository.save(newInterest);
         }
 
-        log.debug("회원 관심사 갱신 - 유저 ID: {}, 새 관심사 목록: {}", userId, Interests);
+        log.debug("회원 관심사 갱신 - 유저 ID: {}, 선택 관심사: {}", userId, selectedInterests);
     }
+
+   /* // 나의 관심사 조회
+    @Transactional(readOnly = true)
+    public UserInterestResponseDto getUserInterestsByUserId(Long userId) {
+        User user = userRepository.findByIdAndDeletedAtIsNull(userId)
+            .orElseThrow(() -> new GlobalException(ErrorCode.USER_NOT_FOUND_BY_ID));
+
+        List<String> userInterests = user.getInterests().stream()
+            .map(UserInterest::getInterest)
+            .toList();
+
+        log.debug("회원 관심사 조회 - 유저 ID: {}, 관심사: {}", userId, userInterests);
+        return new UserInterestResponseDto(userInterests);
+    }
+
+    */
 }

src/main/java/com/hyetaekon/hyetaekon/common/config/SecurityPath.java

@@ -12,7 +12,8 @@ public class SecurityPath {
       "/",
       "/api/services",
       "/api/services/category/*",
-      "/api/services/detail/*"
+      "/api/services/detail/*",
+      "/api/public-data/serviceList/test"
   };
 
 
@@ -32,7 +33,7 @@ public class SecurityPath {
       "/api/admin/users/**",
       "/api/public-data/serviceDetailList",
       "/api/public-data/supportConditionsList",
-      "/api/public-data/serviceList/**"
+      "/api/public-data/serviceList"
   };
 }
 

src/main/java/com/hyetaekon/hyetaekon/common/exception/ErrorCode.java

@@ -30,6 +30,7 @@ public enum ErrorCode {
     FORBIDDEN_ACCESS(HttpStatus.FORBIDDEN, "AUTH-011", "잘못된 접근입니다."),
     NOT_SUSPENDED_USER(HttpStatus.BAD_REQUEST, "ACCOUNT-008", "정지 상태가 아닌 회원입니다."),
     INVALID_SUSPEND_TIME(HttpStatus.BAD_REQUEST, "ACCOUNT-009", "정지 기간이 유효하지 않습니다."),
+    PASSWORD_CONFIRM_MISMATCH(HttpStatus.BAD_REQUEST, "ACCOUNT-010", "새 비밀번호와 확인 비밀번호가 일치하지 않습니다."),
 
     // 북마크
     BOOKMARK_USER_NOT_FOUND(HttpStatus.NOT_FOUND, "BOOKMARK-001", "북마크한 유저를 찾을 수 없습니다."),
@@ -43,6 +44,7 @@ public enum ErrorCode {
 
     // 관심사 선택 제한
     INTEREST_LIMIT_EXCEEDED(HttpStatus.BAD_REQUEST, "INTEREST-001", "관심사는 최대 6개까지만 등록 가능합니다."),
+    INVALID_INTEREST(HttpStatus.BAD_REQUEST, "INTEREST-002", "유효하지 않은 관심사입니다."),
 
     // 공공서비스
     // 유효 JACODE 확인

src/main/java/com/hyetaekon/hyetaekon/common/publicdata/controller/PublicServiceDataController.java

@@ -69,7 +69,7 @@ public ResponseEntity<String> createAndStoreSupportConditionsList() {
   /**
    * 페이지 단위 공공서비스 목록 조회 (테스트용)
    */
-  @GetMapping("/serviceList")
+  @GetMapping("/serviceList/test")
   public ResponseEntity<List<PublicServiceDataDto.Data>> getServiceListByPage(
       @RequestParam(defaultValue = "1") int page,
       @RequestParam(defaultValue = "100") int perPage) {