Merge df9cf90 into 853cd93

andela · Jul 24, 2019 · e45e141 · e45e141
2 parents 853cd93 + df9cf90
commit e45e141
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/models/articlebookmark.js b/src/models/articlebookmark.js
@@ -14,7 +14,13 @@ export default (sequelize, DataTypes) => {
       articleSlug: {
         type: DataTypes.STRING,
         allowNull: false,
-        primaryKey: true
+        primaryKey: true,
+        references: {
+          model: 'Articles',
+          key: 'slug'
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'SET NULL'
       },
       createdAt: {
         allowNull: false,
@@ -29,6 +35,11 @@ export default (sequelize, DataTypes) => {
   );
   ArticleBookmark.associate = (models) => {
     ArticleBookmark.belongsTo(models.User, { foreignKey: 'userId' });
+    ArticleBookmark.belongsTo(models.Article, {
+      foreignKey: 'articleSlug',
+      targetKey: 'slug',
+      as: 'article'
+    });
   };
   return ArticleBookmark;
 };
diff --git a/src/queries/articleBookmarks/getAllBookmarkedArticles.js b/src/queries/articleBookmarks/getAllBookmarkedArticles.js
@@ -7,7 +7,17 @@ import db from '../../models';
 export default async (bookmarkedBy) => {
   try {
     const bookmarkedArticles = bookmarkedBy
-      ? await db.ArticleBookmark.findAll({ where: { userId: bookmarkedBy }, logging: false })
+      ? await db.ArticleBookmark.findAll({
+        where: { userId: bookmarkedBy },
+        logging: false,
+        include: [
+          {
+            model: db.Article,
+            as: 'article',
+            attributes: ['id', 'title', 'description', 'coverUrl', 'readTime']
+          }
+        ]
+      })
       : null;
 
     return bookmarkedArticles || [];