Skip to content

Commit

Permalink
feature(Update and Delete articles): implements feedback [Fixes #1679…
Browse files Browse the repository at this point in the history 
…66138]
  • Loading branch information
Musinda Kadhuwa committed Aug 22, 2019
1 parent 85310d4 commit 8fda042
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 41 deletions.
8 changes: 5 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@
"coverage": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
"build": "rm -rf build && babel -d ./build ./src -s",
"start": "npm run build && node ./build/index.js",
"pretest": "cross-env NODE_ENV=test npm run down && NODE_ENV=test npm run migrate && NODE_ENV=test npm run seed",
"test": "cross-env NODE_ENV=test nyc --reporter=text mocha --require @babel/register --require @babel/polyfill ./src/tests/*.js --timeout 30000 --exit",
"pretest": "cross-env NODE_ENV=test npm run dropdb && NODE_ENV=test npm run createdb && npm run down && NODE_ENV=test npm run migrate && NODE_ENV=test npm run seed",
"test": "cross-env NODE_ENV=test nyc --reporter=text mocha --require @babel/register --require @babel/polyfill ./src/tests/*.test.js --timeout 30000 --exit",
"down": "cross-env NODE_ENV=test node_modules/.bin/sequelize db:migrate:undo",
"migrate": "cross-env NODE_ENV=test node_modules/.bin/sequelize db:migrate",
"seed": "node_modules/.bin/sequelize db:seed:all"
"seed": "node_modules/.bin/sequelize db:seed:all",
"dropdb": "node_modules/.bin/sequelize db:drop",
"createdb": "node_modules/.bin/sequelize db:create authors-haven-test"
},
"engines": {
"node": "10.16.0"
Expand Down
14 changes: 10 additions & 4 deletions src/controllers/articleController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ class ArticleController {
description: description.trim(),
body: body.trim()
};
if (req.body.tags || req.body.category) {
if (req.body.tags) {
payload.tagList = req.body.tags.trim().split(/[ ,]+/);
}
if (req.body.category) {
payload.category = req.body.category.trim();
}
payload.images = await uploadImage(req.files.image);
Expand Down Expand Up @@ -114,7 +116,11 @@ class ArticleController {
}
article.description = (description || originalArticle.description).trim();
article.body = (body || originalArticle.body).trim();
article.tagList = (tags || originalArticle.tagList.toString()).trim().split(/[ ,]+/);
if (originalArticle.tagList) {
article.tagList = (tags || originalArticle.tagList.toString()).trim().split(/[ ,]+/);
} else {
article.tagList = tags.trim().split(/[ ,]+/);
}
article.category = (category || originalArticle.category).trim();
if (req.files.image) {
article.images = await uploadImage(req.files.image);
Expand All @@ -125,7 +131,7 @@ class ArticleController {
);
if (updatedArticle) {
return res.status(200).json({
message: 'Profile updated successfully',
message: 'Article updated successfully',
article: updatedArticle[1]
});
}
Expand All @@ -143,7 +149,7 @@ class ArticleController {
static async deteleArticle(req, res) {
try {
const deleted = await Article.destroy({
where: { slug: req.userData.slug }
where: { id: req.userData.articleId }
});
if (deleted) {
return res.status(200).json({
Expand Down
1 change: 1 addition & 0 deletions src/middleware/findOwner.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const isOwner = async (req, res, next) => {
});
}
req.userData.slug = slug;
req.userData.articleId = foundArticle.id;
next();
};

Expand Down
22 changes: 0 additions & 22 deletions src/sequelize/seeders/20190820163908-create-admin-and-user.js
View file

This file was deleted.

47 changes: 43 additions & 4 deletions src/tests/article.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ describe('POST AND GET /api/v1/articles', () => {
.request(app)
.post('/api/v1/users/login')
.send({
email: 'carlos@gmail.com',
password: 'User1234'
email: 'eric.malaba@gmail.com',
password: 'Superadmin12'
})
.end((err, res) => {
if (err) done(err);
Expand Down Expand Up @@ -169,6 +169,19 @@ describe('POST AND GET /api/v1/articles', () => {
done();
});
});
it('Should return error if category is empty', (done) => {
chai
.request(app)
.post('/api/v1/articles')
.set('Authorization', userToken)
.field(dummyArticle.lessCategory)
.end((err, res) => {
if (err) done(err);
expect(res).have.status(201);
expect(res.body).to.have.keys('article');
done();
});
});
it('Should return error if category is not a string', (done) => {
chai
.request(app)
Expand Down Expand Up @@ -197,6 +210,19 @@ describe('POST AND GET /api/v1/articles', () => {
done();
});
});
it('Should return error if taglist is not set', (done) => {
chai
.request(app)
.post('/api/v1/articles')
.set('Authorization', userToken)
.field(dummyArticle.lessTags)
.end((err, res) => {
if (err) done(err);
expect(res).have.status(201);
expect(res.body).to.have.key('article');
done();
});
});
it('Should create and return an article', (done) => {
chai
.request(app)
Expand Down Expand Up @@ -325,7 +351,7 @@ describe('UPDATE /api/v1/articles/:slug', () => {
if (err) done(err);
expect(res).have.status(200);
expect(res.body).to.have.key('article', 'message');
expect(res.body.message).to.deep.equal('Profile updated successfully');
expect(res.body.message).to.deep.equal('Article updated successfully');
done();
});
});
Expand Down Expand Up @@ -355,6 +381,19 @@ describe('UPDATE /api/v1/articles/:slug', () => {
done();
});
});
it('Should return error if taglist is not set', (done) => {
chai
.request(app)
.put(`/api/v1/articles/${articleSlug}`)
.set('Authorization', userToken)
.field(dummyArticle.updateMissingtags)
.end((err, res) => {
if (err) done(err);
expect(res).have.status(200);
expect(res.body).to.have.key('article', 'message');
done();
});
});
it('Should return the old body if it was not updated', (done) => {
chai
.request(app)
Expand Down Expand Up @@ -405,7 +444,7 @@ describe('UPDATE /api/v1/articles/:slug', () => {
if (err) done(err);
expect(res).have.status(200);
expect(res.body).to.have.key('article', 'message');
expect(res.body.message).to.deep.equal('Profile updated successfully');
expect(res.body.message).to.deep.equal('Article updated successfully');
newArticleSlug = res.body.article.slug;
done();
});
Expand Down
28 changes: 21 additions & 7 deletions src/tests/dummyData/dummyArticle.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
export default {
validArticle: {
title: 'Growth mindset',
description: 'How to demonstrate growth mindsewt',
category: 'Eductaion',
body:
'is simply dummy text of the printing and typesetting industry Lorem Ipsum has'
},
lessCategory: {
title: 'Growth mindset',
description: 'How to demonstrate growth mindsewt',
tags: 'Fixed mind, Confidence, low self-esteem',
body:
'is simply dummy text of the printing and typesetting industry Lorem Ipsum has'
},
lessTags: {
title: 'Growth mindset',
description: 'How to demonstrate growth mindsewt',
category: 'Eductaion',
body:
'is simply dummy text of the printing and typesetting industry Lorem Ipsum has'
Expand Down Expand Up @@ -44,13 +57,12 @@ export default {
'is simply dummy text of the printing and typesetting industry Lorem Ipsum has'
},
updateMissingBody: {
description: 'How to demonstrate growth mindsewt',
tags: 'Bango, Hip-Hop, R&B',
category: 'Music',
},
updateMissingtags: {
tags: 'Bango, Hip-Hop, R&B',
body:
'Music is the best medicine. It can get you out of bed and wiggle your body'
description: 'How to demonstrate growth mindsewt',
category: 'Music',
},
updateMissingCategory: {
tags: 'Bango, Hip-Hop, R&B',
Expand All @@ -76,14 +88,16 @@ export default {
description: 'How to demonstrate growth mindsewt',
tags: [12, 356, 78, 90],
category: 'Fixed mind Confidence',
body: 'is simply dummy text of the printing and typesetting industry Lorem Ipsum has'
body:
'is simply dummy text of the printing and typesetting industry Lorem Ipsum has'
},
incorrectCategory: {
title: 'Growth mindset',
description: 'How to demonstrate growth mindsewt',
tags: 'Fixed mind-Confidence, Fixed-mind-Confidence',
category: [12, 356, 78, 90],
body: 'is simply dummy text of the printing and typesetting industry Lorem Ipsum has'
body:
'is simply dummy text of the printing and typesetting industry Lorem Ipsum has'
},
invalidUserToken: {
id: 1000,
Expand All @@ -95,5 +109,5 @@ export default {
confirmPassword: 'Jamal1230!',
role: 'user',
verified: true
},
}
};
28 changes: 27 additions & 1 deletion swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,19 @@
}
}
}
},
"404": {
"description": "Article not found",
"schema": {
"properties": {
"error": {
"type": "string"
},
"me": {
"type": "string"
}
}
}
}
}
}
Expand Down Expand Up @@ -1196,6 +1209,19 @@
}
}
},
"401": {
"description": "User is not authenticated",
"schema": {
"properties": {
"error": {
"type": "string"
},
"me": {
"type": "string"
}
}
}
},
"403": {
"description": "Fobidden to make changes",
"schema": {
Expand Down Expand Up @@ -1261,7 +1287,7 @@
}
}
},
"404": {
"403": {
"description": "User is fobidden to delete",
"schema": {
"properties": {
Expand Down

0 comments on commit 8fda042

Please sign in to comment.