Merge pull request #228 from TEAM-MODDY/refactor/#220

#220 [Refactor] 제안서 상세보기 API Controller, Service 분리
TEAM-MODDY · Feb 4, 2024 · aa6bcc7 · aa6bcc7
2 parents f2a85ac + 1973100
commit aa6bcc7
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 113 deletions.
diff --git a/src/main/java/com/moddy/server/controller/model/ModelController.java b/src/main/java/com/moddy/server/controller/model/ModelController.java
@@ -8,7 +8,6 @@
 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.response.ApplicationUserDetailResponse;
-import com.moddy.server.controller.model.dto.response.DetailOfferResponse;
 import com.moddy.server.controller.model.dto.response.OpenChatResponse;
 import com.moddy.server.service.model.ModelRegisterService;
 import com.moddy.server.service.model.ModelRetrieveService;
@@ -67,22 +66,6 @@ public SuccessResponse<UserCreateResponse> createModel(
         return SuccessResponse.success(SuccessCode.MODEL_CREATE_SUCCESS, modelRegisterService.createModel(userId, modelCreateRequest));
     }
 
-    @Tag(name = "ModelController")
-    @Operation(summary = "[JWT] 제안서 상세보기 뷰 조회", description = "제안서 상세보기 API입니다.")
-    @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "제안서 상세보기 조회 성공", content = @Content(schema = @Schema(implementation = DetailOfferResponse.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("/model/offer/{offerId}")
-    @SecurityRequirement(name = "JWT Auth")
-    public SuccessResponse<DetailOfferResponse> getModelDetailOfferInfo(
-            @Parameter(hidden = true) @UserId Long userId,
-            @Parameter(name = "offerId", description = "제안서아이디") @PathVariable(value = "offerId") Long offerId) {
-        return SuccessResponse.success(SuccessCode.FIND_MODEL_DETAIL_OFFER_SUCCESS, modelService.getOfferDetail(userId, offerId));
-    }
-
     @Tag(name = "ModelController")
     @Operation(summary = "[JWT] 카카오톡 오픈채팅", description = "지원서 캡처 이미지 및 디자이너 정보 조회입니다")
     @ApiResponses({

diff --git a/src/main/java/com/moddy/server/controller/model/dto/response/DetailOfferResponse.java b/src/main/java/com/moddy/server/controller/model/dto/response/DetailOfferResponse.java
diff --git a/src/main/java/com/moddy/server/controller/model/dto/response/StyleDetailResponse.java b/src/main/java/com/moddy/server/controller/model/dto/response/StyleDetailResponse.java
@@ -1,7 +1,10 @@
 package com.moddy.server.controller.model.dto.response;
 
+import lombok.Builder;
+
 import java.util.List;
 
+@Builder
 public record StyleDetailResponse(
         Boolean isAgree,
         List<String> preferStyle,

diff --git a/src/main/java/com/moddy/server/controller/offer/OfferController.java b/src/main/java/com/moddy/server/controller/offer/OfferController.java
@@ -6,6 +6,7 @@
 import com.moddy.server.common.exception.enums.SuccessCode;
 import com.moddy.server.config.resolver.user.UserId;
 import com.moddy.server.controller.offer.dto.response.ModelMainOfferResponse;
+import com.moddy.server.controller.offer.response.DetailOfferResponse;
 import com.moddy.server.service.offer.HairServiceOfferRegisterService;
 import com.moddy.server.service.offer.HairServiceOfferRetrieveService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -63,4 +64,19 @@ public SuccessResponse<ModelMainOfferResponse> getModelMainInfo(
         return SuccessResponse.success(SuccessCode.FIND_MODEL_MAIN_INFO_SUCCESS, hairServiceOfferRetrieveService.getModelMainOfferInfo(modelId, page, size));
     }
 
+    @Tag(name = "ModelController")
+    @Operation(summary = "[JWT] 모델에게 온 디자이너 제안 상세보기", description = "제안서 상세보기 API입니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "401", description = "인증 오류 입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "200", description = "제안서 상세보기 조회 성공", content = @Content(schema = @Schema(implementation = DetailOfferResponse.class))),
+            @ApiResponse(responseCode = "404", description = "제안서 아이디가 존재하지 않습니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "500", description = "서버 내부 오류 입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+    })
+    @GetMapping("/model/offer/{offerId}")
+    @SecurityRequirement(name = "JWT Auth")
+    public SuccessResponse<DetailOfferResponse> getModelDetailOfferInfo(
+            @Parameter(hidden = true) @UserId Long modelId,
+            @Parameter(name = "offerId", description = "제안서아이디") @PathVariable(value = "offerId") Long offerId) {
+        return SuccessResponse.success(SuccessCode.FIND_MODEL_DETAIL_OFFER_SUCCESS, hairServiceOfferRetrieveService.getOfferDetail(modelId, offerId));
+    }
 }
diff --git a/src/main/java/com/moddy/server/controller/offer/response/DetailOfferResponse.java b/src/main/java/com/moddy/server/controller/offer/response/DetailOfferResponse.java
@@ -0,0 +1,10 @@
+package com.moddy.server.controller.offer.response;
+
+import com.moddy.server.controller.model.dto.response.DesignerInfoResponse;
+import com.moddy.server.controller.model.dto.response.StyleDetailResponse;
+
+public record DetailOfferResponse(
+        DesignerInfoResponse designerInfo,
+        StyleDetailResponse styleDetail
+) {
+}
diff --git a/src/main/java/com/moddy/server/service/application/HairModelApplicationRetrieveService.java b/src/main/java/com/moddy/server/service/application/HairModelApplicationRetrieveService.java
@@ -7,6 +7,7 @@
 import com.moddy.server.controller.model.dto.ApplicationModelInfoDto;
 import com.moddy.server.domain.hair_model_application.HairModelApplication;
 import com.moddy.server.domain.hair_model_application.repository.HairModelApplicationJpaRepository;
+import com.moddy.server.domain.hair_service_offer.HairServiceOffer;
 import com.moddy.server.domain.model.ModelApplyStatus;
 import com.moddy.server.domain.prefer_hair_style.PreferHairStyle;
 import com.moddy.server.domain.prefer_hair_style.repository.PreferHairStyleJpaRepository;
@@ -33,7 +34,7 @@ public class HairModelApplicationRetrieveService {
     private final ModelRetrieveService modelRetrieveService;
     private final PreferHairStyleJpaRepository preferHairStyleJpaRepository;
 
-    public String getApplicationCaptureUrl(final Long applicationId){
+    public String getApplicationCaptureUrl(final Long applicationId) {
         HairModelApplication application = hairModelApplicationJpaRepository.findById(applicationId).orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_APPLICATION_EXCEPTION));
         return application.getApplicationCaptureUrl();
     }
@@ -54,6 +55,21 @@ public DesignerMainResponse getDesignerMainInfo(final Long designerId, final int
         );
     }
 
+    public String fetchApplicationHairDetail(final Long applicationId) {
+        HairModelApplication hairModelApplication = hairModelApplicationJpaRepository.findById(applicationId).orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_APPLICATION_EXCEPTION));
+        return hairModelApplication.getHairDetail();
+    }
+
+    public List<String> fetchPreferHairStyle(final Long applicationId) {
+        List<PreferHairStyle> preferHairStyles = preferHairStyleJpaRepository.findAllByHairModelApplicationId(applicationId);
+        List<String> preferHairStyleList = preferHairStyles.stream().map(hairStyle -> {
+            return hairStyle.getHairStyle().getValue();
+        }).collect(Collectors.toList());
+
+        return preferHairStyleList;
+    }
+
+
     public boolean fetchModelApplyStatus(final Long modelId){
         return hairModelApplicationJpaRepository.existsByModelId(modelId);
     }

