tango-app-api-trax 3.6.0-task-1 → 3.6.0-task-3

package/package.json

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

package/src/controllers/mobileTrax.controller.js

@@ -2024,30 +2024,33 @@ export async function submitTask( req, res ) {
 
     if ( updateResult.modifiedCount > 0 ) {
       if ( submittype === 'submit' ) {
-        const query1 = [
-          {
-            $match: {
-              userId: user._id,
-              sourceCheckList_id: checklist.sourceCheckList_id,
-              checklistStatus: { $in: [ 'open', 'inprogress' ] },
+        const excludedChecklists = [ 'Store Hygiene Check' ];
+        if ( !excludedChecklists.includes( checklist.checkListName ) ) {
+          const query1 = [
+            {
+              $match: {
+                userId: user._id,
+                sourceCheckList_id: checklist.sourceCheckList_id,
+                checklistStatus: { $in: [ 'open', 'inprogress' ] },
+              },
             },
-          },
-          {
-            $project: {
-              _id: 1,
-              date_iso: 1,
-              date_string: 1,
+            {
+              $project: {
+                _id: 1,
+                date_iso: 1,
+                date_string: 1,
+              },
             },
-          },
-        ];
+          ];
 
-        const processedTasksToDelete = await processedTask.aggregate( query1 );
+          const processedTasksToDelete = await processedTask.aggregate( query1 );
 
-        if ( processedTasksToDelete?.length ) {
-          const deleteIds = processedTasksToDelete?.filter( ( val ) => val?.date_string !== date )?.map( ( val ) => val?._id );
+          if ( processedTasksToDelete?.length ) {
+            const deleteIds = processedTasksToDelete?.filter( ( val ) => val?.date_string !== date )?.map( ( val ) => val?._id );
 
-          if ( deleteIds?.length ) {
-            await processedTask.deleteMany( { _id: { $in: deleteIds } } );
+            if ( deleteIds?.length ) {
+              await processedTask.deleteMany( { _id: { $in: deleteIds } } );
+            }
           }
         }
       } else if ( submittype === 'draft' ) {
@@ -2233,6 +2236,8 @@ export async function submiteyeTestTask( req, res ) {
 
     if ( updateResult.modifiedCount > 0 ) {
       if ( submittype === 'submit' ) {
+        // const excludedChecklists = [ 'Store Hygiene Check' ];
+        // if ( !excludedChecklists.includes( checklist.checkListName ) ) {
         const query1 = [
           {
             $match: {
@@ -2259,6 +2264,7 @@ export async function submiteyeTestTask( req, res ) {
             await processedTask.deleteMany( { _id: { $in: deleteIds } } );
           }
         }
+        // }
       } else if ( submittype === 'draft' ) {
         const query2 = [
           {