1.3.0

src/main/java/com/moddy/server/common/exception/enums/SuccessCode.java

@@ -29,7 +29,11 @@ public enum SuccessCode {
     GET_PRE_SIGNED_URL_SUCCESS(HttpStatus.OK, "제안서 다운로드 url 생성 성공"),
     GET_APPLICATION_IMG_URL_SUCCESS(HttpStatus.OK, "지원서 이미지 url 가져오기 성공"),
     CHECK_VALID_APPLICATION_SUCCESS(HttpStatus.OK, "유효한 지원서 입니다."),
-    APPLICATION_DELETE_SUCCESS(HttpStatus.OK, "지원서 삭제하기 성공");
+    APPLICATION_DELETE_SUCCESS(HttpStatus.OK, "지원서 삭제하기 성공"),
+    FIND_DESIGNER_INFO_SUCCESS(HttpStatus.OK, "디자이너 정보 조회 성공"),
+    FIND_MODEL_INFO_SUCCESS(HttpStatus.OK, "모델 정보 조회 성공"),
+    MODEL_UPDATE_SUCCESS(HttpStatus.OK,"모델 정보 수정 성공"),
+    DESIGNER_UPDATE_SUCCESS(HttpStatus.OK,"디자이너 정보 수정 성공");
 
     private final HttpStatus httpStatus;
     private final String message;

src/main/java/com/moddy/server/controller/designer/DesignerRegisterController.java

@@ -1,10 +1,12 @@
 package com.moddy.server.controller.designer;
 
 import com.moddy.server.common.dto.ErrorResponse;
+import com.moddy.server.common.dto.SuccessNonDataResponse;
 import com.moddy.server.common.dto.SuccessResponse;
 import com.moddy.server.common.exception.enums.SuccessCode;
 import com.moddy.server.config.resolver.user.UserId;
 import com.moddy.server.controller.designer.dto.request.DesignerCreateRequest;
+import com.moddy.server.controller.designer.dto.request.DesignerUpdateRequest;
 import com.moddy.server.controller.designer.dto.response.UserCreateResponse;
 import com.moddy.server.service.designer.DesignerRegisterService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -19,6 +21,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
@@ -44,4 +47,21 @@ SuccessResponse<UserCreateResponse> createDesigner(
             @Valid @RequestPart("designerInfo") DesignerCreateRequest designerInfo) {
         return SuccessResponse.success(SuccessCode.DESIGNER_CREATE_SUCCESS, designerRegisterService.createDesigner(designerId, designerInfo, profileImg));
     }
+
+    @Operation(summary = "[JWT] 디자이너 마이페이지 수정 API", description = "디자이너 마이페이지 수정 API입니다.")
+        @ApiResponses(value = {
+                @ApiResponse(responseCode = "200", description = "디자이너 마이페이지 수정 성공"),
+                @ApiResponse(responseCode = "401", 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)))
+        })
+        @PutMapping(consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
+        @SecurityRequirement(name = "JWT Auth")
+        public SuccessNonDataResponse updateModel(
+                @Parameter(hidden = true) @UserId Long designerId,
+                @RequestPart(value = "profileImg", required = false) MultipartFile profileImg,
+                @RequestPart(value = "designerUpdateInfo") @Valid DesignerUpdateRequest designerUpdateInfo){
+            designerRegisterService.updateDesigner(designerId, profileImg, designerUpdateInfo);
+            return SuccessNonDataResponse.success(SuccessCode.DESIGNER_UPDATE_SUCCESS);
+        }
 }

src/main/java/com/moddy/server/controller/designer/DesignerRetrieveController.java

@@ -4,6 +4,7 @@
 import com.moddy.server.common.dto.SuccessResponse;
 import com.moddy.server.common.exception.enums.SuccessCode;
 import com.moddy.server.config.resolver.user.UserId;
