수정

HappyScrolls · Dec 1, 2024 · 901f54f · 901f54f
1 parent 7053b95
commit 901f54f
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 37 deletions.
diff --git a/...main/kotlin/com/yedongsoon/example_project/application/schedule/ScheduleCommandService.kt b/...main/kotlin/com/yedongsoon/example_project/application/schedule/ScheduleCommandService.kt
@@ -64,9 +64,13 @@ class ScheduleCommandService(
 
     fun modifySchedule(command: ScheduleModifyCommand) {
         scheduleRepository.findByIdOrNull(command.scheduleNo)?.let {
+            val partnerNo = coupleQueryService.getLover(command.accountNo).no
+            if (scheduleRepository.existsByDuplicateSchedule(command.scheduleStartAt, command.scheduleEndAt, command.accountNo, partnerNo)) {
+                throw ScheduleDuplicatedException("시간대에 겹치는 일정이 존재합니다")
+            }
             it.updateSchedule(command)
             scheduleRepository.save(it)
         } ?: throw ScheduleNotFoundException("존재하지 않습니다")
         //TODO: 수정 요청 상태 변경
     }
-}
+}
diff --git a/src/main/kotlin/com/yedongsoon/example_project/domain/schedule/Schedule.kt b/src/main/kotlin/com/yedongsoon/example_project/domain/schedule/Schedule.kt
@@ -77,7 +77,7 @@ class Schedule(
         this.scheduleStartAt = command.scheduleStartAt
         this.scheduleEndAt = command.scheduleEndAt
         this.isCommon = command.isCommon
-        this.scheduleAt = command.scheduleAt
+        this.scheduleAt = command.scheduleStartAt.toLocalDate()
     }
 
     companion object {
@@ -92,7 +92,7 @@ class Schedule(
                 scheduleStartAt = command.scheduleStartAt,
                 scheduleEndAt = command.scheduleEndAt,
                 isCommon = command.isCommon,
-                scheduleAt = command.scheduleAt
+                scheduleAt = command.scheduleStartAt.toLocalDate()
         )
     }
-}
+}
diff --git a/src/main/kotlin/com/yedongsoon/example_project/domain/schedule/ScheduleModifyRequest.kt b/src/main/kotlin/com/yedongsoon/example_project/domain/schedule/ScheduleModifyRequest.kt
@@ -73,7 +73,7 @@ class ScheduleModifyRequest(
                 scheduleStartAt = command.scheduleStartAt,
                 scheduleEndAt = command.scheduleEndAt,
                 isCommon = command.isCommon,
-                scheduleAt = command.scheduleAt
+                scheduleAt = command.scheduleStartAt.toLocalDate()
         )
     }
 }
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
@@ -11,4 +11,4 @@ interface ScheduleRepository : JpaRepository<Schedule, Int>, ScheduleRepositoryC
     // 일정 상세 조회
     fun findByAccountNoAndScheduleNo(accountNo: Int, scheduleNo: Int): Schedule
 
-}
+}
diff --git a/...main/kotlin/com/yedongsoon/example_project/domain/schedule/model/ScheduleCreateCommand.kt b/...main/kotlin/com/yedongsoon/example_project/domain/schedule/model/ScheduleCreateCommand.kt
@@ -1,6 +1,5 @@
 package com.yedongsoon.example_project.domain.schedule.model
 
