Zainab's PR

db/index.js

@@ -1,5 +1,5 @@
 // Load our .env file
-require('dotenv').config()
+require("dotenv").config();
 
 // Require Client obj from the postgres node module
 const { Client } = require("pg");
@@ -11,15 +11,15 @@ const client = {
     // on the contents of our env file
     // Create a new connection to the database using the Client
     // object provided by the postgres node module
-    const dbClient = new Client(process.env.PGURL)
+    const dbClient = new Client(process.env.PGURL);
     // connect a connection
-    await dbClient.connect()
+    await dbClient.connect();
     // execute the query
-    const result = await dbClient.query(str, values)
+    const result = await dbClient.query(str, values);
     // close the connection
-    await dbClient.end()
-    return result
-  }
-}
+    await dbClient.end();
+    return result;
+  },
+};
 
 module.exports = client;

package.json

@@ -12,15 +12,15 @@
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "faker": "^5.5.3",
     "morgan": "1.10.0",
     "pg": "8.6.0",
     "pg-promise": "^11.5.4"
   },
   "devDependencies": {
     "jest": "^28.1.3",
-    "nodemon": "^3.0.2",
+    "nodemon": "^3.1.4",
     "supertest": "^6.3.3"
   },
   "keywords": []

src/controllers/books.controller.js

@@ -0,0 +1,67 @@
+const { response } = require("express");
+const client = require("../../db/index");
+
+const getAllBooks = async () => {
+  try {
+    const response = await client.query("SELECT * FROM books");
+    return response.rows;
+  } catch (error) {
+    console.log("Error:", error);
+  }
+};
+
+const createBook = async (book) => {
+  try {
+    const sqlQuery = `insert into books (title, type, author, topic, publication_date, pages) values ($1, $2, $3, $4, $5, $6) returning *`;
+    const response = await client.query(sqlQuery, [
+      book.title,
+      book.type,
+      book.author,
+      book.topic,
+      book.publication_date,
+      book.pages,
+    ]);
+    return response.rows[0];
+  } catch (error) {
+    console.log("Error:", error);
+  }
+};
+
+const getBookById = async (id) => {
+  try {
+    const response = await client.query(`SELECT * FROM books WHERE id = ${id}`);
+    return response.rows[0];
+  } catch (error) {
+    console.log("Error:", error);
+  }
+};
+
+const updateBook = async (id, bookInfo) => {
+  try {
+    const response = await client.query(`UPDATE books
+      SET title = '${bookInfo.title}', type = '${bookInfo.type}', author = '${bookInfo.author}', topic = '${bookInfo.topic}', publication_date = '${bookInfo.publication_date}', pages = '${bookInfo.pages}'
+      WHERE id = ${id} RETURNING *`);
+
+    return response.rows[0];
+  } catch (error) {
+    console.log("Error:", error);
+  }
+};
+
+const deleteBook = async (id) => {
+    try {
+      const sqlQuery = `delete from books where id = $1 returning *`;
+      const response = await client.query(sqlQuery, [id]);
+
+      return response.rows[0];
+    } catch (error) {
+      console.log("Error:", error);
+    }
+}
+module.exports = {
+  getAllBooks,
+  createBook,
+  getBookById,
+  updateBook,
+  deleteBook
+};

src/controllers/pets.controller.js

@@ -0,0 +1,67 @@
+const client = require("../../db/index");
+
+const getAllPets = async () => {
+  try {
+    const response = await client.query("SELECT * FROM pets");
+    return response.rows;
+  } catch (error) {
+    console.log("Error:", error);
+  }
+};
+
+const createPet = async (pet) => {
+  try {
+    const sqlQuery = `insert into pets (name, age, type, breed, has_microchip) values ($1, $2, $3, $4, $5) returning *`;
+    const response = await client.query(sqlQuery, [
+      pet.name,
+      pet.age,
+      pet.type,
+      pet.breed,
+      pet.has_microchip,
+    ]);
+
+    return response.rows[0];
+  } catch (error) {
+    console.log("Error:", error);
+  }
+};
+
+const getPetById = async (id) => {
+  try {
+    const response = await client.query(`SELECT * FROM pets WHERE id = ${id}`);
+    return response.rows[0];
+  } catch (error) {
+    console.log("Error:", error);
+  }
+};
+
+const updatePet = async (id, petInfo) => {
+  try {
+    const response = await client.query(`UPDATE pets
+      SET name = '${petInfo.name}', age = '${petInfo.age}', type = '${petInfo.type}', breed = '${petInfo.breed}', has_microchip = '${petInfo.has_microchip}'
+      WHERE id = ${id} RETURNING *`);
+
+    return response.rows[0];
+  } catch (error) {
+    console.log("Error:", error);
+  }
+};
+
+const deletePet = async (id) => {
+  try {
+    const sqlQuery = `delete from pets where id = $1 returning *`;
+    const response = await client.query(sqlQuery, [id]);
+
+    return response.rows[0];
+  } catch (error) {
+    console.log("Error:", error);
+  }
+};
+
+module.exports = {
+  getAllPets,
+  createPet,
+  getPetById,
+  updatePet,
+  deletePet
+};

src/routers/books.js

@@ -1,9 +1,60 @@
-const express = require('express')
-const router = express.Router()
-const db = require("../../db");
+const express = require("express");
+const router = express.Router();
+const {
+  getAllBooks,
+  createBook,
+  getBookById,
+  updateBook, 
+  deleteBook
+} = require("../controllers/books.controller");
 
-router.get('/', async (req, res) => {
+router.get("/", async (req, res) => {
+  const books = await getAllBooks();
+  // console.log(books)
+  res.status(200).json({
+    books,
+  });
+});
 
-})
+router.post("/", async (req, res) => {
+  const book = req.body;
 
-module.exports = router
+  const newBook = await createBook(book);
+
+  res.status(201).json({
+    book: newBook,
+  });
+});
+
+router.get("/:id", async (req, res) => {
+  const id = Number(req.params.id);
+
+  const selectedBook = await getBookById(id);
+
+  res.status(200).json({
+    book: selectedBook,
+  });
+});
+
+router.put("/:id", async (req, res) => {
+    const id = Number(req.params.id);
+    const bookInfo = req.body;
+
+
+    const bookToUpdate = await updateBook(id, bookInfo);
+
+    res.status(201).json({
+      book: bookToUpdate,
+    });
+});
+
+router.delete("/:id", async (req, res) => {
+  const id = Number(req.params.id);
+  const bookToDelete = await deleteBook(id);
+  res.status(201).json({
+    book: bookToDelete
+  });
+});
+
+
+module.exports = router;