Merge pull request #99 from IZIVIA/fix/#98-twenty-for-seven-marshalling

fix(location) #98: twentyforseven instead of twenty_for_seven
IZIVIA · Apr 19, 2024 · ada80ae · ada80ae
2 parents d724b46 + 3305aea
commit ada80ae
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/ocpi-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/domain/Hours.kt b/ocpi-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/domain/Hours.kt
@@ -8,7 +8,7 @@ import com.izivia.ocpi.toolkit.annotations.Partial
  *
  * @property regularHours Regular hours, weekday based. Should not be set for representing 24/7 as this is the most
  * common case.
- * @property twentyFourSeven True to represent 24 hours a day and 7 days a week, except the given exceptions.
+ * @property twentyfourseven True to represent 24 hours a day and 7 days a week, except the given exceptions.
  * @property exceptionalOpenings Exceptions for specified calendar dates, time-range based. Periods the station is
  * operating/accessible. Additional to regular hours. May overlap regular rules.
  * @property exceptionalClosings Exceptions for specified calendar dates, time-range based. Periods the station is not
@@ -17,7 +17,7 @@ import com.izivia.ocpi.toolkit.annotations.Partial
 @Partial
 data class Hours(
     val regularHours: List<RegularHours>?,
-    val twentyFourSeven: Boolean,
+    val twentyfourseven: Boolean,
     val exceptionalOpenings: List<ExceptionalPeriod>?,
     val exceptionalClosings: List<ExceptionalPeriod>?
 )
diff --git a/.../src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/services/LocationValidators.kt b/.../src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/services/LocationValidators.kt
@@ -92,24 +92,24 @@ fun RegularHoursPartial.validate(): RegularHoursPartial = validate(this) { regul
 }
 
 fun HoursPartial.validate(): HoursPartial = validate(this) { hours ->
-    if (hours.regularHours == null && hours.twentyFourSeven == false) {
+    if (hours.regularHours == null && hours.twentyfourseven == false) {
         constraintViolations.add(
             DefaultConstraintViolation(
                 property = "regularHours is not set whereas twentyFourSeven is false",
                 constraint = RegularHoursSetWhenNotTwentyFourSevenConstraint()
             )
         )
-    } else if (hours.regularHours != null && hours.twentyFourSeven == true) {
+    } else if (hours.regularHours != null && hours.twentyfourseven == true) {
         constraintViolations.add(
             DefaultConstraintViolation(
-                property = "twentyFourSeven is set to true whereas regularHours are set",
+                property = "twentyfourseven is set to true whereas regularHours are set",
                 constraint = RegularHoursSetAtTheSameTimeAsTwentyFourSevenConstraint()
             )
         )
     }
 
     regularHours?.forEach { it.validate() }
-    // twentyFourSeven: nothing to validate
+    // twentyfourseven: nothing to validate
     exceptionalOpenings?.forEach { it.validate() }
     exceptionalClosings?.forEach { it.validate() }
 }

diff --git a/.../test/kotlin/com/izivia/ocpi/toolkit/modules/locations/services/LocationsValidatorTest.kt b/.../test/kotlin/com/izivia/ocpi/toolkit/modules/locations/services/LocationsValidatorTest.kt
@@ -424,7 +424,7 @@ class LocationsValidatorTest {
 
             validHours.copy(
                 regularHours = null,
-                twentyFourSeven = true
+                twentyfourseven = true
             ).validate()
 
             validHours.copy(
@@ -436,21 +436,21 @@ class LocationsValidatorTest {
         expectCatching {
             validHours.copy(
                 regularHours = listOf(validRegularHours),
-                twentyFourSeven = true
+                twentyfourseven = true
             ).toPartial().validate()
         }.isFailure()
 
         expectCatching {
             validHours.copy(
                 regularHours = listOf(validRegularHours),
-                twentyFourSeven = true
+                twentyfourseven = true
             ).validate()
         }.isFailure()
 
         expectCatching {
             validHours.copy(
                 regularHours = null,
-                twentyFourSeven = false
+                twentyfourseven = false
             ).validate()
         }.isFailure()
     }

diff --git a/...toolkit-2.2.1/src/test/kotlin/com/izivia/ocpi/toolkit/samples/common/ValidDomainObjets.kt b/...toolkit-2.2.1/src/test/kotlin/com/izivia/ocpi/toolkit/samples/common/ValidDomainObjets.kt
@@ -60,7 +60,7 @@ val validExceptionalPeriod = ExceptionalPeriod(
 
 val validHours = Hours(
     regularHours = listOf(validRegularHours),
-    twentyFourSeven = false,
+    twentyfourseven = false,
     exceptionalOpenings = listOf(validExceptionalPeriod),
     exceptionalClosings = emptyList()
 )