#117 [fix] 모델 회원가입 로직 변경

src/main/java/com/moddy/server/controller/auth/AuthController.java

@@ -91,21 +91,20 @@ SuccessResponse<UserCreateResponse> createDesigner(
         return SuccessResponse.success(SuccessCode.DESIGNER_CREATE_SUCCESS, designerService.createDesigner(servletRequest.getHeader(ORIGIN), kakaoCode, designerInfo, profileImg));
     }
 
-    @Operation(summary = "[KAKAO CODE] 모델 회원가입 API", description = "모델 회원가입 API입니다.")
+    @Operation(summary = "[JWT] 모델 회원가입 API", description = "모델 회원가입 API입니다.")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "모델 회원가입 성공"),
-            @ApiResponse(responseCode = "400", description = "유효하지 않은 카카오 코드를 입력했습니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "400", description = "인증오류 입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
             @ApiResponse(responseCode = "404", description = "유효하지 않은 값을 입력했습니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
             @ApiResponse(responseCode = "500", description = "서버 내부 오류", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     })
     @PostMapping(value = "/signup/model")
     @SecurityRequirement(name = "JWT Auth")
     public SuccessResponse<UserCreateResponse> createModel(
-            @Parameter(hidden = true) @KakaoCode String kakaoCode,
-            @Parameter(hidden = true) HttpServletRequest request,
+            @Parameter(hidden = true) @UserId Long userId,
             @RequestBody ModelCreateRequest modelCreateRequest
     ) {
-        return SuccessResponse.success(SuccessCode.MODEL_CREATE_SUCCESS, modelService.createModel(request.getHeader(ORIGIN), kakaoCode, modelCreateRequest));
+        return SuccessResponse.success(SuccessCode.MODEL_CREATE_SUCCESS, modelService.createModel(userId, modelCreateRequest));
     }
 
     @Operation(summary = "[SMS 기능 미완성] 인증번호 요청 API", description = "인증번호 요청 API입니다.")

src/main/java/com/moddy/server/domain/model/Model.java

@@ -2,16 +2,22 @@
 
 import com.moddy.server.domain.user.User;
 import jakarta.persistence.Entity;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 
 @Getter
+@Setter
 @Entity
 @NoArgsConstructor
 @AllArgsConstructor
 @SuperBuilder
 public class Model extends User {
+
+    @NotNull
     private String year;
+
 }

src/main/java/com/moddy/server/domain/user/User.java

@@ -11,6 +11,7 @@
 
 @Entity
 @Getter
+@Setter
 @SuperBuilder
 @Inheritance(strategy = InheritanceType.JOINED)
 @NoArgsConstructor
@@ -24,27 +25,20 @@ public class User extends BaseTimeEntity {
     @NotNull
     private String kakaoId;
 
-    @NotNull
     private String name;
 
     @Enumerated(value = EnumType.STRING)
-    @NotNull
     private Gender gender;
 
-    @NotNull
     private String phoneNumber;
 
-    @NotNull
     private Boolean isMarketingAgree;
 
-    @NotNull
     private String profileImgUrl;
 
-    @NotNull
     @Enumerated(EnumType.STRING)
     private Role role;
 
-
     public Integer getAge(String year){
         LocalDateTime currentDateTime = LocalDateTime.now();
         Integer age = currentDateTime.getYear() - Integer.parseInt(year) + 1 ;

src/main/java/com/moddy/server/service/model/ModelService.java

@@ -38,11 +38,13 @@
 import com.moddy.server.domain.user.Gender;
 import com.moddy.server.domain.user.Role;
 import com.moddy.server.domain.user.User;
+import com.moddy.server.domain.user.repository.UserRepository;
 import com.moddy.server.external.kakao.service.KakaoSocialService;
 import com.moddy.server.external.s3.S3Service;
 import com.moddy.server.service.auth.AuthService;
 import lombok.RequiredArgsConstructor;
 import org.hibernate.Length;
+import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -60,6 +62,7 @@
 public class ModelService {
 
     private final ModelJpaRepository modelJpaRepository;
+    private final UserRepository userRepository;
     private final DesignerJpaRepository designerJpaRepository;
     private final HairModelApplicationJpaRepository hairModelApplicationJpaRepository;
     private final HairServiceOfferJpaRepository hairServiceOfferJpaRepository;
@@ -69,7 +72,6 @@ public class ModelService {
     private final PreferRegionJpaRepository preferRegionJpaRepository;
     private final RegionJpaRepository regionJpaRepository;
     private final HairServiceRecordJpaRepository hairServiceRecordJpaRepository;
-    private final KakaoSocialService kakaoSocialService;
     private final AuthService authService;
     private final S3Service s3Service;
 
@@ -240,20 +242,19 @@ public void updateOfferAgreeStatus(Long offerId){
     }
 
     @Transactional
-    public UserCreateResponse createModel(String baseUrl, String code, ModelCreateRequest request) {
+    public UserCreateResponse createModel(Long userId, ModelCreateRequest request) {
 
-        String kakaoId = kakaoSocialService.getIdFromKakao(baseUrl, code);
+        User user = userRepository.findById(userId).orElseThrow(() -> new NotFoundException(ErrorCode.USER_NOT_FOUND_EXCEPTION));
 
         Model model = Model.builder()
+                .kakaoId(user.getKakaoId())
                 .name(request.name())
-                .year(request.year())
                 .gender(request.gender())
                 .phoneNumber(request.phoneNumber())
                 .isMarketingAgree(request.isMarketingAgree())
                 .profileImgUrl(s3Service.getDefaultProfileImageUrl())
-                .kakaoId(kakaoId)
                 .role(Role.MODEL)
-                .build();
+                .year(request.year()).build();
 
         modelJpaRepository.save(model);