[ARV-146] 차 대절 상세 조회 로직 개선 (#143)

* [ARV-146] fix: 차량 대절 폼 상세 조회 시 가용 날짜, 참여자 수를 DTO로 따로 분리해서 List로 조회하도록 수정 * [ARV-146] style: 코드 간격, 빈칸 수정 * [ARV-146] fix: RentDetailResponse 조회 시 날짜 별 참여자 수 조회하도록 수정 * [ARV-146] feat: 차량 대절 관리 리스트 페이지 조회 개선 * [ARV-146] fix: 차량 대절 관리 페이지 조회 로직 개선 - 페이지 조회 겹치는 부분 재사용 * [ARV-146] fix: 자신이 참가한 차 대절 리스트 조회 로직 개선 - 하나의 DTO로 조회하도록 수정 * [ARV-146] style: 빈 줄 삭제 * [ARV-146] feat: 차량 대절 삭제 구현 * [ARV-146] refactor: 차량 대절 API swagger ui 개선 * [ARV-146] fix: 이용 구분 및 입금 처리 인원 조회 groupby 추가 * [ARV-146] fix: RentRegisterRequest rentBoardingDateRequests -> boardingDates json 수정 * [ARV-146] fix: RentJoin command 요청 body 순서 및 유효성 검사 적용 * [ARV-146] fix: Rent command 요청 유효성 검사 적용 * [ARV-146] fix: toRentBoardingDates() 메서드 제거 * [ARV-146] test: Request 매개변수 순서 수정 * [ARV-146] fix: 차 대절 메인 페이지 조회 쿼리 개선
ALLREVA · Dec 26, 2024 · f2de683 · f2de683
1 parent 61e7529
commit f2de683
Show file tree

Hide file tree

Showing 37 changed files with 651 additions and 518 deletions.
diff --git a/src/main/java/com/backend/allreva/rent/command/application/RentCommandService.java b/src/main/java/com/backend/allreva/rent/command/application/RentCommandService.java
@@ -52,5 +52,14 @@ public void closeRent(
         rent.close();
     }
 
+    public void deleteRent(
+            final RentIdRequest rentIdRequest,
+            final Long memberId
+    ) {
+        Rent rent = rentRepository.findById(rentIdRequest.rentId())
+                .orElseThrow(RentNotFoundException::new);
 
+        rent.validateMine(memberId);
+        rentRepository.delete(rent);
+    }
 }
diff --git a/src/main/java/com/backend/allreva/rent/command/application/request/RentIdRequest.java b/src/main/java/com/backend/allreva/rent/command/application/request/RentIdRequest.java
@@ -1,4 +1,10 @@
 package com.backend.allreva.rent.command.application.request;
 
