Merge pull request #94 from whatever-mentoring/feature/goal-proof-app…

…lication-service-test Write test codes of GoalProofApplicationService
whatever-mentoring · May 17, 2024 · dcf5689 · dcf5689
2 parents f680709 + 67f59eb
commit dcf5689
Show file tree

Hide file tree

Showing 6 changed files with 462 additions and 22 deletions.
diff --git a/...tlin/com/whatever/raisedragon/applicationservice/goalproof/GoalProofApplicationService.kt b/...tlin/com/whatever/raisedragon/applicationservice/goalproof/GoalProofApplicationService.kt
@@ -1,6 +1,9 @@
 package com.whatever.raisedragon.applicationservice.goalproof
 
-import com.whatever.raisedragon.applicationservice.goalproof.dto.*
+import com.whatever.raisedragon.applicationservice.goalproof.dto.GoalProofCreateServiceRequest
+import com.whatever.raisedragon.applicationservice.goalproof.dto.GoalProofListRetrieveResponse
+import com.whatever.raisedragon.applicationservice.goalproof.dto.GoalProofRetrieveResponse
+import com.whatever.raisedragon.applicationservice.goalproof.dto.GoalProofUpdateServiceRequest
 import com.whatever.raisedragon.common.exception.BaseException
 import com.whatever.raisedragon.common.exception.ExceptionCode
 import com.whatever.raisedragon.domain.gifticon.URL
