tango-app-api-store-builder 1.0.55 → 1.0.56

package/package.json

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

package/src/controllers/script.controller.js

@@ -1,7 +1,7 @@
 /* eslint-disable quotes */
 // import { writeFileSync } from 'fs';
 import xlsx from 'xlsx';
-import { logger, fileUpload, download } from 'tango-app-api-middleware';
+import { logger, fileUpload, download, chunkArray } from 'tango-app-api-middleware';
 import * as storeBuilderService from '../service/storeBuilder.service.js';
 import * as storeService from '../service/store.service.js';
 import * as planoService from '../service/planogram.service.js';
@@ -15650,7 +15650,7 @@ export async function insertAntennaMappingData( req, res ) {
           { "shelfNumber": 2, "antennaNo": [ 8 ] },
           { "shelfNumber": 3, "antennaNo": [ 5 ] },
           { "shelfNumber": 4, "antennaNo": [ 4 ] },
-          { "shelfNumber": 5, "antennaNo": [ 3 ] },
+          { "shelfNumber": 5, "antennaNo": [ 22 ] },
           { "shelfNumber": 6, "antennaNo": [ 2 ] },
           { "shelfNumber": 7, "antennaNo": [ 1 ] },
         ],
@@ -15662,7 +15662,7 @@ export async function insertAntennaMappingData( req, res ) {
         "storageBoxAntennaNo": [ 9, 10, 11, 12, 13 ],
         "shelfConfig": [
           { "shelfNumber": 1, "antennaNo": [ 21 ] },
-          { "shelfNumber": 2, "antennaNo": [ 22 ] },
+          { "shelfNumber": 2, "antennaNo": [ 25 ] },
           { "shelfNumber": 3, "antennaNo": [ 18, 24 ] },
           { "shelfNumber": 4, "antennaNo": [ 19, 20 ] },
           { "shelfNumber": 5, "antennaNo": [ 14, 15 ] },
@@ -15671,66 +15671,66 @@ export async function insertAntennaMappingData( req, res ) {
         ],
       },
       {
-        "fixtureNumber": 16,
+        "fixtureNumber": 18,
         "readerId": "A4-E8-A3-91-7E-FC",
-        "storageBoxAntennaNo": [ 11, 14, 8 ],
+        "storageBoxAntennaNo": [ 13, 10, 2 ],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 15 ] },
-          { "shelfNumber": 2, "antennaNo": [ 12, 18 ] },
-          { "shelfNumber": 3, "antennaNo": [ 9, 10 ] },
+          { "shelfNumber": 1, "antennaNo": [ 24, 9 ] },
+          { "shelfNumber": 2, "antennaNo": [ 12, 11 ] },
+          { "shelfNumber": 3, "antennaNo": [ 20, 25 ] },
         ],
       },
       {
-        "fixtureNumber": 17,
+        "fixtureNumber": 20,
         "readerId": "A4-E8-A3-91-7E-FC",
-        "storageBoxAntennaNo": [ 2, 3, 1 ],
+        "storageBoxAntennaNo": [ 3, 15, 1 ],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 5, 16 ] },
-          { "shelfNumber": 2, "antennaNo": [ 4, 13 ] },
-          { "shelfNumber": 3, "antennaNo": [ 17, 7 ] },
+          { "shelfNumber": 1, "antennaNo": [ 5, 18 ] },
+          { "shelfNumber": 2, "antennaNo": [ 7, 17 ] },
+          { "shelfNumber": 3, "antennaNo": [ 4, 16 ] },
         ],
       },
       {
-        "fixtureNumber": 19,
+        "fixtureNumber": 21,
         "readerId": "A4-E8-A3-91-7E-FC",
         "storageBoxAntennaNo": [],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 28, 29 ] },
