Merge pull request #92 from mash-up-kr/xonmin/refactor-create-Qset

refactor : excludeQSet to latestQset in create QSet
mash-up-kr · Aug 15, 2024 · f0e8e31 · f0e8e31
2 parents 81ca6cf + 8927228
commit f0e8e31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/service/src/main/kotlin/com/mashup/dojo/service/QuestionService.kt b/service/src/main/kotlin/com/mashup/dojo/service/QuestionService.kt
@@ -61,7 +61,7 @@ interface QuestionService {
         emojiImageId: ImageId,
     ): QuestionId
 
-    fun createQuestionSet(excludedQuestionSet: QuestionSet?): QuestionSetId
+    fun createQuestionSet(latestQuestionSet: QuestionSet?): QuestionSetId
 
     fun createQuestionSet(
         questionIds: List<QuestionId>,
@@ -149,10 +149,10 @@ class DefaultQuestionService(
     }
 
     @Transactional
-    override fun createQuestionSet(excludedQuestionSet: QuestionSet?): QuestionSetId {
+    override fun createQuestionSet(latestQuestionSet: QuestionSet?): QuestionSetId {
         // 비율에 따라 questionType 선정
         val friendQuestionSize = floor(questionSetSize * friendQuestionRatio).toInt()
-        val excludedQuestionIds: List<String> = excludedQuestionSet?.questionIds?.map { it.questionId.value } ?: emptyList()
+        val excludedQuestionIds: List<String> = latestQuestionSet?.questionIds?.map { it.questionId.value } ?: emptyList()
 
         val friendQuestions =
             questionRepository.findRandomQuestions(com.mashup.dojo.QuestionType.FRIEND, excludedQuestionIds, Pageable.ofSize(friendQuestionSize))
@@ -167,7 +167,7 @@ class DefaultQuestionService(
             log.error {
                 "QSet 을 만들기 위한 남은 Question 들이 부족합니다. " +
                     "조회한 QuestionSize : ${questionList.size}, 친구용 질문 size : $friendQuestionSize, 전체용 질문 size : ${accompanyQuestions.size}, " +
-                    "이전 QSetId : ${excludedQuestionSet?.id}, 제외한 QuestionIds : $excludedQuestionIds"
+                    "이전 QSetId : ${latestQuestionSet?.id}, 제외한 QuestionIds : $excludedQuestionIds"
             }
 
             throw DojoException.of(DojoExceptionType.QUESTION_LACK_FOR_CREATE_QUESTION_SET)
@@ -179,10 +179,8 @@ class DefaultQuestionService(
             }
 
         // 마지막 QSet 의 발행 시각 가져오기
-        val latestQSet = getLatestPublishedQuestionSet()
-
         val publishedTime =
-            latestQSet?.endAt ?: run {
+            latestQuestionSet?.endAt ?: run {
                 val now = LocalTime.now()
                 val today = LocalDate.now()
 

diff --git a/service/src/main/kotlin/com/mashup/dojo/usecase/QuestionUseCase.kt b/service/src/main/kotlin/com/mashup/dojo/usecase/QuestionUseCase.kt
@@ -110,7 +110,7 @@ class DefaultQuestionUseCase(
         // 가장 마지막에 만들어진 QSet 정보는 제외
         val latestQSet = questionService.getLatestPublishedQuestionSet()
 
-        return questionService.createQuestionSet(excludedQuestionSet = latestQSet)
+        return questionService.createQuestionSet(latestQuestionSet = latestQSet)
     }
 
     @Transactional