♻️ :: 일정 삭제 오류메시지 미전송 에러 수정

Author: jaemin05

src/main/kotlin/app/xqaure/schedule/application/schedule/ScheduleUsecase.kt

@@ -3,7 +3,6 @@ package app.xqaure.schedule.application.schedule
 import app.xqaure.schedule.application.schedule.exceptions.ScheduleNotFoundException
 import app.xqaure.schedule.domain.schedule.Schedule
 import app.xqaure.schedule.domain.schedule.ScheduleRepository
-import app.xqaure.schedule.global.error.ErrorCode
 import app.xqaure.schedule.presentation.dto.BasicResponse
 import app.xqaure.schedule.presentation.dto.ResponseCreator
 import kotlinx.coroutines.reactor.awaitSingleOrNull
@@ -54,18 +53,12 @@ class ScheduleUsecase(
 
     @Transactional(isolation = Isolation.READ_COMMITTED)
     suspend fun deleteSchedule(uuid: String, userId: String): BasicResponse {
-        runCatching {
-            scheduleRepository.findScheduleByIdAndUserId(uuid, userId)
-                .flatMap {
-                    scheduleRepository.deleteById(uuid)
-                }.awaitSingleOrNull() ?: throw ScheduleNotFoundException()
-        }.onFailure {
-            return responseCreator.onSuccess(
-                code = DELETE_SCHEDULE_CODE,
-                propertyName = DELETE_SCHEDULE_CODE,
-                uuid
-            )
-        }
+        val schedule = scheduleRepository.findScheduleByIdAndUserId(uuid, userId)
+            .awaitSingleOrNull() ?: throw ScheduleNotFoundException()
+
+        scheduleRepository.delete(schedule)
+            .awaitSingleOrNull()
+
         return responseCreator.onSuccess(
             code = DELETE_SCHEDULE_CODE,
             propertyName = DELETE_SCHEDULE_CODE,

src/main/kotlin/app/xqaure/schedule/application/school/SchoolScheduleUsecase.kt

@@ -10,7 +10,6 @@ import app.xqaure.schedule.presentation.dto.ResponseCreator
 import app.xqaure.schedule.presentation.schedule.dto.QueryScheduleListResponse
 import app.xqaure.schedule.presentation.schedule.dto.ScheduleElement
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.reactive.awaitSingle
 import kotlinx.coroutines.reactor.awaitSingleOrNull
 import kotlinx.coroutines.withContext
 import org.springframework.stereotype.Service
@@ -63,10 +62,11 @@ class SchoolScheduleUsecase(
 
     @Transactional(isolation = Isolation.READ_COMMITTED)
     suspend fun deleteSchoolSchedule(uuid: String): BasicResponse {
-        schoolScheduleRepository.findById(uuid)
-            .flatMap {
-                schoolScheduleRepository.deleteById(uuid)
-            }.awaitSingle() ?: throw ScheduleNotFoundException()
+        val schoolSchedule = schoolScheduleRepository.findById(uuid)
+            .awaitSingleOrNull() ?: throw ScheduleNotFoundException()
+
+        schoolScheduleRepository.delete(schoolSchedule)
+            .awaitSingleOrNull()
 
         return responseCreator.onSuccess(
             code = DELETE_SCHEDULE_CODE,

src/main/kotlin/app/xqaure/schedule/presentation/dto/Response.kt

@@ -1,6 +1,5 @@
 package app.xqaure.schedule.presentation.dto
 
-import app.xqaure.schedule.global.error.ErrorResponse
 import org.springframework.context.MessageSource
 import org.springframework.context.i18n.LocaleContextHolder
 import org.springframework.stereotype.Component
@@ -19,17 +18,6 @@ class ResponseCreator(
             message = messageSource.getMessage(propertyName, args, LocaleContextHolder.getLocale())
         )
     }
-
-    fun onError(
-        code: Int,
-        propertyName: String,
-        vararg args: Any?
-    ): ErrorResponse {
-        return ErrorResponse(
-            responseStatus = code,
-            errorMessage = messageSource.getMessage(propertyName, args, LocaleContextHolder.getLocale())
-        )
-    }
 }
 
 data class BasicResponse(