-public record RentIdRequest(Long rentId) {
+import jakarta.validation.constraints.NotNull;
+
+public record RentIdRequest(
+        @NotNull
+        Long rentId
+) {
+
 }
diff --git a/src/main/java/com/backend/allreva/rent/command/application/request/RentRegisterRequest.java b/src/main/java/com/backend/allreva/rent/command/application/request/RentRegisterRequest.java
@@ -10,32 +10,58 @@
 import com.backend.allreva.rent.command.domain.value.DetailInfo;
 import com.backend.allreva.rent.command.domain.value.OperationInfo;
 import com.backend.allreva.rent.command.domain.value.Price;
-import com.backend.allreva.rent_join.command.domain.value.RefundType;
 import com.backend.allreva.rent.command.domain.value.Region;
+import com.backend.allreva.rent_join.command.domain.value.RefundType;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.FutureOrPresent;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PositiveOrZero;
 import java.time.LocalDate;
 import java.util.List;
 
 public record RentRegisterRequest(
+        @NotNull
         Long concertId,
-        String imageUrl,
+        @NotBlank
         String title,
+        String imageUrl,
+        @NotNull
         String artistName,
+        @NotNull
         Region region, // enum 파싱
+        @NotNull
         String depositAccount,
+        @NotNull
         String boardingArea,
+        @NotNull
         String upTime,
+        @NotNull
         String downTime,
+        @NotEmpty(message = "날짜는 하루 이상 선택되어야 합니다.")
+        @JsonProperty("boardingDates")
         List<LocalDate> rentBoardingDateRequests,
+        @NotNull
         BusSize busSize, // enum
+        @NotNull
         BusType busType, // enum
+        @Min(value = 1, message = "탑승 인원 수는 1명 이상이어야 합니다.")
         int maxPassenger,
+        @PositiveOrZero
         int roundPrice,
+        @PositiveOrZero
         int upTimePrice,
+        @PositiveOrZero
         int downTimePrice,
+        @Min(value = 1, message = "모집 인원 수는 1명 이상이어야 합니다.")
         int recruitmentCount,
+        @FutureOrPresent(message = "마감 기한은 과거일 수 없습니다.")
         LocalDate endDate,
         String chatUrl,
-        RefundType refundType, //enum
+        @NotNull
+        RefundType refundType, // enum
         String information
 ) {
 

diff --git a/src/main/java/com/backend/allreva/rent/command/application/request/RentUpdateRequest.java b/src/main/java/com/backend/allreva/rent/command/application/request/RentUpdateRequest.java
@@ -1,39 +1,53 @@
 package com.backend.allreva.rent.command.application.request;
 
-import com.backend.allreva.rent.command.domain.RentBoardingDate;
 import com.backend.allreva.rent.command.domain.value.BusSize;
 import com.backend.allreva.rent.command.domain.value.BusType;
-import com.backend.allreva.rent_join.command.domain.value.RefundType;
 import com.backend.allreva.rent.command.domain.value.Region;
+import com.backend.allreva.rent_join.command.domain.value.RefundType;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.FutureOrPresent;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PositiveOrZero;
 import java.time.LocalDate;
 import java.util.List;
 
 public record RentUpdateRequest(
+        @NotNull
         Long rentId,
         String imageUrl,
+        @NotNull
         Region region, // enum 파싱
+        @NotNull
         String boardingArea,
+        @NotNull
         String upTime,
+        @NotNull
         String downTime,
+        @NotEmpty(message = "날짜는 하루 이상 선택되어야 합니다.")
+        @JsonProperty("boardingDates")
         List<LocalDate> rentBoardingDateRequests,
+        @NotNull
         BusSize busSize, // enum
+        @NotNull
         BusType busType, // enum
+        @Min(value = 1, message = "탑승 인원 수는 1명 이상이어야 합니다.")
         int maxPassenger,
+        @PositiveOrZero
         int roundPrice,
+        @PositiveOrZero
         int upTimePrice,
+        @PositiveOrZero
         int downTimePrice,
+        @Min(value = 1, message = "모집 인원 수는 1명 이상이어야 합니다.")
         int recruitmentCount,
+        @FutureOrPresent(message = "마감 기한은 과거일 수 없습니다.")
         LocalDate endDate,
         String chatUrl,
+        @NotNull
         RefundType refundType, //enum
         String information
 ) {
 
-    public List<RentBoardingDate> toRentBoardingDates() {
-        return rentBoardingDateRequests.stream()
-                .map(request -> RentBoardingDate.builder()
-                        .date(request)
-                        .build())
-                .toList();
-    }
 }
diff --git a/src/main/java/com/backend/allreva/rent/command/domain/RentRepository.java b/src/main/java/com/backend/allreva/rent/command/domain/RentRepository.java
@@ -1,9 +1,13 @@
 package com.backend.allreva.rent.command.domain;
 
 import com.backend.allreva.rent.command.domain.value.Region;
-import com.backend.allreva.rent.query.application.response.*;
+import com.backend.allreva.rent.query.application.response.DepositAccountResponse;
+import com.backend.allreva.rent.query.application.response.RentAdminSummaryResponse;
+import com.backend.allreva.rent.query.application.response.RentDetailResponse;
+import com.backend.allreva.rent.query.application.response.RentJoinCountResponse;
+import com.backend.allreva.rent.query.application.response.RentJoinDetailResponse;
+import com.backend.allreva.rent.query.application.response.RentSummaryResponse;
 import com.backend.allreva.survey.query.application.response.SortType;
-
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
@@ -26,9 +30,10 @@ public interface RentRepository {
     Optional<RentDetailResponse> findRentDetailById(Long rentId);
     Optional<DepositAccountResponse> findDepositAccountById(Long rentId);
 
-    List<RentAdminSummaryResponse> findRentAdminSummariesByMemberId(Long memberId);
-    Optional<RentAdminDetailResponse> findRentAdminDetail(Long memberId, LocalDate boardingDate, Long rentId);
-    List<RentAdminJoinDetailResponse> findRentAdminJoinDetails(Long memberId, Long rentId, LocalDate boardingDate);
+    List<RentAdminSummaryResponse> findRentAdminSummaries(Long memberId);
+    Optional<RentAdminSummaryResponse> findRentAdminSummary(Long memberId, LocalDate boardingDate, Long rentId);
+    Optional<RentJoinCountResponse> findRentJoinCount(Long memberId, LocalDate boardingDate, Long rentId);
+    List<RentJoinDetailResponse> findRentJoinDetails(Long memberId, Long rentId, LocalDate boardingDate);
 
     List<RentSummaryResponse> findRentMainSummaries();
 }