+import com.moddy.server.controller.designer.dto.response.DesignerMyPageResponse;
 import com.moddy.server.controller.model.dto.DesignerInfoOpenChatDto;
 import com.moddy.server.service.designer.DesignerRetrieveService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -41,4 +42,19 @@ public SuccessResponse<DesignerInfoOpenChatDto> getDesignerOpenChatInfo(
             @Parameter(name = "designerId", description = "디자이너아이디") @PathVariable(value = "designerId") Long designerId) {
         return SuccessResponse.success(SuccessCode.OPEN_CHAT_GET_SUCCESS, designerRetrieveService.getDesignerOpenChatInfo(designerId));
     }
+
+    @Operation(summary = "[JWT] 마이페이지 디자이너 정보 조회", description = "마이페이지 수정시 디자이너 정보 조회입니다")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "디자이너 정보 조회 성공", content = @Content(schema = @Schema(implementation = DesignerMyPageResponse.class))),
+            @ApiResponse(responseCode = "401", description = "인증 오류 입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "500", description = "서버 내부 오류 입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+    })
+    @GetMapping()
+    @SecurityRequirement(name = "JWT Auth")
+    public SuccessResponse<DesignerMyPageResponse> getDesignerInfo(
+            @Parameter(hidden = true) @UserId Long designerId){
+        return SuccessResponse.success(SuccessCode.FIND_DESIGNER_INFO_SUCCESS, designerRetrieveService.getDesignerInfo(designerId));
+    }
+
+
 }

src/main/java/com/moddy/server/controller/designer/dto/HairShopDto.java

@@ -1,9 +1,7 @@
 package com.moddy.server.controller.designer.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 import lombok.*;
 

src/main/java/com/moddy/server/controller/designer/dto/request/DesignerUpdateRequest.java

@@ -0,0 +1,43 @@
+package com.moddy.server.controller.designer.dto.request;
+
+import com.moddy.server.common.validation.unique_dayofweek.UniqueDayOfWeek;
+import com.moddy.server.controller.designer.dto.HairShopDto;
+import com.moddy.server.controller.designer.dto.PortfolioDto;
+import com.moddy.server.domain.day_off.DayOfWeek;
+import com.moddy.server.domain.designer.HairShop;
+import com.moddy.server.domain.designer.Portfolio;
+import com.moddy.server.domain.user.Gender;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
+import java.util.List;
+
+@NotNull
+public record DesignerUpdateRequest(
+        @Schema(example = "introduction")
+        @NotNull
+        @Size(min = 0, max = 200, message = "introduction은 1~200 글자수 사이의 글자입니다.")
+        String introduction,
+        @Schema(example = "안현주")
+        @NotNull
+        @Size(min = 0, max = 5, message = "name은 1~5 글자수 사이의 글자입니다.")
+        String name,
+        @Schema(example = "MALE")
+        @NotNull
+        @Enumerated(EnumType.STRING)
+        Gender gender,
+        @Valid
+        HairShopDto hairShop,
+        @UniqueDayOfWeek
+        List<DayOfWeek> dayOffs,
+        @Valid
+        PortfolioDto portfolio,
+        @Schema(example = "http://.kakao")
+        @NotNull
+        String kakaoOpenChatUrl
+) {
+}

src/main/java/com/moddy/server/controller/designer/dto/response/DesignerMyPageResponse.java

@@ -0,0 +1,19 @@
+package com.moddy.server.controller.designer.dto.response;
+
+import com.moddy.server.domain.designer.HairShop;
+import com.moddy.server.domain.designer.Portfolio;
+
+import java.util.List;
+
+public record DesignerMyPageResponse(
+        String profileImgUrl,
+        String introduction,
+        String name,
+        String gender,
+        String phoneNumber,
+        HairShop hairShop,
+        List<String> dayOffs,
+        Portfolio portfolio,
+        String kakaoOpenChatUrl
+) {
+}

src/main/java/com/moddy/server/controller/model/ModelRegisterController.java

@@ -1,11 +1,13 @@
 package com.moddy.server.controller.model;
 
 import com.moddy.server.common.dto.ErrorResponse;
