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

package/package.json

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

package/src/controllers/script.controller.js

@@ -12438,9 +12438,9 @@ async function deriveSubTemplatesFromStoreFixtures() {
   for ( let index = 0; index < storeFixtures.length; index++ ) {
     const fixture = storeFixtures[index];
 
-    let mapKey = `${fixture.templateGroupName}${fixture.templateGroupMax}${fixture.templateGroupNumber}`;
+    // let mapKey = `${fixture.templateGroupName}${fixture.templateGroupMax}${fixture.templateGroupNumber}`;
 
-    // let mapKey = `${fixture.fixtureCategory}${fixture.fixtureWidth.value}${fixture.fixtureWidth.unit}${fixture.header.label}`;
+    let mapKey = `${fixture.fixtureCategory}${fixture.fixtureWidth.value}${fixture.fixtureWidth.unit}${fixture.header.label}`;
 
     // const shelfIdentifier = `${fixture.shelfConfig.length}${JSON.stringify(
     //     fixture.productBrandName,
@@ -12496,9 +12496,22 @@ async function deriveSubTemplatesFromStoreFixtures() {
       templateIndex = maxIndex + 1;
     }
 
-    fixture.templateGroupMax = fixture?.templateGroupMax ?? 1;
-    fixture.templateGroupNumber = fixture?.templateGroupNumber ?? 1;
-    const templateName = `${fixture.templateGroupName}-rule-${fixture.templateGroupMax}-fixture-${fixture.templateGroupNumber}-varient-${templateIndex}`;
+    // fixture.templateGroupMax = fixture?.templateGroupMax ?? 1;
+    // fixture.templateGroupNumber = fixture?.templateGroupNumber ?? 1;
+    // const templateName = `${fixture.templateGroupName}-rule-${fixture.templateGroupMax}-fixture-${fixture.templateGroupNumber}-varient-${templateIndex}`;
+
+    // const fixtureTemplateData = {
+    //   ...fixture,
+    //   fixtureName: templateName,
+    //   crestMapKey: mapKey,
+    //   templateType: 'sub',
+    //   templateIndex,
+    // };
+
+    // delete fixtureTemplateData._id;
+    // delete fixtureTemplateData.masterTemplateId;
+
+    const templateName = `${fixture.header.label}-${fixture.fixtureCategory}-${fixture.fixtureWidth.value}-${fixture.fixtureWidth.unit}-varient-${templateIndex}`;
 
     const fixtureTemplateData = {
       ...fixture,
@@ -12511,18 +12524,6 @@ async function deriveSubTemplatesFromStoreFixtures() {
     delete fixtureTemplateData._id;
     delete fixtureTemplateData.masterTemplateId;
 
-    // const templateName = `${fixture.header.label}-${fixture.fixtureCategory}-${fixture.fixtureWidth.value}-${fixture.fixtureWidth.unit}-varient-${templateIndex}`;
-
-    // const fixtureTemplateData = {
-    //   ...fixture,
-    //   fixtureName: templateName,
-    //   crestMapKey: mapKey,
-    //   templateType: 'sub',
-    //   templateIndex,
-    // };
-
-    // delete fixtureTemplateData._id;
-
     const fixtureTemplate = await fixtureConfigService.upsertOne(
         { crestMapKey: mapKey, templateType: 'sub' },
         fixtureTemplateData,
@@ -15673,21 +15674,21 @@ export async function insertAntennaMappingData( req, res ) {
       {
         "fixtureNumber": 18,
         "readerId": "A4-E8-A3-91-7E-FC",
-        "storageBoxAntennaNo": [ 13, 10, 2 ],
+        "storageBoxAntennaNo": [ 20, 18, 3 ],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 24, 9 ] },
-          { "shelfNumber": 2, "antennaNo": [ 12, 11 ] },
-          { "shelfNumber": 3, "antennaNo": [ 20, 25 ] },
+          { "shelfNumber": 1, "antennaNo": [ 17, 25 ] },
+          { "shelfNumber": 2, "antennaNo": [ 10, 15 ] },
+          { "shelfNumber": 3, "antennaNo": [ 6, 19 ] },
         ],
       },
       {
         "fixtureNumber": 20,
         "readerId": "A4-E8-A3-91-7E-FC",
-        "storageBoxAntennaNo": [ 3, 15, 1 ],
+        "storageBoxAntennaNo": [ 8, 2, 21, 27, 32 ],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 5, 18 ] },
-          { "shelfNumber": 2, "antennaNo": [ 7, 17 ] },
-          { "shelfNumber": 3, "antennaNo": [ 4, 16 ] },
+          { "shelfNumber": 1, "antennaNo": [ 22, 11 ] },
+          { "shelfNumber": 2, "antennaNo": [ 4, 16 ] },
+          { "shelfNumber": 3, "antennaNo": [ 9, 28 ] },
         ],
       },
       {
@@ -15695,31 +15696,31 @@ export async function insertAntennaMappingData( req, res ) {
         "readerId": "A4-E8-A3-91-7E-FC",
         "storageBoxAntennaNo": [],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 26, 22 ] },
