feat: complete day 6

This commit is contained in:
Ayobami
2025-07-14 21:52:29 +01:00
parent 61d9872bab
commit f87c93e85c
9 changed files with 246 additions and 73 deletions
+17 -15
View File
@@ -1,11 +1,13 @@
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");
require("./cronJobs/shopifyCustomerSync");
const db = require("./models"); const db = require("./models");
var cors = require("cors"); var cors = require("cors");
@@ -13,17 +15,17 @@ var cors = require("cors");
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);
// 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 +36,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 running on:", bind);
debug('Listening on ' + bind);
} }
+80
View File
@@ -0,0 +1,80 @@
// const { getUnFulfilledOrders } = require("../services/shopifyService");
const { exec } = require("child_process");
const { promisify } = require("util");
const cron = require("node-cron");
const { customer } = require("../models");
const execPromise = promisify(exec);
const API_KEY = "65c3c809c002379e3a0ea04aeaf2cf84";
const API_PASSWORD = "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";
const STORE = "roving-house.myshopify.com";
const API_VERSION = "2022-01";
// (async () => {
// const orders = await getUnFulfilledOrders();
// console.log(orders);
// })();
async function fetchShopifyCustomers() {
let nextUrl = `https://${API_KEY}:${API_PASSWORD}@${STORE}/admin/api/${API_VERSION}/customers.json?limit=250`;
const allCustomers = [];
try {
while (nextUrl) {
const curlCommand = `curl -i -X GET "${nextUrl}"`;
const { stdout } = await execPromise(curlCommand);
// Separate headers and body
const parts = stdout.split("\r\n\r\n");
const rawHeaders = parts[0];
const body = parts.slice(1).join("\r\n\r\n");
const response = JSON.parse(body);
if (response.customers) {
allCustomers.push(...response.customers);
}
// console.log(response);
// Parse pagination header
const match = rawHeaders.match(/<([^>]+)>; rel="next"/);
nextUrl = match ? match[1] : null;
}
return allCustomers;
} catch (error) {
console.error("Error fetching customers:", error);
throw error;
}
}
async function syncCustomers() {
try {
const shopifyCustomers = await fetchShopifyCustomers();
console.log(`Found ${shopifyCustomers.length} customers from Shopify`);
for (const c of shopifyCustomers) {
await customer.findOrCreate({
where: { shopify_customer_id: c.id.toString() },
defaults: {
shopify_customer_id: c.id.toString(),
shopify_customer_email: c.email || "",
},
});
console.log(`Created customer: ${c.id}`);
}
console.log("Customer sync completed successfully");
} catch (error) {
console.error("Customer sync failed:", error);
}
}
// run every minute
cron.schedule("* * * * *", () => {
console.log("Running Shopify customer sync...");
syncCustomers();
});
// For manual testing
module.exports = { syncCustomers };
+19
View File
@@ -0,0 +1,19 @@
module.exports = (sequelize, DataTypes) => {
const customer = sequelize.define("customer", {
id: {
type: DataTypes.INTEGER,
primaryKey: true,
autoIncrement: true,
},
shopify_customer_id: {
type: DataTypes.STRING,
allowNull: false,
},
shopify_customer_email: {
type: DataTypes.STRING,
allowNull: false,
},
});
return customer;
};
+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 || "root",
DB_ADAPTER: 'mysql', DB_ADAPTER: "mysql",
DB_NAME: 'day_1', DB_NAME: "day_6",
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 -1
View File
@@ -3,9 +3,11 @@
"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": {
"axios": "^1.10.0",
"cookie-parser": "~1.4.4", "cookie-parser": "~1.4.4",
"cors": "^2.8.5", "cors": "^2.8.5",
"debug": "~2.6.9", "debug": "~2.6.9",
@@ -14,6 +16,7 @@
"jade": "~1.11.0", "jade": "~1.11.0",
"morgan": "~1.9.1", "morgan": "~1.9.1",
"mysql2": "^2.3.3", "mysql2": "^2.3.3",
"node-cron": "^4.2.1",
"sequelize": "^6.15.1" "sequelize": "^6.15.1"
} }
} }
+15 -1
View File
@@ -4,5 +4,19 @@ body {
} }
a { a {
color: #00B7FF; color: #00b7ff;
}
#results {
display: grid;
grid-template-columns: repeat(5, 1fr);
gap: 8px;
}
.productCard {
border: 2px solid black;
border-radius: 16px;
display: flex;
flex-direction: column;
align-items: center;
} }
+26 -3
View File
@@ -1,9 +1,32 @@
var express = require('express'); var express = require("express");
var router = express.Router(); var router = express.Router();
const { exec } = require("child_process");
/* GET home page. */ /* GET home page. */
router.get('/', function(req, res, next) { router.get("/", function (req, res, next) {
res.render('index', { title: 'Express' }); res.render("index", { title: "Express" });
});
router.get("/products", function (req, res, next) {
// Use curl to fetch products from Shopify
const curlCmd = `curl -X GET \"https://roving-house.myshopify.com/admin/api/2021-07/products.json\" -u 65c3c809c002379e3a0ea04aeaf2cf84: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`;
exec(curlCmd, (error, stdout, stderr) => {
if (error) {
return res.render("products", { products: [], error: error.message });
}
let products = [];
console.log(error, stdout);
try {
const data = JSON.parse(stdout);
products = data.products || [];
} catch (e) {
return res.render("products", {
products: [],
error: "Failed to parse products",
});
}
res.render("products", { products });
});
}); });
module.exports = router; module.exports = router;
+21
View File
@@ -0,0 +1,21 @@
extends layout
block content
h1 Products page
div#results
if products && products.length
each product in products
.card(style="border:1px solid #ccc;padding:10px;margin:10px;display:inline-block;width:200px;")
if product.image && product.image.src
img(src=product.image.src, alt=product.title, style="width:100%;height:150px;object-fit:cover;")
else if product.images && product.images.length
img(src=product.images[0].src, alt=product.title, style="width:100%;height:150px;object-fit:cover;")
else
div(style="width:100%;height:150px;background:#eee;text-align:center;line-height:150px;") No Image
h3= product.title
if product.variants && product.variants.length
p Price: $#{product.variants[0].price}
else
p Price: N/A
else
p No products found.