Skip to content

feat: make milestone texts optional #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 29, 2019
Merged

feat: make milestone texts optional #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ee34bf
feat: make milestone texts optional
maxceem Aug 27, 2019
0995456
fix: remove unit tests which are no need anymore
maxceem Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions migrations/20190927_milestone_texts_not_required.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--
-- UPDATE EXISTING TABLES:
-- milestones

ALTER TABLE milestones ALTER COLUMN "plannedText" DROP NOT NULL;
ALTER TABLE milestones ALTER COLUMN "activeText" DROP NOT NULL;
ALTER TABLE milestones ALTER COLUMN "completedText" DROP NOT NULL;
ALTER TABLE milestones ALTER COLUMN "blockedText" DROP NOT NULL;
8 changes: 4 additions & 4 deletions src/models/milestone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ module.exports = (sequelize, DataTypes) => {
type: { type: DataTypes.STRING(45), allowNull: false },
details: DataTypes.JSON,
order: { type: DataTypes.INTEGER, allowNull: false },
plannedText: { type: DataTypes.STRING(512), allowNull: false },
activeText: { type: DataTypes.STRING(512), allowNull: false },
completedText: { type: DataTypes.STRING(512), allowNull: false },
blockedText: { type: DataTypes.STRING(512), allowNull: false },
plannedText: { type: DataTypes.STRING(512) },
activeText: { type: DataTypes.STRING(512) },
completedText: { type: DataTypes.STRING(512) },
blockedText: { type: DataTypes.STRING(512) },
hidden: { type: DataTypes.BOOLEAN, defaultValue: false },
deletedAt: DataTypes.DATE,
createdAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
Expand Down
8 changes: 4 additions & 4 deletions src/routes/milestones/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ const schema = {
type: Joi.string().max(45).required(),
details: Joi.object(),
order: Joi.number().integer().required(),
plannedText: Joi.string().max(512).required(),
activeText: Joi.string().max(512).required(),
completedText: Joi.string().max(512).required(),
blockedText: Joi.string().max(512).required(),
plannedText: Joi.string().max(512),
activeText: Joi.string().max(512),
completedText: Joi.string().max(512),
blockedText: Joi.string().max(512),
hidden: Joi.boolean().optional(),
createdAt: Joi.any().strip(),
updatedAt: Joi.any().strip(),
Expand Down
68 changes: 0 additions & 68 deletions src/routes/milestones/create.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,74 +320,6 @@ describe('CREATE milestone', () => {
.expect(422, done);
});

it('should return 422 if missing plannedText', (done) => {
const invalidBody = {
param: _.assign({}, body.param, {
plannedText: undefined,
}),
};

request(server)
.post('/v4/timelines/1/milestones')
.set({
Authorization: `Bearer ${testUtil.jwts.admin}`,
})
.send(invalidBody)
.expect('Content-Type', /json/)
.expect(422, done);
});

it('should return 422 if missing activeText', (done) => {
const invalidBody = {
param: _.assign({}, body.param, {
activeText: undefined,
}),
};

request(server)
.post('/v4/timelines/1/milestones')
.set({
Authorization: `Bearer ${testUtil.jwts.admin}`,
})
.send(invalidBody)
.expect('Content-Type', /json/)
.expect(422, done);
});

it('should return 422 if missing completedText', (done) => {
const invalidBody = {
param: _.assign({}, body.param, {
completedText: undefined,
}),
};

request(server)
.post('/v4/timelines/1/milestones')
.set({
Authorization: `Bearer ${testUtil.jwts.admin}`,
})
.send(invalidBody)
.expect('Content-Type', /json/)
.expect(422, done);
});

it('should return 422 if missing blockedText', (done) => {
const invalidBody = {
param: _.assign({}, body.param, {
blockedText: undefined,
}),
};

request(server)
.post('/v4/timelines/1/milestones')
.set({
Authorization: `Bearer ${testUtil.jwts.admin}`,
})
.send(invalidBody)
.expect('Content-Type', /json/)
.expect(422, done);
});

it('should return 422 if startDate is after endDate', (done) => {
const invalidBody = {
param: _.assign({}, body.param, {
Expand Down