- Add new scope for kbMatchedStatements to not include kbMatches for …

…unit testing

- Update kbMatch unit test route for report.test.js
- Update delete endpoint of kbMatchedStatements to delete bindings with kbMatches on cascade and kbMatches with no associated statements

Co-authored-by: Lara Matiello Pletz <[email protected]>

app/models/reports/kbMatchedStatements.js

@@ -127,6 +127,9 @@ module.exports = (sequelize, Sq) => {
           },
         ],
       },
+      kbMatchesInclude: {
+        attributes: {exclude: ['id', 'reportId', 'deletedAt', 'updatedBy']},
+      },
     },
     hooks: {
       ...DEFAULT_REPORT_OPTIONS.hooks,

app/routes/report/kbMatch/kbMatchedStatements.js

@@ -40,18 +40,44 @@ router.route('/:kbMatchedStatement([A-z0-9-]{36})')
   .delete(async (req, res) => {
     // Soft delete the entry
     try {
-      const binding = await db.models.kbMatchJoin.findOne({
-        where: {kbMatchId: req.kbMatch.id, kbMatchedStatementId: req.kbMatchedStatement.id},
+      const bindings = await db.models.kbMatchJoin.findAll({
+        where: {kbMatchedStatementId: req.kbMatchedStatement.id},
       });
 
-      if (!binding) {
-        logger.error(`Variant: ${req.kbMatch.ident} is not bound to statement: ${req.kbMatchedStatement.ident}`);
-        return res.status(HTTP_STATUS.BAD_REQUEST).json({
-          error: {message: 'Variant is not bound to Statement'},
+      const bindingsIds = []
+      for (const bindingEntry of bindings) {
+        bindingsIds.push(bindingEntry.id);
+      }
+
+      const kbMatchesIds = [];
+      for (const kbMatchEntry of bindings) {
+        const kbMatchesBindings = await db.models.kbMatchJoin.findAll({
+          where: {kbMatchId: kbMatchEntry.kbMatchId}
         });
+
+        if (kbMatchesBindings.length <= 1) {
+          kbMatchesIds.push(kbMatchEntry.kbMatchId);
+        }
       }
 
-      await binding.destroy();
+      await req.kbMatchedStatement.destroy();
+      if (kbMatchesIds) {
+        await db.models.kbMatches.destroy({
+          where: {
+            id: {
+              [Op.in]: kbMatchesIds,
+            },
+          },
+        });
+      };
+      await db.models.kbMatchJoin.destroy({
+        where: {
+          id: {
+            [Op.in]: bindingsIds,
+          },
+        },
+      })
+
       return res.status(HTTP_STATUS.NO_CONTENT).send();
     } catch (error) {
       logger.error(`Unable to remove kb matched statement ${error}`);

app/routes/report/report.js

@@ -267,7 +267,7 @@ router.route('/')
           as: 'kbMatches',
           include: [
             {
-              model: db.models.kbMatchedStatements.scope('public'),
+              model: db.models.kbMatchedStatements.scope('kbMatchesInclude'),
               as: 'kbMatchedStatements',
               through: {attributes: []},
               where: {

test/routes/report/report.test.js

@@ -502,7 +502,7 @@ describe('/reports/{REPORTID}', () => {
 
     test('/ - kb match - 200 Success', async () => {
       const res = await request
-        .get('/api/reports?category=unknown&variantType=cnv&matchingThreshold=1')
+        .get('/api/reports?category=unknown&variantType=cnv')
         .auth(username, password)
         .type('json')
         .expect(HTTP_STATUS.OK);