Merge pull request #17 from HappyScrolls/feature/#16_common_schedule

Feature/#16 common schedule
HappyScrolls · Sep 26, 2024 · c19a070 · c19a070
2 parents e40cc13 + 483be86
commit c19a070
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 8 deletions.
diff --git a/src/main/kotlin/com/yedongsoon/example_project/application/schedule/ScheduleQueryService.kt b/src/main/kotlin/com/yedongsoon/example_project/application/schedule/ScheduleQueryService.kt
@@ -12,8 +12,8 @@ class ScheduleQueryService(
 ) {
 
     // 특정 날짜 일정 조회
-    fun getScheduleByDate(accountNo: Int, searchDate: LocalDate): List<ScheduleDetailResponse> {
-        val schedules: List<Schedule> = scheduleRepository.findByAccountNoAndScheduleAt(accountNo, searchDate)
+    fun getCommonScheduleByDate(accountNo: Int, loverNo: Int, searchDate: LocalDate): List<ScheduleDetailResponse> {
+        val schedules: List<Schedule> = scheduleRepository.findByAccountNoInAndScheduleAtAndIsCommonIsTrue(listOf(accountNo, loverNo), searchDate)
 
         // 조회한 일정들 -> ScheduleDetailResponse
         return schedules.map { schedule -> ScheduleDetailResponse.from(schedule) }
@@ -22,7 +22,6 @@ class ScheduleQueryService(
     fun getScheduleByDateExceptCommon(accountNo: Int, searchDate: LocalDate): List<ScheduleDetailResponse> {
         val schedules: List<Schedule> = scheduleRepository.findByAccountNoAndScheduleAtAndIsCommonIsFalse(accountNo, searchDate)
 
-        // 조회한 일정들 -> ScheduleDetailResponse
         return schedules.map { schedule -> ScheduleDetailResponse.from(schedule) }
     }
 

diff --git a/src/main/kotlin/com/yedongsoon/example_project/domain/schedule/ScheduleRepository.kt b/src/main/kotlin/com/yedongsoon/example_project/domain/schedule/ScheduleRepository.kt
@@ -5,8 +5,8 @@ import java.time.LocalDate
 
 interface ScheduleRepository : JpaRepository<Schedule, Int> {
     // 특정 일정 조회
-    fun findByAccountNoAndScheduleAt(accountNo: Int, scheduleAt: LocalDate): List<Schedule>
     fun findByAccountNoAndScheduleAtAndIsCommonIsFalse(accountNo: Int, scheduleAt: LocalDate): List<Schedule>
+    fun findByAccountNoInAndScheduleAtAndIsCommonIsTrue(accountNos: List<Int>, scheduleAt: LocalDate): List<Schedule>
 
     // 일정 상세 조회
     fun findByAccountNoAndScheduleNo(accountNo: Int, scheduleNo: Int): Schedule

diff --git a/src/main/kotlin/com/yedongsoon/example_project/presentation/handler/ScheduleHandler.kt b/src/main/kotlin/com/yedongsoon/example_project/presentation/handler/ScheduleHandler.kt
@@ -35,7 +35,7 @@ class ScheduleHandler(
     suspend fun readSchedules(request: ServerRequest): ServerResponse = withContext(Dispatchers.IO) {
         val memberHeader = request.extractMemberCodeHeader()
         val searchDate = request.localDateQueryParam("searchDate")
-        val result = scheduleQueryService.getScheduleByDate(memberHeader.no, searchDate)
+        val result = scheduleQueryService.getScheduleByDateExceptCommon(memberHeader.no, searchDate)
         ServerResponse.ok().bodyValueAndAwait(result)
     }
 
@@ -60,6 +60,19 @@ class ScheduleHandler(
         ServerResponse.ok().bodyValueAndAwait(result)
     }
 
+    suspend fun getCommonSchedules(request: ServerRequest): ServerResponse = withContext(Dispatchers.IO) {
+        val memberHeader = request.extractRawMemberCodeHeader()
+        val memberInfo = request.extractMemberCodeHeader()
+
+        val couplePartnerResponse = coupleService.getCouplePartnerInfo(memberHeader)
+        val partnerNo = couplePartnerResponse.no
+        val searchDate = request.localDateQueryParam("searchDate")
+
+        val result = scheduleQueryService.getCommonScheduleByDate(memberInfo.no, partnerNo, searchDate)
+
+        ServerResponse.ok().bodyValueAndAwait(result)
+    }
+
     // 일정 삭제
     suspend fun deleteSchedule(request: ServerRequest): ServerResponse = withContext(Dispatchers.IO) {
         val scheduleNo = request.intPathVariable("scheduleNo")

diff --git a/...otlin/com/yedongsoon/example_project/presentation/handler/model/ScheduleDetailResponse.kt b/...otlin/com/yedongsoon/example_project/presentation/handler/model/ScheduleDetailResponse.kt
@@ -5,6 +5,7 @@ import java.time.LocalDateTime
 
 data class ScheduleDetailResponse(
         val scheduleNo: Int,
+        val accountNo: Int,
         val busyLevel: String,
         val scheduleName: String,
         val scheduleLocation: String,
@@ -18,6 +19,7 @@ data class ScheduleDetailResponse(
         // 특정 일정 조회 (엔티티 -> response)
         fun from(schedule: Schedule) = ScheduleDetailResponse(
                 scheduleNo = schedule.scheduleNo,
+                accountNo = schedule.accountNo,
                 busyLevel = schedule.busyLevel,
                 scheduleName = schedule.scheduleName,
                 scheduleLocation = schedule.scheduleLocation,

diff --git a/src/main/kotlin/com/yedongsoon/example_project/presentation/router/ScheduleRouter.kt b/src/main/kotlin/com/yedongsoon/example_project/presentation/router/ScheduleRouter.kt
@@ -25,6 +25,8 @@ class ScheduleRouter(private val scheduleHandler: ScheduleHandler) {
 
                 // (커플) 특정 날짜 일정 조회
                 GET("/couple", scheduleHandler::readCouplePartnerSchedules)
+
+                GET("/common", scheduleHandler::getCommonSchedules)
                 // 일정 삭제
                 DELETE("/{scheduleNo}", scheduleHandler::deleteSchedule)
                 PUT("/{scheduleNo}/status", scheduleHandler::changeStatus)

diff --git a/src/test/http/example.http b/src/test/http/example.http
@@ -31,7 +31,7 @@ Member-Code: eyJubyI6MiwibmFtZSI6Im5hbWUiLCJhY2NvdW50IjoiYWNjb3VudCJ9
 }
 
 ### 특정 날짜 일정 조회
-GET {{url}}/schedule?searchDate=2024-09-02
+GET {{url}}/schedule?searchDate=2024-09-26
 Content-Type: application/json
 Member-Code: eyJubyI6MiwibmFtZSI6Im5hbWUiLCJhY2NvdW50IjoiYWNjb3VudCJ9
 
@@ -42,7 +42,7 @@ Content-Type: application/json
 Member-Code: eyJubyI6MSwibmFtZSI6Im5hbWUiLCJhY2NvdW50IjoiYWNjb3VudCJ9
 
 ### (커플) 특정 날짜 일정 조회
-GET {{url}}/schedule/couple?searchDate=2024-09-02
+GET {{url}}/schedule/couple?searchDate=2024-09-26
 Content-Type: application/json
 Member-Code: eyJubyI6MSwibmFtZSI6Im5hbWUiLCJhY2NvdW50IjoiYWNjb3VudCJ9
 
@@ -52,4 +52,9 @@ Content-Type: application/json
 
 ### 일정 삭제
 PUT {{url}}/schedule/7/status?status=종료
-Content-Type: application/json
+Content-Type: application/json
+
+### 공통 일정
+GET {{url}}/schedule/common?searchDate=2024-09-26
+Content-Type: application/json
+Member-Code: eyJubyI6MSwibmFtZSI6Im5hbWUiLCJhY2NvdW50IjoiYWNjb3VudCJ9