-          { "shelfNumber": 2, "antennaNo": [ 19, 23 ] },
-          { "shelfNumber": 3, "antennaNo": [ 14, 18 ] },
+          { "shelfNumber": 1, "antennaNo": [ 12, 1 ] },
+          { "shelfNumber": 2, "antennaNo": [ 23, 14 ] },
+          { "shelfNumber": 3, "antennaNo": [ 13, 29 ] },
         ],
       },
       {
         "fixtureNumber": 17,
         "wallNumber": null,
         "readerId": "A4-E8-A3-91-7F-05",
-        "storageBoxAntennaNo": [ 20, 18, 3 ],
+        "storageBoxAntennaNo": [ 3, 15, 1 ],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 17, 25 ] },
-          { "shelfNumber": 2, "antennaNo": [ 10, 15 ] },
-          { "shelfNumber": 3, "antennaNo": [ 6, 19 ] },
+          { "shelfNumber": 1, "antennaNo": [ 5, 18 ] },
+          { "shelfNumber": 2, "antennaNo": [ 7, 17 ] },
+          { "shelfNumber": 3, "antennaNo": [ 4, 16 ] },
         ],
       },
       {
         "fixtureNumber": 16,
         "wallNumber": null,
         "readerId": "A4-E8-A3-91-7F-05",
-        "storageBoxAntennaNo": [ 8, 2, 21, 27, 32 ],
+        "storageBoxAntennaNo": [ 13, 10.2 ],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 22, 11 ] },
-          { "shelfNumber": 2, "antennaNo": [ 4, 16 ] },
-          { "shelfNumber": 3, "antennaNo": [ 9, 28 ] },
+          { "shelfNumber": 1, "antennaNo": [ 24, 9 ] },
+          { "shelfNumber": 2, "antennaNo": [ 12, 11 ] },
+          { "shelfNumber": 3, "antennaNo": [ 14, 8 ] },
         ],
       },
       {
@@ -15728,9 +15729,9 @@ export async function insertAntennaMappingData( req, res ) {
         "readerId": "A4-E8-A3-91-7F-05",
         "storageBoxAntennaNo": [],
         "shelfConfig": [
-          { "shelfNumber": 1, "antennaNo": [ 12, 1 ] },
-          { "shelfNumber": 2, "antennaNo": [ 23, 14 ] },
-          { "shelfNumber": 3, "antennaNo": [ 13, 29 ] },
+          { "shelfNumber": 1, "antennaNo": [ 26, 22 ] },
+          { "shelfNumber": 2, "antennaNo": [ 19, 23 ] },
+          { "shelfNumber": 3, "antennaNo": [ 20, 25 ] },
         ],
       },
 
@@ -16038,7 +16039,7 @@ export async function getstoreMBQFixtureExcel( req, res ) {
   }
 }
 
