Merge ba18f4e into 2b7043b

andela · Aug 3, 2019 · e29f086 · e29f086
2 parents 2b7043b + ba18f4e
commit e29f086
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/src/controllers/ReadingStatController.js b/src/controllers/ReadingStatController.js
@@ -21,7 +21,7 @@ export default class ReadingStat {
     });
 
     return res.status(status.OK).json({
-      saveStat
+      message: saveStat
     });
   }
 

diff --git a/src/models/readingstat.js b/src/models/readingstat.js
@@ -40,6 +40,7 @@ module.exports = (sequelize, DataTypes) => {
     });
     ReadingStat.belongsTo(models.Article, {
       foreignKey: 'articleSlug',
+      targetKey: 'slug',
       as: 'article'
     });
   };

diff --git a/src/queries/comments/getAll.js b/src/queries/comments/getAll.js
@@ -5,7 +5,7 @@ const getAll = async (data = {}) => dbFindAll(db.Comment, data, null, null, [
   {
     model: db.User,
     attributes: ['firstName', 'lastName', 'username', 'email', 'image'],
-    as: 'commentAuthor',
+    as: 'commentAuthor'
   }
 ]);
 

diff --git a/src/queries/readingStats/create.js b/src/queries/readingStats/create.js
@@ -6,6 +6,10 @@ import db from '../../models';
  */
 export default async (data) => {
   let stats = [];
-  stats = await db.ReadingStat.create(data, { logging: false });
+  stats = await db.ReadingStat.findOrCreate({
+    where: data,
+    defaults: 1,
+    logging: false
+  });
   return stats;
 };
diff --git a/src/queries/readingStats/getAll.js b/src/queries/readingStats/getAll.js
@@ -15,6 +15,11 @@ export default async (condition = {}) => db.ReadingStat.findAndCountAll({
       attributes: {
         exclude: ['createdAt', 'updatedAt']
       }
+    },
+    {
+      model: db.Article,
+      as: 'article',
+      attributes: ['id', 'title', 'description', 'coverUrl', 'readTime']
     }
   ],
   order: [['createdAt', 'DESC']]