Merge pull request #7 from NET-ZERO-FitFit/develop

[FEAT] main <- develop (member API 추가)

Author: simhyunmin

src/main/java/fitfit/domain/member/controller/MemberRestController.java

@@ -6,14 +6,16 @@
 import fitfit.domain.member.dto.MemberResponseDTO;
 import fitfit.domain.member.entity.Member;
 import fitfit.domain.member.service.MemberCommandService;
-import fitfit.domain.token.service.MemberTokenCommandUseCase;
+import fitfit.domain.member.service.MemberQueryService;
+import fitfit.domain.token.service.MemberTokenCommandService;
 import fitfit.global.apiPayload.ApiResponse;
+import fitfit.global.apiPayload.code.status.SuccessStatus;
 import fitfit.global.enums.Provider;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -27,8 +29,9 @@
 public class MemberRestController {
 
     private final MemberCommandService memberCommandService;
-    private final MemberTokenCommandUseCase memberTokenService;
+    private final MemberTokenCommandService memberTokenService;
     private final KakaoOidcService kakaoOidcService;
+    private final MemberQueryService memberQueryService;
 
     @PostMapping("/auth/kko")
     @Operation(summary = "KAKAO OAuth2 로그인 API", description = "KAKAO OAuth2 로그인 API 입니다.")
@@ -61,7 +64,7 @@ public ApiResponse<MemberResponseDTO.KkoOAuth2LoginResponse> kkoOAuth2Login (@Va
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "필수 약관에 동의하지 않았습니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
     })
     public ApiResponse<MemberResponseDTO.TermAgreementResponse> termAgreement(
-            @RequestHeader(value = "Authorization", required = false) String authorization,
+            @RequestHeader(value = "Authorization", required = true) String authorization,
             @Valid @RequestBody MemberRequestDTO.TermAgreementRequest request) {
         return ApiResponse.onSuccess(memberCommandService.termAgreement(authorization, request));
     }
@@ -77,11 +80,119 @@ public ApiResponse<MemberResponseDTO.TermAgreementResponse> termAgreement(
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "회원 필수 정보가 누락되었습니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
     })
     public ApiResponse<MemberResponseDTO.MemberSignupResponse> signup(
-            @RequestHeader(value = "Authorization", required = false) String authorization,
+            @RequestHeader(value = "Authorization", required = true) String authorization,
             @Valid @RequestBody MemberRequestDTO.MemberSignupRequest request) {
         return ApiResponse.onSuccess(memberCommandService.memberSignup(authorization, request));
     }
 
