Skip to content

Commit

Permalink
Merge pull request #77 from andela/bg-update-reading-stats-164249016
Browse files Browse the repository at this point in the history 
164249016 Update reading stats
  • Loading branch information
@Makwe-O
Makwe-O committed Feb 26, 2019
2 parents d6fb8bc + 48aa00e commit 2ded3ce
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 33 deletions.
129 changes: 104 additions & 25 deletions server/controllers/ArticleController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,17 @@ import ReadingStatsContoller from './ReadingStatsController';
import eventHandler from '../helpers/eventsHandler';
import MailManager from '../helpers/MailManager';
import newArticleTemplate from '../helpers/emailTemplates/newArticleTemplate';
import TokenManager from '../helpers/TokenManager';

const {
Article, Tag, User, Follow, Comment, Notification, Sequelize, Highlight
Article,
Tag,
User,
Follow,
Comment,
Notification,
Sequelize,
Highlight
} = db;
const { Op } = Sequelize;
const { createReadingStats } = ReadingStatsContoller;
Expand Down Expand Up @@ -42,8 +50,8 @@ class ArticleController {
title,
content,
banner:
banner
|| 'https://res.cloudinary.com/jesseinit/image/upload/v1548941969/photo-1476242906366-d8eb64c2f661.jpg',
banner ||
'https://res.cloudinary.com/jesseinit/image/upload/v1548941969/photo-1476242906366-d8eb64c2f661.jpg',
tagsList: tagsArray,
isPublished: Boolean(isPublished),
isReported: false
Expand All @@ -57,12 +65,20 @@ class ArticleController {
{
model: User,
as: 'followingUser',
attributes: ['id', 'fullName', 'email', 'getEmailsNotification', 'getInAppNotification']
attributes: [
'id',
'fullName',
'email',
'getEmailsNotification',
'getInAppNotification'
]
}
]
});

const myFollowers = myFollowersList.map(user => user.dataValues.followingUser.dataValues);
const myFollowers = myFollowersList.map(
user => user.dataValues.followingUser.dataValues
);

