tango-app-api-store-builder 1.0.0-beta-162 → 1.0.0-beta-164

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -73,13 +73,14 @@ export async function getplanoFeedback( req, res ) {
     return res.sendError( e, 500 );
   }
 }
-function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByApprovalStatus, showtask ) {
+function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByApprovalStatus, showtask, taskId=0 ) {
   console.log( type, planoId, floorId, filterByStatus );
   const matchStage = {
     $match: {
       planoId: new mongoose.Types.ObjectId( planoId ),
       floorId: new mongoose.Types.ObjectId( floorId ),
       type: type,
+      ...( taskId && { taskId: taskId } ),
       ...( filterByStatus?.length ? { status: { $in: filterByStatus } } : {} ),
     },
   };
@@ -695,7 +696,7 @@ export async function updateRolloutStatus( req, res ) {
             },
         );
         let data = {};
-        if ( req.body.type == 'vmRollout' ) {
+        if ( req.body.taskType == 'vmRollout' ) {
           data['isVmEdited'] = false;
         } else {
           data['isMerchEdited'] = false;
@@ -973,7 +974,7 @@ export async function getRolloutFeedback( req, res ) {
     await Promise.all(
         taskTypes.map( async ( type, index ) => {
           console.log( type );
-          const pipeline = buildPipelineByType( type, req.body.planoId, req.body.floorId, filterByStatus, filterByApprovalStatus, req.body.showtask );
+          const pipeline = buildPipelineByType( type, req.body.planoId, req.body.floorId, filterByStatus, filterByApprovalStatus, req.body.showtask, req.body.taskId );
 
           let data = await planoTaskService.aggregate( pipeline );
           console.log( data );

package/src/controllers/storeBuilder.controller.js

@@ -1451,7 +1451,7 @@ export async function updateMissing( req, res ) {
 
     if ( !fixtureShelves.length ) return res.sendError( 'No shelves found for the fixture', 204 );
 
-    console.log('called')
+    console.log( 'called' );
 
     await Promise.all(
         fixtureShelves.map( async ( shelf ) => {
@@ -4766,11 +4766,11 @@ export async function getRolloutDetails( req, res ) {
                     branches: [
                       {
                         case: { $and: [ { $gt: [ '$merchCount', 0 ] }, { $gt: [ '$merchPending', 0 ] } ] },
-                        then: 'merchPending',
+                        then: 'pending',
                       },
                       {
                         case: { $and: [ { $gt: [ '$merchCount', 0 ] }, { $gt: [ '$merchDisagree', 0 ] } ] },
-                        then: 'merchDisagree',
+                        then: 'disagree',
                       },
                     ],
                     default: '',
@@ -4781,11 +4781,11 @@ export async function getRolloutDetails( req, res ) {
                     branches: [
                       {
                         case: { $and: [ { $gt: [ '$vmCount', 0 ] }, { $gt: [ '$vmPending', 0 ] } ] },
-                        then: 'vmPending',
+                        then: 'pending',
                       },
                       {
                         case: { $and: [ { $gt: [ '$vmCount', 0 ] }, { $gt: [ '$vmDisagree', 0 ] } ] },
-                        then: 'vmDisagree',
+                        then: 'disagree',
                       },
                     ],
                     default: '',
@@ -4797,10 +4797,19 @@ export async function getRolloutDetails( req, res ) {
           as: 'taskFeedback',
         },
       },
+      {
+        $set: {
+          taskFeedback: {
+            $ifNull: [ { $arrayElemAt: [ '$taskFeedback', 0 ] }, {} ],
+          },
+        },
+      },
     ];
 
+    let extraCondition = [];
+
     if ( req.body?.filter?.type == 'rollout' ) {
-      query.push( {
+      extraCondition.push( {
         $match: {
           $expr: {
             $gt: [ { $size: '$taskDetails' }, 0 ],
@@ -4816,7 +4825,7 @@ export async function getRolloutDetails( req, res ) {
             taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } },
           },
           {
-            compliance: { $elemMatch: { feedbackStatus: 'merchPending' } },
+            'taskFeedback.fixtureStatus': 'pending',
           },
         ];
       } else {
@@ -4825,12 +4834,12 @@ export async function getRolloutDetails( req, res ) {
             taskDetails: { $elemMatch: { type: 'vmRollout', status: 'submit' } },
           },
           {
-            compliance: { $elemMatch: { feedbackStatus: 'vmPending' } },
+            'taskFeedback.vmStatus': 'pending',
           },
         ];
       }
 
-      query.push( {
+      extraCondition.push( {
         $match: {
           $and: andCondition,
         },
@@ -4838,18 +4847,17 @@ export async function getRolloutDetails( req, res ) {
     }
 
     if ( req.body.filter?.type == 'flag' ) {
-      query.push( {
+      extraCondition.push( {
         $match: {
           $and: [
             {
-              taskDetails: { $elemMatch: { breach: true } },
+              taskDetails: { $elemMatch: { breach: true, status: { $ne: 'submit' } } },
             },
           ],
         },
       } );
     }
 
-    let extraCondition = [];
 
     if ( req.body.searchValue ) {
       extraCondition.push( {
@@ -4859,56 +4867,59 @@ export async function getRolloutDetails( req, res ) {
       } );
     }
 
-    if ( req.body.filter.status.length ) {
+    if ( req.body.filter?.status?.length ) {
+      const orCondition = [];
+
       if ( req.body.filter.status.includes( 'yetToAssign' ) ) {
-        extraCondition.push( {
-          $match: {
-            $expr: {
-              $eq: [ { $size: '$taskDetails' }, 0 ],
-            },
+        orCondition.push( {
+          $expr: {
+            $eq: [ { $size: '$taskDetails' }, 0 ],
           },
         } );
       }
+
       if ( req.body.filter.status.includes( 'taskAssigned' ) ) {
-        extraCondition.push( {
-          $match: {
-            $expr: {
-              $gt: [ { $size: '$taskDetails' }, 0 ],
-            },
+        orCondition.push( {
+          $expr: {
+            $gt: [ { $size: '$taskDetails' }, 0 ],
           },
         } );
       }
+
       if ( req.body.filter.status.includes( 'reviewPending' ) ) {
-        extraCondition.push( {
-          $match: {
-            $or: [
-              {
-                compliance: { $elemMatch: { feedbackStatus: 'merchPending' } },
-              },
-              {
-                compliance: { $elemMatch: { feedbackStatus: 'vmPending' } },
-              },
-            ],
-          },
+        orCondition.push( {
+          $or: [
+            {
+              $and: [
+                { taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } } },
+                { 'taskFeedback.fixtureStatus': 'pending' },
+              ],
+            },
+            {
+              $and: [
+                { taskDetails: { $elemMatch: { type: 'vmRollout', status: 'submit' } } },
+                { 'taskFeedback.vmStatus': 'pending' },
+              ],
+            },
+          ],
         } );
       }
+
       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 ] },
+        orCondition.push( {
+          $and: [
+            { taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } } },
+            { taskDetails: { $elemMatch: { type: 'vmRollout', status: 'submit' } } },
+            {
+              $expr: {
+                $eq: [ { $size: { $objectToArray: '$taskFeedback' } }, 0 ],
               },
-            ],
-          },
+            },
+          ],
         } );
       }
+
+      extraCondition.push( { $match: { $or: orCondition } } );
     }
 
     extraCondition.push(
@@ -4957,9 +4968,7 @@ export async function getRolloutDetails( req, res ) {
                   },
                 },
                 {
-                  compliance: {
-                    $elemMatch: { feedbackStatus: 'merchPending' },
-                  },
+                  'taskFeedback.fixtureStatus': 'pending',
                 },
               ],
             },
@@ -4976,9 +4985,7 @@ export async function getRolloutDetails( req, res ) {
                   },
                 },
                 {
-                  compliance: {
-                    $elemMatch: { feedbackStatus: 'vmPending' },
-                  },
+                  'taskFeedback.vmStatus': 'pending',
                 },
               ],
             },
@@ -4989,7 +4996,7 @@ export async function getRolloutDetails( req, res ) {
           {
             $match: {
               taskDetails: {
-                $elemMatch: { breach: true },
+                $elemMatch: { breach: true, status: { $ne: 'submit' } },
               },
             },
           },

package/src/controllers/task.controller.js

@@ -321,12 +321,12 @@ export async function createTask( req, res ) {
               }
               await floorService.updateOne( { _id: taskData?.floorId }, { planoProgress } );
             }
-            // for ( let j=0; j<req.body.days; j++ ) {
-            let currDate = dayjs();
-            let time = dayjs().format( 'hh:mm A' );
-            let insertData = { ...taskData, date_string: currDate.format( 'YYYY-MM-DD' ), date_iso: new Date( currDate.format( 'YYYY-MM-DD' ) ), scheduleStartTime_iso: dayjs.utc( `${currDate.format( 'YYYY-MM-DD' )} ${time}`, 'YYYY-MM-DD hh:mm A' ).format() };
-            await processedService.updateOne( { date_string: currDate.format( 'YYYY-MM-DD' ), store_id: insertData.store_id, userEmail: insertData.userEmail, planoId: insertData.planoId, planoType: taskData.planoType, ...( taskData?.floorId ) ? { floorId: taskData.floorId }:{} }, insertData );
-            // }
+            for ( let j=0; j<req.body.days; j++ ) {
+              let currDate = dayjs().add( j, 'days' );
+              let time = j ? '12:00 AM' : currDate.format( 'hh:mm A' );
+              let insertData = { ...taskData, date_string: currDate.format( 'YYYY-MM-DD' ), date_iso: new Date( currDate.format( 'YYYY-MM-DD' ) ), scheduleStartTime_iso: dayjs.utc( `${currDate.format( 'YYYY-MM-DD' )} ${time}`, 'YYYY-MM-DD hh:mm A' ).format() };
+              await processedService.updateOne( { date_string: currDate.format( 'YYYY-MM-DD' ), store_id: insertData.store_id, userEmail: insertData.userEmail, planoId: insertData.planoId, planoType: taskData.planoType, ...( taskData?.floorId ) ? { floorId: taskData.floorId }:{}, ...( [ 'merchRollout', 'vmRollout' ].includes( taskData.planoType ) && { sourceCheckList_id: taskData.sourceCheckList_id } ) }, insertData );
+            }
           }
         }
       } ) );
@@ -538,13 +538,13 @@ export async function updateStatus( req, res ) {
       email: req.user.email,
       comment: req.body.comments,
     };
-    // if ( req.body.status == 'inprogress' ) {
-    //   await processedService.updateOne( { planoId: taskDetails.planoId, userEmail: taskDetails.userEmail, store_id: taskDetails.store_id, ...( taskDetails?.floorId ) ? { floorId: taskDetails.floorId } : {}, date_iso: { $gt: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } }, { checklistStatus: 'inprogress', startTime_string: timeString } );
-    // }
+    if ( req.body.status == 'inprogress' ) {
+      await processedService.updateOne( { planoId: taskDetails.planoId, userEmail: taskDetails.userEmail, store_id: taskDetails.store_id, ...( taskDetails?.floorId ) ? { floorId: taskDetails.floorId } : {}, date_iso: { $gt: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } }, { checklistStatus: 'inprogress', startTime_string: timeString } );
+    }
     await processedService.updateOne( { _id: req.body.taskId }, { checklistStatus: req.body.status, ...( req.body.status == 'inprogress' ) ? { startTime_string: timeString } : { submitTime_string: timeString }, comments: { $push: comments } } );
-    // if ( req.body.status == 'submit' ) {
-    //   await processedService.deleteMany( { planoId: taskDetails.planoId, userEmail: taskDetails.userEmail, store_id: taskDetails.store_id, ...( taskDetails?.floorId ) ? { floorId: taskDetails.floorId } : {}, date_iso: { $gt: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } } );
-    // }
+    if ( req.body.status == 'submit' ) {
+      await processedService.deleteMany( { planoId: taskDetails.planoId, userEmail: taskDetails.userEmail, store_id: taskDetails.store_id, ...( taskDetails?.floorId ) ? { floorId: taskDetails.floorId } : {}, date_iso: { $gt: new Date( dayjs().format( 'YYYY-MM-DD' ) ) } } );
+    }
     let vmTask = await planoTaskService.find(
         {
           planoId: new mongoose.Types.ObjectId( taskDetails.planoId ),
@@ -559,6 +559,20 @@ export async function updateStatus( req, res ) {
         await floorService.updateOne( { _id: new mongoose.Types.ObjectId( taskDetails.floorId ) }, { planoProgress: 100 } );
       }
     }
+
+    if ( req.body.status == 'submit' && [ 'merchRollout', 'vmRollout' ].includes( taskDetails.planoType ) ) {
+      let merchVmTaskDetails = await planoTaskService.find(
+          {
+            planoId: new mongoose.Types.ObjectId( taskDetails.planoId ),
+            floorId: new mongoose.Types.ObjectId( taskDetails.floorId ),
+            type: taskDetails.planoType,
+            status: 'complete',
+          },
+          { fixtureId: 1 },
+      );
+      let query = taskDetails.planoType == 'merchRollout' ? { isMerchEdited: false } : { isVmEdited: false };
+      await storeFixtureService.updateMany( { _id: { $in: merchVmTaskDetails?.map( ( ele ) => ele.fixtureId ) } }, query );
+    }
     return res.sendSuccess( 'Task status updated successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'storeLayout', error: e } );
@@ -669,11 +683,6 @@ export async function updateAnswersv2( req, res ) {
       await sendMessageToQueue( `${sqs.url}${sqs.storeBuilder}`, JSON.stringify( sqsData ) );
     }
 
-    if ( data.status == 'complete' && [ 'merchRollout', 'vmRollout' ].includes( data.type ) ) {
-      let query = data.type == 'merchRollout' ? { isMerchEdited: false } : { isVmEdited: false };
-      await storeFixtureService.updateOne( { _id: req.body.fixtureId }, query );
-    }
-
     return res.sendSuccess( 'Fixture details updated successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'updateAnswers', error: e } );