From 50f7586bfa38fd0e11f343ea5a35fb8a856bc0df Mon Sep 17 00:00:00 2001
From: surya <surya.r@venbainfotech.com>
Date: Fri, 8 Oct 2021 16:44:43 +0530
Subject: [PATCH] Surya: checkercomplete

---
 app/controllers/master.controller.js | 56 ++++++++++++++--------------
 app/routes/routes.js                 | 38 ++++++++++++++++++-
 app/services/camunda.helper.js       |  3 +-
 3 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/app/controllers/master.controller.js b/app/controllers/master.controller.js
index c5c4171..1efc7e1 100644
--- a/app/controllers/master.controller.js
+++ b/app/controllers/master.controller.js
@@ -473,27 +473,23 @@ exports.Statementtype_insert =  (req, res) => {
 // API: Cheker Complete
 
 
-exports.MakerSubmit =  (req, res) => {
-  const req_data = req.body;
+exports.TaskComplete =  (req, res) => {
+ 
  try 
- {
-    const losid = req_data.losid;
-    const pan = req_data.pan;
-    const cin = req_data.cin;
+ { 
+    const losid = req.query.losid;
+    const pan = req.query.pan;
+    const cin = req.query.cin;
     Entities.findOne({where : { losid : losid,pan : pan,cin : cin },attributes: [ 'id','process_instance_id'] }) 
     .then(data => {
-      console.log(data.dataValues.process_instance_id)
-     
-      const processInstanceId = data.dataValues.process_instance_id;
-       
+      const processInstanceId = data.dataValues.process_instance_id;  
       task_id =  camundaHelper.financialsListOfProcessInstances(processInstanceId);
-       console.log(task_id)
-        setTimeout(()=>{
-      makercomplete_status =  camundaHelper.financialsTaskComplete(task_id);
-            },1000)
+      task_id.then(function(task_id){
+       camundaHelper.financialsTaskComplete(task_id)      });
     });
-     
+  setTimeout(()=>{
   res.send({'status':200,'message':"success",'data':"No data"});
+  },1000)
   logMsg.info("Cheker Completed Success");
   }
   catch(err) {
@@ -515,7 +511,7 @@ exports.camunda = async (req, res) => {
     instancesid = "33f6a13d-272f-11ec-a4f4-42010a800002";
     taskid = camundaHelper.financialsListOfProcessInstances(instancesid);
     res.send({'status':200,'message':"success",'data':"No data"});
-  logMsg.info("Cheker Completed Success");
+    logMsg.info("Cheker Completed Success");
   }
   catch(err) {
       res.status(500).send({'status':404,
@@ -542,18 +538,22 @@ exports.test =  (req, res) => {
     
 };
 
-const doWorkPromise = new Promise((resolve, reject) => {
-  setTimeout(() => {
-      resolve([7, 4, 1])
-      // reject('Things went wrong!')
-  }, 2000)
-})
-
-doWorkPromise.then((result) => {
-  console.log('Success!', result)
-}).catch((error) => {
-  console.log('Error!', error)
-})
+
+
+//promise
+
+// const doWorkPromise = new Promise((resolve, reject) => {
+//   setTimeout(() => {
+//       resolve([7, 4, 1])
+//       // reject('Things went wrong!')
+//   }, 2000)
+// })
+
+// doWorkPromise.then((result) => {
+//   console.log('Success!', result)
+// }).catch((error) => {
+//   console.log('Error!', error)
+// })
 
 
 
diff --git a/app/routes/routes.js b/app/routes/routes.js
index 964392d..a5928e3 100644
--- a/app/routes/routes.js
+++ b/app/routes/routes.js
@@ -842,9 +842,43 @@ module.exports = app => {
 *     description: success
 */
    router.get("/Historyapi", master.Historyapi);
-   router.post("/MakerSubmit", master.MakerSubmit); 
-   router.post("/doWorkPromise", master.doWorkPromise); 
+   /**
+* @swagger
+* /api/TaskComplete:
+*  get:
+*   summary: MakerSubmit,cheker complete
+*   description: MakerSubmit,cheker complete
+*   parameters:
+*    - in: query
+*      name: losid
+*      schema:
+*       type: string
+*      required: true
+*      description: LOSID
+*      example: MW112233 
+*    - in: query
+*      name: pan
+*      schema:
+*       type: string
+*      required: true
+*      description: pan no
+*      example: AAA123AAA
+*    - in: query
+*      name: cin
+*      schema:
+*       type: string
+*      required: true
+*      description: cin no
+*      example: CIN
+*   responses:
+*    200:
+*     description: success
+*/
+  
+   router.get("/TaskComplete", master.TaskComplete); 
+   //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 01e7e83..711e03e 100644
--- a/app/services/camunda.helper.js
+++ b/app/services/camunda.helper.js
@@ -66,7 +66,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,
@@ -74,7 +74,6 @@ const URL =  process.env.CAMUNDA_URL
             json: true,   
             body: myJSONObject
         }, function (error, response, body){
-            
             return body;
         });