3-get-apis finished

__tests__/app.test.js

@@ -4,6 +4,7 @@ const request = require("supertest");
 const db = require("../db/connection.js");
 const seed = require("../db/seeds/seed.js");
 const testData = require("../db/data/test-data");
+const endPoints = require("../endpoints.json");
 
 beforeEach(() => {
   return seed(testData);
@@ -31,7 +32,6 @@ describe('Non existant end-points',()=>{
       .get("/api/topic")
       .expect(404)
       .then((response)=>{
-
         expect(response.body.msg).toBe('Not Found')
       })
   });
@@ -73,3 +73,15 @@ describe("GET /api/articles/:article_id", () => {
 
 })
 
+
+
+describe('get api',()=>{
+  test("return 200 and api endpoints", () => {
+    return request(app)
+      .get("/api")
+      .expect(200)
+      .then(({body})=>{
+        expect(body).toEqual({'endpoints': endPoints})
+      })
+  });
+})

app.js

@@ -1,18 +1,20 @@
 const express = require("express");
 const app = express();
 
-const { getTopics, getArticleById } = require("./db/controllers/app.controllers.js");
+const { getTopics, getArticleById, getAllApis } = require("./controllers/app.controllers.js");
 
 app.get("/api/topics", getTopics);
 
 app.get("/api/articles/:article_id", getArticleById);
 
 
+app.get("/api", getAllApis)
+
 app.all("/*",(req,res)=>{
   res.status(404).send({msg: 'Not Found'})
 })
 
-app.use((err, rex, res, next)=>{
+app.use((err, req, res, next)=>{
   if (err.status){
     res.status(err.status).send({message: err.message})
   } else {

controllers/app.controllers.js

@@ -1,17 +1,27 @@
-const { fetchTopics } = require("../models/app.models.js")
+const { fetchTopics, fetchArticleById } = require("../models/app.models.js")
 const endPoints = require("../endpoints.json");
 
+exports.getAllApis = (req, res) =>{
+        res.status(200).send({ 'endpoints': endPoints})
+}
 exports.getTopics = (req, res, next) => {
 
     fetchTopics()
     .then((topics)=>{
         res.status(200).send({ topics })
     })
-    .catch((err)=>{
-        next(err)
-    })
+    .catch(next)
 }
 
-exports.getAllApis = (req, res) =>{
-        res.status(200).send({ 'endpoints': endPoints})
+exports.getArticleById = (req, res, next) => {
+    const {article_id} = req.params
+    if (isNaN(article_id)) return next({ status: 400, message: 'Not a number, please enter valid id'});
+
+    fetchArticleById(article_id)
+    .then((article)=>{
+        res.status(200).send({ article })
+    })
+    .catch((err)=>{
+        next(err);
+    })
 }

db/models/app.models.js → models/app.models.js

@@ -1,4 +1,4 @@
-const db = require("../connection.js");
+const db = require("../db/connection.js");
 
 exports.fetchTopics = () => {
     return db.query('SELECT * FROM topics;').then(({ rows }) => {