+import com.moddy.server.common.dto.SuccessNonDataResponse;
 import com.moddy.server.common.dto.SuccessResponse;
 import com.moddy.server.common.exception.enums.SuccessCode;
 import com.moddy.server.config.resolver.user.UserId;
 import com.moddy.server.controller.designer.dto.response.UserCreateResponse;
 import com.moddy.server.controller.model.dto.request.ModelCreateRequest;
+import com.moddy.server.controller.model.dto.request.ModelUpdateRequest;
 import com.moddy.server.service.model.ModelRegisterService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -18,6 +20,7 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -44,4 +47,21 @@ public SuccessResponse<UserCreateResponse> createModel(
             @Valid @RequestBody ModelCreateRequest modelCreateRequest) {
         return SuccessResponse.success(SuccessCode.MODEL_CREATE_SUCCESS, modelRegisterService.createModel(userId, modelCreateRequest));
     }
+
+    @Operation(summary = "[JWT] 모델 마이페이지 수정 API", description = "모델 마이페이지 수정 API입니다.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "모델 마이페이지 수정 성공"),
+            @ApiResponse(responseCode = "401", 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)))
+    })
+    @PutMapping
+    @SecurityRequirement(name = "JWT Auth")
+    public SuccessNonDataResponse updateModel(
+            @Parameter(hidden = true) @UserId Long modelId,
+            @Valid @RequestBody ModelUpdateRequest modelUpdateRequest) {
+        modelRegisterService.updateModel(modelId, modelUpdateRequest);
+        return SuccessNonDataResponse.success(SuccessCode.MODEL_UPDATE_SUCCESS);
+    }
+
 }

src/main/java/com/moddy/server/controller/model/ModelRetrieveController.java

@@ -6,6 +6,7 @@
 import com.moddy.server.config.resolver.user.UserId;
 import com.moddy.server.controller.auth.dto.response.RegionResponse;
 import com.moddy.server.controller.model.dto.response.ApplicationUserDetailResponse;
+import com.moddy.server.controller.model.dto.response.ModelMyPageResponse;
 import com.moddy.server.service.model.ModelRetrieveService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -52,4 +53,17 @@ public SuccessResponse<List<RegionResponse>> getRegionList() {
     public SuccessResponse<ApplicationUserDetailResponse> getUserDetailInApplication(@Parameter(hidden = true) @UserId final Long modelId) {
         return SuccessResponse.success(SuccessCode.CREATE_MODEL_APPLICATION_SUCCESS, modelRetrieveService.getModelDetailInApplication(modelId));
     }
+
+    @Operation(summary = "[JWT] 마이페이지 모델 정보 조회", description = "마이페이지 수정시 모델 정보 조회입니다")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "모델 정보 조회 성공", content = @Content(schema = @Schema(implementation = ModelMyPageResponse.class))),
+            @ApiResponse(responseCode = "401", description = "인증 오류 입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "500", description = "서버 내부 오류 입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+    })
+    @GetMapping()
+    @SecurityRequirement(name = "JWT Auth")
+    public SuccessResponse<ModelMyPageResponse> getDesignerInfo(
+            @Parameter(hidden = true) @UserId Long modelId) {
+        return SuccessResponse.success(SuccessCode.FIND_MODEL_INFO_SUCCESS, modelRetrieveService.getModelInfo(modelId));
+    }
 }

src/main/java/com/moddy/server/controller/model/dto/request/ModelCreateRequest.java