diff --git a/src/main/java/com/moddy/server/service/designer/DesignerRetrieveService.java b/src/main/java/com/moddy/server/service/designer/DesignerRetrieveService.java
@@ -3,25 +3,50 @@
 import com.moddy.server.common.exception.enums.ErrorCode;
 import com.moddy.server.common.exception.model.NotFoundException;
 import com.moddy.server.controller.model.dto.DesignerInfoOpenChatDto;
+import com.moddy.server.controller.model.dto.response.DesignerInfoResponse;
+import com.moddy.server.domain.day_off.DayOff;
+import com.moddy.server.domain.day_off.repository.DayOffJpaRepository;
 import com.moddy.server.domain.designer.Designer;
 import com.moddy.server.domain.designer.repository.DesignerJpaRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class DesignerRetrieveService {
 
     private final DesignerJpaRepository designerJpaRepository;
-    public String getDesignerName(final Long designerId){
+    private final DayOffJpaRepository dayOffJpaRepository;
+
+    public String getDesignerName(final Long designerId) {
         Designer designer = designerJpaRepository.findById(designerId).orElseThrow(() -> new NotFoundException(ErrorCode.DESIGNER_NOT_FOUND_EXCEPTION));
         return designer.getName();
     }
 
-    public DesignerInfoOpenChatDto getDesignerOpenDetail(final Long designerId){
+    public DesignerInfoOpenChatDto getDesignerOpenDetail(final Long designerId) {
+        Designer designer = designerJpaRepository.findById(designerId).orElseThrow(() -> new NotFoundException(ErrorCode.DESIGNER_NOT_FOUND_EXCEPTION));
+        return new DesignerInfoOpenChatDto(designer.getKakaoOpenChatUrl(), designer.getProfileImgUrl(), designer.getHairShop().getName(), designer.getName(), designer.getIntroduction());
+    }
+
+    public DesignerInfoResponse getOfferDesignerInfoResponse(final Long designerId) {
         Designer designer = designerJpaRepository.findById(designerId).orElseThrow(() -> new NotFoundException(ErrorCode.DESIGNER_NOT_FOUND_EXCEPTION));
-        return new DesignerInfoOpenChatDto(designer.getKakaoOpenChatUrl(),designer.getProfileImgUrl(), designer.getHairShop().getName(), designer.getName(), designer.getIntroduction());
+        List<String> dayOfWeekList = getDayOfWeekList(designerId);
+
+        DesignerInfoResponse designerInfoResponse = new DesignerInfoResponse(designer.getProfileImgUrl(), designer.getHairShop().getName(), designer.getName(), designer.getPortfolio().getInstagramUrl(), designer.getPortfolio().getNaverPlaceUrl(), designer.getIntroduction(), designer.getGender().getValue(), dayOfWeekList, designer.getHairShop().getAddress(), designer.getHairShop().getDetailAddress());
+        return designerInfoResponse;
+    }
+
+    private List<String> getDayOfWeekList(final Long designerId) {
+        List<DayOff> dayOffList = dayOffJpaRepository.findAllByDesignerId(designerId);
+        List<String> dayOfWeekList = dayOffList.stream().map(dayOff -> {
+            return dayOff.getDayOfWeek().getValue();
+        }).collect(Collectors.toList());
+
+        return dayOfWeekList;
     }
 }
diff --git a/src/main/java/com/moddy/server/service/model/ModelService.java b/src/main/java/com/moddy/server/service/model/ModelService.java
@@ -4,59 +4,22 @@
 import com.moddy.server.common.exception.enums.ErrorCode;
 import com.moddy.server.common.exception.model.NotFoundException;
 import com.moddy.server.controller.model.dto.response.ApplicationUserDetailResponse;
-import com.moddy.server.controller.model.dto.response.DesignerInfoResponse;
-import com.moddy.server.controller.model.dto.response.DetailOfferResponse;
-import com.moddy.server.controller.model.dto.response.StyleDetailResponse;
-import com.moddy.server.domain.day_off.DayOff;
-import com.moddy.server.domain.day_off.repository.DayOffJpaRepository;
-import com.moddy.server.domain.designer.Designer;
-import com.moddy.server.domain.designer.repository.DesignerJpaRepository;
-import com.moddy.server.domain.hair_model_application.HairModelApplication;
-import com.moddy.server.domain.hair_model_application.repository.HairModelApplicationJpaRepository;
-import com.moddy.server.domain.hair_service_offer.HairServiceOffer;
-import com.moddy.server.domain.hair_service_offer.repository.HairServiceOfferJpaRepository;
 import com.moddy.server.domain.model.Model;
 import com.moddy.server.domain.model.repository.ModelJpaRepository;
-import com.moddy.server.domain.prefer_hair_style.PreferHairStyle;
-import com.moddy.server.domain.prefer_hair_style.repository.PreferHairStyleJpaRepository;
-import com.moddy.server.domain.prefer_offer_condition.OfferCondition;
-import com.moddy.server.domain.prefer_offer_condition.PreferOfferCondition;
-import com.moddy.server.domain.prefer_offer_condition.repository.PreferOfferConditionJpaRepository;
 import com.moddy.server.domain.prefer_region.repository.PreferRegionJpaRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class ModelService {
 
     private final ModelJpaRepository modelJpaRepository;
-    private final DesignerJpaRepository designerJpaRepository;
-    private final HairModelApplicationJpaRepository hairModelApplicationJpaRepository;
-    private final HairServiceOfferJpaRepository hairServiceOfferJpaRepository;
-    private final PreferOfferConditionJpaRepository preferOfferConditionJpaRepository;
-    private final DayOffJpaRepository dayOffJpaRepository;
-    private final PreferHairStyleJpaRepository preferHairStyleJpaRepository;
     private final PreferRegionJpaRepository preferRegionJpaRepository;
 
-    @Transactional
-    public DetailOfferResponse getOfferDetail(Long userId, Long offerId) {
-
-        HairServiceOffer hairServiceOffer = hairServiceOfferJpaRepository.findById(offerId).orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_OFFER_EXCEPTION));
-
-        DesignerInfoResponse designerInfoResponseList = getDesignerInfoResponse(hairServiceOffer, userId, offerId);
-        StyleDetailResponse styleDetailResponse = getStyleDetailResponse(hairServiceOffer, userId, offerId);
-        handleOfferClickStatus(hairServiceOffer);
-
-        return new DetailOfferResponse(designerInfoResponseList, styleDetailResponse);
-    }
-
     public ApplicationUserDetailResponse getUserDetailInApplication(final Long userId) {
         Model model = modelJpaRepository.findById(userId).orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_MODEL_INFO));
         List<String> preferRegions = preferRegionJpaRepository.findAllByModelId(model.getId())
