[🚀 사이클2 - 미션 (예약 변경/취소와 에러 처리)] 주니(이해선) 미션 제출합니다.

README.md

@@ -0,0 +1,80 @@
+# 예약 변경/취소와 에러 처리
+
+## 기능 구현 목록
+
+### 1단계 - 서비스 정책 적용
+
+- [x] 지나간 날짜에 대한 예약 생성 불가
+- [x] 같은 날짜 + 시간 + 테마에 이미 예약이 있으면 중복 예약 거부
+- [x] 예약이 존재하는 시간 삭제 불가 (DB 외래키 RESTRICT 설정)
+- [x] 유효하지 않은 입력값 거부 (빈 이름, null 날짜/시간/테마)
+
+### 2단계 - 에러 응답 설계
+
+- [x] `@RestControllerAdvice`로 전역 예외 처리 추가
+- [x] 500 에러가 사용자에게 노출되지 않도록 처리
+- [x] 에러 응답 본문을 JSON 형식으로 통일
+- [x] 브라우저에서 에러 발생 시 사용자에게 의미 있는 메시지 표시
+
+### 3단계 - 내 예약 조회/변경/취소
+
+- [x] 이름으로 본인의 예약 목록 조회
+- [x] 본인의 예약 취소
+- [x] 본인의 예약 날짜·시간 변경 API 추가
+- [x] 변경 화면 구현 (프론트엔드)
+- [x] 변경·취소 에러 케이스 처리 (이미 지난 예약, 변경하려는 시간이 이미 예약된 경우 등)
+
+---
+
+## API 명세
+
+### 예약
+
+| 메서드 | URL | 설명            | 성공 응답 |
+|---|---|---------------|---|
+| GET | /reservations | 전체 예약 목록 조회   | 200 |
+| GET | /reservations/mine?name={name} | 이름으로 내 예약 조회  | 200 |
+| POST | /reservations | 예약 생성         | 201 |
+| DELETE | /reservations/{id} | 예약 취소         | 204 |
+| PATCH | /reservations/{id} | 예약 날짜 및 시간 변경 | 200 |
+
+### 테마
+
+| 메서드 | URL | 설명 | 성공 응답 |
+|---|---|---|---|
+| GET | /themes | 전체 테마 목록 조회 | 200 |
+| GET | /themes/popular | 인기 테마 상위 10개 조회 (최근 1주일 기준) | 200 |
+| POST | /admin/themes | 테마 생성 | 201 |
+| DELETE | /admin/themes/{id} | 테마 삭제 | 204 |
+
+### 시간
+
+| 메서드 | URL | 설명 | 성공 응답 |
+|---|---|---|---|
+| GET | /times | 전체 예약 시간 목록 조회 | 200 |
+| GET | /times/available?date={date}&themeId={themeId} | 예약 가능한 시간 조회 | 200 |
+| POST | /admin/times | 예약 시간 생성 | 201 |
+| DELETE | /admin/times/{id} | 예약 시간 삭제 | 204 |
+
+---
+
+## 에러 응답 설계
+
+### 응답 형식
+
+```json
+{
+  "status": "INVALID_DATE",
+  "message": "이미 예약된 시간입니다."
+}
+```
+
+### 에러 케이스
+
+| 상황 | 상태코드 |
+|---|---|
+| 중복 예약 | 409 Conflict |
+| 지나간 날짜 예약 | 400 Bad Request |
+| 존재하지 않는 리소스 | 404 Not Found |
+| 예약이 존재하는 시간/테마 삭제 | 400 Bad Request |
+| 유효하지 않은 입력값 | 400 Bad Request |

src/main/java/roomescape/config/JacksonConfig.java

@@ -0,0 +1,23 @@
+package roomescape.config;
+
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.time.format.DateTimeFormatter;
+
+@Configuration
+public class JacksonConfig {
+
+    private static final DateTimeFormatter TIME_FORMAT = DateTimeFormatter.ofPattern("HH:mm");
+
+    @Bean
+    public Jackson2ObjectMapperBuilderCustomizer timeFormatCustomizer() {
+        return builder -> {
+            builder.serializers(new LocalTimeSerializer(TIME_FORMAT));
+            builder.deserializers(new LocalTimeDeserializer(TIME_FORMAT));
+        };
+    }
+}

src/main/java/roomescape/controller/ReservationRestController.java

