diff --git a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt index daf402c5..27201d0a 100644 --- a/src/main/kotlin/roomescape/reservation/business/ReservationService.kt +++ b/src/main/kotlin/roomescape/reservation/business/ReservationService.kt @@ -9,8 +9,6 @@ import org.springframework.transaction.annotation.Transactional import roomescape.common.config.next import roomescape.common.dto.CurrentUserContext import roomescape.common.util.DateUtils -import roomescape.user.business.UserService -import roomescape.user.web.UserContactResponse import roomescape.payment.business.PaymentService import roomescape.payment.web.PaymentWithDetailResponse import roomescape.reservation.exception.ReservationErrorCode @@ -23,6 +21,8 @@ import roomescape.schedule.web.ScheduleSummaryResponse import roomescape.schedule.web.ScheduleUpdateRequest import roomescape.theme.business.ThemeService import roomescape.theme.web.ThemeInfoResponse +import roomescape.user.business.UserService +import roomescape.user.web.UserContactResponse import java.time.LocalDate import java.time.LocalDateTime @@ -52,7 +52,7 @@ class ReservationService( val reservation: ReservationEntity = request.toEntity(id = tsidFactory.next(), userId = user.id) return PendingReservationCreateResponse(reservationRepository.save(reservation).id) - .also { "[ReservationService.createPendingReservation] Pending 예약 생성 완료: reservationId=${it}, schedule=${request.scheduleId}" } + .also { log.info { "[ReservationService.createPendingReservation] Pending 예약 생성 완료: reservationId=${it}, schedule=${request.scheduleId}" } } } @Transactional diff --git a/src/main/kotlin/roomescape/theme/web/PublicThemeController.kt b/src/main/kotlin/roomescape/theme/web/ThemeController.kt similarity index 78% rename from src/main/kotlin/roomescape/theme/web/PublicThemeController.kt rename to src/main/kotlin/roomescape/theme/web/ThemeController.kt index 45eea3d0..0c3898bd 100644 --- a/src/main/kotlin/roomescape/theme/web/PublicThemeController.kt +++ b/src/main/kotlin/roomescape/theme/web/ThemeController.kt @@ -1,5 +1,6 @@ package roomescape.theme.web +import jakarta.validation.Valid import org.springframework.http.ResponseEntity import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable @@ -7,25 +8,27 @@ import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController +import roomescape.auth.web.support.Public import roomescape.common.dto.response.CommonApiResponse import roomescape.theme.business.ThemeService import roomescape.theme.docs.PublicThemeAPI @RestController @RequestMapping("/themes") -class PublicThemeController( +class ThemeController( private val themeService: ThemeService, -): PublicThemeAPI { - +) : PublicThemeAPI { + @Public @PostMapping("/batch") - override fun findThemesByIds( - @RequestBody request: ThemeIdListRequest + override fun findThemeInfosByIds( + @Valid @RequestBody request: ThemeIdListRequest ): ResponseEntity> { - val response = themeService.findThemesByIds(request) + val response = themeService.findAllInfosByIds(request) return ResponseEntity.ok(CommonApiResponse(response)) } + @Public @GetMapping("/{id}") override fun findThemeInfoById( @PathVariable id: Long