- Update PUT route and unit tests

Author: bnguyen-bcgsc

app/routes/variantText/variantText.js

@@ -131,7 +131,6 @@ router.param('variantText', async (req, res, next, ident) => {
   try {
     result = await db.models.variantText.findOne({
       where: {ident},
-      attributes: variantTextPublicAttributes,
       include: variantTextPublicInclude,
     });
   } catch (error) {
@@ -168,7 +167,16 @@ router.route('/:variantText([A-z0-9-]{36})')
     return res.json(req.variantText.view('public'));
   })
   .put(async (req, res) => {
-    const requestedProjectIdents = req.body.projects || (req.body.project ? [req.body.project] : []);
+    const requestedProjectIdentsRaw = req.body.projects || (req.body.project ? [req.body.project] : []);
+    const requestedProjectIdents = (Array.isArray(requestedProjectIdentsRaw) ? requestedProjectIdentsRaw : [requestedProjectIdentsRaw])
+      .map((project) => {
+        if (typeof project === 'string') {
+          return project;
+        }
+
+        return project?.ident;
+      })
+      .filter((ident) => {return Boolean(ident);});
 
     if (requestedProjectIdents.length && !hasProjectAccessForAll(req.user, requestedProjectIdents)) {
       logger.error(`user ${req.user.username} does not have access to variant text projects ${requestedProjectIdents.join(', ')}`);
@@ -177,6 +185,29 @@ router.route('/:variantText([A-z0-9-]{36})')
       });
     }
 
+    let requestedProjectIds;
+    if (requestedProjectIdents.length) {
+      const projects = await db.models.project.findAll({
+        where: {
+          ident: requestedProjectIdents,
+        },
+      });
+
+      if (projects.length !== requestedProjectIdents.length) {
+        const foundProjectIdents = projects.map((project) => {return project.ident;});
+        const missingProjectIdent = requestedProjectIdents.find((ident) => {
+          return !foundProjectIdents.includes(ident);
+        });
+
+        logger.error(`Unable to find project ${missingProjectIdent}`);
+        return res.status(HTTP_STATUS.NOT_FOUND).json({
+          error: {message: 'Unable to find project'},
+        });
+      }
+
+      requestedProjectIds = projects.map((project) => {return project.id;});
+    }
+
     const variantTextBody = {...req.body};
     delete variantTextBody.project;
     delete variantTextBody.projects;
@@ -200,8 +231,8 @@ router.route('/:variantText([A-z0-9-]{36})')
         await req.variantText.update(variantTextBody, {userId: req.user.id});
       }
 
-      if (Array.isArray(req.body.projectIds)) {
-        await req.variantText.setProjects(req.body.projectIds);
+      if (Array.isArray(requestedProjectIds)) {
+        await req.variantText.setProjects(requestedProjectIds);
       }
 
       const updatedVariantText = await db.models.variantText.findOne({

test/routes/variantText/variantText.test.js

@@ -278,7 +278,7 @@ describe('/variant-text', () => {
 
   describe('PUT - /:variantText', () => {
     test('/ - 200 Success', async () => {
-      await request
+      const res = await request
         .put(`${BASE_URI}/${variantText.ident}`)
         .query({
           groups: [{name: VARIANT_EDIT_ACCESS}],
@@ -287,7 +287,10 @@ describe('/variant-text', () => {
         .send(UPDATE_DATA)
         .auth(username, password)
         .type('json')
-        .expect(HTTP_STATUS.INTERNAL_SERVER_ERROR);
+        .expect(HTTP_STATUS.OK);
+
+      checkVariantText(res.body);
+      expect(res.body.text).toEqual(UPDATE_DATA.text);
     });
 
     test('/ - 400 Bad Request not updateable field', async () => {
@@ -336,7 +339,15 @@ describe('/variant-text', () => {
         })
         .auth(username, password)
         .type('json')
-        .expect(HTTP_STATUS.INTERNAL_SERVER_ERROR);
+        .expect(HTTP_STATUS.NO_CONTENT);
+
+      // Verify variant text is soft-deleted
+      const deletedVariantText = await db.models.variantText.findOne({
+        where: {ident: deleteVariantText.ident},
+        paranoid: false,
+      });
+
+      expect(deletedVariantText.deletedAt).not.toBeNull();
     });
 
     test('/ - 403 Forbidden user group', async () => {