Merge e6cffe3 into 665089d

andela · May 28, 2019 · b5a7cef · b5a7cef
2 parents 665089d + e6cffe3
commit b5a7cef
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/controllers/article.js b/controllers/article.js
@@ -76,7 +76,14 @@ class ArticleController {
     } = req.query;
     Article.findAndCountAll({
       offset: (Number(page) - 1) * Number(limit),
-      limit
+      limit,
+      include: [
+        {
+          model: User,
+          as: 'authorfkey',
+          attributes: ['username', 'email', 'image', 'id', 'bio']
+        }
+      ]
     })
       .then(articles => res.status(200).json({
         status: 200,
@@ -89,7 +96,10 @@ class ArticleController {
           limit
         }
       }))
-      .catch(error => res.status(500).json({ error }));
+      .catch((error) => {
+        console.log(error);
+      });
+    // .catch(error => res.status(500).json({ error }));
   }
 
   /**
@@ -174,7 +184,15 @@ class ArticleController {
     const {
       articleId
     } = req.params;
-    const article = await Article.findByPk(articleId);
+    const article = await Article.findByPk(articleId, {
+      include: [
+        {
+          model: User,
+          as: 'authorfkey',
+          attributes: ['username', 'email', 'image', 'id', 'bio']
+        }
+      ]
+    });
     if (!article) {
       throw new httpError(404, 'Sorry the requested resource could not be found.');
     }

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "pg": "^7.9.0",
     "pg-hstore": "^2.3.2",
     "request": "^2.87.0",
-    "sequelize": "^5.1.0",
+    "sequelize": "^5.8.6",
     "sequelize-cli": "^5.4.0",
     "swagger-ui-express": "^4.0.2",
     "underscore": "^1.9.1",
@@ -66,7 +66,7 @@
     "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-jsx-a11y": "^6.2.1",
     "eslint-plugin-react": "^7.12.4",
-    "mocha": "^6.0.2",
+    "mocha": "^6.1.4",
     "nock": "^10.0.6",
     "nodemon": "^1.18.10",
     "nyc": "^13.3.0"

diff --git a/testingdata/user.json b/testingdata/user.json
@@ -60,7 +60,7 @@
     "password": "1Kig1L@20"
   },
   "googleValidToken": {
-    "access_token": "ya29.GlsSBxyqOjVZv7S402kdyhtzxSVOWHxSuYuCgyLpFTm16ifz14o4r54h8PaxBxsJjC3meeiz5JRyLA7biEmOO7yb2DHNNJg9HKQX9ibpdVbBOM8TGuS9nYiJ9vsQ"
+    "access_token": "ya29.GlsXB42q7CiCIWQEQMig2QWG_-laQRRNyEWjRAemWh6e7yWQv5kNtCh1mKUPYCFhtWVegnAI33MHJk_-uz5RMb71OPJglYun-PHXhFYjlzFhZkvshQjdTjtCuqkn"
   },
   "googleInvalidToken": {
     "access_token": "ya29.Glv1Bvx5U-OTtL7Qxym4ugGyyRsxhEPoKe_Uz5cKKF_mLuGzrxHywvzLx_kgWKVfHZTKL2eg0K5oJ7RVKXwqDSG5-f5PUlo0iFz5jISJrVWsc5Ls7crApI-Uagjy"