-- 변경 전CREATETABLE reservation(    id       BIGINTNOTNULL AUTO_INCREMENT,nameVARCHAR(255)NOTNULL,    statusVARCHAR(255)NOTNULL,dateDATENOTNULL,    time_id  BIGINTNOTNULL,    theme_id BIGINTNOTNULL,PRIMARYKEY(id),FOREIGNKEY(time_id)REFERENCEStime(id),FOREIGNKEY(theme_id)REFERENCES theme(id));-- 변경 후CREATETABLE reservation(    id            BIGINTNOTNULL AUTO_INCREMENT,nameVARCHAR(255)NOTNULL,    statusVARCHAR(255)NOTNULL,    theme_slot_id BIGINTNOTNULL,PRIMARYKEY(id),FOREIGNKEY(theme_slot_id)REFERENCES theme_slot(id));

-- reservation 테이블 재정의CREATETABLE IFNOTEXISTS reservation(    id            BIGINTNOTNULL AUTO_INCREMENT,nameVARCHAR(255)NOTNULL,    statusVARCHAR(255)NOTNULL,    theme_slot_id BIGINTNOTNULL,-- 신규PRIMARYKEY(id),FOREIGNKEY(theme_slot_id)REFERENCES theme_slot(id)-- 신규-- 제거: date DATE, time_id BIGINT, theme_id BIGINT, 기존 FK 2개);

1. theme INSERT (기존 유지)2. time  INSERT (기존 유지)3. theme_slot INSERT ← 이 시점에 명시적으로 삽입 (현재는 맨 마지막 MERGE로 자동 생성)4. reservation INSERT (name, status, theme_slot_id) ← subquery로 theme_slot_id 조회

INSERTINTO reservation(name, status, theme_slot_id)VALUES('게스트','CONFIRMED',(SELECT idFROM theme_slotWHERE theme_id =1ANDdate ='2026-05-07'AND time_id =1)),('게스트','CONFIRMED',(SELECT idFROM theme_slotWHERE theme_id =1ANDdate ='2026-05-07'AND time_id =4)),...;

// 제거privatefinal LocalDate date;privatefinal Time time;privatefinal Theme theme;// 추가privatefinal ThemeSlot themeSlot;

// 변경 전public Reservation(String name, LocalDate date, Time time, Theme theme)public Reservation(Long id, String name, LocalDate date, Time time, Theme theme, ReservationStatus status)// 변경 후public Reservation(String name, ThemeSlot themeSlot)public Reservation(Long id, String name, ThemeSlot themeSlot, ReservationStatus status)

publicstatic Reservation of(Long id, Reservation reservation){returnnew Reservation(id, reservation.getName(), reservation.getThemeSlot(), reservation.getReservationStatus());}

// 변경 전: name, date, time, theme 각각 null 체크// 변경 후: name, themeSlot null 체크 (date/time/theme 검증은 ThemeSlot 생성 시점으로 이동)privatevoid validate(String name, ThemeSlot themeSlot){if(name==null|| name.isBlank()){ ...}if(themeSlot==null){ ...}}

// 위임 게터로 유지하면 ReservationController.toResponse() 수정 불필요public LocalDate getDate(){return themeSlot.getDate();}public Time getTime(){return themeSlot.getTime();}public Theme getTheme(){return themeSlot.getTheme();}public ThemeSlot getThemeSlot(){return themeSlot;}

// 변경 전boolean isExistBy(Long themeId, LocalDate date, Long reservationTimeId);void updateDateAndTimeAndTheme(Reservation reservation);// 변경 후boolean isExistBy(Long themeSlotId);// themeSlot의 is_reserved 또는 reservation 존재 여부void updateThemeSlot(Reservation reservation);// theme_slot_id 컬럼만 UPDATE

-- 변경 전FROM reservation rINNERJOINtime tON r.time_id = t.idINNERJOIN theme themeON r.theme_id = theme.id-- 변경 후FROM reservation rINNERJOIN theme_slot tsON r.theme_slot_id = ts.idINNERJOINtime tON ts.time_id  = t.idINNERJOIN theme thON ts.theme_id = th.id

