[Enhancement kbss-cvut/termit-ui#520] Fix change record filter query

lukaskabc · Nov 13, 2024 · 4334617 · 4334617
1 parent 8a1dcc9
commit 4334617
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/main/java/cz/cvut/kbss/termit/persistence/dao/changetracking/ChangeRecordDao.java b/src/main/java/cz/cvut/kbss/termit/persistence/dao/changetracking/ChangeRecordDao.java
@@ -99,7 +99,18 @@ public List<AbstractChangeRecord> findAllFiltered(URI changeContext, ChangeRecor
                             ?record ?hasChangedEntity ?asset ;
                                 ?hasTime ?timestamp ;
                                 ?hasAuthor ?author .
-                            ?asset a ?assetType .
+""" + /* Find an asset type if it is known (deleted assets does not have a type */ """
+                            
+                            OPTIONAL {
+                                ?asset a ?assetType
+                            }
+                            OPTIONAL {
+                                ?asset a ?assetTypeVal .
+                                BIND(true as ?isAssetType)
+                            }
+""" + /* filter assets without a type (deleted) or with a matching type */ """
+                            BIND(?assetTypeVal as ?assetTypeVar)
+                            FILTER(!BOUND(?assetType) || !BOUND(?assetTypeVar) || BOUND(?isAssetType))
 """ + /* Get author's name */ """
                             ?author ?hasFirstName ?firstName ;
                                 ?hasLastName ?lastName .
@@ -124,8 +135,8 @@ public List<AbstractChangeRecord> findAllFiltered(URI changeContext, ChangeRecor
                             OPTIONAL {
                                 FILTER(!BOUND(?label)) .
                                 ?deleteRecord a ?deleteRecordType;
-                                    ?hasChangedEntity ?term;
-                                    ?hasRdfsLabel ?label.
+                                    ?hasChangedEntity ?asset;
+                                    ?hasRdfsLabel ?label .
                             }
                             BIND(?assetLabelValue as ?assetLabel)
                             BIND(?authorNameValue as ?authorName)
@@ -155,7 +166,7 @@ public List<AbstractChangeRecord> findAllFiltered(URI changeContext, ChangeRecor
         if(asset.isPresent() && asset.get().getUri() != null) {
             query = query.setParameter("asset", asset.get().getUri());
         } else if (assetType.isPresent()) {
-            query = query.setParameter("assetType", assetType.get());
+            query = query.setParameter("assetTypeVal", assetType.get());
         }