From 61d9872bab76da88a74562f8ef97071672506b6e Mon Sep 17 00:00:00 2001 From: Ayobami Date: Mon, 14 Jul 2025 19:08:13 +0100 Subject: [PATCH] feat: complete day 6 --- day5/app.js | 32 +++++---- day5/bin/www | 35 +++++---- day5/models/index.js | 82 ++++++++++++--------- day5/models/transaction.js | 41 +++++++++++ day5/package.json | 11 ++- day5/public/js/import.js | 50 +++++++++++++ day5/routes/importExport.js | 140 ++++++++++++++++++++++++++++++++++++ day5/routes/index.js | 10 ++- day5/views/import.jade | 12 ++++ 9 files changed, 340 insertions(+), 73 deletions(-) create mode 100644 day5/models/transaction.js create mode 100644 day5/public/js/import.js create mode 100644 day5/routes/importExport.js create mode 100644 day5/views/import.jade diff --git a/day5/app.js b/day5/app.js index 97a1728..186136f 100644 --- a/day5/app.js +++ b/day5/app.js @@ -1,11 +1,12 @@ -var createError = require('http-errors'); -var express = require('express'); -var path = require('path'); -var cookieParser = require('cookie-parser'); -var logger = require('morgan'); +var createError = require("http-errors"); +var express = require("express"); +var path = require("path"); +var cookieParser = require("cookie-parser"); +var logger = require("morgan"); -var indexRouter = require('./routes/index'); -var usersRouter = require('./routes/users'); +var indexRouter = require("./routes/index"); +var usersRouter = require("./routes/users"); +const importExportRouter = require("./routes/importExport"); const db = require("./models"); var cors = require("cors"); @@ -13,17 +14,18 @@ var cors = require("cors"); var app = express(); app.set("db", db); // view engine setup -app.set('views', path.join(__dirname, 'views')); -app.set('view engine', 'jade'); +app.set("views", path.join(__dirname, "views")); +app.set("view engine", "jade"); app.use(cors()); -app.use(logger('dev')); +app.use(logger("dev")); app.use(express.json()); app.use(express.urlencoded({ extended: false })); app.use(cookieParser()); -app.use(express.static(path.join(__dirname, 'public'))); +app.use(express.static(path.join(__dirname, "public"))); -app.use('/', indexRouter); -app.use('/users', usersRouter); +app.use("/", indexRouter); +app.use("/users", usersRouter); +app.use("/api/v1", importExportRouter); // catch 404 and forward to error handler app.use(function (req, res, next) { @@ -34,11 +36,11 @@ app.use(function (req, res, next) { app.use(function (err, req, res, next) { // set locals, only providing error in development 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 res.status(err.status || 500); - res.render('error'); + res.render("error"); }); module.exports = app; diff --git a/day5/bin/www b/day5/bin/www index cd1a62f..3cfa7f0 100755 --- a/day5/bin/www +++ b/day5/bin/www @@ -4,16 +4,16 @@ * Module dependencies. */ -var app = require('../app'); -var debug = require('debug')('day-1:server'); -var http = require('http'); +var app = require("../app"); +var debug = require("debug")("day-1:server"); +var http = require("http"); /** * Get port from environment and store in Express. */ -var port = normalizePort(process.env.PORT || '3000'); -app.set('port', port); +var port = normalizePort(process.env.PORT || "3000"); +app.set("port", port); /** * Create HTTP server. @@ -26,8 +26,8 @@ var server = http.createServer(app); */ server.listen(port); -server.on('error', onError); -server.on('listening', onListening); +server.on("error", onError); +server.on("listening", onListening); /** * Normalize a port into a number, string, or false. @@ -54,22 +54,20 @@ function normalizePort(val) { */ function onError(error) { - if (error.syscall !== 'listen') { + if (error.syscall !== "listen") { throw error; } - var bind = typeof port === 'string' - ? 'Pipe ' + port - : 'Port ' + port; + var bind = typeof port === "string" ? "Pipe " + port : "Port " + port; // handle specific listen errors with friendly messages switch (error.code) { - case 'EACCES': - console.error(bind + ' requires elevated privileges'); + case "EACCES": + console.error(bind + " requires elevated privileges"); process.exit(1); break; - case 'EADDRINUSE': - console.error(bind + ' is already in use'); + case "EADDRINUSE": + console.error(bind + " is already in use"); process.exit(1); break; default: @@ -83,8 +81,7 @@ function onError(error) { function onListening() { var addr = server.address(); - var bind = typeof addr === 'string' - ? 'pipe ' + addr - : 'port ' + addr.port; - debug('Listening on ' + bind); + var bind = typeof addr === "string" ? "pipe " + addr : "port " + addr.port; + debug("Listening on " + bind); + console.log("Server is listening on ", bind); } diff --git a/day5/models/index.js b/day5/models/index.js index 8c44682..4628822 100644 --- a/day5/models/index.js +++ b/day5/models/index.js @@ -1,4 +1,4 @@ -'use strict'; +"use strict"; /*Powered By: Manaknightdigital Inc. https://manaknightdigital.com/ Year: 2020*/ /** * Sequelize File @@ -8,49 +8,63 @@ * @author Ryan Wong * */ -const fs = require('fs'); -const path = require('path'); -let Sequelize = require('sequelize'); +const fs = require("fs"); +const path = require("path"); +let Sequelize = require("sequelize"); const basename = path.basename(__filename); -const { DataTypes } = require('sequelize'); +const { DataTypes } = require("sequelize"); const config = { - DB_DATABASE: 'mysql', - DB_USERNAME: 'root', - DB_PASSWORD: 'root', - DB_ADAPTER: 'mysql', - DB_NAME: 'day_1', - DB_HOSTNAME: 'localhost', + DB_DATABASE: "mysql", + DB_USERNAME: "root", + DB_PASSWORD: process.env.DB_PASSWORD || "root", + DB_ADAPTER: "mysql", + DB_NAME: "day_5", + DB_HOSTNAME: "localhost", DB_PORT: 3306, }; let db = {}; -let sequelize = new Sequelize(config.DB_DATABASE, config.DB_USERNAME, config.DB_PASSWORD, { - dialect: config.DB_ADAPTER, - username: config.DB_USERNAME, - password: config.DB_PASSWORD, - database: config.DB_NAME, - host: config.DB_HOSTNAME, - port: config.DB_PORT, - logging: console.log, - timezone: '-04:00', - pool: { - maxConnections: 1, - minConnections: 0, - maxIdleTime: 100, - }, - define: { - timestamps: false, - underscoredAll: true, - underscored: true, - }, -}); +let sequelize = new Sequelize( + config.DB_NAME, + config.DB_USERNAME, + config.DB_PASSWORD, + { + dialect: config.DB_ADAPTER, + username: config.DB_USERNAME, + password: config.DB_PASSWORD, + database: config.DB_NAME, + host: config.DB_HOSTNAME, + port: config.DB_PORT, + logging: console.log, + timezone: "-04:00", + pool: { + maxConnections: 1, + minConnections: 0, + maxIdleTime: 100, + }, + 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) .filter((file) => { - return file.indexOf('.') !== 0 && file !== basename && file.slice(-3) === '.js'; + return ( + file.indexOf(".") !== 0 && file !== basename && file.slice(-3) === ".js" + ); }) .forEach((file) => { var model = require(path.join(__dirname, file))(sequelize, DataTypes); @@ -66,4 +80,4 @@ Object.keys(db).forEach((modelName) => { db.sequelize = sequelize; db.Sequelize = Sequelize; -module.exports = db; \ No newline at end of file +module.exports = db; diff --git a/day5/models/transaction.js b/day5/models/transaction.js new file mode 100644 index 0000000..b8f9e92 --- /dev/null +++ b/day5/models/transaction.js @@ -0,0 +1,41 @@ +module.exports = (sequelize, DataTypes) => { + const transaction = 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.NUMERIC, + allowNull: false, + }, + discount: { + type: DataTypes.NUMERIC, + }, + tax: { + type: DataTypes.NUMERIC, + }, + total: { + type: DataTypes.NUMERIC, + allowNull: false, + }, + notes: DataTypes.STRING, + status: { + type: DataTypes.INTEGER, + allowNull: false, + }, + }); + return transaction; +}; diff --git a/day5/package.json b/day5/package.json index 219c20e..61843b8 100644 --- a/day5/package.json +++ b/day5/package.json @@ -3,17 +3,24 @@ "version": "0.0.0", "private": true, "scripts": { - "start": "node ./bin/www" + "start": "node ./bin/www", + "dev": "node --watch --env-file=.env ./bin/www" }, "dependencies": { "cookie-parser": "~1.4.4", "cors": "^2.8.5", + "csv-parse": "^6.0.0", + "csv-stringify": "^6.6.0", "debug": "~2.6.9", "express": "~4.16.1", "http-errors": "~1.6.3", "jade": "~1.11.0", + "joi": "^17.13.3", "morgan": "~1.9.1", + "multer": "^2.0.1", "mysql2": "^2.3.3", - "sequelize": "^6.15.1" + "node-input-validator": "^4.5.1", + "sequelize": "^6.15.1", + "xlsx": "^0.18.5" } } diff --git a/day5/public/js/import.js b/day5/public/js/import.js new file mode 100644 index 0000000..d704239 --- /dev/null +++ b/day5/public/js/import.js @@ -0,0 +1,50 @@ +document.addEventListener("DOMContentLoaded", function () { + const form = document.getElementById("importForm"); + const resultDiv = document.getElementById("result"); + const exportBtn = document.getElementById("exportBtn"); + + exportBtn.addEventListener("click", async function () { + try { + const response = await fetch("/api/v1/export", { + method: "GET", + }); + if (!response.ok) { + const data = await response.json(); + resultDiv.textContent = "Error: " + (data.error || "Unknown error"); + return; + } + const blob = await response.blob(); + const url = window.URL.createObjectURL(blob); + const a = document.createElement("a"); + a.href = url; + a.download = "transactions.csv"; + document.body.appendChild(a); + a.click(); + a.remove(); + window.URL.revokeObjectURL(url); + resultDiv.textContent = "Export successful!"; + } catch (err) { + resultDiv.textContent = "Error: " + err.message; + } + }); + + form.addEventListener("submit", async function (e) { + e.preventDefault(); + const formData = new FormData(form); + + try { + const response = await fetch("/api/v1/import", { + method: "POST", + body: formData, + }); + const data = await response.json(); + if (data.success) { + resultDiv.textContent = "Import successful!"; + } else { + resultDiv.textContent = "Error: " + (data.error || "Unknown error"); + } + } catch (err) { + resultDiv.textContent = "Error: " + err.message; + } + }); +}); diff --git a/day5/routes/importExport.js b/day5/routes/importExport.js new file mode 100644 index 0000000..e15152a --- /dev/null +++ b/day5/routes/importExport.js @@ -0,0 +1,140 @@ +const express = require("express"); +const router = express.Router(); + +const { Validator } = require("node-input-validator"); +const multer = require("multer"); +const fs = require("fs"); +const path = require("path"); +const { parse: csvParse } = require("csv-parse"); +const XLSX = require("xlsx"); +const { stringify } = require("csv-stringify"); + +const upload = multer({ + dest: "uploads/", + limits: { fileSize: 5 * 1024 * 1024 }, // 5MB max size +}); + +const db = require("../models"); +const transaction = db.transaction; // or db.Transaction + +// Validation schema +const transactionValidationRules = { + order_id: "required|integer", + user_id: "required|integer", + shipping_dock_id: "required|integer", + amount: "required|numeric", + discount: "required|numeric", + tax: "required|numeric", + total: "required|numeric", + notes: "string", + status: "required|integer", +}; + +const transactionValidationMessages = { + "order_id.required": "Order ID is required", + "user_id.required": "User ID is required", + // add more if needed +}; + +// Import endpoint +router.post("/import", upload.single("file"), async (req, res) => { + if (!req.file) { + return res.status(400).json({ success: false, error: "No file uploaded" }); + } + + const ext = path.extname(req.file.originalname).toLowerCase(); + let records = []; + + try { + if (ext === ".csv") { + const fileContent = fs.readFileSync(req.file.path, "utf8"); + records = await new Promise((resolve, reject) => { + csvParse(fileContent, { columns: true, trim: true }, (err, output) => { + if (err) reject(err); + else resolve(output); + }); + }); + } else if (ext === ".xlsx" || ext === ".xls") { + const workbook = XLSX.readFile(req.file.path); + const sheetName = workbook.SheetNames[0]; + records = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]); + } else { + fs.unlinkSync(req.file.path); + return res + .status(400) + .json({ success: false, error: "Unsupported file type" }); + } + + const errors = []; + const inserted = []; + + // Optional: Collect valid rows for bulk insert + const validRows = []; + + for (const [i, row] of records.entries()) { + const v = new Validator( + row, + transactionValidationRules, + transactionValidationMessages + ); + const isValid = await v.check(); + + if (!isValid) { + errors.push({ row: i + 1, errors: v.errors }); + continue; + } + + try { + validRows.push(row); + } catch (dbErr) { + errors.push({ row: i + 1, errors: dbErr.message }); + } + } + + if (validRows.length) { + const created = await transaction.bulkCreate(validRows); + inserted.push(...created); + } + + fs.unlinkSync(req.file.path); // clean up + + if (errors.length) { + return res + .status(400) + .json({ success: false, errors, insertedCount: inserted.length }); + } + + return res.status(200).json({ success: true, inserted }); + } catch (err) { + if (req.file && fs.existsSync(req.file.path)) fs.unlinkSync(req.file.path); + return res.status(500).json({ success: false, error: err.message }); + } +}); + +// Export endpoint +router.get("/export", async (req, res) => { + try { + const transactions = await transaction.findAll({ raw: true }); + if (!transactions.length) { + return res + .status(404) + .json({ success: false, error: "No transactions found" }); + } + + stringify(transactions, { header: true }, (err, output) => { + if (err) { + return res.status(500).json({ success: false, error: err.message }); + } + res.setHeader("Content-Type", "text/csv"); + res.setHeader( + "Content-Disposition", + 'attachment; filename="transactions.csv"' + ); + res.status(200).send(output); + }); + } catch (err) { + res.status(500).json({ success: false, error: err.message }); + } +}); + +module.exports = router; diff --git a/day5/routes/index.js b/day5/routes/index.js index ecca96a..5e49ad2 100644 --- a/day5/routes/index.js +++ b/day5/routes/index.js @@ -1,9 +1,13 @@ -var express = require('express'); +var express = require("express"); var router = express.Router(); /* GET home page. */ -router.get('/', function(req, res, next) { - res.render('index', { title: 'Express' }); +router.get("/", function (req, res, next) { + res.render("index", { title: "Express" }); +}); + +router.get("/import", function (_, res) { + res.render("import"); }); module.exports = router; diff --git a/day5/views/import.jade b/day5/views/import.jade new file mode 100644 index 0000000..9a41b0f --- /dev/null +++ b/day5/views/import.jade @@ -0,0 +1,12 @@ +extends layout + +block content + h1 Import Transactions + form#importForm(action="/api/v1/import" method="POST" enctype="multipart/form-data") + label(for="file") Choose CSV or Excel file: + input(type="file" name="file" id="file" accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel") + br + button#exportBtn(type="button") Export + button(type="submit") Import + div#result + script(src="/js/import.js") \ No newline at end of file