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

[#34] 회원 / 인증 도메인 재정의 #43

Merged
pricelees merged 73 commits from refactor/#34 into main 2025-09-13 10:13:45 +00:00
Conversation 0 Commits 73 Files Changed 150 +39 -19
1 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c3b736b81f - Show all commits

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

@ -94,16 +94,26 @@ class DummyInitializer(
scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest, scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest,
reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest, reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest,
): ReservationEntity { ): ReservationEntity {
val themeId: Long = createTheme( val themeId: Long = if (scheduleRequest.themeId > 1) {
scheduleRequest.themeId
} else if (reservationRequest.scheduleId > 1) {
scheduleRepository.findByIdOrNull(reservationRequest.scheduleId)!!.themeId
} else {
createTheme(
adminToken = adminToken, adminToken = adminToken,
request = themeRequest request = themeRequest
).id ).id
}
val scheduleId: Long = createSchedule( val scheduleId: Long = if (reservationRequest.scheduleId > 1) {
reservationRequest.scheduleId
} else {
createSchedule(
adminToken = adminToken, adminToken = adminToken,
request = scheduleRequest.copy(themeId = themeId), request = scheduleRequest.copy(themeId = themeId),
status = ScheduleStatus.HOLD status = ScheduleStatus.HOLD
).id ).id
}
return createPendingReservation( return createPendingReservation(
reserverToken = reserverToken, reserverToken = reserverToken,
@ -118,20 +128,30 @@ class DummyInitializer(
scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest, scheduleRequest: ScheduleCreateRequest = ScheduleFixture.createRequest,
reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest, reservationRequest: PendingReservationCreateRequest = ReservationFixture.pendingCreateRequest,
): ReservationEntity { ): ReservationEntity {
val themeId: Long = createTheme( val themeId: Long = if (scheduleRequest.themeId > 1) {
scheduleRequest.themeId
} else if (reservationRequest.scheduleId > 1) {
scheduleRepository.findByIdOrNull(reservationRequest.scheduleId)!!.themeId
} else {
createTheme(
adminToken = adminToken, adminToken = adminToken,
request = themeRequest request = themeRequest
).id ).id
}
val schedule: ScheduleEntity = createSchedule( val scheduleId: Long = if (reservationRequest.scheduleId > 1) {
reservationRequest.scheduleId
} else {
createSchedule(
adminToken = adminToken, adminToken = adminToken,
request = scheduleRequest.copy(themeId = themeId), request = scheduleRequest.copy(themeId = themeId),
status = ScheduleStatus.HOLD status = ScheduleStatus.HOLD
) ).id
}
val reservation = createPendingReservation( val reservation = createPendingReservation(
reserverToken = reserverToken, reserverToken = reserverToken,
request = reservationRequest.copy(scheduleId = schedule.id) request = reservationRequest.copy(scheduleId = scheduleId)
) )
Given { Given {