From c537fbf99774f51c0c169689a84d840a3a0b65e9 Mon Sep 17 00:00:00 2001 From: sriramv Date: Mon, 16 Aug 2021 16:47:06 +0530 Subject: [PATCH 01/10] financialsSummary:GWM --- app/controllers/financial.controller.js | 46 ++++++++++++++++++------- app/controllers/master.controller.js | 14 +------- app/routes/routes.js | 8 ++--- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index 4ef225c..6cc2386 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -1,6 +1,6 @@ //const db = require("../models"); //const Entities = db.tutorials; -//const Op = db.Sequelize.Op; +const { Op } = require("sequelize"); const { sequelize, Entities , Financials , Statementsmaster ,Sectionsmaster , Subsectionsmaster } = require('../models') const { logMsg } = require('../services/logger.js'); @@ -14,18 +14,21 @@ exports.MenuList = async (req, res) => { const losid = req.params.losid const MasterData = await Statementsmaster.findAll({ where :{is_active : 1} , + attributes: ['id', 'statement', 'is_active'], include :[{ association: 'sectionsmasterData' , where :{is_active : 1} , + attributes: ['id', 'section', 'is_active'], include :[{ association: 'subsectionsmasterData' , - //where :{is_active : 1} - }] - }] + //where :{is_active : 1} , + attributes: ['id', 'subsection', 'is_active'], + }], + required :true + }] }); - // const count = MasterData.length; - // console.log(count) - const EntitiesData = await Entities.findAll({where : { losid } }); + + const EntitiesData = await Entities.findAll({where : { losid } , attributes: ['id', 'losid' , 'pan' , 'cin' , 'bizname'] }); let data = []; EntitiesData.forEach((value, key)=>{ obj_data = { ...value.dataValues , statementsmasterrData:MasterData} @@ -57,13 +60,27 @@ exports.findAllEntities = (req, res) => { }); }; -// Retrieve all Statment from the database. -exports.StatmentList = (req, res) => { - - Statementsmaster.findAll({include: 'sectionsmasterData' }) +// FinantialsSummary +exports.FinantialsSummary = async (req, res) => { + const id = req.params.id + + Financials.findAll({where : { entity_id : id } ,attributes: ['fy'], group: ['fy'] , order: [['fy', 'ASC']] }) .then(data => { - res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success :"(data)); + // console.log(data.length) + if(data.length == 3) + { + const Year_1 = data[0].dataValues.fy + const Year_2 = data[1].dataValues.fy + const Year_3 = data[2].dataValues.fy + sequelize.query("Select a.entity_id,a.itemid,e.statement as statement_id ,e.section as section_id ,e.itemtext as items , a.value as fy_"+Year_1+" , b.value fy_"+Year_2+" , c.value fy_"+Year_3+" FROM financials a JOIN ( SELECT id,statement,section, itemtext FROM itemsmaster) e ON a.itemid = e.id JOIN ( SELECT entity_id, itemid, value, fy FROM financials WHERE fy = "+Year_3+") c ON a.entity_id = c.entity_id and a.itemid = c.itemid JOIN ( SELECT entity_id, itemid, value, fy FROM financials WHERE fy = "+Year_2+") b ON a.entity_id = b.entity_id and a.itemid = b.itemid AND a.fy = "+Year_1+" WHERE a.entity_id = "+id) + .then(result => { + res.send({'status':200,'message':"success",'data':result}); + }).catch(err => { + res.status(500).send({'status':404, + message: err.message || "Some error occurred while retrieving tutorials." ,'data': "No data" }); + }); + } else { res.send({'status':404,'message':"failed",'data':"No data"}); } + }) .catch(err => { res.status(500).send({'status':404, @@ -71,6 +88,9 @@ exports.StatmentList = (req, res) => { }); }; + + + exports.test = (req, res) => { sequelize.query("select * from statementsmaster") .then(data => { diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js index a49e156..210e722 100644 --- a/app/controllers/master.controller.js +++ b/app/controllers/master.controller.js @@ -430,19 +430,7 @@ exports.Deleteitem = (req, res) => { -exports.test = (req, res) => { - sequelize.query("select * from statementsmaster") - .then(data => { - res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success :"(data)); - }) - .catch(err => { - res.status(500).send({ - message: - err.message || "Some error occurred while retrieving tutorials." - }); - }); -}; + diff --git a/app/routes/routes.js b/app/routes/routes.js index 416b7cf..caa3c4e 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -8,7 +8,7 @@ module.exports = app => { // Retrieve all Tutorials router.get("/EntitiesList", financials.findAllEntities); // get statment master data - router.get("/StatmentList", financials.StatmentList); + router.get("/FinantialsSummary/:id/", financials.FinantialsSummary); // get statment master data router.get("/MenuList/:losid", financials.MenuList); @@ -22,18 +22,18 @@ module.exports = app => { router.get("/SectionList", master.SectionList); router.post("/Insertsection", master.Insertsection); - router.put("/Updatesection/:id", master.Updatesection); + router.put("/Updatesection/:id", master.Updatesection); router.put("/Deletesection/:id", master.Deletesection); router.get("/SubsectionList", master.SubsectionList); router.post("/Insertsubsection", master.Insertsubsection); router.put("/Updatesubsection/:id", master.Updatesubsection); - router.put("/Deletesubsection/:id", master.Deletesubsection); + router.put("/Deletesubsection/:id", master.Deletesubsection); router.get("/ItemList", master.ItemList); router.post("/Insertitem", master.Insertitem); router.put("/Updateitem/:id", master.Updateitem); - router.put("/Deleteitem/:id", master.Deleteitem); + router.put("/Deleteitem/:id", master.Deleteitem); //sample //router.put("/:id", tutorials.update); From 28f908ba98c38acaf2085ceae0db7ff3b5c6839a Mon Sep 17 00:00:00 2001 From: surya Date: Mon, 16 Aug 2021 16:56:44 +0530 Subject: [PATCH 02/10] Surya: --- app/routes/routes.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/routes/routes.js b/app/routes/routes.js index 416b7cf..8162156 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -5,7 +5,7 @@ module.exports = app => { var router = require("express").Router(); - // Retrieve all Tutorials + // Retrieve all Entites router.get("/EntitiesList", financials.findAllEntities); // get statment master data router.get("/StatmentList", financials.StatmentList); @@ -22,18 +22,18 @@ module.exports = app => { router.get("/SectionList", master.SectionList); router.post("/Insertsection", master.Insertsection); - router.put("/Updatesection/:id", master.Updatesection); + router.put("/Updatesection/:id", master.Updatesection); router.put("/Deletesection/:id", master.Deletesection); router.get("/SubsectionList", master.SubsectionList); router.post("/Insertsubsection", master.Insertsubsection); router.put("/Updatesubsection/:id", master.Updatesubsection); - router.put("/Deletesubsection/:id", master.Deletesubsection); + router.put("/Deletesubsection/:id", master.Deletesubsection); router.get("/ItemList", master.ItemList); router.post("/Insertitem", master.Insertitem); router.put("/Updateitem/:id", master.Updateitem); - router.put("/Deleteitem/:id", master.Deleteitem); + router.put("/Deleteitem/:id", master.Deleteitem); //sample //router.put("/:id", tutorials.update); From e5578ec5ebedcec16f8c6d7c1523441e36d7c540 Mon Sep 17 00:00:00 2001 From: surya Date: Mon, 16 Aug 2021 17:04:32 +0530 Subject: [PATCH 03/10] Surya:statement master crud apis & models changes --- app/routes/routes.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/routes/routes.js b/app/routes/routes.js index d520254..3544885 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -4,10 +4,7 @@ module.exports = app => { const master = require("../controllers/master.controller.js"); var router = require("express").Router(); -<<<<<<< HEAD - - // Retrieve all Entites -======= + /** * @openapi * /api/EntitiesList: @@ -18,7 +15,7 @@ module.exports = app => { * description: Returns a mysterious string. */ // Retrieve all Tutorials ->>>>>>> 6d54380f49bd9aa3c3e623eccdd3eb6bb98da170 + router.get("/EntitiesList", financials.findAllEntities); // get statment master data router.get("/FinantialsSummary/:id/", financials.FinantialsSummary); From c813d840a57893c842b5d15c9f1fa23d7ccba76d Mon Sep 17 00:00:00 2001 From: surya Date: Mon, 16 Aug 2021 17:54:29 +0530 Subject: [PATCH 04/10] Surya:route changes --- app/routes/routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes/routes.js b/app/routes/routes.js index 3544885..a3f0a93 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -25,7 +25,7 @@ module.exports = app => { //master.controller api's // get statment master data - router.get("/StatmentsList", master.StatmentList); + router.get("/StatementsList", master.StatmentList); router.post("/Insertstatement", master.Insertstatement); router.put("/Updatestatement/:id", master.Updatestatement); router.put("/Deletestatement/:id", master.Deletestatement); From 8f14e2d97662c512bd3e4cd27de47c1c949f6576 Mon Sep 17 00:00:00 2001 From: sriramv Date: Tue, 17 Aug 2021 10:50:00 +0530 Subject: [PATCH 05/10] finsummary:GWM --- app/controllers/financial.controller.js | 5 +++-- app/routes/routes.js | 11 ++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index 6cc2386..2f6065e 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -72,8 +72,9 @@ exports.FinantialsSummary = async (req, res) => { const Year_1 = data[0].dataValues.fy const Year_2 = data[1].dataValues.fy const Year_3 = data[2].dataValues.fy - sequelize.query("Select a.entity_id,a.itemid,e.statement as statement_id ,e.section as section_id ,e.itemtext as items , a.value as fy_"+Year_1+" , b.value fy_"+Year_2+" , c.value fy_"+Year_3+" FROM financials a JOIN ( SELECT id,statement,section, itemtext FROM itemsmaster) e ON a.itemid = e.id JOIN ( SELECT entity_id, itemid, value, fy FROM financials WHERE fy = "+Year_3+") c ON a.entity_id = c.entity_id and a.itemid = c.itemid JOIN ( SELECT entity_id, itemid, value, fy FROM financials WHERE fy = "+Year_2+") b ON a.entity_id = b.entity_id and a.itemid = b.itemid AND a.fy = "+Year_1+" WHERE a.entity_id = "+id) - .then(result => { + //sequelize.query("Select a.entity_id,a.itemid,e.statement as statement_id ,e.section as section_id ,e.itemtext as items , a.value as fy_"+Year_1+" , b.value fy_"+Year_2+" , c.value fy_"+Year_3+" FROM financials a JOIN ( SELECT id,statement,section, itemtext FROM itemsmaster) e ON a.itemid = e.id JOIN ( SELECT entity_id, itemid, value, fy FROM financials WHERE fy = "+Year_3+") c ON a.entity_id = c.entity_id and a.itemid = c.itemid JOIN ( SELECT entity_id, itemid, value, fy FROM financials WHERE fy = "+Year_2+") b ON a.entity_id = b.entity_id and a.itemid = b.itemid AND a.fy = "+Year_1+" WHERE a.entity_id = "+id) + sequelize.query("Select a.entity_id,x.id as statement_id,x.statement as statement,y.id as section_id,y.section as section,a.itemid,e.itemtext as items,a.value as fy_"+Year_1+",b.value fy_"+Year_2+",c.value fy_"+Year_3+" FROM financials a JOIN ( SELECT id, itemtext ,statement FROM itemsmaster ) e ON a.itemid = e.id JOIN ( SELECT id, statement FROM statementsmaster ) x ON e.statement = x.id JOIN ( SELECT id, section FROM sectionsmaster ) y ON e.statement = y.id JOIN ( SELECT entity_id, itemid, value, fy FROM financials WHERE fy = "+Year_3+") c ON a.entity_id = c.entity_id and a.itemid = c.itemid JOIN ( SELECT entity_id, itemid, value, fy FROM financials WHERE fy = "+Year_2+") b ON a.entity_id = b.entity_id and a.itemid = b.itemid AND a.fy = "+Year_1+" WHERE a.entity_id = "+id+" order by x.id asc , y.id asc , a.itemid asc ") + .then(result => { res.send({'status':200,'message':"success",'data':result}); }).catch(err => { res.status(500).send({'status':404, diff --git a/app/routes/routes.js b/app/routes/routes.js index b3fd066..3d0d78f 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -15,8 +15,17 @@ module.exports = app => { */ // Retrieve all Tutorials router.get("/EntitiesList", financials.findAllEntities); + /** + * @openapi + * /FinantialsSummary/:id: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ // get statment master data - router.get("/FinantialsSummary/:id/", financials.FinantialsSummary); + router.get("/FinantialsSummary/:id", financials.FinantialsSummary); // get statment master data router.get("/MenuList/:losid", financials.MenuList); From 70d83f3603c0ba4e226980073b9c42d4fde98221 Mon Sep 17 00:00:00 2001 From: surya Date: Tue, 17 Aug 2021 13:24:39 +0530 Subject: [PATCH 06/10] Surya:route changes --- app/controllers/master.controller.js | 185 ++++++++++++--------------- app/models/Brokenperiods.js | 1 + app/models/Entities.js | 2 +- app/routes/routes.js | 151 +++++++++++++++++++++- 4 files changed, 231 insertions(+), 108 deletions(-) diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js index 210e722..353a79e 100644 --- a/app/controllers/master.controller.js +++ b/app/controllers/master.controller.js @@ -8,7 +8,7 @@ const { logMsg } = require('../services/logger.js'); //statementmaster -// Retrieve all statementmaster from the database. +// Retrieve all statements from the database. exports.StatmentList = (req, res) => { Statementsmaster.findAll({where : { is_active : 1 } }) @@ -18,7 +18,7 @@ exports.StatmentList = (req, res) => { }) .catch(err => { res.status(500).send({'status':404, - message: err.message || "Some error occurred while retrieving tutorials." ,'data': "No data" }); + message: err.message || "Some error occurred while retrieving statements." ,'data': "No data" }); }); }; @@ -34,35 +34,16 @@ exports.Insertstatement = (req, res) => { // Save Tutorial in the database Statementsmaster.create(statement) - .then(data => { - res.send(data); - }) - .catch(err => { - res.status(500).send({ - message: - err.message || "Some error occurred while creating the statement." - }); - }); + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) + .catch(err => { + res.status(500).send({'status':404, + message: err.message || "Some error occurred while insertinging statements." ,'data': "No data" + }); + }); }; -// Post a statement -// insert datas into statementmaster table. -// exports.Insertstatement = (req, res) => { - -// Statementsmaster.create({ -// statement: req.body.statement, -// is_active: req.body.is_active, -// createdby: req.body.createdby, -// updatedby: req.body.updatedby, -// }) -// .then(data => { -// res.send({'status':200,'message':"success",'data':data}); -// logMsg.info("Success :"(data)); -// }) -// .catch(err => { -// res.status(500).send({'status':404, -// message: err.message || "Some error occurred while retrieving tutorials." ,'data': "No data" }); -// }); -// }; // updates datas into statementmaster table. exports.Updatestatement = (req, res) => { @@ -73,19 +54,18 @@ exports.Updatestatement = (req, res) => { }) .then(num => { if (num == 1) { - res.send({ - message: "statement was updated successfully." - }); + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); } else { res.send({ - message: `Cannot update statement with id=${id}. Maybe statement was not found or req.body is empty!` + message: `Cannot update statement with id= ${id}. Maybe statement was not found or req.body is empty!` }); } }) .catch(err => { - res.status(500).send({ - message: "Error updating statement with id=" + id - }); + res.status(500).send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); }); }; @@ -98,9 +78,8 @@ exports.Deletestatement = (req, res) => { }) .then(num => { if (num == 1) { - res.send({ - message: "statement was deleted successfully!" - }); + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); } else { res.send({ message: `Cannot delete statement with id=${id}. Maybe statement was not found!` @@ -108,9 +87,9 @@ exports.Deletestatement = (req, res) => { } }) .catch(err => { - res.status(500).send({ - message: "Could not delete statement with id=" + id - }); + res.status(500).send({'status':404, + message: err.message || "Some error occurred while Deletiing statements." ,'data': "No data" + }); }); }; @@ -143,15 +122,15 @@ exports.Insertsection = (req, res) => { // Save section in the database Sectionsmaster.create(section) - .then(data => { - res.send(data); - }) - .catch(err => { - res.status(500).send({ - message: - err.message || "Some error occurred while creating the section." - }); - }); + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) + .catch(err => { + res.status(500).send({'status':404, + message: err.message || "Some error occurred while insertinging sectino." ,'data': "No data" + }); + }); }; exports.Updatesection = (req, res) => { @@ -162,9 +141,8 @@ exports.Updatesection = (req, res) => { }) .then(num => { if (num == 1) { - res.send({ - message: "section was updated successfully." - }); + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); } else { res.send({ message: `Cannot update section with id=${id}. Maybe section was not found or req.body is empty!` @@ -172,9 +150,9 @@ exports.Updatesection = (req, res) => { } }) .catch(err => { - res.status(500).send({ - message: "Error updating section with id=" + id - }); + res.status(500).send({'status':404, + message: err.message || "Some error occurred while updating sectinos." ,'data': "No data" + }); }); }; @@ -187,9 +165,8 @@ exports.Deletesection = (req, res) => { }) .then(num => { if (num == 1) { - res.send({ - message: "section was deleted successfully!" - }); + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); } else { res.send({ message: `Cannot delete section with id=${id}. Maybe section was not found!` @@ -197,9 +174,9 @@ exports.Deletesection = (req, res) => { } }) .catch(err => { - res.status(500).send({ - message: "Could not delete section with id=" + id - }); + res.status(500).send({'status':404, + message: err.message || "Some error occurred while Deleting statements." ,'data': "No data" + }); }); }; @@ -233,15 +210,15 @@ exports.Insertsubsection = (req, res) => { // Save Tutorial in the database Subsectionsmaster.create(subsection) - .then(data => { - res.send(data); - }) - .catch(err => { - res.status(500).send({ - message: - err.message || "Some error occurred while creating the subsection." - }); - }); + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) + .catch(err => { + res.status(500).send({'status':404, + message: err.message || "Some error occurred while insertinging subsection." ,'data': "No data" + }); + }); }; exports.Updatesubsection = (req, res) => { @@ -252,9 +229,8 @@ exports.Updatesubsection = (req, res) => { }) .then(num => { if (num == 1) { - res.send({ - message: "subsection was updated successfully." - }); + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); } else { res.send({ message: `Cannot update subsection with id=${id}. Maybe subsection was not found or req.body is empty!` @@ -262,9 +238,9 @@ exports.Updatesubsection = (req, res) => { } }) .catch(err => { - res.status(500).send({ - message: "Error updating subsection with id=" + id - }); + res.status(500).send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); }); }; @@ -277,9 +253,8 @@ exports.Deletesubsection = (req, res) => { }) .then(num => { if (num == 1) { - res.send({ - message: "subsection was deleted successfully!" - }); + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); } else { res.send({ message: `Cannot delete subsection with id=${id}. Maybe subsection was not found!` @@ -287,9 +262,9 @@ exports.Deletesubsection = (req, res) => { } }) .catch(err => { - res.status(500).send({ - message: "Could not delete subsection with id=" + id - }); + res.status(500).send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); }); }; @@ -328,15 +303,15 @@ exports.Insertitem = (req, res) => { // Save Tutorial in the database Itemsmaster.create(item) - .then(data => { - res.send(data); - }) - .catch(err => { - res.status(500).send({ - message: - err.message || "Some error occurred while creating the item." - }); - }); + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) + .catch(err => { + res.status(500).send({'status':404, + message: err.message || "Some error occurred while insertinging items." ,'data': "No data" + }); + }); }; exports.Updateitem = (req, res) => { @@ -347,9 +322,8 @@ exports.Updateitem = (req, res) => { }) .then(num => { if (num == 1) { - res.send({ - message: "item was updated successfully." - }); + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); } else { res.send({ message: `Cannot update item with id=${id}. Maybe item was not found or req.body is empty!` @@ -357,9 +331,9 @@ exports.Updateitem = (req, res) => { } }) .catch(err => { - res.status(500).send({ - message: "Error updating item with id=" + id - }); + res.status(500).send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); }); }; @@ -372,9 +346,8 @@ exports.Deleteitem = (req, res) => { }) .then(num => { if (num == 1) { - res.send({ - message: "item was deleted successfully!" - }); + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); } else { res.send({ message: `Cannot delete item with id=${id}. Maybe statement was not found!` @@ -382,9 +355,9 @@ exports.Deleteitem = (req, res) => { } }) .catch(err => { - res.status(500).send({ - message: "Could not delete item with id=" + id - }); + res.status(500).send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); }); }; diff --git a/app/models/Brokenperiods.js b/app/models/Brokenperiods.js index 58b2ffb..0833818 100644 --- a/app/models/Brokenperiods.js +++ b/app/models/Brokenperiods.js @@ -31,6 +31,7 @@ module.exports = (sequelize, DataTypes) => { modelName: 'Brokenperiods', createdAt: 'createdon', updatedAt: 'updatedon', + } ) return Brokenperiods diff --git a/app/models/Entities.js b/app/models/Entities.js index 9b0030f..e5ad7b2 100644 --- a/app/models/Entities.js +++ b/app/models/Entities.js @@ -25,7 +25,7 @@ module.exports = (sequelize, DataTypes) => { biz_act_desc: { type: DataTypes.STRING }, createdby: { type: DataTypes.INTEGER }, updatedby: { type: DataTypes.INTEGER }, - + }, { sequelize, diff --git a/app/routes/routes.js b/app/routes/routes.js index a3f0a93..80fbcec 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -5,7 +5,7 @@ module.exports = app => { var router = require("express").Router(); - /** + /** * @openapi * /api/EntitiesList: * get: @@ -25,24 +25,173 @@ module.exports = app => { //master.controller api's // get statment master data + /** + * @openapi + * /api/StatementsList: + * get: + * description: This is List api statement! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.get("/StatementsList", master.StatmentList); + /** + * @openapi + * /api/Insertstatement: + * get: + * description: This is Insert api statement! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.post("/Insertstatement", master.Insertstatement); + /** + * @openapi + * /api/Updatestatement/:id: + * get: + * description: This is update api statement! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.put("/Updatestatement/:id", master.Updatestatement); + /** + * @openapi + * /api/Deletestatement/:id: + * get: + * description: This is Delete api statement! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.put("/Deletestatement/:id", master.Deletestatement); + + + /** + * @openapi + * /api/SectionList: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ + router.get("/SectionList", master.SectionList); + /** + * @openapi + * /api/Insertsection: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.post("/Insertsection", master.Insertsection); + /** + * @openapi + * /api/Updatesection/:id: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.put("/Updatesection/:id", master.Updatesection); + /** + * @openapi + * /api/Deletesection/:id: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.put("/Deletesection/:id", master.Deletesection); + + /** + * @openapi + * /api/SubsectionList: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.get("/SubsectionList", master.SubsectionList); + /** + * @openapi + * /api/Insertsubsection: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.post("/Insertsubsection", master.Insertsubsection); + /** + * @openapi + * /api/Updatesubsection/:id: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.put("/Updatesubsection/:id", master.Updatesubsection); + /** + * @openapi + * /api/Deletesubsection/:id: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.put("/Deletesubsection/:id", master.Deletesubsection); + + /** + * @openapi + * /api/ItemList: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.get("/ItemList", master.ItemList); + /** + * @openapi + * /api/Insertitem: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.post("/Insertitem", master.Insertitem); + /** + * @openapi + * /api/Updateitem/:id: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.put("/Updateitem/:id", master.Updateitem); + /** + * @openapi + * /api/Deleteitem/:id: + * get: + * description: Welcome to swagger-jsdoc! + * responses: + * 200: + * description: Returns a mysterious string. + */ router.put("/Deleteitem/:id", master.Deleteitem); //sample From 109c7aaebe2457ea127753821b29d5fa07806627 Mon Sep 17 00:00:00 2001 From: sriramv Date: Tue, 17 Aug 2021 13:33:45 +0530 Subject: [PATCH 07/10] merging --- app/controllers/financial.controller.js | 16 +++------------- app/routes/routes.js | 15 +++------------ 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index 2f6065e..71c3c62 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -60,6 +60,8 @@ exports.findAllEntities = (req, res) => { }); }; + + // FinantialsSummary exports.FinantialsSummary = async (req, res) => { const id = req.params.id @@ -92,19 +94,7 @@ exports.FinantialsSummary = async (req, res) => { -exports.test = (req, res) => { - sequelize.query("select * from statementsmaster") - .then(data => { - res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success :"(data)); - }) - .catch(err => { - res.status(500).send({ - message: - err.message || "Some error occurred while retrieving tutorials." - }); - }); -}; + diff --git a/app/routes/routes.js b/app/routes/routes.js index 68cbbd0..4d2b8b8 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -4,7 +4,6 @@ module.exports = app => { const master = require("../controllers/master.controller.js"); var router = require("express").Router(); - /** * @openapi * /api/EntitiesList: @@ -15,26 +14,18 @@ module.exports = app => { * description: Returns a mysterious string. */ // Retrieve all Tutorials - router.get("/EntitiesList", financials.findAllEntities); - /** - * @openapi - * /FinantialsSummary/:id: - * get: - * description: Welcome to swagger-jsdoc! - * responses: - * 200: - * description: Returns a mysterious string. - */ + // get statment master data router.get("/FinantialsSummary/:id", financials.FinantialsSummary); + // get statment master data router.get("/MenuList/:losid", financials.MenuList); //master.controller api's // get statment master data - router.get("/StatementsList", master.StatmentList); + router.get("/StatmentsList", master.StatmentList); router.post("/Insertstatement", master.Insertstatement); router.put("/Updatestatement/:id", master.Updatestatement); router.put("/Deletestatement/:id", master.Deletestatement); From 227d929efeff2be785f7fb0413f366bbe703a7d6 Mon Sep 17 00:00:00 2001 From: surya Date: Tue, 17 Aug 2021 18:45:16 +0530 Subject: [PATCH 08/10] Surya:route changes --- app/controllers/master.controller.js | 201 +++++++++++---------------- app/routes/routes.js | 2 +- 2 files changed, 79 insertions(+), 124 deletions(-) diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js index 353a79e..afd4d44 100644 --- a/app/controllers/master.controller.js +++ b/app/controllers/master.controller.js @@ -9,7 +9,7 @@ const { logMsg } = require('../services/logger.js'); //statementmaster // Retrieve all statements from the database. -exports.StatmentList = (req, res) => { +exports.StatementsList = (req, res) => { Statementsmaster.findAll({where : { is_active : 1 } }) .then(data => { @@ -17,7 +17,7 @@ exports.StatmentList = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.status(500).send({'status':404, + res.send({'status':404, message: err.message || "Some error occurred while retrieving statements." ,'data': "No data" }); }); }; @@ -52,18 +52,12 @@ exports.Updatestatement = (req, res) => { Statementsmaster.update(req.body, { where: { id: id } }) - .then(num => { - if (num == 1) { + .then(data => { res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success :"(data)); - } else { - res.send({ - message: `Cannot update statement with id= ${id}. Maybe statement was not found or req.body is empty!` - }); - } - }) + logMsg.info("Success :"(data)); + }) .catch(err => { - res.status(500).send({'status':404, + res.send({'status':404, message: err.message || "Some error occurred while updating statements." ,'data': "No data" }); }); @@ -76,21 +70,15 @@ exports.Deletestatement = (req, res) => { Statementsmaster.update({ is_active : 0 },{ where: { id: id } }) - .then(num => { - if (num == 1) { - res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success :"(data)); - } else { - res.send({ - message: `Cannot delete statement with id=${id}. Maybe statement was not found!` - }); - } - }) - .catch(err => { - res.status(500).send({'status':404, - message: err.message || "Some error occurred while Deletiing statements." ,'data': "No data" - }); - }); + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) +.catch(err => { + res.send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); +}); }; @@ -105,7 +93,7 @@ exports.SectionList = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.status(500).send({'status':404, + res.send({'status':404, message: err.message || "Some error occurred while retrieving sections." ,'data': "No data" }); }); }; @@ -127,7 +115,7 @@ exports.Insertsection = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.status(500).send({'status':404, + res.send({'status':404, message: err.message || "Some error occurred while insertinging sectino." ,'data': "No data" }); }); @@ -139,21 +127,15 @@ exports.Updatesection = (req, res) => { Sectionsmaster.update(req.body, { where: { id: id } }) - .then(num => { - if (num == 1) { - res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success :"(data)); - } else { - res.send({ - message: `Cannot update section with id=${id}. Maybe section was not found or req.body is empty!` - }); - } - }) - .catch(err => { - res.status(500).send({'status':404, - message: err.message || "Some error occurred while updating sectinos." ,'data': "No data" - }); - }); + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) +.catch(err => { + res.send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); +}); }; //delete @@ -163,21 +145,17 @@ exports.Deletesection = (req, res) => { Sectionsmaster.update({ is_active : 0 },{ where: { id: id } }) - .then(num => { - if (num == 1) { - res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success :"(data)); - } else { - res.send({ - message: `Cannot delete section with id=${id}. Maybe section was not found!` - }); - } - }) - .catch(err => { - res.status(500).send({'status':404, - message: err.message || "Some error occurred while Deleting statements." ,'data': "No data" - }); - }); + + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) + +.catch(err => { + res.send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); +}); }; @@ -192,7 +170,7 @@ exports.SubsectionList = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.status(500).send({'status':404, + res.send({'status':404, message: err.message || "Some error occurred while retrieving subsections." ,'data': "No data" }); }); }; @@ -215,7 +193,7 @@ exports.Insertsubsection = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.status(500).send({'status':404, + res.send({'status':404, message: err.message || "Some error occurred while insertinging subsection." ,'data': "No data" }); }); @@ -227,21 +205,16 @@ exports.Updatesubsection = (req, res) => { Subsectionsmaster.update(req.body, { where: { id: id } }) - .then(num => { - if (num == 1) { - res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success :"(data)); - } else { - res.send({ - message: `Cannot update subsection with id=${id}. Maybe subsection was not found or req.body is empty!` - }); - } - }) - .catch(err => { - res.status(500).send({'status':404, - message: err.message || "Some error occurred while updating statements." ,'data': "No data" - }); - }); + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) +.catch(err => { + res.send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); +}); + }; //delete @@ -251,21 +224,15 @@ exports.Deletesubsection = (req, res) => { Subsectionsmaster.update({ is_active : 0 },{ where: { id: id } }) - .then(num => { - if (num == 1) { - res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success :"(data)); - } else { - res.send({ - message: `Cannot delete subsection with id=${id}. Maybe subsection was not found!` - }); - } - }) - .catch(err => { - res.status(500).send({'status':404, - message: err.message || "Some error occurred while updating statements." ,'data': "No data" - }); - }); + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) +.catch(err => { + res.send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); +}); }; @@ -279,7 +246,7 @@ exports.ItemList = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.status(500).send({'status':404, + res.send({'status':404, message: err.message || "Some error occurred while retrieving items." ,'data': "No data" }); }); }; @@ -308,7 +275,7 @@ exports.Insertitem = (req, res) => { logMsg.info("Success :"(data)); }) .catch(err => { - res.status(500).send({'status':404, + res.send({'status':404, message: err.message || "Some error occurred while insertinging items." ,'data': "No data" }); }); @@ -320,21 +287,15 @@ exports.Updateitem = (req, res) => { Itemsmaster.update(req.body, { where: { id: id } }) - .then(num => { - if (num == 1) { - res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success :"(data)); - } else { - res.send({ - message: `Cannot update item with id=${id}. Maybe item was not found or req.body is empty!` - }); - } - }) - .catch(err => { - res.status(500).send({'status':404, - message: err.message || "Some error occurred while updating statements." ,'data': "No data" - }); - }); + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) +.catch(err => { + res.send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); +}); }; //delete @@ -344,21 +305,15 @@ exports.Deleteitem = (req, res) => { Itemsmaster.update({ is_active : 0 },{ where: { id: id } }) - .then(num => { - if (num == 1) { - res.send({'status':200,'message':"success",'data':data}); - logMsg.info("Success :"(data)); - } else { - res.send({ - message: `Cannot delete item with id=${id}. Maybe statement was not found!` - }); - } - }) - .catch(err => { - res.status(500).send({'status':404, - message: err.message || "Some error occurred while updating statements." ,'data': "No data" - }); - }); + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) +.catch(err => { + res.send({'status':404, + message: err.message || "Some error occurred while updating statements." ,'data': "No data" + }); +}); }; diff --git a/app/routes/routes.js b/app/routes/routes.js index 40b800c..cfcc94c 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -43,7 +43,7 @@ module.exports = app => { * 200: * description: Returns a mysterious string. */ - router.get("/StatementsList", master.StatmentList); + router.get("/StatementsList", master.StatementsList); /** * @openapi * /api/Insertstatement: From 9d5ec1e30c622bf0a40226e4a9bdbb727420d085 Mon Sep 17 00:00:00 2001 From: sriramv Date: Wed, 18 Aug 2021 10:45:44 +0530 Subject: [PATCH 09/10] brokenperiod:GWM --- app/controllers/financial.controller.js | 87 +++++++++++++++++++------ app/models/Brokenperiods.js | 2 + app/routes/routes.js | 11 ++-- 3 files changed, 75 insertions(+), 25 deletions(-) diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index 71c3c62..bb8b3a0 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -2,7 +2,7 @@ //const Entities = db.tutorials; const { Op } = require("sequelize"); -const { sequelize, Entities , Financials , Statementsmaster ,Sectionsmaster , Subsectionsmaster } = require('../models') +const { sequelize, Entities , Financials , Statementsmaster ,Sectionsmaster , Subsectionsmaster , Brokenperiods } = require('../models') const { logMsg } = require('../services/logger.js'); @@ -43,24 +43,6 @@ exports.MenuList = async (req, res) => { }; -// Retrieve all Entities from the database. -exports.findAllEntities = (req, res) => { - - Entities.findAll() - .then(data => { - res.send({'status':200,'message':"success",'data':data}); - - logMsg.info("Success :"(data)); - }) - .catch(err => { - res.status(500).send({ - message: - err.message || "Some error occurred while retrieving tutorials." - }); - }); -}; - - // FinantialsSummary exports.FinantialsSummary = async (req, res) => { @@ -91,8 +73,71 @@ exports.FinantialsSummary = async (req, res) => { }); }; - - +// Broken period list api +exports.BrokenPeriodsList = (req, res) => { + const entityid = req.params.entityid + Brokenperiods.findAll({where : { entity_id : entityid } }) + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + logMsg.info("Success :"(data)); + }) + .catch(err => { + res.status(404).send({'status':404, + message: err.message || "Some error occurred while retrieving statements." ,'data': "No data" }); + }); +}; + +// Broken period Insert OR Update +exports.BrokenPeriods = (req, res) => { + const obj = req.body + if (obj.hasOwnProperty("id")) + { + // update broken periods + const Id = req.body.id + Brokenperiods.update( { + entity_id: req.body.entity_id, + from: req.body.from, + to: req.body.to, + months: req.body.months, + cy: req.body.cy, + py: req.body.py, + variation: req.body.variation, + updatedby: req.body.updatedby, + } , { where: { id: Id } }) + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + }) + .catch(err => { + res.status(404).send({'status':404, + message: err.message || "Some error occurred while insertinging statements." ,'data': "No data" + }); + }); + + } + else + { + // create broken period + Brokenperiods.create({ + entity_id: req.body.entity_id, + from: req.body.from, + to: req.body.to, + months: req.body.months, + cy: req.body.cy, + py: req.body.py, + variation: req.body.variation, + createdby: req.body.createdby, + }) + .then(data => { + res.send({'status':200,'message':"success",'data':data}); + }) + .catch(err => { + res.status(404).send({'status':404, + message: err.message || "Some error occurred while insertinging statements." ,'data': "No data" + }); + }); + } + +}; diff --git a/app/models/Brokenperiods.js b/app/models/Brokenperiods.js index 0833818..63344dc 100644 --- a/app/models/Brokenperiods.js +++ b/app/models/Brokenperiods.js @@ -17,6 +17,8 @@ module.exports = (sequelize, DataTypes) => { Brokenperiods.init( { entity_id: { type: DataTypes.INTEGER }, + from: { type: DataTypes.DATE }, + to: { type: DataTypes.DATE }, months: { type: DataTypes.INTEGER }, cy: { type: DataTypes.INTEGER }, py: { type: DataTypes.INTEGER }, diff --git a/app/routes/routes.js b/app/routes/routes.js index 9d28a2a..15f8adf 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -14,15 +14,18 @@ module.exports = app => { * 200: * description: Returns a mysterious string. */ - // Retrieve all Tutorials - router.get("/EntitiesList", financials.findAllEntities); + // insert or update broken periods + router.post("/BrokenPeriods", financials.BrokenPeriods); - // get statment master data + // get financials summary router.get("/FinantialsSummary/:id", financials.FinantialsSummary); - // get statment master data + // get menu list router.get("/MenuList/:losid", financials.MenuList); + // Retrieve all Broken periods + router.get("/BrokenPeriodsList/:entityid", financials.BrokenPeriodsList); + //master.controller api's // get statment master data From f2eda0ed7a12a4ce285e3b7583d1d4e604f8fb14 Mon Sep 17 00:00:00 2001 From: sriramv Date: Wed, 18 Aug 2021 12:15:55 +0530 Subject: [PATCH 10/10] merging --- app/controllers/financial.controller.js | 9 ++++++--- app/routes/routes.js | 3 --- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index bb8b3a0..c106c0d 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -21,11 +21,14 @@ exports.MenuList = async (req, res) => { attributes: ['id', 'section', 'is_active'], include :[{ association: 'subsectionsmasterData' , - //where :{is_active : 1} , + where :{is_active : 1} , attributes: ['id', 'subsection', 'is_active'], + required :false }], - required :true - }] + required :false + }], + required :false + }); const EntitiesData = await Entities.findAll({where : { losid } , attributes: ['id', 'losid' , 'pan' , 'cin' , 'bizname'] }); diff --git a/app/routes/routes.js b/app/routes/routes.js index 09720bf..6016385 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -29,9 +29,6 @@ module.exports = app => { //master.controller api's // get statment master data - - router.get("/StatmentsList", master.StatmentList); - /** * @openapi * /api/StatementsList: