feat: 예약 조기종료 기능 구현

backend/src/main/java/com/woowacourse/zzimkkong/controller/GuestReservationController.java

@@ -23,7 +23,6 @@
 
 import static com.woowacourse.zzimkkong.dto.ValidatorMessage.DATETIME_FORMAT;
 import static com.woowacourse.zzimkkong.dto.ValidatorMessage.DATE_FORMAT;
-import static com.woowacourse.zzimkkong.infrastructure.datetime.TimeZoneUtils.UTC;
 
 @LogMethodExecutionTime(group = "controller")
 @RestController
@@ -153,6 +152,25 @@ public ResponseEntity<Void> update(
         return ResponseEntity.ok().build();
     }
 
+    @PatchMapping("/maps/{mapId}/spaces/{spaceId}/reservations/{reservationId}")
+    public ResponseEntity<Void> updateEndTime(
+            @PathVariable final Long mapId,
+            @PathVariable final Long spaceId,
+            @PathVariable final Long reservationId,
+            @RequestBody @Valid final ReservationUpdateWithPasswordWithoutEndTimeRequest reservationUpdateWithPasswordWithoutEndTimeRequest,
+            @LoginEmail(isOptional = true) final LoginUserEmail loginUserEmail) {
+        ReservationUpdateDto reservationUpdateDto = ReservationUpdateDto.of(
+                mapId,
+                spaceId,
+                reservationId,
+                reservationUpdateWithPasswordWithoutEndTimeRequest,
+                loginUserEmail,
+                ReservationType.Constants.GUEST);
+        SlackResponse slackResponse = reservationService.updateReservationEndTime(reservationUpdateDto);
+        slackService.sendUpdateMessage(slackResponse);
+        return ResponseEntity.ok().build();
+    }
+
     @DeleteMapping("/maps/{mapId}/spaces/{spaceId}/reservations/{reservationId}")
     public ResponseEntity<Void> delete(
             @PathVariable final Long mapId,

backend/src/main/java/com/woowacourse/zzimkkong/domain/Reservation.java

@@ -3,7 +3,6 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
 
 import javax.persistence.*;
 import java.time.DayOfWeek;
@@ -82,6 +81,10 @@ public void update(final Reservation updateReservation) {
         this.space = updateReservation.space;
     }
 
+    public void updateReservationTime(final ReservationTime updateReservationTime) {
+        this.reservationTime = updateReservationTime;
+    }
+
     public LocalDateTime getStartTime() {
         return reservationTime.getStartTime();
     }

backend/src/main/java/com/woowacourse/zzimkkong/domain/TimeSlot.java

@@ -98,4 +98,3 @@ public String toString() {
         return startTime + " ~ " + endTimeAsString;
     }
 }
-

backend/src/main/java/com/woowacourse/zzimkkong/dto/reservation/ReservationUpdateWithPasswordWithoutEndTimeRequest.java

@@ -0,0 +1,26 @@
+package com.woowacourse.zzimkkong.dto.reservation;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Pattern;
+import java.time.ZonedDateTime;
+
+import static com.woowacourse.zzimkkong.dto.ValidatorMessage.RESERVATION_PW_FORMAT;
+import static com.woowacourse.zzimkkong.dto.ValidatorMessage.RESERVATION_PW_MESSAGE;
+
+@Getter
+@NoArgsConstructor
+public class ReservationUpdateWithPasswordWithoutEndTimeRequest extends ReservationCreateUpdateRequest {
+    @Pattern(regexp = RESERVATION_PW_FORMAT, message = RESERVATION_PW_MESSAGE)
+    private String password;
+
+    public ReservationUpdateWithPasswordWithoutEndTimeRequest(
+            final ZonedDateTime startDateTime,
+            final String password,
+            final String name,
+            final String description) {
+        super(startDateTime, ZonedDateTime.now(), name, description);
+        this.password = password;
+    }
+}

backend/src/main/java/com/woowacourse/zzimkkong/exception/reservation/InvalidMinimumDurationTimeInEarlyStopException.java