@@ -67,49 +30,4 @@ public ApplicationUserDetailResponse getUserDetailInApplication(final Long userI
         return new ApplicationUserDetailResponse(model.getName(), model.getGender().getValue(), model.getAge(), preferRegions);
     }
 
-    private DesignerInfoResponse getDesignerInfoResponse(HairServiceOffer hairServiceOffer, Long userId, Long offerId) {
-
-        Designer designer = designerJpaRepository.findById(hairServiceOffer.getDesigner().getId()).orElseThrow(() -> new NotFoundException(ErrorCode.DESIGNER_NOT_FOUND_EXCEPTION));
-
-        List<DayOff> dayOffList = dayOffJpaRepository.findAllByDesignerId(designer.getId());
-        List<String> dayOfWeekList = dayOffList.stream().map(dayOff -> {
-            return dayOff.getDayOfWeek().getValue();
-        }).collect(Collectors.toList());
-
-        DesignerInfoResponse designerInfoResponse = new DesignerInfoResponse(designer.getProfileImgUrl(), designer.getHairShop().getName(), designer.getName(), designer.getPortfolio().getInstagramUrl(), designer.getPortfolio().getNaverPlaceUrl(), designer.getIntroduction(), designer.getGender().getValue(), dayOfWeekList, designer.getHairShop().getAddress(), designer.getHairShop().getDetailAddress());
-
-        return designerInfoResponse;
-
-    }
-
-    private StyleDetailResponse getStyleDetailResponse(HairServiceOffer hairServiceOffer, Long userId, Long offerId) {
-
-        HairModelApplication hairModelApplication = hairModelApplicationJpaRepository.findById(hairServiceOffer.getHairModelApplication().getId()).orElseThrow(() -> new NotFoundException(ErrorCode.NOT_FOUND_APPLICATION_EXCEPTION));
-
-        List<PreferHairStyle> preferHairStyles = preferHairStyleJpaRepository.findAllByHairModelApplicationId(hairServiceOffer.getHairModelApplication().getId());
-        List<String> hairStyleList = preferHairStyles.stream().map(hairStyle -> {
-            return hairStyle.getHairStyle().getValue();
-        }).collect(Collectors.toList());
-
-        List<PreferOfferCondition> preferOfferConditionList = preferOfferConditionJpaRepository.findAllByHairServiceOfferId(offerId);
-        List<OfferCondition> offerConditionList = preferOfferConditionList.stream().map(PreferOfferCondition::getOfferCondition).collect(Collectors.toList());
-        List<Boolean> preferOfferConditionBooleanList = Arrays.stream(OfferCondition.values()).map(condition -> {
-            if (offerConditionList.contains(condition)) return true;
-            else return false;
-        }).collect(Collectors.toList());
-
-        StyleDetailResponse styleDetailResponse = new StyleDetailResponse(hairServiceOffer.getIsModelAgree(), hairStyleList, hairServiceOffer.getOfferDetail(), hairModelApplication.getHairDetail(), preferOfferConditionBooleanList);
-
-        return styleDetailResponse;
-    }
-
-    private void handleOfferClickStatus(HairServiceOffer hairServiceOffer) {
-
-        if (!hairServiceOffer.getIsClicked()) {
-            hairServiceOffer.updateClickStatus();
-        }
-    }
-
-
-
 }