Merge 683a7d3 into 6d10d56

__tests__/routes/profile.test.js

@@ -73,7 +73,7 @@ describe('Profile', () => {
 
     expect(res.status).toBe(200);
     expect(res.body.user.firstName).toBe('Peter');
-    expect(res.body.message).toBe('The information was updated successful');
+    expect(res.body.message).toBe('The information was updated successfully');
     done();
   });
 
@@ -136,7 +136,7 @@ describe('Profile', () => {
       .set('Authorization', loginUser1.token)
       .send({ user: { username: 'claudine' } });
     expect(res.status).toBe(200);
-    expect(res.body.message).toBe('The information was updated successful');
+    expect(res.body.message).toBe('The information was updated successfully');
     done();
   });
 

app.js

@@ -35,8 +35,8 @@ app.use(
     secret: 'MYSECRETISVERYSECRET',
     store,
     resave: true,
-    saveUninitialized: true,
-  }),
+    saveUninitialized: true
+  })
 );
 app.use(passport.initialize());
 app.use(passport.session());
@@ -66,8 +66,8 @@ app.use((err, req, res) => {
   res.status(err.status || 500).json({
     errors: {
       message: err.message,
-      error: err,
-    },
+      error: err
+    }
   });
 });
 

controllers/ArticleController.js

@@ -18,17 +18,15 @@ class ArticleController {
    * @returns {Object} Returns the response
    */
   static async createArticle(req, res) {
-    const { file, currentUser } = req;
+    const { currentUser } = req;
     const { article } = req.body;
-    const cover = file ? file.url : undefined;
     const slug = slugString(article.title);
     const readingTime = getReadingTime(article.body);
     const newArticle = await Article.create(
       {
         ...article,
         userId: currentUser.id,
         slug,
-        cover,
         readingTime
       },
       {
@@ -100,12 +98,15 @@ class ArticleController {
       await Reader.create({ articleId: article.id });
     }
     const views = await Reader.count({ where: { articleId: article.id } });
-
+    const rated = await Favorite.findOne({
+      where: { articleId: article.id, userId: currentUser ? currentUser.id : null }
+    });
     return res.status(200).json({
       status: 200,
       article: {
         ...article.get(),
         rating: await calculateRating(article.get().id),
+        rated: rated ? rated.rating : 0,
         author: { ...article.get().author.get(), following },
         favorited,
         favoritesCount,

controllers/AuthController.js

@@ -7,7 +7,7 @@ import moment from 'moment';
 import { User, ResetPassword, Token } from '../database/models';
 import { sendEmailConfirmationLink, resetPasswordEmail, newPasswordEmail } from './MailController';
 
-const { JWT_SECRET } = process.env;
+const { JWT_SECRET, FRONTEND_URL } = process.env;
 
 /**
  * @description Authentication class
@@ -192,7 +192,7 @@ class AuthController {
    * @returns {Object} Returns the response
    */
   static async socialLogin(req, res) {
-    return res.json({ status: 200, user: req.user });
+    res.redirect(`${FRONTEND_URL}?token=${req.user.token}`);
   }
 }
 

controllers/ProfileController.js

@@ -61,11 +61,11 @@ class ProfileController {
       await sendEmailConfirmationLink({ ...profile.get() });
       message = 'Your email has changed. Please check your email for confirmation';
     } else {
-      message = 'The information was updated successful';
+      message = 'The information was updated successfully';
     }
     const { confirmationCode, ...userData } = profile.get();
     return res.status(200).send({
-      statu: 200,
+      status: 200,
       message,
       user: userData
     });
@@ -198,12 +198,15 @@ class ProfileController {
    */
   static async getCurrentUser(req, res) {
     const { currentUser } = req;
-
+    const articles = await Article.findAll({
+      where: { userId: currentUser.id, status: { [Op.not]: 'deleted' } }
+    });
     return res.status(200).json({
       status: 200,
       user: {
         ...currentUser,
-        password: undefined
+        password: undefined,
+        articles
       }
     });
   }

controllers/RatingController.js

@@ -28,14 +28,14 @@ class RatingController {
     if (rating) {
       await rating.update({ rating: rate, updatedAt: new Date() });
       const averageRate = await calculateRating(articleId);
+
       return res.status(200).send({
         status: 200,
         message: 'Rating updated successfully',
         rate: { ...rating.get() },
         averageRate
       });
     }
-    const averageRate = await calculateRating(articleId);
     const newRate = await Favorite.create(
       {
         userId: currentUser.id,
@@ -44,6 +44,8 @@ class RatingController {
       },
       { include: [{ model: User, as: 'author' }, { model: Article, as: 'favorites' }] }
     );
+    const averageRate = await calculateRating(articleId);
+
     return res.status(201).send({
       status: 201,
       message: 'article has been rated successfully',
@@ -105,6 +107,9 @@ class RatingController {
         articleId: article.id,
         rating: { [Op.ne]: null }
       },
+      include: [
+        { model: User, as: 'author', attributes: ['username', 'firstName', 'lastName', 'image'] }
+      ],
       limit,
       offset: (queryPage - 1) * limit
     });
@@ -116,6 +121,7 @@ class RatingController {
     }
     return res.status(200).send({
       status: 200,
+      article: article.get(),
       averageRate: await calculateRating(null, article.slug),
       ratings: allRating.rows,
       page: Number(queryPage),

controllers/UserController.js

@@ -31,7 +31,7 @@ class UserController {
     await user.update({ confirmed: 'confirmed', confirmationCode: null });
 
     await sendEmailVerified(user.get());
-    return res.json({ message: `${user.email} has been confirmed` });
+    return res.status(200).json({ status: 200, message: `${user.email} has been confirmed` });
   }
 
   /**