#117 Develop -> Main

src/main/java/com/example/sabujak/reservation/controller/ReservationController.java

@@ -156,6 +156,20 @@ public ResponseEntity<Response<ReservationResponseDto.CheckRechargingRoomOverlap
         return ResponseEntity.ok(Response.success(reservationService.checkRechargingRoomOverlap(access.getEmail(), startAt)));
     }
 
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "취소 성공", content = @Content(schema = @Schema(implementation = Response.class))),
+            @ApiResponse(responseCode = "404", description = "취소 실패", content = @Content(schema = @Schema(implementation = Response.class)))})
+    @Operation(summary = "리차징룸 예약 취소", description = "리차징룸 예약 id를 받고 예약 취소")
+    @Parameters({
+            @Parameter(name = "access", hidden = true)
+    })
+    @DeleteMapping("/recharging-rooms/{reservationId}")
+    public ResponseEntity<Response<Void>> cancelRechargingRoomReservation(@AuthenticationPrincipal AuthRequestDto.Access access,
+                                                                          @PathVariable Long reservationId) {
+        reservationService.cancelRechargingRoom(access.getEmail(), reservationId);
+        return ResponseEntity.ok(Response.success(null));
+    }
+
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "예약 성공", content = @Content(schema = @Schema(implementation = Response.class))),
             @ApiResponse(responseCode = "404", description = "예약 실패", content = @Content(schema = @Schema(implementation = Response.class)))})

src/main/java/com/example/sabujak/reservation/service/ReservationService.java

@@ -444,6 +444,23 @@ private boolean verifyOverlappingRechargingRoom(Member member, LocalDateTime sta
         return false;
     }
 
+    @Transactional
+    public void cancelRechargingRoom(String email, Long reservationId) {
+        final Member member = memberRepository.findByMemberEmail(email)
+                .orElseThrow(() -> new AuthException(ACCOUNT_NOT_EXISTS));
+
+        Reservation reservation = reservationRepository.findById(reservationId)
+                .orElseThrow(() -> new ReservationException(RESERVATION_NOT_EXISTS));
+
+        if(reservation.getMemberReservations().get(0).getMember().getMemberId() != member.getMemberId()) {
+            throw new ReservationException(NOT_RESERVED_BY_MEMBER);
+        } else if (reservation.getReservationEndDateTime().isBefore(LocalDateTime.now())) {
+            throw new ReservationException(ALREADY_ENDED_RESERVATION);
+        } else {
+            reservation.getMemberReservations().forEach(MemberReservation::cancelReservation);
+        }
+    }
+
     public ReservationResponseDto.CheckRechargingRoomOverlap checkRechargingRoomOverlap(String email, LocalDateTime startAt) {
 
         final Member member = memberRepository.findByMemberEmail(email)

src/main/java/com/example/sabujak/space/service/SpaceService.java

@@ -4,6 +4,7 @@
 import com.example.sabujak.branch.exception.BranchErrorCode;
 import com.example.sabujak.branch.exception.BranchException;
 import com.example.sabujak.branch.repository.BranchRepository;
+import com.example.sabujak.common.dto.ToastType;
 import com.example.sabujak.member.entity.Member;
 import com.example.sabujak.member.repository.MemberRepository;
 import com.example.sabujak.reservation.entity.Reservation;
@@ -13,23 +14,21 @@
 import com.example.sabujak.space.dto.response.FocusDeskResponseDto;
 import com.example.sabujak.space.dto.response.MeetingRoomResponseDto;
 import com.example.sabujak.space.dto.response.RechargingRoomResponseDto;
-import com.example.sabujak.common.dto.ToastType;
 import com.example.sabujak.space.entity.MeetingRoom;
 import com.example.sabujak.space.entity.MeetingRoomType;
 import com.example.sabujak.space.entity.RechargingRoom;
 import com.example.sabujak.space.entity.Space;
 import com.example.sabujak.space.exception.meetingroom.SpaceException;
 import com.example.sabujak.space.repository.FocusDeskRepository;
-
 import com.example.sabujak.space.repository.RechargingRoomRepository;
 import com.example.sabujak.space.repository.SpaceRepository;
-
 import com.example.sabujak.space.repository.meetingroom.MeetingRoomRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -137,10 +136,14 @@ public List<RechargingRoomResponseDto.RechargingRoomForList> getRechargingRoomLi
         for (RechargingRoom rechargingRoom : rechargingRooms) {
             Map<String, Boolean> reservationTimes = new HashMap<>();
             for (int i = 0; i < 5; i++) {
-                String startTime = now.plusMinutes(30 * i).format(DateTimeFormatter.ofPattern("HH:mm"));
-                String endTime = now.plusMinutes(30 * (i + 1)).format(DateTimeFormatter.ofPattern("HH:mm"));
+                LocalDateTime startTime = now.plusMinutes(30 * i);
 
-                reservationTimes.put(startTime, true);
+                if (startTime.equals(now.plusDays(1).with(LocalTime.of(0, 0, 0)))) {
+                    break;
+                }
+
+                String startTimeStr = startTime.format(DateTimeFormatter.ofPattern("HH:mm"));
+                reservationTimes.put(startTimeStr, true);
             }
 
             if (reservationMap.size() > 0) {
@@ -153,7 +156,7 @@ public List<RechargingRoomResponseDto.RechargingRoomForList> getRechargingRoomLi
         }
         return rechargingRoomList;
     }
-      
+
     public SpaceCountResponseDto countRoomByBranch(Long branchId) {
         Branch branch = branchRepository.findById(branchId)
                 .orElseThrow(() -> new BranchException(BranchErrorCode.BRANCH_NOT_FOUND));