Merge pull request #21 from Schi11er/schilling

bug fix: CatalogItem property labels.de deleted on create relationship causes wrong query results for search lists

Author: Schi11er

src/main/java/de/bentrm/datacat/catalog/domain/IndexingPreSaveEventListener.java

@@ -4,18 +4,24 @@
 import org.neo4j.ogm.session.event.EventListenerAdapter;
 import org.springframework.stereotype.Component;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * This class supports indexing of catalog entry nodes for multilingual full text search queries.
+ * This class supports indexing of catalog entry nodes for multilingual full
+ * text search queries.
  */
+@Slf4j
 @Component
 class IndexingPreSaveEventListener extends EventListenerAdapter {
 
     /**
-     * The property {@link CatalogItem#getLabels()} represents a map all translations
-     * mapped to their language tag. The persisted structure is used to index full text
+     * The property {@link CatalogItem#getLabels()} represents a map all
+     * translations
+     * mapped to their language tag. The persisted structure is used to index full
+     * text
      * queries honouring the current locale of the user.
      *
      * @param event The persistence event.
@@ -26,8 +32,10 @@ public void onPreSave(Event event) {
             final Map<String, String> labels = catalogItem.getNames().stream()
                     .collect(Collectors.toMap(Translation::getLanguageTag, Translation::getValue));
 
-            catalogItem.getLabels().clear();
-            catalogItem.getLabels().putAll(labels);
+            if (labels.size() > 0) {
+                catalogItem.getLabels().clear();
+                catalogItem.getLabels().putAll(labels);
+            }
         }
     }
 }

src/main/java/de/bentrm/datacat/catalog/repository/CatalogValidationQuery.java

@@ -116,8 +116,7 @@ WITH x.id AS paths, count(*) AS IDCount
     """)
     List<List<String>> findMultipleIDs();
 
-    /* Finde Elemente mit identischer Bezeichnung */
-    // AND (x)-[:TAGGED]->()<-[:TAGGED]-(y) bei Fachmodell Gruppe Klasse Merkmalsgruppe Datenvorlage
+    /* Finde Elemente mit identischer Bezeichnung innerhalb eines Types*/
     @Query("""
     MATCH (x)-[:NAMED]->(v)
     MATCH (y)-[:NAMED]->(z)