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 +37 -37
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d8fa110f3f - Show all commits

12
src/test/kotlin/roomescape/payment/PaymentAPITest.kt
View File

@ -43,7 +43,7 @@ class PaymentAPITest(
test("관리자") { test("관리자") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultStoreAdminLogin(), token = testAuthUtil.defaultHqAdminLogin(),
method = HttpMethod.POST, method = HttpMethod.POST,
endpoint = endpoint, endpoint = endpoint,
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -165,7 +165,7 @@ class PaymentAPITest(
PaymentMethod.entries.filter { it !in supportedMethod }.forEach { PaymentMethod.entries.filter { it !in supportedMethod }.forEach {
test("결제 수단: ${it.koreanName}") { test("결제 수단: ${it.koreanName}") {
val reservation = dummyInitializer.createConfirmReservation( val reservation = dummyInitializer.createConfirmReservation(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
reserverToken = testAuthUtil.defaultUserLogin() reserverToken = testAuthUtil.defaultUserLogin()
) )
@ -209,7 +209,7 @@ class PaymentAPITest(
test("관리자") { test("관리자") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultStoreAdminLogin(), token = testAuthUtil.defaultHqAdminLogin(),
method = HttpMethod.POST, method = HttpMethod.POST,
endpoint = endpoint, endpoint = endpoint,
requestBody = PaymentFixture.cancelRequest, requestBody = PaymentFixture.cancelRequest,
@ -222,7 +222,7 @@ class PaymentAPITest(
val userToken = testAuthUtil.defaultUserLogin() val userToken = testAuthUtil.defaultUserLogin()
val confirmRequest = PaymentFixture.confirmRequest val confirmRequest = PaymentFixture.confirmRequest
val reservation = dummyInitializer.createConfirmReservation( val reservation = dummyInitializer.createConfirmReservation(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
reserverToken = userToken reserverToken = userToken
) )
@ -268,7 +268,7 @@ class PaymentAPITest(
test("예약에 대한 결제 정보가 없으면 실패한다.") { test("예약에 대한 결제 정보가 없으면 실패한다.") {
val userToken = testAuthUtil.defaultUserLogin() val userToken = testAuthUtil.defaultUserLogin()
val reservation = dummyInitializer.createConfirmReservation( val reservation = dummyInitializer.createConfirmReservation(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
reserverToken = userToken, reserverToken = userToken,
) )
@ -312,7 +312,7 @@ class PaymentAPITest(
val request = PaymentFixture.confirmRequest.copy(paymentKey = paymentKey, amount = amount) val request = PaymentFixture.confirmRequest.copy(paymentKey = paymentKey, amount = amount)
val reservation: ReservationEntity = dummyInitializer.createPendingReservation( val reservation: ReservationEntity = dummyInitializer.createPendingReservation(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
reserverToken = testAuthUtil.defaultUserLogin(), reserverToken = testAuthUtil.defaultUserLogin(),
) )

30
src/test/kotlin/roomescape/reservation/ReservationApiTest.kt
View File

@ -55,7 +55,7 @@ class ReservationApiTest(
test("관리자") { test("관리자") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultStoreAdminLogin(), token = testAuthUtil.defaultHqAdminLogin(),
method = HttpMethod.POST, method = HttpMethod.POST,
endpoint = endpoint, endpoint = endpoint,
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -66,7 +66,7 @@ class ReservationApiTest(
test("정상 생성") { test("정상 생성") {
val schedule: ScheduleEntity = dummyInitializer.createSchedule( val schedule: ScheduleEntity = dummyInitializer.createSchedule(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
request = ScheduleFixture.createRequest, request = ScheduleFixture.createRequest,
status = ScheduleStatus.HOLD status = ScheduleStatus.HOLD
) )
@ -95,7 +95,7 @@ class ReservationApiTest(
test("예약을 생성할 때 해당 일정이 ${ScheduleStatus.HOLD} 상태가 아니면 실패한다.") { test("예약을 생성할 때 해당 일정이 ${ScheduleStatus.HOLD} 상태가 아니면 실패한다.") {
val schedule: ScheduleEntity = dummyInitializer.createSchedule( val schedule: ScheduleEntity = dummyInitializer.createSchedule(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
request = ScheduleFixture.createRequest, request = ScheduleFixture.createRequest,
status = ScheduleStatus.AVAILABLE status = ScheduleStatus.AVAILABLE
) )
@ -116,7 +116,7 @@ class ReservationApiTest(
} }
test("예약 인원이 테마의 최소 인원보다 작거나 최대 인원보다 많으면 실패한다.") { test("예약 인원이 테마의 최소 인원보다 작거나 최대 인원보다 많으면 실패한다.") {
val adminToken = testAuthUtil.defaultStoreAdminLogin() val adminToken = testAuthUtil.defaultHqAdminLogin()
val theme: ThemeEntity = dummyInitializer.createTheme( val theme: ThemeEntity = dummyInitializer.createTheme(
adminToken = adminToken, adminToken = adminToken,
request = ThemeFixture.createRequest request = ThemeFixture.createRequest
@ -190,7 +190,7 @@ class ReservationApiTest(
test("관리자") { test("관리자") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultStoreAdminLogin(), token = testAuthUtil.defaultHqAdminLogin(),
method = HttpMethod.POST, method = HttpMethod.POST,
endpoint = endpoint, endpoint = endpoint,
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -202,7 +202,7 @@ class ReservationApiTest(
val userToken = testAuthUtil.defaultUserLogin() val userToken = testAuthUtil.defaultUserLogin()
val reservation: ReservationEntity = dummyInitializer.createPendingReservation( val reservation: ReservationEntity = dummyInitializer.createPendingReservation(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
reserverToken = userToken, reserverToken = userToken,
) )
@ -250,7 +250,7 @@ class ReservationApiTest(
test("관리자") { test("관리자") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultStoreAdminLogin(), token = testAuthUtil.defaultHqAdminLogin(),
method = HttpMethod.POST, method = HttpMethod.POST,
endpoint = endpoint, endpoint = endpoint,
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -262,7 +262,7 @@ class ReservationApiTest(
val userToken = testAuthUtil.defaultUserLogin() val userToken = testAuthUtil.defaultUserLogin()
val reservation: ReservationEntity = dummyInitializer.createConfirmReservation( val reservation: ReservationEntity = dummyInitializer.createConfirmReservation(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
reserverToken = userToken, reserverToken = userToken,
) )
@ -301,7 +301,7 @@ class ReservationApiTest(
test("다른 회원의 예약을 취소할 수 없다.") { test("다른 회원의 예약을 취소할 수 없다.") {
val reservation: ReservationEntity = dummyInitializer.createConfirmReservation( val reservation: ReservationEntity = dummyInitializer.createConfirmReservation(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
reserverToken = testAuthUtil.defaultUserLogin(), reserverToken = testAuthUtil.defaultUserLogin(),
) )
@ -332,7 +332,7 @@ class ReservationApiTest(
test("관리자") { test("관리자") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultStoreAdminLogin(), token = testAuthUtil.defaultHqAdminLogin(),
method = HttpMethod.POST, method = HttpMethod.POST,
endpoint = endpoint, endpoint = endpoint,
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -342,7 +342,7 @@ class ReservationApiTest(
test("정상 응답") { test("정상 응답") {
val userToken = testAuthUtil.defaultUserLogin() val userToken = testAuthUtil.defaultUserLogin()
val adminToken = testAuthUtil.defaultStoreAdminLogin() val adminToken = testAuthUtil.defaultHqAdminLogin()
for (i in 1..3) { for (i in 1..3) {
dummyInitializer.createConfirmReservation( dummyInitializer.createConfirmReservation(
@ -398,7 +398,7 @@ class ReservationApiTest(
test("관리자") { test("관리자") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultStoreAdminLogin(), token = testAuthUtil.defaultHqAdminLogin(),
method = HttpMethod.POST, method = HttpMethod.POST,
endpoint = endpoint, endpoint = endpoint,
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -413,7 +413,7 @@ class ReservationApiTest(
beforeTest { beforeTest {
reservation = dummyInitializer.createConfirmReservation( reservation = dummyInitializer.createConfirmReservation(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
reserverToken = testAuthUtil.defaultUserLogin(), reserverToken = testAuthUtil.defaultUserLogin(),
) )
} }
@ -556,7 +556,7 @@ class ReservationApiTest(
test("예약은 있지만, 결제 정보를 찾을 수 없으면 null로 지정한다.") { test("예약은 있지만, 결제 정보를 찾을 수 없으면 null로 지정한다.") {
val reservation = dummyInitializer.createConfirmReservation( val reservation = dummyInitializer.createConfirmReservation(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
reserverToken = testAuthUtil.defaultUserLogin(), reserverToken = testAuthUtil.defaultUserLogin(),
) )
@ -574,7 +574,7 @@ class ReservationApiTest(
test("예약과 결제는 있지만, 결제 세부 내역이 없으면 세부 내역만 null로 지정한다..") { test("예약과 결제는 있지만, 결제 세부 내역이 없으면 세부 내역만 null로 지정한다..") {
val reservation = dummyInitializer.createConfirmReservation( val reservation = dummyInitializer.createConfirmReservation(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
reserverToken = testAuthUtil.defaultUserLogin(), reserverToken = testAuthUtil.defaultUserLogin(),
) )

32
src/test/kotlin/roomescape/schedule/ScheduleApiTest.kt
View File

@ -32,7 +32,7 @@ class ScheduleApiTest(
val endpoint = "/schedules/themes?date=$date" val endpoint = "/schedules/themes?date=$date"
test("정상 응답") { test("정상 응답") {
val adminToken = testAuthUtil.defaultStoreAdminLogin() val adminToken = testAuthUtil.defaultHqAdminLogin()
for (i in 1..10) { for (i in 1..10) {
dummyInitializer.createSchedule( dummyInitializer.createSchedule(
@ -61,7 +61,7 @@ class ScheduleApiTest(
test("정상 응답") { test("정상 응답") {
val date = LocalDate.now().plusDays(1) val date = LocalDate.now().plusDays(1)
val adminToken = testAuthUtil.defaultStoreAdminLogin() val adminToken = testAuthUtil.defaultHqAdminLogin()
val createdSchedule = dummyInitializer.createSchedule( val createdSchedule = dummyInitializer.createSchedule(
adminToken = adminToken, adminToken = adminToken,
request = createRequest.copy(date = date, time = LocalTime.now()) request = createRequest.copy(date = date, time = LocalTime.now())
@ -129,7 +129,7 @@ class ScheduleApiTest(
} }
test("정상 응답") { test("정상 응답") {
val token = testAuthUtil.defaultStoreAdminLogin() val token = testAuthUtil.defaultHqAdminLogin()
val createdSchedule = dummyInitializer.createSchedule( val createdSchedule = dummyInitializer.createSchedule(
adminToken = token, adminToken = token,
@ -161,7 +161,7 @@ class ScheduleApiTest(
test("일정이 없으면 실패한다.") { test("일정이 없으면 실패한다.") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultStoreAdminLogin(), token = testAuthUtil.defaultHqAdminLogin(),
method = HttpMethod.GET, method = HttpMethod.GET,
endpoint = "/schedules/$INVALID_PK", endpoint = "/schedules/$INVALID_PK",
expectedErrorCode = ScheduleErrorCode.SCHEDULE_NOT_FOUND expectedErrorCode = ScheduleErrorCode.SCHEDULE_NOT_FOUND
@ -208,7 +208,7 @@ class ScheduleApiTest(
} }
test("정상 생성 및 감사 정보 확인") { test("정상 생성 및 감사 정보 확인") {
val token = testAuthUtil.defaultStoreAdminLogin() val token = testAuthUtil.defaultHqAdminLogin()
val themeId: Long = dummyInitializer.createTheme( val themeId: Long = dummyInitializer.createTheme(
adminToken = token, adminToken = token,
@ -246,7 +246,7 @@ class ScheduleApiTest(
} }
test("이미 동일한 날짜, 시간, 테마인 일정이 있으면 실패한다.") { test("이미 동일한 날짜, 시간, 테마인 일정이 있으면 실패한다.") {
val token = testAuthUtil.defaultStoreAdminLogin() val token = testAuthUtil.defaultHqAdminLogin()
val date = LocalDate.now().plusDays(1) val date = LocalDate.now().plusDays(1)
val time = LocalTime.of(10, 0) val time = LocalTime.of(10, 0)
@ -267,7 +267,7 @@ class ScheduleApiTest(
} }
test("입력된 날짜 + 시간이 현재 시간 이전이면 실패한다.") { test("입력된 날짜 + 시간이 현재 시간 이전이면 실패한다.") {
val token = testAuthUtil.defaultStoreAdminLogin() val token = testAuthUtil.defaultHqAdminLogin()
val body = createRequest.copy(LocalDate.now(), LocalTime.now().minusMinutes(1)) val body = createRequest.copy(LocalDate.now(), LocalTime.now().minusMinutes(1))
runExceptionTest( runExceptionTest(
@ -294,7 +294,7 @@ class ScheduleApiTest(
test("관리자") { test("관리자") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultStoreAdminLogin(), token = testAuthUtil.defaultHqAdminLogin(),
method = HttpMethod.PATCH, method = HttpMethod.PATCH,
endpoint = endpoint, endpoint = endpoint,
expectedErrorCode = AuthErrorCode.ACCESS_DENIED expectedErrorCode = AuthErrorCode.ACCESS_DENIED
@ -304,7 +304,7 @@ class ScheduleApiTest(
test("해당 일정이 ${ScheduleStatus.AVAILABLE} 상태이면 정상 응답") { test("해당 일정이 ${ScheduleStatus.AVAILABLE} 상태이면 정상 응답") {
val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule( val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
request = createRequest request = createRequest
) )
@ -334,7 +334,7 @@ class ScheduleApiTest(
} }
test("해당 일정이 ${ScheduleStatus.AVAILABLE} 상태가 아니면 실패한다.") { test("해당 일정이 ${ScheduleStatus.AVAILABLE} 상태가 아니면 실패한다.") {
val adminToken = testAuthUtil.defaultStoreAdminLogin() val adminToken = testAuthUtil.defaultHqAdminLogin()
val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule( val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule(
adminToken = adminToken, adminToken = adminToken,
@ -414,7 +414,7 @@ class ScheduleApiTest(
test("정상 수정 및 감사 정보 변경 확인") { test("정상 수정 및 감사 정보 변경 확인") {
val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule( val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule(
adminToken = testAuthUtil.defaultStoreAdminLogin(), adminToken = testAuthUtil.defaultHqAdminLogin(),
request = createRequest.copy( request = createRequest.copy(
date = LocalDate.now().plusDays(1), date = LocalDate.now().plusDays(1),
time = LocalTime.now().plusMinutes(1), time = LocalTime.now().plusMinutes(1),
@ -449,7 +449,7 @@ class ScheduleApiTest(
} }
test("입력값이 없으면 수정하지 않는다.") { test("입력값이 없으면 수정하지 않는다.") {
val token = testAuthUtil.defaultStoreAdminLogin() val token = testAuthUtil.defaultHqAdminLogin()
val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule( val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule(
adminToken = token, adminToken = token,
@ -477,7 +477,7 @@ class ScheduleApiTest(
test("일정이 없으면 실패한다.") { test("일정이 없으면 실패한다.") {
runExceptionTest( runExceptionTest(
token = testAuthUtil.defaultStoreAdminLogin(), token = testAuthUtil.defaultHqAdminLogin(),
method = HttpMethod.PATCH, method = HttpMethod.PATCH,
requestBody = updateRequest, requestBody = updateRequest,
endpoint = "/schedules/${INVALID_PK}", endpoint = "/schedules/${INVALID_PK}",
@ -486,7 +486,7 @@ class ScheduleApiTest(
} }
test("입력된 날짜 + 시간이 현재 시간 이전이면 실패한다.") { test("입력된 날짜 + 시간이 현재 시간 이전이면 실패한다.") {
val token = testAuthUtil.defaultStoreAdminLogin() val token = testAuthUtil.defaultHqAdminLogin()
val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule( val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule(
adminToken = token, adminToken = token,
request = request =
@ -540,7 +540,7 @@ class ScheduleApiTest(
} }
test("정상 삭제") { test("정상 삭제") {
val token = testAuthUtil.defaultStoreAdminLogin() val token = testAuthUtil.defaultHqAdminLogin()
val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule( val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule(
adminToken = token, adminToken = token,
request = createRequest request = createRequest
@ -560,7 +560,7 @@ class ScheduleApiTest(
} }
test("예약 중이거나 예약이 완료된 일정이면 실패한다.") { test("예약 중이거나 예약이 완료된 일정이면 실패한다.") {
val token = testAuthUtil.defaultStoreAdminLogin() val token = testAuthUtil.defaultHqAdminLogin()
val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule( val createdSchedule: ScheduleEntity = dummyInitializer.createSchedule(
adminToken = token, adminToken = token,