feat: 결제 환불 로직 리팩토링

src/main/kotlin/uoslife/servermeeting/admin/service/AdminService.kt

@@ -48,7 +48,7 @@ class AdminService(
     fun refundPayment(
         requestInfo: RequestInfoDto
     ): PaymentResponseDto.NotMatchedPaymentRefundResponse {
-        val result = paymentService.refundPayment()
+        val result = paymentService.refundUnmatchedPayment()
         logger.info("[ADMIN-매칭 실패 유저 환불] $requestInfo")
         return result
     }

src/main/kotlin/uoslife/servermeeting/global/external/PortOneAPI.kt

@@ -16,7 +16,6 @@ interface PaymentClient {
     fun getAccessToken(
         @RequestBody request: PortOneRequestDto.AccessTokenRequest
     ): PortOneResponseDto.AccessTokenResponse
-
     @GetMapping("/payments/{impUid}", consumes = ["application/json"])
     fun checkPayment(
         @RequestHeader("Authorization") accessToken: String,

src/main/kotlin/uoslife/servermeeting/match/dto/response/MatchedPartnerInformationResponse.kt

@@ -0,0 +1,30 @@
+package uoslife.servermeeting.match.dto.response
+
+import uoslife.servermeeting.meetingteam.dto.response.MeetingTeamInformationGetResponse
+import uoslife.servermeeting.meetingteam.dto.response.UserCardProfile
+import uoslife.servermeeting.meetingteam.entity.enums.TeamType
+import uoslife.servermeeting.user.entity.enums.GenderType
+
+data class MatchedPartnerInformationResponse(
+    val teamType: TeamType,
+    val teamName: String?,
+    val course: String?,
+    val gender: GenderType,
+    val code: String?,
+    val meetingTeamUserProfiles: List<UserCardProfile>?
+)
+
+object MeetingDtoConverter {
+    fun toMatchedPartnerInformationResponse(
+        response: MeetingTeamInformationGetResponse
+    ): MatchedPartnerInformationResponse {
+        return MatchedPartnerInformationResponse(
+            teamType = response.teamType,
+            teamName = response.teamName,
+            course = response.course,
+            gender = response.gender,
+            code = response.code,
+            meetingTeamUserProfiles = response.meetingTeamUserProfiles
+        )
+    }
+}

src/main/kotlin/uoslife/servermeeting/payment/service/PaymentService.kt

@@ -22,7 +22,7 @@ interface PaymentService {
         userId: Long,
         teamType: TeamType
     ): PaymentResponseDto.PaymentRefundResponse
-    fun refundPayment(): PaymentResponseDto.NotMatchedPaymentRefundResponse
+    fun refundUnmatchedPayment(): PaymentResponseDto.NotMatchedPaymentRefundResponse
     fun verifyPayment(userId: Long, teamType: TeamType): PaymentResponseDto.PaymentRequestResponse
     fun deleteUserPayment(user: User)
     fun synchronizePayment(paymentWebhookResponse: PaymentResponseDto.PaymentWebhookResponse)

src/main/kotlin/uoslife/servermeeting/payment/service/impl/PortOneService.kt

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import uoslife.servermeeting.global.auth.exception.ExternalApiFailedException
-import uoslife.servermeeting.meetingteam.dao.MeetingTeamDao
+import uoslife.servermeeting.match.dao.MatchedDao
 import uoslife.servermeeting.meetingteam.dao.UserTeamDao
 import uoslife.servermeeting.meetingteam.entity.MeetingTeam
 import uoslife.servermeeting.meetingteam.entity.UserTeam
@@ -24,23 +24,22 @@ import uoslife.servermeeting.payment.entity.enums.PaymentStatus
 import uoslife.servermeeting.payment.exception.*
 import uoslife.servermeeting.payment.repository.PaymentRepository
 import uoslife.servermeeting.payment.service.PaymentService
-import uoslife.servermeeting.user.dao.UserDao
 import uoslife.servermeeting.user.entity.User
+import uoslife.servermeeting.user.entity.enums.GenderType
 import uoslife.servermeeting.user.exception.UserNotFoundException
 import uoslife.servermeeting.user.repository.UserRepository
 
 @Service
 @Qualifier("PortOneService")
 class PortOneService(
     private val userRepository: UserRepository,
-    private val userDao: UserDao,
     private val userTeamDao: UserTeamDao,
     private val paymentDao: PaymentDao,
-    private val meetingTeamDao: MeetingTeamDao,
     private val paymentRepository: PaymentRepository,
     private val validator: Validator,
     private val userTeamRepository: UserTeamRepository,
     private val portOneAPIService: PortOneAPIService,
+    private val matchedDao: MatchedDao,
     @Value("\${portone.api.price.single}") private val singlePrice: Int,
     @Value("\${portone.api.price.triple}") private val triplePrice: Int,
 ) : PaymentService {
@@ -284,27 +283,46 @@ class PortOneService(
     }
 
     @Transactional
-    override fun refundPayment(): PaymentResponseDto.NotMatchedPaymentRefundResponse {
-        val userList =
-            meetingTeamDao
-                .findUserIdWithMaleMeetingTeam()
-                .plus(meetingTeamDao.findUserIdWithFeMaleMeetingTeam())
-        val paymentList = userDao.findNotMatchedPayment(userList)
-        logger.info("Total payment count: " + paymentList.size)
+    override fun refundUnmatchedPayment(): PaymentResponseDto.NotMatchedPaymentRefundResponse {
+        val successPayments = paymentRepository.findByStatus(PaymentStatus.SUCCESS)
+
+        val unMatchedPayments = mutableListOf<Payment>()
+        successPayments.forEach { payment ->
+            if (!isMatchedPayment(payment)) {
+                unMatchedPayments.add(payment)
+            }
+        }
+        logger.info("Total unmatched payment count: " + unMatchedPayments.size)
 
         val refundFailedList: MutableList<String> = mutableListOf()
-        paymentList.forEach { payment ->
+        unMatchedPayments.forEach { payment ->
             try {
-                portOneAPIService.refundPayment(payment.impUid, payment.price)
-                updatePaymentStatus(payment, PaymentStatus.REFUND, payment.impUid!!)
+                val refundPayment = portOneAPIService.refundPayment(payment.impUid, payment.price)
+                if (refundPayment.code == 0) {
+                    updatePaymentStatus(payment, PaymentStatus.REFUND, payment.impUid!!)
+                } else {
+                    updatePaymentStatus(payment, PaymentStatus.REFUND_FAILED, payment.impUid!!)
+                    refundFailedList.add(payment.impUid.toString())
+                }
             } catch (e: ExternalApiFailedException) {
-                logger.info(
-                    "[환불 실패] payment_id: ${payment.id}, impUid: ${payment.impUid}, marchantUid: ${payment.merchantUid}"
-                )
-                refundFailedList.add(payment.id.toString())
-                payment.status = PaymentStatus.REFUND_FAILED
+                updatePaymentStatus(payment, PaymentStatus.REFUND_FAILED, payment.impUid!!)
+                refundFailedList.add(payment.impUid.toString())
             }
         }
         return PaymentResponseDto.NotMatchedPaymentRefundResponse(refundFailedList)
     }
+
+    private fun isMatchedPayment(payment: Payment): Boolean {
+        val meetingTeam = payment.meetingTeam ?: throw MeetingTeamNotFoundException()
+        val matched =
+            when (meetingTeam.gender) {
+                GenderType.MALE -> {
+                    matchedDao.findMatchByMaleTeamWithFemaleTeam(meetingTeam)
+                }
+                GenderType.FEMALE -> {
+                    matchedDao.findMatchByFeMaleTeamWithMaleTeam(meetingTeam)
+                }
+            }
+        return matched != null
+    }
 }

src/main/kotlin/uoslife/servermeeting/verification/service/AsyncEmailService.kt

@@ -66,6 +66,6 @@ class AsyncEmailService(
                         .withBody(Body().withHtml(Content(emailBody)))
                 )
                 .withSource(emailFrom)
-        sesClient.sendEmail(request)
+        //        sesClient.sendEmail(request)
     }
 }