우산 반납/대여 관련 슬랙 메시지 개선

.github/workflows/dev-pr-test.yml

@@ -17,11 +17,11 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Set application properties
         run: |

src/main/kotlin/upbrella/be/config/DevCorsConfig.kt

@@ -2,11 +2,9 @@ package upbrella.be.config
 
 import org.springframework.context.annotation.Profile
 import org.springframework.stereotype.Component
-
 import javax.servlet.*
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
-import java.io.IOException
 
 @Profile("dev")
 @Component

src/main/kotlin/upbrella/be/rent/controller/RentController.kt

@@ -12,7 +12,7 @@ import upbrella.be.rent.service.ConditionReportService
 import upbrella.be.rent.service.ImprovementReportService
 import upbrella.be.rent.service.LockerService
 import upbrella.be.rent.service.RentService
-import upbrella.be.slack.service.SlackAlarmService
+import upbrella.be.slack.SlackAlarmService
 import upbrella.be.user.dto.response.SessionUser
 import upbrella.be.user.repository.UserReader
 import upbrella.be.util.CustomResponse
@@ -97,9 +97,7 @@ class RentController(
         val userToReturn = userReader.findUserById(user.id)
 
         rentService.returnUmbrellaByUser(userToReturn, returnUmbrellaByUserRequest)
-        val unrefundedRentCount = rentService.countUnrefundedRent()
 
-        slackAlarmService.notifyReturn(unrefundedRentCount)
         return ResponseEntity
             .ok()
             .body(CustomResponse(

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

@@ -11,7 +11,7 @@ data class ConditionReportResponse(
     companion object {
         fun fromConditionReport(conditionReport: ConditionReport): ConditionReportResponse {
             return ConditionReportResponse(
-                id = conditionReport.history!!.id!!,
+                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

@@ -11,8 +11,8 @@ data class ImprovementReportResponse(
     companion object {
         fun fromImprovementReport(improvementReport: ImprovementReport): ImprovementReportResponse {
             return ImprovementReportResponse(
-                id = improvementReport.history?.id ?: 0,
-                umbrellaUuid = improvementReport.history?.umbrella?.uuid ?: 0,
+                id = improvementReport.history.id ?: 0,
+                umbrellaUuid = improvementReport.history.umbrella.uuid,
                 content = improvementReport.content,
                 etc = improvementReport.etc
             )

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

@@ -2,7 +2,6 @@ package upbrella.be.rent.dto.response
 
 import com.fasterxml.jackson.annotation.JsonFormat
 import java.time.LocalDateTime
-import upbrella.be.rent.entity.History
 
 data class RentalHistoryResponse(
     val id: Long,
@@ -24,9 +23,6 @@ data class RentalHistoryResponse(
     val etc: String? = null
 ) {
     companion object {
-        private fun isRefunded(history: History): Boolean {
-            return history.refundedAt != null
-        }
 
         fun createReturnedHistory(history: HistoryInfoDto, elapsedDay: Int, totalRentalDay: Int): RentalHistoryResponse {
             return RentalHistoryResponse(

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

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

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

@@ -1,6 +1,5 @@
 package upbrella.be.rent.entity
 
-import upbrella.be.rent.dto.request.ReturnUmbrellaByUserRequest
 import upbrella.be.rent.exception.NotRefundedException
 import upbrella.be.store.entity.StoreMeta
 import upbrella.be.umbrella.entity.Umbrella
@@ -25,11 +24,11 @@ class History(
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "rent_store_meta_id")
-    val rentStoreMeta: StoreMeta,
+    var rentStoreMeta: StoreMeta,
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "return_store_meta_id")
-    val returnStoreMeta: StoreMeta? = null,
+    var returnStoreMeta: StoreMeta? = null,
 
     val rentedAt: LocalDateTime = LocalDateTime.now(),
     var returnedAt: LocalDateTime? = null,
@@ -60,26 +59,6 @@ class History(
             )
         }
 
-        @JvmStatic
-        fun updateHistoryForReturn(
-            rentedHistory: History,
-            returnStoreMeta: StoreMeta,
-            request: ReturnUmbrellaByUserRequest
-        ): History {
-            return History(
-                id = rentedHistory.id,
-                umbrella =  rentedHistory.umbrella,
-                user = rentedHistory.user,
-                paidAt =  rentedHistory.paidAt,
-                bank = request.bank,
-                accountNumber = request.accountNumber,
-                rentStoreMeta = rentedHistory.rentStoreMeta,
-                returnStoreMeta = returnStoreMeta,
-                rentedAt = rentedHistory.rentedAt,
-                returnedAt = LocalDateTime.now(),
-            )
-        }
-
         fun ofUserHistory(history: History): SingleHistoryResponse {
             var isReturned = true
             var isRefunded = false
@@ -139,4 +118,4 @@ class History(
         this.bank = null
         this.accountNumber = null
     }
-}
+}

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

@@ -6,20 +6,10 @@ import javax.persistence.*
 class ImprovementReport(
     @OneToOne
     @JoinColumn(name = "history_id")
-    val history: History? = null,
+    val history: History,
     val content: String? = null,
     val etc: String? = null,
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    val id: Long? =null
-) {
-    companion object {
-        @JvmStatic
-        fun createFromReturn(history: History, content: String): ImprovementReport {
-            return ImprovementReport(
-                history = history,
-                content = content,
-            )
-        }
-    }
-}
+    val id: Long? = null
+)

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

@@ -3,5 +3,4 @@ package upbrella.be.rent.repository
 import org.springframework.data.jpa.repository.JpaRepository
 import upbrella.be.rent.entity.ConditionReport
 
-interface ConditionReportRepository : JpaRepository<ConditionReport, Long> {
-}
+interface ConditionReportRepository : JpaRepository<ConditionReport, Long>

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

@@ -3,5 +3,4 @@ package upbrella.be.rent.repository
 import org.springframework.data.jpa.repository.JpaRepository
 import upbrella.be.rent.entity.ImprovementReport
 
-interface ImprovementReportRepository : JpaRepository<ImprovementReport, Long> {
-}
+interface ImprovementReportRepository : JpaRepository<ImprovementReport, Long>

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

@@ -27,7 +27,7 @@ class RentRepositoryImpl(
             .orderBy(history.id.desc())
             .offset(pageable.offset)
             .limit(pageable.pageSize.toLong())
-            .fetch();
+            .fetch()
     }
 
     override fun findHistoryInfos(
@@ -61,7 +61,7 @@ class RentRepositoryImpl(
             .orderBy(history.id.desc())
             .offset(pageable.offset)
             .limit(pageable.pageSize.toLong())
-            .fetch();
+            .fetch()
     }
 
     override fun countAll(filter: HistoryFilterRequest, pageable: Pageable): Long {
@@ -82,12 +82,12 @@ class RentRepositoryImpl(
             .leftJoin(history.returnStoreMeta, storeMeta).fetchJoin()
             .where(history.user.id.eq(userId))
             .orderBy(history.id.desc())
-            .fetch();
+            .fetch()
     }
 
     private fun filterRefunded(filter: HistoryFilterRequest): BooleanExpression? {
         if (filter.refunded == null) {
-            return null;
+            return null
         }
 
         if (filter.refunded == true) {
@@ -96,4 +96,4 @@ class RentRepositoryImpl(
 
         return history.refundedAt.isNull
     }
-}
+}

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

@@ -3,7 +3,6 @@ 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.History
 import upbrella.be.rent.entity.ImprovementReport
 import upbrella.be.rent.repository.ImprovementReportRepository
 
@@ -15,9 +14,9 @@ class ImprovementReportService(
     fun findAll(): ImprovementReportPageResponse =
         ImprovementReportPageResponse.of(findAllImprovementReport())
 
-    fun addImprovementReportFromReturn(history: History, content: String) {
-        val report = ImprovementReport.createFromReturn(history, content)
-        improvementReportRepository.save(report)
+    fun save(improvementReport: ImprovementReport) {
+
+        improvementReportRepository.save(improvementReport)
     }
 
     private fun findAllImprovementReport(): List<ImprovementReportResponse> =