Olaoluwa Oyebode_Pull Request

credentials.env

@@ -0,0 +1 @@
+PGURL="postgres://neondb_owner:2lI6UfidxAPz@ep-damp-butterfly-a5ikepwz.us-east-2.aws.neon.tech/neondb"

src/routers/books.js

@@ -1,9 +1,108 @@
-const express = require('express')
-const router = express.Router()
-const db = require("../../db");
+const router = require("express").Router();
 
-router.get('/', async (req, res) => {
+module.exports = function (pool) {
+  // GET all books
+  router.get("/", async function (req, res) {
+    const client = await pool.connect();
+    try {
+      const response = await client.query("SELECT * FROM books");
+      const books = response.rows;
+      res.json({ books: books });
+    } catch (error) {
+      console.error("Error fetching books: ", error);
+      res.status(500).json({ error: "Internal Server Error" });
+    } finally {
+      client.release();
+    }
+  });
 
-})
+  // GET a book by ID
+  router.get("/:id", async function (req, res) {
+    const client = await pool.connect();
+    const { id } = req.params;
+    try {
+      const response = await client.query("SELECT * FROM books WHERE id = $1", [
+        id,
+      ]);
+      const book = response.rows[0];
+      if (book) {
+        res.json({ book: book });
+      } else {
+        res.status(404).json({ error: "Book not found" });
+      }
+    } catch (error) {
+      console.error("Error fetching book by ID: ", error);
+      res.status(500).json({ error: "Internal Server Error" });
+    } finally {
+      client.release();
+    }
+  });
 
-module.exports = router
+  // POST a new book
+  router.post("/", async function (req, res) {
+    const client = await pool.connect();
+    const { title, author, genre, year } = req.body;
+    try {
+      const response = await client.query(
+        "INSERT INTO books (title, author, genre, year) VALUES ($1, $2, $3, $4) RETURNING *",
+        [title, author, genre, year]
+      );
+      const newBook = response.rows[0];
+      res.status(201).json({ book: newBook });
+    } catch (error) {
+      console.error("Error creating a new book: ", error);
+      res.status(500).json({ error: "Internal Server Error" });
+    } finally {
+      client.release();
+    }
+  });
+
+  // PUT update an existing book by ID
+  router.put("/:id", async function (req, res) {
+    const client = await pool.connect();
+    const { id } = req.params;
+    const { title, author, genre, year } = req.body;
+    try {
+      const response = await client.query(
+        "UPDATE books SET title = $1, author = $2, genre = $3, year = $4 WHERE id = $5 RETURNING *",
+        [title, author, genre, year, id]
+      );
+      const updatedBook = response.rows[0];
+      if (updatedBook) {
+        res.json({ book: updatedBook });
+      } else {
+        res.status(404).json({ error: "Book not found" });
+      }
+    } catch (error) {
+      console.error("Error updating book: ", error);
+      res.status(500).json({ error: "Internal Server Error" });
+    } finally {
+      client.release();
+    }
+  });
+
+  // DELETE a book by ID
+  router.delete("/:id", async function (req, res) {
+    const client = await pool.connect();
+    const { id } = req.params;
+    try {
+      const response = await client.query(
+        "DELETE FROM books WHERE id = $1 RETURNING *",
+        [id]
+      );
+      const deletedBook = response.rows[0];
+      if (deletedBook) {
+        res.json({ book: deletedBook });
+      } else {
+        res.status(404).json({ error: "Book not found" });
+      }
+    } catch (error) {
+      console.error("Error deleting book: ", error);
+      res.status(500).json({ error: "Internal Server Error" });
+    } finally {
+      client.release();
+    }
+  });
+
+  return router;
+};

src/routers/pets.js

