Merge pull request #445

* test: Fake 객체 리팩토링

* refactor: 지난 날짜 및 시간 예약 불가 예외 처리

* refactor: 중복 예약 예외 처리 추가

* refactor: AdminReservationController 분리

* feat: 사용자 이름으로 예약 조회 기능 추가

* feat: 사용자 이름으로 예약 삭제 기능 추가

* refactor: 사용자 예약 조회 api url 수정

* refactor: 에러 포맷팅 누락 해결

* feat: 예약 수정 기능 구현

* feat: 추가된 기능 클라이언트 코드 추가

* refactor: 더미데이터 수정

* docs: 기능 명세 업데이트

* refactor: `@Valid`로 입력값 검증

* refactor: 불필요한 개행 삭제

* refactor: ErrorCode 네이밍 변경

* refactor: 가능 시간 조회 api url 수정

* refactor: errors 패키지 추가

* refactor: 엣지케이스 예외 추가

* refactor: 불필요한 `@Transactional` 어노테이션 삭제

* refactor: 불필요한 로깅 삭제

* refactor: 메서드 네이밍 변경

* refactor: 날짜와 시간 추출 로직 수정

* refactor: 시간 조회 시 theme id및 date id 검증 로직 추가

* refactor: 동일 자료형 검증 형태 통일

* test: 테마 테스트 추가

* refactor: 쿼리문 수정

* test: ReservationControllerTest 추가

* test: AdminReservationControllerTest 추가

* refactor: ReservationDate 어드민 컨트롤러 분리

* test: ReservationDate 컨트롤러 테스트 추가

* refactor: ReservationTime 어드민 기능 분리

* test: ReservationTime 컨트롤러 테스트 추가

* refactor: Theme 컨트롤러 관리자 기능 분리

* refactor: ReservationTime 패키지 수정

* test: Theme 컨트롤러 테스트 추가

* refactor: yml 필요한 필드 추가

* test: Theme e2e 테스트 추가

* test: ReservationTime e2e 테스트 추가

* test: ReservationDate e2e 테스트 추가

* test: Reservation e2e 테스트 추가

* refactor: 테스트 네이밍 컨벤션 통일

* refactor: 메서드 네이밍 수정

* feat: 테스트마다 고유한 db 이름 사용하도록 yml 추가

Author: boyekim

README.md

@@ -7,6 +7,13 @@
 - 사용자는 이름, 날짜 ID, 시간 ID, 테마 ID를 입력해 예약을 생성한다.
 - 예약 생성 시 이름이 비어 있으면 예외를 반환한다.
 - 예약 생성 시 날짜, 시간, 테마 값이 누락되면 예외를 반환한다.
+- 사용자는 이름으로 본인의 예약 목록을 조회한다.
+- 사용자는 본인의 예약을 취소한다.
+- 사용자는 본인의 예약 날짜와 시간을 변경한다.
+- 예약 변경 시 날짜와 시간이 모두 누락되면 예외를 반환한다.
+- 예약 변경 시 존재하지 않는 날짜나 시간이 입력되면 예외를 반환한다.
+- 예약 변경 시 변경하려는 날짜와 시간이 현재보다 이전이면 예외를 반환한다.
+- 예약 변경 시 같은 날짜, 시간, 테마의 다른 예약이 이미 존재하면 예외를 반환한다.
 - 관리자는 전체 예약 목록을 조회한다.
 - 관리자는 예약 ID로 예약을 삭제한다.
 
