[DPMBE-131] 종료된 약속이 같이 조회되는 것을 검증한다 (#222)

* feat : 종료 약속과 예정 약속의 분리 * test : marked as conflict
depromeet · Jul 20, 2023 · 97fff30 · 97fff30
1 parent bf9916e
commit 97fff30
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/api/promise/usecase/PromiseReadUseCase.kt b/Whatnow-Api/src/main/kotlin/com/depromeet/whatnow/api/promise/usecase/PromiseReadUseCase.kt
@@ -50,10 +50,9 @@ class PromiseReadUseCase(
 
             when (promise?.promiseType) {
                 PromiseType.BEFORE, PromiseType.END -> {
-                    val promiseType = promise.promiseType
                     val promiseFindDto = PromiseFindDto.of(promise, participant)
 
-                    promiseSplitByPromiseTypeDto.getOrPut(promiseType) { mutableListOf() }
+                    promiseSplitByPromiseTypeDto.getOrPut(promise.promiseType) { mutableListOf() }
                         .add(promiseFindDto)
                 }
 
@@ -104,7 +103,7 @@ class PromiseReadUseCase(
         val userId: Long = SecurityUtils.currentUserId
         val promiseUsersByPromiseId = promiseUserAdaptor.findByUserId(userId)
         val promiseIds = promiseUsersByPromiseId.map { it.promiseId }
-        val promises = promiseAdaptor.queryPromises(promiseIds)
+        val promises = promiseAdaptor.queryPromises(promiseIds).filter { it.promiseType == promiseType }
         val uniqueUsers = promiseUsersByPromiseId.distinctBy { it.userId }
         val users = userAdapter.queryUsers(uniqueUsers.map { it.userId })
         val result = mutableListOf<PromiseDetailDto>()

diff --git a/...w-Api/src/test/kotlin/com/depromeet/whatnow/api/promise/usecase/PromiseReadUseCaseTest.kt b/...w-Api/src/test/kotlin/com/depromeet/whatnow/api/promise/usecase/PromiseReadUseCaseTest.kt
@@ -97,14 +97,25 @@ class PromiseReadUseCaseTest {
             ),
             Promise(
                 id = 2,
+                title = "Promise A",
+                endTime = promiseTime1,
+                mainUserId = 1L,
+                meetPlace = PlaceVo(
+                    CoordinateVo(352.1, 167.2),
+                    "서울시 강남구",
+                ),
+                promiseType = PromiseType.BEFORE,
+            ),
+            Promise(
+                id = 3,
                 title = "Promise 2",
                 endTime = promiseTime2,
                 mainUserId = 2L,
                 meetPlace = PlaceVo(
                     CoordinateVo(123.4, 234.2),
                     "전라북도 남원시",
                 ),
-                promiseType = PromiseType.DELETED,
+                promiseType = PromiseType.END,
             ),
         )
         val users = listOf(
@@ -152,10 +163,6 @@ class PromiseReadUseCaseTest {
         Assertions.assertEquals(promiseTime1, result[0].endTime)
         Assertions.assertEquals(1, result[1].promiseUsers.size)
 
-        Assertions.assertEquals("Promise 2", result[1].title)
-        Assertions.assertEquals(promiseTime2, result[1].endTime)
-        Assertions.assertEquals(1, result[0].promiseUsers.size)
-
         // 약속 1번
         Assertions.assertEquals(1234, result[0].promiseUsers[0].interactions[0].count)
         // 약속 2번