배포 v1

README.md

@@ -54,6 +54,10 @@
 
 </div>
 
+## 아키텍처 다이어그램
+![image](https://github.com/user-attachments/assets/25a84d99-a57e-42c9-afcf-1f9cb9adc9da)
+
+
 ## 협업 규칙
 
 ### Github 협업 규칙

src/main/generated/com/example/mody/domain/member/entity/QMember.java

@@ -60,9 +60,9 @@ public class QMember extends EntityPathBase<Member> {
 
     public final StringPath providerId = createString("providerId");
 
-    public final ListPath<com.example.mody.domain.recommendation.entity.Recommendation, com.example.mody.domain.recommendation.entity.QRecommendation> recommendations = this.<com.example.mody.domain.recommendation.entity.Recommendation, com.example.mody.domain.recommendation.entity.QRecommendation>createList("recommendations", com.example.mody.domain.recommendation.entity.Recommendation.class, com.example.mody.domain.recommendation.entity.QRecommendation.class, PathInits.DIRECT2);
+    public final ListPath<com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike> recommendationLikes = this.<com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike>createList("recommendationLikes", com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike.class, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike.class, PathInits.DIRECT2);
 
-    public final ListPath<com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike> RecommendLikes = this.<com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike>createList("RecommendLikes", com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike.class, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike.class, PathInits.DIRECT2);
+    public final ListPath<com.example.mody.domain.recommendation.entity.Recommendation, com.example.mody.domain.recommendation.entity.QRecommendation> recommendations = this.<com.example.mody.domain.recommendation.entity.Recommendation, com.example.mody.domain.recommendation.entity.QRecommendation>createList("recommendations", com.example.mody.domain.recommendation.entity.Recommendation.class, com.example.mody.domain.recommendation.entity.QRecommendation.class, PathInits.DIRECT2);
 
     public final NumberPath<Integer> reportCount = createNumber("reportCount", Integer.class);
 

src/main/generated/com/example/mody/domain/recommendation/entity/QRecommendation.java

@@ -40,7 +40,7 @@ public class QRecommendation extends EntityPathBase<Recommendation> {
 
     public final com.example.mody.domain.member.entity.QMember member;
 
-    public final ListPath<com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike> RecommendLikes = this.<com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike>createList("RecommendLikes", com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike.class, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike.class, PathInits.DIRECT2);
+    public final ListPath<com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike> recommendationLikes = this.<com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike>createList("recommendationLikes", com.example.mody.domain.recommendation.entity.mapping.MemberRecommendationLike.class, com.example.mody.domain.recommendation.entity.mapping.QMemberRecommendationLike.class, PathInits.DIRECT2);
 
     public final EnumPath<com.example.mody.domain.recommendation.enums.RecommendType> recommendType = createEnum("recommendType", com.example.mody.domain.recommendation.enums.RecommendType.class);
 

src/main/java/com/example/mody/domain/auth/controller/AuthController.java

@@ -96,26 +96,25 @@ public class AuthController {
 			)
 		),
 		@ApiResponse(
-			responseCode = "404",
-			description = "사용자를 찾을 수 없음",
+			responseCode = "COMMON401",
+			description = "로그인하지 않은 경우에 발생합니다.(엑세스 토큰을 넣지 않았을 때)",
 			content = @Content(
 				mediaType = "application/json",
 				examples = @ExampleObject(
 					value = """
-						{
-						    "timestamp": "2024-01-13T10:00:00",
-						    "code": "MEMBER404",
-						    "message": "해당 회원을 찾을 수 없습니다.",
-						    "result": null
-						}
-						"""
+								{
+								  "timestamp": "2025-02-17T22:23:22.7640118",
+								  "code": "COMMON401",
+								  "message": "인증이 필요합니다."
+								}
+							"""
 				)
 			)
 		)
 	})
 	@PostMapping("/signup/complete")
 	public BaseResponse<Void> completeRegistration(
-		@AuthenticationPrincipal CustomUserDetails userDetails,
+		@AuthenticationPrincipal CustomUserDetails customUserDetails,
 		@Valid @RequestBody
 		@Parameter(
 			description = "회원가입 완료 요청 정보",
@@ -137,7 +136,7 @@ public BaseResponse<Void> completeRegistration(
 			)
 		) MemberRegistrationRequest request
 	) {
-		memberCommandService.completeRegistration(userDetails.getMember().getId(), request);
+		memberCommandService.completeRegistration(customUserDetails.getMember(), request);
 		return BaseResponse.onSuccess(null);
 	}
 
@@ -243,18 +242,17 @@ public BaseResponse<AccessTokenResponse> reissueToken(
 			)
 		),
 		@ApiResponse(
-			responseCode = "AUTH401",
+			responseCode = "COMMON401",
 			description = "인증되지 않은 사용자",
 			content = @Content(
 				mediaType = "application/json",
 				examples = @ExampleObject(
 					value = """
 						{
-						    "timestamp": "2024-01-13T10:00:00",
-						    "code": "AUTH001",
-						    "message": "JWT가 없습니다.",
-						    "result": null
-						}
+								  "timestamp": "2025-02-17T22:23:22.7640118",
+								  "code": "COMMON401",
+								  "message": "인증이 필요합니다."
+								}
 						"""
 				)
 			)

src/main/java/com/example/mody/domain/auth/handler/OAuth2SuccessHandler.java

@@ -58,13 +58,13 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 		Member member = memberRepository.findByProviderId(oAuth2User.getOAuth2Response().getProviderId())
 			.orElseGet(() -> saveMember(oAuth2User));
 
-		// 새로 가입한 멤버인지 아닌지 확인
-		boolean isNewMember = member.getCreatedAt().equals(member.getUpdatedAt());
+//		// 새로 가입한 멤버인지 아닌지 확인
+//		boolean isNewMember = member.getCreatedAt().equals(member.getUpdatedAt());
 
 		// Access Token, Refresh Token 발급
 		String newAccessToken = authCommandService.processLoginSuccess(member, response);
 
-		String tempUrl = (isNewMember || !member.isRegistrationCompleted()) ? FRONT_SIGNUP_URL : FRONT_HOME_URL;
+		String tempUrl = (!member.isRegistrationCompleted()) ? FRONT_SIGNUP_URL : FRONT_HOME_URL;
 
 		String targetUrl = UriComponentsBuilder.fromUriString(tempUrl)
 				.build().toUriString();

src/main/java/com/example/mody/domain/auth/jwt/JwtAuthenticationFilter.java

@@ -35,9 +35,8 @@
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
 	private final JwtProvider jwtProvider;
-	private final MemberRepository memberRepository;
-	private final ObjectMapper objectMapper;
 	private final MemberQueryService memberQueryService;
+	private final ObjectMapper objectMapper;
 
 	@Override
 	protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
@@ -47,7 +46,9 @@ protected boolean shouldNotFilter(HttpServletRequest request) throws ServletExce
 			uri = uri.substring(contextPath.length());
 		}
 		log.info("JwtAuthenticationFilter - Request URI after context removal: {}", uri);
-		boolean skip = uri.startsWith("/auth/") && !uri.startsWith("/auth/signup/complete") ||
+		boolean skip = uri.startsWith("/auth/")
+				&& !uri.startsWith("/auth/signup/complete")
+				&& !uri.startsWith("/auth/logout")||
 			uri.startsWith("/oauth2/") ||
 			uri.startsWith("/email/") ||
 			uri.startsWith("/swagger-ui/") ||
@@ -70,8 +71,7 @@ protected void doFilterInternal(
 			// 만약 토큰이 있다면
 			if (token != null) {
 				String memberId = jwtProvider.validateTokenAndGetSubject(token);
-				Member member = memberRepository.findById(Long.parseLong(memberId))
-					.orElseThrow(() -> new RestApiException(AuthErrorStatus.INVALID_ACCESS_TOKEN));
+				Member member = memberQueryService.findMemberById(Long.parseLong(memberId));
 
 				CustomUserDetails customUserDetails = new CustomUserDetails(member);
 

src/main/java/com/example/mody/domain/auth/security/OAuth2UserService.java

@@ -57,7 +57,6 @@ private Member saveMember(OAuth2Response oAuth2Response) {
 		Member member = Member.builder()
 			.providerId(oAuth2Response.getProviderId())
 			.provider(oAuth2Response.getProvider())
-			.nickname(oAuth2Response.getName())
 			.status(Status.ACTIVE)
 			.role(Role.ROLE_USER)
 			.loginType(LoginType.KAKAO)

src/main/java/com/example/mody/domain/bodytype/controller/BodyTypeController.java

@@ -7,149 +7,32 @@
 import com.example.mody.domain.bodytype.service.memberbodytype.MemberBodyTypeQueryService;
 import com.example.mody.global.common.base.BaseResponse;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.ExampleObject;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-@Tag(name = "체형 분석", description = "체형 분석 API")
+@Tag(name = "체형 분석", description = "체형 분석 관련 API")
 @RestController
 @RequestMapping("/body-analysis")
 @RequiredArgsConstructor
-public class BodyTypeController {
+public class BodyTypeController implements BodyTypeControllerInterface {
 
     private final MemberBodyTypeCommandService memberBodyTypeCommandService;
     private final MemberBodyTypeQueryService memberBodyTypeQueryService;
 
     @PostMapping("/result")
-    @Operation(summary = "체형 분석 API", description = "OpenAi를 사용해서 사용자의 체형을 분석하는 API입니다. Request Body에는 질문에 맞는 답변 목록을 보내주세요.")
-    @ApiResponses({
-            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200",description = "체형 분석 성공"),
-            @ApiResponse(
-                    responseCode = "401",
-                    description = "Access Token이 필요합니다.",
-                    content = @Content(
-                            mediaType = "application/json",
-                            examples = @ExampleObject(
-                                    value = """
-						{
-							"timestamp": "2025-01-26T15:15:54.334Z",
-							"code": "COMMON401",
-							"message": "인증이 필요합니다."
-						}
-						"""
-                            )
-                    )
-            ),
-			@ApiResponse(
-					responseCode = "404",
-					description = "체형을 찾을 수 없습니다.",
-					content = @Content(
-							mediaType = "application/json",
-							examples = @ExampleObject(
-									value = """
-						{
-							"timestamp": "2025-01-26T15:15:54.334Z",
-							"code": "BODY_TYPE404",
-							"message": "체형을 찾을 수 없습니다."
-						}
-						"""
-							)
-					)
-			),
-            @ApiResponse(
-                    responseCode = "500",
-                    description = "GPT가 적절한 응답을 하지 못 했습니다.",
-                    content = @Content(
-                            mediaType = "application/json",
-                            examples = @ExampleObject(
-                                    value = """
-						{
-							"timestamp": "2025-01-26T15:15:54.334Z",
-							"code": "ANALYSIS108",
-							"message": "GPT가 올바르지 않은 답변을 했습니다. 관리자에게 문의하세요."
-						}
-						"""
-                            )
-                    )
-            ),
-    })
+	@Operation(summary = "체형 분석 API", description = "OpenAI를 사용해서 사용자의 체형을 분석하는 API입니다. Request Body에는 질문에 맞는 답변 목록을 보내주세요.")
     public BaseResponse<BodyTypeAnalysisResponse> analyzeBodyType(
             @AuthenticationPrincipal CustomUserDetails customUserDetails,
             @Valid @RequestBody BodyTypeAnalysisRequest request
     ) {
         return BaseResponse.onSuccess(memberBodyTypeCommandService.analyzeBodyType(customUserDetails.getMember(), request.getAnswer()));
     }
 
-//    @GetMapping()
-//    @Operation(summary = "체형 질문 문항 조회 API - 프론트와 협의 필요(API 연동 안 해도 됨)",
-//            description = "체형 분석을 하기 위해 질문 문항을 받아 오는 API입니다. 이 부분은 서버에서 바로 프롬프트로 넣는 방법도 있기 때문에 프론트와 협의 후 진행하겠습니다.")
-//    @ApiResponses({
-//            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200",description = "OK, 성공")
-//    })
-//    public BaseResponse<Void> getQuestion() {
-//        return BaseResponse.onSuccess(null);
-//    }
-
     @GetMapping("/result")
     @Operation(summary = "체형 분석 결과 조회 API", description = "사용자의 체형 분석 결과를 받아 오는 API입니다.")
-    @ApiResponses({
-            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200",description = "체형 분석 결과 조회 성공"),
-            @ApiResponse(
-                    responseCode = "400",
-                    description = "체형 분석 결과를 처리하는 중 JSON 파싱에 실패했습니다.",
-                    content = @Content(
-                            mediaType = "application/json",
-                            examples = @ExampleObject(
-                                    value = """
-						{
-							"timestamp": "2025-01-26T15:15:54.334Z",
-							"code": "JSON_PARSING400",
-							"message": "체형 분석 결과를 처리하는 중 JSON 파싱에 실패했습니다."
-						}
-						"""
-                            )
-                    )
-            ),
-            @ApiResponse(
-                    responseCode = "401",
-                    description = "Access Token이 필요합니다.",
-                    content = @Content(
-                            mediaType = "application/json",
-                            examples = @ExampleObject(
-                                    value = """
-						{
-							"timestamp": "2025-01-26T15:15:54.334Z",
-							"code": "COMMON401",
-							"message": "인증이 필요합니다."
-						}
-						"""
-                            )
-                    )
-            ),
-            @ApiResponse(
-                    responseCode = "404",
-                    description = "체형 분석 결과를 찾을 수 없습니다.",
-                    content = @Content(
-                            mediaType = "application/json",
-                            examples = @ExampleObject(
-                                    value = """
-						{
-							"timestamp": "2025-01-26T15:15:54.334Z",
-							"code": "MEMBER_BODY_TYPE404",
-							"message": "체형 분석 결과를 찾을 수 없습니다."
-						}
-						"""
-                            )
-                    )
-            ),
-    })
     public BaseResponse<BodyTypeAnalysisResponse> getBodyType(@AuthenticationPrincipal CustomUserDetails customUserDetails) {
         return BaseResponse.onSuccess(memberBodyTypeQueryService.getBodyTypeAnalysis(customUserDetails.getMember()));
     }