Merge pull request #73 from mash-up-kr/fix/generate-option

feat: Add generating condition
mash-up-kr · Aug 21, 2024 · b75342c · b75342c
2 parents c711f53 + c25f5fe
commit b75342c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/pic-api/src/main/kotlin/com/mashup/pic/vote/applicationservice/VoteApplicationService.kt b/pic-api/src/main/kotlin/com/mashup/pic/vote/applicationservice/VoteApplicationService.kt
@@ -34,7 +34,9 @@ class VoteApplicationService(
         voteService.markVoted(request.userId, request.eventId)
 
         if (voteService.hasEveryoneVoted(request.eventId)) {
-            resultService.generateResult(request.eventId)
+            if (!resultService.hasResult(request.eventId)) {
+                resultService.generateResult(request.eventId)
+            }
             eventService.endEventVoting(request.eventId)
         }
 

diff --git a/pic-domain/src/main/kotlin/com/mashup/pic/domain/redis/RedisMessageListener.kt b/pic-domain/src/main/kotlin/com/mashup/pic/domain/redis/RedisMessageListener.kt
@@ -25,7 +25,9 @@ class RedisMessageListener(
         when (ChannelTopic.from(eventInfo.topic)) {
             ChannelTopic.EVENT_OPEN -> eventService.endEventUploading(eventInfo.eventId)
             ChannelTopic.VOTE_OPEN -> {
-                resultService.generateResult(eventInfo.eventId)
+                if (!resultService.hasResult(eventInfo.eventId)) {
+                    resultService.generateResult(eventInfo.eventId)
+                }
                 eventService.endEventVoting(eventInfo.eventId)
             }
         }

diff --git a/pic-domain/src/main/kotlin/com/mashup/pic/domain/result/ResultRepository.kt b/pic-domain/src/main/kotlin/com/mashup/pic/domain/result/ResultRepository.kt
@@ -4,4 +4,6 @@ import org.springframework.data.jpa.repository.JpaRepository
 
 interface ResultRepository : JpaRepository<Result, Long> {
     fun findAllByEventIdOrderByImageOrderAsc(eventId: Long): List<Result>
+
+    fun findAllByEventId(eventId: Long): List<Result>
 }
diff --git a/pic-domain/src/main/kotlin/com/mashup/pic/domain/result/ResultService.kt b/pic-domain/src/main/kotlin/com/mashup/pic/domain/result/ResultService.kt
@@ -59,6 +59,10 @@ class ResultService(
         )
     }
 
+    fun hasResult(eventId: Long): Boolean {
+        return resultRepository.findAllByEventId(eventId).isNotEmpty()
+    }
+
     private fun getImageOptionById(imageOptionId: Long): EventImageOption {
         return eventImageOptionRepository.findByIdOrNull(imageOptionId)
             ?: throw PicException.of(PicExceptionType.ARGUMENT_NOT_VALID, "없는 이미지 항목")