tango-app-api-store-builder 1.0.0-beta-170 → 1.0.0-beta-172

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-170",
+    "version": "1.0.0-beta-172",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",

package/src/controllers/storeBuilder.controller.js

@@ -4893,9 +4893,22 @@ export async function getRolloutDetails( req, res ) {
       if ( req.body.filter.status.includes( 'yetToAssign' ) ) {
         orCondition.push( {
           $expr: {
-            $eq: [ { $size: '$taskDetails' }, 0 ],
+            $lt: [ { $size: '$taskDetails' }, 2 ],
           },
-        } );
+        },
+        {
+          $and: [
+            { taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } } },
+            { 'taskFeedback.fixtureStatus': 'disagree' },
+          ],
+        },
+        {
+          $and: [
+            { taskDetails: { $elemMatch: { type: 'vmRollout', status: 'submit' } } },
+            { 'taskFeedback.vmStatus': 'disagree' },
+          ],
+        },
+        );
       }
 
       if ( req.body.filter.status.includes( 'taskAssigned' ) ) {
@@ -4905,8 +4918,7 @@ export async function getRolloutDetails( req, res ) {
       }
 
       if ( req.body.filter.status.includes( 'reviewPending' ) ) {
-        orCondition.push( {
-          $or: [
+        orCondition.push(
             {
               $and: [
                 { taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } } },
@@ -4919,15 +4931,18 @@ export async function getRolloutDetails( req, res ) {
                 { 'taskFeedback.vmStatus': 'pending' },
               ],
             },
-          ],
-        } );
+        );
       }
 
       if ( req.body.filter.status.includes( 'completed' ) ) {
         orCondition.push( {
           $and: [
-            { taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } } },
-            { taskDetails: { $elemMatch: { type: 'vmRollout', status: 'submit' } } },
+            {
+              $or: [
+                { taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } } },
+                { taskDetails: { $elemMatch: { type: 'vmRollout', status: 'submit' } } },
+              ],
+            },
             {
               $expr: {
                 $eq: [ { $size: { $objectToArray: '$taskFeedback' } }, 0 ],

package/src/controllers/task.controller.js

@@ -1054,7 +1054,7 @@ export async function revokeTask( req, res ) {
     if ( !req.body.floorId ) {
       return res.sendError( 'floor id is required', 400 );
     }
-    await processedService.deleteMany( { planoId: req.body.planoId, floorId: req.body.floorId, checklistStatus: { $ne: 'submit' }, date_iso: { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) }, ...( req.body?.type && { planoType: req.body?.type } ) } );
+    await processedService.deleteMany( { planoId: req.body.planoId, floorId: req.body.floorId, checklistStatus: { $ne: 'submit' }, ...( req.body?.type && { planoType: req.body?.type } ) } );
     return res.sendSuccess( 'Task revoked successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'revokeTask', error: e } );