merge: (#204) 지점 + 개인 일정 보기 변경사항

simtong-application/src/main/kotlin/team/comit/simtong/domain/schedule/dto/QueryIndividualSpotScheduleResponse.kt

@@ -1,5 +1,6 @@
 package team.comit.simtong.domain.schedule.dto
 
+import team.comit.simtong.domain.schedule.model.Scope
 import java.time.LocalDate
 import java.util.UUID
 
@@ -30,5 +31,7 @@ data class ScheduleResponse(
 
     val endAt: LocalDate,
 
-    val title: String
+    val title: String,
+
+    val scope: Scope
 )

simtong-application/src/main/kotlin/team/comit/simtong/domain/schedule/usecase/QueryIndividualSpotScheduleUseCase.kt

@@ -34,18 +34,19 @@ class QueryIndividualSpotScheduleUseCase(
         )
 
         val ownSpotSchedules = querySchedulePort.querySchedulesByMonthAndSpotIdAndScope(
-            date, user.spotId, Scope.INDIVIDUAL
+            date, user.spotId, Scope.ENTIRE
         )
 
-        val schedules = ownSpotSchedules.union(individualSchedules) // 개인 일정과 소속 지점 일정 합치면서 중복 제거
+        val schedules = (ownSpotSchedules + individualSchedules) // 개인 일정과 소속 지점 일정 합치기
             .sortedBy { it.startAt } // 시작일 기준 오름차순으로 정렬
 
         val response = schedules.map {
             ScheduleResponse(
                 id = it.id,
                 startAt = it.startAt,
                 endAt = it.endAt,
-                title = it.title
+                title = it.title,
+                scope = it.scope
             )
         }
 

simtong-application/src/test/kotlin/team/comit/simtong/domain/schedule/usecase/QueryIndividualSpotScheduleUseCaseTests.kt

@@ -18,7 +18,7 @@ import team.comit.simtong.domain.user.model.Authority
 import team.comit.simtong.domain.user.model.User
 import team.comit.simtong.global.annotation.SimtongTest
 import java.time.LocalDate
-import java.util.*
+import java.util.UUID
 
 @SimtongTest
 class QueryIndividualSpotScheduleUseCaseTests {
@@ -36,6 +36,10 @@ class QueryIndividualSpotScheduleUseCaseTests {
 
     private val date: LocalDate = LocalDate.now()
 
+    private val minDate: LocalDate = LocalDate.MIN
+
+    private val maxDate: LocalDate = LocalDate.MAX
+
     private val userId: UUID = UUID.randomUUID()
 
     private val spotId: UUID = UUID.randomUUID()
@@ -57,15 +61,28 @@ class QueryIndividualSpotScheduleUseCaseTests {
         )
     }
 
-    private val scheduleStub: Schedule by lazy {
+    private val individualScheduleStub: Schedule by lazy {
         Schedule(
             id = scheduleId,
             userId = userId,
             spotId = spotId,
             title = "test title",
             scope = Scope.INDIVIDUAL,
-            startAt = date,
-            endAt = date,
+            startAt = minDate,
+            endAt = minDate,
+            alarmTime = Schedule.DEFAULT_ALARM_TIME
+        )
+    }
+
+    private val entireScheduleStub: Schedule by lazy {
+        Schedule(
+            id = scheduleId,
+            userId = userId,
+            spotId = spotId,
+            title = "test title",
+            scope = Scope.ENTIRE,
+            startAt = maxDate,
+            endAt = maxDate,
             alarmTime = Schedule.DEFAULT_ALARM_TIME
         )
     }
@@ -75,9 +92,17 @@ class QueryIndividualSpotScheduleUseCaseTests {
             listOf(
                 ScheduleResponse(
                     id = scheduleId,
-                    startAt = date,
-                    endAt = date,
-                    title = "test title"
+                    startAt = minDate,
+                    endAt = minDate,
+                    title = "test title",
+                    scope = Scope.INDIVIDUAL
+                ),
+                ScheduleResponse(
+                    id = scheduleId,
+                    startAt = maxDate,
+                    endAt = maxDate,
+                    title = "test title",
+                    Scope.ENTIRE
                 )
             )
         )
@@ -101,12 +126,12 @@ class QueryIndividualSpotScheduleUseCaseTests {
 
         given(querySchedulePort.querySchedulesByMonthAndUserIdAndScope(date, userStub.id, Scope.INDIVIDUAL))
             .willReturn(
-                listOf(scheduleStub)
+                listOf(individualScheduleStub)
             )
 
-        given(querySchedulePort.querySchedulesByMonthAndSpotIdAndScope(date, userStub.spotId, Scope.INDIVIDUAL))
+        given(querySchedulePort.querySchedulesByMonthAndSpotIdAndScope(date, userStub.spotId, Scope.ENTIRE))
             .willReturn(
-                listOf(scheduleStub)
+                listOf(entireScheduleStub)
             )
 
         // when