tango-app-api-store-builder 1.0.0-beta-169 → 1.0.0-beta-171

package/package.json

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

package/src/controllers/storeBuilder.controller.js

@@ -2658,7 +2658,7 @@ export async function storeFixturesv2( req, res ) {
         planograms.map( async ( planogram ) => {
           const floors = await storeBuilderService.find(
               { planoId: planogram._id },
-              { floorName: 1, layoutPolygon: 1, planoId: 1, isEdited: 1, planoProgress:1, },
+              { floorName: 1, layoutPolygon: 1, planoId: 1, isEdited: 1, planoProgress: 1 },
           );
 
           const floorsWithFixtures = await Promise.all(
@@ -4542,6 +4542,7 @@ export async function getRolloutDetails( req, res ) {
         $match: {
           clientId: req.body.clientId,
           storeId: { $in: storeDetails },
+          planoProgress: 100,
         },
       },
       {
@@ -4611,8 +4612,8 @@ export async function getRolloutDetails( req, res ) {
                 _id: '$planoType',
                 type: { $first: '$planoType' },
                 status: { $first: '$checklistStatus' },
-                taskId: { $last: '$_id' },
-                scheduleEndTime_iso: { $last: '$scheduleEndTime_iso' },
+                taskId: { $first: '$_id' },
+                scheduleEndTime_iso: { $first: '$scheduleEndTime_iso' },
               },
             },
             {
@@ -4825,11 +4826,7 @@ export async function getRolloutDetails( req, res ) {
       },
     ];
 
-    let extraCondition = [ {
-      $match: {
-        planoProgress: 100,
-      },
-    } ];
+    let extraCondition = [];
 
     if ( req.body?.filter?.type == 'rollout' ) {
       extraCondition.push( {
@@ -4896,22 +4893,32 @@ 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' ) ) {
         orCondition.push( {
-          $expr: {
-            $gt: [ { $size: '$taskDetails' }, 0 ],
-          },
+          taskDetails: { $elemMatch: { status: { $ne: 'submit' }, breach: false } },
         } );
       }
 
       if ( req.body.filter.status.includes( 'reviewPending' ) ) {
-        orCondition.push( {
-          $or: [
+        orCondition.push(
             {
               $and: [
                 { taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } } },
@@ -4924,8 +4931,7 @@ export async function getRolloutDetails( req, res ) {
                 { 'taskFeedback.vmStatus': 'pending' },
               ],
             },
-          ],
-        } );
+        );
       }
 
       if ( req.body.filter.status.includes( 'completed' ) ) {
@@ -4945,11 +4951,6 @@ export async function getRolloutDetails( req, res ) {
       extraCondition.push( { $match: { $or: orCondition } } );
     }
 
-    extraCondition.push(
-        { $skip: skip },
-        { $limit: limit },
-    );
-
     if ( req.body.sortColumnName && req.body.sortBy ) {
       query.push(
           { $sort: { [req.body.sortColumnName]: req.body.sortBy } },
@@ -5025,31 +5026,8 @@ export async function getRolloutDetails( req, res ) {
           },
           { $count: 'count' },
         ],
-        doubleFloorStore: [
-          {
-            $group: {
-              _id: '$storeId',
-              count: { $sum: 1 },
-            },
-          },
-          {
-            $match: {
-              count: { $gt: 1 },
-            },
-          },
-          {
-            $group: {
-              _id: '',
-              doubleFloorList: { $addToSet: '$_id' },
-            },
-          },
-          {
-            $project: {
-              doubleFloorList: 1,
-            },
-          },
-        ],
-        data: extraCondition,
+        data: [ ...extraCondition, { $skip: skip },
+          { $limit: limit } ],
         count: [
           ...extraCondition,
           { $count: 'total' },
@@ -5058,7 +5036,37 @@ export async function getRolloutDetails( req, res ) {
     } );
 
 
-    let rolloutDetails = await storeBuilderService.aggregate( query );
+    let floorQuery = [
+      {
+        $match: {
+          clientId: req.body.clientId,
+          storeId: { $in: storeDetails },
+        },
+      },
+      {
+        $group: {
+          _id: '$storeId',
+          count: { $sum: 1 },
+        },
+      },
+      {
+        $match: {
+          count: { $gt: 1 },
+        },
+      },
+      {
+        $group: {
+          _id: '',
+          storeList: { $addToSet: '$_id' },
+        },
+      },
+    ];
+
+
+    let [ rolloutDetails, doubleFloorList ] = await Promise.all( [
+      storeBuilderService.aggregate( query ),
+      storeBuilderService.aggregate( floorQuery ),
+    ] );
     let result = {
       cardData: {
         totalStore: rolloutDetails?.[0]?.totalStore?.[0]?.count || 0,
@@ -5067,7 +5075,7 @@ export async function getRolloutDetails( req, res ) {
         vmPendingStore: rolloutDetails?.[0]?.vmPending?.[0]?.count || 0,
         flagStore: rolloutDetails?.[0]?.flag?.[0]?.count || 0,
         flagStore: rolloutDetails?.[0]?.flag?.[0]?.count || 0,
-        doubleFloorStore: rolloutDetails?.[0]?.doubleFloorStore?.[0]?.doubleFloorList || [],
+        doubleFloorStore: doubleFloorList[0]?.storeList|| [],
       },
       tableData: {
         count: rolloutDetails?.[0]?.count?.[0]?.total || 0,

package/src/controllers/task.controller.js

@@ -662,6 +662,7 @@ export async function updateAnswersv2( req, res ) {
       taskType: req.body.taskType,
       storeName: req.body?.storeName,
       storeId: req.body?.storeId,
+      date_string: dayjs().format( 'YYYY-MM-DD' ),
     };
     console.log( '111111', data.answers[0] );
     console.log( '111111', data.answers[0].issues[0] );
@@ -1053,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' ) ) } } );
+    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 } );