-import java.time.LocalDate
 import java.time.LocalDateTime
 
 data class ScheduleCreateCommand(
@@ -13,5 +12,4 @@ data class ScheduleCreateCommand(
         val scheduleStartAt: LocalDateTime,
         val scheduleEndAt: LocalDateTime,
         val isCommon: Boolean,
-        val scheduleAt: LocalDate,
 )
diff --git a/...main/kotlin/com/yedongsoon/example_project/domain/schedule/model/ScheduleModifyCommand.kt b/...main/kotlin/com/yedongsoon/example_project/domain/schedule/model/ScheduleModifyCommand.kt
@@ -1,6 +1,5 @@
 package com.yedongsoon.example_project.domain.schedule.model
 
-import java.time.LocalDate
 import java.time.LocalDateTime
 
 data class ScheduleModifyCommand(
@@ -15,5 +14,4 @@ data class ScheduleModifyCommand(
         val scheduleStartAt: LocalDateTime,
         val scheduleEndAt: LocalDateTime,
         val isCommon: Boolean,
-        val scheduleAt: LocalDate,
-)
+)
diff --git a/...om/yedongsoon/example_project/domain/schedule/model/ScheduleModifyRequestCreateCommand.kt b/...om/yedongsoon/example_project/domain/schedule/model/ScheduleModifyRequestCreateCommand.kt
@@ -1,6 +1,5 @@
 package com.yedongsoon.example_project.domain.schedule.model
 
-import java.time.LocalDate
 import java.time.LocalDateTime
 
 data class ScheduleModifyRequestCreateCommand(
@@ -14,5 +13,4 @@ data class ScheduleModifyRequestCreateCommand(
         val scheduleStartAt: LocalDateTime,
         val scheduleEndAt: LocalDateTime,
         val isCommon: Boolean,
-        val scheduleAt: LocalDate,
-)
+)
diff --git a/...kotlin/com/yedongsoon/example_project/presentation/handler/model/ScheduleCreateRequest.kt b/...kotlin/com/yedongsoon/example_project/presentation/handler/model/ScheduleCreateRequest.kt
@@ -1,7 +1,6 @@
 package com.yedongsoon.example_project.presentation.handler.model
 
 import com.yedongsoon.example_project.domain.schedule.model.ScheduleCreateCommand
-import java.time.LocalDate
 import java.time.LocalDateTime
 
 data class ScheduleCreateRequest(
@@ -13,7 +12,6 @@ data class ScheduleCreateRequest(
         val scheduleStartAt: LocalDateTime,
         val scheduleEndAt: LocalDateTime,
         val isCommon: Boolean,
-        val scheduleAt: LocalDate
 ) {
     // 입력값 -> command
     fun toCommand(no: Int) = ScheduleCreateCommand(
@@ -26,7 +24,5 @@ data class ScheduleCreateRequest(
             scheduleStartAt = scheduleStartAt,
             scheduleEndAt = scheduleEndAt,
             isCommon = isCommon,
-            scheduleAt = scheduleAt
     )
 }
-
diff --git a/...kotlin/com/yedongsoon/example_project/presentation/handler/model/ScheduleModifyRequest.kt b/...kotlin/com/yedongsoon/example_project/presentation/handler/model/ScheduleModifyRequest.kt
@@ -1,7 +1,6 @@
 package com.yedongsoon.example_project.presentation.handler.model
 
 import com.yedongsoon.example_project.domain.schedule.model.ScheduleModifyCommand
-import java.time.LocalDate
 import java.time.LocalDateTime
 
 data class ScheduleModifyRequest(
@@ -21,8 +20,6 @@ data class ScheduleModifyRequest(
         val scheduleEndAt: LocalDateTime,
 
         val isCommon: Boolean,
-
-        val scheduleAt: LocalDate
 ) {
     fun toCommand(scheduleNo: Int, accountNo: Int) = ScheduleModifyCommand(
             accountNo = accountNo,
@@ -36,6 +33,5 @@ data class ScheduleModifyRequest(
             scheduleStartAt = scheduleStartAt,
             scheduleEndAt = scheduleEndAt,
             isCommon = isCommon,
-            scheduleAt = scheduleAt
     )
 }
diff --git a/...m/yedongsoon/example_project/presentation/handler/model/ScheduleModifyRequestCreateDto.kt b/...m/yedongsoon/example_project/presentation/handler/model/ScheduleModifyRequestCreateDto.kt
@@ -1,7 +1,6 @@
 package com.yedongsoon.example_project.presentation.handler.model
 
 import com.yedongsoon.example_project.domain.schedule.model.ScheduleModifyRequestCreateCommand
-import java.time.LocalDate
 import java.time.LocalDateTime
 
 data class ScheduleModifyRequestCreateDto(
@@ -14,19 +13,17 @@ data class ScheduleModifyRequestCreateDto(
         val scheduleStartAt: LocalDateTime,
         val scheduleEndAt: LocalDateTime,
         val isCommon: Boolean,
-        val scheduleAt: LocalDate,
 ) {
-        fun toCommand(no: Int) = ScheduleModifyRequestCreateCommand(
-                scheduleNo = scheduleNo,
-                requestAccountNo = no,
-                busyLevel = busyLevel,
-                scheduleName = scheduleName,
-                scheduleLocation = scheduleLocation,
-                scheduleWith = scheduleWith,
-                groupGenderType = groupGenderType,
-                scheduleStartAt = scheduleStartAt,
-                scheduleEndAt = scheduleEndAt,
-                isCommon = isCommon,
-                scheduleAt = scheduleAt,
-        )
+    fun toCommand(no: Int) = ScheduleModifyRequestCreateCommand(
+            scheduleNo = scheduleNo,
+            requestAccountNo = no,
+            busyLevel = busyLevel,
+            scheduleName = scheduleName,
+            scheduleLocation = scheduleLocation,
+            scheduleWith = scheduleWith,
+            groupGenderType = groupGenderType,
+            scheduleStartAt = scheduleStartAt,
+            scheduleEndAt = scheduleEndAt,
+            isCommon = isCommon,
+    )
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         // 일정 상세 조회
         fun findByAccountNoAndScheduleNo(accountNo: Int, scheduleNo: Int): Schedule
-    }
+    }