diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js index 35d85dc..6ce07b2 100644 --- a/app/controllers/master.controller.js +++ b/app/controllers/master.controller.js @@ -486,7 +486,8 @@ exports.TaskComplete = (req, res) => { task_id = camundaHelper.financialsListOfProcessInstances(processInstanceId); task_id.then(function(task_id){ if(task_id != false){ - camundaHelper.financialsTaskComplete(task_id) + value = true; + camundaHelper.financialsTaskComplete(task_id,value) } }); }); setTimeout(()=>{ @@ -501,38 +502,38 @@ exports.TaskComplete = (req, res) => { }; -exports.camunda = async (req, res) => { - const losid = req.query.losid; - try - { - const losid = "fb37c1e4-271e-11ec-a4f4-42010a800002"; - const cin = "test"; - const user = "test"; - - - instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002"; - taskid = camundaHelper.financialsListOfProcessInstances(instancesid); - res.send({'status':200,'message':"success",'data':"No data"}); - logMsg.info("Cheker Completed Success"); - } - catch(err) { +exports.ReInitiate = async (req, res) => { + try + { + const losid = req.query.losid; + const pan = req.query.pan; + const cin = req.query.cin; + const user = "SMC" + Entities.findOne({where : { losid : losid,pan : pan,cin : cin },attributes: ['id'] }) + .then(data => { + const primaryId = data.dataValues.id; + console.log(primaryId) + processInstanceId = camundaHelper.startFinancialsProcessInstance(losid,pan,user); + console.log(processInstanceId) + processInstanceId.then(function(InstanceId){ + console.log(InstanceId) + //Entities.update({ "process_instance_id" : InstanceId },{ where: { id: primaryId }}) + Entities.update({ "process_instance_id":InstanceId },{ where: { id: primaryId }}) + .then(()=>{ + res.send({'status':200,'message':"success",'data':"No data"}); + }) + .catch(err => { + res.status(500).send({'status':404, + message: err.message || "processInstanceId not updated in entities table." ,'data': "No data" }); + }); + }); + }) + .catch(err => { res.status(500).send({'status':404, - message: err.message || "Some error occurred while Cheker Complete." ,'data': "No data" - }); } - -}; - -exports.test = (req, res) => { + message: err.message || "Data not found." ,'data': "No data" }); + }); + } - try - { - const processInstanceId = "fb2b8cd9-271e-11ec-a4f4-42010a800002"; - - task_id = camundaHelper.financialsListOfProcessInstances(processInstanceId); - - res.send({'status':200,'message':"success",'data':"No data"}); - logMsg.info("Cheker Completed Success"); - } catch(err) { res.status(500).send({'status':404, message: err.message || "Some error occurred while Cheker Complete." ,'data': "No data" @@ -540,6 +541,91 @@ exports.test = (req, res) => { }; +// exports.Reassign = async (req, res) => { +// try +// { +// const id = req.query.entityid; +// console.log(id) +// Entities.findOne({where : { id : id },attributes: ['process_instance_id'] }) +// .then(data => { + +// console.log(data) +// const processInstanceId = data.dataValues.process_instance_id; +// task_id = camundaHelper.financialsListOfProcessInstances(processInstanceId); + +// task_id.then(function(task_id){ +// console.log(task_id) + +// if(task_id != false) +// { +// value = false; +// camundaHelper.financialsTaskComplete(task_id,value) +// } +// }); +// }); +// setTimeout(()=>{ +// res.send({'status':200,'message':"success",'data':"No data"}); +// },1000) +// logMsg.info("Cheker Completed Success"); +// } +// catch(err) { +// res.status(500).send({'status':404, +// message: err.message || "Some error occurred while Cheker Complete." ,'data': "No data" +// }); +// } + +// }; +// exports.Reassign = async (req, res) => { +// try +// { +// const id = req.query.id; + +// Entities.findOne({where : { id : id },attributes: ['process_instance_id'] }) +// .then(data => { +// const processInstanceId = data.dataValues.process_instance_id; +// task_id = camundaHelper.financialsListOfProcessInstances(processInstanceId); +// task_id.then(function(task_id){ +// console.log(task_id) +// if(task_id != false){ +// // value = false +// camundaHelper.financialsTaskComplete(task_id,value) +// } +// }); +// }); +// setTimeout(()=>{ +// res.send({'status':200,'message':"success",'data':"No data"}); +// },1000) +// logMsg.info("Cheker Completed Success"); +// } +// catch(err) { +// res.status(500).send({'status':404, +// message: err.message || "Some error occurred while Cheker Complete." ,'data': "No data" +// }); } + +// }; + + + + + +// exports.test = (req, res) => { + +// try +// { +// const processInstanceId = "fb2b8cd9-271e-11ec-a4f4-42010a800002"; + +// task_id = camundaHelper.financialsListOfProcessInstances(processInstanceId); + +// res.send({'status':200,'message':"success",'data':"No data"}); +// logMsg.info("Cheker Completed Success"); +// } +// catch(err) { +// res.status(500).send({'status':404, +// message: err.message || "Some error occurred while Cheker Complete." ,'data': "No data" +// }); } + +// }; + //promise @@ -560,7 +646,30 @@ exports.test = (req, res) => { - +// public function reassign(Request $request) +// { +// $gst_data = $request->all(); + +// $gstin_id = $gst_data['gstin_id']; +// $process_instance_id = GSTIN::select('process_instance_id') +// ->where( 'id', '=', $gstin_id )->first(); + + +// if($process_instance_id) +// { +// $instance_id = $process_instance_id['process_instance_id']; +// $json = [ 'json' => [ "processInstanceIdIn" => [ $instance_id ] ] ]; +// //get taskid from gstListOfProcessInstances camunda Api with process_instance_id +// $get_task_id = CamundaHelper::gstListOfProcessInstances($json); +// // $taskid = count($get_task_id)? $get_task_id[0]['id'] : NULL; +// $taskid = $get_task_id[0]['id']; +// //calling GstTaskComplete camunda Api with taskid +// $value = false; +// CamundaHelper::GstTaskComplete($taskid,$value); +// return ResponseBuilder::sendResponse(200,'success'); + +// } +// } diff --git a/app/models/Entities.js b/app/models/Entities.js index 8bff480..4f452fd 100644 --- a/app/models/Entities.js +++ b/app/models/Entities.js @@ -17,6 +17,7 @@ module.exports = (sequelize, DataTypes) => { Entities.init( { losid: { type: DataTypes.STRING }, + process_instance_id: {type: DataTypes.STRING}, pan: { type: DataTypes.STRING }, cin: { type: DataTypes.STRING }, bizname: { type: DataTypes.STRING }, diff --git a/app/routes/routes.js b/app/routes/routes.js index bb2e9fb..1c85a16 100644 --- a/app/routes/routes.js +++ b/app/routes/routes.js @@ -877,8 +877,14 @@ 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); + //router.get("/test", master.test); diff --git a/app/services/camunda.helper.js b/app/services/camunda.helper.js index 5755b0e..1fc2a47 100644 --- a/app/services/camunda.helper.js +++ b/app/services/camunda.helper.js @@ -67,12 +67,15 @@ const URL = process.env.CAMUNDA_URL } - function financialsTaskComplete(taskid) + function financialsTaskComplete(taskid,value) { try { - const task_complete_url = URL+"/task/"+taskid+"/complete"; - const myJSONObject = {"variables":{"review_status":{"value":true}}}; + + + const task_complete_url = URL+"task/"+taskid+"/complete"; + const myJSONObject = {"variables":{"review_status":{"value":value}}}; + request({ url: task_complete_url, method: "POST",