Merge pull request #38 from gdsc-ssu/feat/#34-senior-profile

[SENIOR] 어르신 정보 입력 및 조회 기능 구현

Author: shinminkyoung1

src/main/java/com/weve/controller/UserController.java

@@ -3,7 +3,9 @@
 import com.weve.common.api.payload.BasicResponse;
 import com.weve.domain.User;
 import com.weve.dto.request.PatchMypageRequest;
+import com.weve.dto.request.SeniorInfoRequest;
 import com.weve.dto.response.MypageResponse;
+import com.weve.dto.response.SeniorProfileResponse;
 import com.weve.repository.UserRepository;
 import com.weve.security.CustomUserDetails;
 import com.weve.service.UserService;
@@ -25,15 +27,15 @@
 @RequiredArgsConstructor
 @Validated
 @Slf4j
-@RequestMapping("/api/mypage")
+@RequestMapping("/api")
 @Tag(name = "User", description = "User 관련 API입니다.")
 public class UserController {
 
     private final UserService userService;
     private final UserRepository userRepository;
 
     // 마이페이지 정보 조회
-    @GetMapping
+    @GetMapping("/mypage")
     public BasicResponse<MypageResponse> getMypage(@AuthenticationPrincipal UserDetails userDetails) {
 
         String username = userDetails.getUsername();
@@ -42,9 +44,28 @@ public BasicResponse<MypageResponse> getMypage(@AuthenticationPrincipal UserDeta
     }
 
     // 마이페이지 정보 수정
-    @PatchMapping
+    @PatchMapping("/mypage")
     public BasicResponse<MypageResponse> patchMypage(@AuthenticationPrincipal UserDetails userDetails, @RequestBody PatchMypageRequest request) {
         MypageResponse response = userService.patchMypage(userDetails.getUsername(), request).getResult();
         return BasicResponse.onSuccess(response);
     }
+
+    // 어르신 정보 입력
+    @PostMapping("/senior")
+    public BasicResponse<?> postSeniorInfo(@AuthenticationPrincipal UserDetails userDetails, @RequestBody SeniorInfoRequest request) {
+
+        String username = userDetails.getUsername();
+        userService.postSeniorInfo(username, request);
+
+        return BasicResponse.onSuccess(null);
+    }
+
+    // 어르신 정보 확인
+    @GetMapping("/senior")
+    public BasicResponse<SeniorProfileResponse> getSeniorInfo(@AuthenticationPrincipal UserDetails userDetails) {
+
+        String username = userDetails.getUsername();
+        SeniorProfileResponse response = userService.getSeniorInfo(username).getResult();
+        return BasicResponse.onSuccess(response);
+    }
 }

src/main/java/com/weve/domain/MatchingInfo.java

@@ -9,7 +9,7 @@
 import lombok.*;
 
 @Getter
-@Builder
+@Builder(toBuilder = true)
 @Embeddable
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

src/main/java/com/weve/dto/request/SeniorInfoRequest.java

@@ -0,0 +1,18 @@
+package com.weve.dto.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.weve.domain.enums.HardshipCategory;
+import com.weve.domain.enums.JobCategory;
+import com.weve.domain.enums.ValueCategory;
+import lombok.Getter;
+
+import java.time.LocalDate;
+
+@Getter
+public class SeniorInfoRequest {
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private LocalDate birth;
+    private String job;
+    private String value;
+    private String hardship;
+}

src/main/java/com/weve/dto/response/SeniorProfileResponse.java

@@ -0,0 +1,26 @@
+package com.weve.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.weve.domain.User;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SeniorProfileResponse {
+
+    private String name;
+    private String nationality;
+
+    public static SeniorProfileResponse fromUser(User user) {
+        return SeniorProfileResponse.builder()
+                .name(user.getName())
+                .nationality(user.getNationality())
+                .build();
+    }
+}

src/main/java/com/weve/service/MessageService.java

@@ -105,17 +105,4 @@ public boolean verifySMSCode(String phoneNumber, String inputCode) {
         }
         return false;
     }
