tango-app-api-store-builder 1.0.0-beta-224 → 1.0.0-beta-226

package/package.json

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

package/src/controllers/storeBuilder.controller.js

@@ -3322,7 +3322,7 @@ export async function storeFixturesv3( req, res ) {
 export async function fixtureShelfProductv2( req, res ) {
   try {
     const { planoId, fixtureId } = req.body;
-    let shelfMapping = [];
+    let shelfMapping = {};
 
     const [ planogram, fixture ] = await Promise.all( [
       planoService.findOne(
@@ -3335,27 +3335,28 @@ export async function fixtureShelfProductv2( req, res ) {
     if ( !planogram ) return res.sendError( 'Planogram not found', 204 );
     if ( !fixture ) return res.sendError( 'Fixture not found', 204 );
 
+    if ( req.body?.compliance ) {
+      let getAllFixtures = await fixtureShelfService.find( { planoId: fixture.planoId, floorId: fixture.floorId, fixtureId: { $ne: fixtureId } } );
 
-    let getAllFixtures = await fixtureShelfService.find( { planoId: fixture.planoId, floorId: fixture.floorId, fixtureId: { $ne: fixtureId } } );
-
-    shelfMapping = getAllFixtures.reduce( ( acc, ele ) => {
-      let productList = ele.productBrandName?.toString()?.toLowerCase();
-      if ( !acc?.[productList] ) {
-        let findZone = acc?.[productList]?.find( ( prod ) => prod.zone == ele.zone && prod.shelfId.toString() == ele._id.toString() );
-        if ( !findZone ) {
-          acc[productList] = [
-            {
-              zone: ele.zone,
-              shelfId: ele._id,
-              fixtureId: ele.fixtureId,
-              fixtureName: fixture.fixtureName,
-              brandName: ele.productBrandName,
-            },
-          ];
+      shelfMapping = getAllFixtures.reduce( ( acc, ele ) => {
+        let productList = ele.productBrandName?.toString()?.toLowerCase();
+        if ( !acc?.[productList] ) {
+          let findZone = acc?.[productList]?.find( ( prod ) => prod.zone == ele.zone && prod.shelfId.toString() == ele._id.toString() );
+          if ( !findZone ) {
+            acc[productList] = [
+              {
+                zone: ele.zone,
+                shelfId: ele._id,
+                fixtureId: ele.fixtureId,
+                fixtureName: fixture.fixtureName,
+                brandName: ele.productBrandName,
+              },
+            ];
+          }
         }
-      }
-      return acc;
-    }, {} );
+        return acc;
+      }, {} );
+    }
 
 
     const currentDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
@@ -3408,13 +3409,15 @@ export async function fixtureShelfProductv2( req, res ) {
           fixtureShelves.map( async ( shelf ) => {
             const productMappings = await planoMappingService.find( { shelfId: shelf._id, type: 'product' } );
             const productDetails = await getProducts( productMappings );
-            let count = shelf.shelfType == 'tray' ? ( shelf.productPerShelf * shelf.trayRows ) : shelf.productPerShelf;
-            if ( count > productMappings.length ) {
-              let extraProduct = count- productMappings.length;
-              for ( let i=0; i<extraProduct; i++ ) {
-                productDetails.unshift( {
-                  status: 'missing',
-                } );
+            if ( req.body?.compliance ) {
+              let count = shelf.shelfType == 'tray' ? ( shelf.productPerShelf * shelf.trayRows ) : shelf.productPerShelf;
+              if ( count > productMappings.length ) {
+                let extraProduct = count- productMappings.length;
+                for ( let i=0; i<extraProduct; i++ ) {
+                  productDetails.unshift( {
+                    status: 'missing',
+                  } );
+                }
               }
             }
             return { ...shelf.toObject(), products: productDetails };
@@ -3576,14 +3579,14 @@ export async function storeFixturesTaskv2( req, res ) {
                                   let productIdList = productDetails.map( ( ele ) => ele._id );
                                   let status = await planoComplianceService.find( { fixtureId: fixture._id, shelfId: shelf.toObject(), planoMappingId: { $in: productIdList } }, { compliance: 1 } );
                                   status = status.map( ( ele ) => ele?.compliance );
-                                  const compliance = status.length ? ( status.includes( 'missing' ) || status.includes( 'misplaced' ) ) ? 'improper' : 'proper' : 'improper';
+                                  const productCompliance = status.length ? ( status.includes( 'missing' ) || status.includes( 'misplaced' ) ) ? 'improper' : 'proper' : 'improper';
                                   const vmCount = await planoMappingService.count( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'vm' } );
 
                                   return {
                                     ...shelf.toObject(),
                                     productCount: productDetails.length,
                                     vmCount: vmCount,
-                                    compliance,
+                                    compliance: productCompliance,
                                   };
                                 } ),
                             );
@@ -3625,6 +3628,7 @@ export async function storeFixturesTaskv2( req, res ) {
                               shelfConfig: shelfDetails,
                               vmConfig: vmDetails,
                               ...( req.body.type == 'fixtureMeasurement' && { fixtureMeasurement: compliance.answers?.[0]?.fixtureWidth } ),
+                              ...( ( compliance?.answers?.[0]?.status && req.body.type == 'fixture' && req.body.redo ) && { ansStatus: true } ),
                             };
                           } ),
                       );
@@ -3685,12 +3689,12 @@ export async function storeFixturesTaskv2( req, res ) {
                             let productIdList = productDetails.map( ( ele ) => ele._id );
                             let status = await planoComplianceService.find( { fixtureId: fixture._id, shelfId: shelf.toObject(), planoMappingId: { $in: productIdList } }, { compliance: 1 } );
                             status = status.map( ( ele ) => ele?.compliance );
-                            const compliance = status.length ? ( status.includes( 'missing' ) || status.includes( 'misplaced' ) ) ? 'improper' : 'proper' : 'improper';
+                            let productCompliance = status.length ? ( status.includes( 'missing' ) || status.includes( 'misplaced' ) ) ? 'improper' : 'proper' : 'improper';
                             return {
                               ...shelf.toObject(),
                               productCount: productDetails.length,
                               vmCount: vmCount,
-                              compliance,
+                              compliance: productCompliance,
                             };
                           } ),
                       );
@@ -3732,6 +3736,7 @@ export async function storeFixturesTaskv2( req, res ) {
                         shelfConfig: shelfDetails,
                         vmConfig: vmDetails,
                         ...( req.body.type == 'fixtureMeasurement' && { fixtureMeasurement: compliance.answers?.[0]?.fixtureWidth } ),
+                        ...( ( compliance?.answers?.[0]?.status && req.body.type == 'fixture' && req.body.redo ) && { ansStatus: true } ),
                       };
                     } ),
                 );
@@ -5254,7 +5259,15 @@ export async function planoList( req, res ) {
 
     if ( inputData.filter.status.length ) {
       if ( inputData.filter.status.includes( 'taskAssigned' ) ) {
-        orQuery.push( { 'planoTask.taskStatus.status': { $in: [ 'open', 'inprogress' ] } } );
+        // orQuery.push( { 'planoTask.taskStatus.status': { $in: [ 'open', 'inprogress' ] } } );
+        orQuery.push( {
+          'planoTask.taskStatus': {
+            $elemMatch: {
+              status: { $ne: 'submit' },
+              breach: false,
+            },
+          },
+        } );
       }
       if ( inputData.filter.status.includes( 'reviewPending' ) ) {
         orQuery.push( {
@@ -7081,7 +7094,7 @@ export async function updateProductMapping( req, res ) {
         await planoMappingService.deleteMany( { storeId: store.storeId } );
         let mappingInsertData = await planoMappingService.insertMany( mappingData );
         mappingInsertData = new Map( mappingInsertData.map( ( ele, index ) => [ index, ele ] ) );
-        let date = new Date();
+        let date = dayjs().format();
         complianceData.forEach( ( compliance, index ) => {
           compliance.planoMappingId = mappingInsertData.get( index );
           compliance.createdAt = date;
@@ -7109,9 +7122,6 @@ export async function calculateCompliance( req, res ) {
           compliance: 'proper',
         },
       },
-      {
-        $sort: { createdAt: -1 },
-      },
       {
         $group: {
           _id: '$createdAt',
@@ -7125,6 +7135,9 @@ export async function calculateCompliance( req, res ) {
           count: 1,
         },
       },
+      {
+        $sort: { date: -1 },
+      },
       {
         $limit: 2,
       },
@@ -7169,7 +7182,7 @@ export async function calculateCompliance( req, res ) {
           let diff = previousMerchCompliance - result.merchCompliance;
           result.previousMerchCompliance = diff;
         }
-        result.lastCheck = dayjs.utc( getCompliance?.[0]?.date ).format( 'hh:mm A' );
+        result.lastCheck = dayjs( getCompliance?.[0]?.date ).format( 'hh:mm A' );
       }
     }
     return res.sendSuccess( result );

package/src/dtos/validation.dtos.js

@@ -59,6 +59,7 @@ export const fixtureShelfProductSchema = joi.object( {
   fixtureId: joi.string().required(),
   floorId: joi.string().required(),
   planoId: joi.string().required(),
+  compliance: joi.boolean().optional(),
 } );
 
 export const fixtureShelfProduct = {

package/src/routes/storeBuilder.routes.js

@@ -45,10 +45,10 @@ storeBuilderRouter
     .post( '/storeLayoutElements', isAllowedSessionHandler, storeBuilderController.storeLayoutElements )
     .post( '/qrScan', isAllowedSessionHandler, storeBuilderController.qrScan )
     .post( '/storeFixturesV2', isAllowedSessionHandler, validate( validateDtos.storeList ), storeBuilderController.storeFixturesv2 )
-    .post( '/fixtureShelfDetailsv2', isAllowedSessionHandler, validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv2 )
-    .post( '/storeFixturesTaskv2', isAllowedSessionHandler, storeBuilderController.storeFixturesTaskv2 )
+    // .post( '/fixtureShelfDetailsv2', isAllowedSessionHandler, validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv2 )
+    // .post( '/storeFixturesTaskv2', isAllowedSessionHandler, storeBuilderController.storeFixturesTaskv2 )
     .post( '/qrScan1', isAllowedSessionHandler, storeBuilderController.qrScan1 )
-    .post( '/storeFixturesV2', isAllowedSessionHandler, validate( validateDtos.storeList ), storeBuilderController.storeFixturesv2 )
+    // .post( '/storeFixturesV2', isAllowedSessionHandler, validate( validateDtos.storeList ), storeBuilderController.storeFixturesv2 )
     .post( '/storeFixturesV3', isAllowedSessionHandler, validate( validateDtos.storeList ), storeBuilderController.storeFixturesv3 )
     .post( '/fixtureShelfDetailsv2', isAllowedSessionHandler, validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv2 )
     .post( '/fixtureShelfDetailsv3', isAllowedSessionHandler, validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv3 )