@@ -22,7 +25,7 @@ class GoalProofApplicationService(
 ) {
 
     @Transactional
-    fun create(request: GoalProofCreateServiceRequest): GoalProofCreateUpdateResponse {
+    fun create(request: GoalProofCreateServiceRequest): GoalProofRetrieveResponse {
         val goal = goalService.findById(request.goalId)
 
         isGoalProofAlreadyExists(goal.id)
@@ -31,11 +34,11 @@ class GoalProofApplicationService(
         val goalProof = goalProofService.create(
             userId = request.userId,
             goalId = goal.id,
-            url = URL(request.url),
+            url = request.url,
             comment = request.comment
         )
         goalService.increaseThreshold(goal.id)
-        return GoalProofCreateUpdateResponse(GoalProofRetrieveResponse.of(goalProof))
+        return GoalProofRetrieveResponse.of(goalProof)
     }
 
     private fun isGoalProofAlreadyExists(goalId: Long) {
@@ -87,15 +90,14 @@ class GoalProofApplicationService(
             .also { it.validateOwnerId(request.userId) }
             .also { it.validateEndDate() }
         return GoalProofRetrieveResponse.of(
-            goalProofService.update(request.goalProofId, request.url?.let { URL(it) }, request.comment)
+            goalProofService.update(request.goalProofId, request.url, request.comment)
         )
     }
 
     private fun validateGoalProofCreateTiming(goal: Goal) {
         val now = LocalDateTime.now()
         val daysBetween = ChronoUnit.DAYS.between(goal.startDate, now) + 1
 
-
         if (1 > daysBetween || daysBetween > 7) {
             throw BaseException.of(
                 exceptionCode = ExceptionCode.E400_BAD_REQUEST,
@@ -108,7 +110,7 @@ class GoalProofApplicationService(
         return goalProofService.findById(goalProofId) ?: throw BaseException.of(ExceptionCode.E404_NOT_FOUND)
     }
 
-    private fun validateUpdatable(url: String?, comment: Comment?) {
+    private fun validateUpdatable(url: URL?, comment: Comment?) {
         if (url == null && comment == null) {
             throw BaseException.of(ExceptionCode.E400_BAD_REQUEST)
         }
@@ -121,7 +123,7 @@ class GoalProofApplicationService(
     }
 
     private fun GoalProof.validateEndDate() {
-        if (goalService.findById(goalId).endDate > LocalDateTime.now()) {
+        if (goalService.findById(goalId).endDate < LocalDateTime.now()) {
             throw BaseException.of(ExceptionCode.E400_BAD_REQUEST, "이미 끝난 내기입니다")
         }
     }

diff --git a/.../kotlin/com/whatever/raisedragon/applicationservice/goalproof/dto/GoalProofResponseDto.kt b/.../kotlin/com/whatever/raisedragon/applicationservice/goalproof/dto/GoalProofResponseDto.kt
@@ -3,13 +3,6 @@ package com.whatever.raisedragon.applicationservice.goalproof.dto
 import com.whatever.raisedragon.domain.goalproof.GoalProof
 import io.swagger.v3.oas.annotations.media.Schema
 
-
-@Schema(description = "[Response] 인증내역 생성/수정")
-data class GoalProofCreateUpdateResponse(
-    @Schema(description = "GoalProof")
-    val goalProofRetrieveResponse: GoalProofRetrieveResponse
-)
-
 @Schema(description = "[Response] 단건 다짐 인증 조회")
 data class GoalProofRetrieveResponse(
 

diff --git a/...n/com/whatever/raisedragon/applicationservice/goalproof/dto/GoalProofServiceRequestDto.kt b/...n/com/whatever/raisedragon/applicationservice/goalproof/dto/GoalProofServiceRequestDto.kt
@@ -1,17 +1,18 @@
 package com.whatever.raisedragon.applicationservice.goalproof.dto
 
+import com.whatever.raisedragon.domain.gifticon.URL
 import com.whatever.raisedragon.domain.goalproof.Comment
 
 data class GoalProofCreateServiceRequest(
     val userId: Long,
     val goalId: Long,
-    val url: String,
+    val url: URL,
     val comment: Comment
 )
 
 data class GoalProofUpdateServiceRequest(
     val goalProofId: Long,
     val userId: Long,
-    val url: String? = null,
+    val url: URL? = null,
     val comment: Comment? = null
 )
diff --git a/...-api/src/main/kotlin/com/whatever/raisedragon/controller/goalproof/GoalProofController.kt b/...-api/src/main/kotlin/com/whatever/raisedragon/controller/goalproof/GoalProofController.kt
@@ -1,7 +1,6 @@
 package com.whatever.raisedragon.controller.goalproof
 
 import com.whatever.raisedragon.applicationservice.goalproof.GoalProofApplicationService
-import com.whatever.raisedragon.applicationservice.goalproof.dto.GoalProofCreateUpdateResponse
 import com.whatever.raisedragon.applicationservice.goalproof.dto.GoalProofListRetrieveResponse
 import com.whatever.raisedragon.applicationservice.goalproof.dto.GoalProofRetrieveResponse
 import com.whatever.raisedragon.common.Response
@@ -28,7 +27,7 @@ class GoalProofController(
     fun create(
         @Valid @RequestBody goalProofCreateRequest: GoalProofCreateRequest,
         @GetAuth userInfo: UserInfo
-    ): Response<GoalProofCreateUpdateResponse> {
+    ): Response<GoalProofRetrieveResponse> {
         return Response.success(
             goalProofApplicationService.create(goalProofCreateRequest.toServiceRequest(userInfo.id))
         )

diff --git a/...edragon-api/src/main/kotlin/com/whatever/raisedragon/controller/goalproof/GoalProofDto.kt b/...edragon-api/src/main/kotlin/com/whatever/raisedragon/controller/goalproof/GoalProofDto.kt
@@ -2,6 +2,7 @@ package com.whatever.raisedragon.controller.goalproof
 
 import com.whatever.raisedragon.applicationservice.goalproof.dto.GoalProofCreateServiceRequest
 import com.whatever.raisedragon.applicationservice.goalproof.dto.GoalProofUpdateServiceRequest
+import com.whatever.raisedragon.domain.gifticon.URL
 import com.whatever.raisedragon.domain.goalproof.Comment
 import io.swagger.v3.oas.annotations.media.Schema
 
@@ -11,7 +12,7 @@ data class GoalProofCreateRequest(
     val goalId: Long,
 
     @Schema(description = "다짐 인증에 사용한 이미지 url")
-    val url: String?,
+    val url: String,
 
     @Schema(description = "다짐 인증에 대한 부연설명")
     val comment: String
@@ -22,7 +23,7 @@ fun GoalProofCreateRequest.toServiceRequest(
 ): GoalProofCreateServiceRequest = GoalProofCreateServiceRequest(
     userId = userId,
     goalId = goalId,
-    url = url ?: "",
+    url = URL(url),
     comment = Comment(comment)
 )
 
@@ -41,6 +42,6 @@ fun GoalProofUpdateRequest.toServiceRequest(
 ): GoalProofUpdateServiceRequest = GoalProofUpdateServiceRequest(
     userId = userId,
     goalProofId = goalProofId,
-    url = url,
+    url = url?.let { URL(it) },
     comment = comment?.let { Comment(it) }
 )