tango-app-api-trax 3.2.1-beta-2 → 3.2.1-beta-4

package/package.json

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

package/src/controllers/mobileTrax.controller.js

@@ -1792,7 +1792,9 @@ export async function submitChecklist( req, res ) {
         //   createdAt: createdAtDate,
         // };
         // await detectionService.create( detectionData );
-        updateOpenSearch( req.user, requestData );
+        if ( requestData.submittype == 'submit' ) {
+          updateOpenSearch( req.user, requestData );
+        }
 
         return res.sendSuccess( 'Checklist Updated Successfully' );
       } else {
@@ -1956,7 +1958,9 @@ export async function submitTask( req, res ) {
       };
       await checklistLogs.create( logInsertData );
 
-      updateOpenSearchTask( user, requestData );
+      if ( submittype == 'submit' ) {
+        updateOpenSearchTask( user, requestData );
+      }
 
       return res.sendSuccess( 'Task Updated Successfully' );
     } else {

package/src/controllers/trax.controller.js

@@ -2237,15 +2237,29 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
             await processedchecklist.insertMany( submitUser );
           }
         } else {
-          let deleteQuery = {
+          let deleteInprogressQuery = {
             date_string: insertdata.date_string,
             date_iso: insertdata.date_iso,
             client_id: insertdata.client_id,
             checkListId: updatedchecklist._id,
-            checklistStatus: { $nin: [ 'submit' ] },
+            checklistStatus: { $nin: [ 'submit', 'inprogress' ] },
+            redoStatus: false,
           };
-          await processedchecklist.deleteMany( deleteQuery );
-          await processedchecklist.insertMany( allQuestion );
+          await processedchecklist.deleteMany( deleteInprogressQuery );
+          deleteInprogressQuery.checklistStatus = 'inprogress';
+          deleteInprogressQuery.redoStatus = false;
+          let getInprogressData = await processedchecklist.find( deleteInprogressQuery, { userId: 1, store_id: 1 } );
+          if ( getInprogressData ) {
+            allQuestion = allQuestion.filter( ( item ) => {
+              let inprogressData = getInprogressData.find( ( ele ) => ele.userId.toString() == item.userId.toString() && ele.store_id == item.store_id );
+              if ( !inprogressData ) {
+                return item;
+              }
+            } );
+          }
+          if ( allQuestion.length ) {
+            await processedchecklist.insertMany( allQuestion );
+          }
         }
       } else {
         let unAssignedList = allQuestion.reduce( ( acc, item ) => {