diff --git a/controllers/v1/general/general.js b/controllers/v1/general/general.js index 0b680cd..b50cf8a 100644 --- a/controllers/v1/general/general.js +++ b/controllers/v1/general/general.js @@ -2,6 +2,7 @@ const sequelize = require("../../../config/db"); const createApi = async (req, res, next) => { try { + console.log("Create Api"); } catch (error) { next(error); } diff --git a/models/init-models.js b/models/init-models.js index e9f376f..a63dcb4 100644 --- a/models/init-models.js +++ b/models/init-models.js @@ -1,8 +1,8 @@ -var DataTypes = require("sequelize").DataTypes; -var _casbin_rule = require("./casbin_rule"); -var _sys_dropdown_list = require("./sys_dropdown_list"); -var _sys_otp_template = require("./sys_otp_template"); -var _sys_tables = require("./sys_tables"); +let DataTypes = require("sequelize").DataTypes; +let _casbin_rule = require("./casbin_rule"); +let _sys_dropdown_list = require("./sys_dropdown_list"); +let _sys_otp_template = require("./sys_otp_template"); +let _sys_tables = require("./sys_tables"); function initModels(sequelize) { var casbin_rule = _casbin_rule(sequelize, DataTypes); diff --git a/package-lock.json b/package-lock.json index a0062c3..1aa095a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,8 @@ "uuid": "^9.0.0" }, "devDependencies": { - "plop": "^3.1.1" + "plop": "^3.1.1", + "prettier": "^3.5.3" } }, "node_modules/@azure/abort-controller": { @@ -4371,6 +4372,22 @@ "node": ">= 0.4" } }, + "node_modules/prettier": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", + "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", diff --git a/service/v1/index.js b/service/v1/index.js index 9b99cf2..217617e 100644 --- a/service/v1/index.js +++ b/service/v1/index.js @@ -1,4 +1,3 @@ -// const ReplaceWithService = require("./replace-with-service"); module.exports = { // ReplaceWithService diff --git a/utils/hash.js b/utils/hash.js index 4f354fa..a3b535a 100644 --- a/utils/hash.js +++ b/utils/hash.js @@ -7,7 +7,9 @@ module.exports = { const hashedPassword = await new Promise((resolve, reject) => { bcrypt.hash(password, saltRounds, function (err, hash) { - if (err) reject(err); + if (err) { + return reject(err instanceof Error ? err : new Error(err)); + } resolve(hash); }); }); @@ -21,7 +23,7 @@ module.exports = { return new Promise(function (resolve, reject) { bcrypt.compare(password, original, function (err, isMatch) { if (err) { - reject(err); + return reject(err instanceof Error ? err : new Error(err)); } else { resolve(isMatch); } diff --git a/utils/message-helper.js b/utils/message-helper.js index f1551ec..6b48965 100644 --- a/utils/message-helper.js +++ b/utils/message-helper.js @@ -11,7 +11,7 @@ module.exports = { return enc; } catch (error) { console.error(error); - return 0; + return "0"; } }, hashGenerator: async (USERNAME, SENDERID, messgae, KEY) => { diff --git a/utils/notifications.js b/utils/notifications.js index f6da4e0..2e6bfe1 100644 --- a/utils/notifications.js +++ b/utils/notifications.js @@ -7,8 +7,7 @@ const Sequelize = require("sequelize"); module.exports = { notification: async function (body, subject) { try { - const sender = new gcm.Sender(process.env.GCMSENDER), - createdDate = getDate("YYYY-MM-DD HH:mm:ss"); + const sender = new gcm.Sender(process.env.GCMSENDER); const message = new gcm.Message({ notification: { diff --git a/utils/search-util.js b/utils/search-util.js index 59967c8..bbd10ab 100644 --- a/utils/search-util.js +++ b/utils/search-util.js @@ -1,6 +1,6 @@ const { LINK, TEXT } = require("./constant"); -getSearchAbleData = ({ data: { uri, link_title }, children }) => { +const getSearchAbleData = ({ data: { uri, link_title }, children }) => { let mData = []; mData = [...mData, uri, ...(link_title ? [link_title] : [])]; if (!children) return mData; @@ -12,20 +12,22 @@ getSearchAbleData = ({ data: { uri, link_title }, children }) => { return mData; }; -checkForMatch = (a, b) => { +const checkForMatch = (a, b) => { let c = 0; a.map((v) => { let d = 0; b.map((v1) => { if (v1.toLowerCase().includes(v.toLowerCase())) d++; }); - d > 0 ? c++ : false; + if (d > 0) { + c++; + } }); return c >= a.length; }; -getSearchType = (type) => { +const getSearchType = (type) => { switch (type) { case 0: return `AND type = '${LINK}'`; diff --git a/utils/time.js b/utils/time.js index 71490dc..3efe96c 100644 --- a/utils/time.js +++ b/utils/time.js @@ -35,8 +35,6 @@ module.exports = { let m = Math.floor(p / 60); - p -= m * 60; - let tmp = []; d && tmp.push(d + "d"); @@ -45,7 +43,7 @@ module.exports = { (d || h || m) && tmp.push(m + "m"); - var datetime = tmp.join(" "); + let datetime = tmp.join(" "); return datetime; }, dateSort: date => { @@ -54,7 +52,13 @@ module.exports = { date.sort(function (a, b) { let aa = a.split("-").join(), bb = b.split("-").join(); - return aa < bb ? -1 : aa > bb ? 1 : 0; + if (aa < bb) { + return -1; + } else if (aa > bb) { + return 1; + } else { + return 0; + } }); return { diff --git a/utils/upload.js b/utils/upload.js index d290680..b02b7f5 100644 --- a/utils/upload.js +++ b/utils/upload.js @@ -49,7 +49,7 @@ const formidableUpload = async (req) => { const formfields = await new Promise(function (resolve, reject) { form.parse(req, function (err, fields, files) { if (err) { - reject(err); + reject(new Error("Form Not parsed ")); return; } @@ -59,7 +59,7 @@ const formidableUpload = async (req) => { return formfields; } catch (error) { - throw error; + console.error("Error in formidable upload:", error.message); } };