fix: prevent shared items duplication for owners

internxt · Dec 1, 2023 · 0f35488 · 0f35488
1 parent 12d4976
commit 0f35488
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/src/modules/sharing/sharing.repository.ts b/src/modules/sharing/sharing.repository.ts
@@ -313,14 +313,8 @@ export class SequelizeSharingRepository implements SharingRepository {
           'encryptionKey',
         ],
         [sequelize.literal(`MAX("SharingModel"."created_at")`), 'createdAt'],
-        [sequelize.literal(`"SharingModel"."type"`), 'sharingType'],
-      ],
-      group: [
-        'folder.id',
-        'folder->user.id',
-        'SharingModel.item_id',
-        'sharingType',
       ],
+      group: ['folder.id', 'folder->user.id', 'SharingModel.item_id'],
       include: [
         {
           model: FolderModel,
@@ -351,7 +345,6 @@ export class SequelizeSharingRepository implements SharingRepository {
     });
 
     return sharedFolders.map((shared) => {
-      shared.set('type', shared.get('sharingType'));
       return this.toDomain(shared);
     });
   }
@@ -372,14 +365,8 @@ export class SequelizeSharingRepository implements SharingRepository {
           'encryptionKey',
         ],
         [sequelize.literal(`MAX("SharingModel"."created_at")`), 'createdAt'],
-        [sequelize.literal(`"SharingModel"."type"`), 'sharingType'],
-      ],
-      group: [
-        'file.id',
-        'file->user.id',
-        'SharingModel.item_id',
-        'sharingType',
       ],
+      group: ['file.id', 'file->user.id', 'SharingModel.item_id'],
       include: [
         {
           model: FileModel,
@@ -409,7 +396,6 @@ export class SequelizeSharingRepository implements SharingRepository {
     });
 
     return sharedFiles.map((shared) => {
-      shared.set('type', shared.get('sharingType'));
       return this.toDomainFile(shared);
     });
   }

diff --git a/src/modules/sharing/sharing.service.ts b/src/modules/sharing/sharing.service.ts
@@ -1526,7 +1526,6 @@ export class SharingService {
             this.folderUsecases.decryptFolderName(folderWithSharedInfo.folder)
               .plainName,
           sharingId: folderWithSharedInfo.id,
-          sharingType: folderWithSharedInfo.type,
           encryptionKey: folderWithSharedInfo.encryptionKey,
           dateShared: folderWithSharedInfo.createdAt,
           sharedWithMe: user.uuid !== folderWithSharedInfo.folder.user.uuid,
@@ -1553,7 +1552,6 @@ export class SharingService {
             fileWithSharedInfo.file.plainName ||
             this.fileUsecases.decrypFileName(fileWithSharedInfo.file).plainName,
           sharingId: fileWithSharedInfo.id,
-          sharingType: fileWithSharedInfo.type,
           encryptionKey: fileWithSharedInfo.encryptionKey,
           dateShared: fileWithSharedInfo.createdAt,
           sharedWithMe: user.uuid !== fileWithSharedInfo.file.user.uuid,
@@ -1606,7 +1604,6 @@ export class SharingService {
             fileWithSharedInfo.file.plainName ||
             this.fileUsecases.decrypFileName(fileWithSharedInfo.file).plainName,
           sharingId: fileWithSharedInfo.id,
-          sharingType: fileWithSharedInfo.type,
           encryptionKey: fileWithSharedInfo.encryptionKey,
           dateShared: fileWithSharedInfo.createdAt,
           sharedWithMe: user.uuid !== fileWithSharedInfo.file.user.uuid,