@@ -17,7 +17,7 @@
 @NotNull
 public record ModelCreateRequest(
         @Schema(description = "모델 회원가입 유저 이름 예시입니다.", example ="안현주")
-        @Size(min = 0, max = 10, message = "name은 1~10 글자수 사이의 글자입니다.")
+        @Size(min = 0, max = 10, message = "name은 1~5 글자수 사이의 글자입니다.")
         String name,
         @Schema(description = "모델 회원가입 유저 나이 예시입니다.", example ="2000")
         @NotBlank

src/main/java/com/moddy/server/controller/model/dto/request/ModelUpdateRequest.java

@@ -0,0 +1,32 @@
+package com.moddy.server.controller.model.dto.request;
+
+import com.moddy.server.common.validation.prefer_regions.ValidPreferRegions;
+import com.moddy.server.common.validation.year.ValidYear;
+import com.moddy.server.domain.user.Gender;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
+import java.util.List;
+
+@NotNull
+public record ModelUpdateRequest(
+        @Schema(description = "모델 회원가입 유저 이름 예시입니다.", example ="안현주")
+        @Size(min = 0, max = 5, message = "name은 1~5 글자수 사이의 글자입니다.")
+        String name,
+        @Schema(description = "모델 회원가입 유저 나이 예시입니다.", example ="2000")
+        @NotBlank
+        @ValidYear
+        String year,
+        @Schema(description = "모델 회원가입 유저 성별 예시입니다.", example ="FEMALE")
+        @Enumerated(EnumType.STRING)
+        @NotNull
+        Gender gender,
+        @Schema(description = "모델 회원가입 선호 지역 예시입니다.", example ="[\"3\", \"15\"]")
+        @ValidPreferRegions
+        List<Long> preferRegions
+) {
+}

src/main/java/com/moddy/server/controller/model/dto/response/ModelMyPageResponse.java

@@ -0,0 +1,12 @@
+package com.moddy.server.controller.model.dto.response;
+
+import java.util.List;
+
+public record ModelMyPageResponse(
+        String name,
+        String year,
+        String gender,
+        String phoneNumber,
+        List<String> preferRegions
+) {
+}

src/main/java/com/moddy/server/domain/designer/Designer.java

@@ -1,12 +1,12 @@
 package com.moddy.server.domain.designer;
 
+import com.moddy.server.controller.designer.dto.request.DesignerUpdateRequest;
 import com.moddy.server.domain.user.User;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 
 @Entity
@@ -27,4 +27,11 @@ public class Designer extends User {
 
     @NotNull
     private String kakaoOpenChatUrl;
+
+    public void update(HairShop hairShop, Portfolio portfolio, String introduction, String kakaoOpenChatUrl){
+        this.hairShop = hairShop;
+        this.portfolio = portfolio;
+        this.introduction = introduction;
+        this.kakaoOpenChatUrl = kakaoOpenChatUrl;
+    }
 }

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

@@ -6,7 +6,6 @@
 import lombok.Getter;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 
 import java.time.LocalDateTime;
@@ -20,9 +19,14 @@ public class Model extends User {
 
     @NotNull
     private String year;
+
     public int getAge() {
         LocalDateTime currentDateTime = LocalDateTime.now();
         Integer age = currentDateTime.getYear() - Integer.parseInt(this.year) + 1;
         return age;
     }
+
+    public void update(String year){
+        this.year = year;
+    }
 }

src/main/java/com/moddy/server/domain/model/repository/ModelJpaRepository.java

@@ -7,14 +7,13 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.Optional;
 
 @Repository
 public interface ModelJpaRepository extends JpaRepository<Model, Long> {
 
     @Modifying(clearAutomatically = true)
     @Query(value = "insert into model (id, year) VALUES (:id, :year)", nativeQuery = true)
     void modelRegister(@Param("id") Long id, @Param("year") String year);
-
+    
 }
 

src/main/java/com/moddy/server/domain/prefer_region/PreferRegion.java

@@ -3,7 +3,6 @@
 import com.moddy.server.domain.BaseTimeEntity;
 import com.moddy.server.domain.model.Model;
 import com.moddy.server.domain.region.Region;
-import com.moddy.server.domain.user.User;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
@@ -15,7 +14,6 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 @Entity
 @Getter

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

@@ -52,4 +52,8 @@ public void update(String name, Gender gender, String phoneNumber, Boolean isMar
         this.profileImgUrl = profileImgUrl;
         this.role = role;
     }
+
+    public String getSlashedPhoneNumber(String phoneNumber){
+        return phoneNumber.substring(0, 3) + "-" + phoneNumber.substring(3, 7) + "-" + phoneNumber.substring(7);
+    }
 }