Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions controllers/bookControllers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
const booksRepo = require("../repo/booksRepo");

const getAllBooks = async (req, res) => {
const result = await booksRepo.getAllBooks(req);

res.status(200).send({ books: result.rows });
};

const createNewBook = async (req, res) => {
const result = await booksRepo.createNewBook(req);

res.status(201).send({ book: result.rows[0] });
};

const listBook = async (req, res) => {
const result = await booksRepo.listBook(req);

res.status(200).send({ book: result.rows[0] });
};

const updateBook = async (req, res) => {
const { id } = req.params;
const bookData = req.body;
const updatedBook = await booksRepo.updateBook(id, bookData);

res.status(201).send({ book: updatedBook });
};
const deleteBook = async (req, res) => {
const { id } = req.params;
const deletedBook = await booksRepo.deleteBook(id);
res.status(201).send({ book: deletedBook });
};

module.exports = {
createNewBook,
getAllBooks,
listBook,
updateBook,
deleteBook,
};
41 changes: 41 additions & 0 deletions controllers/petControllers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
const petsRepo = require("../repo/petsRepo");

const getAllPets = async (req, res) => {
const result = await petsRepo.getAllPets(req);

res.status(200).send({ pets: result.rows });
};

const createNewPet = async (req, res) => {
const result = await petsRepo.createNewPet(req);

res.status(201).send({ pet: result.rows[0] });
};

const listPet = async (req, res) => {
const result = await petsRepo.listPet(req);

res.status(200).send({ pet: result.rows[0] });
};

const updatePet = async (req, res) => {
const { id } = req.params;
const petData = req.body;
const updatedPet = await petsRepo.updatePet(id, petData);

res.status(201).json({ pet: updatedPet });
};

const deletePet = async (req, res) => {
const { id } = req.params;
const deletedPet = await petsRepo.deletePet(id);
res.status(201).send({ pet: deletedPet });
};

module.exports = {
createNewPet,
getAllPets,
listPet,
updatePet,
deletePet,
};
17 changes: 17 additions & 0 deletions db/dbConnection.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
require("dotenv").config();

const { Pool } = require("pg");
const { PGHOST, PGDATABASE, PGUSER, PGPASSWORD } = process.env;

const dbConnection = new Pool({
host: PGHOST,
database: PGDATABASE,
username: PGUSER,
password: PGPASSWORD,
port: 5432,
ssl: {
require: true,
},
});

module.exports = dbConnection;
25 changes: 0 additions & 25 deletions db/index.js

This file was deleted.

