tango-app-api-store-builder 1.0.0-beta-211 → 1.0.0-beta-213

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -30,17 +30,37 @@ export async function getplanoFeedback( req, res ) {
           const pipeline = buildPipelineByType( type, req.body.planoId, req.body.floorId, filterByStatus, filterByApprovalStatus, req.body.showtask );
 
           let data = await planoTaskService.aggregate( pipeline );
-          if ( filterByApprovalStatus && filterByApprovalStatus !== '' ) {
-            data.forEach( ( element ) => {
-              element.answers?.forEach( ( ans ) => {
-                ans.issues = ans.issues?.filter(
-                    ( issue ) => issue.Details && issue.Details.length > 0,
+          if ( filterByApprovalStatus && filterByApprovalStatus?.length ) {
+            if ( type == 'fixture' ) {
+              let pendingData = [];
+              let agreeData = [];
+              let disAgreeData = [];
+              if ( filterByApprovalStatus.includes( 'pending' ) ) {
+                pendingData = data.filter( ( element ) => {
+                  return element?.approvalStatus == 'pending';
+                } );
+              } if ( filterByApprovalStatus.includes( 'agree' ) ) {
+                agreeData = data.filter( ( element ) => {
+                  return element?.answers?.[0]?.status == 'agree';
+                } );
+              } if ( filterByApprovalStatus.includes( 'disagree' ) ) {
+                disAgreeData = data.filter( ( element ) => {
+                  return element?.answers?.[0]?.status == 'disagree';
+                } );
+              }
+              data = [ ...pendingData, ...agreeData, ...disAgreeData ];
+            } else {
+              data.forEach( ( element ) => {
+                element.answers?.forEach( ( ans ) => {
+                  ans.issues = ans.issues?.filter(
+                      ( issue ) => issue.Details && issue.Details.length > 0,
+                  );
+                } );
+                element.answers = element.answers?.filter(
+                    ( ans ) => ans.issues && ans.issues.length > 0,
                 );
               } );
-              element.answers = element.answers?.filter(
-                  ( ans ) => ans.issues && ans.issues.length > 0,
-              );
-            } );
+            }
             data = data.filter(
                 ( element ) => element.answers && element.answers.length > 0,
             );
@@ -354,7 +374,7 @@ function buildPipelineByType( type, planoId, floorId, filterByStatus, filterByAp
     ...vmStages,
     { $sort: { _id: -1 } },
   ];
-  if ( filterByApprovalStatus && filterByApprovalStatus != '' ) {
+  if ( filterByApprovalStatus && filterByApprovalStatus != '' && type !== 'fixture' ) {
     pipeline = [];
     pipeline.push( matchStage );
     pipeline.push(
@@ -960,6 +980,19 @@ export async function updateFixtureStatus( req, res ) {
           ] );
 
       await planoTaskService.updateOne( { _id: req.body._id }, { approvalStatus: 'approved' } );
+      let fixtureTask = await planoTaskService.find(
+          {
+            planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+            floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+            type: 'fixture',
+          },
+      );
+      if ( fixtureTask.length > 0 ) {
+        let allTaskDone = fixtureTask.filter( ( data ) => !data?.answers?.[0]?.status || data?.answers?.[0]?.status == 'disagree' );
+        if ( allTaskDone.length === 0 ) {
+          await floorService.updateOne( { _id: new mongoose.Types.ObjectId( req.body.floorId ) }, { planoProgress: 100 } );
+        }
+      }
     } else {
       let updateResponse = await planoTaskService.updateOnefilters(
           { _id: new mongoose.Types.ObjectId( req.body._id ) },

package/src/controllers/script.controller.js

@@ -9698,45 +9698,44 @@ function transformProducts( products, shelvesByZone, fixtureData ) {
 
 // ---------------------Plano Migrate-------------------------
 
-export async function getAllPlanoIds(req, res){
+export async function getAllPlanoIds( req, res ) {
   try {
-
-    if (!req.query?.clientId) {
-      return res.sendError('Client id is required', 400);
+    if ( !req.query?.clientId ) {
+      return res.sendError( 'Client id is required', 400 );
     }
-    const floorsData = await storeBuilderService.aggregate([
+    const floorsData = await storeBuilderService.aggregate( [
       {
-      '$match': {
-        'clientId': '11'
-      }
+        '$match': {
+          'clientId': '11',
+        },
       }, {
-      '$group': {
-        '_id': '$planoId',
-        'storeName': {
-        '$first': '$storeName'
+        '$group': {
+          '_id': '$planoId',
+          'storeName': {
+            '$first': '$storeName',
+          },
+          'storeId': {
+            '$first': '$storeId',
+          },
         },
-        'storeId': {
-        '$first': '$storeId'
-        }
-      }
-      }, {  
-      '$project': {
-        'planoId': '$_id',
-        'storeName': 1,
-        'storeId': 1
-      }
       }, {
-      '$sort': { storeName: 1 }
-      }
-    ]);
+        '$project': {
+          'planoId': '$_id',
+          'storeName': 1,
+          'storeId': 1,
+        },
+      }, {
+        '$sort': { storeName: 1 },
+      },
+    ] );
 
-    if (floorsData) {
-      return res.sendSuccess(floorsData);
+    if ( floorsData ) {
+      return res.sendSuccess( floorsData );
     } else {
-      return res.sendError("No floor data found", 204)
+      return res.sendError( 'No floor data found', 204 );
     }
-  } catch (error) {
-    console.log("@@ ~ getAllPlanoIds [ERR]:", error);
-    return res.sendError(e, 500);
+  } catch ( error ) {
+    console.log( '@@ ~ getAllPlanoIds [ERR]:', error );
+    return res.sendError( e, 500 );
   }
-}
+}

package/src/controllers/storeBuilder.controller.js

@@ -25,8 +25,9 @@ import * as fixtureShelfDuplicateService from '../service/fixtureShelfDuplicate.
 import * as planoMappingDuplicateService from '../service/planoMappingDuplicate.service.js';
 import * as fixtureConfigDuplicateService from '../service/fixtureConfigDuplicate.service.js';
 import * as planoVmDuplicateService from '../service/planoVmDuplicate.service.js';
+import advancedFormat from 'dayjs/plugin/advancedFormat.js';
 
-
+dayjs.extend( advancedFormat );
 dayjs.extend( utc );
 dayjs.extend( customParseFormat );
 
@@ -2800,7 +2801,7 @@ export async function storeFixturesv2( req, res ) {
         planograms.map( async ( planogram ) => {
           const floors = await storeBuilderService.find(
               { planoId: planogram._id, ...( req.body?.floorId && { _id: req.body.floorId } ) },
-              { floorName: 1, layoutPolygon: 1, planoId: 1, isEdited: 1, planoProgress: 1 },
+              { floorName: 1, layoutPolygon: 1, planoId: 1, isEdited: 1, planoProgress: 1, updatedAt: 1 },
           );
 
           const floorsWithFixtures = await Promise.all(
@@ -2811,12 +2812,12 @@ export async function storeFixturesv2( req, res ) {
                 const masterTemplateIds = new Set();
                 const layoutPolygonWithFixtures = await Promise.all(
                     floor.layoutPolygon.map( async ( element ) => {
-                        const fixtures = await storeFixtureService.findAndSort( {
+                      const fixtures = await storeFixtureService.findAndSort( {
                         floorId: floor._id,
                         associatedElementType: element.elementType,
                         associatedElementNumber: element.elementNumber,
                         fixtureType: { $ne: 'other' },
-                        }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
+                      }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
                       const fixturesWithStatus = await Promise.all(
                           fixtures.map( async ( fixture ) => {
@@ -2917,7 +2918,7 @@ export async function storeFixturesv2( req, res ) {
                   $and: [
                     { associatedElementType: { $exists: false } },
                     { associatedElementNumber: { $exists: false } },
-                    { fixtureType: { $ne: 'other' } }
+                    { fixtureType: { $ne: 'other' } },
                   ],
                 }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
@@ -3020,6 +3021,7 @@ export async function storeFixturesv2( req, res ) {
 
                 return {
                   ...floor.toObject(),
+                  updatedAt: dayjs( floor?.updatedAt ).format( 'Do MMM YYYY' ),
                   fixtureCount: fixtureCount,
                   vmCount: totalVmCount,
                   layoutPolygon: layoutPolygonWithFixtures,
@@ -3495,7 +3497,7 @@ export async function storeFixturesTaskv2( req, res ) {
                         floorId: floor._id,
                         associatedElementType: element.elementType,
                         associatedElementNumber: element.elementNumber,
-                        fixtureType: { $ne: 'other' }
+                        fixtureType: { $ne: 'other' },
                       }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
                       const fixturesWithStatus = await Promise.all(
@@ -3550,7 +3552,7 @@ export async function storeFixturesTaskv2( req, res ) {
                             let disabled = true;
                             if ( compliance?.status ) {
                               const hasDisagree = compliance?.answers?.some( ( answer ) =>
-                                answer?.status === 'disagree' ||
+                                answer?.status === 'disagree' || ( req.body?.type == 'fixture' && req?.body?.redo && compliance.status == 'complete' && !answer?.status ) ||
                                 answer?.issues?.some( ( issue ) =>
                                   issue?.Details?.some( ( detail ) => detail.status === 'disagree' ),
                                 ),
@@ -3598,7 +3600,7 @@ export async function storeFixturesTaskv2( req, res ) {
                   $and: [
                     { associatedElementType: { $exists: false } },
                     { associatedElementNumber: { $exists: false } },
-                    { fixtureType: { $ne: 'other' } }
+                    { fixtureType: { $ne: 'other' } },
                   ],
                 }, { shelfcount: 0 }, { associatedElementFixtureNumber: 1 } );
 
@@ -3653,7 +3655,7 @@ export async function storeFixturesTaskv2( req, res ) {
                       let disabled = true;
                       if ( compliance?.status ) {
                         const hasDisagree = compliance?.answers?.some( ( answer ) =>
-                          answer?.status === 'disagree' ||
+                          answer?.status === 'disagree' || ( req.body?.type == 'fixture' && req?.body?.redo && compliance.status == 'complete' && !answer?.status ) ||
                           answer?.issues?.some( ( issue ) =>
                             issue?.Details?.some( ( detail ) => detail.status === 'disagree' ),
                           ),
@@ -4864,6 +4866,7 @@ export async function getTaskDetails( req, res ) {
           isPlano: true,
           date_iso: { $lte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) },
           floorId: new mongoose.Types.ObjectId( req.query.floorId ),
+          planoType: { $in: [ 'layout', 'fixture', 'vm' ] },
         },
       },
       {
@@ -5301,8 +5304,12 @@ export async function getTaskDetails( req, res ) {
     let taskInfo = await planotaskService.aggregate( query );
     let disabledInfo = [];
     let floorDetails = await layoutService.findOne( { _id: req.query.floorId }, { isEdited: 1, planoProgress: 1 } );
-    if ( floorDetails && !floorDetails?.isEdited ) {
-      disabledInfo = taskInfo?.[0]?.taskStatus?.filter( ( ele ) => ( ( ele.feedbackStatus && ![ 'complete', 'disagree' ].includes( ele.feedbackStatus ) ) || ele.status != 'submit' ) && !ele?.breach );
+    disabledInfo = taskInfo?.[0]?.taskStatus?.filter( ( ele ) => ( ( ele.feedbackStatus && ![ 'complete', 'disagree' ].includes( ele.feedbackStatus ) ) || ele.status != 'submit' ) && !ele?.breach );
+    if ( floorDetails.isEdited ) {
+      let findPending = taskInfo?.[0]?.taskStatus?.findIndex( ( ele ) => ele.type == 'fixture' && ele.feedbackStatus == 'pending' );
+      if ( findPending != -1 ) {
+        disabledInfo = [];
+      }
     }
     return res.sendSuccess( { taskDetails: taskInfo?.[0]?.taskStatus, disabled: disabledInfo?.length ? true : false, planoProgress: floorDetails?.planoProgress ?? 25 } );
   } catch ( e ) {

package/src/controllers/task.controller.js

@@ -694,6 +694,7 @@ export async function updateAnswersv2( req, res ) {
       storeName: req.body?.storeName,
       storeId: req.body?.storeId,
       date_string: dayjs().format( 'YYYY-MM-DD' ),
+      approvalStatus: 'pending',
     };
     if ( req.body.type === 'layout' ) {
       await planoTaskService.updateOne( { planoId: req.body.planoId, taskType: req.body.taskType, floorId: req.body.floorId, fixtureId: req.body.fixtureId, type: req.body.type, ...( taskDetails?._id ) ? { taskId: taskDetails?._id } : {} }, data );