tango-app-api-store-builder 1.0.43 → 1.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.43",
+    "version": "1.0.45",
     "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.26",
+        "tango-api-schema": "^2.5.34",
         "tango-app-api-middleware": "3.1.48",
         "url": "^0.11.4",
         "winston": "^3.17.0",

package/src/controllers/planoLibrary.controller.js

@@ -940,74 +940,74 @@ export async function getVmLibList( req, res ) {
 
     const query = [
       { $match: matchStage },
-      {
-        $lookup: {
-          from: 'fixtureconfigs',
-          let: { libraryId: '$_id' },
-          pipeline: [
-            {
-              $match: {
-                $expr: {
-                  $in: [ '$$libraryId', { $ifNull: [ '$vmConfig.vmId', [] ] } ],
-                },
-              },
-            },
-            {
-              $group: {
-                _id: null,
-                templateIds: { $addToSet: '$_id' },
-              },
-            },
-          ],
-          as: 'fixtureTemplate',
-        },
-      },
-      {
-        $set: {
-          templateId: { $ifNull: [ { $arrayElemAt: [ '$fixtureTemplate.templateIds', 0 ] }, [] ] },
-        },
-      },
-      {
-        $lookup: {
-          from: 'storefixtures',
-          localField: 'templateId',
-          foreignField: 'fixtureConfigId',
-          as: 'storeFixtureDetails',
-        },
-      },
-      {
-        $set: {
-          planoId: {
-            $setUnion: [
-              { $map: { input: '$storeFixtureDetails', as: 'sf', in: '$$sf.planoId' } },
-              [],
-            ],
-          },
-          templateCount: { $size: '$templateId' },
-        },
-      },
-      {
-        $lookup: {
-          from: 'planograms',
-          let: { planoIds: '$planoId' },
-          pipeline: [
-            {
-              $match: {
-                $expr: {
-                  $in: [ '$_id', { $ifNull: [ '$$planoIds', [] ] } ],
-                },
-              },
-            },
-            {
-              $group: {
-                _id: null,
-                statusList: { $push: '$status' },
-              },
-            },
-          ],
-          as: 'planoStatus',
-        },
-      },
+      // {
+      //   $lookup: {
+      //     from: 'fixtureconfigs',
+      //     let: { libraryId: '$_id' },
+      //     pipeline: [
+      //       {
+      //         $match: {
+      //           $expr: {
+      //             $in: [ '$$libraryId', { $ifNull: [ '$vmConfig.vmId', [] ] } ],
+      //           },
+      //         },
+      //       },
+      //       {
+      //         $group: {
+      //           _id: null,
+      //           templateIds: { $addToSet: '$_id' },
+      //         },
+      //       },
+      //     ],
+      //     as: 'fixtureTemplate',
+      //   },
+      // },
+      // {
+      //   $set: {
+      //     templateId: { $ifNull: [ { $arrayElemAt: [ '$fixtureTemplate.templateIds', 0 ] }, [] ] },
+      //   },
+      // },
+      // {
+      //   $lookup: {
+      //     from: 'storefixtures',
+      //     localField: 'templateId',
+      //     foreignField: 'fixtureConfigId',
+      //     as: 'storeFixtureDetails',
+      //   },
+      // },
+      // {
+      //   $set: {
+      //     planoId: {
+      //       $setUnion: [
+      //         { $map: { input: '$storeFixtureDetails', as: 'sf', in: '$$sf.planoId' } },
+      //         [],
+      //       ],
+      //     },
+      //     templateCount: { $size: '$templateId' },
+      //   },
+      // },
+      // {
+      //   $lookup: {
+      //     from: 'planograms',
+      //     let: { planoIds: '$planoId' },
+      //     pipeline: [
+      //       {
+      //         $match: {
+      //           $expr: {
+      //             $in: [ '$_id', { $ifNull: [ '$$planoIds', [] ] } ],
+      //           },
+      //         },
+      //       },
+      //       {
+      //         $group: {
+      //           _id: null,
+      //           statusList: { $push: '$status' },
+      //         },
+      //       },
+      //     ],
+      //     as: 'planoStatus',
+      //   },
+      // },
       {
         $project: {
           vmName: 1,
@@ -1020,29 +1020,31 @@ export async function getVmLibList( req, res ) {
           vmWidth: 1,
           vmImageUrl: 1,
           isDoubleSided: 1,
-          templateId: 1,
-          planoId: 1,
           vmLibCode: 1,
           vmSubCategory: 1,
-          planoStatus: { $ifNull: [ { $arrayElemAt: [ '$planoStatus.statusList', 0 ] }, [] ] },
-          templateCount: 1,
-          status: {
-            $cond: {
-              if: { $and: [ { $in: [ 'completed', { $ifNull: [ { $arrayElemAt: [ '$planoStatus.statusList', 0 ] }, [] ] } ] }, { $gt: [ { $size: '$templateId' }, 0 ] } ] },
-              then: 'active',
-              else: {
-                $cond: {
-                  if: {
-                    $eq: [
-                      '$status', 'draft',
-                    ],
-                  },
-                  then: 'draft',
-                  else: 'inactive',
-                },
-              },
-            },
-          },
+          // templateId: 1,
+          // planoId: 1,
+          // vmLibCode: 1,
+          // vmSubCategory: 1,
+          // planoStatus: { $ifNull: [ { $arrayElemAt: [ '$planoStatus.statusList', 0 ] }, [] ] },
+          // templateCount: 1,
+          // status: {
+          //   $cond: {
+          //     if: { $and: [ { $in: [ 'completed', { $ifNull: [ { $arrayElemAt: [ '$planoStatus.statusList', 0 ] }, [] ] } ] }, { $gt: [ { $size: '$templateId' }, 0 ] } ] },
+          //     then: 'active',
+          //     else: {
+          //       $cond: {
+          //         if: {
+          //           $eq: [
+          //             '$status', 'draft',
+          //           ],
+          //         },
+          //         then: 'draft',
+          //         else: 'inactive',
+          //       },
+          //     },
+          //   },
+          // },
         },
       },
     ];
@@ -1081,6 +1083,21 @@ export async function getVmLibList( req, res ) {
     if ( !req.body.export && !fixtureDetails[0]?.fixtureData.length ) {
       return res.sendError( 'No data found', 204 );
     }
+    fixtureDetails[0].fixtureData = await Promise.all( fixtureDetails[0].fixtureData.map( async ( vm ) => {
+      let getMappedTemplates = await fixtureTemplateService.find( { 'vmConfig.vmId': vm._id } );
+      let getMapppedFixtureDetails = await storeFixtureService.find( { fixtureConfigId: { $in: getMappedTemplates.map( ( temp ) => temp._id ) } } );
+
+      let data = {
+
+        templateId: getMappedTemplates.map( ( temp ) => ele?._id ),
+        planoId: getMapppedFixtureDetails.map( ( plano ) => plano.planoId ),
+        planoStatus: 'incomplete',
+        status: 'inactive',
+
+      };
+
+      return { ...vm, ...data };
+    } ) );
     let result = {
       count: fixtureDetails[0].count[0].total,
       data: fixtureDetails[0].fixtureData,

package/src/controllers/script.controller.js

@@ -15445,7 +15445,7 @@ export async function insertAntennaMappingData( req, res ) {
     const antennaMapingData = [
       {
         "fixtureNumber": 14,
-        "readerId": "a4:e8:a3:91:7f:01",
+        "readerId": "A4-E8-A3-91-7F-01",
         "storageBoxAntennaNo": [ 1, 2, 3, 6, 7 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 18 ] },
@@ -15460,7 +15460,7 @@ export async function insertAntennaMappingData( req, res ) {
       },
       {
         "fixtureNumber": 15,
-        "readerId": "a4:e8:a3:91:7f:01",
+        "readerId": "A4-E8-A3-91-7F-01",
         "storageBoxAntennaNo": [ 8, 9, 11, 13, 14 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 26 ] },
@@ -15476,7 +15476,7 @@ export async function insertAntennaMappingData( req, res ) {
       {
         "fixtureNumber": 3,
         "wallNumber": 1,
-        "readerId": "a4:e8:a3:91:7f:01",
+        "readerId": "A4-E8-A3-91-7E-FD",
         "storageBoxAntennaNo": [ 25, 26, 27, 28, 29 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 15 ] },
@@ -15490,7 +15490,7 @@ export async function insertAntennaMappingData( req, res ) {
       {
         "fixtureNumber": 4,
         "wallNumber": 1,
-        "readerId": "a4:e8:a3:91:7f:01",
+        "readerId": "A4-E8-A3-91-7E-FD",
         "storageBoxAntennaNo": [ 5, 6, 9, 13 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 4 ] },
@@ -15503,12 +15503,12 @@ export async function insertAntennaMappingData( req, res ) {
       },
       {
         "fixtureNumber": 5,
-        "readerId": "a4:e8:a3:91:7f:03",
+        "readerId": "A4-E8-A3-91-7F-03",
         "storageBoxAntennaNo": [ 2, 5, 6, 7, 3 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 10 ] },
           { "shelfNumber": 2, "antennaNo": [ 11 ] },
-          { "shelfNumber": 3, "antennaNo": [ 9, 16 ] },
+          { "shelfNumber": 3, "antennaNo": [ 22, 23 ] },
           { "shelfNumber": 4, "antennaNo": [ 20, 21 ] },
           { "shelfNumber": 5, "antennaNo": [ 18, 19 ] },
           { "shelfNumber": 6, "antennaNo": [ 25, 30 ] },
@@ -15516,12 +15516,12 @@ export async function insertAntennaMappingData( req, res ) {
       },
       {
         "fixtureNumber": 6,
-        "readerId": "a4:e8:a3:91:7f:03",
+        "readerId": "A4-E8-A3-91-7F-03",
         "storageBoxAntennaNo": [ 26, 27, 28, 29, 31 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 24 ] },
           { "shelfNumber": 2, "antennaNo": [ 17 ] },
-          { "shelfNumber": 3, "antennaNo": [ 22, 23 ] },
+          { "shelfNumber": 3, "antennaNo": [ 9, 16 ] },
           { "shelfNumber": 4, "antennaNo": [ 12, 13 ] },
           { "shelfNumber": 5, "antennaNo": [ 14, 15 ] },
           { "shelfNumber": 6, "antennaNo": [ 1, 4 ] },
@@ -15529,7 +15529,7 @@ export async function insertAntennaMappingData( req, res ) {
       },
       {
         "fixtureNumber": 1,
-        "readerId": "a4:e8:a3:91:7f:00",
+        "readerId": "A4-E8-A3-91-7F-00",
         "storageBoxAntennaNo": [ 18, 19, 20, 21, 22 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 28 ] },
@@ -15543,7 +15543,7 @@ export async function insertAntennaMappingData( req, res ) {
       {
         "fixtureNumber": 2,
         "wallNumber": 1,
-        "readerId": "a4:e8:a3:91:7f:00",
+        "readerId": "A4-E8-A3-91-7F-00",
         "storageBoxAntennaNo": [ 7, 8, 9, 10, 11 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 3 ] },
@@ -15557,7 +15557,7 @@ export async function insertAntennaMappingData( req, res ) {
       {
         "fixtureNumber": 11,
         "wallNumber": 3,
-        "readerId": "a4:e8:a3:91:7f:02",
+        "readerId": "A4-E8-A3-91-7F-02",
         "storageBoxAntennaNo": [ 8, 9, 12, 13, 14 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 15 ] },
@@ -15573,7 +15573,7 @@ export async function insertAntennaMappingData( req, res ) {
       {
         "fixtureNumber": 9,
         "wallNumber": 3,
-        "readerId": "a4:e8:a3:91:7f:04",
+        "readerId": "A4-E8-A3-91-7F-04",
         "storageBoxAntennaNo": [ 17, 18, 19, 20, 21 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 13 ] },
@@ -15588,7 +15588,7 @@ export async function insertAntennaMappingData( req, res ) {
       },
       {
         "fixtureNumber": 10,
-        "readerId": "a4:e8:a3:91:7f:04",
+        "readerId": "A4-E8-A3-91-7F-04",
         "storageBoxAntennaNo": [ 1, 2, 3, 4, 5 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 26 ] },
@@ -15604,7 +15604,7 @@ export async function insertAntennaMappingData( req, res ) {
       {
         "fixtureNumber": 12,
         "wallNumber": 3,
-        "readerId": "a4:e8:a3:91:7f:04",
+        "readerId": "A4-E8-A3-91-7E-FE",
         "storageBoxAntennaNo": [ 14, 15, 16, 17, 18 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 13 ] },
@@ -15612,15 +15612,15 @@ export async function insertAntennaMappingData( req, res ) {
           { "shelfNumber": 3, "antennaNo": [ 10 ] },
           { "shelfNumber": 4, "antennaNo": [ 8 ] },
           { "shelfNumber": 5, "antennaNo": [ 12 ] },
-          { "shelfNumber": 6, "antennaNo": [ 9 ] },
-          { "shelfNumber": 7, "antennaNo": [ 4 ] },
+          { "shelfNumber": 6, "antennaNo": [ 4 ] },
+          { "shelfNumber": 7, "antennaNo": [ 9 ] },
           { "shelfNumber": 8, "antennaNo": [ 3 ] },
         ],
       },
       {
         "fixtureNumber": 13,
         "wallNumber": 3,
-        "readerId": "a4:e8:a3:91:7f:04",
+        "readerId": "A4-E8-A3-91-7E-FE",
         "storageBoxAntennaNo": [ 1, 2, 5, 6, 7 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 25 ] },
@@ -15636,7 +15636,7 @@ export async function insertAntennaMappingData( req, res ) {
       {
         "fixtureNumber": 7,
         "wallNumber": 2,
-        "readerId": "a4:e8:a3:8e:85:43",
+        "readerId": "A4-E8-A3-8E-85-43",
         "storageBoxAntennaNo": [ 7 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 6 ] },
@@ -15651,7 +15651,7 @@ export async function insertAntennaMappingData( req, res ) {
       {
         "fixtureNumber": 8,
         "wallNumber": 2,
-        "readerId": "a4:e8:a3:8e:85:43",
+        "readerId": "A4-E8-A3-8E-85-43",
         "storageBoxAntennaNo": [ 9, 10, 11, 12, 13 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 21 ] },
@@ -15779,11 +15779,14 @@ export async function insertAntennaMappingData( req, res ) {
               shelfNumber: shelfNumber,
             } );
 
+            console.log( shelf );
+
             if ( shelf ) {
-              await fixtureShelfService.updateOne(
+              let data = await fixtureShelfService.updateOne(
                   { _id: shelf._id },
                   { antennaNo: antennaNo },
               );
+              console.log( data );
               console.log( `Updated fixture ${fixtureNumber}, shelf ${shelfNumber} with antennaNo:`, antennaNo );
             } else {
               const errorMsg = `Shelf not found for fixture ${fixtureNumber}, shelfNumber: ${shelfNumber}`;
@@ -15865,3 +15868,69 @@ export async function get4487FixtureDetails( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function getstoreMBQFixtureExcel( req, res ) {
+  try {
+    if ( !req.body?.storeName ) {
+      return res.sendError( 'storeName is required', 400 );
+    }
+    let getStoreDetails = await storeService.find( { storeName: { $in: req.body.storeName }, status: 'active', clientId: '11' }, { storeProfile: 1, storeName: 1 } );
+    if ( !getStoreDetails.length ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    let data = [];
+    let sortOrder = [ 5, 1, 2, 3, 4 ];
+    await Promise.all( getStoreDetails.map( async ( store ) => {
+      let storeFixturesList = await storeFixtureService.findAndSort( { storeName: store.storeName }, {}, { fixtureNumber: 1, associatedElementNumber: 1, associatedElementFixtureNumber: 1 } );
+      storeFixturesList.sort( ( a, b ) => {
+        const floorDiff = b.floorId.toString().localeCompare( a.floorId.toString() );
+        if ( floorDiff !== 0 ) return floorDiff;
+
+        if ( a.fixtureType !== b.fixtureType ) {
+          return a.fixtureType === "wall" ? -1 : 1;
+        }
+
+        if ( a.fixtureType === "wall" ) {
+          const orderDiff =
+      sortOrder.indexOf( a.associatedElementNumber ) -
+      sortOrder.indexOf( b.associatedElementNumber );
+
+          if ( orderDiff !== 0 ) return orderDiff;
+
+          return (
+            ( 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 } );
+
+        storeFixtureDetails.push( {
+          "Store Code": ele.storeName,
+          "Wall": ele?.associatedElementNumber ?? 'floor',
+          "Unique Fixture Number": 'FX - ' + ele.fixtureNumber,
+          "Brand-Category": ele.header?.label,
+          "Fixture Type": ele.fixtureCategory,
+          "Fixture Size": ele.fixtureWidth.value +' '+ ele.fixtureWidth.unit,
+          "Shelves/ Rods/ Space per Fixture": shelfDetails.length,
+          'Display per Shelf/ Rod/ Space': shelfDetails?.[0]?.productPerShelf,
+          'Fixture Capacity': ele?.fixtureCapacity,
+        },
+        );
+      }
+      data.push( ...storeFixtureDetails );
+    } ) );
+    // for ( let store of getStoreDetails ) {
+    // }
+    await download( data, res );
+  } catch ( e ) {
+    console.log( e );
+    return res.sendError( e, 500 );
+  }
+}

package/src/controllers/storeBuilder.controller.js

@@ -27,8 +27,8 @@ import * as fixtureConfigDuplicateService from '../service/fixtureConfigDuplicat
 import * as planoVmDuplicateService from '../service/planoVmDuplicate.service.js';
 import advancedFormat from 'dayjs/plugin/advancedFormat.js';
 import * as planoRevisionService from '../service/planoRevision.service.js';
-// import xlsx from 'xlsx';
-// import fs from 'fs';
+import xlsx from 'xlsx';
+import fs from 'fs';
 
 dayjs.extend( advancedFormat );
 dayjs.extend( utc );
@@ -3617,9 +3617,19 @@ export async function shelfProduct( req, res ) {
 
       let fixtureCompliance = Math.floor( ( properCount / fixture.fixtureCapacity ) * 100 );
 
+      fixtureCompliance = fixtureCompliance > 100 ? 100 : fixtureCompliance;
+
+      let notProperCount = shelfProducts.flatMap( ( ele ) => ele?.products.map( ( prod ) => prod?.status ) )?.filter( ( ele ) => ele != 'proper' )?.length;
+
+      if ( fixtureCompliance == 100 && notProperCount ) {
+        nonProperpercentage = ( notProperCount /fixtureCompliance ) * 100;
+
+        fixtureCompliance = fixtureCompliance - nonProperpercentage;
+      }
+
       let storageProducts = await planoMappingService.find( { fixtureId: new mongoose.Types.ObjectId( fixtureId ), type: 'storageBox' } );
       storageProducts = await getProducts( storageProducts );
-      return res.sendSuccess( { ...fixture, shelves: shelfProducts, vmConfig: vmDetails, productCount: productCount, storageProducts: storageProducts, fixtureImage: fixtureImage, fixtureCompliance } );
+      return res.sendSuccess( { ...fixture, shelves: shelfProducts, vmConfig: vmDetails, productCount: productCount, storageProducts: storageProducts, fixtureImage: fixtureImage, fixtureCompliance: fixtureCompliance > 100 ? 100 : fixtureCompliance } );
     }
 
     return res.sendError( 'Incorrect resolution level', 400 );
@@ -8047,6 +8057,9 @@ 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 } );
@@ -8132,6 +8145,7 @@ export async function updateProductMapping( req, res ) {
 
 export async function calculateCompliance( req, res ) {
   try {
+    let clFixtures = await storeFixtureService.findOne( { 'header.label': 'CL' }, { _id: 1 } );
     let query = [
       {
         $match: {
@@ -8140,6 +8154,7 @@ export async function calculateCompliance( req, res ) {
           storeName: req.body.storeName,
           compliance: 'proper',
           date: new Date( dayjs().format( 'YYYY-MM-DD' ) ),
+          fixtureId: { $ne: clFixtures._id },
         },
       },
       {
@@ -9233,6 +9248,9 @@ export async function getShelfDetails( req, res ) {
       {
         $project: {
           _id: 1,
+          associatedElementNumber: 1,
+          associatedElementFixtureNumber: 1,
+          label: '$header.label',
         },
       },
     ];
@@ -9245,7 +9263,8 @@ export async function getShelfDetails( req, res ) {
     if ( !shelfDetails ) {
       return res.sendError( 'No antenna found', 204 );
     }
-    return res.sendSuccess( shelfDetails );
+    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' } );
   } catch ( e ) {
     logger.error( { functionName: 'getShelfDetails', error: e } );
     return res.sendError( e, 500 );

package/src/routes/script.routes.js

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