tango-app-api-store-builder 1.0.49 → 1.0.50

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.49",
+    "version": "1.0.50",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",
@@ -33,7 +33,7 @@
         "path": "^0.12.7",
         "selenium-webdriver": "^4.31.0",
         "sharp": "^0.34.1",
-        "tango-api-schema": "^2.5.35",
+        "tango-api-schema": "^2.5.37",
         "tango-app-api-middleware": "3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",

package/src/controllers/managePlano.controller.js

@@ -948,7 +948,7 @@ export async function updateStorePlano( req, res ) {
       storeName: floorData.toObject().storeName,
       storeId: floorData.toObject().storeId,
       planoChanges: JSON.stringify( currentFixtures ),
-
+      date_string: dayjs( 'YYYY-MM-DD' ),
     };
 
     await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).planoLog, insertData );
@@ -1597,6 +1597,7 @@ export async function updateStoreFixture( req, res ) {
       storeName: currentFixture.storeName,
       storeId: currentFixture.storeId,
       planoChanges: JSON.stringify( currentFixture ),
+      date_string: dayjs( 'YYYY-MM-DD' ),
     };
 
     await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).planoLog, insertData );
@@ -2545,7 +2546,6 @@ export async function createPlanoFromCAD( req, res ) {
       } );
     }
 
-
     try {
       const updateStoreFixtures = await processFixtureTemplates( { fixtures: storeFixtures } );
 
@@ -2557,14 +2557,14 @@ export async function createPlanoFromCAD( req, res ) {
       } );
     }
 
-    return res.sendSuccess(meta);
-  } catch (error) {
-    logger.error({
+    return res.sendSuccess( meta );
+  } catch ( error ) {
+    logger.error( {
       functionName: 'createPlanoFromCAD',
       error,
-    });
+    } );
 
-    return res.sendError({ errMsg: 'Failed to create planogram.', errInfo: error }, 500);
+    return res.sendError( { errMsg: 'Failed to create planogram.', errInfo: error }, 500 );
   }
 }
 
@@ -2781,21 +2781,19 @@ async function processFixtureTemplates( data ) {
   return updateStoreFixtures;
 }
 
-
-export async function approvePlanoLayout(req, res) {
+export async function approvePlanoLayout( req, res ) {
   try {
-
     const { floorId } = req.body;
 
     await floorService.updateOne(
-      { _id: new mongoose.Types.ObjectId(floorId) },
-      {
-        isPlanoApproved: true,
-      },
+        { _id: new mongoose.Types.ObjectId( floorId ) },
+        {
+          isPlanoApproved: true,
+        },
     );
-    res.sendSuccess(true);
-  } catch (error) {
-    logger.error({ functionName: 'approvePlanoLayout', error: e });
-    res.sendError('Failed to approve planogram', 500);
+    res.sendSuccess( true );
+  } catch ( error ) {
+    logger.error( { functionName: 'approvePlanoLayout', error: e } );
+    res.sendError( 'Failed to approve planogram', 500 );
   }
-}
+}

package/src/controllers/script.controller.js

@@ -15412,6 +15412,7 @@ export async function update4487Inventory( req, res ) {
             category: element.collection,
             productImageUrl: element.image_front,
             productId: req.body.pidData[i].products[j],
+            pid: element.product_id,
           };
         } else {
           updateData = {
@@ -15425,6 +15426,7 @@ export async function update4487Inventory( req, res ) {
             category: 'Unknown',
             productImageUrl: raw?.[0]?.image_front,
             productId: req.body.pidData[i].products[j],
+            pid: element.product_id,
           };
         }
         const product = await planoProductService.create( updateData );
@@ -15617,8 +15619,8 @@ export async function insertAntennaMappingData( req, res ) {
           { "shelfNumber": 3, "antennaNo": [ 10 ] },
           { "shelfNumber": 4, "antennaNo": [ 8 ] },
           { "shelfNumber": 5, "antennaNo": [ 12 ] },
-          { "shelfNumber": 6, "antennaNo": [ 4 ] },
-          { "shelfNumber": 7, "antennaNo": [ 9 ] },
+          { "shelfNumber": 6, "antennaNo": [ 9 ] },
+          { "shelfNumber": 7, "antennaNo": [ 4 ] },
           { "shelfNumber": 8, "antennaNo": [ 3 ] },
         ],
       },
