tango-app-api-store-builder 1.0.0-beta-159 → 1.0.0-beta-160

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-159",
+    "version": "1.0.0-beta-160",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",
@@ -32,7 +32,7 @@
         "path": "^0.12.7",
         "selenium-webdriver": "^4.31.0",
         "sharp": "^0.34.1",
-        "tango-api-schema": "^2.2.192",
+        "tango-api-schema": "^2.2.201",
         "tango-app-api-middleware": "3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",

package/src/controllers/script.controller.js

@@ -7400,7 +7400,7 @@ export async function migrateCrestv1( req, res ) {
       clientId: '11',
       $and: [
         { storeName: req.body.storeName },
-        // { storeName: { $in: ['LKST98', 'LKST682', 'ST185', 'ST36', 'LKST1193'] } },
+        // { storeName: { $in: [ 'LKST1324', 'LKST495' ] } },
         // { storeName: { $nin: [ 'LKST98', 'LKST1193' ] } },
       ],
     };

package/src/controllers/storeBuilder.controller.js

@@ -1451,6 +1451,8 @@ export async function updateMissing( req, res ) {
 
     if ( !fixtureShelves.length ) return res.sendError( 'No shelves found for the fixture', 204 );
 
+    console.log('called')
+
     await Promise.all(
         fixtureShelves.map( async ( shelf ) => {
           const productMappings = await planoMappingService.find( { shelfId: shelf._id } );
@@ -1459,18 +1461,18 @@ export async function updateMissing( req, res ) {
             return { ...shelf.toObject(), products: [] };
           }
 
-          const productIds = productMappings.map( ( mapping ) => mapping.productId );
-          const products = await planoProductService.find( { _id: { $in: productIds } } );
-          const productMap = new Map( products.map( ( product ) => [ product._id.toString(), product.toObject() ] ) );
+          // const productIds = productMappings.map( ( mapping ) => mapping.productId );
+          // const products = await planoProductService.find( { _id: { $in: productIds } } );
+          // const productMap = new Map( products.map( ( product ) => [ product._id.toString(), product.toObject() ] ) );
 
           const currentDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
 
           await Promise.all(
               productMappings.map( async ( mapping ) => {
-                const productData = productMap.get( mapping.productId.toString() );
-                if ( !productData ) {
-                  return { ...mapping.toObject(), status: '' };
-                }
+                // const productData = productMap.get( mapping?.productId?.toString() );
+                // if ( !productData ) {
+                //   return { ...mapping.toObject(), status: '' };
+                // }
 
                 const mappingCompliance = await planoComplianceService.findOne( {
                   planoMappingId: mapping._id,
@@ -1484,7 +1486,7 @@ export async function updateMissing( req, res ) {
 
                 return {
                   ...mapping.toObject(),
-                  ...productData,
+                  // ...productData,
                 };
               } ),
           );
@@ -4857,6 +4859,58 @@ export async function getRolloutDetails( req, res ) {
       } );
     }
 
+    if ( req.body.filter.status.length ) {
+      if ( req.body.filter.status.includes( 'yetToAssign' ) ) {
+        extraCondition.push( {
+          $match: {
+            $expr: {
+              $eq: [ { $size: '$taskDetails' }, 0 ],
+            },
+          },
+        } );
+      }
+      if ( req.body.filter.status.includes( 'taskAssigned' ) ) {
+        extraCondition.push( {
+          $match: {
+            $expr: {
+              $gt: [ { $size: '$taskDetails' }, 0 ],
+            },
+          },
+        } );
+      }
+      if ( req.body.filter.status.includes( 'reviewPending' ) ) {
+        extraCondition.push( {
+          $match: {
+            $or: [
+              {
+                compliance: { $elemMatch: { feedbackStatus: 'merchPending' } },
+              },
+              {
+                compliance: { $elemMatch: { feedbackStatus: 'vmPending' } },
+              },
+            ],
+          },
+        } );
+      }
+      if ( req.body.filter.status.includes( 'completed' ) ) {
+        extraCondition.push( {
+          $match: {
+            $and: [
+              {
+                taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } },
+              },
+              {
+                taskDetails: { $elemMatch: { type: 'vmRollout', status: 'submit' } },
+              },
+              {
+                $expr: { $eq: [ { $size: '$compliance' }, 0 ] },
+              },
+            ],
+          },
+        } );
+      }
+    }
+
     extraCondition.push(
         { $skip: skip },
         { $limit: limit },
@@ -5020,6 +5074,7 @@ export async function getRolloutTaskDetails( req, res ) {
           taskId: { $last: '$_id' },
           redoStatus: { $last: '$redoStatus' },
           scheduleEndTime_iso: { $last: '$scheduleEndTime_iso' },
+          taskId: { $last: '$_id' },
         },
       },
       {
@@ -5033,6 +5088,7 @@ export async function getRolloutTaskDetails( req, res ) {
               floorId: '$_id.floorId',
               redoStatus: '$redoStatus',
               endTime: '$scheduleEndTime_iso',
+              id: '$taskId',
               breach: {
                 $cond: {
                   if: {
@@ -5303,6 +5359,7 @@ export async function getRolloutTaskDetails( req, res ) {
                 redoStatus: '$$task.redoStatus',
                 endTime: '$$task.endTime',
                 breach: '$$task.breach',
+                taskId: '$$task.id',
                 feedbackStatus: {
                   $switch: {
                     branches: [
@@ -5328,10 +5385,10 @@ export async function getRolloutTaskDetails( req, res ) {
 
     let taskInfo = await planotaskService.aggregate( query );
     const [ merchCount, vmCount ] = await Promise.all( [
-      await layoutService.count( { _id: req.query.floorId, isMerchEdited: true } ),
-      await layoutService.count( { _id: req.query.floorId, isVmEdited: true } ),
+      await storeFixtureService.count( { floorId: req.query.floorId, isMerchEdited: true } ),
+      await storeFixtureService.count( { floorId: req.query.floorId, isVmEdited: true } ),
     ] );
-    return res.sendSuccess( { taskDetails: taskInfo, merchCount, vmCount } );
+    return res.sendSuccess( { taskDetails: taskInfo?.[0]?.taskStatus || [], merchCount, vmCount } );
   } catch ( e ) {
     logger.error( { functionName: 'getTaskDetails', error: e } );
     return res.sendError( e, 500 );

package/src/controllers/task.controller.js

@@ -15,6 +15,7 @@ import * as floorService from '../service/storeBuilder.service.js';
 import * as planoStaticService from '../service/planoStaticData.service.js';
 import * as assignService from '../service/assignService.service.js';
 import * as storeBuilderService from '../service/storeBuilder.service.js';
+import * as commentsService from '../service/planoGlobalComment.service.js';
 
 
 dayjs.extend( timeZone );
@@ -1031,7 +1032,11 @@ export async function redoTask( req, res ) {
 
 export async function revokeTask( req, res ) {
   try {
-    await processedService.deleteMany( { checklistName: req.body.checkListName, date_string: dayjs().format( 'YYYY-MM-DD' ), planoId: req.body.planoId, floorId: req.body.floorId } );
+    if(!req.body.taskId) {
+      return res.sendError('Checklist type is required',400)
+    }
+    await processedService.deleteMany( { _id:req.body.taskId } );
+    return res.sendSuccess('Task revoked successfully');
   } catch ( e ) {
     logger.error( { functionName: 'revokeTask', error: e } );
     return res.sendError( e, 500 );

package/src/routes/task.routes.js

@@ -16,4 +16,5 @@ storeBuilderTaskRouter
     .get( '/getVmDetails', isAllowedSessionHandler, taskController.getVmDetails )
     .post( '/generateTaskExcel', taskController.generatetaskDetails )
     .post( '/getSubmitDetails', taskController.taskSubmitDetails )
-    .post( '/redoTask', isAllowedSessionHandler, taskController.redoTask );
+    .post( '/redoTask', isAllowedSessionHandler, taskController.redoTask )
+    .post( '/revokeTask', isAllowedSessionHandler, taskController.revokeTask );

package/src/service/storeFixture.service.js

@@ -60,3 +60,7 @@ export async function upsertOne( query, record ) {
 export async function removeKeys( query, data ) {
   return model.storeFixtureModel.updateOne( query, data );
 }
+
+export async function count( query ) {
+  return model.storeFixtureModel.countDocuments( query );
+}