add: added response dto

mash-up-kr · Sep 2, 2024 · 38f58ae · 38f58ae
1 parent 2703f26
commit 38f58ae
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 23 deletions.
diff --git a/piikii-application/src/main/kotlin/com/piikii/application/domain/schedule/ScheduleService.kt b/piikii-application/src/main/kotlin/com/piikii/application/domain/schedule/ScheduleService.kt
@@ -19,13 +19,13 @@ class ScheduleService(
     override fun registerSchedules(
         roomUid: UuidTypeId,
         request: RegisterSchedulesRequest,
-    ) {
+    ): SchedulesResponse {
         val schedulesToRegister = request.toDomains(roomUid)
         deleteSchedules(roomUid, schedulesToRegister)
-        schedulesToRegister.partition { it.id.getValue() == 0L }.let { (newSchedules, updatedSchedules) ->
-            scheduleCommandPort.saveSchedules(newSchedules)
-            scheduleCommandPort.updateSchedules(updatedSchedules)
-        }
+        val (newSchedules, changedSchedules) = schedulesToRegister.partition { it.id.getValue() == 0L }
+        val savedSchedules = scheduleCommandPort.saveSchedules(newSchedules)
+        val updatedSchedules = scheduleCommandPort.updateSchedules(changedSchedules)
+        return SchedulesResponse.from(savedSchedules + updatedSchedules)
     }
 
     override fun getSchedules(roomUid: UuidTypeId): SchedulesResponse {

diff --git a/piikii-application/src/main/kotlin/com/piikii/application/port/input/ScheduleUseCase.kt b/piikii-application/src/main/kotlin/com/piikii/application/port/input/ScheduleUseCase.kt
@@ -8,7 +8,7 @@ interface ScheduleUseCase {
     fun registerSchedules(
         roomUid: UuidTypeId,
         request: RegisterSchedulesRequest,
-    )
+    ): SchedulesResponse
 
     fun getSchedules(roomUid: UuidTypeId): SchedulesResponse
 }
diff --git a/...cation/src/main/kotlin/com/piikii/application/port/input/dto/response/ScheduleResponse.kt b/...cation/src/main/kotlin/com/piikii/application/port/input/dto/response/ScheduleResponse.kt
@@ -14,7 +14,7 @@ data class SchedulesResponse(
     companion object {
         fun from(schedules: List<Schedule>): SchedulesResponse {
             return SchedulesResponse(
-                schedules.map { ScheduleResponse.from(it) },
+                schedules.map { ScheduleResponse.from(it) }.sortedBy { it.sequence },
             )
         }
     }

diff --git a/...pplication/src/main/kotlin/com/piikii/application/port/output/persistence/SchedulePort.kt b/...pplication/src/main/kotlin/com/piikii/application/port/output/persistence/SchedulePort.kt
@@ -13,9 +13,9 @@ interface ScheduleQueryPort {
 }
 
 interface ScheduleCommandPort {
-    fun saveSchedules(schedules: List<Schedule>)
+    fun saveSchedules(schedules: List<Schedule>): List<Schedule>
 
     fun deleteSchedules(scheduleIds: List<LongTypeId>)
 
-    fun updateSchedules(schedules: List<Schedule>)
+    fun updateSchedules(schedules: List<Schedule>): List<Schedule>
 }
diff --git a/piikii-input-http/src/main/kotlin/com/piikii/input/http/controller/ScheduleApi.kt b/piikii-input-http/src/main/kotlin/com/piikii/input/http/controller/ScheduleApi.kt
@@ -30,9 +30,10 @@ class ScheduleApi(
     override fun registerSchedules(
         @NotNull @PathVariable roomUid: UUID,
         @Valid @NotNull @RequestBody request: RegisterSchedulesRequest,
-    ): ResponseForm<Unit> {
-        scheduleUseCase.registerSchedules(UuidTypeId(roomUid), request)
-        return ResponseForm.EMPTY_RESPONSE
+    ): ResponseForm<SchedulesResponse> {
+        return ResponseForm(
+            data = scheduleUseCase.registerSchedules(UuidTypeId(roomUid), request),
+        )
     }
 
     @ResponseStatus(HttpStatus.OK)

diff --git a/piikii-input-http/src/main/kotlin/com/piikii/input/http/controller/docs/ScheduleApiDocs.kt b/piikii-input-http/src/main/kotlin/com/piikii/input/http/controller/docs/ScheduleApiDocs.kt
@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.Parameter
 import io.swagger.v3.oas.annotations.enums.ParameterIn
 import io.swagger.v3.oas.annotations.media.Content
 import io.swagger.v3.oas.annotations.media.Schema
+import io.swagger.v3.oas.annotations.parameters.RequestBody
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.responses.ApiResponses
 import io.swagger.v3.oas.annotations.tags.Tag
@@ -25,7 +26,7 @@ interface ScheduleApiDocs {
             ApiResponse(
                 responseCode = "200",
                 description = "OK success",
-                content = [Content(schema = Schema(implementation = ResponseForm::class))],
+                content = [Content(schema = Schema(implementation = SuccessSchedulesResponse::class))],
             ),
         ],
     )
@@ -44,9 +45,9 @@ interface ScheduleApiDocs {
         )
         @Valid
         @NotNull
-        @io.swagger.v3.oas.annotations.parameters.RequestBody
+        @RequestBody
         request: RegisterSchedulesRequest,
-    ): ResponseForm<Unit>
+    ): ResponseForm<SchedulesResponse>
 
     @Operation(summary = "스케줄 조회 API", description = "스케줄을 조회합니다.")
     @ApiResponses(

diff --git a/...resql/src/main/kotlin/com/piikii/output/persistence/postgresql/adapter/ScheduleAdapter.kt b/...resql/src/main/kotlin/com/piikii/output/persistence/postgresql/adapter/ScheduleAdapter.kt
@@ -21,10 +21,10 @@ class ScheduleAdapter(
     private val placeRepository: PlaceRepository,
 ) : ScheduleCommandPort, ScheduleQueryPort {
     @Transactional
-    override fun saveSchedules(schedules: List<Schedule>) {
-        scheduleRepository.saveAll(
+    override fun saveSchedules(schedules: List<Schedule>): List<Schedule> {
+        return scheduleRepository.saveAll(
             schedules.map { ScheduleEntity(it) },
-        )
+        ).map { it.toDomain() }
     }
 
     @Transactional
@@ -36,13 +36,11 @@ class ScheduleAdapter(
     }
 
     @Transactional
-    override fun updateSchedules(schedules: List<Schedule>) {
-        for (schedule in schedules) {
-            updateSchedule(schedule)
-        }
+    override fun updateSchedules(schedules: List<Schedule>): List<Schedule> {
+        return schedules.map { updateSchedule(it) }
     }
 
-    private fun updateSchedule(schedule: Schedule) {
+    private fun updateSchedule(schedule: Schedule): Schedule {
         val scheduleId =
             requireNotNull(schedule.id) {
                 throw PiikiiException(
@@ -52,6 +50,7 @@ class ScheduleAdapter(
             }
         val scheduleEntity = findScheduleEntityById(scheduleId)
         scheduleEntity.update(schedule)
+        return scheduleEntity.toDomain()
     }
 
     override fun findAllByRoomUid(roomUid: UuidTypeId): List<Schedule> {