diff --git a/app/controllers/financial.controller.js b/app/controllers/financial.controller.js index 207cd74..594e57d 100644 --- a/app/controllers/financial.controller.js +++ b/app/controllers/financial.controller.js @@ -710,26 +710,53 @@ exports.camunda = async (req, res) => { const cin = "test"; const user = "test"; - //let promise = Promise.resolve(); - promiseA = new Promise((resolve, reject) => { - instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002"; - taskid = camundaHelper.financialsListOfProcessInstances(instancesid); - return taskid; - }); + var camunda_status; + instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002"; + const taskid = camundaHelper.financialsListOfProcessInstances(instancesid); + taskid.then(function(result){ - setTimeout(function(){ - promiseB = promiseA.then(function(taskid){ - console.log(taskid); - camunda_status = camundaHelper.financialsFormVariables(taskid); - return camunda_status; - }) - },2000); + const formVariable = camundaHelper.financialsFormVariables(result); + formVariable.then(function(form_result){ camunda_status = form_result }); + }); + setTimeout(function(){ + console.log(camunda_status); + res.send(camunda_status); + + },5000); + //console.log(camunda_status); + // function one(){ + // console.log("one") + // instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002"; + // taskid = camundaHelper.financialsListOfProcessInstances(instancesid); + // return taskid; + // console.log(taskid); + // } + + // one().then(function(taskid){ console.log(taskid); }); + + + //let promise = Promise.resolve(); + // promiseA = new Promise((resolve, reject) => { + // instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002"; + // taskid = camundaHelper.financialsListOfProcessInstances(instancesid); + // taskid.then(function(taskid){ + // console.log(taskid); + // }) + // }); + + // setTimeout(function(){ + // promiseB = promiseA.then(function(taskid){ + // console.log(taskid); + // camunda_status = camundaHelper.financialsFormVariables(taskid); + // return camunda_status; + // }) + // },2000); - setTimeout(function(){ - promiseB.then(function(camunda_status){ - Promise.resolve(res.send({'status':200,'camunda': camunda_status })) - }) - },2000); + // setTimeout(function(){ + // promiseB.then(function(camunda_status){ + // Promise.resolve(res.send({'status':200,'camunda': camunda_status })) + // }) + // },2000); } catch(err) { diff --git a/app/routes/routes.js b/app/routes/routes.js index d120a1a..1a70a01 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); + router.get("/camunda", financials.camunda); /** * @swagger * /api/ConsolidatedSummary: diff --git a/app/services/camunda.helper.js b/app/services/camunda.helper.js index 908fa80..01e7e83 100644 --- a/app/services/camunda.helper.js +++ b/app/services/camunda.helper.js @@ -15,6 +15,7 @@ const URL = process.env.CAMUNDA_URL "user":{"value": user } },"businessKey": businessKey }; + return new Promise((resolve, reject) => { request({ url: start_url, method: "POST", @@ -23,9 +24,10 @@ const URL = process.env.CAMUNDA_URL }, function (error, response, body){ let data = body; instancesid = data.id; - return instancesid; - }); - + resolve(instancesid); + }); + + }); } catch (error) { @@ -33,23 +35,25 @@ const URL = process.env.CAMUNDA_URL } } - function financialsListOfProcessInstances(instancesid) + function financialsListOfProcessInstances(instancesid,req,res) { try { const task_id_url = URL+"task"; const myJSONObject = { "processInstanceIdIn":[instancesid] }; + return new Promise((resolve, reject) => { request({ url: task_id_url, method: "POST", json: true, body: myJSONObject - }, function (error, response, body){ + }, function (error, response, body){ let data = body; - task_id =data[0].id; - return task_id; + task_id = data[0].id; + resolve(task_id); }); - + + }); } catch (error) { @@ -86,13 +90,16 @@ const URL = process.env.CAMUNDA_URL try { const form_variable_url = URL+"task/"+taskid+"/form-variables"; + return new Promise((resolve, reject) => { request({ url: form_variable_url, method: "GET" }, function (error, response, body){ - return body; - }); + resolve(body); + }) + + }); } catch (error)