refactor: 우산 대여 코드 이벤트 분리

src/main/kotlin/upbrella/be/config/event/EventConfiguration.kt

@@ -0,0 +1,18 @@
+package upbrella.be.config.event
+
+import org.springframework.beans.factory.InitializingBean
+import org.springframework.context.ApplicationContext
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import upbrella.be.util.event.Events
+
+@Configuration
+class EventsConfiguration(
+    private val applicationContext: ApplicationContext
+) {
+
+    @Bean
+    fun eventsInitializer(): InitializingBean {
+        return InitializingBean { Events.setPublisher(applicationContext) }
+    }
+}

src/main/kotlin/upbrella/be/rent/dto/response/ConditionReportResponse.kt

@@ -1,21 +1,8 @@
 package upbrella.be.rent.dto.response
 
-import upbrella.be.rent.entity.ConditionReport
-
 data class ConditionReportResponse(
     val id: Long,
     val umbrellaUuid: Long,
     val content: String?,
     val etc: String?
-) {
-    companion object {
-        fun fromConditionReport(conditionReport: ConditionReport): ConditionReportResponse {
-            return ConditionReportResponse(
-                id = conditionReport.history.id!!,
-                umbrellaUuid = conditionReport.history.umbrella.uuid,
-                content = conditionReport.content,
-                etc = conditionReport.etc
-            )
-        }
-    }
-}
+)

src/main/kotlin/upbrella/be/rent/dto/response/ImprovementReportResponse.kt

@@ -1,21 +1,8 @@
 package upbrella.be.rent.dto.response
 
-import upbrella.be.rent.entity.ImprovementReport
-
 data class ImprovementReportResponse(
     val id: Long = 0,
     val umbrellaUuid: Long = 0,
     val content: String? = "",
     val etc: String? = ""
-) {
-    companion object {
-        fun fromImprovementReport(improvementReport: ImprovementReport): ImprovementReportResponse {
-            return ImprovementReportResponse(
-                id = improvementReport.history.id ?: 0,
-                umbrellaUuid = improvementReport.history.umbrella.uuid,
-                content = improvementReport.content,
-                etc = improvementReport.etc
-            )
-        }
-    }
-}
+)

src/main/kotlin/upbrella/be/rent/entity/ConditionReport.kt

