Fix Unit Tests

Author: jatindersingh93

app/src/controllers/invite.js

@@ -171,41 +171,35 @@ const controller = {
 
       // if permCodes in db is `null` then just assign READ
       const permCodes = !invite.permCodes ? [Permissions.READ] : invite.permCodes;
-
-      // Assign array of permCode to the bucket or object
-      permCodes.forEach(async permCode => {
-        if (invite.type === ResourceType.OBJECT) {
-          // Check for object existence
-          await objectService.read(invite.resource).catch(() => {
-            inviteService.delete(token);
-            throw new Problem(409, {
-              detail: `Object '${invite.resource}' not found`,
-              instance: req.originalUrl,
-              objectId: invite.resource
-            });
+      if (invite.type === ResourceType.OBJECT) {
+        // Check for object existence
+        await objectService.read(invite.resource).catch(() => {
+          inviteService.delete(token);
+          throw new Problem(409, {
+            detail: `Object '${invite.resource}' not found`,
+            instance: req.originalUrl,
+            objectId: invite.resource
           });
+        });
 
-          // Grant invitation permission and cleanup
-          await objectPermissionService.addPermissions(invite.resource, [
-            { userId: userId, permCode: permCode }
-          ], invite.createdBy);
-        } else if (invite.type === ResourceType.BUCKET) {
-          // Check for object existence
-          await bucketService.read(invite.resource).catch(() => {
-            inviteService.delete(token);
-            throw new Problem(409, {
-              detail: `Bucket '${invite.resource}' not found`,
-              instance: req.originalUrl,
-              bucketId: invite.resource
-            });
+        // Grant invitation permission and cleanup
+        await objectPermissionService.addPermissions(invite.resource,
+          permCodes.map(permCode => ({ userId, permCode })), invite.createdBy);
+      } else if (invite.type === ResourceType.BUCKET) {
+        // Check for object existence
+        await bucketService.read(invite.resource).catch(() => {
+          inviteService.delete(token);
+          throw new Problem(409, {
+            detail: `Bucket '${invite.resource}' not found`,
+            instance: req.originalUrl,
+            bucketId: invite.resource
           });
+        });
 
-          // Grant invitation permission and cleanup
-          await bucketPermissionService.addPermissions(invite.resource, [
-            { userId: userId, permCode: permCode }
-          ], invite.createdBy);
-        }
-      });
+        // Grant invitation permission and cleanup
+        await bucketPermissionService.addPermissions(invite.resource,
+          permCodes.map(permCode => ({ userId, permCode })), invite.createdBy);
+      }
 
       // Cleanup invite on success
       inviteService.delete(token);

app/src/db/migrations/20240305000000_014-invitePermissions.js

@@ -2,15 +2,13 @@ exports.up = function (knex) {
   return Promise.resolve()
     // Add permCodes to the table
     .then(() => knex.schema.alterTable('invite', table => {
-      // Choosing jsonb instead of array as for some reasons insert does not
-      // seems to be accepting data in array format, something to do with knex and postgres
       table.jsonb('permCodes');
     }));
 };
 
 exports.down = function (knex) {
   return Promise.resolve()
-    // permCodes column from Invite table
+    // Drop permCodes column from Invite table
     .then(() => knex.schema.alterTable('invite', table => {
       table.dropColumn('permCodes');
     }));

app/tests/unit/controllers/invite.spec.js

@@ -446,7 +446,6 @@ describe('useInvite', () => {
       params: { token: TOKEN }
     };
 
-    inviteReadSpy.mockResolvedValue({ email: email, resource: RESOURCE, type: ResourceType.OBJECT });
     objectReadSpy.mockRejectedValue({});
 
     await controller.useInvite(req, res, next);
@@ -480,7 +479,7 @@ describe('useInvite', () => {
     expect(inviteDeleteSpy).toHaveBeenCalledWith(TOKEN);
     expect(inviteReadSpy).toHaveBeenCalledTimes(1);
     expect(inviteReadSpy).toHaveBeenCalledWith(TOKEN);
-    expect(objectAddPermissionsSpy).toHaveBeenCalledTimes(0);
+    expect(objectAddPermissionsSpy).toHaveBeenCalledTimes(1);
     expect(objectReadSpy).toHaveBeenCalledTimes(1);
     expect(objectReadSpy).toHaveBeenCalledWith(RESOURCE);
     expect(next).toHaveBeenCalledTimes(0);
@@ -495,7 +494,6 @@ describe('useInvite', () => {
       params: { token: TOKEN }
     };
 
-    inviteReadSpy.mockResolvedValue({ email: email, resource: RESOURCE, type: ResourceType.BUCKET });
     bucketReadSpy.mockRejectedValue({});
 
     await controller.useInvite(req, res, next);
@@ -505,7 +503,9 @@ describe('useInvite', () => {
     expect(inviteDeleteSpy).toHaveBeenCalledTimes(0);
     expect(inviteReadSpy).toHaveBeenCalledTimes(1);
     expect(inviteReadSpy).toHaveBeenCalledWith(TOKEN);
-    expect(bucketAddPermissionsSpy).toHaveBeenCalledTimes(0);
+    expect(objectAddPermissionsSpy).toHaveBeenCalledTimes(0);
+    expect(objectReadSpy).toHaveBeenCalledTimes(0);
+    expect(next).toHaveBeenCalledTimes(1);
   });
 
   it('should 200 when bucket grant successful', async () => {
@@ -523,13 +523,13 @@ describe('useInvite', () => {
 
     await controller.useInvite(req, res, next);
 
-    expect(bucketAddPermissionsSpy).toHaveBeenCalledTimes(0);
+    expect(bucketAddPermissionsSpy).toHaveBeenCalledTimes(1);
     expect(bucketReadSpy).toHaveBeenCalledTimes(1);
     expect(inviteDeleteSpy).toHaveBeenCalledTimes(1);
     expect(inviteDeleteSpy).toHaveBeenCalledWith(TOKEN);
     expect(inviteReadSpy).toHaveBeenCalledTimes(1);
     expect(inviteReadSpy).toHaveBeenCalledWith(TOKEN);
-    expect(bucketAddPermissionsSpy).toHaveBeenCalledTimes(0);
+    expect(bucketAddPermissionsSpy).toHaveBeenCalledTimes(1);
     expect(bucketReadSpy).toHaveBeenCalledTimes(1);
     expect(next).toHaveBeenCalledTimes(0);
     expect(res.json).toHaveBeenCalledWith({ resource: RESOURCE, type: ResourceType.BUCKET });