Skip to content

Commit

Permalink
feature(share-articles): Use util helper fuctions [Finishes #167313416]
Browse files Browse the repository at this point in the history
  • Loading branch information
nkalyesubula committed Aug 29, 2019
1 parent 45cf47f commit 82142a8
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 86 deletions.
28 changes: 11 additions & 17 deletions src/controllers/articles.controller.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import open from 'open';
import 'dotenv/config';
import slug from 'slug';
import _ from 'lodash';
Expand All @@ -10,8 +9,11 @@ import Helper from '../helpers/helper';
import NotificationServices from '../services/notification.service';
import cloudinaryHelper from '../helpers/cloudinaryHelper';
import OpenUrlHelper from '../helpers/share.article.helper';
import Util from '../helpers/util';


const { notifyViaEmailAndPush } = NotificationServices;
const util = new Util();

const db = models.Article;
/**
Expand Down Expand Up @@ -227,32 +229,24 @@ class Articles {
});

if (!article) {
return res.status(404).json({
status: 404,
message: 'Article is not found.'
});
util.setError(404, 'Article is not found.');
return util.send(res);
}
const location = `${process.env.BACKEND_URL}/api/${process.env.API_VERSION}`;
const url = `${location}/articles/${req.params.slug}`;
switch (req.params.channel) {
case 'facebook':
await OpenUrlHelper.openUrl(`https:www.facebook.com/sharer/sharer.php?u=${url}`);
return res.status(200).json({
status: 200,
message: `Article shared to ${req.params.channel}`,
});
util.setError(200, `Article shared to ${req.params.channel}`);
return util.send(res);
case 'twitter':
await OpenUrlHelper.openUrl(`https://twitter.com/intent/tweet?url=${url}`);
return res.status(200).json({
status: 200,
message: `Article shared to ${req.params.channel}`,
});
util.setError(200, `Article shared to ${req.params.channel}`);
return util.send(res);
case 'mail':
await OpenUrlHelper.openUrl(`mailto:?subject=${article.title}&body=${url}`);
return res.status(200).json({
status: 200,
message: `Article shared to ${req.params.channel}`,
});
util.setError(200, `Article shared to ${req.params.channel}`);
return util.send(res);
default:
break;
}
Expand Down
96 changes: 48 additions & 48 deletions test/search.test.js
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
// import { chai, server, expect } from './test-setup';
// import Helper from '../src/helpers/helper';
import { chai, server, expect } from './test-setup';
import Helper from '../src/helpers/helper';

// const usertoken = Helper.generateToken({
// id: 2,
// email: 'user@gmail.com',
// username: 'user',
// verified: false
// });
const usertoken = Helper.generateToken({
id: 2,
email: 'user@gmail.com',
username: 'user',
verified: false
});

// describe('search article query builder', () => {
// it('List of all articles', (done) => {
// chai
// .request(server)
// .get('/api/v1/articles')
// .set('Content-Type', 'application/json')
// .set('Authorization', usertoken)
// .end((err, res) => {
// expect(res.status).to.be.deep.equal(200);
// expect(res.body).to.have.deep.property('message', 'List of all articles');
// });
// done();
// });
// it('Title and description in the query', (done) => {
// chai
// .request(server)
// .get('/api/v1/articles?title=Title&&keyword=here')
// .set('Content-Type', 'application/json')
// .set('Authorization', usertoken)
// .end((err, res) => {
// if (err) done(err);
// expect(res.status).to.be.deep.equal(200);
// expect(res.body).to.have.deep.property('message', 'List of all articles');
// });
// done();
// });
// it('if invalid query key', (done) => {
// chai
// .request(server)
// .get('/api/v1/articles?key=Tilltle')
// .set('Content-Type', 'application/json')
// .set('Authorization', usertoken)
// .end((err, res) => {
// if (err) done(err);
// expect(res.status).to.be.deep.equal(400);
// expect(res.body).to.have.deep.property('error');
// });
// done();
// });
// });
describe('search article query builder', () => {
it('List of all articles', (done) => {
chai
.request(server)
.get('/api/v1/articles')
.set('Content-Type', 'application/json')
.set('Authorization', usertoken)
.end((err, res) => {
expect(res.status).to.be.deep.equal(200);
expect(res.body).to.have.deep.property('message', 'List of all articles');
done();
});
});
it('Title and description in the query', (done) => {
chai
.request(server)
.get('/api/v1/articles?title=Title&&keyword=here')
.set('Content-Type', 'application/json')
.set('Authorization', usertoken)
.end((err, res) => {
if (err) done(err);
expect(res.status).to.be.deep.equal(200);
expect(res.body).to.have.deep.property('message', 'List of all articles');
done();
});
});
it('if invalid query key', (done) => {
chai
.request(server)
.get('/api/v1/articles?key=Tilltle')
.set('Content-Type', 'application/json')
.set('Authorization', usertoken)
.end((err, res) => {
if (err) done(err);
expect(res.status).to.be.deep.equal(400);
expect(res.body).to.have.deep.property('error');
done();
});
});
});
42 changes: 21 additions & 21 deletions test/test.articles.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ describe('Articles', () => {
.end((err, res) => {
expect(res.status).to.be.deep.equal(400);
expect(res.body).to.have.deep.property('status');
done();
});
done();
});
it('create an article', async () => {
const req = {
Expand All @@ -49,24 +49,24 @@ describe('Articles', () => {
await articleController.createArticles(req, res);
expect(res.status).to.have.been.calledWith(201);
});
// it('List of all articles', (done) => {
// chai
// .request(server)
// .get('/api/v1/articles')
// .end((err, res) => {
// expect(res.status).to.be.deep.equal(200);
// expect(res.body).to.have.deep.property('message', 'List of all articles');
// });
// done();
// });
// it('view single article', (done) => {
// chai
// .request(server)
// .get('/api/v1/articles/fakeslug')
// .end((err, res) => {
// expect(res.status).to.be.deep.equal(200);
// expect(res.body).to.have.deep.property('message', 'Article successfully retrieved');
// });
// done();
// });
it('List of all articles', (done) => {
chai
.request(server)
.get('/api/v1/articles')
.end((err, res) => {
expect(res.status).to.be.deep.equal(200);
expect(res.body).to.have.deep.property('message', 'List of all articles');
done();
});
});
it('view single article', (done) => {
chai
.request(server)
.get('/api/v1/articles/fakeslug')
.end((err, res) => {
expect(res.status).to.be.deep.equal(200);
expect(res.body).to.have.deep.property('message', 'Article successfully retrieved');
done();
});
});
});

0 comments on commit 82142a8

Please sign in to comment.