// 변경 전Map.of("name", ...,"date", ...,"time_id", ...,"theme_id", ...,"status", ...)// 변경 후Map.of("name", ...,"theme_slot_id", reservation.getThemeSlot().getId(),"status", ...)

// 변경 후 시그니처boolean isExistBy(Long themeSlotId)// SQLSELECT EXISTS(    SELECT1 FROM reservation WHERE theme_slot_id=?)

-- 변경 전UPDATE reservationSETdate = ?, time_id = ?, theme_id = ?WHERE id = ?-- 변경 후UPDATE reservationSET theme_slot_id = ?WHERE id = ?

-- existsByThemeId 변경 후SELECTEXISTS(SELECT1FROM reservation rINNERJOIN theme_slot tsON r.theme_slot_id = ts.idWHERE ts.theme_id = ?)-- existsByTimeId 변경 후SELECTEXISTS(SELECT1FROM reservation rINNERJOIN theme_slot tsON r.theme_slot_id = ts.idWHERE ts.time_id = ?)

// 변경 후: ThemeSlot을 먼저 조립하여 Reservation에 전달return(rs, rowNum) ->{    ThemeSlot themeSlot=new ThemeSlot(        rs.getLong("ts_id"),new Theme(rs.getLong("theme_id"), rs.getString("theme_name"), ...),        rs.getObject("date", LocalDate.class),new Time(rs.getLong("t_id"), rs.getObject("start_at", LocalTime.class)),        rs.getBoolean("is_reserved"));returnnew Reservation(rs.getLong("r_id"), rs.getString("name"), themeSlot, toStatus(rs.getString("status")));};

// 서비스에서 (themeId, date, timeId) 조합으로 슬롯을 조회할 수 있어야 함Optional<ThemeSlot> findBy(long themeId, LocalDate date,long timeId);

@Overridepublic Optional<ThemeSlot> findBy(long themeId, LocalDate date,long timeId){    String sql="""            SELECT ... FROM theme_slot ts            INNER JOIN time t ON ts.time_id = t.id            INNER JOIN theme th ON ts.theme_id = th.id            WHERE ts.theme_id = ? AND ts.date = ? AND ts.time_id = ?            """;return jdbcTemplate.query(sql, rowMapper(), themeId, date, timeId).stream().findFirst();}

// 변경 전public Reservation saveReservation(String name, LocalDate date, Long reservationTimeId, Long themeId){    validateBeforeDate(date);    validateIsExistBy(date, reservationTimeId, themeId);    Theme theme= getThemeOrElseThrow(themeId);    Time time= getTimeOrElseThrow(reservationTimeId);    validateDateTime(date, time);    Reservation reservation= reservationRepository.save(new Reservation(name, date, time, theme));    themeSlotRepository.update(new ThemeSlot(theme, date, time,true));return reservation;}// 변경 후 (Theme/Time 개별 조회 불필요 → ThemeSlot 단일 조회)public Reservation saveReservation(String name, LocalDate date, Long reservationTimeId, Long themeId){    validateBeforeDate(date);    ThemeSlot themeSlot= getThemeSlotOrElseThrow(themeId, date, reservationTimeId);    validateIsExistBy(themeSlot.getId());    validateDateTime(date, themeSlot.getTime());    Reservation reservation= reservationRepository.save(new Reservation(name, themeSlot));    themeSlotRepository.update(ThemeSlot.of(themeSlot.getId(),/* isReserved=true */));return reservation;}

// 변경 전themeSlotRepository.update(new ThemeSlot(reservation.getTheme(), reservation.getDate(), reservation.getTime(),false));// 변경 후 (위임 게터를 사용하면 코드 변경 없음, ThemeSlot 직접 접근하면 더 명확)themeSlotRepository.update(ThemeSlot.of(reservation.getThemeSlot().getId(),/* isReserved=false */));