@@ -3,13 +3,14 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import roomescape.domain.reservation.ReservationRequest;
-import roomescape.domain.reservation.ReservationResponse;
+import roomescape.dto.reservation.ReservationRequest;
+import roomescape.dto.reservation.ReservationResponse;
 import roomescape.service.ReservationService;
 
 import java.net.URI;
@@ -47,6 +48,12 @@ public ResponseEntity<ReservationResponse> create(@RequestBody ReservationReques
         return ResponseEntity.created(uri).body(newReservation);
     }
 
+    @PatchMapping("/reservations/{id}")
+    public ResponseEntity<ReservationResponse> update(@PathVariable Long id, @RequestBody ReservationRequest reservationReq) {
+        ReservationResponse updatedReservation = reservationService.update(id, reservationReq);
+        return ResponseEntity.ok(updatedReservation);
+    }
+
     @DeleteMapping("/reservations/{id}")
     public ResponseEntity<Void> delete(@PathVariable Long id) {
         reservationService.delete(id);

src/main/java/roomescape/controller/ReservationTimeRestController.java

@@ -9,8 +9,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import roomescape.domain.reservationtime.ReservationTimeRequest;
-import roomescape.domain.reservationtime.ReservationTimeResponse;
+import roomescape.dto.reservationtime.ReservationTimeRequest;
+import roomescape.dto.reservationtime.ReservationTimeResponse;
 import roomescape.service.ReservationTimeService;
 
 import java.net.URI;

src/main/java/roomescape/controller/ThemeRestController.java

@@ -7,8 +7,8 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import roomescape.domain.theme.ThemeRequest;
-import roomescape.domain.theme.ThemeResponse;
+import roomescape.dto.theme.ThemeRequest;
+import roomescape.dto.theme.ThemeResponse;
 import roomescape.service.ThemeService;
 
 import java.net.URI;

src/main/java/roomescape/domain/reservation/Reservation.java

@@ -35,10 +35,14 @@ public Reservation(Long id, String name, LocalDate date, ReservationTime time, T
         this.createdAt = createdAt;
     }
 
-    public Reservation reservationWithId(Long id) {
+    public Reservation withReservationId(Long id) {
         return new Reservation(id, this.name, this.date, this.time, this.theme, this.createdAt);
     }
 
+    public Reservation withUpdatedDateAndTime(LocalDate date, ReservationTime time) {
+        return new Reservation(id, this.name, date, time, this.theme, this.createdAt);
+    }
+
     public Long getId() {
         return id;
     }

src/main/java/roomescape/dto/reservation/ReservationRequest.java

@@ -0,0 +1,34 @@
+package roomescape.dto.reservation;
+
+import roomescape.exception.InvalidInputException;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+public record ReservationRequest(String name, LocalDate date, Long timeId, Long themeId) {
+
+    public ReservationRequest {
+        List<String> emptyFields = new ArrayList<>();
+
+        if (name == null || name.isBlank()) {
+            emptyFields.add("name");
+        }
+
+        if (date == null) {
+            emptyFields.add("date");
+        }
+
+        if (timeId == null) {
+            emptyFields.add("timeId");
+        }
+
+        if (themeId == null) {
+            emptyFields.add("themeId");
+        }
+
+        if (!emptyFields.isEmpty()) {
+            throw new InvalidInputException("%s 필드가 비어있습니다.".formatted(emptyFields));
+        }
+    }
+}

src/main/java/roomescape/domain/reservation/ReservationResponse.java → src/main/java/roomescape/dto/reservation/ReservationResponse.java

@@ -1,7 +1,8 @@
-package roomescape.domain.reservation;
+package roomescape.dto.reservation;
 
-import roomescape.domain.reservationtime.ReservationTimeResponse;
-import roomescape.domain.theme.ThemeResponse;
+import roomescape.domain.reservation.Reservation;
+import roomescape.dto.reservationtime.ReservationTimeResponse;
+import roomescape.dto.theme.ThemeResponse;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

src/main/java/roomescape/dto/reservationtime/ReservationTimeRequest.java

@@ -0,0 +1,23 @@
+package roomescape.dto.reservationtime;
+
+import roomescape.exception.InvalidInputException;
+
+import java.time.LocalTime;
+
+public record ReservationTimeRequest(LocalTime startAt) {
+
+    public ReservationTimeRequest {
+        validateStartAt(startAt);
+    }
+
+    @Override
+    public LocalTime startAt() {
+        return startAt;
+    }
+
+    private static void validateStartAt(LocalTime startAt) {
+        if (startAt == null) {
+            throw new InvalidInputException("생성 시간은 필수입니다.");
+        }
+    }
+}

src/main/java/roomescape/domain/reservationtime/ReservationTimeResponse.java → src/main/java/roomescape/dto/reservationtime/ReservationTimeResponse.java

@@ -1,4 +1,6 @@
-package roomescape.domain.reservationtime;
+package roomescape.dto.reservationtime;
+
+import roomescape.domain.reservationtime.ReservationTime;
 
 import java.time.LocalTime;
 

src/main/java/roomescape/domain/theme/ThemeRequest.java → src/main/java/roomescape/dto/theme/ThemeRequest.java

@@ -1,4 +1,4 @@
-package roomescape.domain.theme;
+package roomescape.dto.theme;
 
 public record ThemeRequest(String name, String description, String url) {
 

src/main/java/roomescape/domain/theme/ThemeResponse.java → src/main/java/roomescape/dto/theme/ThemeResponse.java

@@ -1,4 +1,6 @@
-package roomescape.domain.theme;
+package roomescape.dto.theme;
+
+import roomescape.domain.theme.Theme;
 
 public class ThemeResponse {
 

src/main/java/roomescape/exception/ErrorResponse.java

@@ -0,0 +1,4 @@
+package roomescape.exception;
+
+public record ErrorResponse(String errorCode, String message) {
+}

src/main/java/roomescape/exception/GlobalExceptionHandler.java

@@ -0,0 +1,52 @@
+package roomescape.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(ReservationAlreadyExistException.class)
+    public ResponseEntity<ErrorResponse> handle(ReservationAlreadyExistException e) {
+        return ResponseEntity.status(HttpStatus.CONFLICT)
+                .body(new ErrorResponse("DUPLICATE_RESERVATION", e.getMessage()));
+    }
+
+    @ExceptionHandler(ReservationNotFoundException.class)
+    public ResponseEntity<ErrorResponse> handle(ReservationNotFoundException e) {
+        return ResponseEntity.status(HttpStatus.NOT_FOUND)
+                .body(new ErrorResponse("RESERVATION_NOT_FOUND", e.getMessage()));
+    }
+
+    @ExceptionHandler(ReservationTimeNotFoundException.class)
+    public ResponseEntity<ErrorResponse> handle(ReservationTimeNotFoundException e) {
+        return ResponseEntity.status(HttpStatus.NOT_FOUND)
+                .body(new ErrorResponse("TIME_NOT_FOUND", e.getMessage()));
+    }
+
+    @ExceptionHandler(ThemeNotFoundException.class)
+    public ResponseEntity<ErrorResponse> handle(ThemeNotFoundException e) {
+        return ResponseEntity.status(HttpStatus.NOT_FOUND)
+                .body(new ErrorResponse("THEME_NOT_FOUND", e.getMessage()));
+    }
+
+    @ExceptionHandler(InvalidReservationException.class)
+    public ResponseEntity<ErrorResponse> handle(InvalidReservationException e) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                .body(new ErrorResponse("INVALID_DATE_OR_TIME", e.getMessage()));
+    }
+
+    @ExceptionHandler(ReferencedDataException.class)
+    public ResponseEntity<ErrorResponse> handle(ReferencedDataException e) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                .body(new ErrorResponse("DIFFERENCE_DATA_EXISTS", e.getMessage()));
+    }
+
+    @ExceptionHandler(InvalidInputException.class)
+    public ResponseEntity<ErrorResponse> handle(InvalidInputException e) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                .body(new ErrorResponse("INVALID_INPUT", e.getMessage()));
+    }
+}

src/main/java/roomescape/exception/InvalidInputException.java

@@ -0,0 +1,7 @@
+package roomescape.exception;
+
+public class InvalidInputException extends IllegalArgumentException {
+    public InvalidInputException(String message) {
+        super(message);
+    }
+}

src/main/java/roomescape/exception/InvalidReservationException.java

@@ -0,0 +1,7 @@
+package roomescape.exception;
+
+public class InvalidReservationException extends RuntimeException {
+    public InvalidReservationException() {
+        super("이미 지난 날짜이거나 시간입니다.");
+    }
+}