-          { "shelfNumber": 2, "antennaNo": [ 19, 25 ] },
-          { "shelfNumber": 3, "antennaNo": [ 26, 27 ] },
+          { "shelfNumber": 1, "antennaNo": [ 26, 22 ] },
+          { "shelfNumber": 2, "antennaNo": [ 19, 23 ] },
+          { "shelfNumber": 3, "antennaNo": [ 14, 18 ] },
         ],
       },
       {
-        "fixtureNumber": 18,
+        "fixtureNumber": 17,
         "wallNumber": null,
         "readerId": "A4-E8-A3-91-7F-05",
-        "storageBoxAntennaNo": [ 17, 18, 23, 24 ],
+        "storageBoxAntennaNo": [ 20, 18, 3 ],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 21, 22 ] },
-          { "shelfNumber": 2, "antennaNo": [ 25, 27 ] },
-          { "shelfNumber": 3, "antennaNo": [ 19, 20 ] },
+          { "shelfNumber": 1, "antennaNo": [ 17, 25 ] },
+          { "shelfNumber": 2, "antennaNo": [ 10, 15 ] },
+          { "shelfNumber": 3, "antennaNo": [ 6, 19 ] },
         ],
       },
       {
-        "fixtureNumber": 20,
+        "fixtureNumber": 16,
         "wallNumber": null,
         "readerId": "A4-E8-A3-91-7F-05",
-        "storageBoxAntennaNo": [ 8, 2, 3, 29 ],
+        "storageBoxAntennaNo": [ 8, 2, 21, 27, 32 ],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 10, 11 ] },
-          { "shelfNumber": 2, "antennaNo": [ 7, 15 ] },
-          { "shelfNumber": 3, "antennaNo": [ 5, 16 ] },
+          { "shelfNumber": 1, "antennaNo": [ 22, 11 ] },
+          { "shelfNumber": 2, "antennaNo": [ 4, 16 ] },
+          { "shelfNumber": 3, "antennaNo": [ 9, 28 ] },
         ],
       },
       {
-        "fixtureNumber": 21,
+        "fixtureNumber": 19,
         "wallNumber": null,
         "readerId": "A4-E8-A3-91-7F-05",
         "storageBoxAntennaNo": [],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 12, 4 ] },
-          { "shelfNumber": 2, "antennaNo": [ 9, 14 ] },
-          { "shelfNumber": 3, "antennaNo": [ 1, 13 ] },
+          { "shelfNumber": 1, "antennaNo": [ 12, 1 ] },
+          { "shelfNumber": 2, "antennaNo": [ 23, 14 ] },
+          { "shelfNumber": 3, "antennaNo": [ 13, 29 ] },
         ],
       },
 