@@ -4,9 +4,7 @@ import javax.persistence.*
 
 @Entity
 class ConditionReport(
-    @OneToOne
-    @JoinColumn(name = "history_id")
-    val history: History,
+    val historyId: Long,
     val content: String? = null,
     val etc: String? = null,
     @Id

src/main/kotlin/upbrella/be/rent/entity/ImprovementReport.kt

@@ -4,9 +4,7 @@ import javax.persistence.*
 
 @Entity
 class ImprovementReport(
-    @OneToOne
-    @JoinColumn(name = "history_id")
-    val history: History,
+    val historyId: Long,
     val content: String? = null,
     val etc: String? = null,
     @Id

src/main/kotlin/upbrella/be/rent/event/RentEventHandler.kt

@@ -0,0 +1,88 @@
+package upbrella.be.rent.event
+
+import org.springframework.context.event.EventListener
+import org.springframework.stereotype.Service
+import upbrella.be.rent.entity.ConditionReport
+import upbrella.be.rent.entity.ImprovementReport
+import upbrella.be.rent.service.ConditionReportService
+import upbrella.be.rent.service.ImprovementReportService
+import upbrella.be.rent.service.RentService
+import upbrella.be.slack.SlackAlarmService
+import upbrella.be.slack.dto.service.input.NotifyConditionReportInput
+import upbrella.be.slack.dto.service.input.NotifyImprovementReportInput
+import upbrella.be.slack.dto.service.input.NotifyRentInput
+import upbrella.be.slack.dto.service.input.NotifyReturnInput
+
+@Service
+class RentEventHandler(
+    private val slackAlarmService: SlackAlarmService,
+    private val conditionReportService: ConditionReportService,
+    private val rentService: RentService,
+    private val improvementReportService: ImprovementReportService,
+) {
+
+    @EventListener(UmbrellaRentedEvent::class)
+    fun handleUmbrellaRentedEvent(event: UmbrellaRentedEvent) {
+        slackAlarmService.notifyRent(
+            NotifyRentInput(
+                userId = event.userId,
+                userName = event.userName,
+                rentStoreName = event.rentStoreName
+            )
+        )
+
+        event.conditionReportContent
+            ?.takeIf { it.isNotBlank() }
+            ?.let { content ->
+                ConditionReport(
+                    historyId = event.historyId,
+                    content = content
+                ).also { conditionReport ->
+                    conditionReportService.saveConditionReport(conditionReport)
+                    slackAlarmService.notifyConditionReport(
+                        NotifyConditionReportInput(
+                            umbrellaId = event.umbrellaId,
+                            rentStoreName = event.rentStoreName,
+                            content = content
+                        )
+                    )
+                }
+            }
+    }
+
+    @EventListener(UmbrellaReturnedEvent::class)
+    fun handleUmbrellaReturnedEvent(event: UmbrellaReturnedEvent) {
+
+        val unrefundedRentCount = rentService.countUnrefundedRent()
+        slackAlarmService.notifyReturn(
+            NotifyReturnInput(
+                userId = event.rentUserId,
+                rentStoreName = event.rentStoreName,
+                rentedAt = event.rentedAt.toString(),
+                returnStoreName = event.returnStoreName,
+                returnedAt = event.returnedAt.toString(),
+                unrefundedCount = unrefundedRentCount
+            )
+        )
+
+        event.improvementReportContent?.takeIf { it.isNotBlank() }
+            ?.let { content ->
+                ImprovementReport(
+                    historyId = event.historyId,
+                    content = content
+                ).also { improvementReport ->
+                    improvementReportService.save(improvementReport)
+                    slackAlarmService.notifyImprovementReport(
+                        NotifyImprovementReportInput(
+                            umbrellaId = event.returnedUmbrellaId,
+                            rentStoreName = event.rentStoreName,
+                            rentedAt = event.rentedAt.toString(),
+                            returnStoreName = event.returnStoreName,
+                            returnedAt = event.returnedAt.toString(),
+                            content = content
+                        )
+                    )
+                }
+            }
+    }
+}

src/main/kotlin/upbrella/be/rent/event/UmbrellaRentedEvent.kt

@@ -0,0 +1,12 @@
+package upbrella.be.rent.event
+
+import upbrella.be.util.event.Event
+
+class UmbrellaRentedEvent(
+    val userId: Long,
+    val userName: String,
+    val rentStoreName: String,
+    val conditionReportContent: String? = null,
+    val umbrellaId: Long,
+    val historyId: Long,
+) : Event()

src/main/kotlin/upbrella/be/rent/event/UmbrellaReturnedEvent.kt

@@ -0,0 +1,15 @@
+package upbrella.be.rent.event
+
+import upbrella.be.util.event.Event
+import java.time.LocalDateTime
+
+class UmbrellaReturnedEvent(
+    val rentUserId: Long,
+    val rentStoreName: String,
+    val rentedAt: LocalDateTime,
+    val returnStoreName: String,
+    val returnedAt: LocalDateTime,
+    val historyId: Long,
+    val improvementReportContent: String? = null,
+    val returnedUmbrellaId: Long,
+) : Event()

src/main/kotlin/upbrella/be/rent/repository/CustomConditionReportRepository.kt

@@ -0,0 +1,29 @@
+package upbrella.be.rent.repository
+
+import com.querydsl.core.types.Projections
+import com.querydsl.jpa.impl.JPAQueryFactory
+import org.springframework.stereotype.Repository
+import upbrella.be.rent.dto.response.ConditionReportResponse
+import upbrella.be.rent.entity.QConditionReport.conditionReport
+import upbrella.be.rent.entity.QHistory.history
+
+@Repository
+class CustomConditionReportRepository(
+    private val queryFactory: JPAQueryFactory
+) {
+    fun findAllConditionReport(): List<ConditionReportResponse> {
+        return queryFactory
+            .select(
+                Projections.constructor(
+                    ConditionReportResponse::class.java,
+                    conditionReport.id,
+                    history.umbrella.uuid,
+                    conditionReport.content,
+                    conditionReport.etc
+                )
+            )
+            .from(conditionReport)
+            .join(history)
+            .fetch()
+    }
+}

src/main/kotlin/upbrella/be/rent/repository/CustomImprovementReportRepository.kt

@@ -0,0 +1,30 @@
+package upbrella.be.rent.repository
+
+import com.querydsl.core.types.Projections
+import com.querydsl.jpa.impl.JPAQueryFactory
+import org.springframework.stereotype.Repository
+import upbrella.be.rent.dto.response.ImprovementReportResponse
+import upbrella.be.rent.entity.QHistory.history
+import upbrella.be.rent.entity.QImprovementReport.improvementReport
+
+@Repository
+class CustomImprovementReportRepository(
+    private val queryFactory: JPAQueryFactory,
+) {
+    fun findAllImprovementReport(): List<ImprovementReportResponse> {
+        return queryFactory
+            .select(
+                Projections.constructor(
+                    ImprovementReportResponse::class.java,
+                    improvementReport.id,
+                    history.umbrella.uuid,
+                    improvementReport.content,
+                    improvementReport.etc
+                )
+            )
+            .from(improvementReport)
+            .join(history)
+            .fetchJoin()
+            .fetch()
+    }
+}

src/main/kotlin/upbrella/be/rent/service/ConditionReportService.kt

@@ -2,23 +2,20 @@ package upbrella.be.rent.service
 
 import org.springframework.stereotype.Service
 import upbrella.be.rent.dto.response.ConditionReportPageResponse
-import upbrella.be.rent.dto.response.ConditionReportResponse
 import upbrella.be.rent.entity.ConditionReport
 import upbrella.be.rent.repository.ConditionReportRepository
+import upbrella.be.rent.repository.CustomConditionReportRepository
 
 @Service
 class ConditionReportService(
-    private val conditionReportRepository: ConditionReportRepository
+    private val conditionReportRepository: ConditionReportRepository,
+    private val customConditionReportRepository: CustomConditionReportRepository,
 ) {
 
     fun findAll(): ConditionReportPageResponse =
-        ConditionReportPageResponse.of(findAllConditionReport())
+        ConditionReportPageResponse.of(customConditionReportRepository.findAllConditionReport())
 
     fun saveConditionReport(conditionReport: ConditionReport) {
         conditionReportRepository.save(conditionReport)
     }
-
-    private fun findAllConditionReport(): List<ConditionReportResponse> =
-        conditionReportRepository.findAll()
-            .map { ConditionReportResponse.fromConditionReport(it) }
 }

src/main/kotlin/upbrella/be/rent/service/ImprovementReportService.kt

@@ -2,24 +2,21 @@ package upbrella.be.rent.service
 
 import org.springframework.stereotype.Service
 import upbrella.be.rent.dto.response.ImprovementReportPageResponse
-import upbrella.be.rent.dto.response.ImprovementReportResponse
 import upbrella.be.rent.entity.ImprovementReport
+import upbrella.be.rent.repository.CustomImprovementReportRepository
 import upbrella.be.rent.repository.ImprovementReportRepository
 
 @Service
 class ImprovementReportService(
-    private val improvementReportRepository: ImprovementReportRepository
+    private val improvementReportRepository: ImprovementReportRepository,
+    private val customImprovementReportRepository: CustomImprovementReportRepository
 ) {
 
     fun findAll(): ImprovementReportPageResponse =
-        ImprovementReportPageResponse.of(findAllImprovementReport())
+        ImprovementReportPageResponse.of(customImprovementReportRepository.findAllImprovementReport())
 
     fun save(improvementReport: ImprovementReport) {
 
         improvementReportRepository.save(improvementReport)
     }
-
-    private fun findAllImprovementReport(): List<ImprovementReportResponse> =
-        improvementReportRepository.findAll()
-            .map { ImprovementReportResponse.fromImprovementReport(it) }
 }