@@ -15871,13 +15873,13 @@ export async function get4487FixtureDetails( req, res ) {
   }
 }
 
-export async function getstoreMBQFixtureExcel(req, res) {
+export async function getstoreMBQFixtureExcel( req, res ) {
   try {
-    const fromDate = new Date(dayjs().subtract(1, 'day').format('YYYY-MM-DD'));
-    let toDate = new Date(dayjs().subtract(1, 'day').format('YYYY-MM-DD'));
+    const fromDate = new Date( dayjs().subtract( 1, 'day' ).format( 'YYYY-MM-DD' ) );
+    let toDate = new Date( dayjs().subtract( 1, 'day' ).format( 'YYYY-MM-DD' ) );
     const userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
-    toDate = new Date(toDate.getTime() - userTimezoneOffset);
-    toDate.setUTCHours(23, 59, 59, 59);
+    toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    toDate.setUTCHours( 23, 59, 59, 59 );
 
     let query = [
       {
@@ -15898,45 +15900,45 @@ export async function getstoreMBQFixtureExcel(req, res) {
       },
     ];
 
-    let planorevisions = await planoRevisionService.aggregate(query);
+    let planorevisions = await planoRevisionService.aggregate( query );
     let data = [];
-    let sortOrder = [5, 1, 2, 3, 4];
+    let sortOrder = [ 5, 1, 2, 3, 4 ];
 
-    await Promise.all(planorevisions.map(async (revision) => {
-      let wallFixtures = revision?.data?.floorData?.layoutPolygon.flatMap((ele) => ele.fixtures);
+    await Promise.all( planorevisions.map( async ( revision ) => {
+      let wallFixtures = revision?.data?.floorData?.layoutPolygon.flatMap( ( ele ) => ele.fixtures );
       let centerFixtures = revision?.data?.floorData?.centerFixture;
-      let storeFixturesList = [...wallFixtures, ...centerFixtures];
+      let storeFixturesList = [ ...wallFixtures, ...centerFixtures ];
 
-      storeFixturesList.sort((a, b) => {
-        const floorDiff = b.floorId.toString().localeCompare(a.floorId.toString());
-        if (floorDiff !== 0) return floorDiff;
+      storeFixturesList.sort( ( a, b ) => {
+        const floorDiff = b.floorId.toString().localeCompare( a.floorId.toString() );
+        if ( floorDiff !== 0 ) return floorDiff;
 
-        if (a.fixtureType !== b.fixtureType) {
+        if ( a.fixtureType !== b.fixtureType ) {
           return a.fixtureType === "wall" ? -1 : 1;
         }
 
-        if (a.fixtureType === "wall") {
+        if ( a.fixtureType === "wall" ) {
           const orderDiff =
-            sortOrder.indexOf(a.associatedElementNumber) -
-            sortOrder.indexOf(b.associatedElementNumber);
+            sortOrder.indexOf( a.associatedElementNumber ) -
+            sortOrder.indexOf( b.associatedElementNumber );
 
-          if (orderDiff !== 0) return orderDiff;
+          if ( orderDiff !== 0 ) return orderDiff;
 
           return (
-            (a.associatedElementFixtureNumber || 0) -
-            (b.associatedElementFixtureNumber || 0)
+            ( a.associatedElementFixtureNumber || 0 ) -
+            ( b.associatedElementFixtureNumber || 0 )
           );
         }
 
         return 0;
-      });
+      } );
 
 
       let storeFixtureDetails = [];
-      for (let ele of storeFixturesList) {
-        let shelfDetails = await fixtureShelfService.findAndSort({ fixtureId: ele._id }, {}, { shelfNumber: 1 });
+      for ( let ele of storeFixturesList ) {
+        let shelfDetails = await fixtureShelfService.findAndSort( { fixtureId: ele._id }, {}, { shelfNumber: 1 } );
 
-        storeFixtureDetails.push({
+        storeFixtureDetails.push( {
           "Store Code": ele.storeName,
           "Wall": ele?.associatedElementNumber ?? 'floor',
           "Unique Fixture Number": 'FX - ' + ele.fixtureNumber,
@@ -15949,91 +15951,148 @@ export async function getstoreMBQFixtureExcel(req, res) {
         },
         );
       }
-      data.push(...storeFixtureDetails);
-    }));
+      data.push( ...storeFixtureDetails );
+    } ) );
 
 
     //  ------------------------------------------------
-    const originalSend = res.send.bind(res);
+    const originalSend = res.send.bind( res );
 
-    res.send = async (buffer) => {
-      const uploadDate = dayjs().format('DD-MM-YYYY');
-      const uploadTime = dayjs().format('HH-mm-ss');
+    res.send = async ( buffer ) => {
+      const uploadDate = dayjs().format( 'DD-MM-YYYY' );
+      const uploadTime = dayjs().format( 'HH-mm-ss' );
       const fileName = `mbq_${uploadTime}.xlsx`;
 
-      const tempFilePath = path.join(os.tmpdir(), fileName);
+      const tempFilePath = path.join( os.tmpdir(), fileName );
 
       try {
         // 1️⃣ Write buffer to temp file
-        fs.writeFileSync(tempFilePath, buffer);
+        fs.writeFileSync( tempFilePath, buffer );
 
         // 2️⃣ Create multipart form with REAL FILE
         const formData = new FormData();
         formData.append(
-          'file',
-          fs.createReadStream(tempFilePath),
-          fileName
+            'file',
+            fs.createReadStream( tempFilePath ),
+            fileName,
         );
 
         // 3️⃣ Upload using node-fetch
         const response = await fetch(
-          `${JSON.parse(process.env.LAMBDAURL).mbqFileUpload}` +
-          `?date=${uploadDate}&filename=${encodeURIComponent(fileName)}`,
-          {
-            method: 'POST',
-            body: formData,
-            headers: formData.getHeaders()
-          }
+            `${JSON.parse( process.env.LAMBDAURL ).mbqFileUpload}` +
+          `?date=${uploadDate}&filename=${encodeURIComponent( fileName )}`,
+            {
+              method: 'POST',
+              body: formData,
+              headers: formData.getHeaders(),
+            },
         );
 
         const resultText = await response.text();
 
-        if (response.ok) {
-          logger.info({
+        if ( response.ok ) {
+          logger.info( {
             functionName: 'MBQUploadSuccess',
             fileName,
             uploadDate,
-            result: resultText
-          });
+            result: resultText,
+          } );
         } else {
-          logger.error({
+          logger.error( {
             functionName: 'MBQUploadFailed',
             status: response.status,
             fileName,
             uploadDate,
-            result: resultText
-          });
+            result: resultText,
+          } );
         }
-
-      } catch (err) {
-        logger.error({
+      } catch ( err ) {
+        logger.error( {
           functionName: 'MBQUploadError',
           fileName,
           uploadDate,
-          error: err
-        });
+          error: err,
+        } );
       } finally {
         // 4️⃣ Cleanup temp file
-        if (fs.existsSync(tempFilePath)) {
-          fs.unlinkSync(tempFilePath);
+        if ( fs.existsSync( tempFilePath ) ) {
+          fs.unlinkSync( tempFilePath );
         }
       }
 
       // 5️⃣ Continue normal download
-      return originalSend(buffer);
+      return originalSend( buffer );
     };
 
 
     //  ------------------------------------------------
 
-    if (!data.length) {
-      return res.sendError('No data available for export', 204);
+    if ( !data.length ) {
+      return res.sendError( 'No data available for export', 204 );
     }
 
-    await download(data, res);
-  } catch (e) {
-    logger.error({ functionName: "getstoreMBQFixtureExcel", error: e });
-    return res.sendError(e, 500);
+    await download( data, res );
+  } catch ( e ) {
+    logger.error( { functionName: "getstoreMBQFixtureExcel", error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+
+export async function get4487FixtureData( req, res ) {
+  try {
+    let fixtureDetails = await storeFixtureService.find( { planoId: new mongoose.Types.ObjectId( '690b2b9dc27523201d101bbb' ), fixtureType: { $ne: 'other' } } );
+    let data = [];
+    if ( fixtureDetails.length ) {
+      for ( let fixt of fixtureDetails ) {
+        console.log( fixt );
+        let uniqueNumber = 'FX' + fixt.fixtureNumber?.toString()?.padStart( 2, '0' );
+        let inputData = {
+          Bucket: JSON.parse( process.env.BUCKET )?.storeBuilder,
+          file_path: `fixtureImage/${uniqueNumber}.jpeg`,
+        };
+        let fixtureImage = await signedUrl( inputData );
+        let headerData = {
+          Bucket: JSON.parse( process.env.BUCKET )?.storeBuilder,
+          file_path: `fixtureImage/${uniqueNumber}VM.png`,
+        };
+        let fixtureHeaderImage = await signedUrl( headerData );
+        let query = [
+          {
+            $match: {
+              fixtureId: fixt._id,
+            },
+          },
+        ];
+        let shelfDetails = await fixtureShelfService.aggregate( query );
+        for ( let section of shelfDetails ) {
+          let productDetails = await planoMappingService.find( { shelfId: section._id }, { pid: 1 } );
+          productDetails.forEach( ( product ) => {
+            if ( product.pid ) {
+              data.push( {
+                productId: product.pid,
+                storeCode: 'LKST4487',
+                fixtureId: uniqueNumber,
+                fixtureNumber: fixt.associatedElementFixtureNumber,
+                fixtureName: fixt.fixtureName,
+                fixtureTitle: fixt?.header?.label,
+                uniqueFixtureNumber: fixt.fixtureNumber,
+                fixtureHeaderImageUrl: fixtureImage,
+                fullFixtureImageUrl: fixtureHeaderImage,
+                section: fixt?.associatedElementNumber ? section.zone : 'Full',
+                shelfNumber: section.shelfNumber,
+                wallNumber: fixt?.associatedElementNumber ?? 'floor',
+                lastUpdatedAt: dayjs( fixt.updatedAt ).valueOf(),
+              } );
+            }
+          } );
+        }
+      }
+    }
+    return res.sendSuccess( data );
+  } catch ( e ) {
+    console.log( e );
+    logger.error( { functionName: 'get4487FixtureData', error: e } );
+    return res.sendError( e, 500 );
   }
 }
 

package/src/controllers/storeBuilder.controller.js

@@ -2794,7 +2794,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, updatedAt: 1, verificationStatus: 1, merchRolloutStatus: 1, vmRolloutStatus: 1, cadLayout: 1,isPlanoApproved:1 },
+              { floorName: 1, layoutPolygon: 1, planoId: 1, isEdited: 1, planoProgress: 1, updatedAt: 1, verificationStatus: 1, merchRolloutStatus: 1, vmRolloutStatus: 1, cadLayout: 1, isPlanoApproved: 1 },
           );
 
           const floorsWithFixtures = await Promise.all(
@@ -3616,7 +3616,7 @@ export async function shelfProduct( req, res ) {
       let notProperCount = shelfProducts.flatMap( ( ele ) => ele?.products.map( ( prod ) => prod?.status ) )?.filter( ( ele ) => ele != 'proper' )?.length;
 
       if ( fixtureCompliance == 100 && notProperCount ) {
-        nonProperpercentage = ( notProperCount /fixtureCompliance ) * 100;
+        let nonProperpercentage = ( notProperCount /fixtureCompliance ) * 100;
 
         fixtureCompliance = fixtureCompliance - nonProperpercentage;
       }
@@ -6063,6 +6063,12 @@ export async function planoList( req, res ) {
       }
     }
 
+    if (inputData.filter?.planoStrategy) {
+      orQuery.push({
+        planoStrategy: req.body?.filter?.planoStrategy,
+      });
+    }
+
     if ( orQuery.length ) {
       query.push( {
         $match: {
@@ -8023,6 +8029,7 @@ export async function searchProduct( req, res ) {
 export async function updateProductMapping( req, res ) {
   try {
     let storeDetails = await storeService.find( { clientId: req.body.clientId, ...( req.body.stores && { storeName: { $in: req.body.stores } } ), status: 'active' }, { storeId: 1, storeName: 1 } );
+    console.log( storeDetails, 'storeDetails' );
     if ( !storeDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
@@ -8053,9 +8060,6 @@ export async function updateProductMapping( req, res ) {
                 } else {
                   fixtureShelfDetails = fixtureDetails.find( ( fixt ) => fixt._id.toString() == getShelfDetails.fixtureId.toString() );
                 }
-                if ( macDetails?.MAC == 'A4-E8-A3-91-7F-05' ) {
-                  console.log( ele?.data?.antenna, fixtureShelfDetails?._id );
-                }
                 logger.error( { data: fixtureShelfDetails, antennaNo: ele.data.antenna, macId: ele?.data?.MAC } );
                 if ( getShelfDetails && fixtureShelfDetails ) {
                   let productDetails = await planoProductService.findOne( { productId: ele.data.idText } );
@@ -8066,7 +8070,8 @@ export async function updateProductMapping( req, res ) {
                       storeId: fixtureShelfDetails.storeId,
                       type: getShelfDetails?.shelfType != 'storage' ? 'product' : 'storageBox',
                       productId: productDetails._id,
-                      pid: productDetails.productId,
+                      rfId: productDetails.productId,
+                      pid: productDetails.pid,
                       planoId: fixtureShelfDetails.planoId,
                       floorId: fixtureShelfDetails.floorId,
                       fixtureId: fixtureShelfDetails._id,
@@ -8075,12 +8080,11 @@ export async function updateProductMapping( req, res ) {
                     mappingData.push( data );
 
                     // let mappingDetails = await planoMappingService.create( data );
-
                     let productData = {
                       'planoMappingId': '',
                       'date': dayjs().format( 'YYYY-MM-DD' ),
                       'clientId': req.body.clientId,
-                      'compliance': getShelfDetails?.shelfType != 'storage' ? getShelfDetails.productBrandName.includes( productDetails.brandName ) ? 'proper' : 'misplaced' : '',
+                      'compliance': getShelfDetails?.shelfType != 'storage' ? ( getShelfDetails.productBrandName.includes( productDetails.brandName ) || fixtureShelfDetails.templateGroupName == productDetails.brandGroup )? 'proper' : 'misplaced' : '',
                       'fixtureId': fixtureShelfDetails._id,
                       'floorId': fixtureShelfDetails.floorId,
                       'planoId': fixtureShelfDetails.planoId,
@@ -8090,6 +8094,7 @@ export async function updateProductMapping( req, res ) {
                       'storeId': fixtureShelfDetails.storeId,
                       'storeName': fixtureShelfDetails.storeName,
                       'type': getShelfDetails?.shelfType != 'storage' ? 'product' : 'storageBox',
+                      'createdAt': dayjs( response?.mac_details?.[0]?.last_modified ).format(),
                     };
                     complianceData.push( productData );
 
@@ -8113,6 +8118,114 @@ export async function updateProductMapping( req, res ) {
           }
         }
 
+        // await Promise.all( response?.mac_details?.map( async ( macDetails ) => {
+        // } ) );
+        await planoMappingService.deleteMany( { storeId: store.storeId } );
+        let mappingInsertData = await planoMappingService.insertMany( mappingData );
+        mappingInsertData = new Map( mappingInsertData.map( ( ele, index ) => [ index, ele ] ) );
+        // let date = dayjs().format();
+        complianceData.forEach( ( compliance, index ) => {
+          compliance.planoMappingId = mappingInsertData.get( index );
+          // compliance.createdAt = date;
+        } );
+        await planoComplianceService.insertMany( complianceData );
+        // const ws = xlsx.utils.json_to_sheet( excelData );
+        // const wb = xlsx.utils.book_new();
+        // xlsx.utils.book_append_sheet( wb, ws, 'data' );
+        // const buffer = xlsx.write( wb, { type: 'buffer', bookType: 'xlsx' } );
+        // fs.writeFileSync( './items.xlsx', buffer );
+      }
+    } ) );
+    return res.sendSuccess( 'Updated successfully' );
+  } catch ( e ) {
+    console.log( e );
+    logger.error( { functionName: 'updateMapping', error: e } );
+    return res.sendError( e, 500 );
+  }
+}
+
+export async function updateProductMappingNew( req, res ) {
+  try {
+    let storeDetails = await storeService.find( { clientId: req.body.clientId, ...( req.body.stores && { storeName: { $in: req.body.stores } } ), status: 'active' }, { storeId: 1, storeName: 1 } );
+    console.log( storeDetails, 'storeDetails' );
+    if ( !storeDetails.length ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    await Promise.all( storeDetails.map( async ( store ) => {
+      // let number = Number( store.storeName.replace( /\D/g, '' ) );
+      const getLatestData = await fetch(
+          JSON.parse( process.env.LAMBDAURL ).getRFIDDetails,
+          {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify( { store_name: store.storeName, date: dayjs().format( 'YYYY-MM-DD' ) } ),
+          },
+      );
+      // let getLatestData = await fetch( `${JSON.parse( process.env.LAMBDAURL )?.getRFIDDetails}`, { method: 'POST' },{} );
+      if ( getLatestData.status == 200 ) {
+        let response = await getLatestData.json();
+        logger.error( { data: response } );
+        // let data = response.mac_details.flatMap( ( ele ) => ele.body );
+        let mappingData = [];
+        let complianceData = [];
+        let excelData = [];
+        await Promise.all( response.map( async ( ele ) => {
+          let fixtureTemplate = await storeFixtureService.findOne( { _id: ele?.fixtureId }, { templateGroupName: 1 } );
+          let productDetails = await planoProductService.find( { productId: { $in: ele.final_idText } } );
+          if ( productDetails.length ) {
+            for ( let product of productDetails ) {
+              let data = {
+                clientId: req.body.clientId,
+                storeName: store.storeName,
+                storeId: store.storeId,
+                type: ele?.shelfType != 'storage' ? 'product' : 'storageBox',
+                productId: product._id,
+                pid: productDetails.pid,
+                rfId: product.productId,
+                planoId: new mongoose.Types.ObjectId( ele?.planoId ),
+                floorId: new mongoose.Types.ObjectId( ele?.floorId ),
+                fixtureId: new mongoose.Types.ObjectId( ele?.fixtureId ),
+                ...( ele?.shelfType && { shelfId: new mongoose.Types.ObjectId( ele?._id ) } ),
+              };
+              mappingData.push( data );
+
+              // let mappingDetails = await planoMappingService.create( data );
+              let productData = {
+                'planoMappingId': '',
+                'date': dayjs().format( 'YYYY-MM-DD' ),
+                'clientId': req.body.clientId,
+                'compliance': ele?.shelfType != 'storage' ? ( ele.productBrandName.split( ',' ).includes( product.brandName ) || fixtureTemplate.templateGroupName == product.brandGroup )? 'proper' : 'misplaced' : '',
+                'fixtureId': ele.fixtureId,
+                'floorId': ele.floorId,
+                'planoId': ele.planoId,
+                'productId': product._id,
+                'rfId': ele.idHex,
+                'shelfId': ele._id,
+                'storeId': store.storeId,
+                'storeName': store.storeName,
+                'type': ele?.shelfType != 'storage' ? 'product' : 'storageBox',
+              };
+              complianceData.push( productData );
+
+
+              excelData.push( {
+                wallNumber: ele.wallNo ?? '',
+                fixtureNumber: ele.fixtureNo,
+                fixtureId: ele.fixtureId.toString(),
+                readerId: ele?.mac,
+                antennaNo: ele.antennaNo.toString(),
+                pid: ele.final_idText,
+                productName: product?.brandName,
+                shelfId: ele?.shelfNumber ?? 'storage',
+              } );
+            }
+
+            // await planoComplianceService.create( productData );
+          } else {
+            logger.error( { data: 'pid mapping is missing', pid: ele?.final_idText } );
+          }
+        } ) );
+
         // await Promise.all( response?.mac_details?.map( async ( macDetails ) => {
         // } ) );
         await planoMappingService.deleteMany( { storeId: store.storeId } );
@@ -8568,6 +8681,7 @@ export async function getPlanogramList( req, res ) {
         $match: {
           clientId,
           storeId: { $in: allowedStoreIds },
+          ...(filter?.planoStrategy ? { planoStrategy: filter?.planoStrategy } : {}),
         },
       },
       { $sort: { _id: -1 } },
@@ -8667,6 +8781,7 @@ export async function getPlanogramList( req, res ) {
       },
     ];
 
+
     if ( filter?.compliance?.length === 2 ) {
       const [ minC, maxC ] = filter.compliance.map( Number );
       pipeline.push( {
@@ -9247,6 +9362,7 @@ export async function getShelfDetails( req, res ) {
           associatedElementNumber: 1,
           associatedElementFixtureNumber: 1,
           label: '$header.label',
+          storage: '$footer.antennaNo',
         },
       },
     ];
@@ -9257,10 +9373,15 @@ export async function getShelfDetails( req, res ) {
     let shelfDetails = await fixtureShelfService.findOne( { fixtureId: { $in: fixtureDetails.map( ( ele ) => ele._id ) }, antennaNo: { $in: [ req.body?.antenna ] } } );
 
     if ( !shelfDetails ) {
-      return res.sendError( 'No antenna found', 204 );
+      fixtureDetails = fixtureDetails.find( ( ele ) => ele.storage.includes( req.body?.antenna ) );
+      if ( !fixtureDetails ) {
+        return res.sendError( 'No antenna found', 204 );
+      }
+    }
+    if ( shelfDetails ) {
+      fixtureDetails = fixtureDetails.find( ( ele ) => ele._id.toString() == shelfDetails.fixtureId.toString() );
     }
-    fixtureDetails = fixtureDetails.find( ( ele ) => ele._id.toString() == shelfDetails.fixtureId.toString() );
-    return res.sendSuccess( { ...shelfDetails.toObject(), associatedElementNumber: fixtureDetails?.associatedElementNumber, associatedElementFixtureNumber: fixtureDetails?.associatedElementFixtureNumber, isCl: fixtureDetails.label == 'CL' } );
+    return res.sendSuccess( { ...shelfDetails?.toObject(), associatedElementNumber: fixtureDetails?.associatedElementNumber, associatedElementFixtureNumber: fixtureDetails?.associatedElementFixtureNumber, isCl: fixtureDetails.label == 'CL', ...( !shelfDetails && { antennaNo: fixtureDetails?.storage } ) } );
   } catch ( e ) {
     logger.error( { functionName: 'getShelfDetails', error: e } );
     return res.sendError( e, 500 );

package/src/routes/script.routes.js

@@ -52,4 +52,5 @@ scriptRouter
     .post( '/update4487Inventory', scriptController.update4487Inventory )
     .get( '/4487FixtureDetails', scriptController.get4487FixtureDetails )
     .post( '/getstoreMBQFixtureExcel', scriptController.getstoreMBQFixtureExcel )
+    .get( '/get4487FixtureData', scriptController.get4487FixtureData )
 ;