@@ -15759,7 +15759,7 @@ export async function insertAntennaMappingData( req, res ) {
         if ( readerId ) {
           await storeFixtureService.updateOne(
               { _id: fixtureId },
-              { $set: { readerId: readerId } },
+              { readerId: readerId },
           );
           console.log( `Updated fixture ${fixtureNumber} readerId:`, readerId );
         }
@@ -16044,7 +16044,6 @@ export async function get4487FixtureData( req, res ) {
     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,
@@ -16065,19 +16064,20 @@ export async function get4487FixtureData( req, res ) {
         ];
         let shelfDetails = await fixtureShelfService.aggregate( query );
         for ( let section of shelfDetails ) {
-          let productDetails = await planoMappingService.find( { shelfId: section._id }, { pid: 1 } );
+          let productDetails = await planoMappingService.find( { shelfId: section._id }, { pid: 1, barCode: 1 } );
           productDetails.forEach( ( product ) => {
-            if ( product.pid ) {
+            if ( product.pid != '0' ) {
               data.push( {
                 productId: product.pid,
                 storeCode: 'LKST4487',
+                barCode: product.barCode,
                 fixtureId: uniqueNumber,
-                fixtureNumber: fixt.associatedElementFixtureNumber,
-                fixtureName: fixt.fixtureName,
+                // fixtureNumber: fixt.associatedElementFixtureNumber,
+                // fixtureName: fixt.fixtureName,
                 fixtureTitle: fixt?.header?.label,
-                uniqueFixtureNumber: fixt.fixtureNumber,
-                fixtureHeaderImageUrl: fixtureImage,
-                fullFixtureImageUrl: fixtureHeaderImage,
+                // uniqueFixtureNumber: fixt.fixtureNumber,
+                fixtureHeaderImageUrl: fixt.fixtureType == 'floor' ? fixtureImage: fixtureHeaderImage,
+                fullFixtureImageUrl: fixtureImage,
                 section: fixt?.associatedElementNumber ? section.zone : 'Full',
                 shelfNumber: section.shelfNumber,
                 wallNumber: fixt?.associatedElementNumber ?? 'floor',
@@ -16088,7 +16088,23 @@ export async function get4487FixtureData( req, res ) {
         }
       }
     }
-    return res.sendSuccess( data );
+
+    const fetchWithCookies = fetchCookie( fetch );
+    let splitArray = await chunkArray( data, 50 );
+    for ( let chunk of splitArray ) {
+      let uploadData = await fetchWithCookies( `https://api-gateway.juno.lenskart.com/v2/lenskart-personalize/fixture-mappings/bulk`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Cookie': '__cf_bm=MkKoKWIxlAN21LorpSTh6yRib4s2TL_RFWTLDAdNA0I-1769622733-1.0.1.1-5KpHJzGgnbtf01g7DoWkWUlTMLssLy1qKcfj4avp_R7E6Q6gvda.1NblcCfBdqCcKJ.GhiTRx1hcqhVmVZq4X3j6.gt4LGo4vYX9YjpN2O4',
+        },
+        body: JSON.stringify( { data: chunk } ),
+      } );
+
+      console.log( uploadData );
+    }
+
+    return res.sendSuccess( chunkArray );
   } catch ( e ) {
     console.log( e );
     logger.error( { functionName: 'get4487FixtureData', error: e } );

package/src/controllers/storeBuilder.controller.js

@@ -8245,7 +8245,7 @@ export async function updateProductMappingNew( req, res ) {
                 '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' : '',
+                'compliance': ele?.shelfType != 'storage' ? ( ele?.productBrandName?.split( ',' )?.map( ( element ) => element.trim() )?.includes( product?.brandName ) || fixtureTemplate?.templateGroupName == product?.brandGroup )? 'proper' : 'misplaced' : '',
                 'fixtureId': ele?.fixtureId,
                 'floorId': ele?.floorId,
                 'planoId': ele?.planoId,
@@ -8304,14 +8304,13 @@ export async function updateProductMappingNew( req, res ) {
 
 export async function calculateCompliance( req, res ) {
   try {
-    let clFixtures = await storeFixtureService.findOne( { 'header.label': 'CL' }, { _id: 1 } );
+    let clFixtures = await storeFixtureService.findOne( { 'planoId': req.body.planoId, 'floorId': req.body.floorId, 'header.label': 'CL' }, { _id: 1 } );
     let query = [
       {
         $match: {
           planoId: new mongoose.Types.ObjectId( req.body.planoId ),
           floorId: new mongoose.Types.ObjectId( req.body.floorId ),
           storeName: req.body.storeName,
-          compliance: 'proper',
           date: new Date( dayjs().format( 'YYYY-MM-DD' ) ),
           fixtureId: { $ne: clFixtures._id },
         },
@@ -8319,7 +8318,6 @@ export async function calculateCompliance( req, res ) {
       {
         $group: {
           _id: '$createdAt',
-          count: { $sum: 1 },
         },
       },
       {
@@ -8406,7 +8404,23 @@ export async function calculateCompliance( req, res ) {
       },
     ];
     let getCompliance = await planoComplianceService.aggregate( query );
+    let fixtureDetails = await storeFixtureService.find( { planoId: new mongoose.Types.ObjectId( req.body.planoId ), floorId: new mongoose.Types.ObjectId( req.body.floorId ), _id: { $ne: clFixtures._id }, fixtureType: { $ne: 'other' } }, { _id: 1, fixtureCapacity: 1 } );
+
+    getCompliance = await Promise.all( getCompliance.map( async ( ele ) => {
+      ele['count'] =0;
+      if ( ele.date ) {
+        let properCount = 0;
+        for ( let fixture of fixtureDetails ) {
+          let planoDetails = await planoComplianceService.find( { createdAt: new Date( ele.date ), fixtureId: fixture._id, compliance: 'proper' } );
+          properCount = properCount + ( ( planoDetails.length / fixture.fixtureCapacity ) * 100 );
+        }
+
+
+        ele['count'] = Math.floor( properCount / fixtureDetails.length );
 
+        return ele;
+      }
+    } ) );
     let result = {
       merchCompliance: 0,
       previousMerchCompliance: 0,
@@ -8414,27 +8428,28 @@ export async function calculateCompliance( req, res ) {
       lastCheck: null,
     };
     if ( getCompliance.length ) {
-      let productCountQuery = [
-        {
-          $match: {
-            planoId: new mongoose.Types.ObjectId( req.body.planoId ),
-            floorId: new mongoose.Types.ObjectId( req.body.floorId ),
-          },
-        },
-        {
-          $group: {
-            _id: '$floorId',
-            productCount: { $sum: '$fixtureCapacity' },
-          },
-        },
-        {
-          $project: {
-            _id: 0,
-            productCount: 1,
-          },
-        },
-      ];
-      let totalProducts = await storeFixtureService.aggregate( productCountQuery );
+      // let productCountQuery = [
+      //   {
+      //     $match: {
+      //       planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+      //       floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+      //       fixtureId: { $ne: clFixtures._id },
+      //     },
+      //   },
+      //   {
+      //     $group: {
+      //       _id: '$floorId',
+      //       productCount: { $sum: '$fixtureCapacity' },
+      //     },
+      //   },
+      //   {
+      //     $project: {
+      //       _id: 0,
+      //       productCount: 1,
+      //     },
+      //   },
+      // ];
+      // let totalProducts = await storeFixtureService.aggregate( productCountQuery );
       // function formatPercentage( value ) {
       //   if ( value >= 100 ) return 100;
 
@@ -8442,22 +8457,22 @@ export async function calculateCompliance( req, res ) {
 
       //   return Number.isInteger( truncated ) ? Math.trunc( truncated ) : truncated;
       // }
-      if ( totalProducts.length ) {
-        result.merchCompliance = Math.floor( ( getCompliance?.[0]?.count / totalProducts?.[0]?.productCount ) * 100 );
-        let previousMerchCompliance = getCompliance?.[1]?.count ? Math.floor( ( getCompliance?.[1]?.count / totalProducts?.[0]?.productCount ) * 100 ) : 0;
-        if ( getCompliance.length > 1 && result.merchCompliance != previousMerchCompliance ) {
-          if ( result.merchCompliance > previousMerchCompliance ) {
-            let diff = result.merchCompliance - previousMerchCompliance;
-            result.previousMerchCompliance = diff;
-            result.rateIncrease = true;
-          } else {
-            let diff = previousMerchCompliance - result.merchCompliance;
-            result.previousMerchCompliance = diff;
-            result.rateIncrease = false;
-          }
+      // if ( totalProducts.length ) {
+      result.merchCompliance = getCompliance?.[0]?.count;
+      let previousMerchCompliance = getCompliance?.[1]?.count ? getCompliance?.[1]?.count : 0;
+      if ( getCompliance.length > 1 && result.merchCompliance != previousMerchCompliance ) {
+        if ( result.merchCompliance > previousMerchCompliance ) {
+          let diff = result.merchCompliance - previousMerchCompliance;
+          result.previousMerchCompliance = diff;
+          result.rateIncrease = true;
+        } else {
+          let diff = previousMerchCompliance - result.merchCompliance;
+          result.previousMerchCompliance = diff;
+          result.rateIncrease = false;
         }
-        result.lastCheck = `${getCompliance?.[0]?.time}`;
       }
+      result.lastCheck = `${getCompliance?.[0]?.time}`;
+      // }
     }
     return res.sendSuccess( result );
   } catch ( e ) {