12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"dependencies": {
"body-parser": "^1.20.2",
"cors": "^2.8.5",
"dotenv": "^16.3.1",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"faker": "^5.5.3",
"morgan": "1.10.0",
"pg": "8.6.0",
"pg": "^8.6.0",
"pg-promise": "^11.5.4"
},
"devDependencies": {
Expand Down
92 changes: 92 additions & 0 deletions repo/booksRepo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
const dbConnection = require("../db/dbConnection.js");

async function getAllBooks(req) {
const db = await dbConnection.connect();
try {
const sqlQuery = "SELECT * FROM books";
const result = await db.query(sqlQuery);
return result;
} finally {
db.release();
}
}

async function createNewBook(req) {
const db = await dbConnection.connect();
const bookData = require("../test/fixtures/bookData.js");

const { title, type, author, topic, publication_date, pages } =
bookData.book1;

try {
const sqlQuery = `
INSERT INTO books (title, type, author, topic, publication_date, pages)
VALUES ($1, $2, $3, $4, $5, $6)
RETURNING *;
`;
const values = [title, type, author, topic, publication_date, pages];
const result = await db.query(sqlQuery, values);
return result;
} finally {
db.release();
}
}

async function listBook(req) {
const db = await dbConnection.connect();
const { id } = req.params;

try {
const sqlQuery = `SELECT * FROM books WHERE id = $1;`;
const result = await db.query(sqlQuery, [id]);
return result;
} finally {
db.release();
}
}

const updateBook = async (id, bookData) => {
const db = await dbConnection.connect();
const { title, type, author, topic, publication_date, pages } = bookData;

try {
const sqlQuery = `
UPDATE books
SET title = $1,
type = $2,
author = $3,
topic = $4,
publication_date = $5,
pages = $6
WHERE id = $7
RETURNING *;
`;
const values = [title, type, author, topic, publication_date, pages, id];
const result = await db.query(sqlQuery, values);
return result.rows[0];
} finally {
db.release();
}
};

const deleteBook = async (id) => {
const db = await dbConnection.connect();

try {
const sqlQuery = `DELETE FROM books WHERE id = $1 RETURNING *;`;
const result = await db.query(sqlQuery, [id]);
return result.rows[0];
} finally {
db.release();
}
};

module.exports = { deleteBook };

module.exports = {
getAllBooks,
createNewBook,
listBook,
updateBook,
deleteBook,
};
88 changes: 88 additions & 0 deletions repo/petsRepo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
const dbConnection = require("../db/dbConnection.js");

async function getAllPets(req) {
const db = await dbConnection.connect();
try {
const sqlQuery = "SELECT * FROM pets";
const result = await db.query(sqlQuery);
return result;
} finally {
db.release();
}
}

async function createNewPet(req) {
const db = await dbConnection.connect();
const petData = require("../test/fixtures/petData.js");

const { name, age, type, breed, has_microchip } = petData.pet1;

try {
const sqlQuery = `
INSERT INTO pets (name, age, type, breed, has_microchip)
VALUES ($1, $2, $3, $4, $5)
RETURNING *;
`;
const values = [name, age, type, breed, has_microchip];
const result = await db.query(sqlQuery, values);
return result;
} finally {
db.release();
}
}

async function listPet(req) {
const db = await dbConnection.connect();
const { id } = req.params;

try {
const sqlQuery = `SELECT * FROM pets WHERE id = $1;`;
const result = await db.query(sqlQuery, [id]);
return result;
} finally {
db.release();
}
}

const updatePet = async (id, petData) => {
const db = await dbConnection.connect();
const { name, age, type, breed, has_microchip } = petData;

try {
const sqlQuery = `
UPDATE pets
SET name = $1,
age = $2,
type = $3,
breed = $4,
has_microchip = $5
WHERE id = $6
RETURNING *;
`;
const values = [name, age, type, breed, has_microchip, id];
const result = await db.query(sqlQuery, values);
return result.rows[0];
} finally {
db.release();
}
};

const deletePet = async (id) => {
const db = await dbConnection.connect();

try {
const sqlQuery = `DELETE FROM pets WHERE id = $1 RETURNING *;`;
const result = await db.query(sqlQuery, [id]);
return result.rows[0];
} finally {
db.release();
}
};

module.exports = {
getAllPets,
createNewPet,
listPet,
updatePet,
deletePet,
};
21 changes: 15 additions & 6 deletions src/routers/books.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
const express = require('express')
const router = express.Router()
const db = require("../../db");
const express = require("express");
const router = express.Router();

router.get('/', async (req, res) => {
const {
getAllBooks,
createNewBook,
listBook,
updateBook,
deleteBook,
} = require("../../controllers/bookControllers.js");

})
router.get("/", getAllBooks);
router.get("/:id", listBook);
router.post("/", createNewBook);
router.put("/:id", updateBook);
router.delete("/:id", deleteBook);

module.exports = router
module.exports = router;
18 changes: 18 additions & 0 deletions src/routers/pets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
const express = require("express");
const router = express.Router();

const {
getAllPets,
createNewPet,
listPet,
updatePet,
deletePet,
} = require("../../controllers/petControllers.js");

router.get("/", getAllPets);
router.get("/:id", listPet);
router.post("/", createNewPet);
router.put("/:id", updatePet);
router.delete("/:id", deletePet);

module.exports = router;
Loading