Skip to content

Commit d0cdd1e

Browse files
author
Vikas Agarwal
committed
Added disabled and hidden fields to the project and product templates models
1 parent c1e6c92 commit d0cdd1e

File tree

12 files changed

+36
-1
lines changed

12 files changed

+36
-1
lines changed

src/models/productTemplate.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ module.exports = (sequelize, DataTypes) => {
1414
aliases: { type: DataTypes.JSON, allowNull: false },
1515
template: { type: DataTypes.JSON, allowNull: false },
1616
deletedAt: DataTypes.DATE,
17+
disabled: { type: DataTypes.BOOLEAN, defaultValue: false },
18+
hidden: { type: DataTypes.BOOLEAN, defaultValue: false },
1719
createdAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
1820
updatedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
1921
deletedBy: DataTypes.BIGINT,

src/models/projectTemplate.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ module.exports = (sequelize, DataTypes) => {
1515
aliases: { type: DataTypes.JSON, allowNull: false },
1616
scope: { type: DataTypes.JSON, allowNull: false },
1717
phases: { type: DataTypes.JSON, allowNull: false },
18+
disabled: { type: DataTypes.BOOLEAN, defaultValue: false },
19+
hidden: { type: DataTypes.BOOLEAN, defaultValue: false },
1820
deletedAt: DataTypes.DATE,
1921
createdAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
2022
updatedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },

src/routes/productTemplates/create.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ const schema = {
2121
details: Joi.string().max(255).required(),
2222
aliases: Joi.array().required(),
2323
template: Joi.object().required(),
24+
disabled: Joi.boolean().optional(),
25+
hidden: Joi.boolean().optional(),
2426
createdAt: Joi.any().strip(),
2527
updatedAt: Joi.any().strip(),
2628
deletedAt: Joi.any().strip(),

src/routes/productTemplates/create.spec.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ describe('CREATE product template', () => {
1919
brief: 'brief 1',
2020
details: 'details 1',
2121
aliases: ['product key 1', 'product_key_1'],
22+
disabled: true,
23+
hidden: true,
2224
template: {
2325
template1: {
2426
name: 'template 1',
@@ -102,6 +104,8 @@ describe('CREATE product template', () => {
102104
resJson.details.should.be.eql(body.param.details);
103105
resJson.aliases.should.be.eql(body.param.aliases);
104106
resJson.template.should.be.eql(body.param.template);
107+
resJson.disabled.should.be.eql(true);
108+
resJson.hidden.should.be.eql(true);
105109

106110
resJson.createdBy.should.be.eql(40051333); // admin
107111
should.exist(resJson.createdAt);

src/routes/productTemplates/list.spec.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Tests for list.js
33
*/
44
// import chai from 'chai';
5+
import _ from 'lodash';
56
import request from 'supertest';
67

78
import models from '../../models';
@@ -14,7 +15,7 @@ const validateProductTemplates = (count, resJson, expectedTemplates) => {
1415
resJson.should.have.length(count);
1516
resJson.forEach((pt, idx) => {
1617
pt.should.have.all.keys('id', 'name', 'productKey', 'icon', 'brief', 'details', 'aliases',
17-
'template', 'createdBy', 'createdAt', 'updatedBy', 'updatedAt');
18+
'template', 'disabled', 'hidden', 'createdBy', 'createdAt', 'updatedBy', 'updatedAt');
1819
pt.should.not.have.all.keys('deletedAt', 'deletedBy');
1920
pt.name.should.be.eql(expectedTemplates[idx].name);
2021
pt.productKey.should.be.eql(expectedTemplates[idx].productKey);
@@ -25,6 +26,8 @@ const validateProductTemplates = (count, resJson, expectedTemplates) => {
2526
pt.template.should.be.eql(expectedTemplates[idx].template);
2627
pt.createdBy.should.be.eql(expectedTemplates[idx].createdBy);
2728
pt.updatedBy.should.be.eql(expectedTemplates[idx].updatedBy);
29+
pt.disabled.should.be.eql(_.get(expectedTemplates[idx], 'disabled', false));
30+
pt.hidden.should.be.eql(_.get(expectedTemplates[idx], 'hidden', false));
2831
});
2932
};
3033

@@ -43,6 +46,8 @@ describe('LIST product templates', () => {
4346
},
4447
alias2: [1, 2, 3],
4548
},
49+
disabled: true,
50+
hidden: true,
4651
template: {
4752
template1: {
4853
name: 'template 1',

src/routes/productTemplates/update.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ const schema = {
2424
details: Joi.string().max(255),
2525
aliases: Joi.object(),
2626
template: Joi.object(),
27+
disabled: Joi.boolean().optional(),
28+
hidden: Joi.boolean().optional(),
2729
createdAt: Joi.any().strip(),
2830
updatedAt: Joi.any().strip(),
2931
deletedAt: Joi.any().strip(),

src/routes/productTemplates/update.spec.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ describe('UPDATE product template', () => {
2424
},
2525
alias2: [1, 2, 3],
2626
},
27+
disabled: true,
28+
hidden: true,
2729
template: {
2830
template1: {
2931
name: 'template 1',
@@ -174,6 +176,8 @@ describe('UPDATE product template', () => {
174176
resJson.icon.should.be.eql(body.param.icon);
175177
resJson.brief.should.be.eql(body.param.brief);
176178
resJson.details.should.be.eql(body.param.details);
179+
resJson.disabled.should.be.eql(true);
180+
resJson.hidden.should.be.eql(true);
177181

178182
resJson.aliases.should.be.eql({
179183
alias1: {

src/routes/projectTemplates/create.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ const schema = {
2323
aliases: Joi.array().required(),
2424
scope: Joi.object().required(),
2525
phases: Joi.object().required(),
26+
disabled: Joi.boolean().optional(),
27+
hidden: Joi.boolean().optional(),
2628
createdAt: Joi.any().strip(),
2729
updatedAt: Joi.any().strip(),
2830
deletedAt: Joi.any().strip(),

src/routes/projectTemplates/create.spec.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ describe('CREATE project template', () => {
2020
question: 'question 1',
2121
info: 'info 1',
2222
aliases: ['key-1', 'key_1'],
23+
disabled: true,
24+
hidden: true,
2325
scope: {
2426
scope1: {
2527
subScope1A: 1,
@@ -106,6 +108,8 @@ describe('CREATE project template', () => {
106108
resJson.name.should.be.eql(body.param.name);
107109
resJson.key.should.be.eql(body.param.key);
108110
resJson.category.should.be.eql(body.param.category);
111+
resJson.disabled.should.be.eql(true);
112+
resJson.hidden.should.be.eql(true);
109113
resJson.scope.should.be.eql(body.param.scope);
110114
resJson.phases.should.be.eql(body.param.phases);
111115

src/routes/projectTemplates/list.spec.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ describe('LIST project templates', () => {
2020
question: 'question 1',
2121
info: 'info 1',
2222
aliases: ['key-1', 'key_1'],
23+
disabled: true,
24+
hidden: true,
2325
scope: {
2426
scope1: {
2527
subScope1A: 1,

0 commit comments

Comments
 (0)