From 529122f61f6f96fe88789ebb8dfc30a7dbeeaa50 Mon Sep 17 00:00:00 2001 From: surya Date: Sat, 21 Aug 2021 20:08:44 +0530 Subject: [PATCH 1/3] Surya:20-08-2021 GD changes --- app/controllers/master.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js index 1a68909..53f20b7 100644 --- a/app/controllers/master.controller.js +++ b/app/controllers/master.controller.js @@ -246,7 +246,7 @@ exports.Deletesubsection = (req, res) => { exports.ItemList = (req, res) => { //Itemsmaster.findAll() - sequelize.query("SELECT itemsmaster.id,itemsmaster.statement as statement_id,statementsmaster.statement,itemsmaster.section as section_id,sectionsmaster.section,itemsmaster.subsection as subsection_id,subsectionsmaster.subsection ,itemsmaster.itemtext,itemsmaster.is_active,itemsmaster.createdby,itemsmaster.createdon,itemsmaster.updatedby,itemsmaster.updatedon FROM itemsmaster JOIN statementsmaster ON itemsmaster.statement=statementsmaster.id JOIN sectionsmaster ON itemsmaster.section= sectionsmaster.id JOIN subsectionsmaster ON itemsmaster.subsection= subsectionsmaster.id") + sequelize.query("SELECT itemsmaster.id,itemsmaster.statement as statement_id,statementsmaster.statement,itemsmaster.section as section_id,sectionsmaster.section,itemsmaster.subsection as subsection_id,subsectionsmaster.subsection,subsectionsmaster.itemtext as subsection_itemtext ,itemsmaster.itemtext,itemsmaster.is_active,itemsmaster.createdby,itemsmaster.createdon,itemsmaster.updatedby,itemsmaster.updatedon FROM itemsmaster JOIN statementsmaster ON itemsmaster.statement=statementsmaster.id JOIN sectionsmaster ON itemsmaster.section= sectionsmaster.id JOIN subsectionsmaster ON itemsmaster.subsection= subsectionsmaster.id") .then(data => { res.send({'status':200,'message':"success",'data':data}); logMsg.info("Success :"(data)); From 821d1c004fccaa3c5263c92e5df3cd693bf7c5fa Mon Sep 17 00:00:00 2001 From: surya Date: Mon, 23 Aug 2021 12:38:51 +0530 Subject: [PATCH 2/3] Surya: changes --- app/controllers/master.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js index 53f20b7..1edc70a 100644 --- a/app/controllers/master.controller.js +++ b/app/controllers/master.controller.js @@ -246,7 +246,7 @@ exports.Deletesubsection = (req, res) => { exports.ItemList = (req, res) => { //Itemsmaster.findAll() - sequelize.query("SELECT itemsmaster.id,itemsmaster.statement as statement_id,statementsmaster.statement,itemsmaster.section as section_id,sectionsmaster.section,itemsmaster.subsection as subsection_id,subsectionsmaster.subsection,subsectionsmaster.itemtext as subsection_itemtext ,itemsmaster.itemtext,itemsmaster.is_active,itemsmaster.createdby,itemsmaster.createdon,itemsmaster.updatedby,itemsmaster.updatedon FROM itemsmaster JOIN statementsmaster ON itemsmaster.statement=statementsmaster.id JOIN sectionsmaster ON itemsmaster.section= sectionsmaster.id JOIN subsectionsmaster ON itemsmaster.subsection= subsectionsmaster.id") + sequelize.query("SELECT itemsmaster.id,itemsmaster.statement as statement_id,statementsmaster.statement,itemsmaster.section as section_id,sectionsmaster.section,itemsmaster.subsection as subsection_id,subsectionsmaster.subsection,subsectionsmaster.itemtext as subsection_itemtext ,itemsmaster.itemtext,itemsmaster.is_active,pvtltd,llp,others,formula,is_calculated,itemsmaster.createdby,itemsmaster.createdon,itemsmaster.updatedby,itemsmaster.updatedon FROM itemsmaster JOIN statementsmaster ON itemsmaster.statement=statementsmaster.id JOIN sectionsmaster ON itemsmaster.section= sectionsmaster.id JOIN subsectionsmaster ON itemsmaster.subsection= subsectionsmaster.id") .then(data => { res.send({'status':200,'message':"success",'data':data}); logMsg.info("Success :"(data)); From 6a099d7dc5c4f0a7bd07c6a0e0b58cf80ad75109 Mon Sep 17 00:00:00 2001 From: surya Date: Mon, 23 Aug 2021 14:03:16 +0530 Subject: [PATCH 3/3] Surya: logger --- app/controllers/master.controller.js | 2 +- app/models/Statementsmaster.js | 3 +++ app/routes/routes.js | 5 +++-- app/services/logger.js | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js index 1edc70a..2cc7862 100644 --- a/app/controllers/master.controller.js +++ b/app/controllers/master.controller.js @@ -16,7 +16,7 @@ const { logMsg } = require('../services/logger.js'); await Statementsmaster.findAll() .then(data => { res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success "); + logMsg.info("Success -controller"); }) .catch(err => { diff --git a/app/models/Statementsmaster.js b/app/models/Statementsmaster.js index ccccfdd..2194b22 100644 --- a/app/models/Statementsmaster.js +++ b/app/models/Statementsmaster.js @@ -1,5 +1,6 @@ 'use strict' const { Model } = require('sequelize') +const { logMsg } = require('../services/logger.js') module.exports = (sequelize, DataTypes) => { class Statementsmaster extends Model { /** @@ -15,6 +16,7 @@ module.exports = (sequelize, DataTypes) => { //Sectionsmaster.hasMany(Subsectionsmaster, { foreignKey: 'section', as: 'subsectionsmaster' }) } + Statementsmaster.init( { @@ -32,5 +34,6 @@ module.exports = (sequelize, DataTypes) => { updatedAt: 'updatedon', } ) + logMsg.info("Success-model ") return Statementsmaster } diff --git a/app/routes/routes.js b/app/routes/routes.js index 75f9f31..295d2aa 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -2,6 +2,7 @@ module.exports = app => { const request = require("request"); const financials = require("../controllers/financial.controller.js"); const master = require("../controllers/master.controller.js"); + const { logMsg } = require('../services/logger.js'); var router = require("express").Router(); @@ -41,9 +42,9 @@ module.exports = app => { * 200: * description: Returns a mysterious string. */ - + logMsg.info("Success -route "); router.get("/StatementsList", master.StatementsList); - + /** * @openapi diff --git a/app/services/logger.js b/app/services/logger.js index 22a47cc..7970433 100644 --- a/app/services/logger.js +++ b/app/services/logger.js @@ -6,7 +6,7 @@ var transport = new winston.transports.DailyRotateFile({ filename: 'storage/log/msg.log', - datePattern: 'YYYY-MM-DD-HH', + datePattern: 'YYYY-MM-DD', zippedArchive: true, maxSize: '20m', maxFiles: '14d'