// 변경 전public Reservation modifyReservation(Long reservationId, LocalDate date, Long timeId, Long themeId){    Time time= getTimeOrElseThrow(timeId);    Theme theme= getThemeOrElseThrow(themeId);    ...    reservationRepository.updateDateAndTimeAndTheme(updateReservation);}// 변경 후public Reservation modifyReservation(Long reservationId, LocalDate date, Long timeId, Long themeId){    ThemeSlot newSlot= getThemeSlotOrElseThrow(themeId, date, timeId);    Reservation reservation= getReservationOrElseThrow(reservationId);    validateIsExistBy(newSlot.getId());    validateDateTime(date, newSlot.getTime());    Reservation updated=new Reservation(reservationId, reservation.getName(), newSlot, reservation.getReservationStatus());    reservationRepository.updateThemeSlot(updated);return updated;}

// 변경 전privatevoid validateIsExistBy(LocalDate date, Long reservationTimeId, Long themeId){if(reservationRepository.isExistBy(themeId, date, reservationTimeId)){ ...}}// 변경 후privatevoid validateIsExistBy(Long themeSlotId){if(reservationRepository.isExistBy(themeSlotId)){ ...}}

private ThemeSlot getThemeSlotOrElseThrow(Long themeId, LocalDate date, Long timeId){return themeSlotRepository.findBy(themeId, date, timeId).orElseThrow(() ->new CustomException(ErrorCode.THEME_SLOT_NOT_FOUND));}

// 변경 전Reservation savedReservation=new Reservation(id, reservation.getName(),    reservation.getDate(), reservation.getTime(), reservation.getTheme(), reservation.getReservationStatus());// 변경 후Reservation savedReservation=new Reservation(id, reservation.getName(),    reservation.getThemeSlot(), reservation.getReservationStatus());

// 변경 후 시그니처publicboolean isExistBy(Long themeSlotId){return storage.values().stream().anyMatch(r -> Objects.equals(r.getThemeSlot().getId(), themeSlotId));}

// 변경 후publicvoid updateThemeSlot(Reservation reservation){    Long id= reservation.getId();    Reservation existing= storage.get(id);    storage.put(id,new Reservation(id, existing.getName(),            reservation.getThemeSlot(), existing.getReservationStatus()));}

// themeSlot을 통해 접근publicboolean existsByThemeId(long themeId){return storage.values().stream().anyMatch(r -> Objects.equals(r.getThemeSlot().getTheme().getId(), themeId));}publicboolean existsByTimeId(long timeId){return storage.values().stream().anyMatch(r -> Objects.equals(r.getThemeSlot().getTime().getId(), timeId));}

@Overridepublic Optional<ThemeSlot> findBy(long themeId, LocalDate date,long timeId){return storage.values().stream().filter(ts -> ts.getTheme().getId()== themeId&& ts.getDate().equals(date)&& ts.getTime().getId()== timeId).findFirst();}

// 변경 전Time time=new Time(1L, LocalTime.of(10,0));new Reservation(1L,"브라운", LocalDate.now().plusDays(1), time,new Theme(1L,null,null,null), PendingStatus.getInstance())// 변경 후ThemeSlot slot=new ThemeSlot(1L,new Theme(1L,null,null,null), LocalDate.now().plusDays(1),new Time(1L, LocalTime.of(10,0)),false);new Reservation(1L,"브라운", slot, PendingStatus.getInstance())

// 변경 전 (예: save 테스트)Reservation reservation=new Reservation("브라운", LocalDate.now(), TIME_10, THEME_1);// 변경 후ThemeSlot slot=new ThemeSlot(1L, THEME_1, LocalDate.now(), TIME_10,false);Reservation reservation=new Reservation("브라운", slot);

// setUp()에 ThemeSlot 사전 저장 추가 필요FakeThemeSlotDao fakeThemeSlotDao=new FakeThemeSlotDao();ThemeSlot savedSlot= fakeThemeSlotDao.save(new ThemeSlot(savedTheme, futureDate, savedTime,false));