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

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -30,21 +30,25 @@ 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 !== '' ) {
+          if ( filterByApprovalStatus && filterByApprovalStatus?.length ) {
             if ( type == 'fixture' ) {
-              if ( filterByApprovalStatus == 'pending' ) {
-                data = data.filter( ( element ) => {
+              let pendingData = [];
+              let agreeData = [];
+              let disAgreeData = [];
+              if ( filterByApprovalStatus.includes( 'pending' ) ) {
+                pendingData = data.filter( ( element ) => {
                   return element?.approvalStatus == 'pending';
                 } );
-              } if ( filterByApprovalStatus == 'agree' ) {
-                data = data.filter( ( element ) => {
+              } if ( filterByApprovalStatus.includes( 'agree' ) ) {
+                agreeData = data.filter( ( element ) => {
                   return element?.answers?.[0]?.status == 'agree';
                 } );
-              } if ( filterByApprovalStatus == 'disagree' ) {
-                data = data.filter( ( element ) => {
+              } 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 ) => {
@@ -370,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(

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(
@@ -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,
@@ -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' ),
                                 ),
@@ -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' ),
                           ),
@@ -5303,6 +5305,12 @@ export async function getTaskDetails( req, res ) {
     let disabledInfo = [];
     let floorDetails = await layoutService.findOne( { _id: req.query.floorId }, { isEdited: 1, planoProgress: 1 } );
     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 ) {
     logger.error( { functionName: 'getTaskDetails', error: e } );