Merge pull request #31 from MEME-UMC/chore/#27

[Chore] Service Module 테스트 및 세부 코드 수정
MEME-UMC · Aug 14, 2024 · 18c91cb · 18c91cb
2 parents 2083d0d + 21aca16
commit 18c91cb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/MEME-DOMAIN/src/main/java/org/meme/domain/common/status/SuccessStatus.java b/MEME-DOMAIN/src/main/java/org/meme/domain/common/status/SuccessStatus.java
@@ -65,9 +65,9 @@ public enum SuccessStatus {
     RESERVATION_GET_BY_MODEL(HttpStatus.OK,200, "예약 내역 조회가 완료되었습니다."),
     RESERVATION_DETAIL_GET_BY_ARTIST(HttpStatus.OK,200, "예약 상세 조회가 완료되었습니다."),
     RESERVATION_DETAIL_GET_BY_MODEL(HttpStatus.OK,200, "예약 상세 조회가 완료되었습니다."),
-    RESERVATION_STATUS_APPROVED_BY_ARTIST(HttpStatus.OK,200, "예약 상세 조회가 완료되었습니다."),
-    RESERVATION_STATUS_CANCELED_BY_ARTIST(HttpStatus.OK,200, "예약 상세 조회가 완료되었습니다."),
-    RESERVATION_STATUS_CANCELED_BY_MODEL(HttpStatus.OK,200, "예약 상세 조회가 완료되었습니다."),
+    RESERVATION_STATUS_APPROVED_BY_ARTIST(HttpStatus.OK,200, "예약 승인이 완료되었습니다."),
+    RESERVATION_STATUS_CANCELED_BY_ARTIST(HttpStatus.OK,200, "예약 취소가 완료되었습니다."),
+    RESERVATION_STATUS_CANCELED_BY_MODEL(HttpStatus.OK,200, "예약 취소가 완료되었습니다."),
 
     /**mypage**/
     MYPAGE_GET(HttpStatus.OK,200, "마이페이지 조회가 완료되었습니다"),

diff --git a/MEME-RESERVATION/src/main/java/org/meme/reservation/service/ReservationService.java b/MEME-RESERVATION/src/main/java/org/meme/reservation/service/ReservationService.java
@@ -162,6 +162,7 @@ public ReservationResponse.ReservationDetailModelSightDto getReservationDetailBy
         return ReservationConverter.toReservationDetailModelSightDto(reservation);
     }
 
+    @Transactional
     public void changeReservationStatusApproved(Long reservationId) {
         Reservation reservation = reservationRepository.findById(reservationId)
                 .orElseThrow(() -> new IllegalArgumentException("Reservation not found"));
@@ -171,6 +172,7 @@ public void changeReservationStatusApproved(Long reservationId) {
         }
     }
 
+    @Transactional
     public void changeReservationStatusCanceled(Long reservationId) {
         Reservation reservation = reservationRepository.findById(reservationId)
                 .orElseThrow(() -> new IllegalArgumentException("Reservation not found"));

diff --git a/MEME-SERVICE/src/main/java/org/meme/service/converter/PortfolioConverter.java b/MEME-SERVICE/src/main/java/org/meme/service/converter/PortfolioConverter.java
@@ -23,6 +23,7 @@ public static Portfolio toPortfolio(Artist artist, PortfolioRequest.CreatePortfo
                 .price(dto.getPrice())
                 .portfolioImgList(new ArrayList<PortfolioImg>())
                 .averageStars("0.00")
+                .durationTime(dto.getDurationTime())
                 .isBlock(false)
                 .build();
     }