generated from pricelees/issue-pr-template
[#30] 코드 구조 개선 #31
@ -23,7 +23,7 @@ class AuthService(
|
||||
@Transactional(readOnly = true)
|
||||
fun login(request: LoginRequest): LoginResponse {
|
||||
val params = "email=${request.email}, password=${request.password}"
|
||||
log.info { "[AuthService.login] 시작: $params" }
|
||||
log.debug { "[AuthService.login] 시작: $params" }
|
||||
|
||||
val member: MemberEntity = fetchOrThrow(AuthErrorCode.LOGIN_FAILED) {
|
||||
memberFinder.findByEmailAndPassword(request.email, request.password)
|
||||
@ -36,7 +36,7 @@ class AuthService(
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
fun checkLogin(memberId: Long): LoginCheckResponse {
|
||||
log.info { "[AuthService.checkLogin] 시작: memberId=$memberId" }
|
||||
log.debug { "[AuthService.checkLogin] 시작: memberId=$memberId" }
|
||||
|
||||
val member: MemberEntity = fetchOrThrow(AuthErrorCode.MEMBER_NOT_FOUND) { memberFinder.findById(memberId) }
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ class MemberService(
|
||||
) {
|
||||
@Transactional(readOnly = true)
|
||||
fun findMembers(): MemberRetrieveListResponse {
|
||||
log.info { "[MemberService.findMembers] 시작" }
|
||||
log.debug { "[MemberService.findMembers] 시작" }
|
||||
|
||||
return memberFinder.findAll()
|
||||
.toRetrieveListResponse()
|
||||
@ -27,7 +27,7 @@ class MemberService(
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
fun findById(memberId: Long): MemberEntity {
|
||||
log.info { "[MemberService.findById] 시작" }
|
||||
log.debug { "[MemberService.findById] 시작" }
|
||||
|
||||
return memberFinder.findById(memberId)
|
||||
.also { log.info { "[MemberService.findById] 완료. memberId=${memberId}, email=${it.email}" } }
|
||||
@ -35,7 +35,7 @@ class MemberService(
|
||||
|
||||
@Transactional
|
||||
fun createMember(request: SignupRequest): SignupResponse {
|
||||
log.info { "[MemberService.createMember] 시작" }
|
||||
log.debug { "[MemberService.createMember] 시작" }
|
||||
|
||||
return memberWriter.create(request.name, request.email, request.password, Role.MEMBER)
|
||||
.toSignupResponse()
|
||||
|
||||
@ -24,7 +24,7 @@ class PaymentService(
|
||||
) {
|
||||
@Transactional(readOnly = true)
|
||||
fun existsByReservationId(reservationId: Long): Boolean {
|
||||
log.info { "[PaymentService.existsByReservationId] 시작: reservationId=$reservationId" }
|
||||
log.debug { "[PaymentService.existsByReservationId] 시작: reservationId=$reservationId" }
|
||||
|
||||
return paymentFinder.existsPaymentByReservationId(reservationId)
|
||||
.also { log.info { "[PaymentService.existsByReservationId] 완료: reservationId=$reservationId, isPaid=$it" } }
|
||||
@ -35,7 +35,7 @@ class PaymentService(
|
||||
approvedPaymentInfo: PaymentApproveResponse,
|
||||
reservation: ReservationEntity,
|
||||
): PaymentCreateResponse {
|
||||
log.info { "[PaymentService.createPayment] 시작: paymentKey=${approvedPaymentInfo.paymentKey}, reservationId=${reservation.id}" }
|
||||
log.debug { "[PaymentService.createPayment] 시작: paymentKey=${approvedPaymentInfo.paymentKey}, reservationId=${reservation.id}" }
|
||||
|
||||
val created: PaymentEntity = paymentWriter.create(
|
||||
paymentKey = approvedPaymentInfo.paymentKey,
|
||||
@ -55,7 +55,7 @@ class PaymentService(
|
||||
approvedAt: OffsetDateTime,
|
||||
paymentKey: String,
|
||||
): CanceledPaymentEntity {
|
||||
log.info { "[PaymentService.createCanceledPayment] 시작: paymentKey=$paymentKey" }
|
||||
log.debug { "[PaymentService.createCanceledPayment] 시작: paymentKey=$paymentKey" }
|
||||
|
||||
val created: CanceledPaymentEntity = paymentWriter.createCanceled(
|
||||
cancelReason = canceledPaymentInfo.cancelReason,
|
||||
@ -72,7 +72,7 @@ class PaymentService(
|
||||
|
||||
@Transactional
|
||||
fun createCanceledPayment(reservationId: Long): PaymentCancelRequest {
|
||||
log.info { "[PaymentService.createCanceledPayment] 시작: reservationId=$reservationId" }
|
||||
log.debug { "[PaymentService.createCanceledPayment] 시작: reservationId=$reservationId" }
|
||||
|
||||
val payment: PaymentEntity = paymentFinder.findByReservationId(reservationId)
|
||||
val canceled: CanceledPaymentEntity = paymentWriter.createCanceled(
|
||||
@ -90,7 +90,7 @@ class PaymentService(
|
||||
paymentKey: String,
|
||||
canceledAt: OffsetDateTime,
|
||||
) {
|
||||
log.info { "[PaymentService.updateCanceledTime] 시작: paymentKey=$paymentKey, canceledAt=$canceledAt" }
|
||||
log.debug { "[PaymentService.updateCanceledTime] 시작: paymentKey=$paymentKey, canceledAt=$canceledAt" }
|
||||
|
||||
paymentFinder.findCanceledByKey(paymentKey).apply { this.canceledAt = canceledAt }
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ class ReservationCommandService(
|
||||
request: ReservationCreateWithPaymentRequest,
|
||||
memberId: Long
|
||||
): ReservationEntity {
|
||||
log.info { "[ReservationCommandService.createReservationByAdmin] 시작: date=${request.date}, timeId=${request.timeId}, themeId=${request.themeId}, memberId=${memberId}" }
|
||||
log.debug { "[ReservationCommandService.createReservationByAdmin] 시작: date=${request.date}, timeId=${request.timeId}, themeId=${request.themeId}, memberId=${memberId}" }
|
||||
|
||||
val created: ReservationEntity = reservationWriter.create(
|
||||
date = request.date,
|
||||
@ -42,7 +42,7 @@ class ReservationCommandService(
|
||||
request: AdminReservationCreateRequest,
|
||||
memberId: Long
|
||||
): ReservationCreateResponse {
|
||||
log.info { "[ReservationCommandService.createReservationByAdmin] 시작: date=${request.date}, timeId=${request.timeId}, themeId=${request.themeId}, memberId=${request.memberId} by adminId=${memberId}" }
|
||||
log.debug { "[ReservationCommandService.createReservationByAdmin] 시작: date=${request.date}, timeId=${request.timeId}, themeId=${request.themeId}, memberId=${request.memberId} by adminId=${memberId}" }
|
||||
|
||||
val created: ReservationEntity = reservationWriter.create(
|
||||
date = request.date,
|
||||
@ -60,7 +60,7 @@ class ReservationCommandService(
|
||||
}
|
||||
|
||||
fun createWaiting(request: WaitingCreateRequest, memberId: Long): ReservationCreateResponse {
|
||||
log.info { "[ReservationCommandService.createWaiting] 시작: date=${request.date}, timeId=${request.timeId}, themeId=${request.themeId}, memberId=${memberId}" }
|
||||
log.debug { "[ReservationCommandService.createWaiting] 시작: date=${request.date}, timeId=${request.timeId}, themeId=${request.themeId}, memberId=${memberId}" }
|
||||
|
||||
val created: ReservationEntity = reservationWriter.create(
|
||||
date = request.date,
|
||||
@ -87,14 +87,14 @@ class ReservationCommandService(
|
||||
}
|
||||
|
||||
fun confirmWaiting(reservationId: Long, memberId: Long) {
|
||||
log.info { "[ReservationCommandService.confirmWaiting] 시작: reservationId=$reservationId (by adminId=$memberId)" }
|
||||
log.debug { "[ReservationCommandService.confirmWaiting] 시작: reservationId=$reservationId (by adminId=$memberId)" }
|
||||
|
||||
reservationWriter.confirm(reservationId)
|
||||
.also { log.info { "[ReservationCommandService.confirmWaiting] 완료: reservationId=$reservationId" } }
|
||||
}
|
||||
|
||||
fun deleteWaiting(reservationId: Long, memberId: Long) {
|
||||
log.info { "[ReservationCommandService.deleteWaiting] 시작: reservationId=$reservationId (by adminId=$memberId)" }
|
||||
log.debug { "[ReservationCommandService.deleteWaiting] 시작: reservationId=$reservationId (by adminId=$memberId)" }
|
||||
|
||||
val reservation: ReservationEntity = reservationFinder.findById(reservationId)
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ class ReservationQueryService(
|
||||
private val reservationFinder: ReservationFinder
|
||||
) {
|
||||
fun findReservations(): ReservationRetrieveListResponse {
|
||||
log.info { "[ReservationService.findReservations] 시작" }
|
||||
log.debug { "[ReservationService.findReservations] 시작" }
|
||||
|
||||
return reservationFinder.findAllByStatuses(*ReservationStatus.confirmedStatus())
|
||||
.toRetrieveListResponse()
|
||||
@ -26,7 +26,7 @@ class ReservationQueryService(
|
||||
}
|
||||
|
||||
fun findAllWaiting(): ReservationRetrieveListResponse {
|
||||
log.info { "[ReservationService.findAllWaiting] 시작" }
|
||||
log.debug { "[ReservationService.findAllWaiting] 시작" }
|
||||
|
||||
return reservationFinder.findAllByStatuses(ReservationStatus.WAITING)
|
||||
.toRetrieveListResponse()
|
||||
@ -34,7 +34,7 @@ class ReservationQueryService(
|
||||
}
|
||||
|
||||
fun findReservationsByMemberId(memberId: Long): MyReservationRetrieveListResponse {
|
||||
log.info { "[ReservationService.findReservationsByMemberId] 시작: memberId=$memberId" }
|
||||
log.debug { "[ReservationService.findReservationsByMemberId] 시작: memberId=$memberId" }
|
||||
|
||||
return reservationFinder.findAllByMemberId(memberId)
|
||||
.toRetrieveListResponse()
|
||||
@ -47,7 +47,7 @@ class ReservationQueryService(
|
||||
startFrom: LocalDate?,
|
||||
endAt: LocalDate?,
|
||||
): ReservationRetrieveListResponse {
|
||||
log.info { "[ReservationService.searchReservations] 시작: themeId=$themeId, memberId=$memberId, dateFrom=$startFrom, dateTo=$endAt" }
|
||||
log.debug { "[ReservationService.searchReservations] 시작: themeId=$themeId, memberId=$memberId, dateFrom=$startFrom, dateTo=$endAt" }
|
||||
|
||||
return reservationFinder.searchReservations(themeId, memberId, startFrom, endAt)
|
||||
.toRetrieveListResponse()
|
||||
|
||||
@ -26,13 +26,13 @@ class ReservationWithPaymentService(
|
||||
approvedPaymentInfo: PaymentApproveResponse,
|
||||
memberId: Long,
|
||||
): ReservationCreateResponse {
|
||||
log.info { "[ReservationWithPaymentService.createReservationAndPayment] 예약 & 결제 정보 저장 시작: memberId=$memberId, paymentInfo=$approvedPaymentInfo" }
|
||||
log.info { "[ReservationWithPaymentService.createReservationAndPayment] 시작: memberId=$memberId, paymentInfo=$approvedPaymentInfo" }
|
||||
|
||||
val reservation: ReservationEntity = reservationCommandService.createReservationWithPayment(request, memberId)
|
||||
.also { paymentService.createPayment(approvedPaymentInfo, it) }
|
||||
|
||||
return reservation.toCreateResponse()
|
||||
.also { log.info { "[ReservationWithPaymentService.createReservationAndPayment] 예약 & 결제 정보 저장 완료: reservationId=${reservation.id}, paymentId=${it.id}" } }
|
||||
.also { log.info { "[ReservationWithPaymentService.createReservationAndPayment] 완료: reservationId=${reservation.id}, paymentId=${it.id}" } }
|
||||
}
|
||||
|
||||
fun createCanceledPayment(
|
||||
@ -47,11 +47,11 @@ class ReservationWithPaymentService(
|
||||
reservationId: Long,
|
||||
memberId: Long,
|
||||
): PaymentCancelRequest {
|
||||
log.info { "[ReservationWithPaymentService.deleteReservationAndPayment] 결제 취소 정보 저장 & 예약 삭제 시작: reservationId=$reservationId" }
|
||||
log.info { "[ReservationWithPaymentService.deleteReservationAndPayment] 시작: reservationId=$reservationId" }
|
||||
val paymentCancelRequest = paymentService.createCanceledPayment(reservationId)
|
||||
|
||||
reservationCommandService.deleteReservation(reservationId, memberId)
|
||||
log.info { "[ReservationWithPaymentService.deleteReservationAndPayment] 결제 취소 정보 저장 & 예약 삭제 완료: reservationId=$reservationId" }
|
||||
log.info { "[ReservationWithPaymentService.deleteReservationAndPayment] 완료: reservationId=$reservationId" }
|
||||
return paymentCancelRequest
|
||||
}
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ class ThemeService(
|
||||
) {
|
||||
@Transactional(readOnly = true)
|
||||
fun findById(id: Long): ThemeEntity {
|
||||
log.info { "[ThemeService.findById] 시작: themeId=$id" }
|
||||
log.debug { "[ThemeService.findById] 시작: themeId=$id" }
|
||||
|
||||
return themeFinder.findById(id)
|
||||
.also { log.info { "[ThemeService.findById] 완료: themeId=$id, name=${it.name}" } }
|
||||
@ -26,7 +26,7 @@ class ThemeService(
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
fun findThemes(): ThemeRetrieveListResponse {
|
||||
log.info { "[ThemeService.findThemes] 시작" }
|
||||
log.debug { "[ThemeService.findThemes] 시작" }
|
||||
|
||||
return themeFinder.findAll()
|
||||
.toRetrieveListResponse()
|
||||
@ -35,7 +35,7 @@ class ThemeService(
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
fun findMostReservedThemes(count: Int): ThemeRetrieveListResponse {
|
||||
log.info { "[ThemeService.findMostReservedThemes] 시작: count=$count" }
|
||||
log.debug { "[ThemeService.findMostReservedThemes] 시작: count=$count" }
|
||||
|
||||
val today = LocalDate.now()
|
||||
val startFrom = today.minusDays(7)
|
||||
@ -48,7 +48,7 @@ class ThemeService(
|
||||
|
||||
@Transactional
|
||||
fun createTheme(request: ThemeCreateRequest): ThemeCreateResponse {
|
||||
log.info { "[ThemeService.createTheme] 시작: name=${request.name}" }
|
||||
log.debug { "[ThemeService.createTheme] 시작: name=${request.name}" }
|
||||
|
||||
return themeWriter.create(request.name, request.description, request.thumbnail)
|
||||
.toCreateResponse()
|
||||
@ -57,7 +57,7 @@ class ThemeService(
|
||||
|
||||
@Transactional
|
||||
fun deleteTheme(id: Long) {
|
||||
log.info { "[ThemeService.deleteTheme] 시작: themeId=$id" }
|
||||
log.debug { "[ThemeService.deleteTheme] 시작: themeId=$id" }
|
||||
|
||||
val theme: ThemeEntity = themeFinder.findById(id)
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ class TimeService(
|
||||
) {
|
||||
@Transactional(readOnly = true)
|
||||
fun findById(id: Long): TimeEntity {
|
||||
log.info { "[TimeService.findById] 시작: timeId=$id" }
|
||||
log.debug { "[TimeService.findById] 시작: timeId=$id" }
|
||||
|
||||
return timeFinder.findById(id)
|
||||
.also { log.info { "[TimeService.findById] 완료: timeId=$id, startAt=${it.startAt}" } }
|
||||
@ -27,7 +27,7 @@ class TimeService(
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
fun findTimes(): TimeRetrieveListResponse {
|
||||
log.info { "[TimeService.findTimes] 시작" }
|
||||
log.debug { "[TimeService.findTimes] 시작" }
|
||||
|
||||
return timeFinder.findAll()
|
||||
.toResponse()
|
||||
@ -36,7 +36,7 @@ class TimeService(
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
fun findTimesWithAvailability(date: LocalDate, themeId: Long): TimeWithAvailabilityListResponse {
|
||||
log.info { "[TimeService.findTimesWithAvailability] 시작: date=$date, themeId=$themeId" }
|
||||
log.debug { "[TimeService.findTimesWithAvailability] 시작: date=$date, themeId=$themeId" }
|
||||
|
||||
val times: List<TimeWithAvailabilityResponse> =
|
||||
timeFinder.findAllWithAvailabilityByDateAndThemeId(date, themeId)
|
||||
@ -55,7 +55,7 @@ class TimeService(
|
||||
@Transactional
|
||||
fun createTime(request: TimeCreateRequest): TimeCreateResponse {
|
||||
val startAt: LocalTime = request.startAt
|
||||
log.info { "[TimeService.createTime] 시작: startAt=${startAt}" }
|
||||
log.debug { "[TimeService.createTime] 시작: startAt=${startAt}" }
|
||||
|
||||
return timeWriter.create(startAt)
|
||||
.toCreateResponse()
|
||||
@ -64,7 +64,7 @@ class TimeService(
|
||||
|
||||
@Transactional
|
||||
fun deleteTime(id: Long) {
|
||||
log.info { "[TimeService.deleteTime] 시작: timeId=$id" }
|
||||
log.debug { "[TimeService.deleteTime] 시작: timeId=$id" }
|
||||
|
||||
val time: TimeEntity = timeFinder.findById(id)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user