Merge pull request #49 from yngwi/master

Move date range validation to event repository
nam-pi · Oct 25, 2021 · fbfeff0 · fbfeff0
2 parents d0cced8 + cdb51f6
commit fbfeff0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>eu.nampi</groupId>
   <artifactId>backend</artifactId>
-  <version>0.4.0</version>
+  <version>0.4.1</version>
   <name>nampi-backend</name>
   <description>The NAMPI backend</description>
 

diff --git a/src/main/java/eu/nampi/backend/converter/StringToDateRangeConverter.java b/src/main/java/eu/nampi/backend/converter/StringToDateRangeConverter.java
@@ -53,10 +53,6 @@ public DateRange convert(String string) {
     if (start.isPresent() && end.isPresent()) {
       var startVal = start.get();
       var endVal = end.get();
-      if (startVal.isAfter(endVal)) {
-        throw new IllegalArgumentException(
-            String.format("Start date '%s' is not allowed to be after '%s'", startVal, endVal));
-      }
       if (startVal.equals(endVal)) {
         end = Optional.empty();
         isRange = false;

diff --git a/src/main/java/eu/nampi/backend/repository/EventRepository.java b/src/main/java/eu/nampi/backend/repository/EventRepository.java
@@ -661,6 +661,16 @@ private void validatePayload(Lang lang, List<Resource> types,
     HydraInsertBuilder builder = hydraBuilderFactory.insertBuilder(lang, ENDPOINT_NAME, types,
         labels, comments, texts, new ArrayList<>());
     builder.validateSubresources(Core.event, types);
+    // Date
+    optionalDate
+        .ifPresent(date -> date.getStart().ifPresent(start -> date.getEnd().ifPresent(end -> {
+          if (start.isAfter(end)) {
+            throw new IllegalArgumentException(
+                String.format("Start date '%s' is not allowed to be after '%s'",
+                    start.format(DateTimeFormatter.ISO_DATE),
+                    end.format(DateTimeFormatter.ISO_DATE)));
+          }
+        })));
     // Event main participant
     builder.validateType(Core.person, mainParticipant.getObject());
     mainParticipant.getPredicate().ifPresent(predicate -> {