diff --git a/app/controllers/obligation.controller.js b/app/controllers/obligation.controller.js index 045c7fa..a8cc295 100644 --- a/app/controllers/obligation.controller.js +++ b/app/controllers/obligation.controller.js @@ -1,22 +1,21 @@ -const { sequelize,Test,OblicationMaster,OblicationBurearBankStatement} = require('../models') +const { sequelize,Test,OblicationMaster,OblicationBankStatement} = require('../models') const { logMsg } = require('../services/logger.js'); - +// get all obligation master data exports.ObligationMaster = async (req, res) => { - try - { - await OblicationMaster.findAll({where : {is_active : 1} }) - .then(data => - { - res.send({'status':200,'message':"success",'data':data}); + try + { + await OblicationMaster.findAll({where : {is_active : 1} }) + .then(data => + { + res.send({'status':200,'message':"success",'data':data}); logMsg.info("Master Data List api call Success"); }) .catch(err => { res.send({'status':404, message: err.message || "Some error occurred while fetching Obligation masterdata." ,'data': "No data" }); - }); - + }); } catch(err) { res.send({'status':404, message: err.message || "Some error occurred while fetching Obligation masterdata masterdata." ,'data': "No data" @@ -25,12 +24,12 @@ exports.ObligationMaster = async (req, res) => }; - -exports.GetOblicationBurearBankStatement = async (req, res) => +// get all obligation bank statement +exports.GetOblicationBankStatement = async (req, res) => { try { - await OblicationBurearBankStatement.findAll({where : {los_id : req.query.los_id , is_active : 1} }) + await OblicationBankStatement.findAll({where : {los_id : req.query.los_id , is_active : 1} }) .then(data => { res.send({'status':200,'message':"success",'data':data}); @@ -49,6 +48,7 @@ exports.GetOblicationBurearBankStatement = async (req, res) => }; +// create new obligation master exports.CreateObligationMaster = async (req, res) => { try @@ -70,12 +70,12 @@ exports.CreateObligationMaster = async (req, res) => } //end of try catch }; - -exports.CreateOblicationBurearBankStatement = async (req, res) => +// create new obligation bank statement +exports.CreateOblicationBankStatement = async (req, res) => { try { - await OblicationBurearBankStatement.create(req.body) + await OblicationBankStatement.create(req.body) .then(data => { res.send({'status':200,'message':"success",'data': data}); @@ -93,15 +93,14 @@ exports.CreateOblicationBurearBankStatement = async (req, res) => } //end of try catch }; - -exports.UpdateOblicationBurearBankStatement = async (req, res) => +// update bank statement ( is_active = 0) then create new bank statement +exports.UpdateOblicationBankStatement = async (req, res) => { try { - id = req.body.id; - delete req.body.id; - await OblicationBurearBankStatement.update({is_active : 0 },{ where: { id: id }}); - OblicationBurearBankStatement.create(req.body).then(data => + los_id = req.body.los_id; + await OblicationBankStatement.update({is_active : 0 },{ where: { los_id: los_id }}); + OblicationBankStatement.create(req.body).then(data => { res.send({'status':200,'message':"success",'data':data}); }) diff --git a/app/models/ObligationBurearBankStatement.js b/app/models/ObligationBankStatement.js similarity index 88% rename from app/models/ObligationBurearBankStatement.js rename to app/models/ObligationBankStatement.js index 110b9eb..63eafa1 100644 --- a/app/models/ObligationBurearBankStatement.js +++ b/app/models/ObligationBankStatement.js @@ -1,10 +1,10 @@ 'use strict' const { Model } = require('sequelize') module.exports = (sequelize, DataTypes) => { - class OblicationBurearBankStatement extends Model { + class OblicationBankStatement extends Model { } - OblicationBurearBankStatement.init( + OblicationBankStatement.init( { los_id: { type: DataTypes.STRING }, lender: { type: DataTypes.STRING }, @@ -37,11 +37,11 @@ module.exports = (sequelize, DataTypes) => { }, { sequelize, - tableName: 'obligation_burear_bank_statement', - modelName: 'OblicationBurearBankStatement', + tableName: 'obligation_bank_statement', + modelName: 'OblicationBankStatement', } ) - return OblicationBurearBankStatement + return OblicationBankStatement } \ No newline at end of file diff --git a/app/routes/routes.js b/app/routes/routes.js index 8570948..4ce58d2 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -19,39 +19,38 @@ module.exports = app => { * 200: * description: success */ - router.get("/obligationmaster",Mycontroller.ObligationMaster) + router.get("/obligationMaster",Mycontroller.ObligationMaster) // get oblication burear bankstatement - /** * @swagger -* /api/getoblicationburearbankstatement: +* /api/getOblicationBankStatement: * get: -* summary: Get Oblication Burear Bank Statement List -* description: Get Oblication Burear Bank Statement +* summary: Get Oblication Bank Statement List +* description: Get Oblication Bank Statement * parameters: * - in: query * name: los_id * schema: * type: string * required: true -* description: Oblication Burear Bank Statement +* description: Oblication Bank Statement * example: 12abc * responses: * 200: * description: success */ -router.get("/getoblicationburearbankstatement",Mycontroller.GetOblicationBurearBankStatement) +router.get("/getOblicationBankStatement",Mycontroller.GetOblicationBankStatement) -// create oblication burear bankstatement +// create oblication master /** * @swagger * definitions: -* createobligationmaster: +* createObligationMaster: * type: object * properties: * master_name: @@ -69,7 +68,7 @@ router.get("/getoblicationburearbankstatement",Mycontroller.GetOblicationBurearB */ /** * @swagger -* /api/createobligationmaster: +* /api/createObligationMaster: * post: * summary: create Oblication masterdata details * description: create a Oblication masterdata @@ -77,24 +76,22 @@ router.get("/getoblicationburearbankstatement",Mycontroller.GetOblicationBurearB * content: * application/json: * schema: -* $ref: '#/definitions/createobligationmaster' +* $ref: '#/definitions/createObligationMaster' * responses: * 200: * description: New Oblication masterdata details inserted * 500: * description: failure in inserting Oblication masterdata details */ -router.post("/createobligationmaster",Mycontroller.CreateObligationMaster) +router.post("/createObligationMaster",Mycontroller.CreateObligationMaster) - - -// create oblication burear bankstatement +// create oblication bankstatement /** * @swagger * definitions: -* createoblicationburearbankstatement: +* createOblicationBankStatement: * type: object * properties: * los_id: @@ -144,7 +141,7 @@ router.post("/createobligationmaster",Mycontroller.CreateObligationMaster) * sanction_date: * type: string * description: sanctionDate -* example: 10-2-2020 +* example: "10-2-2020" * principal_outstanding: * type: integer * description: principalOutstanding @@ -212,33 +209,30 @@ router.post("/createobligationmaster",Mycontroller.CreateObligationMaster) */ /** * @swagger -* /api/createoblicationburearbankstatement: +* /api/createOblicationBankStatement: * post: -* summary: create Oblication Burear BankStatement details -* description: create a Oblication Burear BankStatement +* summary: create Oblication BankStatement details +* description: create a Oblication BankStatement * requestBody: * content: * application/json: * schema: -* $ref: '#/definitions/createoblicationburearbankstatement' +* $ref: '#/definitions/createOblicationBankStatement' * responses: * 200: -* description: New Oblication Burear BankStatement details inserted +* description: New Oblication BankStatement details inserted * 500: -* description: failure in inserting Oblication Burear BankStatement details +* description: failure in inserting Oblication BankStatement details */ - router.post("/createoblicationburearbankstatement",Mycontroller.CreateOblicationBurearBankStatement) + router.post("/createOblicationBankStatement",Mycontroller.CreateOblicationBankStatement) +// update Oblication BankStatement - -// update Oblication Burear BankStatement - - - /** +/** * @swagger * definitions: -* updateoblicationburearbankstatement: +* updateOblicationBankStatement: * type: object * properties: * los_id: @@ -288,7 +282,7 @@ router.post("/createobligationmaster",Mycontroller.CreateObligationMaster) * sanction_date: * type: string * description: sanctionDate -* example: 10-2-2020 +* example: "10-2-2020" * principal_outstanding: * type: integer * description: principalOutstanding @@ -356,7 +350,7 @@ router.post("/createobligationmaster",Mycontroller.CreateObligationMaster) */ /** * @swagger -* /api/updateoblicationburearbankstatement: +* /api/updateOblicationBankStatement: * post: * summary: create Oblication Burear BankStatement details * description: create a Oblication Burear BankStatement @@ -364,14 +358,14 @@ router.post("/createobligationmaster",Mycontroller.CreateObligationMaster) * content: * application/json: * schema: -* $ref: '#/definitions/updateoblicationburearbankstatement' +* $ref: '#/definitions/updateOblicationBankStatement' * responses: * 200: -* description: update Oblication Burear BankStatement details inserted +* description: update Oblication BankStatement details inserted * 500: -* description: failure in updating Oblication Burear BankStatement details +* description: failure in updating Oblication BankStatement details */ -router.post("/updateoblicationburearbankstatement",Mycontroller.UpdateOblicationBurearBankStatement) +router.post("/updateOblicationBankStatement",Mycontroller.UpdateOblicationBankStatement)