Merge pull request #46 from yngwi/master

Fix incorrect handling of other event participants in updates

Author: yngwi

pom.xml

@@ -9,7 +9,7 @@
   </parent>
   <groupId>eu.nampi</groupId>
   <artifactId>backend</artifactId>
-  <version>0.3.0</version>
+  <version>0.3.1</version>
   <name>nampi-backend</name>
   <description>The NAMPI backend</description>
 

src/main/java/eu/nampi/backend/repository/EventRepository.java

@@ -539,13 +539,13 @@ public void delete(UUID id) {
     Node varDatePredicate = NodeFactory.createVariable("datePredicate");
     Node varDateObject = NodeFactory.createVariable("dateObject");
     builder
-        .addFilter(ef.in(
-            varHasDatePredicate,
-            Core.hasDate, Core.takesPlaceNotEarlierThan,
-            Core.takesPlaceNotLaterThan, Core.takesPlaceOn))
         .addOptional(new WhereBuilder()
             .addWhere(VAR_MAIN, varHasDatePredicate, varDate)
-            .addWhere(varDate, varDatePredicate, varDateObject))
+            .addWhere(varDate, varDatePredicate, varDateObject)
+            .addFilter(ef.in(
+                varHasDatePredicate,
+                Core.hasDate, Core.takesPlaceNotEarlierThan,
+                Core.takesPlaceNotLaterThan, Core.takesPlaceOn)))
         .addDelete(VAR_MAIN, varHasDatePredicate, varDate)
         .addDelete(varDate, varDatePredicate, varDateObject);
     // Delete act
@@ -576,9 +576,9 @@ public InsertResult insert(Optional<UUID> optionalId, Lang lang, List<Resource>
       builder.validateType(Core.actor, participant.getObject());
       participant.getPredicate().ifPresentOrElse(predicate -> {
         builder.validateNotSubnode(Core.hasMainParticipant, predicate);
-        builder.validateSubnode(Core.hasParticipant, predicate);
+        builder.validateSubnode(Core.hasOtherParticipant, predicate);
         builder.addInsert(builder.root, predicate, participant.getObject());
-      }, () -> builder.addInsert(builder.root, Core.hasParticipant, participant.getObject()));
+      }, () -> builder.addInsert(builder.root, Core.hasOtherParticipant, participant.getObject()));
     });
     // Event aspects
     aspects.forEach(aspect -> {

src/main/java/eu/nampi/backend/vocabulary/Core.java

@@ -40,6 +40,7 @@ protected static final Property property(String local) {
   public static final Property hasLatitude = property("has_latitude");
   public static final Property hasLongitude = property("has_longitude");
   public static final Property hasMainParticipant = property("has_main_participant");
+  public static final Property hasOtherParticipant = property("has_other_participant");
   public static final Property hasPart = property("has_part");
   public static final Property hasParticipant = property("has_participant");
   public static final Property hasSortingDate = property("has_sorting_date");