Merge branch 'develop' of https://github.com/TEAM-MODDY/moddy-server …

…into feat/#233 # Conflicts: # src/main/java/com/moddy/server/controller/application/ApplicationRetrieveController.java # src/main/java/com/moddy/server/controller/designer/DesignerRegisterController.java # src/main/java/com/moddy/server/service/application/HairModelApplicationRetrieveService.java
TEAM-MODDY · Feb 24, 2024 · 5063af3 · 5063af3
2 parents 457dcd6 + b450281
commit 5063af3
Show file tree

Hide file tree

Showing 21 changed files with 401 additions and 338 deletions.
diff --git a/src/main/java/com/moddy/server/common/exception/enums/SuccessCode.java b/src/main/java/com/moddy/server/common/exception/enums/SuccessCode.java
@@ -26,7 +26,8 @@ public enum SuccessCode {
     REFRESH_SUCCESS(HttpStatus.OK, "토큰 갱신 성공입니다."),
     CREATE_MODEL_APPLICATION_SUCCESS(HttpStatus.OK, "모델 지원서 생성 성공입니다."),
     USER_WITHDRAW_SUCCESS(HttpStatus.OK, "회원 탈퇴 성공입니다."),
-    GET_PRE_SIGNED_URL_SUCCESS(HttpStatus.OK, "제안서 다운로드 url 생성 성공");
+    GET_PRE_SIGNED_URL_SUCCESS(HttpStatus.OK, "제안서 다운로드 url 생성 성공"),
+    GET_APPLICATION_IMG_URL_SUCCESS(HttpStatus.OK, "지원서 이미지 url 가져오기 성공");
 
     private final HttpStatus httpStatus;
     private final String message;

diff --git a/src/main/java/com/moddy/server/controller/application/ApplicationController.java b/src/main/java/com/moddy/server/controller/application/ApplicationController.java
diff --git a/src/main/java/com/moddy/server/controller/application/ApplicationRegisterController.java b/src/main/java/com/moddy/server/controller/application/ApplicationRegisterController.java
@@ -0,0 +1,50 @@
+package com.moddy.server.controller.application;
+
+import com.moddy.server.common.dto.ErrorResponse;
+import com.moddy.server.common.dto.SuccessNonDataResponse;
+import com.moddy.server.common.exception.enums.SuccessCode;
+import com.moddy.server.config.resolver.user.UserId;
+import com.moddy.server.controller.model.dto.request.ModelApplicationRequest;
+import com.moddy.server.service.application.HairModelApplicationRegisterService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+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.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+@RestController
+@RequiredArgsConstructor
+@Tag(name = "Application Controller")
+@RequestMapping("/application")
+public class ApplicationRegisterController {
+
+    private final HairModelApplicationRegisterService hairModelApplicationRegisterService;
+
+    @Operation(summary = "[JWT] 모델 지원서 작성", description = "모델 지원서 작성 API입니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "모델 지원서 작성 성공"),
+            @ApiResponse(responseCode = "400", description = "인증 오류 입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "500", description = "서버 내부 오류 입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+    })
+    @SecurityRequirement(name = "JWT Auth")
+    @PostMapping(consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE})
+    public SuccessNonDataResponse submitModelApplication(
+            @Parameter(hidden = true) @UserId Long modelId,
+            @RequestPart(value = "modelImgUrl", required = false) MultipartFile modelImgUrl,
+            @RequestPart(value = "applicationCaptureImgUrl", required = false) MultipartFile applicationCaptureImgUrl,
+            @RequestPart(value = "applicationInfo") @Valid ModelApplicationRequest applicationInfo) {
+        hairModelApplicationRegisterService.postApplication(modelId, modelImgUrl, applicationCaptureImgUrl, applicationInfo);
+        return SuccessNonDataResponse.success(SuccessCode.CREATE_MODEL_APPLICATION_SUCCESS);
+    }
+}
diff --git a/src/main/java/com/moddy/server/controller/application/ApplicationRetrieveController.java b/src/main/java/com/moddy/server/controller/application/ApplicationRetrieveController.java
@@ -2,9 +2,19 @@
 
 import com.moddy.server.common.dto.ErrorResponse;
 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.ApplicationDetailInfoResponse;
+import com.moddy.server.controller.designer.dto.response.ApplicationInfoResponse;
+import com.moddy.server.controller.designer.dto.response.DesignerMainResponse;
 import com.moddy.server.controller.designer.dto.response.DownloadUrlResponseDto;
+import com.moddy.server.controller.designer.dto.response.ModelInfoResponse;
+import com.moddy.server.controller.model.dto.ApplicationDto;
+import com.moddy.server.controller.model.dto.ApplicationModelInfoDto;
+import com.moddy.server.controller.model.dto.response.ApplicationImgUrlResponse;
 import com.moddy.server.service.application.HairModelApplicationRetrieveService;
