From 19db927bb9268c1f0f5719c6fe63ab2dff458605 Mon Sep 17 00:00:00 2001 From: RishiRaj Date: Tue, 25 Jun 2019 15:22:55 +0530 Subject: [PATCH 1/2] stopping disabled templates to be returned in response of list endpoints. --- src/routes/metadata/list.js | 4 ++++ src/routes/productTemplates/list.js | 2 +- src/routes/projectTemplates/list.js | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/routes/metadata/list.js b/src/routes/metadata/list.js index 3358350f..784a36b4 100644 --- a/src/routes/metadata/list.js +++ b/src/routes/metadata/list.js @@ -27,6 +27,10 @@ function getUsedModel() { priceConfig: { }, }; const query = { + where: { + deletedAt: { $eq: null }, + disabled: false, + }, attributes: { exclude: ['deletedAt', 'deletedBy'] }, raw: true, }; diff --git a/src/routes/productTemplates/list.js b/src/routes/productTemplates/list.js index d34f7d3e..c72c50ca 100644 --- a/src/routes/productTemplates/list.js +++ b/src/routes/productTemplates/list.js @@ -14,7 +14,7 @@ module.exports = [ if (!util.isValidFilter(filters, ['productKey'])) { return util.handleError('Invalid filters', null, req, next); } - const where = { deletedAt: { $eq: null } }; + const where = { deletedAt: { $eq: null }, disabled: false }; if (filters.productKey) { where.productKey = { $eq: filters.productKey }; } diff --git a/src/routes/projectTemplates/list.js b/src/routes/projectTemplates/list.js index 3e83f2e4..09a8f7bf 100644 --- a/src/routes/projectTemplates/list.js +++ b/src/routes/projectTemplates/list.js @@ -12,6 +12,7 @@ module.exports = [ (req, res, next) => models.ProjectTemplate.findAll({ where: { deletedAt: { $eq: null }, + disabled: false, }, attributes: { exclude: ['deletedAt', 'deletedBy'] }, raw: true, From 70f6eca579e2ae526dbe2aed9f9327654fc7a588 Mon Sep 17 00:00:00 2001 From: RishiRaj Date: Tue, 25 Jun 2019 15:49:56 +0530 Subject: [PATCH 2/2] fixed test cases. --- src/routes/productTemplates/list.spec.js | 2 +- src/routes/projectTemplates/list.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/productTemplates/list.spec.js b/src/routes/productTemplates/list.spec.js index d872be8e..9bd95b26 100644 --- a/src/routes/productTemplates/list.spec.js +++ b/src/routes/productTemplates/list.spec.js @@ -51,7 +51,7 @@ describe('LIST product templates', () => { }, alias2: [1, 2, 3], }, - disabled: true, + disabled: false, hidden: true, isAddOn: true, template: { diff --git a/src/routes/projectTemplates/list.spec.js b/src/routes/projectTemplates/list.spec.js index 2da743c5..3971aa3b 100644 --- a/src/routes/projectTemplates/list.spec.js +++ b/src/routes/projectTemplates/list.spec.js @@ -20,7 +20,7 @@ describe('LIST project templates', () => { question: 'question 1', info: 'info 1', aliases: ['key-1', 'key_1'], - disabled: true, + disabled: false, hidden: true, scope: { scope1: {