[MOB-325] Fix current folders root resource search

passbolt · Apr 13, 2022 · a31e5d8 · a31e5d8
1 parent 3ee105c
commit a31e5d8
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/...age/Sources/Accounts/Features/Storage/Database/Operations/Folders/FoldersOperations.swift b/...age/Sources/Accounts/Features/Storage/Database/Operations/Folders/FoldersOperations.swift
@@ -190,7 +190,7 @@ extension FetchListViewFoldersOperation {
 
               UNION ALL
 
-              SELECT
+              SELECT DISTINCT
                 foldersListView.id,
                 foldersListView.name,
                 foldersListView.permission,
@@ -200,7 +200,7 @@ extension FetchListViewFoldersOperation {
                 foldersListView,
                 flattenedFoldersListView
               WHERE
-                foldersListView.parentFolderID = flattenedFoldersListView.id
+                foldersListView.parentFolderID IS flattenedFoldersListView.id
             )
           SELECT DISTINCT
             flattenedFoldersListView.id AS id,
@@ -385,11 +385,21 @@ extension FetchListViewFolderResourcesOperation {
                 SELECT
                   foldersListView.id,
                   foldersListView.parentFolderID
+                FROM
+                  foldersListView
+                WHERE
+                  foldersListView.parentFolderID IS ?
+
+                UNION ALL
+
+                SELECT DISTINCT
+                  foldersListView.id,
+                  foldersListView.parentFolderID
                 FROM
                   foldersListView,
                   flattenedFoldersListView
                 WHERE
-                  foldersListView.parentFolderID = flattenedFoldersListView.id
+                  foldersListView.parentFolderID IS flattenedFoldersListView.id
               )
             SELECT DISTINCT
               folderResourcesListView.id AS id,
@@ -407,7 +417,7 @@ extension FetchListViewFolderResourcesOperation {
             WHERE
               1 -- equivalent of true, used to simplify dynamic query building
           """
-        params = [input.folderID?.rawValue, input.folderID?.rawValue]
+        params = [input.folderID?.rawValue, input.folderID?.rawValue, input.folderID?.rawValue]
       }
       else {
         statement = """