@@ -0,0 +1,108 @@
+const router = require("express").Router();
+
+module.exports = function (pool) {
+  // GET all pets
+  router.get("/", async function (req, res) {
+    const client = await pool.connect();
+    try {
+      const response = await client.query("SELECT * FROM pets");
+      const pets = response.rows;
+      res.json({ pets: pets });
+    } catch (error) {
+      console.error("Error fetching pets: ", error);
+      res.status(500).json({ error: "Internal Server Error" });
+    } finally {
+      client.release();
+    }
+  });
+
+  // GET a pet by ID
+  router.get("/:id", async function (req, res) {
+    const client = await pool.connect();
+    const { id } = req.params;
+    try {
+      const response = await client.query("SELECT * FROM pets WHERE id = $1", [
+        id,
+      ]);
+      const pet = response.rows[0];
+      if (pet) {
+        res.json({ pet: pet });
+      } else {
+        res.status(404).json({ error: "Pet not found" });
+      }
+    } catch (error) {
+      console.error("Error fetching pet by ID: ", error);
+      res.status(500).json({ error: "Internal Server Error" });
+    } finally {
+      client.release();
+    }
+  });
+
+  // POST a new pet
+  router.post("/", async function (req, res) {
+    const client = await pool.connect();
+    const { name, type, age, owner } = req.body;
+    try {
+      const response = await client.query(
+        "INSERT INTO pets (name, type, age, owner) VALUES ($1, $2, $3, $4) RETURNING *",
+        [name, type, age, owner]
+      );
+      const newPet = response.rows[0];
+      res.status(201).json({ pet: newPet });
+    } catch (error) {
+      console.error("Error creating a new pet: ", error);
+      res.status(500).json({ error: "Internal Server Error" });
+    } finally {
+      client.release();
+    }
+  });
+
+  // PUT update an existing pet by ID
+  router.put("/:id", async function (req, res) {
+    const client = await pool.connect();
+    const { id } = req.params;
+    const { name, type, age, owner } = req.body;
+    try {
+      const response = await client.query(
+        "UPDATE pets SET name = $1, type = $2, age = $3, owner = $4 WHERE id = $5 RETURNING *",
+        [name, type, age, owner, id]
+      );
+      const updatedPet = response.rows[0];
+      if (updatedPet) {
+        res.json({ pet: updatedPet });
+      } else {
+        res.status(404).json({ error: "Pet not found" });
+      }
+    } catch (error) {
+      console.error("Error updating pet: ", error);
+      res.status(500).json({ error: "Internal Server Error" });
+    } finally {
+      client.release();
+    }
+  });
+
+  // DELETE a pet by ID
+  router.delete("/:id", async function (req, res) {
+    const client = await pool.connect();
+    const { id } = req.params;
+    try {
+      const response = await client.query(
+        "DELETE FROM pets WHERE id = $1 RETURNING *",
+        [id]
+      );
+      const deletedPet = response.rows[0];
+      if (deletedPet) {
+        res.json({ pet: deletedPet });
+      } else {
+        res.status(404).json({ error: "Pet not found" });
+      }
+    } catch (error) {
+      console.error("Error deleting pet: ", error);
+      res.status(500).json({ error: "Internal Server Error" });
+    } finally {
+      client.release();
+    }
+  });
+
+  return router;
+};

src/server.js

@@ -1,16 +1,28 @@
 const express = require("express");
 const morgan = require("morgan");
 const cors = require("cors");
+const { Pool } = require("pg");
+const booksRouter = require("./routers/books.js");
+const petsRouter = require("./routers/pets.js");
+
+// Set up a connection to the database
+const pool = new Pool({
+  user: "neondb_owner",
+  host: "ep-damp-butterfly-a5ikepwz.us-east-2.aws.neon.tech",
+  database: "neondb",
+  password: "2lI6UfidxAPz",
+  port: 5432,
+  ssl: true,
+});
 
 const app = express();
 
 app.use(morgan("dev"));
 app.use(cors());
 app.use(express.json());
 
-//TODO: Implement books and pets APIs using Express Modular Routers
-const booksRouter = require('./routers/books.js')
-
-app.use('/books', booksRouter)
+// Implement books and pets APIs using Express Modular Routers
+app.use("/books", booksRouter(pool));
+app.use("/pets", petsRouter(pool));
 
-module.exports = app
+module.exports = app;