From e0972550d4e341f4ef20dd951c4a7ada3c39afd8 Mon Sep 17 00:00:00 2001 From: pricelees Date: Sat, 13 Sep 2025 12:28:34 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20Reservation=EC=9D=98=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=20ID=20=EC=BB=AC=EB=9F=BC=EB=AA=85=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(member=5Fid=20->=20user=5Fid)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roomescape/payment/business/PaymentService.kt | 4 ++-- .../roomescape/payment/business/PaymentWriter.kt | 4 ++-- .../infrastructure/persistence/ReservationEntity.kt | 2 +- .../persistence/ReservationRepository.kt | 2 +- .../roomescape/reservation/web/ReservationDto.kt | 4 ++-- src/main/resources/schema/schema-h2.sql | 10 ++++------ src/test/kotlin/roomescape/util/DummyInitializer.kt | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/kotlin/roomescape/payment/business/PaymentService.kt b/src/main/kotlin/roomescape/payment/business/PaymentService.kt index 8885dc18..05d4ca5e 100644 --- a/src/main/kotlin/roomescape/payment/business/PaymentService.kt +++ b/src/main/kotlin/roomescape/payment/business/PaymentService.kt @@ -44,7 +44,7 @@ class PaymentService( } } - fun cancel(memberId: Long, request: PaymentCancelRequest) { + fun cancel(userId: Long, request: PaymentCancelRequest) { val payment: PaymentEntity = findByReservationIdOrThrow(request.reservationId) val clientCancelResponse: PaymentClientCancelResponse = paymentClient.cancel( @@ -55,7 +55,7 @@ class PaymentService( transactionExecutionUtil.withNewTransaction(isReadOnly = false) { paymentWriter.cancel( - memberId = memberId, + userId = userId, payment = payment, requestedAt = request.requestedAt, cancelResponse = clientCancelResponse diff --git a/src/main/kotlin/roomescape/payment/business/PaymentWriter.kt b/src/main/kotlin/roomescape/payment/business/PaymentWriter.kt index 52f9de11..60a7473f 100644 --- a/src/main/kotlin/roomescape/payment/business/PaymentWriter.kt +++ b/src/main/kotlin/roomescape/payment/business/PaymentWriter.kt @@ -59,7 +59,7 @@ class PaymentWriter( } fun cancel( - memberId: Long, + userId: Long, payment: PaymentEntity, requestedAt: LocalDateTime, cancelResponse: PaymentClientCancelResponse @@ -72,7 +72,7 @@ class PaymentWriter( id = tsidFactory.next(), paymentId = payment.id, cancelRequestedAt = requestedAt, - canceledBy = memberId + canceledBy = userId ).also { canceledPaymentRepository.save(it) log.debug { "[PaymentWriterV2.cancelPayment] 결제 취소 정보 저장 완료: payment.id=${payment.id}" } diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt index 48e68558..dfd87710 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt +++ b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationEntity.kt @@ -11,7 +11,7 @@ import roomescape.common.entity.AuditingBaseEntity class ReservationEntity( id: Long, - val memberId: Long, + val userId: Long, val scheduleId: Long, val reserverName: String, val reserverContact: String, diff --git a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt index a36616a6..aba5f37f 100644 --- a/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt +++ b/src/main/kotlin/roomescape/reservation/infrastructure/persistence/ReservationRepository.kt @@ -4,5 +4,5 @@ import org.springframework.data.jpa.repository.JpaRepository interface ReservationRepository : JpaRepository { - fun findAllByMemberId(memberId: Long): List + fun findAllByUserId(userId: Long): List } diff --git a/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt b/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt index 43352f3e..5e5050cb 100644 --- a/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt +++ b/src/main/kotlin/roomescape/reservation/web/ReservationDto.kt @@ -19,9 +19,9 @@ data class PendingReservationCreateRequest( val requirement: String ) -fun PendingReservationCreateRequest.toEntity(id: Long, memberId: Long) = ReservationEntity( +fun PendingReservationCreateRequest.toEntity(id: Long, userId: Long) = ReservationEntity( id = id, - memberId = memberId, + userId = userId, scheduleId = this.scheduleId, reserverName = this.reserverName, reserverContact = this.reserverContact, diff --git a/src/main/resources/schema/schema-h2.sql b/src/main/resources/schema/schema-h2.sql index ec8ab571..4551306b 100644 --- a/src/main/resources/schema/schema-h2.sql +++ b/src/main/resources/schema/schema-h2.sql @@ -108,7 +108,7 @@ create table if not exists schedule ( create table if not exists reservation ( id bigint primary key, - member_id bigint not null, + user_id bigint not null, schedule_id bigint not null, reserver_name varchar(30) not null, reserver_contact varchar(30) not null, @@ -120,7 +120,7 @@ create table if not exists reservation ( updated_at timestamp not null, updated_by bigint not null, - constraint fk_reservation__member_id foreign key (member_id) references members (member_id), + constraint fk_reservation__user_id foreign key (user_id) references users (id), constraint fk_reservation__schedule_id foreign key (schedule_id) references schedule (id) ); @@ -133,8 +133,7 @@ create table if not exists canceled_reservation ( status varchar(30) not null, constraint uk_canceled_reservations__reservation_id unique (reservation_id), - constraint fk_canceled_reservations__reservation_id foreign key (reservation_id) references reservation (id), - constraint fk_canceled_reservations__canceled_by foreign key (canceled_by) references members (member_id) + constraint fk_canceled_reservations__reservation_id foreign key (reservation_id) references reservation (id) ); create table if not exists payment ( @@ -208,6 +207,5 @@ create table if not exists canceled_payment( easypay_discount_amount integer not null, constraint uk_canceled_payment__paymentId unique (payment_id), - constraint fk_canceled_payment__paymentId foreign key (payment_id) references payment(id), - constraint fk_canceled_payment__canceledBy foreign key (canceled_by) references members(member_id) + constraint fk_canceled_payment__paymentId foreign key (payment_id) references payment(id) ); diff --git a/src/test/kotlin/roomescape/util/DummyInitializer.kt b/src/test/kotlin/roomescape/util/DummyInitializer.kt index cef0eab6..f9d3368c 100644 --- a/src/test/kotlin/roomescape/util/DummyInitializer.kt +++ b/src/test/kotlin/roomescape/util/DummyInitializer.kt @@ -184,7 +184,7 @@ class DummyInitializer( } fun cancelPayment( - memberId: Long, + userId: Long, reservationId: Long, cancelReason: String, ): CanceledPaymentEntity { @@ -197,7 +197,7 @@ class DummyInitializer( ) return paymentWriter.cancel( - memberId, + userId, payment, requestedAt = LocalDateTime.now(), clientCancelResponse