James C PR

package.json

@@ -1,7 +1,7 @@
 {
   "name": "api_express_with_nodepostgres",
   "version": "1.0.0",
-  "description": "",
+  "description": "In this workshop we're going to look at how to use express with a postgres database.",
   "main": "src/index.js",
   "scripts": {
     "start": "npx nodemon src/index.js",
@@ -11,10 +11,10 @@
   "dependencies": {
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
-    "dotenv": "^16.3.1",
-    "express": "^4.18.2",
+    "dotenv": "^16.4.5",
+    "express": "^4.19.2",
     "faker": "^5.5.3",
-    "morgan": "1.10.0",
+    "morgan": "^1.10.0",
     "pg": "8.6.0",
     "pg-promise": "^11.5.4"
   },
@@ -23,5 +23,11 @@
     "nodemon": "^3.0.2",
     "supertest": "^6.3.3"
   },
-  "keywords": []
+  "keywords": [],
+  "directories": {
+    "doc": "docs",
+    "test": "test"
+  },
+  "author": "",
+  "license": "ISC"
 }

src/index.js

@@ -1,5 +1,5 @@
-const app = require('./server.js')
-const port = 3030;
+const app = require("./server.js");
+const port = 3032;
 
 app.listen(port, () => {
   console.log(`[SERVER] Running on http://localhost:${port}/`);

src/routers/books.js

@@ -1,9 +1,90 @@
-const express = require('express')
-const router = express.Router()
-const db = require("../../db");
+const express = require("express");
+const router = express.Router();
+const client = require("../../db");
 
-router.get('/', async (req, res) => {
+router.get("/", async (req, res) => {
+  try {
+    const response = await client.query("SELECT * FROM books");
+    const books = response.rows;
+    res.json({ books: books });
+  } catch (err) {
+    console.log("Error:", err);
+  }
+});
 
-})
+router.get("/:id", async (req, res) => {
+  try {
+    const response = await client.query(
+      `SELECT * FROM books WHERE id = ${req.params.id}`
+    );
+    const book = response.rows;
+    res.json({ book: book });
+  } catch (err) {
+    console.log("Error:", err);
+  }
+});
 
-module.exports = router
+router.post("/", async (req, res) => {
+  try {
+    const { title, type, author, topic, publication_date, pages } = req.body;
+    const query = `
+      INSERT INTO books (title, type, author, topic, publication_date, pages)
+      VALUES ($1, $2, $3, $4, $5, $6)
+      RETURNING *;`;
+    const response = await client.query(query, [
+      title,
+      type,
+      author,
+      topic,
+      publication_date,
+      pages,
+    ]);
+    const book = response.rows[0];
+    res.status(201).json({ book: book });
+  } catch (err) {
+    console.log("Error:", err);
+  }
+});
+
+router.put("/:id", async (req, res) => {
+  try {
+    const id = req.params.id;
+    const { title, type, author, topic, publication_date, pages } = req.body;
+    const query = `
+      UPDATE books
+      SET title = $1,
+          type = $2,
+          author = $3,
+          topic = $4,
+          publication_date = $5,
+          pages = $6
+      WHERE id = $7;`;
+    const values = [title, type, author, topic, publication_date, pages, id];
+    await client.query(query, values);
+
+    const selectQuery = `SELECT * FROM books WHERE id = ${id};`;
+    const selectResult = await client.query(selectQuery);
+    const book = selectResult.rows[0];
+
+    res.status(200).send({ book: book });
+  } catch (err) {
+    console.log("Error:", err);
+  }
+});
+
+router.delete("/:id", async (req, res) => {
+  try {
+    const id = req.params.id;
+    const selectQuery = `SELECT * FROM books WHERE id = ${id};`;
+    const selectResult = await client.query(selectQuery);
+    const book = selectResult.rows[0];
+
+    const query = `DELETE FROM books WHERE id = ${id};`;
+    await client.query(query);
+    res.status(200).send({ book: book });
+  } catch (err) {
+    console.log("Error:", err);
+  }
+});
+
+module.exports = router;

src/routers/pets.js

@@ -0,0 +1,88 @@
+const express = require("express");
+const router = express.Router();
+const client = require("../../db");
+
+router.get("/", async (req, res) => {
+  try {
+    const response = await client.query("SELECT * FROM pets");
+    const pets = response.rows;
+    res.json({ pets: pets });
+  } catch (err) {
+    console.log("Error:", err);
+  }
+});
+
+router.get("/:id", async (req, res) => {
+  try {
+    const response = await client.query(
+      `SELECT * FROM pets WHERE id = ${req.params.id}`
+    );
+    const pet = response.rows;
+    res.json({ pet: pet });
+  } catch (err) {
+    console.log("Error:", err);
+  }
+});
+
+router.post("/", async (req, res) => {
+  try {
+    const { name, age, type, breed, has_microchip } = req.body;
+    const query = `
+      INSERT INTO pets (name, age, type, breed, has_microchip)
+      VALUES ($1, $2, $3, $4, $5)
+      RETURNING *;`;
+    const response = await client.query(query, [
+      name,
+      age,
+      type,
+      breed,
+      has_microchip,
+    ]);
+    const pet = response.rows[0];
+    res.status(201).json({ pet: pet });
+  } catch (err) {
+    console.log("Error:", err);
+  }
+});
+
+router.put("/:id", async (req, res) => {
+  try {
+    const id = req.params.id;
+    const { name, age, type, breed, has_microchip } = req.body;
+    const query = `
+      UPDATE pets
+      SET name = $1,
+          age = $2,
+          type = $3,
+          breed = $4,
+          has_microchip = $5
+      WHERE id = $6;`;
+    const values = [name, age, type, breed, has_microchip, id];
+    await client.query(query, values);
+
+    const selectQuery = `SELECT * FROM pets WHERE id = ${id};`;
+    const selectResult = await client.query(selectQuery);
+    const pet = selectResult.rows[0];
+
+    res.status(200).send({ pet: pet });
+  } catch (err) {
+    console.log("Error:", err);
+  }
+});
+
+router.delete("/:id", async (req, res) => {
+  try {
+    const id = req.params.id;
+    const selectQuery = `SELECT * FROM pets WHERE id = ${id};`;
+    const selectResult = await client.query(selectQuery);
+    const pet = selectResult.rows[0];
+
+    const query = `DELETE FROM pets WHERE id = ${id};`;
+    await client.query(query);
+    res.status(200).send({ pet: pet });
+  } catch (err) {
+    console.log("Error:", err);
+  }
+});
+
+module.exports = router;

src/server.js

@@ -9,8 +9,10 @@ app.use(cors());
 app.use(express.json());
 
 //TODO: Implement books and pets APIs using Express Modular Routers
-const booksRouter = require('./routers/books.js')
+const booksRouter = require("./routers/books.js");
+const petsRouter = require("./routers/pets.js");
 
-app.use('/books', booksRouter)
+app.use("/books", booksRouter);
+app.use("/pets", petsRouter);
 
-module.exports = app
+module.exports = app;