From 1639ea2a7de73fff73d404c4022c344b01518598 Mon Sep 17 00:00:00 2001 From: sriramv Date: Tue, 16 Aug 2022 16:37:06 +0530 Subject: [PATCH] GWM --- app/controllers/credit.policy.controller.js | 62 +++++++++++++++++++-- 1 file changed, 57 insertions(+), 5 deletions(-) diff --git a/app/controllers/credit.policy.controller.js b/app/controllers/credit.policy.controller.js index b3af4b9..8009c56 100644 --- a/app/controllers/credit.policy.controller.js +++ b/app/controllers/credit.policy.controller.js @@ -342,7 +342,33 @@ exports.updatePolicyMasterData = async (req, res) => }; - + [{ + program:"Vanilla", + + child:[ + + [{"business_activity_name":"Retail Trader","leverage": "<=1","data":[]}, + {"business_activity_name":"Retail Trader","leverage": "<=2","data":[]}, + {"business_activity_name":"Retail Trader","leverage": "<=3","data":[]}, + {"business_activity_name":"Retail Trader","leverage": "<=4","data":[]}] , + + [{"business_activity_name":"Wholesale Trader","leverage": "<=1","data":[]}, + {"business_activity_name":"Wholesale Trader","leverage": "<=2","data":[]}, + {"business_activity_name":"Wholesale Trader","leverage": "<=3","data":[]}, + {"business_activity_name":"Wholesale Trader","leverage": "<=4","data":[]}] , + + [{"business_activity_name":"Manufacturer","leverage": "<=1","data":[]}, + {"business_activity_name":"Manufacturer","leverage": "<=2","data":[]}, + {"business_activity_name":"Manufacturer","leverage": "<=3","data":[]}, + {"business_activity_name":"Manufacturer","leverage": "<=4","data":[]}] , + + [{"business_activity_name":"Service Provider","leverage": "<=1","data":[]}, + {"business_activity_name":"Service Provider","leverage": "<=2","data":[]}, + {"business_activity_name":"Service Provider","leverage": "<=3","data":[]}, + {"business_activity_name":"Service Provider","leverage": "<=4","data":[]}] , + + ] +}] exports.DscrLeverageGridDataList = async (req, res) => { @@ -356,14 +382,40 @@ exports.updatePolicyMasterData = async (req, res) => groupByData = await DscrLeverageGrid.findAll({attributes:['program_id','business_activity_id'],group: ["program_id","business_activity_id"] }); for(const groupByDataValue of groupByData) { + // if(groupByDataValue.program_id == 1 ) + // { + // VanillaData = await DscrLeverageGrid.findAll({raw:true,where:{program_id : 1 ,business_activity_id : groupByDataValue.business_activity_id }, include:[{ model: ProgramMaster,attributes:['program_name'] },{ model: BusinessActivityMaster,attributes:['business_activity_name'] }] }); + // VanillaArray.push(VanillaData); + // } + // else{ + // OtherThenVanillaData = await DscrLeverageGrid.findAll({raw:true,where:{program_id : 8,business_activity_id : groupByDataValue.business_activity_id}, include:[{ model: ProgramMaster,attributes:['program_name'] },{ model: BusinessActivityMaster,attributes:['business_activity_name'] }] }); + // OtherThenVanillaArray.push(OtherThenVanillaData); + // } if(groupByDataValue.program_id == 1 ) { - VanillaData = await DscrLeverageGrid.findAll({raw:true,where:{program_id : 1 ,business_activity_id : groupByDataValue.business_activity_id }, include:[{ model: ProgramMaster,attributes:['program_name'] },{ model: BusinessActivityMaster,attributes:['business_activity_name'] }] }); - VanillaArray.push(VanillaData); + leverageData = await DscrLeverageGrid.findAll({where:{program_id : 1 ,business_activity_id : groupByDataValue.business_activity_id }, attributes:['program_id','business_activity_id','leverage'],group: ["program_id","business_activity_id","leverage"]}); + leverageDataArray = []; + for(const leverageDataValue of leverageData) + { + VanillaData = await DscrLeverageGrid.findAll({raw:true,where:{program_id : 1 ,business_activity_id : leverageDataValue.business_activity_id , leverage : leverageDataValue.leverage }, include:[{ model: ProgramMaster,attributes:['program_name'] },{ model: BusinessActivityMaster,attributes:['business_activity_name'] }] }); + console.log(VanillaData[0]); + childObj = { data : VanillaData }; + obj = {...leverageDataValue.dataValues, ...childObj}; + leverageDataArray.push(obj); + } + VanillaArray.push(leverageDataArray); } else{ - OtherThenVanillaData = await DscrLeverageGrid.findAll({raw:true,where:{program_id : 8,business_activity_id : groupByDataValue.business_activity_id}, include:[{ model: ProgramMaster,attributes:['program_name'] },{ model: BusinessActivityMaster,attributes:['business_activity_name'] }] }); - OtherThenVanillaArray.push(OtherThenVanillaData); + leverageData = await DscrLeverageGrid.findAll({where:{program_id : 8 ,business_activity_id : groupByDataValue.business_activity_id }, attributes:['program_id','business_activity_id','leverage'],group: ["program_id","business_activity_id","leverage"]}); + leverageArray = []; + for(const leverageValue of leverageData) + { + OtherThenVanillaData = await DscrLeverageGrid.findAll({raw:true,where:{program_id : 8 ,business_activity_id : leverageValue.business_activity_id , leverage : leverageValue.leverage }, include:[{ model: ProgramMaster,attributes:['program_name'] },{ model: BusinessActivityMaster,attributes:['business_activity_name'] }] }); + childObj = { data : OtherThenVanillaData }; + obj = {...leverageValue.dataValues, ...childObj}; + leverageArray.push(obj); + } + OtherThenVanillaArray.push(leverageArray); } }