+import com.moddy.server.service.model.ModelRetrieveService;
+import com.moddy.server.service.offer.HairServiceOfferRetrieveService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -17,6 +27,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import static com.moddy.server.common.exception.enums.SuccessCode.GET_PRE_SIGNED_URL_SUCCESS;
@@ -27,6 +38,8 @@
 @RequestMapping("/application")
 public class ApplicationRetrieveController {
     private final HairModelApplicationRetrieveService hairModelApplicationRetrieveService;
+    private final ModelRetrieveService modelRetrieveService;
+    private final HairServiceOfferRetrieveService hairServiceOfferRetrieveService;
 
     @Operation(summary = "[JWT] 제안서 다운로드 링크", description = "디자이너 제안서 다운로드 링크 불러오는 API")
     @ApiResponses({
@@ -43,4 +56,73 @@ public SuccessResponse<DownloadUrlResponseDto> getOfferImageDownloadUrl(
     ) {
         return SuccessResponse.success(GET_PRE_SIGNED_URL_SUCCESS, hairModelApplicationRetrieveService.getApplicationCaptureDownloadUrl(applicationId));
     }
+
+    @Operation(summary = "[JWT] 디자이너 메인 뷰 조회", description = "디자이너 메인 뷰 조회 API입니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "디자이너 메인뷰 조회 성공", content = @Content(schema = @Schema(implementation = DesignerMainResponse.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<DesignerMainResponse> getDesignerMainInfo(
+            @Parameter(hidden = true) @UserId Long designerId,
+            @Parameter(name = "page", description = "페이지 ") @RequestParam(value = "page") int page,
+            @Parameter(name = "size", description = "페이지 ") @RequestParam(value = "size") int size) {
+        return SuccessResponse.success(SuccessCode.FIND_DESIGNER_MAIN_INFO_SUCCESS, hairModelApplicationRetrieveService.getDesignerMainInfo(designerId, page, size));
+    }
+
+    @Operation(summary = "[JWT] 모델 지원서 상세 조회", description = "모델 지원서 상세 조회 API입니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "모델 지원서 상세 조회 성공", content = @Content(schema = @Schema(implementation = ApplicationDetailInfoResponse.class))),
+            @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))),
+    })
+    @GetMapping("/{applicationId}")
+    @SecurityRequirement(name = "JWT Auth")
+    public SuccessResponse<ApplicationDetailInfoResponse> getApplicationDetailInfo(
+            @Parameter(hidden = true) @UserId Long designerId,
+            @PathVariable(value = "applicationId") Long applicationId) {
+        ApplicationDto applicationDto = hairModelApplicationRetrieveService.getApplicationDetailInfo(applicationId);
+        ApplicationModelInfoDto modelInfoDto = modelRetrieveService.getApplicationModelInfo(applicationDto.modelId());
+        ApplicationInfoResponse applicationInfoResponse = new ApplicationInfoResponse(
+                applicationId,
+                applicationDto.modelImgUrl(),
+                applicationDto.hairLength(),
+                applicationDto.preferHairStyleList(),
+                applicationDto.recordResponseList(),
+                applicationDto.hairDetail(),
+                hairServiceOfferRetrieveService.getIsSendStatus(applicationId, designerId),
+                applicationDto.instgramId()
+        );
+
+        ModelInfoResponse modelInfoResponse = new ModelInfoResponse(
+                modelInfoDto.modelId(),
+                modelInfoDto.name(),
+                modelInfoDto.age(),
+                modelInfoDto.gender(),
+                modelInfoDto.regionList()
+
+        );
+
+        ApplicationDetailInfoResponse applicationDetailInfoResponse = new ApplicationDetailInfoResponse(applicationInfoResponse, modelInfoResponse);
+        return SuccessResponse.success(SuccessCode.MODEL_APPLICATION_DETAil_INFO_SUCCESS, applicationDetailInfoResponse);
+    }
+
+    @Operation(summary = "[JWT] 지원서 이미지 가져오기", description = "오픈채팅 뷰에서 지원서 이미지 가져오기 API입니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "모델 지원서 이미지 가져오기 성공", content = @Content(schema = @Schema(implementation = ApplicationDetailInfoResponse.class))),
+            @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))),
+    })
+    @GetMapping("/{applicationId}/img-url")
+    @SecurityRequirement(name = "JWT Auth")
+    public SuccessResponse<ApplicationImgUrlResponse> getApplicationImgUrlOpenChat(
+            @Parameter(hidden = true) @UserId Long modelId,
+            @PathVariable(value = "applicationId") Long applicationId) {
+        return SuccessResponse.success(SuccessCode.GET_APPLICATION_IMG_URL_SUCCESS, hairModelApplicationRetrieveService.getApplicationImgUrl(applicationId));
+    }
 }
+