From 02da88a01f04088e2b090bb1db784747ff9f83f3 Mon Sep 17 00:00:00 2001 From: surya Date: Fri, 3 Sep 2021 15:50:16 +0530 Subject: [PATCH] Surya: Api FOr REmarks --- app/controllers/master.controller.js | 87 ++++++++++++++++++++++++++-- app/models/Fin_remarks.js | 3 +- app/routes/routes.js | 33 +++++++---- 3 files changed, 108 insertions(+), 15 deletions(-) diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js index f648dbd..7e52caa 100644 --- a/app/controllers/master.controller.js +++ b/app/controllers/master.controller.js @@ -4,7 +4,7 @@ -const {sequelize , Statementsmaster ,Sectionsmaster , Subsectionsmaster,Itemsmaster } = require('../models') +const {sequelize , Statementsmaster ,Sectionsmaster , Subsectionsmaster,Itemsmaster ,Fin_remarks} = require('../models') const { logMsg } = require('../services/logger.js'); @@ -325,8 +325,8 @@ exports.Deleteitem = (req, res) => { //ItemFilter // Retrieve all items from the database which is under by the represent section. exports.ItemFilter = (req, res) => { - const section = req.params.section - const statement = req.params.statement + const section = req.query.section + const statement = req.query.statement Itemsmaster.findAll({where : { section : section}}) // 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 => { @@ -340,6 +340,86 @@ exports.ItemFilter = (req, res) => { }; +exports.createRemarkss = (req, res) => { + + const req_array_data = req.body; + try + { + req_array_data.forEach((value, key)=>{ + if (value.hasOwnProperty("id")) + { console.log(value.is_active) + Fin_remarks.update({ is_active : 0 },{ where: { id: value.id }}); + logMsg.info("updated is_active = 0 for primary key for Remarks: "+value.id); + Fin_remarks.create({ "entity_id":value.entity_id,"itemid":value.itemid,"remarks":value.remarks,"is_active":value.is_active,"createdby":value.createdby }) + logMsg.info("Created new Remarks entity_id: "+value.entity_id+"itemid:"+value.itemid); + + } + else + { + console.log(value.is_active) + Fin_remarks.create({ "entity_id":value.entity_id,"itemid":value.itemid,"remarks":value.remarks,"is_active":value.is_active,"createdby":value.createdby }) + logMsg.info("Created new Remarks entity_id: "+value.entity_id+"itemid:"+value.itemid); + + } + }); + res.send({'status':200,'message':"success",'data':"No data"}); + } + + catch(err) + { + res.status(500).send({'status':404, + message: err.message || "Some error occurred while inserting statements." ,'data': "No data" + }); + } +}; + +exports.createRemarks = (req, res) => { + const obj = req.body + if (obj.hasOwnProperty("id")) + { + // update broken periods + const Id = req.body.id + Fin_remarks.update( { + entity_id: req.body.entity_id, + itemid: req.body.itemid, + remarks: req.body.remarks, + is_active: req.body.is_active, + createdby: req.body.createdby, + 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 + Fin_remarks.create( { + entity_id: req.body.entity_id, + itemid: req.body.itemid, + remarks: req.body.remarks, + is_active: req.body.is_active, + 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" + }); + }); + } + +}; + + @@ -425,6 +505,5 @@ exports.ItemFilter = (req, res) => { - diff --git a/app/models/Fin_remarks.js b/app/models/Fin_remarks.js index 67aa39f..9af7ee1 100644 --- a/app/models/Fin_remarks.js +++ b/app/models/Fin_remarks.js @@ -18,7 +18,8 @@ module.exports = (sequelize, DataTypes) => { { entity_id: { type: DataTypes.INTEGER }, itemid: { type: DataTypes.INTEGER }, - remarks: { type: DataTypes.STRING }, + remarks: { type: DataTypes.STRING }, + is_active:{ type: DataTypes.INTEGER} , createdby: { type: DataTypes.INTEGER }, updatedby: { type: DataTypes.INTEGER }, diff --git a/app/routes/routes.js b/app/routes/routes.js index 3275d46..e5a72c9 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -624,17 +624,30 @@ module.exports = app => { //router.put("/:id", tutorials.update); //router.delete("/:id", tutorials.delete); - -/** - * @openapi - * /api/ItemList: - * get: - * description: Welcome to swagger-jsdoc! - * responses: - * 200: - * description: Returns a mysterious string. + + /** + * @swagger + * /api/ItemFilter: + * get: + * summary: ItemFilter + * description: ItemFilter + * parameters: + * - in: query + * name: section + * schema: + * type: integer + * required: true + * description: id of the section + * example: 1 + * responses: + * 200: + * description: success */ - router.get("/ItemFilter/:section", master.ItemFilter); + // get financials summary + router.get("/ItemFilter/:section", master.ItemFilter); + + router.post("/createRemarkss", master.createRemarkss); + router.post("/createRemarks", master.createRemarks);