+    @GetMapping("/mypage")
+    @Operation(summary = "마이페이지 첫 화면 프로필 조회", description = "헤더의 토큰을 사용해 닉네임, 프사, 이메일, 클린지수 등을 조회하는 API입니다.")
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "유효하지 않은 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "만료된 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "존재하지 않는 회원입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+    })
+    public ApiResponse<MemberResponseDTO.MyProfileResDTO> getMyPage(
+            @RequestHeader(value="Authorization", required = true) String authorization
+            ){
+        MemberResponseDTO.MyProfileResDTO result = memberQueryService.getMyProfile(authorization);
+        return ApiResponse.of(SuccessStatus._OK, result);
+
+    }
+
+    @GetMapping("/mypage/detail")
+    @Operation(summary="프로필 상세 정보 조회(프로필 관리 페이지)", description = "프로필 관리 화면에 진입할 때, 기본 정보를 조회하는 API(체형 정보 제외)" )
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "유효하지 않은 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "만료된 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "존재하지 않는 회원입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+    })
+    public ApiResponse<MemberResponseDTO.MyProfileDetailDto> getMyProfileDetail(
+            @RequestHeader(value="Authorization", required = true) String authorization
+
+    ){
+        return ApiResponse.of(SuccessStatus._OK, memberQueryService.getMyProfileDetail(authorization));
+    }
+
+    @PatchMapping("/mypage/detail")
+    @Operation(summary = "프로필 정보 수정", description = "프로필 사진 URL과 텍스트 정보를 수정하는 API")
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "Bad Request, 잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "유효하지 않은 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "만료된 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "존재하지 않는 회원입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+    })
+    public ApiResponse<MemberResponseDTO.MyProfileDetailDto> updateMyProfile(
+            @RequestHeader(value="Authorization", required = true) String authorization,
+            @RequestBody @Valid MemberRequestDTO.UpdateProfileDTO req
+    ) {
+
+        return ApiResponse.of(SuccessStatus._OK, memberCommandService.updateProfile(authorization,req));
+    }
+
+    @GetMapping("/mypage/body-info")
+    @Operation(summary = "체형 정보 조회", description = "프로필 관리하기 -> 체형정보 수정하기에서 키, 몸무게, 전신사진URL을 조회하는 API")
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "유효하지 않은 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "만료된 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "존재하지 않는 회원입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+    })
+    public ApiResponse<MemberResponseDTO.BodyInfoResDTO> getBodyInfo(
+            @RequestHeader(value="Authorization", required = true) String authorization
+        ){
+        return ApiResponse.of(SuccessStatus._OK,memberQueryService.getBodyInfo(authorization));
+    }
+
+    @PatchMapping("/mypage/body-info")
+    @Operation(summary = "체형 정보 수정", description = "키, 몸무게, 전신사진URL을 수정하는 API")
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "Bad Request, 잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "유효하지 않은 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "만료된 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "존재하지 않는 회원입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+    })
+    public ApiResponse<MemberResponseDTO.BodyInfoResDTO> updateBodyInfo(
+            @RequestHeader(value="Authorization", required = true) String authorization,
+            @RequestBody @Valid MemberRequestDTO.UpdateBodyInfoReqDTO req
+    ){
+        return ApiResponse.of(SuccessStatus._OK,memberCommandService.updateBodyInfo(authorization,req));
+    }
+
+    @GetMapping("/leaf")
+    @Operation(summary = "나의 나뭇잎 조회", description = "현재 보유한 나뭇잎(포인트)를 조회하는 API")
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "유효하지 않은 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "만료된 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "존재하지 않는 회원입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+    })
+    public ApiResponse<MemberResponseDTO.PointResDTO> getMyPoing(
+            @RequestHeader(value="Authorization", required = true) String authorization
+    ){
+        return ApiResponse.of(SuccessStatus._OK,memberQueryService.getMyPoint(authorization));
+    }
+
+    @PostMapping("/leaf/quiz")
+    @Operation(summary = "퀴즈 결과 나뭇잎 적립", description = "맞춘 문제 개수를 받아 나뭇잎을 적립하는 API (1문제당 50잎)")
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "Bad Request, 잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "유효하지 않은 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "만료된 JWT 토큰입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "존재하지 않는 회원입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+    })
+    public ApiResponse<MemberResponseDTO.QuizPointResDTO> earnQuizPoint(
+            @RequestHeader(value="Authorization", required = true) String authorization,
+            @RequestBody @Valid MemberRequestDTO.QuizPointReqDTO req
+    ){
+        return ApiResponse.of(SuccessStatus._OK,memberCommandService.earnQuizPoint(authorization,req));
+    }
+
     @PostMapping("/nickname/check")
     @Operation(summary = "닉네임 중복 확인 API", description = "닉네임 중복을 확인하는 API입니다.")
     @ApiResponses({
@@ -101,7 +212,7 @@ public ApiResponse<String> checkNickname(@Valid @RequestBody MemberRequestDTO.Ni
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "401", description = "인증이 필요합니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "존재하지 않는 회원입니다.", content = @Content(schema = @Schema(implementation = ApiResponse.class)))
     })
-    public ApiResponse<String> withdrawMember(@RequestHeader("Authorization") String authorization) {
+    public ApiResponse<String> withdrawMember(@RequestHeader(value = "Authorization", required = true) String authorization) {
         memberCommandService.withdrawMember(authorization);
         return ApiResponse.onSuccess("회원 탈퇴가 성공적으로 처리되었습니다.");
     }

src/main/java/fitfit/domain/member/converter/MemberConverter.java

@@ -9,6 +9,8 @@
 import fitfit.global.enums.MemberStatus;
 import fitfit.global.enums.Provider;
 
+import java.util.List;
+
 public class MemberConverter {
     private static final String DEFAULT_PROFILE_IMG_URL = "https://fitfit-profile-img.s3.ap-northeast-2.amazonaws.com/default_img.png";
     public static Member toMember (MemberDataDTO.MemberData kakaoMemberData, Provider provider) {
@@ -25,7 +27,7 @@ public static Member toMember (MemberDataDTO.MemberData kakaoMemberData, Provide
                 .height("임시 키")
                 .weight("임시 체중")
                 .point(0)
-                .clean_index(50)
+                .cleanIndex(50)
                 .build();
     }
 
@@ -51,4 +53,51 @@ public static MemberResponseDTO.MemberSignupResponse toMemberSignupResponse(Memb
                 .status(MemberStatus.ACTIVE)
                 .build();
     }
+
+    //Entity -> DTO
+    public static MemberResponseDTO.MyProfileResDTO toMemberProfileResDTO(Member member) {
+        return MemberResponseDTO.MyProfileResDTO.builder()
+                .memberId(member.getId())
+                .nickname(member.getNickname())
+                .email(member.getEmail())
+                .profileImgUrl(member.getProfileImgUrl())
+                .cleanIndex(member.getCleanIndex())
+                .build();
+    }
+
+    //Entity + StyleList -> Detail DTO
+    public static MemberResponseDTO.MyProfileDetailDto toMemberProfileDetailResDTO(Member member, List<String> styleList){
+        return MemberResponseDTO.MyProfileDetailDto.builder()
+                .memberId(member.getId())
+                .name(member.getName())
+                .nickname(member.getNickname())
+                .profileImgUrl(member.getProfileImgUrl())
+                .birthDate(member.getBirth())
+                .phoneNumber(member.getPhoneNumber())
+                .preferredStyles(styleList)
+                .build();
+    }
+
+    //Member Entity -> BodyInfoResDTO
+    public static MemberResponseDTO.BodyInfoResDTO toMemberBodyInfoResDTO(Member member) {
+        return MemberResponseDTO.BodyInfoResDTO.builder()
+                .height(member.getHeight())
+                .weight(member.getWeight())
+                .bodyImgUrl(member.getFullBodyImgUrl())
+                .build();
+    }
+
+    //Member Entity -> PointResDTO
+    public static MemberResponseDTO.PointResDTO toPointResDTO(Member member){
+        return MemberResponseDTO.PointResDTO.builder()
+                .point(member.getPoint()!= null ? member.getPoint():0)
+                .build();
+    }
+
+    public static MemberResponseDTO.QuizPointResDTO toQuizPointResDTO(Member member, Integer earnedPoint) {
+        return MemberResponseDTO.QuizPointResDTO.builder()
+                .earnedPoint(earnedPoint)
+                .totalPoint(member.getPoint())
+                .build();
+    }
 }

src/main/java/fitfit/domain/member/dto/MemberRequestDTO.java

@@ -2,6 +2,9 @@
 
 import fitfit.global.enums.Gender;
 import fitfit.global.enums.Style;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
@@ -77,4 +80,38 @@ public static class MemberSignupRequest {
         private List<Style> styleList;
         private String fullBodyImgUrl;
     }
+
+    public record UpdateProfileDTO(
+
+            @Schema(description = "닉네임", example = "박콩")
+            @NotBlank(message="닉네임은 필수입니다.")
+            String nickname,
+
+            @Schema(description = "프로필 이미지 URL", example = "https://s3...")
+            String profileImgUrl,
+
+            @Schema(description = "선호 스타일 리스트", example = "[\"BASIC\", \"CASUAL\"]")
+            List<String> preferredStyles
+    ){}
+
+    public record UpdateBodyInfoReqDTO(
+
+            @Schema(description = "키", example="170")
+            @NotBlank(message="키 입력은 필수입니다.")
+            String height,
+
+            @Schema(description = "몸무게", example="45")
+            @NotBlank(message="몸무게 입력은 필수입니다.")
+            String weight,
+
+            @Schema(description = "전신사진 URL", example = "https://s3...")
+            String bodyImgUrl
+            ){}
+
+    public record QuizPointReqDTO(
+       @Schema(description = "획득한 포인트", example = "100")
+       @NotNull(message="획득한 포인트는 필수입니다.")
+       @Min(value = 0, message = "포인트는 0 이상이어야 합니다.")
+       Integer earnedPoint
+    ){}
 }