Merge pull request #115 from Money-Touch/feat/#114

✨Feat : 소비 MBTI 결과 조회 기능 구현

Author: Yujin1219

src/main/java/com/server/money_touch/domain/consumptionMbti/controller/ConsumptionMbtiController.java

@@ -2,6 +2,7 @@
 
 
 import com.server.money_touch.domain.consumptionMbti.dto.ConsumptionMbtiResponse;
+import com.server.money_touch.domain.consumptionMbti.service.ConsumptionMbtiService;
 import com.server.money_touch.global.apiPayload.ApiResponse;
 import com.server.money_touch.global.apiPayload.code.status.ErrorStatus;
 import com.server.money_touch.global.validation.annotation.ApiErrorCodeExample;
@@ -11,6 +12,7 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
@@ -26,6 +28,8 @@
 @RequestMapping("/api/consumptionMbti")
 public class ConsumptionMbtiController {
 
+    private final ConsumptionMbtiService consumptionMbtiService;
+
     @Operation(
             summary = "소비 Mbti 조회 API",
             description = "결과 코드(예: PTG)에 해당하는 소비 MBTI 설명, 부제, 이미지 등을 조회합니다."
@@ -40,8 +44,8 @@ public class ConsumptionMbtiController {
             @Parameter(name = "result" , description = "조회하려는 소비 MBTI", example = "PTG" , required = true)
     })
     @GetMapping("/result")
-    public ApiResponse<ConsumptionMbtiResponse.ConsumptionMbtiResultDTO> getMbti(@RequestParam @NotBlank(message = "결과값은 필수입니다.") String result) {
-        ConsumptionMbtiResponse.ConsumptionMbtiResultDTO response = null; //  TODO: 서비스 연결 예정
+    public ApiResponse<ConsumptionMbtiResponse.ConsumptionMbtiResultDTO> getMbti(@RequestParam @NotBlank(message = "결과값은 필수입니다.") String result, HttpServletRequest request) {
+        var response = consumptionMbtiService.getConsumptionMbti(result, request);
         return ApiResponse.onSuccess(response);
     }
 

src/main/java/com/server/money_touch/domain/consumptionMbti/converter/ConsumptionMbtiConveter.java

@@ -0,0 +1,18 @@
+package com.server.money_touch.domain.consumptionMbti.converter;
+
+import com.server.money_touch.domain.consumptionMbti.dto.ConsumptionMbtiResponse;
+import com.server.money_touch.domain.consumptionMbti.entity.ConsumptionMbti;
+
+public class ConsumptionMbtiConveter {
+
+    public static ConsumptionMbtiResponse.ConsumptionMbtiResultDTO toResultDTO(ConsumptionMbti entity) {
+        return new ConsumptionMbtiResponse.ConsumptionMbtiResultDTO(
+                entity.getId(),
+                entity.getResult(),
+                entity.getSubtitle(),
+                entity.getMbtiImgUrl(),
+                entity.getDescription()
+        );
+
+    }
+}

src/main/java/com/server/money_touch/domain/consumptionMbti/dto/ConsumptionMbtiResponse.java

@@ -18,6 +18,9 @@ public static class ConsumptionMbtiResultDTO{
         @Schema(description = "소비 mbti 이름", example = "PTG")
         private String result;
 
+        @Schema(description = "소비 mbti 부제" , example = "계획 철벽러")
+        private String subtitle;
+
         @Schema(description = "소비 mbti 설명" ,example = "철저한 계획 아래~")
         private String description;
 

src/main/java/com/server/money_touch/domain/consumptionMbti/entity/ConsumptionMbti.java

@@ -21,12 +21,15 @@ public class ConsumptionMbti {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Column(length = 10, nullable = false, unique = true)
+    private String result; // 소비MBTI 이름 ex) PTG
+
+    private String subtitle; // ex) 계획 철벽러
+
     private String mbtiImgUrl;
 
     private String description;
 
-    @Column(length = 10)
-    private String result; // 소비MBTI 이름 ex) PTG
 
     @CreatedDate
     private LocalDateTime createdAt;

src/main/java/com/server/money_touch/domain/consumptionMbti/repository/ConsumptionMbtiRepository.java

@@ -0,0 +1,11 @@
+package com.server.money_touch.domain.consumptionMbti.repository;
+
+import com.server.money_touch.domain.consumptionMbti.entity.ConsumptionMbti;
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.Optional;
+
+public interface ConsumptionMbtiRepository extends CrudRepository<ConsumptionMbti, Long> {
+    // 소비 MBTI 존재 유무 확인
+    Optional <ConsumptionMbti> findByResult(String result);
+}

src/main/java/com/server/money_touch/domain/consumptionMbti/service/ConsumptionMbtiService.java

@@ -0,0 +1,14 @@
+package com.server.money_touch.domain.consumptionMbti.service;
+
+
+import com.server.money_touch.domain.consumptionMbti.dto.ConsumptionMbtiResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
+public interface ConsumptionMbtiService {
+    // 소비 MBTI 존재 여부 검증
+    Boolean existsConsumptionMbti(Long consumptionMbtiId);
+
+    // 소비 MBTI 조회
+    ConsumptionMbtiResponse.ConsumptionMbtiResultDTO getConsumptionMbti(String result, HttpServletRequest request);
+
+}

src/main/java/com/server/money_touch/domain/consumptionMbti/service/ConsumptionMbtiServiceImpl.java

@@ -0,0 +1,58 @@
+package com.server.money_touch.domain.consumptionMbti.service;
+
+import com.server.money_touch.domain.consumptionMbti.converter.ConsumptionMbtiConveter;
+import com.server.money_touch.domain.consumptionMbti.dto.ConsumptionMbtiResponse;
+import com.server.money_touch.domain.consumptionMbti.entity.ConsumptionMbti;
+import com.server.money_touch.domain.consumptionMbti.repository.ConsumptionMbtiRepository;
+import com.server.money_touch.domain.user.entity.User;
+import com.server.money_touch.domain.user.repository.user.UserRepository;
+import com.server.money_touch.global.apiPayload.code.status.ErrorStatus;
+import com.server.money_touch.global.apiPayload.exception.handler.ErrorHandler;
+import com.server.money_touch.global.utils.AuthUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class ConsumptionMbtiServiceImpl implements ConsumptionMbtiService{
+
+    private final ConsumptionMbtiRepository consumptionMbtiRepository;
+    private final AuthUtil authUtil;
+    private final UserRepository userRepository;
+
+    // 소비 MBTI 존재 여부 검증
+    @Override
+    public Boolean existsConsumptionMbti(Long ConsumptionMbtiId) {
+        return consumptionMbtiRepository.existsById(ConsumptionMbtiId);
+    }
+
+    // 유저 프로필이미지 존재 여부 검증
+
+
+    @Override
+    public ConsumptionMbtiResponse.ConsumptionMbtiResultDTO getConsumptionMbti(String result, HttpServletRequest request) {
+        // 1. MBTI 결과 조회
+        ConsumptionMbti consumptionMbti = consumptionMbtiRepository.findByResult(result)
+                .orElseThrow(() -> new ErrorHandler(ErrorStatus.MBTI_NOT_FOUND));
+
+        // 2. 현재 로그인한 유저 ID 추출
+        Long userId = authUtil.getUserIdFromRequest(request);
+
+        // 3. 유저 조회
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new ErrorHandler(ErrorStatus.USER_NOT_FOUND));
+
+        // 유저의 프로필 이미지가 없고, 소비 MBTI 이미지가 존재할 경우
+        if ((user.getProfileImgUrl() == null || user.getProfileImgUrl().isBlank())
+                && consumptionMbti.getMbtiImgUrl() != null && !consumptionMbti.getMbtiImgUrl().isBlank()) {
+            user.setProfileImgUrl(consumptionMbti.getMbtiImgUrl());
+            userRepository.save(user); // 유저 정보 저장
+        }
+
+        return ConsumptionMbtiConveter.toResultDTO(consumptionMbti);
+    }
+
+}

src/main/java/com/server/money_touch/domain/user/repository/user/UserRepository.java

@@ -12,7 +12,9 @@ public interface UserRepository extends JpaRepository<User, Long> {
     @Query("SELECT u FROM User u LEFT JOIN FETCH u.userDetail")
     List<User> findAllWithUserDetail();
 
-    Optional<User> findByEmail(String email); // email로 사용자 정보를 가져옴
+    // email로 유저 조회
+    Optional<User> findByEmail(String email);
 
-    boolean existsByEmail(String email);
+    Optional<User> findById(Long id);
+    
 }

src/main/java/com/server/money_touch/domain/user/service/user/AuthService.java

@@ -34,6 +34,7 @@ public class AuthService {
     private final UserRepository userRepository;
     private final TokenProvider tokenProvider;
     private final PasswordEncoder passwordEncoder;
+    private final UserQueryService userQueryService;
     private final BudgetCommandService budgetCommandService;
     private final TotalConsumptionRepository totalConsumptionRepository;
 
@@ -46,7 +47,7 @@ public User oAuthLogin(String accessCode, HttpServletResponse httpServletRespons
         User user;
         boolean isNewUser = false;
 
-        if (userRepository.existsByEmail(email)) {
+        if (userQueryService.existsByEmail(email)) {
             user = userRepository.findByEmail(email).get();
         } else {
             user = createNewUser(kakaoProfile); // 등록되지않은 회원이면 회원가입

src/main/java/com/server/money_touch/domain/user/service/user/UserCommandServiceImpl.java

@@ -49,6 +49,7 @@ public class UserCommandServiceImpl implements UserCommandService {
     private final UserDetailRepository userDetailRepository;
     private final PasswordEncoder passwordEncoder;
     private final TokenProvider tokenProvider;
+    private final UserQueryService userQueryService;
     private final BudgetCommandService budgetCommandService;
     private final TotalConsumptionRepository totalConsumptionRepository;
 
@@ -212,7 +213,7 @@ private Authentication createAuthentication(User user) {
      * 이메일 중복 검증
      */
     private void validateDuplicateEmail(String email) {
-        if (userRepository.existsByEmail(email)) {
+        if (userQueryService.existsByEmail(email)) {
             throw new IllegalArgumentException("이미 사용중인 이메일입니다.");
         }
     }