From 26a1a9b9bab23a82d55e4a6fecd5ce0951bdf90e Mon Sep 17 00:00:00 2001 From: sriramv Date: Mon, 11 Oct 2021 10:40:55 +0530 Subject: [PATCH 1/2] merge:GWM --- app/controllers/financial.controller.js | 11 +++++++---- app/routes/routes.js | 3 ++- app/services/camunda.helper.js | 13 +++++-------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index 5b0d388..cc2c09d 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -130,8 +130,9 @@ exports.FinantialsSummary = async (req, res) => { taskid.then(function(result){ formVariable = camundaHelper.financialsFormVariables(result); formVariable.then(function(form_result){ - camunda_status = JSON.parse(form_result); - res.send({'status':200,'message':"success",'data':{"years" : three_years_data ,"add_new_finyear_flag" : add_new_FY_flag,status:camunda_status, "summary" : summary } }); + formVariableResult = JSON.parse(form_result); + if(formVariableResult.type){ camunda_status = {"process_status":"NULL"}; } else { camunda_status =JSON.parse(form_result); } + res.send({'status':200,'message':"success",'data':{"years" : three_years_data ,"add_new_finyear_flag" : add_new_FY_flag , status:camunda_status, "summary" : summary } }); }); }); //res.send({'status':200,'message':"success",'data':{"years" : three_years_data ,"add_new_finyear_flag" : add_new_FY_flag, "summary" : result } }); @@ -149,8 +150,9 @@ exports.FinantialsSummary = async (req, res) => { taskid.then(function(result){ formVariable = camundaHelper.financialsFormVariables(result); formVariable.then(function(form_result){ - camunda_status = JSON.parse(form_result); - res.send({'status':200,'message':"success",'data':{"years" : four_years_data ,"add_new_finyear_flag" : add_new_FY_flag,status:camunda_status, "summary" : summary } }); + formVariableResult = JSON.parse(form_result); + if(formVariableResult.type){ camunda_status = {"process_status":"NULL"}; } else { camunda_status =JSON.parse(form_result); } + res.send({'status':200,'message':"success",'data':{"years" : four_years_data ,"add_new_finyear_flag" : add_new_FY_flag , status:camunda_status, "summary" : summary } }); }); }); //res.send({'status':200,'message':"success",'data':{"years" : four_years_data ,"add_new_finyear_flag" : add_new_FY_flag, "summary" : result } }); @@ -803,3 +805,4 @@ exports.camunda = async (req, res) => { message: err.message || "Some error occurred while inserting statements." ,'data': "No data" }); } }; + diff --git a/app/routes/routes.js b/app/routes/routes.js index a5928e3..bb2e9fb 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -8,7 +8,8 @@ module.exports = app => { var router = require("express").Router(); - router.get("/camunda", financials.camunda); + + /** * @swagger * /api/ConsolidatedSummary: diff --git a/app/services/camunda.helper.js b/app/services/camunda.helper.js index 651fee8..5755b0e 100644 --- a/app/services/camunda.helper.js +++ b/app/services/camunda.helper.js @@ -49,16 +49,12 @@ const URL = process.env.CAMUNDA_URL body: myJSONObject }, function (error, response, body){ let data = body; - - if(data.length) + task_id = data[0].id; + if(task_id) { - task_id = data[0].id; resolve(task_id); } - else - { - resolve(false); - } + else{ resolve(false); } }); @@ -75,7 +71,7 @@ const URL = process.env.CAMUNDA_URL { try { - const task_complete_url = URL+"task/"+taskid+"/complete"; + const task_complete_url = URL+"/task/"+taskid+"/complete"; const myJSONObject = {"variables":{"review_status":{"value":true}}}; request({ url: task_complete_url, @@ -83,6 +79,7 @@ const URL = process.env.CAMUNDA_URL json: true, body: myJSONObject }, function (error, response, body){ + return body; }); From fbf52a0d6d437df64cc53e105b8260820455b9d2 Mon Sep 17 00:00:00 2001 From: sriramv Date: Mon, 11 Oct 2021 12:25:15 +0530 Subject: [PATCH 2/2] merge:GWM --- app/controllers/financial.controller.js | 4 ++-- app/routes/routes.js | 8 +------- app/services/camunda.helper.js | 5 +++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index cc2c09d..18fba8a 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -324,7 +324,7 @@ Pro42Data.forEach((Pro42Datavalue, key)=>{ { Entities.create({ "losid":Pro42Datavalue.losid,"pan":Pro42Datavalue.pan,"cin":Pro42Datavalue.cin,"bizname":Pro42Datavalue.bizname,"entity_type":Pro42Datavalue.entity_type,"activity_group":Pro42Datavalue.activity_group,"biz_act_desc":Pro42Datavalue.biz_act_desc,"createdby":Pro42Datavalue.createdby}) .then(Entitydata => { - + console.log(Entitydata.dataValues.id) //create Entityfinyears data const Y1 = new Date().getFullYear(); const Y2 = Y1-1; @@ -645,7 +645,7 @@ const Pro42Data = [ { Entities.create({ "losid":Pro42Datavalue.losid,"pan":Pro42Datavalue.pan,"cin":Pro42Datavalue.cin,"bizname":Pro42Datavalue.bizname,"entity_type":Pro42Datavalue.entity_type,"activity_group":Pro42Datavalue.activity_group,"biz_act_desc":Pro42Datavalue.biz_act_desc,"createdby":Pro42Datavalue.createdby}) .then(Entitydata => { - + //create Entityfinyears data const Y1 = new Date().getFullYear(); const Y2 = Y1-1; diff --git a/app/routes/routes.js b/app/routes/routes.js index 1c85a16..0ddedf6 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -8,7 +8,7 @@ module.exports = app => { var router = require("express").Router(); - + router.get("/camunda", financials.camunda); /** * @swagger @@ -877,12 +877,6 @@ module.exports = app => { */ router.get("/TaskComplete", master.TaskComplete); - - router.get("/ReInitiate", master.ReInitiate); - - router.get("/Reassign", master.Reassign); - - //router.post("/doWorkPromise", master.doWorkPromise); //router.get("/test", master.test); diff --git a/app/services/camunda.helper.js b/app/services/camunda.helper.js index 1fc2a47..719e38a 100644 --- a/app/services/camunda.helper.js +++ b/app/services/camunda.helper.js @@ -49,9 +49,10 @@ const URL = process.env.CAMUNDA_URL body: myJSONObject }, function (error, response, body){ let data = body; - task_id = data[0].id; - if(task_id) + + if(data.length) { + task_id = data[0].id; resolve(task_id); } else{ resolve(false); }