fix: use folder uuid instead of id when looking for existent files (#1003)

Author: apsantiso

src/modules/file/file.repository.spec.ts

@@ -147,7 +147,7 @@ describe('FileRepository', () => {
     });
   });
 
-  describe('findByPlainNameAndFolderId', () => {
+  describe('findByPlainNameAndFolder', () => {
     it('When file is searched with empty type, it should find it', async () => {
       const mockFile = newFile({ attributes: { type: '' } });
 
@@ -160,11 +160,11 @@ describe('FileRepository', () => {
 
       jest.spyOn(fileModel, 'findOne').mockResolvedValueOnce(model);
 
-      await repository.findByPlainNameAndFolderId(
+      await repository.findByPlainNameAndFolder(
         mockFile.userId,
         mockFile.plainName,
         mockFile.type,
-        mockFile.folderId,
+        mockFile.folderUuid,
         mockFile.status,
       );
 
@@ -173,7 +173,7 @@ describe('FileRepository', () => {
           userId: { [Op.eq]: mockFile.userId },
           plainName: { [Op.eq]: mockFile.plainName },
           type: { [Op.or]: [{ [Op.is]: null }, { [Op.eq]: '' }] },
-          folderId: { [Op.eq]: mockFile.folderId },
+          folderUuid: { [Op.eq]: mockFile.folderUuid },
           status: { [Op.eq]: mockFile.status },
         }),
       });
@@ -191,11 +191,11 @@ describe('FileRepository', () => {
 
       jest.spyOn(fileModel, 'findOne').mockResolvedValueOnce(model);
 
-      await repository.findByPlainNameAndFolderId(
+      await repository.findByPlainNameAndFolder(
         mockFile.userId,
         mockFile.plainName,
         mockFile.type,
-        mockFile.folderId,
+        mockFile.folderUuid,
         mockFile.status,
       );
 
@@ -204,7 +204,7 @@ describe('FileRepository', () => {
           userId: { [Op.eq]: mockFile.userId },
           plainName: { [Op.eq]: mockFile.plainName },
           type: { [Op.or]: [{ [Op.is]: null }, { [Op.eq]: '' }] },
-          folderId: { [Op.eq]: mockFile.folderId },
+          folderUuid: { [Op.eq]: mockFile.folderUuid },
           status: { [Op.eq]: mockFile.status },
         }),
       });
@@ -222,11 +222,11 @@ describe('FileRepository', () => {
 
       jest.spyOn(fileModel, 'findOne').mockResolvedValueOnce(model);
 
-      await repository.findByPlainNameAndFolderId(
+      await repository.findByPlainNameAndFolder(
         mockFile.userId,
         mockFile.plainName,
         mockFile.type,
-        mockFile.folderId,
+        mockFile.folderUuid,
         mockFile.status,
       );
 
@@ -235,7 +235,7 @@ describe('FileRepository', () => {
           userId: { [Op.eq]: mockFile.userId },
           plainName: { [Op.eq]: mockFile.plainName },
           type: { [Op.eq]: mockFile.type },
-          folderId: { [Op.eq]: mockFile.folderId },
+          folderUuid: { [Op.eq]: mockFile.folderUuid },
           status: { [Op.eq]: mockFile.status },
         }),
       });

src/modules/file/file.repository.ts

@@ -91,11 +91,11 @@ export interface FileRepository {
     folderId: Folder['uuid'],
     searchBy: { plainName: File['plainName']; type?: File['type'] }[],
   ): Promise<File[]>;
-  findByPlainNameAndFolderId(
+  findByPlainNameAndFolder(
     userId: File['userId'],
     plainName: FileAttributes['plainName'],
     type: FileAttributes['type'],
-    folderId: FileAttributes['folderId'],
+    folderUuid: FileAttributes['folderUuid'],
     status: FileAttributes['status'],
   ): Promise<File | null>;
   getSumSizeOfFilesInWorkspaceByStatuses(
@@ -328,11 +328,11 @@ export class SequelizeFileRepository implements FileRepository {
     return file ? this.toDomain(file) : null;
   }
 
-  async findByPlainNameAndFolderId(
+  async findByPlainNameAndFolder(
     userId: FileAttributes['userId'],
     plainName: FileAttributes['plainName'],
     type: FileAttributes['type'],
-    folderId: FileAttributes['folderId'],
+    folderUuid: FileAttributes['folderUuid'],
     status: FileAttributes['status'],
   ): Promise<File | null> {
     const typeCondition =
@@ -345,7 +345,7 @@ export class SequelizeFileRepository implements FileRepository {
         userId: { [Op.eq]: userId },
         plainName: { [Op.eq]: plainName },
         type: typeCondition,
-        folderId: { [Op.eq]: folderId },
+        folderUuid: { [Op.eq]: folderUuid },
         status: { [Op.eq]: status },
       },
     });