Merge branch 'develop'

DSM-PICK · Apr 28, 2024 · 958d2b3 · 958d2b3
2 parents 10060dd + 593a29e
commit 958d2b3
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/src/main/kotlin/dsm/pick2024/domain/selfstudy/service/SelfStudyTeacherService.kt b/src/main/kotlin/dsm/pick2024/domain/selfstudy/service/SelfStudyTeacherService.kt
@@ -17,23 +17,20 @@ class SelfStudyTeacherService(
     private val deleteByDatePort: DeleteByDatePort
 ) : SelfStudyTeacherUseCase {
     override fun registrationSelfStudyTeacher(request: RegistrationSelfStudyTeacherRequest) {
-        if (request.teacher.any { it.teacher.isNotBlank() }) {
-            val selfStudy = findByDatePort.findByDateList(request.date)
-            if (selfStudy.isNotEmpty()) deleteByDatePort.deleteByDate(request.date)
-            val teacherList =
-                request.teacher
-                    .filter { it.teacher.isNotBlank() }
-                    .mapNotNull { teacher ->
-                        val exist = selfStudy.find { it!!.floor == teacher.floor }
+        val selfStudy = findByDatePort.findByDateList(request.date)
+        if (selfStudy.isNotEmpty()) deleteByDatePort.deleteByDate(request.date)
+        val teacherList =
+            request.teacher
+                .filter { it.teacher.isNotBlank() }
+                .mapNotNull { teacher ->
+                    val exist = selfStudy.find { it!!.floor == teacher.floor }
+                    exist?.copy(teacher = teacher.teacher) ?: SelfStudy(
+                        floor = teacher.floor,
+                        teacher = teacher.teacher,
+                        date = request.date
+                    )
+                }
 
-                        exist?.copy(teacher = teacher.teacher) ?: SelfStudy(
-                            floor = teacher.floor,
-                            teacher = teacher.teacher,
-                            date = request.date
-                        )
-                    }
-
-            selfStudySaveAllPort.saveAll(teacherList)
-        }
+        selfStudySaveAllPort.saveAll(teacherList)
     }
 }