From c4ade7db4e42f984a5addc9455b10b1b40b4ea06 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 18 Dec 2025 14:57:57 +0530 Subject: [PATCH] logger message format changed --- app/controllers/dashboard.controller.js | 90 +------------------ app/controllers/establishment.controller.js | 6 +- .../establishment_products.controller.js | 10 +-- .../establishment_user.controller.js | 12 +-- .../establishment_users_auth.controller.js | 4 +- .../notificationTemplate.controller.js | 10 +-- app/controllers/products.controller.js | 12 +-- ...uarterlyWindowsConfiguration.controller.js | 10 +-- app/controllers/submission.controller.js | 26 +++--- app/controllers/unitMasterController.js | 14 +-- .../variationReasonMaster.controller.js | 6 +- 11 files changed, 57 insertions(+), 143 deletions(-) diff --git a/app/controllers/dashboard.controller.js b/app/controllers/dashboard.controller.js index 02f8e3b..2fed341 100644 --- a/app/controllers/dashboard.controller.js +++ b/app/controllers/dashboard.controller.js @@ -180,7 +180,7 @@ exports.getEstablishmentDashboard = async (req, res) => { }); } catch (err) { - logger.error('Error on establishment dashboard data', { error: err.message }); + logger.error(err.message); res.status(500).json({ status: "failed", message: "Internal server error" }); } }; @@ -281,94 +281,8 @@ exports.adminDashboard = async (req, res) => { }); } catch (err) { - logger.error('Error admin dashboard', { error: err.message }); + logger.error(err.message); return res.status(500).json({ status: "failed", message: "Internal server error" }); } }; - -// exports.adminDashboard = async (req, res) => { -// try { -// const { quarter, year } = req.query; // e.g., Q1, 2025 - -// // --- Summary Counts --- -// const [ -// totalEstablishments, -// submittedCount, -// approvedCount, -// rejectedCount, -// pendingCount -// ] = await Promise.all([ -// Establishment.count(), -// Submission.count(), -// Submission.count({ where: { status: "Approved" } }), -// Submission.count({ where: { status: "Rejected" } }), -// Submission.count({ where: { status: "Pending" } }), -// ]); - -// // Not Started = total establishments - those that have any submission -// const startedEstIds = await Submission.findAll({ -// attributes: [[Sequelize.fn("DISTINCT", Sequelize.col("establishment_id")), "id"]], -// raw: true, -// }); -// const startedIds = startedEstIds.map(e => e.id); -// const notStartedCount = await Establishment.count({ -// where: { id: { [Op.notIn]: startedIds } }, -// }); - -// // --- Recent 10 submissions for given quarter & year --- -// const whereCond = {}; -// if (quarter) whereCond.quarter = quarter; -// if (year) whereCond.year = year; - -// const recentSubmissions = await Submission.findAll({ -// where: whereCond, -// include: [ -// { -// model: Establishment, -// as: "establishment", -// attributes: ["factory_name"], -// include: [ -// { model: Emirate, as: "establishment_emirate", attributes: ["name"] }, -// ], -// }, -// { -// model: EstablishmentUser, -// as: "created_user", -// attributes: ["name"], -// }, -// ], -// attributes: { -// include: [ -// [ -// Sequelize.literal(`( -// SELECT COUNT(*) -// FROM submission_products AS sp -// WHERE sp.submission_id = submission.id -// )`), -// "product_count", -// ], -// ], -// }, -// order: [["created_at", "DESC"]], -// limit: 10, -// }); - -// // --- Send Response --- -// return res.status(200).json({ -// status: "success", -// summary: { -// total_establishments: totalEstablishments, -// submitted: submittedCount, -// approved: approvedCount, -// rejected: rejectedCount, -// pending: pendingCount, -// not_started: notStartedCount, -// }, -// recent_submissions: recentSubmissions, -// }); -// } catch (err) { -// console.error(err); -// return res.status(500).json({ status: "failed", message: err.message }); -// } -// }; \ No newline at end of file diff --git a/app/controllers/establishment.controller.js b/app/controllers/establishment.controller.js index dc5205f..5e46a7d 100644 --- a/app/controllers/establishment.controller.js +++ b/app/controllers/establishment.controller.js @@ -948,7 +948,7 @@ exports.forgotPasswordRequestOTP = async (req, res) => { }); } catch (err) { - logger.error(`Error in forgotPasswordRequestOTP: ${err.message}`); + logger.error(err.message); return res.status(500).json({ status: "failed", message: "Internal server error" }); } }; @@ -1023,7 +1023,7 @@ exports.forgotPasswordVerifyOTP = async (req, res) => { }); } catch (err) { - logger.error(`Error in forgotPasswordVerifyOTP: ${err.message}`); + logger.error(err.message); return res.status(500).json({ status: "failed", message: "Internal server error" }); } }; @@ -1625,7 +1625,7 @@ exports.downloadCompanyProfileSample = async (req, res) => { return res.download(safeFilePath, "company_profile_upload_sample.csv"); } catch (error) { - logger.error('Error on downloading company profile sample file', { error: error.message }); + logger.error('Error on downloading company profile sample file' + error.message ); return res.status(500).send({ status: "failed", message: "Internal server error" }); } }; diff --git a/app/controllers/establishment_products.controller.js b/app/controllers/establishment_products.controller.js index 0a8a509..1c72785 100644 --- a/app/controllers/establishment_products.controller.js +++ b/app/controllers/establishment_products.controller.js @@ -74,7 +74,7 @@ exports.createEstablishmentProduct = async (req, res) => { res.status(201).send({'status':"success",'message':"Establishment Product Created successfully."}); } catch (err) { - logger.error('Error on creating establishment product', { error: err.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -117,7 +117,7 @@ exports.getAllEstablishmentProducts = async (req, res) => { res.status(200).send({'status':"success",'message':"Fetched successfully",'data': data }); } catch (err) { - logger.error('Error get all establishment products', { error: err.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -132,7 +132,7 @@ exports.getEstablishmentProductById = async (req, res) => { res.status(200).send({'status':"success",'message':"Fetched successfully",'data': data }); } catch (err) { - logger.error('Error get establishment product', { error: err.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -157,7 +157,7 @@ exports.updateEstablishmentProduct = async (req, res) => { res.status(200).send({'status':"success",'message':"Record updated successfully",'data': "" }); } catch (err) { - logger.error('Error on updating establishment product', { error: err.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -172,7 +172,7 @@ exports.deleteEstablishmentProduct = async (req, res) => { res.status(200).send({'status':"success",'message':"Record deleted successfully",'data': "" }); } catch (err) { - logger.error('Error on deleting establishment product', { error: err.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; diff --git a/app/controllers/establishment_user.controller.js b/app/controllers/establishment_user.controller.js index 4350741..54db326 100644 --- a/app/controllers/establishment_user.controller.js +++ b/app/controllers/establishment_user.controller.js @@ -107,7 +107,7 @@ exports.createUser = async (req, res) => { message: "Establishment User created successfully.", }); } catch (error) { - logger.error('Error on creating user', { error: error.message }); + logger.error(err.message); return res.status(500).json({ status: "error", message: "Internal server error" }); } }; @@ -132,7 +132,7 @@ exports.getAllUsers = async (req, res) => { return res.status(200).send({'status':"success",'message':"Fetched successfully",'data': users }); } catch (err) { - logger.error('Error on get all users', { error: err.message }); + logger.error(err.message); return res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -148,7 +148,7 @@ exports.getUserById = async (req, res) => { return res.status(200).send({'status':"success",'message':"Fetched successfully",'data': user }); } catch (err) { - logger.error('Error on get user', { error: err.message }); + logger.error(err.message); return res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -177,7 +177,7 @@ exports.updateUser = async (req, res) => { return res.status(200).send({'status':"success",'message':"Record updated successfully",'data': "" }); } catch (err) { - logger.error('Error on updating user:', err.message ); + logger.error(err.message); return res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -254,7 +254,7 @@ exports.deleteUser = async (req, res) => { return res.status(200).send({'status':"success",'message':"Record deleted successfully",'data': "" }); } catch (err) { - logger.error('Error on deleting user', { error: err.message }); + logger.error(err.message); return res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -327,7 +327,7 @@ exports.triggerEstablishmentUsersWelcomeEmail = async (req, res) => { } catch (error) { console.error(error); - logger.error('Error on sending establishment user welcome email', { error: error.message }); + logger.error(err.message); return res.status(500).json({ status: "error", message: "Internal server error" }); } }; diff --git a/app/controllers/establishment_users_auth.controller.js b/app/controllers/establishment_users_auth.controller.js index d902024..efc8fd2 100644 --- a/app/controllers/establishment_users_auth.controller.js +++ b/app/controllers/establishment_users_auth.controller.js @@ -39,7 +39,7 @@ exports.login = async (req, res) => { res.status(200).send({'status':"success",'message':"Login successful",'data': token }); } catch (err) { - logger.error('Login error', { error: err.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -52,7 +52,7 @@ exports.logout = async (req, res) => { res.status(200).send({'status':"success",'message':"Logout successful",'data': "" }); res.status(200).json({ message: "Logout successful (client should discard token)" }); } catch (err) { - logger.error('Logout error', { error: err.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; diff --git a/app/controllers/notificationTemplate.controller.js b/app/controllers/notificationTemplate.controller.js index d636746..2dedca9 100644 --- a/app/controllers/notificationTemplate.controller.js +++ b/app/controllers/notificationTemplate.controller.js @@ -39,7 +39,7 @@ exports.createTemplate = async (req, res) => { }); } catch (err) { - logger.error('Error on creating notification template', { error: err.message }); + logger.error(err.message); res.status(500).json({ status: "failed", message: "Internal server error" }); } }; @@ -80,7 +80,7 @@ exports.updateTemplate = async (req, res) => { }); } catch (err) { - logger.error('Error on updating notification template', { error: err.message }); + logger.error(err.message); return res.status(500).json({ status: "failed", message: "Internal server error" @@ -98,7 +98,7 @@ exports.getAllTemplates = async (req, res) => { data: templates, }); } catch (err) { - logger.error('Error on getall notification template', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -118,7 +118,7 @@ exports.getTemplateById = async (req, res) => { data: template, }); } catch (err) { - logger.error('Error on get template', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -139,7 +139,7 @@ exports.deleteTemplate = async (req, res) => { .status(200) .send({ status: "success", message: "Deleted successfully" }); } catch (err) { - logger.error('Error deleting template', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; diff --git a/app/controllers/products.controller.js b/app/controllers/products.controller.js index ef5fc7e..a1be7d8 100644 --- a/app/controllers/products.controller.js +++ b/app/controllers/products.controller.js @@ -72,7 +72,7 @@ exports.createProduct = async (req, res) => { res.status(201).send({'status':"success",'message':"created successfully." }); } catch (error) { - logger.error('Error on creating product', { error: error.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -118,7 +118,7 @@ exports.getAllProducts = async (req, res) => { }); } catch (error) { - logger.error('Error on get all products', { error: error.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -133,7 +133,7 @@ exports.getProductById = async (req, res) => { res.status(200).send({'status':"success",'message':"Fetched successfully",'data': data }); } catch (error) { - logger.error('Error on get product', { error: error.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -154,7 +154,7 @@ exports.updateProduct = async (req, res) => { res.status(200).send({'status':"success",'message':"Updated successfully",'data': "" }); } catch (error) { - logger.error('Error on update product', { error: error.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -170,7 +170,7 @@ exports.deleteProduct = async (req, res) => { res.status(200).send({'status':"success",'message':"Deleted successfully",'data': "" }); } catch (error) { - logger.error('Error on deleting product', { error: error.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; @@ -181,7 +181,7 @@ exports.downloadProductSample = async (req, res) => { const filePath = path.join(__dirname, "../downloads_csv/products_upload_sample.csv"); return res.download(filePath, "products_upload_sample.csv"); } catch (error) { - logger.error('Error on downloading HS Code sample file', { error: error.message }); + logger.error(err.message); res.status(500).send({'status':"failed",'message': "Internal server error" }); } }; diff --git a/app/controllers/quarterlyWindowsConfiguration.controller.js b/app/controllers/quarterlyWindowsConfiguration.controller.js index 96f4f88..ec25a3f 100644 --- a/app/controllers/quarterlyWindowsConfiguration.controller.js +++ b/app/controllers/quarterlyWindowsConfiguration.controller.js @@ -69,7 +69,7 @@ exports.createConfig = async (req, res) => { }); sendEmailsToEstablishments(placeholder); } catch (err) { - logger.error('Error creating config', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -91,7 +91,7 @@ async function sendEmailsToEstablishments(placeholder) { } } catch (err) { console.error("Email background job failed:", err.message); - logger.error('Error sending email establishments', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } } @@ -117,7 +117,7 @@ exports.getAllConfigs = async (req, res) => { .status(200) .send({ status: "success", message: "Fetched successfully", quarter_count: data.length, data }); } catch (err) { - logger.error('Error on getall config', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -135,7 +135,7 @@ exports.getConfigById = async (req, res) => { .status(200) .send({ status: "success", message: "Fetched successfully", data }); } catch (err) { - logger.error('Error get config by Id', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -177,7 +177,7 @@ exports.deleteConfig = async (req, res) => { .status(200) .send({ status: "success", message: "Deleted successfully" }); } catch (err) { - logger.error('Error deleting config', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; diff --git a/app/controllers/submission.controller.js b/app/controllers/submission.controller.js index c1dc975..4e8abfc 100644 --- a/app/controllers/submission.controller.js +++ b/app/controllers/submission.controller.js @@ -195,7 +195,7 @@ exports.createSubmission = async (req, res) => { res.status(201).json({ status: "success", message: "Submission created sucessfully."}); } catch (err) { - logger.error('Error on creating submission ', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -294,7 +294,7 @@ exports.updateSubmission = async (req, res) => { message: "Submission updated successfully", }); } catch (err) { - logger.error('Error updating submission', { error: err.message }); + logger.error(err.message); res.status(500).json({ status: "failed", message: "Internal server error" }); } }; @@ -328,7 +328,7 @@ exports.submissionHistory = async (req, res) => { res.status(200).json({ status: "success", data }); } catch (err) { - logger.error('Error on get submission history', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -480,7 +480,7 @@ exports.submissionList = async (req, res) => { }); } catch (err) { console.error(err); - logger.error('Error on submission listing', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -555,7 +555,7 @@ exports.viewSubmissionDetails = async (req, res) => { res.status(200).json({ status: "success", data: plainData, quarter_periods }); } catch (err) { - logger.error('Error on view submission', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -655,7 +655,7 @@ exports.getSubmissionHistory = async (req, res) => { } catch (err) { console.log(err); - logger.error('Error on submission history', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } } @@ -682,7 +682,7 @@ exports.submissionEditRequest = async (req, res) => { } catch (err) { console.error(err); - logger.error('Error on submission edit request', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -709,7 +709,7 @@ exports.enableOrDisableSubmissionEditAccess = async (req, res) => { } catch (err) { console.error(err); - logger.error('Error on disable submission edit access', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -782,7 +782,7 @@ exports.approveOrRejectSubmission = async (req, res) => { }); } catch (err) { console.error(err); - logger.error('Error on approve or reject submission', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } @@ -803,7 +803,7 @@ exports.getQuarterPeriods = async (req, res) => { return res.status(200).json({ status: "success", data: quarter_periods }); } catch (err) { - logger.error('Error on getting quater periods', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -853,7 +853,7 @@ exports.getPreviousForecastData = async (req, res) => { return res.status(200).json({ status:"success", data: submissionProduct }); } catch (err) { - logger.error('Error on getting previous forecasting data', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -936,7 +936,7 @@ exports.getBeforePreviousData = async (req, res) => { return res.status(200).json({ status: "success", data: submissionProduct }); } catch (err) { - logger.error('Error on get before previous data', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -1008,7 +1008,7 @@ exports.getProductSubmissionHistory = async (req, res) => { return res.status(200).json({ status:"success", data: submissionProductsData }); } catch (err) { - logger.error('Error on product submission history', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; diff --git a/app/controllers/unitMasterController.js b/app/controllers/unitMasterController.js index 7b29533..59fe9c8 100644 --- a/app/controllers/unitMasterController.js +++ b/app/controllers/unitMasterController.js @@ -134,7 +134,7 @@ exports.createUnit = async (req, res) => { }); } catch (err) { - logger.error('Error on creating unit', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -169,7 +169,7 @@ exports.getAllUnits = async (req, res) => { res.status(200).json({ status: "success",unit_count : units.length, data: units }); } catch (err) { - logger.error('Error on getting all unit', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -182,7 +182,7 @@ exports.getUnitById = async (req, res) => { if (!unit) return res.status(404).json({ status: "error", message: "Unit not found" }); res.status(200).json({ status: "success", data: unit }); } catch (err) { - logger.error('Error on get unit by Id', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -199,7 +199,7 @@ exports.updateUnit = async (req, res) => { await unit.update(req.body); res.status(200).json({ status: "success" }); } catch (err) { - logger.error('Error on updating unit', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -213,7 +213,7 @@ exports.deleteUnit = async (req, res) => { await unit.destroy(); res.status(200).json({ status: "success", message: "Unit deleted successfully" }); } catch (err) { - logger.error('Error on deleting unit', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -588,7 +588,7 @@ exports.uploadUnitMasterFromCSV = async (req, res) => { } catch (err) { deleteFileSecure(sanitizedPath); - logger.error('Error on import unit master csv file', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -608,7 +608,7 @@ exports.downloadUnitMasterFile = async (req, res) => { return res.download(safeFilePath, "unit_master_sample.csv"); } catch (error) { - logger.error('Error on downloading unit master csv sample file', { error: error.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; diff --git a/app/controllers/variationReasonMaster.controller.js b/app/controllers/variationReasonMaster.controller.js index c4a4b93..1f80128 100644 --- a/app/controllers/variationReasonMaster.controller.js +++ b/app/controllers/variationReasonMaster.controller.js @@ -65,7 +65,7 @@ exports.getReasonById = async (req, res) => { if (!data) return res.status(404).send({ status: "failed", message: "Reason not found" }); res.status(200).send({ status: "success", message: "Fetched successfully", data }); } catch (err) { - logger.error('Error on get reason', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -82,7 +82,7 @@ exports.updateReason = async (req, res) => { if (updated[0] === 0) return res.status(404).send({ status: "failed", message: "Reason not found" }); res.status(200).send({ status: "success", message: "Updated successfully" }); } catch (err) { - logger.error('Error on updating reason', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message: "Internal server error" }); } }; @@ -94,7 +94,7 @@ exports.deleteReason = async (req, res) => { if (!deleted) return res.status(404).send({ status: "failed", message: "Reason not found" }); res.status(200).send({ status: "success", message: "Deleted successfully" }); } catch (err) { - logger.error('Error deleting reason', { error: err.message }); + logger.error(err.message); res.status(500).send({ status: "failed", message:"Internal server error" }); } };