@@ -101,7 +108,7 @@
 
 ```json
 {
-  "name": "쿠키",
+  "name": "보예",
   "dateId": 1,
   "timeId": 2,
   "themeId": 3
@@ -113,7 +120,7 @@
 ```json
 {
   "id": 29,
-  "name": "쿠키",
+  "name": "보예",
   "date": "2026-05-01",
   "time": "11:00",
   "theme": {
@@ -124,6 +131,55 @@
 }
 ```
 
+#### `GET /reservations?name={name}`
+
+- 설명: 사용자 이름으로 예약 목록 조회
+- 응답 `200 OK`
+
+```json
+{
+  "name": "보예",
+  "reservation": [
+    {
+      "reservationId": 29,
+      "date": {
+        "id": 1,
+        "startWhen": "2026-05-01"
+      },
+      "time": {
+        "id": 2,
+        "startAt": "11:00"
+      },
+      "theme": {
+        "id": 3,
+        "name": "청춘물",
+        "content": "학교 배경인 테마 입니다.",
+        "url": "/themes/youth"
+      }
+    }
+  ]
+}
+```
+
+#### `PATCH /reservations/{id}`
+
+- 설명: 사용자 예약 날짜와 시간 변경
+- 요청 본문
+
+```json
+{
+  "startWhen": "2026-05-10",
+  "startAt": "15:00"
+}
+```
+
+- 응답 `204 No Content`
+
+#### `DELETE /reservations/{id}`
+
+- 설명: 사용자 예약 취소
+- 응답 `204 No Content`
+
 #### `DELETE /admin/reservations/{id}`
 
 - 설명: 예약 삭제
@@ -190,7 +246,7 @@
 
 ### 예약 시간
 
-#### `GET /times?themeId={themeId}&dateId={dateId}`
+#### `GET /reservation-times/availability?themeId={themeId}&dateId={dateId}`
 
 - 설명: 특정 테마와 날짜의 예약 가능 시간 조회
 - 응답 `200 OK`

build.gradle

@@ -21,6 +21,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     runtimeOnly 'com.h2database:h2'

src/main/java/roomescape/config/TimeConfig.java

@@ -0,0 +1,14 @@
+package roomescape.config;
+
+import java.time.Clock;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class TimeConfig {
+
+    @Bean
+    public Clock clock() {
+        return Clock.systemDefaultZone();
+    }
+}

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

@@ -4,6 +4,7 @@
 import java.sql.Statement;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
@@ -85,7 +86,53 @@ select count(*)
             from reservation
             where theme_id = ?
             """;
-    ;
+    private static final String EXISTS_RESERVATION_BY_TIME_AND_DATE_AND_THEME_SQL =
+        """
+            select exists(
+                select 1
+                from reservation r
+                where time_id = ? and date_id = ? and theme_id = ?
+            )
+            """;
+    private static final String EXISTS_OTHER_RESERVATION_BY_TIME_AND_DATE_AND_THEME_SQL =
+        """
+            select exists(
+                select 1
+                from reservation r
+                where r.id <> ? and time_id = ? and date_id = ? and theme_id = ?
+            )
+            """;
+    private static final String FIND_BY_NAME_SQL =
+        """
+            select r.id, r.name,
+                   rd.id as date_id, rd.date,
+                   rt.id as time_id, rt.start_at,
+                   th.id as theme_id, th.name as theme_name, th.content as theme_content, th.url as theme_url
+            from reservation r
+            join reservation_date rd on r.date_id = rd.id
+            join reservation_time rt on r.time_id = rt.id
+            join theme th on r.theme_id = th.id
+            where r.name = ?
+            order by rd.date desc, rt.start_at desc, r.id desc
+            """;
+    private static final String FIND_BY_ID_SQL =
+        """
+            select r.id, r.name,
+                   rd.id as date_id, rd.date,
+                   rt.id as time_id, rt.start_at,
+                   th.id as theme_id, th.name as theme_name, th.content as theme_content, th.url as theme_url
+            from reservation r
+            join reservation_date rd on r.date_id = rd.id
+            join reservation_time rt on r.time_id = rt.id
+            join theme th on r.theme_id = th.id
+            where r.id = ?
+            """;
+    private static final String UPDATE_SQL =
+        """
+            update reservation
+            set name = ?, date_id = ?, time_id = ?, theme_id = ?
+            where id = ?
+            """;
 
     private final JdbcTemplate jdbcTemplate;
 
@@ -151,6 +198,58 @@ public int countByThemeId(Long themeId) {
         return count;
     }
 
+    @Override
+    public boolean existsReservation(Long timeId, Long dateId, Long themeId) {
+        Boolean exists = jdbcTemplate.queryForObject(
+            EXISTS_RESERVATION_BY_TIME_AND_DATE_AND_THEME_SQL,
+            Boolean.class,
+            timeId,
+            dateId,
+            themeId
+        );
+        return exists != null && exists;
+    }
+
+    @Override
+    public boolean existsOtherReservation(Long id, Long timeId, Long dateId, Long themeId) {
+        Boolean exists = jdbcTemplate.queryForObject(
+            EXISTS_OTHER_RESERVATION_BY_TIME_AND_DATE_AND_THEME_SQL,
+            Boolean.class,
+            id,
+            timeId,
+            dateId,
+            themeId
+        );
+        return exists != null && exists;
+    }
+
+    @Override
+    public List<Reservation> findByName(String name) {
+        return jdbcTemplate.query(FIND_BY_NAME_SQL, reservationRowMapper(), name);
+    }
+
+    @Override
+    public Optional<Reservation> findById(Long id) {
+        List<Reservation> result = jdbcTemplate.query(FIND_BY_ID_SQL, reservationRowMapper(), id);
+        return result.stream().findFirst();
+    }
+
+    @Override
+    public Optional<Reservation> update(Long id, Reservation withoutId) {
+        int updatedCount = jdbcTemplate.update(
+            UPDATE_SQL,
+            withoutId.getName(),
+            withoutId.getDate().getId(),
+            withoutId.getTime().getId(),
+            withoutId.getTheme().getId(),
+            id
+        );
+        if (updatedCount == 0) {
+            return Optional.empty();
+        }
+        return findById(id);
+    }
+
     private RowMapper<Reservation> reservationRowMapper() {
         return (rs, rowNum) -> Reservation.of(
             rs.getLong(COLUMN_ID),

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

@@ -5,13 +5,15 @@
 import roomescape.domain.reservationtime.ReservationTime;
 import roomescape.domain.theme.Theme;
 import roomescape.support.exception.BadRequestException;
-import roomescape.support.exception.ReservationErrorCode;
-import roomescape.support.exception.ReservationTimeErrorCode;
-import roomescape.support.exception.ThemeErrorCode;
+import roomescape.support.exception.errors.ReservationErrors;
+import roomescape.support.exception.errors.ReservationTimeErrors;
+import roomescape.support.exception.errors.ThemeErrors;
 
 @Getter
 public class Reservation {
 
+    private static final int MAX_NAME_LENGTH = 10;
+
     private final Long id;
     private final String name;
     private final ReservationDate date;
@@ -76,16 +78,19 @@ public static Reservation of(
 
     private static void validate(String name, ReservationDate date, ReservationTime time, Theme theme) {
         if (name == null || name.isBlank()) {
-            throw new BadRequestException(ReservationErrorCode.INVALID_RESERVATION_NAME);
+            throw new BadRequestException(ReservationErrors.INVALID_RESERVATION_NAME);
+        }
+        if (name.length() > MAX_NAME_LENGTH) {
+            throw new BadRequestException(ReservationErrors.INVALID_RESERVATION_NAME_LENGTH);
         }
         if (date == null) {
-            throw new BadRequestException(ReservationErrorCode.INVALID_RESERVATION_DATE);
+            throw new BadRequestException(ReservationErrors.INVALID_RESERVATION_DATE);
         }
         if (time == null) {
-            throw new BadRequestException(ReservationTimeErrorCode.INVALID_RESERVATION_TIME);
+            throw new BadRequestException(ReservationTimeErrors.INVALID_RESERVATION_TIME);
         }
         if (theme == null) {
-            throw new BadRequestException(ThemeErrorCode.INVALID_THEME);
+            throw new BadRequestException(ThemeErrors.INVALID_THEME);
         }
     }
 }

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

@@ -1,50 +1,63 @@
 package roomescape.domain.reservation;
 
-import jakarta.servlet.http.HttpServletRequest;
-import java.util.List;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 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.support.auth.AdminRequestValidator;
 import roomescape.domain.reservation.dto.CreateReservationRequest;
 import roomescape.domain.reservation.dto.CreateReservationResponse;
-import roomescape.domain.reservation.dto.ReservationResponse;
+import roomescape.domain.reservation.dto.UpdateReservationRequest;
+import roomescape.domain.reservation.dto.UserReservationResponse;
 
+@Validated
 @RestController
 @RequiredArgsConstructor
 public class ReservationController {
 
     private final ReservationService reservationService;
-    private final AdminRequestValidator validator;
-
-    @GetMapping("/admin/reservations")
-    public ResponseEntity<List<ReservationResponse>> getAllReservation(HttpServletRequest request) {
-        if (validator.isUnauthorized(request)) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
-        }
-        List<ReservationResponse> response = reservationService.getAllReservations();
-        return ResponseEntity.ok(response);
-    }
 
     @PostMapping("/reservations")
-    public ResponseEntity<CreateReservationResponse> createReservation(@RequestBody CreateReservationRequest request) {
-        request.validate();
+    public ResponseEntity<CreateReservationResponse> createReservation(
+        @Valid @RequestBody CreateReservationRequest request
+    ) {
         CreateReservationResponse response = reservationService.createReservation(request);
         return ResponseEntity.status(HttpStatus.CREATED).body(response);
     }
 
-    @DeleteMapping("/admin/reservations/{id}")
-    public ResponseEntity<Void> deleteReservation(HttpServletRequest request, @PathVariable Long id) {
-        if (validator.isUnauthorized(request)) {
-            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
-        }
-        reservationService.deleteReservation(id);
+    @GetMapping("/reservations")
+    public ResponseEntity<UserReservationResponse> getUserReservations(
+        @RequestParam
+        @NotBlank(message = "예약자 이름은 필수 입력값 입니다.")
+        String name
+    ) {
+        UserReservationResponse response = reservationService.getUserReservations(name);
+        return ResponseEntity.ok(response);
+    }
+
+    @DeleteMapping("/reservations/{id}")
+    public ResponseEntity<Void> cancelUserReservation(
+        @PathVariable Long id
+    ) {
+        reservationService.cancelUserReservation(id);
+        return ResponseEntity.status(HttpStatus.NO_CONTENT).build();
+    }
+
+    @PatchMapping("/reservations/{id}")
+    public ResponseEntity<Void> updateReservation(
+        @PathVariable Long id,
+        @RequestBody UpdateReservationRequest request
+    ) {
+        reservationService.updateReservation(id, request);
         return ResponseEntity.status(HttpStatus.NO_CONTENT).build();
     }
 }

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

@@ -2,6 +2,7 @@
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 import roomescape.domain.theme.Theme;
 
 public interface ReservationRepository {
@@ -21,4 +22,14 @@ public interface ReservationRepository {
     List<Theme> findPopularThemes(int rankLimit, LocalDate startDay, LocalDate today);
 
     int countByThemeId(Long id);
+
+    boolean existsReservation(Long timeId, Long dateId, Long themeId);
+
+    boolean existsOtherReservation(Long id, Long timeId, Long dateId, Long themeId);
+
+    List<Reservation> findByName(String name);
+
+    Optional<Reservation> findById(Long id);
+
+    Optional<Reservation> update(Long id, Reservation withoutId);
 }