chore(school): remove duplication in areEventsInTimeTableOverlapping …

…in AlterationPolicy
IntelligentBackpack · Jul 9, 2023 · c9db27d · c9db27d
1 parent 6c93d49
commit c9db27d
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/policy/AlterationPolicy.kt b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/policy/AlterationPolicy.kt
@@ -106,24 +106,28 @@ object AlterationPolicy {
             }
         return when (newLesson) {
             is WeekLesson ->
-                allLesson
-                    .filter { lesson ->
-                        isNewLessonOverlapping(newLesson, lesson)
-                    }.any {
-                        isOverlappingTime(it, newLesson)
-                    }
+                checkOverlapping(newLesson, allLesson) {
+                    isNewLessonOverlapping(newLesson, it)
+                }
 
             is DateLesson ->
-                allLesson.filter { lesson ->
-                    isNewLessonOverlapping(newLesson, lesson)
-                }.any {
-                    isOverlappingTime(it, newLesson)
+                checkOverlapping(newLesson, allLesson) {
+                    isNewLessonOverlapping(newLesson, it)
                 }
 
             else -> true
         }
     }
 
+    private fun checkOverlapping(
+        newLesson: CalendarEvent,
+        allLesson: List<CalendarEvent>,
+        filter: (CalendarEvent) -> Boolean,
+    ) =
+        allLesson.filter(filter).any {
+            isOverlappingTime(it, newLesson)
+        }
+
     /**
      * Checks if the event in the interval is already cancelled or rescheduled.
      *