-export async function get4487FixtureData( req, res ) {
+export async function getRfidFixtureData( req, res ) {
   try {
     let fixtureDetails = await storeFixtureService.find( { planoId: new mongoose.Types.ObjectId( '690b2b9dc27523201d101bbb' ), fixtureType: { $ne: 'other' } } );
     let data = [];
@@ -16089,22 +16090,7 @@ export async function get4487FixtureData( req, res ) {
       }
     }
 
-    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 );
+    return res.sendSuccess( data );
   } catch ( e ) {
     console.log( e );
     logger.error( { functionName: 'get4487FixtureData', error: e } );

package/src/controllers/storeBuilder.controller.js

@@ -3812,7 +3812,7 @@ export async function storeFixturesTaskv2( req, res ) {
                                     },
                                   ];
                                   let complianceStatus = await planoComplianceService.aggregate( complianceQuery );
-                                  const productCompliance = complianceStatus?.[0]?.status?.length ? ( complianceStatus?.[0]?.status?.length.includes( 'missing' ) || complianceStatus?.[0]?.status.length.includes( 'misplaced' ) ) ? 'improper' : 'proper' : 'improper';
+                                  const productCompliance = complianceStatus?.[0]?.status?.length ? ( complianceStatus?.[0]?.status?.includes( 'missing' ) || complianceStatus?.[0]?.status?.includes( 'misplaced' ) ) ? 'improper' : 'proper' : 'improper';
                                   const vmCount = await planoMappingService.count( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'vm' } );
 
                                   return {
@@ -3943,7 +3943,7 @@ export async function storeFixturesTaskv2( req, res ) {
                               },
                             ];
                             let complianceStatus = await planoComplianceService.aggregate( complianceQuery );
-                            const productCompliance = complianceStatus?.[0]?.status?.length ? ( complianceStatus?.[0]?.status?.length.includes( 'missing' ) || complianceStatus?.[0]?.status.length.includes( 'misplaced' ) ) ? 'improper' : 'proper' : 'improper';
+                            const productCompliance = complianceStatus?.[0]?.status?.length ? ( complianceStatus?.[0]?.status?.includes( 'missing' ) || complianceStatus?.[0]?.status?.includes( 'misplaced' ) ) ? 'improper' : 'proper' : 'improper';
                             return {
                               ...shelf.toObject(),
                               productCount: productDetails.length,
@@ -6137,7 +6137,7 @@ export async function planoList( req, res ) {
           ele['country'] = findStore.storeProfile.country;
           ele['city'] = findStore.storeProfile.city;
         }
-        let fixtureStatus = ele?.taskDetails.fixtureStatus == 'complete' ? 'Completed' : ele?.taskDetails.fixtureStatus == 'pending' ? 'Review Pending' : 'Yet to assign';
+        let fixtureStatus = ele?.taskDetails.fixtureStatus == 'complete' ? 'Completed' : ( ele?.planoTask?.[0]?.taskStatus?.some( ( task ) => task.status == 'submit' && task.type == 'fixture' ) && ele?.taskDetails.fixtureStatus == 'pending' ) ? 'Review Pending' : ( ele?.planoTask?.[0]?.taskStatus?.some( ( task ) => task.type == 'fixture' && task.status != 'submit' && !task.breach ) ) ?'Task Assigned' : ( ele?.planoTask?.[0]?.taskStatus?.some( ( task ) => task.type == 'fixture' && task.status != 'submit' && task.breach ) ) ? 'Flagged' : 'Yet To Assign';
         exportData.push( {
           'Store Name': ele?.storeName ?? '--',
           'Layout Name': ele?.layoutName ?? '--',
@@ -7532,13 +7532,13 @@ export async function getRolloutDetails( req, res ) {
                 type: 'merchRollout',
                 status: 'submit',
               },
-            } }, { 'taskDetails.fixtureStatus': 'complete' },
-            { 'planoTask.taskStatus': {
+            } }, { 'taskFeedback.fixtureStatus': 'complete' },
+            { 'taskDetails': {
               $elemMatch: {
                 type: 'vmRollout',
                 status: 'submit',
               },
-            } }, { 'taskDetails.vmStatus': 'complete' },
+            } }, { 'taskFeedback.vmStatus': 'complete' },
             {
               layoutStatus: { $in: [ false ] },
             },
