From 4dd9c31d0357f9074efcf677cccf9e485793535a Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Wed, 5 Nov 2025 18:06:16 +0530 Subject: [PATCH 1/2] Emila template and send email to establishment user --- app/controllers/establishment.controller.js | 26 +++++++++++++- .../establishment_user.controller.js | 14 ++++++++ app/routes/routes.js | 5 ++- app/services/email.service.js | 35 +++++++++++++------ 4 files changed, 67 insertions(+), 13 deletions(-) diff --git a/app/controllers/establishment.controller.js b/app/controllers/establishment.controller.js index 2e8bdca..668b9e6 100644 --- a/app/controllers/establishment.controller.js +++ b/app/controllers/establishment.controller.js @@ -8,10 +8,22 @@ const Emirate = db.Emirate; const user = db.user; const ExcelJS = require("exceljs"); const { Op } = require("sequelize"); -const { sendEmail } = require("../services/emailHelper"); // custom helper +const { sendEmail } = require("../services/emailHelper"); +const { sendEmailService } = require("../services/email.service"); const logger = require("../services/logger"); +exports.testEmail = async (req, res) => { + placeHolderData = { + contact_name : 'Gowtham', + portal_url : process.env.BASE_URL, + username : '--', + Password : '--', + support_email : '--', + support_phone : '--', + } + await sendEmailService('gowthamceline46@gmail.com', 'establishment_user_creation_to_user', placeHolderData); +}; exports.createEstablishment = async (req, res) => { try { const { @@ -126,6 +138,18 @@ exports.createEstablishment = async (req, res) => { password: hashedPassword, }); + //send email to user + placeHolderData = { + contact_name : establishment_user.name, + portal_url : process.env.FE_BASE_URL, + username : establishment_user.email, + Password : establishment_user.password, + support_email : process.env.SUPPORT_EMAIL, + support_phone : process.env.SUPPORT_PHONE, + + } + await sendEmailService(establishment_user.email, 'establishment_user_creation_to_user', placeHolderData); + // 🔹 Return success response return res.status(201).send({ status: "success", diff --git a/app/controllers/establishment_user.controller.js b/app/controllers/establishment_user.controller.js index 6421235..e1a736e 100644 --- a/app/controllers/establishment_user.controller.js +++ b/app/controllers/establishment_user.controller.js @@ -2,6 +2,8 @@ const db = require("../models"); const bcrypt = require("bcryptjs"); const EstablishmentUser = db.EstablishmentUser; +const { sendEmailService } = require("../services/email.service"); + // Create User exports.createUser = async (req, res) => { try { @@ -17,6 +19,18 @@ exports.createUser = async (req, res) => { gender, }); + //send email to user + placeHolderData = { + contact_name : name, + portal_url : process.env.FE_BASE_URL, + username : email, + Password : password, + support_email : process.env.SUPPORT_EMAIL, + support_phone : process.env.SUPPORT_PHONE, + + } + await sendEmailService(email, 'establishment_user_creation_to_user', placeHolderData); + return res.status(201).send({'status':"success",'message':"Creation successful",'data': user }); } catch (err) { diff --git a/app/routes/routes.js b/app/routes/routes.js index f92b257..c7c190d 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -342,6 +342,9 @@ router.delete("/admin_users/:id",[verifySignature, verifyToken], adminUserContro +router.get("/testEmail", establishmentController.testEmail); + + /** * @swagger @@ -2114,7 +2117,7 @@ router.get("/submissions/getPreviousForecastData",[verifySignature, verifyToken] * 500: * description: Server error */ -router.get("/submission-audit-history", submissionController.getSubmissionHistory); +router.get("/submission-audit-history",[verifySignature, verifyToken], submissionController.getSubmissionHistory); diff --git a/app/services/email.service.js b/app/services/email.service.js index 0151310..454cd3f 100644 --- a/app/services/email.service.js +++ b/app/services/email.service.js @@ -3,34 +3,46 @@ const { NotificationTemplate } = require("../models"); // adjust path if needed const logger = require("../services/logger"); require("dotenv").config(); + const transporter = nodemailer.createTransport({ - host: process.env.SMTP_HOST, - port: process.env.SMTP_PORT, - secure: process.env.SMTP_SECURE === "true", // true for 465, false for 587 + host: process.env.MAIL_HOST, + port: process.env.MAIL_PORT, + secure: false, // true for 465, false for 587 auth: { - user: process.env.SMTP_USER, - pass: process.env.SMTP_PASS, + user: process.env.MAIL_USER, + pass: process.env.MAIL_PASS, }, }); + /** * Replace placeholders in template HTML with actual data */ +// function replacePlaceholders(templateHtml, data) { +// let html = templateHtml; +// for (const key in data) { +// const regex = new RegExp(`{{\\s*${key}\\s*}}`, "g"); +// html = html.replace(regex, data[key]); +// } +// return html; +// } + function replacePlaceholders(templateHtml, data) { + if(!templateHtml) return ""; let html = templateHtml; + for (const key in data) { + const safeValue = data[key] ?? ""; const regex = new RegExp(`{{\\s*${key}\\s*}}`, "g"); - html = html.replace(regex, data[key]); + html = html.replace(regex, safeValue); } + return html; } - - - -exports.sendEmail = async (to, templateCode, data = {}) => { +exports.sendEmailService = async (to, templateCode, data = {}) => { const logPrefix = `[EMAIL SERVICE][${new Date().toISOString()}]`; logger.info(`${logPrefix} → Starting email send process`); @@ -50,7 +62,7 @@ exports.sendEmail = async (to, templateCode, data = {}) => { } // 2. Replace placeholders - const html = replacePlaceholders(template.template_html, data); + const html = replacePlaceholders(template.body_html, data); // 3. Prepare mail options const mailOptions = { @@ -59,6 +71,7 @@ exports.sendEmail = async (to, templateCode, data = {}) => { subject: template.subject || "Notification", html, }; + logger.info(`${logPrefix} ✉️ Sending email using SMTP...`); From 4544316b3d02ea9a9746e94aeb3dd368c11119a3 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Wed, 5 Nov 2025 18:17:21 +0530 Subject: [PATCH 2/2] Emila template and send email to establishment user --- app/controllers/establishment.controller.js | 2 +- app/controllers/establishment_user.controller.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/establishment.controller.js b/app/controllers/establishment.controller.js index 668b9e6..3176d39 100644 --- a/app/controllers/establishment.controller.js +++ b/app/controllers/establishment.controller.js @@ -17,7 +17,7 @@ exports.testEmail = async (req, res) => { contact_name : 'Gowtham', portal_url : process.env.BASE_URL, username : '--', - Password : '--', + password : '--', support_email : '--', support_phone : '--', diff --git a/app/controllers/establishment_user.controller.js b/app/controllers/establishment_user.controller.js index e1a736e..e178259 100644 --- a/app/controllers/establishment_user.controller.js +++ b/app/controllers/establishment_user.controller.js @@ -24,7 +24,7 @@ exports.createUser = async (req, res) => { contact_name : name, portal_url : process.env.FE_BASE_URL, username : email, - Password : password, + password : password, support_email : process.env.SUPPORT_EMAIL, support_phone : process.env.SUPPORT_PHONE,