feat: complete day 4
This commit is contained in:
+21
-15
@@ -1,11 +1,14 @@
|
||||
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");
|
||||
var emailRouter = require("./routes/email");
|
||||
var userApiRouter = require("./routes/user");
|
||||
var emailQueueRouter = require("./routes/email_queue");
|
||||
|
||||
const db = require("./models");
|
||||
var cors = require("cors");
|
||||
@@ -13,17 +16,20 @@ 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/email", emailRouter);
|
||||
app.use("/api/v1/user", userApiRouter);
|
||||
app.use("/api/v1/email_queue", emailQueueRouter);
|
||||
|
||||
// catch 404 and forward to error handler
|
||||
app.use(function (req, res, next) {
|
||||
@@ -34,11 +40,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;
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
const db = require("../models");
|
||||
const { Op } = require("sequelize");
|
||||
|
||||
(async () => {
|
||||
try {
|
||||
const User = db.user;
|
||||
const Email = db.email;
|
||||
const EmailQueue = db.email_queue;
|
||||
|
||||
// 1. Get all active users
|
||||
const users = await User.findAll({ where: { status: 1 } });
|
||||
if (!users.length) {
|
||||
console.log("No active users found.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 2. Determine day and select emails
|
||||
const today = new Date();
|
||||
const day = today.getDay(); // 0=Sun, 1=Mon, ...
|
||||
const isOddDay = day === 1 || day === 3 || day === 5; // Mon, Wed, Fri
|
||||
const emailWhere = isOddDay
|
||||
? { id: { [Op.mod]: [2, 1] } } // odd ids
|
||||
: { id: { [Op.mod]: [2, 0] } }; // even ids
|
||||
const emails = await Email.findAll({ where: emailWhere });
|
||||
if (!emails.length) {
|
||||
console.log("No emails found for today.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 3. For each user and email, insert into email_queue
|
||||
const tomorrow = new Date(today);
|
||||
tomorrow.setDate(today.getDate() + 1);
|
||||
const sendAt = tomorrow;
|
||||
let count = 0;
|
||||
for (const user of users) {
|
||||
for (const email of emails) {
|
||||
await EmailQueue.create({
|
||||
email_id: email.id,
|
||||
user_id: user.id,
|
||||
status: 0, // not sent
|
||||
created_at: today,
|
||||
send_at: sendAt,
|
||||
updated_at: today,
|
||||
});
|
||||
count++;
|
||||
}
|
||||
}
|
||||
console.log(
|
||||
`Inserted ${count} email_queue records for ${users.length} users and ${emails.length} emails.`
|
||||
);
|
||||
process.exit(0);
|
||||
} catch (err) {
|
||||
console.error("Error in email_queue cronjob:", err);
|
||||
process.exit(1);
|
||||
}
|
||||
})();
|
||||
@@ -0,0 +1,66 @@
|
||||
const db = require("../models");
|
||||
const nodemailer = require("nodemailer");
|
||||
require("dotenv").config();
|
||||
|
||||
(async () => {
|
||||
try {
|
||||
const EmailQueue = db.email_queue;
|
||||
const Email = db.email;
|
||||
const User = db.user;
|
||||
const today = new Date();
|
||||
today.setHours(0, 0, 0, 0);
|
||||
const tomorrow = new Date(today);
|
||||
tomorrow.setDate(today.getDate() + 1);
|
||||
|
||||
// 1. Get all email_queue entries for today and not sent
|
||||
const queues = await EmailQueue.findAll({
|
||||
where: {
|
||||
send_at: { $gte: today, $lt: tomorrow },
|
||||
status: 0,
|
||||
},
|
||||
});
|
||||
if (!queues.length) {
|
||||
console.log("No emails to send today.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 2. Setup nodemailer with Mailtrap
|
||||
const transporter = nodemailer.createTransport({
|
||||
host: process.env.MAILTRAP_HOST,
|
||||
port: process.env.MAILTRAP_PORT,
|
||||
auth: {
|
||||
user: process.env.MAILTRAP_USER,
|
||||
pass: process.env.MAILTRAP_PASS,
|
||||
},
|
||||
});
|
||||
|
||||
let sentCount = 0;
|
||||
for (const queue of queues) {
|
||||
// 3. Get user and email
|
||||
const user = await User.findByPk(queue.user_id);
|
||||
const email = await Email.findByPk(queue.email_id);
|
||||
if (!user || !email) continue;
|
||||
// 4. Replace template
|
||||
let body = email.body
|
||||
.replace(/\{\{\{NAME\}\}\}/g, user.name)
|
||||
.replace(/\{\{\{EMAIL\}\}\}/g, user.email);
|
||||
// 5. Send email
|
||||
await transporter.sendMail({
|
||||
from: "noreply@example.com",
|
||||
to: user.email,
|
||||
subject: email.subject,
|
||||
html: body,
|
||||
});
|
||||
// 6. Mark as sent
|
||||
queue.status = 1;
|
||||
queue.updated_at = new Date();
|
||||
await queue.save();
|
||||
sentCount++;
|
||||
}
|
||||
console.log(`Sent ${sentCount} emails.`);
|
||||
process.exit(0);
|
||||
} catch (err) {
|
||||
console.error("Error in email_sending cronjob:", err);
|
||||
process.exit(1);
|
||||
}
|
||||
})();
|
||||
@@ -0,0 +1,38 @@
|
||||
module.exports = (sequelize, DataTypes) => {
|
||||
const email = sequelize.define(
|
||||
"email",
|
||||
{
|
||||
id: {
|
||||
type: DataTypes.INTEGER,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
},
|
||||
slug: {
|
||||
type: DataTypes.STRING,
|
||||
unique: true,
|
||||
allowNull: false,
|
||||
},
|
||||
subject: {
|
||||
type: DataTypes.STRING,
|
||||
allowNull: false,
|
||||
},
|
||||
body: {
|
||||
type: DataTypes.TEXT,
|
||||
allowNull: false,
|
||||
},
|
||||
status: {
|
||||
type: DataTypes.INTEGER, // 0: inactive, 1: active
|
||||
allowNull: false,
|
||||
defaultValue: 1,
|
||||
},
|
||||
},
|
||||
{
|
||||
timestamps: true,
|
||||
freezeTableName: true,
|
||||
tableName: "email",
|
||||
createdAt: "created_at",
|
||||
updatedAt: "updated_at",
|
||||
}
|
||||
);
|
||||
return email;
|
||||
};
|
||||
@@ -0,0 +1,45 @@
|
||||
module.exports = (sequelize, DataTypes) => {
|
||||
const email_queue = sequelize.define(
|
||||
"email_queue",
|
||||
{
|
||||
id: {
|
||||
type: DataTypes.INTEGER,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
},
|
||||
email_id: {
|
||||
type: DataTypes.INTEGER,
|
||||
allowNull: false,
|
||||
},
|
||||
user_id: {
|
||||
type: DataTypes.INTEGER,
|
||||
allowNull: false,
|
||||
},
|
||||
status: {
|
||||
type: DataTypes.INTEGER, // 0: not sent, 1: sent
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
},
|
||||
created_at: {
|
||||
type: DataTypes.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: DataTypes.NOW,
|
||||
},
|
||||
send_at: {
|
||||
type: DataTypes.DATE,
|
||||
allowNull: false,
|
||||
},
|
||||
updated_at: {
|
||||
type: DataTypes.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: DataTypes.NOW,
|
||||
},
|
||||
},
|
||||
{
|
||||
timestamps: false,
|
||||
freezeTableName: true,
|
||||
tableName: "email_queue",
|
||||
}
|
||||
);
|
||||
return email_queue;
|
||||
};
|
||||
+30
-16
@@ -1,4 +1,4 @@
|
||||
'use strict';
|
||||
"use strict";
|
||||
/*Powered By: Manaknightdigital Inc. https://manaknightdigital.com/ Year: 2020*/
|
||||
/**
|
||||
* Sequelize File
|
||||
@@ -8,24 +8,28 @@
|
||||
* @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_4",
|
||||
DB_HOSTNAME: "localhost",
|
||||
DB_PORT: 3306,
|
||||
};
|
||||
|
||||
let db = {};
|
||||
|
||||
let sequelize = new Sequelize(config.DB_DATABASE, config.DB_USERNAME, config.DB_PASSWORD, {
|
||||
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,
|
||||
@@ -33,7 +37,7 @@ let sequelize = new Sequelize(config.DB_DATABASE, config.DB_USERNAME, config.DB_
|
||||
host: config.DB_HOSTNAME,
|
||||
port: config.DB_PORT,
|
||||
logging: console.log,
|
||||
timezone: '-04:00',
|
||||
timezone: "-04:00",
|
||||
pool: {
|
||||
maxConnections: 1,
|
||||
minConnections: 0,
|
||||
@@ -44,13 +48,23 @@ let sequelize = new Sequelize(config.DB_DATABASE, config.DB_USERNAME, config.DB_
|
||||
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);
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
module.exports = (sequelize, DataTypes) => {
|
||||
const user = sequelize.define(
|
||||
"user",
|
||||
{
|
||||
id: {
|
||||
type: DataTypes.INTEGER,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
},
|
||||
email: {
|
||||
type: DataTypes.STRING,
|
||||
allowNull: false,
|
||||
unique: true,
|
||||
},
|
||||
name: {
|
||||
type: DataTypes.STRING,
|
||||
allowNull: false,
|
||||
},
|
||||
status: {
|
||||
type: DataTypes.INTEGER, // 0: inactive, 1: active
|
||||
allowNull: false,
|
||||
defaultValue: 1,
|
||||
},
|
||||
},
|
||||
{
|
||||
timestamps: true,
|
||||
freezeTableName: true,
|
||||
tableName: "user",
|
||||
createdAt: "created_at",
|
||||
updatedAt: "updated_at",
|
||||
}
|
||||
);
|
||||
return user;
|
||||
};
|
||||
@@ -0,0 +1,65 @@
|
||||
const express = require("express");
|
||||
const router = express.Router();
|
||||
const db = require("../models");
|
||||
const Email = db.email;
|
||||
|
||||
// GET /api/v1/email (get all)
|
||||
router.get("/", async (req, res) => {
|
||||
try {
|
||||
const emails = await Email.findAll();
|
||||
res.json({ success: true, data: emails });
|
||||
} catch (err) {
|
||||
res.status(500).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// GET /api/v1/email/:id (get one)
|
||||
router.get("/:id", async (req, res) => {
|
||||
try {
|
||||
const email = await Email.findByPk(req.params.id);
|
||||
if (!email)
|
||||
return res.status(404).json({ success: false, error: "Email not found" });
|
||||
res.json({ success: true, data: email });
|
||||
} catch (err) {
|
||||
res.status(500).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// POST /api/v1/email (add one)
|
||||
router.post("/", async (req, res) => {
|
||||
try {
|
||||
const email = await Email.create(req.body);
|
||||
res.status(201).json({ success: true, data: email });
|
||||
} catch (err) {
|
||||
res.status(400).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// PUT /api/v1/email/:id (update one)
|
||||
router.put("/:id", async (req, res) => {
|
||||
try {
|
||||
const [updated] = await Email.update(req.body, {
|
||||
where: { id: req.params.id },
|
||||
});
|
||||
if (!updated)
|
||||
return res.status(404).json({ success: false, error: "Email not found" });
|
||||
const email = await Email.findByPk(req.params.id);
|
||||
res.json({ success: true, data: email });
|
||||
} catch (err) {
|
||||
res.status(400).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// DELETE /api/v1/email/:id (delete one)
|
||||
router.delete("/:id", async (req, res) => {
|
||||
try {
|
||||
const deleted = await Email.destroy({ where: { id: req.params.id } });
|
||||
if (!deleted)
|
||||
return res.status(404).json({ success: false, error: "Email not found" });
|
||||
res.json({ success: true, data: "Email deleted" });
|
||||
} catch (err) {
|
||||
res.status(500).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
@@ -0,0 +1,71 @@
|
||||
const express = require("express");
|
||||
const router = express.Router();
|
||||
const db = require("../models");
|
||||
const EmailQueue = db.email_queue;
|
||||
|
||||
// GET /api/v1/email_queue (get all)
|
||||
router.get("/", async (req, res) => {
|
||||
try {
|
||||
const queues = await EmailQueue.findAll();
|
||||
res.json({ success: true, data: queues });
|
||||
} catch (err) {
|
||||
res.status(500).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// GET /api/v1/email_queue/:id (get one)
|
||||
router.get("/:id", async (req, res) => {
|
||||
try {
|
||||
const queue = await EmailQueue.findByPk(req.params.id);
|
||||
if (!queue)
|
||||
return res
|
||||
.status(404)
|
||||
.json({ success: false, error: "Email queue not found" });
|
||||
res.json({ success: true, data: queue });
|
||||
} catch (err) {
|
||||
res.status(500).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// POST /api/v1/email_queue (add one)
|
||||
router.post("/", async (req, res) => {
|
||||
try {
|
||||
const queue = await EmailQueue.create(req.body);
|
||||
res.status(201).json({ success: true, data: queue });
|
||||
} catch (err) {
|
||||
res.status(400).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// PUT /api/v1/email_queue/:id (update one)
|
||||
router.put("/:id", async (req, res) => {
|
||||
try {
|
||||
const [updated] = await EmailQueue.update(req.body, {
|
||||
where: { id: req.params.id },
|
||||
});
|
||||
if (!updated)
|
||||
return res
|
||||
.status(404)
|
||||
.json({ success: false, error: "Email queue not found" });
|
||||
const queue = await EmailQueue.findByPk(req.params.id);
|
||||
res.json({ success: true, data: queue });
|
||||
} catch (err) {
|
||||
res.status(400).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// DELETE /api/v1/email_queue/:id (delete one)
|
||||
router.delete("/:id", async (req, res) => {
|
||||
try {
|
||||
const deleted = await EmailQueue.destroy({ where: { id: req.params.id } });
|
||||
if (!deleted)
|
||||
return res
|
||||
.status(404)
|
||||
.json({ success: false, error: "Email queue not found" });
|
||||
res.json({ success: true, data: "Email queue deleted" });
|
||||
} catch (err) {
|
||||
res.status(500).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
@@ -0,0 +1,65 @@
|
||||
const express = require("express");
|
||||
const router = express.Router();
|
||||
const db = require("../models");
|
||||
const User = db.user;
|
||||
|
||||
// GET /api/v1/user (get all)
|
||||
router.get("/", async (req, res) => {
|
||||
try {
|
||||
const users = await User.findAll();
|
||||
res.json({ success: true, data: users });
|
||||
} catch (err) {
|
||||
res.status(500).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// GET /api/v1/user/:id (get one)
|
||||
router.get("/:id", async (req, res) => {
|
||||
try {
|
||||
const user = await User.findByPk(req.params.id);
|
||||
if (!user)
|
||||
return res.status(404).json({ success: false, error: "User not found" });
|
||||
res.json({ success: true, data: user });
|
||||
} catch (err) {
|
||||
res.status(500).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// POST /api/v1/user (add one)
|
||||
router.post("/", async (req, res) => {
|
||||
try {
|
||||
const user = await User.create(req.body);
|
||||
res.status(201).json({ success: true, data: user });
|
||||
} catch (err) {
|
||||
res.status(400).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// PUT /api/v1/user/:id (update one)
|
||||
router.put("/:id", async (req, res) => {
|
||||
try {
|
||||
const [updated] = await User.update(req.body, {
|
||||
where: { id: req.params.id },
|
||||
});
|
||||
if (!updated)
|
||||
return res.status(404).json({ success: false, error: "User not found" });
|
||||
const user = await User.findByPk(req.params.id);
|
||||
res.json({ success: true, data: user });
|
||||
} catch (err) {
|
||||
res.status(400).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// DELETE /api/v1/user/:id (delete one)
|
||||
router.delete("/:id", async (req, res) => {
|
||||
try {
|
||||
const deleted = await User.destroy({ where: { id: req.params.id } });
|
||||
if (!deleted)
|
||||
return res.status(404).json({ success: false, error: "User not found" });
|
||||
res.json({ success: true, data: "User deleted" });
|
||||
} catch (err) {
|
||||
res.status(500).json({ success: false, error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
Reference in New Issue
Block a user