fix: Use client.query in models.folder

cozy · Feb 13, 2024 · 7c6edf6 · 7c6edf6
1 parent 03e73ba
commit 7c6edf6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 34 deletions.
diff --git a/docs/api/cozy-client/modules/models.folder.md b/docs/api/cozy-client/modules/models.folder.md
@@ -25,7 +25,7 @@
 
 *Defined in*
 
-[packages/cozy-client/src/models/folder.js:9](https://github.com/cozy/cozy-client/blob/master/packages/cozy-client/src/models/folder.js#L9)
+[packages/cozy-client/src/models/folder.js:11](https://github.com/cozy/cozy-client/blob/master/packages/cozy-client/src/models/folder.js#L11)
 
 ## Functions
 
@@ -51,7 +51,7 @@ Folder document
 
 *Defined in*
 
-[packages/cozy-client/src/models/folder.js:69](https://github.com/cozy/cozy-client/blob/master/packages/cozy-client/src/models/folder.js#L69)
+[packages/cozy-client/src/models/folder.js:71](https://github.com/cozy/cozy-client/blob/master/packages/cozy-client/src/models/folder.js#L71)
 
 ***
 
@@ -77,7 +77,7 @@ Folder document
 
 *Defined in*
 
-[packages/cozy-client/src/models/folder.js:29](https://github.com/cozy/cozy-client/blob/master/packages/cozy-client/src/models/folder.js#L29)
+[packages/cozy-client/src/models/folder.js:31](https://github.com/cozy/cozy-client/blob/master/packages/cozy-client/src/models/folder.js#L31)
 
 ***
 
@@ -102,4 +102,4 @@ Folder referenced by the given document
 
 *Defined in*
 
-[packages/cozy-client/src/models/folder.js:90](https://github.com/cozy/cozy-client/blob/master/packages/cozy-client/src/models/folder.js#L90)
+[packages/cozy-client/src/models/folder.js:92](https://github.com/cozy/cozy-client/blob/master/packages/cozy-client/src/models/folder.js#L92)
diff --git a/packages/cozy-client/src/models/folder.js b/packages/cozy-client/src/models/folder.js
@@ -2,6 +2,8 @@ import sortBy from 'lodash/sortBy'
 import CozyClient from '../CozyClient'
 import { DOCTYPE_FILES } from '../const'
 
+import { Q } from '../queries/dsl'
+
 const APP_DOCTYPE = 'io.cozy.apps'
 const administrative = 'administrative'
 const photos = 'photos'
@@ -88,16 +90,13 @@ export const createFolderWithReference = async (client, path, document) => {
  * @returns {Promise<import("../types").IOCozyFolder>} Folder referenced by the given document
  */
 export const getReferencedFolder = async (client, document) => {
-  const { included } = await client
-    .collection(DOCTYPE_FILES)
-    .findReferencedBy(document)
-  const foldersOutsideTrash = included.filter(
-    folder => !/^\/\.cozy_trash/.test(folder.path)
+  const { included: folders } = await client.query(
+    Q(DOCTYPE_FILES)
+      .partialIndex({ type: 'directory', trashed: false })
+      .referencedBy(document)
   )
 
   // there can be multiple folders with the same reference in some edge cases
   // when this happens we return the most recent one
-  return foldersOutsideTrash.length > 0
-    ? sortBy(foldersOutsideTrash, 'created_at').pop()
-    : null
+  return folders.length > 0 ? sortBy(folders, 'created_at').pop() : null
 }
diff --git a/packages/cozy-client/src/models/folder.spec.js b/packages/cozy-client/src/models/folder.spec.js
@@ -3,6 +3,7 @@ import { MAGIC_FOLDERS, ensureMagicFolder, getReferencedFolder } from './folder'
 describe('Folder model', () => {
   const mockClient = {
     collection: () => mockClient,
+    query: jest.fn(),
     findReferencedBy: jest.fn(),
     ensureDirectoryExists: jest.fn(),
     addReferencesTo: jest.fn(),
@@ -38,7 +39,7 @@ describe('Folder model', () => {
         }
       ]
 
-      mockClient.findReferencedBy.mockResolvedValue({
+      mockClient.query.mockResolvedValueOnce({
         included: existingMagicFolders
       })
 
@@ -66,10 +67,9 @@ describe('Folder model', () => {
     })
 
     it('should create magic folder', async () => {
-      mockClient.findReferencedBy.mockResolvedValue({
+      mockClient.query.mockResolvedValueOnce({
         included: []
       })
-
       mockClient.ensureDirectoryExists.mockResolvedValue('dir-id')
       mockClient.get.mockResolvedValue({ data: {} })
 
@@ -90,24 +90,6 @@ describe('Folder model', () => {
   })
 
   describe('getReferencedFolder', () => {
-    it('should filter trashed folders', async () => {
-      const referencedFolder = {
-        path: '/Reference/Folder'
-      }
-
-      const trashFolder = {
-        path: '/.cozy_trash/Old/Reference/Folder'
-      }
-
-      mockClient.findReferencedBy.mockResolvedValue({
-        included: [referencedFolder, trashFolder]
-      })
-
-      const result = await getReferencedFolder(mockClient, 'ref')
-
-      expect(result).toBe(referencedFolder)
-    })
-
     it('should return the most recently created folder', async () => {
       const oldFolder = {
         path: '/Old/folder',
@@ -118,7 +100,7 @@ describe('Folder model', () => {
         created_at: '2020-03-02T14:57:07.661588+01:00'
       }
 
-      mockClient.findReferencedBy.mockResolvedValue({
+      mockClient.query.mockResolvedValueOnce({
         included: [oldFolder, recentFolder]
       })