From bec10dd4e629105de3e8d744ab80b4367b4fc0b2 Mon Sep 17 00:00:00 2001 From: soohyeon Date: Thu, 31 Oct 2024 22:50:24 +0900 Subject: [PATCH] modify :: logic --- .../service/ChangeClassroomStatusService.kt | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/kotlin/dsm/pick2024/domain/classroom/service/ChangeClassroomStatusService.kt b/src/main/kotlin/dsm/pick2024/domain/classroom/service/ChangeClassroomStatusService.kt index e0ffa651..706aa925 100644 --- a/src/main/kotlin/dsm/pick2024/domain/classroom/service/ChangeClassroomStatusService.kt +++ b/src/main/kotlin/dsm/pick2024/domain/classroom/service/ChangeClassroomStatusService.kt @@ -36,33 +36,33 @@ class ChangeClassroomStatusService( deleteClassRoomPort.deleteByUserId(classroom.userId) } eventPublisher.publishEvent(ChangeStatusRequest(this, request.idList)) - } + } else { + val update = mutableListOf() + val updateAttendanceList = mutableListOf() - val update = mutableListOf() - val updateAttendanceList = mutableListOf() + request.idList.forEach { id -> + val classroom = queryClassroomPort.findByUserId(id) ?: throw ClassroomNotFoundException - request.idList.forEach { id -> - val classroom = queryClassroomPort.findByUserId(id) ?: throw ClassroomNotFoundException + val updatedClassroom = classroom.copy(status = OK) + update.add(updatedClassroom) - val updatedClassroom = classroom.copy(status = OK) - update.add(updatedClassroom) + val updatedAttendance = queryAttendancePort.findByUserId(classroom.userId)?.run { + copy( + period6 = getStatus(classroom, period6, 6), + period7 = getStatus(classroom, period7, 7), + period8 = getStatus(classroom, period8, 8), + period9 = getStatus(classroom, period9, 9), + period10 = getStatus(classroom, period10, 10) + ) + } ?: throw UserNotFoundException - val updatedAttendance = queryAttendancePort.findByUserId(classroom.userId)?.run { - copy( - period6 = getStatus(classroom, period6, 6), - period7 = getStatus(classroom, period7, 7), - period8 = getStatus(classroom, period8, 8), - period9 = getStatus(classroom, period9, 9), - period10 = getStatus(classroom, period10, 10) - ) - } ?: throw UserNotFoundException + updateAttendanceList.add(updatedAttendance) + } - updateAttendanceList.add(updatedAttendance) + saveClassRoomPort.saveAll(update) + saveAttendancePort.saveAll(updateAttendanceList) + eventPublisher.publishEvent(ChangeStatusRequest(this, updateAttendanceList.map { it.userId })) } - - saveClassRoomPort.saveAll(update) - saveAttendancePort.saveAll(updateAttendanceList) - eventPublisher.publishEvent(ChangeStatusRequest(this, updateAttendanceList.map { it.userId })) } private fun getStatus(