@@ -7552,13 +7552,13 @@ export async function getRolloutDetails( req, res ) {
               type: 'merchRollout',
               status: 'submit',
             },
-          } }, { 'taskDetails.fixtureStatus': 'complete' },
-          { 'planoTask.taskStatus': {
+          } }, { 'taskFeedback.fixtureStatus': 'complete' },
+          { 'taskDetails': {
             $elemMatch: {
               type: 'vmRollout',
               status: 'submit',
             },
-          } }, { 'taskDetails.vmStatus': 'complete' },
+          } }, { 'taskFeedback.vmStatus': 'complete' },
           {
             layoutStatus: { $nin: [ false ] },
           },
@@ -7711,8 +7711,8 @@ export async function getRolloutDetails( req, res ) {
     if ( req.body.export ) {
       let exportData = [];
       result.tableData.data.forEach( ( ele ) => {
-        let merchStatus = ele?.taskDetails.fixtureStatus == 'complete' ? 'Completed' : ele?.taskDetails.fixtureStatus == 'pending' ? 'Review Pending' : 'Yet to Assign';
-        let vmStatus = ele?.taskDetails.fixtureStatus == 'complete' ? 'Completed' : ele?.taskDetails.fixtureStatus == 'pending' ? 'Review Pending' : 'Yet to Assign';
+        let merchStatus = ele?.taskFeedback.fixtureStatus == 'complete' ? 'Completed' : ( ele?.taskDetails?.some( ( task ) => task.status == 'submit' && task.type == 'merchRollout' ) && ele?.taskFeedback.fixtureStatus == 'pending' ) ? 'Review Pending' : ( ele?.taskDetails?.some( ( task ) => task.type == 'merchRollout' && task.status != 'submit' && !task.breach ) ) ?'Task Assigned' : ( ele?.taskDetails?.some( ( task ) => task.type == 'merchRollout' && task.status != 'submit' && task.breach ) ) ? 'Flagged' : 'Yet To Assign';
+        let vmStatus = ele?.taskFeedback.vmStatus == 'complete' ? 'Completed' : ( ele?.taskDetails?.some( ( task ) => task.status == 'submit' && task.type == 'vmRollout' ) && ele?.taskFeedback.vmStatus == 'pending' ) ? 'Review Pending' : ( ele?.taskDetails?.some( ( task ) => task.type == 'vmRollout' && task.status != 'submit' && !task.breach ) ) ?'Task Assigned' : ( ele?.taskDetails?.some( ( task ) => task.type == 'vmRollout' && task.status != 'submit' && task.breach ) ) ? 'Flagged' : 'Yet To Assign';
         let planoStatus = [ merchStatus, vmStatus ];
         exportData.push( {
           'Store Name': ele?.storeName ?? '--',

package/src/routes/script.routes.js

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

package/src/routes/storeBuilder.routes.js

@@ -73,4 +73,5 @@ storeBuilderRouter
     .get( '/getAllStores', isAllowedSessionHandler, storeBuilderController.getAllStores )
     .get( '/getStoreFloorsList', isAllowedSessionHandler, storeBuilderController.getStoreFloorsList )
     .post( '/getShelfDetails', isAllowedInternalAPIHandler, storeBuilderController.getShelfDetails )
+    // .get( '/migrationScript', isAllowedInternalAPIHandler, storeBuilderController.migrationScript )
 ;