refactor: (#492) 자습실 수정 web request 분리

dms-presentation/src/main/kotlin/team/aliens/dms/domain/studyroom/StudyRoomWebAdapter.kt

@@ -33,6 +33,10 @@ import team.aliens.dms.domain.studyroom.dto.StudentQueryStudyRoomResponse
 import team.aliens.dms.domain.studyroom.dto.StudentQueryStudyRoomsResponse
 import team.aliens.dms.domain.studyroom.dto.UpdateAvailableTimeWebRequest
 import team.aliens.dms.domain.studyroom.dto.UpdateStudyRoomRequest
+import team.aliens.dms.domain.studyroom.dto.UpdateStudyRoomSeatsRequest
+import team.aliens.dms.domain.studyroom.dto.UpdateStudyRoomSeatsWebRequest
+import team.aliens.dms.domain.studyroom.dto.UpdateStudyRoomTimeSlotRequest
+import team.aliens.dms.domain.studyroom.dto.UpdateStudyRoomTimeSlotWebRequest
 import team.aliens.dms.domain.studyroom.dto.UpdateStudyRoomWebRequest
 import team.aliens.dms.domain.studyroom.dto.UpdateTimeSlotWebRequest
 import team.aliens.dms.domain.studyroom.usecase.ApplySeatUseCase
@@ -53,6 +57,8 @@ import team.aliens.dms.domain.studyroom.usecase.StudentQueryStudyRoomUseCase
 import team.aliens.dms.domain.studyroom.usecase.StudentQueryStudyRoomsUseCase
 import team.aliens.dms.domain.studyroom.usecase.UnApplySeatUseCase
 import team.aliens.dms.domain.studyroom.usecase.UpdateAvailableTimeUseCase
+import team.aliens.dms.domain.studyroom.usecase.UpdateStudyRoomSeatsUseCase
+import team.aliens.dms.domain.studyroom.usecase.UpdateStudyRoomTimeSlotUseCase
 import team.aliens.dms.domain.studyroom.usecase.UpdateStudyRoomUseCase
 import team.aliens.dms.domain.studyroom.usecase.UpdateTimeSlotUseCase
 import java.util.UUID
@@ -83,7 +89,9 @@ class StudyRoomWebAdapter(
     private val queryTimeSlotsUseCase: QueryTimeSlotsUseCase,
     private val createTimeSlotUseCase: CreateTimeSlotUseCase,
     private val updateTimeSlotUseCase: UpdateTimeSlotUseCase,
-    private val removeTimeSlotUseCase: RemoveTimeSlotUseCase
+    private val removeTimeSlotUseCase: RemoveTimeSlotUseCase,
+    private val updateStudyRoomSeatsUseCase: UpdateStudyRoomSeatsUseCase,
+    private val updateStudyRoomTimeSlotUseCase: UpdateStudyRoomTimeSlotUseCase
 ) {
 
     @GetMapping("/available-time")
@@ -187,22 +195,46 @@ class StudyRoomWebAdapter(
                     southDescription = southDescription,
                     northDescription = northDescription,
                     availableSex = availableSex.name,
-                    availableGrade = availableGrade,
-                    timeSlotIds = timeSlotIds,
-                    seats = seats.map {
-                        UpdateStudyRoomRequest.SeatRequest(
-                            widthLocation = it.widthLocation,
-                            heightLocation = it.heightLocation,
-                            number = it.number,
-                            typeId = it.typeId,
-                            status = it.status.name
-                        )
-                    }
+                    availableGrade = availableGrade
                 )
             }
         )
     }
 
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    @PatchMapping("/{study-room-id}/seats")
+    fun updateStudyRoomSeats(
+        @PathVariable("study-room-id") @NotNull studyRoomId: UUID,
+        @RequestBody @Valid webRequest: UpdateStudyRoomSeatsWebRequest
+    ) {
+        updateStudyRoomSeatsUseCase.execute(
+            request = UpdateStudyRoomSeatsRequest(
+                webRequest.seats.map {
+                    UpdateStudyRoomSeatsRequest.SeatRequest(
+                        widthLocation = it.widthLocation,
+                        heightLocation = it.heightLocation,
+                        number = it.number,
+                        typeId = it.typeId,
+                        status = it.status.name
+                    )
+                }
+            ),
+            studyRoomId = studyRoomId
+        )
+    }
+
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    @PatchMapping("/{study-room-id}/time-slot")
+    fun updateStudyRoomTimeSlot(
+        @PathVariable("study-room-id") @NotNull studyRoomId: UUID,
+        @RequestBody @Valid webRequest: UpdateStudyRoomTimeSlotWebRequest
+    ) {
+        updateStudyRoomTimeSlotUseCase.execute(
+            request = UpdateStudyRoomTimeSlotRequest(webRequest.timeSlotIds),
+            studyRoomId = studyRoomId
+        )
+    }
+
     @GetMapping("/{study-room-id}/students")
     fun studentGetStudyRoom(
         @PathVariable("study-room-id") @NotNull studyRoomId: UUID,

dms-presentation/src/main/kotlin/team/aliens/dms/domain/studyroom/dto/UpdateStudyRoomSeatsWebRequest.kt

@@ -0,0 +1,28 @@
+package team.aliens.dms.domain.studyroom.dto
+
+import java.util.UUID
+import javax.validation.Valid
+import javax.validation.constraints.Min
+import javax.validation.constraints.NotNull
+
+data class UpdateStudyRoomSeatsWebRequest(
+    @field:Valid
+    val seats: List<SeatWebRequest>
+) {
+    data class SeatWebRequest(
+        @field:NotNull
+        @field:Min(0)
+        val widthLocation: Int,
+
+        @field:NotNull
+        @field:Min(0)
+        val heightLocation: Int,
+
+        val number: Int?,
+
+        val typeId: UUID?,
+
+        @field:NotNull
+        val status: WebSeatStatus
+    )
+}

dms-presentation/src/main/kotlin/team/aliens/dms/domain/studyroom/dto/UpdateStudyRoomTimeSlotWebRequest.kt

@@ -0,0 +1,7 @@
+package team.aliens.dms.domain.studyroom.dto
+
+import java.util.UUID
+
+data class UpdateStudyRoomTimeSlotWebRequest(
+    val timeSlotIds: List<UUID>
+)

dms-presentation/src/main/kotlin/team/aliens/dms/domain/studyroom/dto/UpdateStudyRoomWebRequest.kt

@@ -1,8 +1,5 @@
 package team.aliens.dms.domain.studyroom.dto
 
-import team.aliens.dms.common.validator.NotNullElements
-import java.util.UUID
-import javax.validation.Valid
 import javax.validation.constraints.Min
 import javax.validation.constraints.NotBlank
 import javax.validation.constraints.NotNull
@@ -47,33 +44,6 @@ data class UpdateStudyRoomWebRequest(
 
     @field:NotNull
     @field:Min(0)
-    val availableGrade: Int,
+    val availableGrade: Int
 
-    @field:Size(min = 1)
-    @field:NotNullElements
-    val timeSlotIds: List<UUID>,
-
-    @field:Valid
-    val seats: List<SeatRequest>
-
-) {
-
-    data class SeatRequest(
-
-        @field:NotNull
-        @field:Min(0)
-        val widthLocation: Int,
-
-        @field:NotNull
-        @field:Min(0)
-        val heightLocation: Int,
-
-        val number: Int?,
-
-        val typeId: UUID?,
-
-        @field:NotNull
-        val status: WebSeatStatus
-
-    )
-}
+)