From edfb6c59c9af508e70f93b461eb69f621b85b96b Mon Sep 17 00:00:00 2001 From: Andrea Brighi Date: Tue, 11 Jul 2023 14:53:40 +0200 Subject: [PATCH] fix(school): reverse all condition in checks --- .../com/intelligentbackpack/schooldomain/entities/Class.kt | 2 +- .../com/intelligentbackpack/schooldomain/entities/School.kt | 4 ++-- .../schooldomain/entities/calendar/CalendarEventFactory.kt | 6 +++--- .../schooldomain/entities/calendar/SchoolCalendarImpl.kt | 2 +- .../schooldomain/entities/implementation/SchoolImpl.kt | 6 +++--- .../schooldomain/entities/person/Professor.kt | 6 +++--- .../schooldomain/entities/person/Student.kt | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/Class.kt b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/Class.kt index 5ddb1197..c106a8de 100644 --- a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/Class.kt +++ b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/Class.kt @@ -45,7 +45,7 @@ interface Class { * @throws IllegalArgumentException if the name is blank */ fun create(name: String): Class { - check(name.isBlank()) { "name cannot be blank" } + check(name.isNotBlank()) { "name cannot be blank" } return ClassImpl(name) } } diff --git a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/School.kt b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/School.kt index cac9bb76..3d0152a7 100644 --- a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/School.kt +++ b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/School.kt @@ -61,8 +61,8 @@ interface School { * @throws IllegalArgumentException if the name or the city is blank */ fun create(name: String, city: String): School { - check(name.isBlank()) { "name cannot be blank" } - check(city.isBlank()) { "city cannot be blank" } + check(name.isNotBlank()) { "name cannot be blank" } + check(city.isNotBlank()) { "city cannot be blank" } return SchoolImpl(name, city) } } diff --git a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/CalendarEventFactory.kt b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/CalendarEventFactory.kt index a5b271a6..10788c55 100644 --- a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/CalendarEventFactory.kt +++ b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/CalendarEventFactory.kt @@ -108,13 +108,13 @@ object CalendarEventFactory { subject: Subject, module: String? = null, ): WeekLesson { - check(subject.isBlank()) { + check(subject.isNotBlank()) { "subject cannot be blank" } - check(startTime.isAfter(endTime)) { + check(!startTime.isAfter(endTime)) { "startTime cannot be after endTime" } - check(fromDate.isAfter(toDate)) { + check(!fromDate.isAfter(toDate)) { "fromDate cannot be after toDate" } return WeekLessonImpl( diff --git a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/SchoolCalendarImpl.kt b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/SchoolCalendarImpl.kt index 56e87dfd..274f030f 100644 --- a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/SchoolCalendarImpl.kt +++ b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/SchoolCalendarImpl.kt @@ -63,7 +63,7 @@ internal data class SchoolCalendarImpl( } override fun addLessons(lessons: Set): SchoolCalendar { - check(lessons.any { lesson -> this.lessons.any { it == lesson } }) { + check(!lessons.any { lesson -> this.lessons.any { it == lesson } }) { "lessons must not be in current lessons" } val checkOverlappingStudents = lessons.any { lesson -> diff --git a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/implementation/SchoolImpl.kt b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/implementation/SchoolImpl.kt index 036fc3b7..7f1b9009 100644 --- a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/implementation/SchoolImpl.kt +++ b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/implementation/SchoolImpl.kt @@ -51,7 +51,7 @@ internal data class SchoolImpl( * @throws IllegalArgumentException if the class is already in the school */ override fun addClass(classToAdd: Class): School { - check(classes.contains(classToAdd)) { + check(!classes.contains(classToAdd)) { "class already in school" } return copy(classes = classes + classToAdd) @@ -64,7 +64,7 @@ internal data class SchoolImpl( * @throws IllegalArgumentException if the student is already in the school */ override fun addStudent(student: Student): School { - check(students.contains(student)) { + check(!students.contains(student)) { "student already in school" } return copy(students = students + student) @@ -77,7 +77,7 @@ internal data class SchoolImpl( * @throws IllegalArgumentException if the professor is already in the school */ override fun addProfessor(professor: Professor): School { - check(professors.contains(professor)) { + check(!professors.contains(professor)) { "professor already in school" } return copy(professors = professors + professor) diff --git a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Professor.kt b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Professor.kt index 59964833..399ba0cf 100644 --- a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Professor.kt +++ b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Professor.kt @@ -33,9 +33,9 @@ interface Professor : Person { name: String, surname: String, ): Professor { - check(email.isBlank()) { "email cannot be blank" } - check(name.isBlank()) { "name cannot be blank" } - check(surname.isBlank()) { "surname cannot be blank" } + check(email.isNotBlank()) { "email cannot be blank" } + check(name.isNotBlank()) { "name cannot be blank" } + check(surname.isNotBlank()) { "surname cannot be blank" } return ProfessorImpl(email, name, surname) } } diff --git a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Student.kt b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Student.kt index 9fc1f989..8fc3b0ea 100644 --- a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Student.kt +++ b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Student.kt @@ -30,9 +30,9 @@ interface Student : Person { name: String, surname: String, ): Student { - check(email.isBlank()) { "email cannot be blank" } - check(name.isBlank()) { "name cannot be blank" } - check(surname.isBlank()) { "surname cannot be blank" } + check(email.isNotBlank()) { "email cannot be blank" } + check(name.isNotBlank()) { "name cannot be blank" } + check(surname.isNotBlank()) { "surname cannot be blank" } return StudentImpl(email, name, surname) } }