@@ -0,0 +1,13 @@
+package com.woowacourse.zzimkkong.exception.reservation;
+
+import com.woowacourse.zzimkkong.exception.ZzimkkongException;
+import org.springframework.http.HttpStatus;
+
+public class InvalidMinimumDurationTimeInEarlyStopException extends ZzimkkongException {
+
+    private static final String MESSAGE = "조기 종료는 최소 5분 이후부터 가능합니다.";
+
+    public InvalidMinimumDurationTimeInEarlyStopException() {
+        super(MESSAGE, HttpStatus.BAD_REQUEST);
+    }
+}

backend/src/main/java/com/woowacourse/zzimkkong/exception/reservation/NotCurrentReservationException.java

@@ -0,0 +1,12 @@
+package com.woowacourse.zzimkkong.exception.reservation;
+
+import com.woowacourse.zzimkkong.exception.ZzimkkongException;
+import org.springframework.http.HttpStatus;
+
+public class NotCurrentReservationException extends ZzimkkongException {
+    private static final String MESSAGE = "사용중인 예약에 대해서만 조기종료가 가능합니다.";
+
+    public NotCurrentReservationException() {
+        super(MESSAGE, HttpStatus.BAD_REQUEST);
+    }
+}

backend/src/main/java/com/woowacourse/zzimkkong/service/ReservationService.java

@@ -1,12 +1,39 @@
 package com.woowacourse.zzimkkong.service;
 
-import com.woowacourse.zzimkkong.domain.*;
+import com.woowacourse.zzimkkong.domain.Map;
+import com.woowacourse.zzimkkong.domain.Member;
+import com.woowacourse.zzimkkong.domain.Reservation;
+import com.woowacourse.zzimkkong.domain.ReservationTime;
+import com.woowacourse.zzimkkong.domain.ServiceZone;
+import com.woowacourse.zzimkkong.domain.Setting;
+import com.woowacourse.zzimkkong.domain.Settings;
+import com.woowacourse.zzimkkong.domain.Space;
+import com.woowacourse.zzimkkong.domain.TimeSlot;
 import com.woowacourse.zzimkkong.dto.member.LoginUserEmail;
-import com.woowacourse.zzimkkong.dto.reservation.*;
+import com.woowacourse.zzimkkong.dto.reservation.ReservationAuthenticationDto;
+import com.woowacourse.zzimkkong.dto.reservation.ReservationCreateDto;
+import com.woowacourse.zzimkkong.dto.reservation.ReservationCreateResponse;
+import com.woowacourse.zzimkkong.dto.reservation.ReservationFindAllDto;
+import com.woowacourse.zzimkkong.dto.reservation.ReservationFindAllResponse;
+import com.woowacourse.zzimkkong.dto.reservation.ReservationFindDto;
+import com.woowacourse.zzimkkong.dto.reservation.ReservationFindResponse;
+import com.woowacourse.zzimkkong.dto.reservation.ReservationInfiniteScrollResponse;
+import com.woowacourse.zzimkkong.dto.reservation.ReservationResponse;
+import com.woowacourse.zzimkkong.dto.reservation.ReservationUpdateDto;
 import com.woowacourse.zzimkkong.dto.slack.SlackResponse;
 import com.woowacourse.zzimkkong.exception.map.NoSuchMapException;
 import com.woowacourse.zzimkkong.exception.member.NoSuchMemberException;
-import com.woowacourse.zzimkkong.exception.reservation.*;
+import com.woowacourse.zzimkkong.exception.reservation.DeleteExpiredReservationException;
+import com.woowacourse.zzimkkong.exception.reservation.DeleteReservationInUseException;
+import com.woowacourse.zzimkkong.exception.reservation.InvalidMaximumDurationTimeException;
+import com.woowacourse.zzimkkong.exception.reservation.InvalidMinimumDurationTimeException;
+import com.woowacourse.zzimkkong.exception.reservation.InvalidMinimumDurationTimeInEarlyStopException;
+import com.woowacourse.zzimkkong.exception.reservation.InvalidReservationEnableException;
+import com.woowacourse.zzimkkong.exception.reservation.InvalidStartEndTimeException;
+import com.woowacourse.zzimkkong.exception.reservation.InvalidTimeUnitException;
+import com.woowacourse.zzimkkong.exception.reservation.NoSuchReservationException;
+import com.woowacourse.zzimkkong.exception.reservation.NotCurrentReservationException;
+import com.woowacourse.zzimkkong.exception.reservation.ReservationAlreadyExistsException;
 import com.woowacourse.zzimkkong.exception.setting.MultipleSettingsException;
 import com.woowacourse.zzimkkong.exception.setting.NoSettingAvailableException;
 import com.woowacourse.zzimkkong.exception.space.NoSuchSpaceException;
