tango-app-api-trax 3.7.30 → 3.7.32

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.7.30",
+    "version": "3.7.32",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/mobileTrax.controller.js

@@ -2095,8 +2095,32 @@ export async function submitTask( req, res ) {
     }
 
     const updateResult = await processedTask.updateOne( updateQuery, updateData );
+    if ( submittype == 'submit' ) {
+      updateOpenSearchTask( user, requestData );
+    }
 
     if ( updateResult.modifiedCount > 0 ) {
+      let openSearch = JSON.parse( process.env.OPENSEARCH );
+      let inserttraxlogs = {
+        client_id: req.user.clientId,
+        createAt: new Date(),
+        sourceCheckList_id: checklist.sourceCheckList_id,
+        checkListName: checklist.checkListName,
+        type: 'task',
+        action: requestData?.submittype === 'draft' ? 'save' : 'submit',
+        storeName: checklist.storeName,
+        store_id: checklist.store_id,
+        userName: checklist.userName,
+        userEmail: checklist.userEmail,
+        createdByEmail: checklist.userEmail,
+        createdBy: checklist.userName,
+        coverage: checklist.coverage,
+        checkListType: checklist.checkListType,
+        logDetails: {},
+        userType: req.user.userType,
+      };
+      console.log( 'inserttraxlogs =>', inserttraxlogs );
+      insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
       if ( submittype === 'submit' ) {
         const excludedChecklists = [ 'Store Hygiene Check' ];
         if ( !excludedChecklists.includes( checklist.checkListName ) ) {
@@ -2174,31 +2198,31 @@ export async function submitTask( req, res ) {
       // };
       // await checklistLogs.create( logInsertData );
 
-      if ( submittype == 'submit' ) {
-        updateOpenSearchTask( user, requestData );
-        let openSearch = JSON.parse( process.env.OPENSEARCH );
-        // console.log( 'openSearch', openSearch );
-        let inserttraxlogs = {
-          client_id: req.user.clientId,
-          createAt: new Date(),
-          sourceCheckList_id: checklist.sourceCheckList_id,
-          checkListName: checklist.checkListName,
-          type: 'task',
-          action: requestData?.submittype === 'draft' ? 'save' : 'submit',
-          storeName: checklist.storeName,
-          store_id: checklist.store_id,
-          userName: checklist.userName,
-          userEmail: checklist.userEmail,
-          createdByEmail: checklist.userEmail,
-          createdBy: checklist.userName,
-          coverage: checklist.coverage,
-          checkListType: checklist.checkListType,
-          logDetails: {},
-          userType: req.user.userType,
-        };
-        console.log( 'inserttraxlogs =>', inserttraxlogs );
-        insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
-      }
+      // if ( submittype == 'submit' ) {
+      //   updateOpenSearchTask( user, requestData );
+      //   let openSearch = JSON.parse( process.env.OPENSEARCH );
+      //   // console.log( 'openSearch', openSearch );
+      //   let inserttraxlogs = {
+      //     client_id: req.user.clientId,
+      //     createAt: new Date(),
+      //     sourceCheckList_id: checklist.sourceCheckList_id,
+      //     checkListName: checklist.checkListName,
+      //     type: 'task',
+      //     action: requestData?.submittype === 'draft' ? 'save' : 'submit',
+      //     storeName: checklist.storeName,
+      //     store_id: checklist.store_id,
+      //     userName: checklist.userName,
+      //     userEmail: checklist.userEmail,
+      //     createdByEmail: checklist.userEmail,
+      //     createdBy: checklist.userName,
+      //     coverage: checklist.coverage,
+      //     checkListType: checklist.checkListType,
+      //     logDetails: {},
+      //     userType: req.user.userType,
+      //   };
+      //   console.log( 'inserttraxlogs =>', inserttraxlogs );
+      //   insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
+      // }
 
       return res.sendSuccess( 'Task Updated Successfully' );
     } else {

package/src/controllers/trax.controller.js

@@ -3746,7 +3746,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
       submittedDetails = await processedchecklist.find( query );
     }
     await Promise.all( allQuestion.map( async ( element4 ) => {
-      let getToken = userDetails.get( element4.userId.toString() );
+      let getToken = userDetails.get( element4?.userId?.toString() );
       if ( getToken && element4?.sendNotification && showEdit ) {
         tokenList.push( getToken );
       }
@@ -4511,6 +4511,7 @@ export async function updateAssign( req, res ) {
       },
     ];
     let assignUserDetails = await userService.aggregate( query );
+    let storeProfileDetails;
     if ( req.body.coverage == 'store' ) {
       let storeList = req.body.assignedList.map( ( ele ) => ele?.storeId );
       storeProfileDetails = await storeService.find( { storeId: { $in: storeList } }, { storeId: 1, city: '$storeProfile.city', country: '$storeProfile.country', state: '$storeProfile.state' } );