Merge pull request #361 from internxt/fix/sharing-type-error-fixed-an…

…d-log-name-file [_] fix: fixed error when fetching the sharing type
internxt · Jul 12, 2024 · 82ac6d3 · 82ac6d3
2 parents b415e51 + 25372bb
commit 82ac6d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/modules/file/file.controller.ts b/src/modules/file/file.controller.ts
@@ -126,11 +126,9 @@ export class FileController {
       const err = error as Error;
       const { email, uuid } = user;
       Logger.error(
-        `[SHARING/REPLACE] Error while replacing file. CONTEXT:${JSON.stringify(
-          {
-            user: { email, uuid },
-          },
-        )}}, STACK: ${err.stack || 'No stack trace'}`,
+        `[FILE/REPLACE] Error while replacing file. CONTEXT:${JSON.stringify({
+          user: { email, uuid },
+        })}}, STACK: ${err.stack || 'No stack trace'}`,
       );
 
       throw error;

diff --git a/src/modules/sharing/sharing.repository.ts b/src/modules/sharing/sharing.repository.ts
@@ -221,13 +221,17 @@ export class SequelizeSharingRepository implements SharingRepository {
     type?: SharingType,
     sharedWithType?: SharedWithType,
   ): Promise<Sharing> {
+    const optionalWhere = {
+      ...(type ? { type } : null),
+      ...(sharedWithType ? { sharedWithType } : null),
+    };
+
     const raw = await this.sharings.findOne({
       where: {
         itemId,
         itemType,
         [Op.or]: [{ ownerId: userId }, { sharedWith: userId }],
-        type,
-        sharedWithType,
+        ...optionalWhere,
       },
     });
 

diff --git a/src/modules/sharing/sharing.service.ts b/src/modules/sharing/sharing.service.ts
@@ -2200,6 +2200,7 @@ export class SharingService {
         itemId,
         itemType,
         SharingType.Public,
+        sharedWithType,
       ),
       this.sharingRepository.findOneByOwnerOrSharedWithItem(
         user.uuid,