pricelees/roomescape-refactored
1
0
Fork 0
generated from pricelees/issue-pr-template
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[#44] 매장 기능 도입 #45

Merged
pricelees merged 116 commits from feat/#44 into main 2025-09-20 03:15:06 +00:00
Conversation 0 Commits 116 Files Changed 133 +12 -12
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 747ecbf058 - Show all commits

18
src/test/kotlin/roomescape/supports/DummyInitializer.kt
View File

@ -57,7 +57,7 @@ class DummyInitializer(
request: ScheduleCreateRequest, request: ScheduleCreateRequest,
status: ScheduleStatus = ScheduleStatus.AVAILABLE status: ScheduleStatus = ScheduleStatus.AVAILABLE
): ScheduleEntity { ): ScheduleEntity {
val themeId: Long = if (request.themeId > 1L) { val themeId: Long = if (themeRepository.existsById(request.themeId)) {
request.themeId request.themeId
} else { } else {
createTheme( createTheme(
@ -94,10 +94,10 @@ class DummyInitializer(
scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest, scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest,
reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest, reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest,
): ReservationEntity { ): ReservationEntity {
val themeId: Long = if (scheduleRequest.themeId > 1) { val themeId: Long = if (themeRepository.existsById(scheduleRequest.themeId)) {
scheduleRequest.themeId scheduleRequest.themeId
} else if (reservationRequest.scheduleId > 1) { } else if (themeRepository.existsById(reservationRequest.scheduleId)) {
scheduleRepository.findByIdOrNull(reservationRequest.scheduleId)!!.themeId reservationRequest.scheduleId
} else { } else {
createTheme( createTheme(
adminToken = adminToken, adminToken = adminToken,
@ -105,7 +105,7 @@ class DummyInitializer(
).id ).id
} }
val scheduleId: Long = if (reservationRequest.scheduleId > 1) { val scheduleId: Long = if (scheduleRepository.existsById(reservationRequest.scheduleId)) {
reservationRequest.scheduleId reservationRequest.scheduleId
} else { } else {
createSchedule( createSchedule(
@ -128,10 +128,10 @@ class DummyInitializer(
scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest, scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest,
reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest, reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest,
): ReservationEntity { ): ReservationEntity {
val themeId: Long = if (scheduleRequest.themeId > 1) { val themeId: Long = if (themeRepository.existsById(scheduleRequest.themeId)) {
scheduleRequest.themeId scheduleRequest.themeId
} else if (reservationRequest.scheduleId > 1) { } else if (themeRepository.existsById(reservationRequest.scheduleId)) {
scheduleRepository.findByIdOrNull(reservationRequest.scheduleId)!!.themeId reservationRequest.scheduleId
} else { } else {
createTheme( createTheme(
adminToken = adminToken, adminToken = adminToken,
@ -139,7 +139,7 @@ class DummyInitializer(
).id ).id
} }
val scheduleId: Long = if (reservationRequest.scheduleId > 1) { val scheduleId: Long = if (scheduleRepository.existsById(reservationRequest.scheduleId)) {
reservationRequest.scheduleId reservationRequest.scheduleId
} else { } else {
createSchedule( createSchedule(

6
src/test/kotlin/roomescape/supports/Fixtures.kt
View File

@ -170,7 +170,7 @@ object ScheduleFixture {
val createRequest: ScheduleCreateRequest = ScheduleCreateRequest( val createRequest: ScheduleCreateRequest = ScheduleCreateRequest(
date = LocalDate.now().plusDays(1), date = LocalDate.now().plusDays(1),
time = LocalTime.now(), time = LocalTime.now(),
themeId = 1L themeId = tsidFactory.next()
) )
} }
@ -183,7 +183,7 @@ object PaymentFixture {
) )
val cancelRequest: PaymentCancelRequest = PaymentCancelRequest( val cancelRequest: PaymentCancelRequest = PaymentCancelRequest(
reservationId = 1L, reservationId = tsidFactory.next(),
cancelReason = "cancelReason", cancelReason = "cancelReason",
) )
@ -260,7 +260,7 @@ object PaymentFixture {
object ReservationFixture { object ReservationFixture {
val pendingCreateRequest: PendingReservationCreateRequest = PendingReservationCreateRequest( val pendingCreateRequest: PendingReservationCreateRequest = PendingReservationCreateRequest(
scheduleId = 1L, scheduleId = tsidFactory.next(),
reserverName = "Wilbur Stuart", reserverName = "Wilbur Stuart",
reserverContact = "wilbur@example.com", reserverContact = "wilbur@example.com",
participantCount = 5, participantCount = 5,