tango-app-api-trax 3.2.1-beta-5 → 3.2.1-beta-7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.2.1-beta-5",
+    "version": "3.2.1-beta-7",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/internalTrax.controller.js

@@ -1474,7 +1474,7 @@ export async function internalSendPushNotification( req, res ) {
 async function getUserToken( clientId, userEmail ) {
   try {
     if ( clientId && clientId !='' && userEmail && userEmail !='' ) {
-      let userData = await userService.findOne( { clientId: requestHeader.clientid, email: userEmail }, { fcmToken: 1 } );
+      let userData = await userService.findOne( { clientId: clientId, email: userEmail }, { fcmToken: 1 } );
       if ( userData && userData.fcmToken && userData.fcmToken !='' ) {
         return userData.fcmToken;
       } else {

package/src/controllers/trax.controller.js

@@ -2177,18 +2177,17 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
               getsubmitDetails[0].date_iso = new Date( date );
               getsubmitDetails[0].redoStatus = false;
               getsubmitDetails[0].approvalStatus = false;
-            } else {
-              if ( editSubmit && getsubmitDetails[0].checklistStatus == 'submit' ) {
-                console.log( editSubmit );
-                let user = {
-                  _id: getsubmitDetails[0].userId,
-                  clientId: getsubmitDetails[0].client_id,
-                };
-                updateOpenSearch( user, { processedcheckListId: getsubmitDetails[0]._id, date: getsubmitDetails[0].date_string } );
-              }
             }
             let data = { ...getsubmitDetails[0]._doc };
             await processedchecklist.updateOne( { _id: getsubmitDetails[0]._id }, data );
+            if ( editSubmit && getsubmitDetails[0].checklistStatus == 'submit' ) {
+              console.log( editSubmit );
+              let user = {
+                _id: getsubmitDetails[0].userId,
+                clientId: getsubmitDetails[0].client_id,
+              };
+              updateOpenSearch( user, { processedcheckListId: getsubmitDetails[0]._id, date: getsubmitDetails[0].date_string } );
+            }
           }
           if ( getsubmitDetails[0]?.checklistStatus == 'submit' ) {
             userIdList.push( element4._id );