Merge pull request #315 from internxt/fix/intial-folders-parent-uuid

[_]: Fix/Add parent uuid to intial folders
internxt · May 17, 2024 · 0fd1d99 · 0fd1d99
2 parents 3131816 + 55cf500
commit 0fd1d99
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/modules/folder/folder.repository.ts b/src/modules/folder/folder.repository.ts
@@ -329,8 +329,9 @@ export class SequelizeFolderRepository implements FolderRepository {
     userId: UserAttributes['id'],
     name: FolderAttributes['name'],
     bucket: FolderAttributes['bucket'],
-    parentId: FolderAttributes['id'],
+    parentId: FolderAttributes['parentId'],
     encryptVersion: FolderAttributes['encryptVersion'],
+    parentUuid?: FolderAttributes['parentUuid'],
   ): Promise<Folder> {
     const folder = await this.folderModel.create({
       userId,
@@ -339,6 +340,7 @@ export class SequelizeFolderRepository implements FolderRepository {
       parentId,
       encryptVersion,
       uuid: v4(),
+      parentUuid,
     });
 
     return this.toDomain(folder);
@@ -349,8 +351,9 @@ export class SequelizeFolderRepository implements FolderRepository {
       userId: UserAttributes['id'];
       name: FolderAttributes['name'];
       bucket: FolderAttributes['bucket'];
-      parentId: FolderAttributes['id'];
+      parentId: FolderAttributes['parentId'];
       encryptVersion: FolderAttributes['encryptVersion'];
+      parentUuid: FolderAttributes['parentUuid'];
     }[],
   ): Promise<Folder[]> {
     const rawFolders = await this.folderModel.bulkCreate(folders);

diff --git a/src/modules/folder/folder.usecase.ts b/src/modules/folder/folder.usecase.ts
@@ -193,7 +193,8 @@ export class FolderUseCases {
     creator: User,
     folders: {
       name: FolderAttributes['name'];
-      parentFolderId: FolderAttributes['id'];
+      parentFolderId: FolderAttributes['parentId'];
+      parentUuid: FolderAttributes['parentUuid'];
     }[],
   ): Promise<Folder[]> {
     for (const { parentFolderId } of folders) {
@@ -226,6 +227,7 @@ export class FolderUseCases {
           encryptVersion: '03-aes',
           bucket: null,
           parentId: folder.parentFolderId,
+          parentUuid: folder.parentUuid,
         };
       }),
     );
@@ -234,7 +236,8 @@ export class FolderUseCases {
   async createFolder(
     creator: User,
     name: FolderAttributes['name'],
-    parentFolderId: FolderAttributes['id'],
+    parentFolderId: FolderAttributes['parentId'],
+    parentUuid: FolderAttributes['parentUuid'],
   ): Promise<Folder> {
     if (parentFolderId >= 2147483648) {
       throw new Error('Invalid parent folder');
@@ -285,6 +288,7 @@ export class FolderUseCases {
       null,
       parentFolderId,
       '03-aes',
+      parentUuid,
     );
 
     return folder;

diff --git a/src/modules/user/user.usecase.ts b/src/modules/user/user.usecase.ts
@@ -283,8 +283,16 @@ export class UserUseCases {
       // Relate the root folder to the user
       this.userRepository.updateById(user.id, { rootFolderId: rootFolder.id }),
       this.folderUseCases.createFolders(user, [
-        { name: 'Family', parentFolderId: rootFolder.id },
-        { name: 'Personal', parentFolderId: rootFolder.id },
+        {
+          name: 'Family',
+          parentFolderId: rootFolder.id,
+          parentUuid: rootFolder.uuid,
+        },
+        {
+          name: 'Personal',
+          parentFolderId: rootFolder.id,
+          parentUuid: rootFolder.uuid,
+        },
       ]),
     ]);