@@ -15,7 +42,11 @@
 import com.woowacourse.zzimkkong.repository.MapRepository;
 import com.woowacourse.zzimkkong.repository.MemberRepository;
 import com.woowacourse.zzimkkong.repository.ReservationRepository;
-import com.woowacourse.zzimkkong.service.strategy.*;
+import com.woowacourse.zzimkkong.service.strategy.ExcludeReservationCreateStrategy;
+import com.woowacourse.zzimkkong.service.strategy.ExcludeReservationStrategy;
+import com.woowacourse.zzimkkong.service.strategy.ExcludeReservationUpdateStrategy;
+import com.woowacourse.zzimkkong.service.strategy.ReservationStrategies;
+import com.woowacourse.zzimkkong.service.strategy.ReservationStrategy;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.stereotype.Service;
@@ -24,6 +55,8 @@
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -219,6 +252,52 @@ public SlackResponse updateReservation(final ReservationUpdateDto reservationUpd
         return SlackResponse.of(reservation, map);
     }
 
+    public SlackResponse updateReservationEndTime(final ReservationUpdateDto reservationUpdateDto) {
+        ReservationStrategy reservationStrategy = reservationStrategies.getStrategyByReservationType(reservationUpdateDto.getReservationType());
+        Long mapId = reservationUpdateDto.getMapId();
+        LoginUserEmail loginUserEmail = reservationUpdateDto.getLoginUserEmail();
+
+        Map map = maps.findByIdFetch(mapId)
+                .orElseThrow(NoSuchMapException::new);
+        reservationStrategy.validateManagerOfMap(map, loginUserEmail);
+
+        Long reservationId = reservationUpdateDto.getReservationId();
+        Reservation reservation = reservations.findById(reservationId)
+                .orElseThrow(NoSuchReservationException::new);
+        reservationStrategy.validateOwnerOfReservation(reservation, reservationUpdateDto.getPassword(), loginUserEmail);
+
+        LocalDateTime now = LocalDateTime.now();
+        if (!reservation.isInUse(now)) {
+            throw new NotCurrentReservationException();
+        }
+
+        if (ChronoUnit.MINUTES.between(reservation.getStartTime(), reservationUpdateDto.getEndDateTime()) < 5L) {
+            throw new InvalidMinimumDurationTimeInEarlyStopException();
+        }
+
+        reservation.updateReservationTime(
+                ReservationTime.of(
+                        reservation.getStartTime(),
+                        LocalDateTime.of(
+                                reservation.getDate(),
+                                LocalTime.of(
+                                        reservation.getEndTime().getHour(),
+                                        floorByFiveMinutes(reservationUpdateDto.getEndDateTime())
+                                )
+                        ),
+                        map.getServiceZone(),
+                        false)
+        );
+
+        map.activateSharingMapId(sharingIdGenerator);
+
+        return SlackResponse.of(reservation, map);
+    }
+
+    private int floorByFiveMinutes(final LocalDateTime baseTime) {
+        return (baseTime.getMinute() - 5) / 5 * 5;
+    }
+
     public SlackResponse deleteReservation(final ReservationAuthenticationDto reservationAuthenticationDto) {
         ReservationStrategy reservationStrategy = reservationStrategies.getStrategyByReservationType(reservationAuthenticationDto.getReservationType());
         Long mapId = reservationAuthenticationDto.getMapId();

backend/src/test/java/com/woowacourse/zzimkkong/domain/TimeSlotTest.java

@@ -149,4 +149,4 @@ private static Stream<Arguments> provideTimeSlotArguments_isNotWithin() {
                         false)
         );
     }
-}
+}

backend/src/test/java/com/woowacourse/zzimkkong/service/GuestReservationServiceTest.java

@@ -26,7 +26,6 @@
 import java.util.Optional;
 
 import static com.woowacourse.zzimkkong.Constants.*;
-import static com.woowacourse.zzimkkong.infrastructure.datetime.TimeZoneUtils.UTC;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;