-}
-
-
-// 문자인증 시 들어오는 값은 [국가번호 + 전화번호]
-// 국가번호는 3개 중 하나로 파싱 후 이에 따라 국적 분류해야함
-// 문자 인증 시 다른 나라 번호도 가능한지 알아봐야함
-
-// 문자인증 연결은 1. 회원가입 2. 전화번호 수정
-// mysql에 sms_code 속성 추가한 후 이를 저장한 뒤, 비교해서 같은 값이면 인증 성공 (시간 초과 시 실패)
-// 인증 다시 할 때마다 db에 있는 값 갱신
-
-// 1. sms 인증 코드 구현 (mysql 코드 저장 포함)
-// 2. 국가번호 파싱 -> 국가 저장 포함 -> sms 인증 연결
-// 3. #28 브랜치에서 1번 진행 후 나머지는 2번에서 진행 ???????
+}

src/main/java/com/weve/service/UserService.java

@@ -3,21 +3,23 @@
 import com.weve.common.api.exception.GeneralException;
 import com.weve.common.api.payload.BasicResponse;
 import com.weve.common.api.payload.code.status.ErrorStatus;
+import com.weve.domain.MatchingInfo;
 import com.weve.domain.User;
-import com.weve.domain.enums.Language;
+import com.weve.domain.enums.HardshipCategory;
+import com.weve.domain.enums.JobCategory;
+import com.weve.domain.enums.ValueCategory;
 import com.weve.dto.request.PatchMypageRequest;
+import com.weve.dto.request.SeniorInfoRequest;
 import com.weve.dto.response.MypageResponse;
+import com.weve.dto.response.SeniorProfileResponse;
 import com.weve.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
-
 import static com.weve.domain.enums.UserType.JUNIOR;
 import static com.weve.domain.enums.UserType.SENIOR;
-import static com.weve.service.AuthService.COUNTRY_NATIONALITY_MAP;
 
 @Slf4j
 @Service
@@ -27,6 +29,7 @@ public class UserService {
 
     private final UserRepository userRepository;
     private final AuthService authService;
+    private final GeminiService geminiService;
 
     // id로 유저 검색
     public User findById(Long memberId) {
@@ -83,7 +86,49 @@ public BasicResponse<MypageResponse> patchMypage(String username, PatchMypageReq
         userRepository.save(patchedUser);
         MypageResponse response = MypageResponse.fromUser(patchedUser);
         return BasicResponse.onSuccess(response);
+    }
+
+    // 어르신 정보 입력
+    @Transactional
+    public void postSeniorInfo(String username, SeniorInfoRequest request) {
+
+        User user = findByPhoneNumber(username);
+        checkIfSenior(user); // 시니어인지 검사 (생략 가능)
+
+        // 정보 받아서 텍스트 분석 후 카테고리 분류 (User 테이블 저장)
+        // Gemini 서비스에 있는 analyzeText() 이용
+        String newJob = request.getJob();
+        String newValue = request.getValue();
+        String newHardship = request.getHardship();
+        String prompt = newJob + newValue + newHardship;
+
+        // 텍스트 분석 후 카테고리 분류 (세 번 호출하는 방식)
+        JobCategory jobResult = geminiService.analyzeText(prompt).getJob();
+        ValueCategory valueResult = geminiService.analyzeText(prompt).getValue();
+        HardshipCategory hardshipResult = geminiService.analyzeText(prompt).getHardship();
+        log.info(String.valueOf(jobResult));
+        log.info(String.valueOf(valueResult));
+        log.info(String.valueOf(hardshipResult));
+
+        // MatchingInfo 객체 생성
+        MatchingInfo matchingInfo = new MatchingInfo(jobResult, valueResult, hardshipResult);
+
+        // 분석된 것을 User 테이블에 저장
+        User newUser = user.toBuilder()
+                .birth(request.getBirth())
+                .matchingInfo(matchingInfo)
+                .build();
+
+
+        // 변경된 User 엔티티 저장
+        userRepository.save(newUser);
+    }
 
+    // 어르신 정보 확인
+    public BasicResponse<SeniorProfileResponse> getSeniorInfo(String username) {
 
+        User user = findByPhoneNumber(username);
+        SeniorProfileResponse response = SeniorProfileResponse.fromUser(user);
+        return BasicResponse.onSuccess(response);
     }
 }