if (articleData.isPublished) {
myFollowers.forEach(async (follower) => {
Expand All @@ -85,7 +101,10 @@ class ArticleController {
}

if (follower.getInAppNotification) {
Util.sendInAppNotification([follower], `${userName} just published a new article`);
Util.sendInAppNotification(
[follower],
`${userName} just published a new article`
);
}
});
}
Expand Down Expand Up @@ -132,7 +151,9 @@ class ArticleController {
const currentPage = Number(query.page) || 1;
const offset = (currentPage - 1) * limit;

const totalArticlesPromise = Article.count({ where: { isPublished: true } });
const totalArticlesPromise = Article.count({
where: { isPublished: true }
});

const articlesPromise = Article.findAndCountAll({
where: { isPublished: true },
Expand All @@ -153,7 +174,10 @@ class ArticleController {
offset
});

const [totalArticles, articles] = await Promise.all([totalArticlesPromise, articlesPromise]);
const [totalArticles, articles] = await Promise.all([
totalArticlesPromise,
articlesPromise
]);

if (articles.count > 0) {
const articleList = articles.rows.map((article) => {
Expand All @@ -163,7 +187,12 @@ class ArticleController {
return article;
});

const paginatedData = pagination(articleList.length, limit, currentPage, totalArticles);
const paginatedData = pagination(
articleList.length,
limit,
currentPage,
totalArticles
);

return response(res, 200, 'success', 'All articles', null, {
articles: articleList,
Expand Down Expand Up @@ -196,6 +225,7 @@ class ArticleController {
static async fetchOne(req, res) {
try {
const { slug } = req.params;
const { authorization } = req.headers;
const userId = req.user !== undefined ? req.user.userId : null;

let article = await Article.findOne({
Expand Down Expand Up @@ -233,7 +263,16 @@ class ArticleController {
});

if (!article) {
return response(res, 404, 'failure', 'not found error', { message: 'Article not found' });
return response(res, 404, 'failure', 'not found error', {
message: 'Article not found'
});
}

if (authorization) {
const token = authorization.split(' ')[1];
const decoded = TokenManager.verify(token);
req.user = decoded;
await createReadingStats(req, res);
}

article = article.toJSON();
Expand All @@ -250,11 +289,14 @@ class ArticleController {
article.createdAt = Util.formatDate(article.createdAt);
article.updatedAt = Util.formatDate(article.updatedAt);

if (req.user) {
await createReadingStats(req, res);
}

return response(res, 200, 'success', 'Article was fetched successfully', null, article);
return response(
res,
200,
'success',
'Article was fetched successfully',
null,
article
);
} catch (error) {
return response(res, 500, 'failure', 'server error', {
message: 'Something went wrong on the server'
Expand Down Expand Up @@ -282,17 +324,25 @@ class ArticleController {
});

if (result) {
const articleSlug = result.title.toLowerCase() === req.body.title.toLowerCase()
? result.slug
: ArticleHelper.generateArticleSlug(req.body.title);
const articleSlug =
result.title.toLowerCase() === req.body.title.toLowerCase()
? result.slug
: ArticleHelper.generateArticleSlug(req.body.title);

req.body.slug = articleSlug;
let article = await result.update(req.body);
article = article.toJSON();
article.timeToRead = TimeToRead.readTime(article);
article.createdAt = Util.formatDate(article.createdAt);
article.updatedAt = Util.formatDate(article.updatedAt);
return response(res, 200, 'success', 'Article was updated successfully', null, article);
return response(
res,
200,
'success',
'Article was updated successfully',
null,
article
);
}
} catch (error) {
return response(
Expand Down Expand Up @@ -325,7 +375,14 @@ class ArticleController {
});
if (article) {
await article.destroy();
return response(res, 200, 'success', 'Article was deleted successfully', null, null);
return response(
res,
200,
'success',
'Article was deleted successfully',
null,
null
);
}
} catch (error) {
return response(
Expand Down Expand Up @@ -355,7 +412,14 @@ class ArticleController {
} else if (title) {
SearchController.byTitle(title, req, res);
} else {
return response(res, 400, 'failure', 'No search parameters supplied', null, null);
return response(
res,
400,
'failure',
'No search parameters supplied',
null,
null
);
}
}

Expand Down Expand Up @@ -464,14 +528,29 @@ class ArticleController {
});

if (tag) {
articleList = ArticleHelper.filterAuthorArticle(articleList, 'tag', tag);
articleList = ArticleHelper.filterAuthorArticle(
articleList,
'tag',
tag
);
} else if (drafts === '') {
articleList = ArticleHelper.filterAuthorArticle(articleList, 'drafts');
articleList = ArticleHelper.filterAuthorArticle(
articleList,
'drafts'
);
} else if (published === '') {
articleList = ArticleHelper.filterAuthorArticle(articleList, 'published');
articleList = ArticleHelper.filterAuthorArticle(
articleList,
'published'
);
}

const paginatedData = pagination(articleList.length, limit, currentPage, totalArticles);
const paginatedData = pagination(
articleList.length,
limit,
currentPage,
totalArticles
);
const data = {
articles: articleList,
paginatedData
Expand Down
9 changes: 8 additions & 1 deletion server/controllers/ReadingStatsController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,14 @@ class ReadingStatsController {
include: [
{
model: Article,
attributes: ['slug', 'title', 'content', 'banner']
attributes: [
'slug',
'title',
'content',
'banner',
'timeToRead',
'createdAt'
]
}
]
});
Expand Down
42 changes: 35 additions & 7 deletions server/middlewares/AuthMiddleware.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@ class AuthMiddleware {
if (name === 'TokenExpiredError' || name === 'JsonWebTokenError') {
return response(res, 401, 'failure', 'You need to log in again.');
}
return response(res, 500, 'failure', 'An error occured on the server', error.message);
return response(
res,
500,
'failure',
'An error occured on the server',
error.message
);
}
}

Expand Down Expand Up @@ -62,10 +68,15 @@ class AuthMiddleware {

const { roleId } = req.user;
if (
roleId !== '3ceb546e-054d-4c1d-8860-e27c209d4ae4'
&& roleId !== '2023afbb-7072-4759-8161-3d149c9589f2'
roleId !== '3ceb546e-054d-4c1d-8860-e27c209d4ae4' &&
roleId !== '2023afbb-7072-4759-8161-3d149c9589f2'
) {
return response(res, 401, 'failure', 'You are unauthorised to access this page.');
return response(
res,
401,
'failure',
'You are unauthorised to access this page.'
);
}
return next();
} catch (error) {
Expand All @@ -74,7 +85,13 @@ class AuthMiddleware {
return response(res, 401, 'failure', 'You need to log in again.');
}

return response(res, 500, 'failure', 'An error occured on the server', error);
return response(
res,
500,
'failure',
'An error occured on the server',
error
);
}
}

Expand Down Expand Up @@ -102,7 +119,12 @@ class AuthMiddleware {
}

if (req.user.roleId !== '2023afbb-7072-4759-8161-3d149c9589f2') {
return response(res, 403, 'failure', 'You are unauthorised to access this page.');
return response(
res,
403,
'failure',
'You are unauthorised to access this page.'
);
}
return next();
} catch (error) {
Expand All @@ -111,7 +133,13 @@ class AuthMiddleware {
return response(res, 401, 'failure', 'You need to log in again.');
}

return response(res, 500, 'failure', 'An error occured on the server', error);
return response(
res,
500,
'failure',
'An error occured on the server',
error
);
}
}
}
Expand Down
0 server/test/controllers/readStats.js → server/test/controllers/readStats.spec.js
View file
File renamed without changes.

0 comments on commit 2ded3ce

Please sign in to comment.