feat: complete day 1

This commit is contained in:
Ayobami
2025-07-10 21:08:42 +01:00
parent 1703819bda
commit b277c8182d
13 changed files with 512 additions and 79 deletions
+2
View File
@@ -0,0 +1,2 @@
DB_PASSWORD=ayobamidavid
PORT=8000
+24 -15
View File
@@ -1,29 +1,38 @@
var createError = require('http-errors'); var createError = require("http-errors");
var express = require('express'); var express = require("express");
var path = require('path'); var path = require("path");
var cookieParser = require('cookie-parser'); var cookieParser = require("cookie-parser");
var logger = require('morgan'); var logger = require("morgan");
var indexRouter = require('./routes/index'); var indexRouter = require("./routes/index");
var usersRouter = require('./routes/users'); var usersRouter = require("./routes/users");
const db = require("./models"); const db = require("./models");
var cors = require("cors"); var cors = require("cors");
const shippingDockRouter = require("./routes/shippingDock");
const orderRouter = require("./routes/order");
const transactionRouter = require("./routes/transaction");
var app = express(); var app = express();
app.set("db", db); app.set("db", db);
// view engine setup // view engine setup
app.set('views', path.join(__dirname, 'views')); app.set("views", path.join(__dirname, "views"));
app.set('view engine', 'jade'); app.set("view engine", "jade");
app.use(cors()); app.use(cors());
app.use(logger('dev')); app.use(logger("dev"));
app.use(express.json()); app.use(express.json());
app.use(express.urlencoded({ extended: false })); app.use(express.urlencoded({ extended: false }));
app.use(cookieParser()); app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public'))); app.use(express.static(path.join(__dirname, "public")));
app.use('/', indexRouter); app.use("/", indexRouter);
app.use('/users', usersRouter); app.use("/users", usersRouter);
// ROUTES
app.use("/api/v1/shipping_dock", shippingDockRouter);
app.use("/api/v1/order", orderRouter);
app.use("/api/v1/transaction", transactionRouter);
// catch 404 and forward to error handler // catch 404 and forward to error handler
app.use(function (req, res, next) { app.use(function (req, res, next) {
@@ -34,11 +43,11 @@ app.use(function (req, res, next) {
app.use(function (err, req, res, next) { app.use(function (err, req, res, next) {
// set locals, only providing error in development // set locals, only providing error in development
res.locals.message = err.message; res.locals.message = err.message;
res.locals.error = req.app.get('env') === 'development' ? err : {}; res.locals.error = req.app.get("env") === "development" ? err : {};
// render the error page // render the error page
res.status(err.status || 500); res.status(err.status || 500);
res.render('error'); res.render("error");
}); });
module.exports = app; module.exports = app;
+16 -19
View File
@@ -4,16 +4,16 @@
* Module dependencies. * Module dependencies.
*/ */
var app = require('../app'); var app = require("../app");
var debug = require('debug')('day-1:server'); var debug = require("debug")("day-1:server");
var http = require('http'); var http = require("http");
/** /**
* Get port from environment and store in Express. * Get port from environment and store in Express.
*/ */
var port = normalizePort(process.env.PORT || '3000'); var port = normalizePort(process.env.PORT || "3000");
app.set('port', port); app.set("port", port);
/** /**
* Create HTTP server. * Create HTTP server.
@@ -26,8 +26,8 @@ var server = http.createServer(app);
*/ */
server.listen(port); server.listen(port);
server.on('error', onError); server.on("error", onError);
server.on('listening', onListening); server.on("listening", onListening);
/** /**
* Normalize a port into a number, string, or false. * Normalize a port into a number, string, or false.
@@ -54,22 +54,20 @@ function normalizePort(val) {
*/ */
function onError(error) { function onError(error) {
if (error.syscall !== 'listen') { if (error.syscall !== "listen") {
throw error; throw error;
} }
var bind = typeof port === 'string' var bind = typeof port === "string" ? "Pipe " + port : "Port " + port;
? 'Pipe ' + port
: 'Port ' + port;
// handle specific listen errors with friendly messages // handle specific listen errors with friendly messages
switch (error.code) { switch (error.code) {
case 'EACCES': case "EACCES":
console.error(bind + ' requires elevated privileges'); console.error(bind + " requires elevated privileges");
process.exit(1); process.exit(1);
break; break;
case 'EADDRINUSE': case "EADDRINUSE":
console.error(bind + ' is already in use'); console.error(bind + " is already in use");
process.exit(1); process.exit(1);
break; break;
default: default:
@@ -83,8 +81,7 @@ function onError(error) {
function onListening() { function onListening() {
var addr = server.address(); var addr = server.address();
var bind = typeof addr === 'string' var bind = typeof addr === "string" ? "pipe " + addr : "port " + addr.port;
? 'pipe ' + addr debug("Listening on " + bind);
: 'port ' + addr.port; console.log("Server is listening on " + bind);
debug('Listening on ' + bind);
} }
+48 -34
View File
@@ -1,4 +1,4 @@
'use strict'; "use strict";
/*Powered By: Manaknightdigital Inc. https://manaknightdigital.com/ Year: 2020*/ /*Powered By: Manaknightdigital Inc. https://manaknightdigital.com/ Year: 2020*/
/** /**
* Sequelize File * Sequelize File
@@ -8,49 +8,63 @@
* @author Ryan Wong * @author Ryan Wong
* *
*/ */
const fs = require('fs'); const fs = require("fs");
const path = require('path'); const path = require("path");
let Sequelize = require('sequelize'); let Sequelize = require("sequelize");
const basename = path.basename(__filename); const basename = path.basename(__filename);
const { DataTypes } = require('sequelize'); const { DataTypes } = require("sequelize");
const config = { const config = {
DB_DATABASE: 'mysql', DB_DATABASE: "mysql",
DB_USERNAME: 'root', DB_USERNAME: "root",
DB_PASSWORD: 'root', DB_PASSWORD: process.env.DB_PASSWORD,
DB_ADAPTER: 'mysql', DB_ADAPTER: "mysql",
DB_NAME: 'day_1', DB_NAME: "day_1",
DB_HOSTNAME: 'localhost', DB_HOSTNAME: "localhost",
DB_PORT: 3306, DB_PORT: 3306,
}; };
let db = {}; let db = {};
let sequelize = new Sequelize(config.DB_DATABASE, config.DB_USERNAME, config.DB_PASSWORD, { let sequelize = new Sequelize(
dialect: config.DB_ADAPTER, config.DB_NAME,
username: config.DB_USERNAME, config.DB_USERNAME,
password: config.DB_PASSWORD, config.DB_PASSWORD,
database: config.DB_NAME, {
host: config.DB_HOSTNAME, dialect: config.DB_ADAPTER,
port: config.DB_PORT, username: config.DB_USERNAME,
logging: console.log, password: config.DB_PASSWORD,
timezone: '-04:00', database: config.DB_NAME,
pool: { host: config.DB_HOSTNAME,
maxConnections: 1, port: config.DB_PORT,
minConnections: 0, logging: console.log,
maxIdleTime: 100, timezone: "-04:00",
}, pool: {
define: { maxConnections: 1,
timestamps: false, minConnections: 0,
underscoredAll: true, maxIdleTime: 100,
underscored: true, },
}, define: {
}); timestamps: false,
underscoredAll: true,
underscored: true,
},
}
);
// sequelize.sync({ force: true }); sequelize
.sync()
.then(() => {
console.log("All tables synced successfully.");
})
.catch((err) => {
console.error("Failed to sync tables:", err);
});
fs.readdirSync(__dirname) fs.readdirSync(__dirname)
.filter((file) => { .filter((file) => {
return file.indexOf('.') !== 0 && file !== basename && file.slice(-3) === '.js'; return (
file.indexOf(".") !== 0 && file !== basename && file.slice(-3) === ".js"
);
}) })
.forEach((file) => { .forEach((file) => {
var model = require(path.join(__dirname, file))(sequelize, DataTypes); var model = require(path.join(__dirname, file))(sequelize, DataTypes);
@@ -66,4 +80,4 @@ Object.keys(db).forEach((modelName) => {
db.sequelize = sequelize; db.sequelize = sequelize;
db.Sequelize = Sequelize; db.Sequelize = Sequelize;
module.exports = db; module.exports = db;
+4 -10
View File
@@ -1,5 +1,5 @@
module.exports = (sequelize, DataTypes) => { module.exports = (sequelize, DataTypes) => {
const location = sequelize.define( return sequelize.define(
"location", "location",
{ {
id: { id: {
@@ -8,19 +8,13 @@ module.exports = (sequelize, DataTypes) => {
autoIncrement: true, autoIncrement: true,
}, },
name: DataTypes.STRING, name: DataTypes.STRING,
created_at: DataTypes.DATEONLY,
updated_at: DataTypes.DATE,
}, },
{ {
timestamps: true, timestamps: true,
freezeTableName: true, freezeTableName: true,
tableName: "location", tableName: "location",
}, createdAt: "created_at",
{ updatedAt: "updated_at",
underscoredAll: false,
underscored: false,
} }
); );
};
return location;
};
+37
View File
@@ -0,0 +1,37 @@
module.exports = (sequelize, DataTypes) => {
return sequelize.define(
"Order",
{
id: {
type: DataTypes.INTEGER,
primaryKey: true,
autoIncrement: true,
},
order_id: {
type: DataTypes.INTEGER,
allowNull: false,
},
user_id: {
type: DataTypes.INTEGER,
allowNull: false,
},
shipping_dock_id: {
type: DataTypes.INTEGER,
allowNull: false,
},
amount: {
type: DataTypes.INTEGER,
allowNull: false,
},
notes: DataTypes.STRING,
status: {
type: DataTypes.INTEGER,
allowNull: false,
defaultValue: 0,
},
},
{
tableName: "orders",
}
);
};
+24
View File
@@ -0,0 +1,24 @@
module.exports = (sequelize, DataTypes) => {
return sequelize.define(
"ShippingDock",
{
id: {
type: DataTypes.INTEGER,
primaryKey: true,
autoIncrement: true,
},
name: {
type: DataTypes.STRING,
allowNull: false,
},
status: {
type: DataTypes.INTEGER,
allowNull: false,
defaultValue: 0,
},
},
{
tableName: "shipping_dock",
}
);
};
+32
View File
@@ -0,0 +1,32 @@
module.exports = (sequelize, DataTypes) => {
return sequelize.define(
"Transaction",
{
id: {
type: DataTypes.INTEGER,
primaryKey: true,
autoIncrement: true,
},
order_id: {
type: DataTypes.INTEGER,
allowNull: false,
},
user_id: {
type: DataTypes.INTEGER,
allowNull: false,
},
shipping_dock_id: {
type: DataTypes.INTEGER,
allowNull: false,
},
amount: {
type: DataTypes.INTEGER,
allowNull: false,
},
notes: DataTypes.STRING,
},
{
tableName: "transactions",
}
);
};
+2 -1
View File
@@ -3,7 +3,8 @@
"version": "0.0.0", "version": "0.0.0",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "node ./bin/www" "start": "node ./bin/www",
"dev": "node --watch --env-file=.env ./bin/www"
}, },
"dependencies": { "dependencies": {
"cookie-parser": "~1.4.4", "cookie-parser": "~1.4.4",
+104
View File
@@ -0,0 +1,104 @@
const express = require("express");
const router = express.Router();
const { Order } = require("../models");
const {
handleError,
handleSuccess,
handleSequelizeError,
deepEqual,
} = require("../utils");
// GET all orders
router.get("/", async (_, res) => {
try {
const orders = await Order.findAll();
handleSuccess(res, orders);
} catch (err) {
handleSequelizeError(err, res);
}
});
// GET one order by id
router.get("/:id", async (req, res) => {
try {
const order = await Order.findByPk(req.params.id);
if (!order) return handleError("Order not found", 404, res);
handleSuccess(res, order);
} catch (err) {
handleSequelizeError(err, res);
}
});
// POST create an order
router.post("/", async (req, res) => {
try {
const { order_id, user_id, shipping_dock_id, amount, notes } = req.body;
if (
order_id === undefined ||
user_id === undefined ||
shipping_dock_id === undefined ||
amount === undefined ||
notes === undefined
) {
return handleError("All fields are required", 400, res);
}
const order = await Order.create(req.body);
handleSuccess(res, order, 201);
} catch (err) {
handleError(err.message, 500, res);
}
});
// PUT update an order
router.put("/:id", async (req, res) => {
try {
const { id } = req.params;
const order = await Order.findByPk(id);
if (!order) return handleError("Order not found", 404, res);
// Only allow updating amount, notes, and status
const allowedFields = ["amount", "notes", "status"];
const changes = {};
for (const key of allowedFields) {
if (
req.body[key] !== undefined &&
!deepEqual(req.body[key], order[key])
) {
changes[key] = req.body[key];
}
}
// Validate status if present
if (
changes.status !== undefined &&
![0, 1].includes(Number(changes.status))
) {
return handleError("Status must be 0 or 1", 400, res);
}
if (Object.keys(changes).length === 0) {
return handleError("No updated fields", 400, res); // No changes
}
await order.update(changes);
handleSuccess(res, await Order.findByPk(id));
} catch (err) {
handleSequelizeError(err, res);
}
});
// DELETE an order
router.delete("/:id", async (req, res) => {
try {
const deleted = await Order.destroy({
where: { id: req.params.id },
});
if (deleted === 0) return handleError("Order not found", 404, res);
handleSuccess(res, null, 204); // 204 No Content
} catch (err) {
handleSequelizeError(err, res);
}
});
module.exports = router;
+94
View File
@@ -0,0 +1,94 @@
const express = require("express");
const router = express.Router();
const { ShippingDock } = require("../models");
const {
handleError,
handleSuccess,
handleSequelizeError,
deepEqual,
} = require("../utils");
// GET all shipping docks
router.get("/", async (_, res) => {
try {
const docks = await ShippingDock.findAll();
handleSuccess(res, docks);
} catch (err) {
handleSequelizeError(err, res);
}
});
// GET one shipping dock by id
router.get("/:id", async (req, res) => {
try {
const dock = await ShippingDock.findByPk(req.params.id);
if (!dock) return handleError("Dock not found", 404, res);
handleSuccess(res, dock);
} catch (err) {
handleSequelizeError(err, res);
}
});
// POST create a shipping dock
router.post("/", async (req, res) => {
try {
const { name } = req.body;
if (!name || !name.trim()) {
return handleError("Name is required and cannot be empty", 400, res);
}
await ShippingDock.create(req.body);
handleSuccess(res, dock, 201);
} catch (err) {
handleError(err.message, 500, res);
}
});
// PUT update a shipping dock
router.put("/:id", async (req, res) => {
try {
const { id } = req.params;
const dock = await ShippingDock.findByPk(id);
if (!dock) return handleError("Dock not found", 404, res);
// Validate status separately
if (
req.body.status !== undefined &&
![0, 1].includes(Number(req.body.status))
) {
return handleError("Status must be 0 or 1", 400, res);
}
// Build changes object dynamically
const changes = {};
for (const key in req.body) {
if (req.body[key] !== undefined && !deepEqual(req.body[key], dock[key])) {
changes[key] = req.body[key];
}
}
if (Object.keys(changes).length === 0) {
return handleError("No updated fields", 400, res); // No changes
}
await dock.update(changes);
handleSuccess(res, await ShippingDock.findByPk(id));
} catch (err) {
handleSequelizeError(err, res);
}
});
// DELETE a shipping dock
router.delete("/:id", async (req, res) => {
try {
const deleted = await ShippingDock.destroy({
where: { id: req.params.id },
});
if (deleted === 0) return handleError("Dock not found", 404, res);
handleSuccess(res, null, 204); // 204 No Content
} catch (err) {
handleSequelizeError(err, res);
}
});
module.exports = router;
+96
View File
@@ -0,0 +1,96 @@
const express = require("express");
const router = express.Router();
const { Transaction } = require("../models");
const {
handleError,
handleSuccess,
handleSequelizeError,
deepEqual,
} = require("../utils");
// GET all transactions
router.get("/", async (_, res) => {
try {
const transactions = await Transaction.findAll();
handleSuccess(res, transactions);
} catch (err) {
handleSequelizeError(err, res);
}
});
// GET one transaction by id
router.get("/:id", async (req, res) => {
try {
const transaction = await Transaction.findByPk(req.params.id);
if (!transaction) return handleError("Transaction not found", 404, res);
handleSuccess(res, transaction);
} catch (err) {
handleSequelizeError(err, res);
}
});
// POST create a transaction
router.post("/", async (req, res) => {
try {
const { order_id, user_id, shipping_dock_id, amount, notes } = req.body;
if (
order_id === undefined ||
user_id === undefined ||
shipping_dock_id === undefined ||
amount === undefined ||
notes === undefined
) {
return handleError("All fields are required", 400, res);
}
const transaction = await Transaction.create(req.body);
handleSuccess(res, transaction, 201);
} catch (err) {
handleError(err.message, 500, res);
}
});
// PUT update a transaction
router.put("/:id", async (req, res) => {
try {
const { id } = req.params;
const transaction = await Transaction.findByPk(id);
if (!transaction) return handleError("Transaction not found", 404, res);
// Only allow updating amount and notes
const allowedFields = ["amount", "notes"];
const changes = {};
for (const key of allowedFields) {
if (
req.body[key] !== undefined &&
!deepEqual(req.body[key], transaction[key])
) {
changes[key] = req.body[key];
}
}
if (Object.keys(changes).length === 0) {
return handleError("No updated fields", 400, res); // No changes
}
await transaction.update(changes);
handleSuccess(res, await Transaction.findByPk(id));
} catch (err) {
handleSequelizeError(err, res);
}
});
// DELETE a transaction
router.delete("/:id", async (req, res) => {
try {
const deleted = await Transaction.destroy({
where: { id: req.params.id },
});
if (deleted === 0) return handleError("Transaction not found", 404, res);
handleSuccess(res, null, 204); // 204 No Content
} catch (err) {
handleSequelizeError(err, res);
}
});
module.exports = router;
+29
View File
@@ -0,0 +1,29 @@
const handleError = (message, status, res) => {
res.status(status).json({ success: false, message });
};
const handleSuccess = (res, data = null, status = 200) => {
res.status(status).json({
success: true,
...(data && { data }),
});
};
// Centralize Sequelize error handling
const handleSequelizeError = (err, res) => {
if (err.name === "SequelizeValidationError") {
return handleError(err.errors.map((e) => e.message).join(", "), 400, res);
}
handleError(err.message, 500, res);
};
function deepEqual(a, b) {
return JSON.stringify(a) === JSON.stringify(b);
}
module.exports = {
handleError,
handleSuccess,
handleSequelizeError,
deepEqual,
};