tango-app-api-store-builder 1.0.0-beta-108 → 1.0.0-beta-109

package/src/controllers/script.controller.js

@@ -20,6 +20,7 @@ import mongoose from 'mongoose';
 import JSZip from 'jszip';
 import { signedUrl } from 'tango-app-api-middleware';
 import fs from 'fs';
+// import https from 'https';
 import os from 'os';
 import { fileURLToPath } from 'url';
 import path from 'path';
@@ -2320,11 +2321,11 @@ export async function updateVmData( req, res ) {
   }
 }
 
-// import https from 'https';
+
 // async function scrapeCrest() {
-//   const storeIds = [ 'LKST2567' ];
+//   const storeIds = [ 'LKST682' ];
 //   const apiUrl = 'https://api.getcrest.ai/api/ms_shelfsensei/layout/';
-//   const bearerToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzQ5MTEyNDYxLCJpYXQiOjE3NDkxMDg4NjEsImp0aSI6ImYzMDhmN2M3YzBlYjQ4NWU5YjVmNTJjZjRjNTkxNTM2IiwidXNlcl9pZCI6MTA4NSwiaWQiOjEwODUsImlzX21lZXNlZWtfYWNjb3VudCI6ZmFsc2UsImN1c3RvbWVyX2dyb3VwIjozOTgsImxpY2VuY2Vfc2NvcGVzIjpbeyJyZXNvdXJjZV9zZXQiOiJwcF9zZXQiLCJzY29wZV9yb2xlIjoiY29udHJpYnV0b3IifSx7InJlc291cmNlX3NldCI6ImRwX3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9LHsicmVzb3VyY2Vfc2V0IjoiZGZfc2V0Iiwic2NvcGVfcm9sZSI6ImNvbnRyaWJ1dG9yIn0seyJyZXNvdXJjZV9zZXQiOiJkZWZhdWx0X3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9XX0.zXRf9dgtrIhjnUJSKyLqbB8FRnTT0a-hOBos0gvKsJY';
+//   const bearerToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbl90eXBlIjoiYWNjZXNzIiwiZXhwIjoxNzQ4ODUwMzMyLCJpYXQiOjE3NDg4NDY3MzIsImp0aSI6ImNkNmRmNWZhYTg4ZDRmMjQ4YmZkYzFkMzkzZWYzMTg5IiwidXNlcl9pZCI6MTA4NSwiaWQiOjEwODUsImlzX21lZXNlZWtfYWNjb3VudCI6ZmFsc2UsImN1c3RvbWVyX2dyb3VwIjozOTgsImxpY2VuY2Vfc2NvcGVzIjpbeyJyZXNvdXJjZV9zZXQiOiJwcF9zZXQiLCJzY29wZV9yb2xlIjoiY29udHJpYnV0b3IifSx7InJlc291cmNlX3NldCI6ImRwX3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9LHsicmVzb3VyY2Vfc2V0IjoiZGZfc2V0Iiwic2NvcGVfcm9sZSI6ImNvbnRyaWJ1dG9yIn0seyJyZXNvdXJjZV9zZXQiOiJkZWZhdWx0X3NldCIsInNjb3BlX3JvbGUiOiJjb250cmlidXRvciJ9XX0.8fclGcH6koHsKVmtGAQLscS80yNaVqPRkcpLhI3cnsk';
 //   const filePath = 'response.json';
 //   let allResults = [];
 
@@ -2389,7 +2390,7 @@ export async function updateVmData( req, res ) {
 //   }
 // }
 
-// scrapeCrest();
+// scrapeCrest()
 
 export async function createCrestPlanogram( req, res ) {
   try {
@@ -3443,7 +3444,6 @@ import { Builder } from 'selenium-webdriver';
 import fetch from 'node-fetch';
 
 import fetchCookie from 'fetch-cookie';
-// import { elementIsNotVisible } from 'selenium-webdriver/lib/until.js';
 
 
 // async function downloadCrestImages() {
@@ -7224,6 +7224,32 @@ export async function migrateCrestv1( req, res ) {
     };
 
 
+    async function generateFixtureTemplateName( baseName, fixtureWidth ) {
+      function escapeRegex( str ) {
+        return str.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
+      }
+
+      const escapedBase = escapeRegex( baseName );
+      const regexPattern = new RegExp( `^Template-(\\d+)-${escapedBase}$` );
+
+      const existingFixtures = await fixtureConfigService.find( {
+        fixtureName: { $regex: new RegExp( `^Template-(\\d+)-${escapedBase}$` ) },
+        fixtureWidth: fixtureWidth,
+      } );
+
+      const usedNumbers = existingFixtures
+          .map( ( doc ) => {
+            const match = doc.fixtureName.match( regexPattern );
+            return match ? parseInt( match[1], 10 ) : null;
+          } )
+          .filter( ( num ) => num !== null );
+
+      const nextNumber = usedNumbers.length > 0 ? Math.max( ...usedNumbers ) + 1 : 1;
+
+      return `Template-${nextNumber}-${baseName}`;
+    }
+
+
     if ( !req?.body?.storeName ) {
       return res.sendError( 'No store supplied', 200 );
     }
@@ -7239,10 +7265,10 @@ export async function migrateCrestv1( req, res ) {
 
     let storeList = await storeService.find( storeQuery );
 
-    // const constantFixtureLength = 1220;
+    const constantFixtureLength = 1220;
     const constantDetailedFixtureLength = 1220;
 
-    // const constantFixtureWidth = 610;
+    const constantFixtureWidth = 610;
     const constantDetailedFixtureWidth = 1524;
 
     const mmToFeet = 305;
@@ -7262,15 +7288,15 @@ export async function migrateCrestv1( req, res ) {
 
       const existingPlanogram = await planoService.findOne( { storeName: storeData.storeName } );
 
-      // if ( existingPlanogram ) {
-      //   const checkTaskSubmitted = await planoTaskService.findOne( { planoId: existingPlanogram.toObject()._id } );
+      if ( existingPlanogram ) {
+        const checkTaskSubmitted = await planoTaskService.findOne( { planoId: existingPlanogram.toObject()._id } );
 
-      //   const checkTaskCreated = await processedTaskService.findOne( { storeName: storeData.storeName, date_string: dayjs().format( 'YYYY-MM-DD' ), isPlano: true } );
+        const checkTaskCreated = await processedTaskService.findOne( { storeName: storeData.storeName, date_string: dayjs().format( 'YYYY-MM-DD' ), isPlano: true } );
 
-      //   if ( checkTaskSubmitted || checkTaskCreated ) {
-      //     continue;
-      //   }
-      // }
+        if ( checkTaskSubmitted || checkTaskCreated ) {
+          continue;
+        }
+      }
 
 
       if ( existingPlanogram?.toObject()?._id && mongoose.Types.ObjectId.isValid( existingPlanogram?.toObject()?._id ) ) {
@@ -7347,43 +7373,43 @@ export async function migrateCrestv1( req, res ) {
           floorFixtures = floorFixtures.filter( ( fixture ) => fixture.floor === floorArray[floorIndex] );
         }
 
-        // const leftXDistanceFeet = leftFixtures.length ? roundToTwo( ( leftFixtures.length * ( constantFixtureLength / mmToFeet ) ) ) : 0;
+        const leftXDistanceFeet = leftFixtures.length ? roundToTwo( ( leftFixtures.length * ( constantFixtureLength / mmToFeet ) ) ) : 0;
         const leftXDetailedDistanceFeet = leftFixtures.length ? roundToTwo( ( leftFixtures.length * ( constantDetailedFixtureLength / mmToFeet ) ) ) : 0;
 
-        // const leftYDistanceFeet = leftFixtures.length ? roundToTwo( ( ( constantFixtureWidth / mmToFeet ) ) ) : 0;
+        const leftYDistanceFeet = leftFixtures.length ? roundToTwo( ( ( constantFixtureWidth / mmToFeet ) ) ) : 0;
         const leftYDetailedDistanceFeet = leftFixtures.length ? roundToTwo( ( ( constantDetailedFixtureWidth / mmToFeet ) ) ) : 0;
 
-        // const rightXDistanceFeet = rightFixtures.length ? roundToTwo( ( rightFixtures.length * ( constantFixtureLength / mmToFeet ) ) ) : 0;
+        const rightXDistanceFeet = rightFixtures.length ? roundToTwo( ( rightFixtures.length * ( constantFixtureLength / mmToFeet ) ) ) : 0;
         const rightXDetailedDistanceFeet = rightFixtures.length ? roundToTwo( ( rightFixtures.length * ( constantDetailedFixtureLength / mmToFeet ) ) ) : 0;
 
-        // const rightYDistanceFeet = rightFixtures.length ? roundToTwo( ( constantFixtureWidth / mmToFeet ) ) : 0;
+        const rightYDistanceFeet = rightFixtures.length ? roundToTwo( ( constantFixtureWidth / mmToFeet ) ) : 0;
         const rightYDetailedDistanceFeet = rightFixtures.length ? roundToTwo( ( constantDetailedFixtureWidth / mmToFeet ) ): 0;
 
         const maxFixturesPerRow = floorFixtures.length/2;
         const totalRows = 2;
 
-        // const floorXDistanceFeet = floorFixtures.length ? roundToTwo( ( ( floorFixtures.length/2 ) * ( constantFixtureLength / mmToFeet ) ) ) : 0;
+        const floorXDistanceFeet = floorFixtures.length ? roundToTwo( ( ( floorFixtures.length/2 ) * ( constantFixtureLength / mmToFeet ) ) ) : 0;
         const floorXDetailedDistanceFeet = floorFixtures.length ? roundToTwo( ( ( floorFixtures.length/2 ) * ( constantDetailedFixtureLength / mmToFeet ) ) ): 0;
 
-        // const floorYDistanceFeet = floorFixtures.length ? roundToTwo( ( 2 * ( constantFixtureWidth/ mmToFeet ) ) ): 0;
+        const floorYDistanceFeet = floorFixtures.length ? roundToTwo( ( 2 * ( constantFixtureWidth/ mmToFeet ) ) ): 0;
         const floorYDetailedDistanceFeet = floorFixtures.length ? roundToTwo( 2 * ( constantDetailedFixtureWidth/mmToFeet ) ): 0;
 
-        // const backXDistanceFeet = backFixtures.length ? roundToTwo( ( constantFixtureWidth / mmToFeet ) ) : 0;
+        const backXDistanceFeet = backFixtures.length ? roundToTwo( ( constantFixtureWidth / mmToFeet ) ) : 0;
         const backXDetailedDistanceFeet = backFixtures.length ? roundToTwo( ( constantDetailedFixtureLength / mmToFeet ) ) : 0;
 
-        // const backYDistanceFeet = backFixtures.length ? roundToTwo( ( ( backFixtures.length * ( constantFixtureLength / mmToFeet ) ) + ( ( ( leftFixtures.length ? 1 : 0 ) + ( rightFixtures.length ? 1 : 0 ) * constantFixtureWidth )/mmToFeet ) ) ) : 0;
+        const backYDistanceFeet = backFixtures.length ? roundToTwo( ( ( backFixtures.length * ( constantFixtureLength / mmToFeet ) ) + ( ( ( leftFixtures.length ? 1 : 0 ) + ( rightFixtures.length ? 1 : 0 ) * constantFixtureWidth )/mmToFeet ) ) ) : 0;
         const backYDetailedDistanceFeet = backFixtures.length ? roundToTwo( ( ( backFixtures.length * ( constantDetailedFixtureWidth / mmToFeet ) ) + ( ( ( leftFixtures.length ? 1 : 0 ) + ( rightFixtures.length ? 1 : 0 ) * constantDetailedFixtureWidth )/mmToFeet ) ) ): 0;
 
-        // const maxXDistance = Math.max( leftXDistanceFeet, rightXDistanceFeet, floorXDistanceFeet );
+        const maxXDistance = Math.max( leftXDistanceFeet, rightXDistanceFeet, floorXDistanceFeet );
         const maxXDetailedDistance = Math.max( leftXDetailedDistanceFeet, rightXDetailedDistanceFeet, floorXDetailedDistanceFeet );
 
-        // const maxYDistance = Math.max( floorYDistanceFeet, backYDistanceFeet );
+        const maxYDistance = Math.max( floorYDistanceFeet, backYDistanceFeet );
         const maxYDetailedDistance = Math.max( floorYDetailedDistanceFeet, backYDetailedDistanceFeet );
 
-        // const finalXDistance = roundToTwo( ( maxXDistance < ( backXDistanceFeet + floorXDistanceFeet )? ( ( backXDistanceFeet + floorXDistanceFeet ) + ( ( 2 * constantFixtureLength )/mmToFeet ) ) : ( floorFixtures.length && backFixtures.length ) ? ( maxXDistance + ( ( 2 * constantFixtureLength )/mmToFeet ) ) : maxXDistance ) );
+        const finalXDistance = roundToTwo( ( maxXDistance < ( backXDistanceFeet + floorXDistanceFeet )? ( ( backXDistanceFeet + floorXDistanceFeet ) + ( ( 2 * constantFixtureLength )/mmToFeet ) ) : ( floorFixtures.length && backFixtures.length ) ? ( maxXDistance + ( ( 2 * constantFixtureLength )/mmToFeet ) ) : maxXDistance ) );
         const finalXDetailedDistance = roundToTwo( ( maxXDetailedDistance < ( backXDetailedDistanceFeet + floorXDetailedDistanceFeet )? ( ( backXDetailedDistanceFeet + floorXDetailedDistanceFeet ) + ( ( 2 * constantDetailedFixtureLength )/mmToFeet ) ) : ( floorFixtures.length && backFixtures.length ) ? ( maxXDetailedDistance + ( ( 2 * constantDetailedFixtureLength )/mmToFeet ) ) : maxXDetailedDistance ) );
 
-        // const finalYDistance = roundToTwo( ( maxYDistance < ( leftYDistanceFeet + rightYDistanceFeet + floorYDistanceFeet ) ? ( ( leftYDistanceFeet + rightYDistanceFeet + floorYDistanceFeet ) + ( ( 2 * constantFixtureWidth )/mmToFeet ) ) : ( maxYDistance + ( ( constantFixtureWidth )/mmToFeet ) ) ) );
+        const finalYDistance = roundToTwo( ( maxYDistance < ( leftYDistanceFeet + rightYDistanceFeet + floorYDistanceFeet ) ? ( ( leftYDistanceFeet + rightYDistanceFeet + floorYDistanceFeet ) + ( ( 2 * constantFixtureWidth )/mmToFeet ) ) : ( maxYDistance + ( ( constantFixtureWidth )/mmToFeet ) ) ) );
         const finalYDetailedDistance = roundToTwo( ( maxYDetailedDistance < ( leftYDetailedDistanceFeet + rightYDetailedDistanceFeet + floorYDetailedDistanceFeet ) ? ( ( leftYDetailedDistanceFeet + rightYDetailedDistanceFeet + floorYDetailedDistanceFeet ) + ( ( 2 * constantDetailedFixtureWidth )/mmToFeet ) ) : ( maxYDetailedDistance + ( ( constantDetailedFixtureWidth )/mmToFeet ) ) ) );
 
 
@@ -7398,57 +7424,57 @@ export async function migrateCrestv1( req, res ) {
           layoutPolygon: [
             {
               elementType: 'wall',
-              distance: finalXDetailedDistance,
+              distance: finalXDistance,
               unit: 'ft',
               direction: 'right',
               angle: 90,
               elementNumber: 1,
-              // detailedDistance: finalXDetailedDistance,
+              detailedDistance: finalXDetailedDistance,
             },
             {
               elementType: 'wall',
-              distance: finalYDetailedDistance,
+              distance: finalYDistance,
               unit: 'ft',
               direction: 'down',
               angle: 90,
               elementNumber: 2,
-              // detailedDistance: finalYDetailedDistance,
+              detailedDistance: finalYDetailedDistance,
             },
             {
               elementType: 'wall',
-              distance: finalXDetailedDistance,
+              distance: finalXDistance,
               unit: 'ft',
               direction: 'left',
               angle: 90,
               elementNumber: 3,
-              // detailedDistance: finalXDetailedDistance,
+              detailedDistance: finalXDetailedDistance,
             },
             {
               elementType: 'wall',
-              distance: roundToTwo( ( ( finalYDetailedDistance * 35 ) / 100 ) ),
+              distance: roundToTwo( ( ( finalYDistance * 40 ) / 100 ) ),
               unit: 'ft',
               direction: 'up',
               angle: 90,
               elementNumber: 4,
-              // detailedDistance: roundToTwo( ( ( finalYDetailedDistance * 35 ) / 100 ) ),
+              detailedDistance: roundToTwo( ( ( finalYDetailedDistance * 35 ) / 100 ) ),
             },
             {
               elementType: 'entrance',
-              distance: roundToTwo( ( ( finalYDetailedDistance * 30 ) / 100 ) ),
+              distance: roundToTwo( ( ( finalYDistance * 20 ) / 100 ) ),
               unit: 'ft',
               direction: 'up',
               angle: 90,
               elementNumber: 1,
-              // detailedDistance: roundToTwo( ( ( finalYDetailedDistance * 30 ) / 100 ) ),
+              detailedDistance: roundToTwo( ( ( finalYDetailedDistance * 30 ) / 100 ) ),
             },
             {
               elementType: 'wall',
-              distance: roundToTwo( ( ( finalYDetailedDistance * 35 ) / 100 ) ),
+              distance: roundToTwo( ( ( finalYDistance * 40 ) / 100 ) ),
               unit: 'ft',
               direction: 'up',
               angle: 90,
               elementNumber: 5,
-              // detailedDistance: roundToTwo( ( ( finalYDetailedDistance * 35 ) / 100 ) ),
+              detailedDistance: roundToTwo( ( ( finalYDetailedDistance * 35 ) / 100 ) ),
             },
           ],
           createdBy: new mongoose.Types.ObjectId( '66a78cd82734f4f857cd6db6' ),
@@ -7507,20 +7533,13 @@ export async function migrateCrestv1( req, res ) {
 
               if ( vm.productName === 'Creatr' && zone.zoneName === 'Mid' ) {
                 configData = vmConfig.find( ( config ) => config.vmWidthmm === 905 );
+                configData.zone = 'stretch';
               }
 
               if ( vm.productName === 'Creatr' && zone.zoneName === 'Mid' && pids.length ) {
                 configData = vmConfig.find( ( config ) => config.vmWidthmm === 230 );
               }
 
-              if ( configData.vmWidthmm === 905 ) {
-                configData.zone = 'stretch';
-              }
-
-              if ( configData.vmWidthmm === 230 ) {
-                configData.zone = 'left';
-              }
-
               if ( !configData ) return;
 
               const vmIdentifier = `vm${k+1}=${vm.productName}+${configData.vmHeightmm}+${configData.vmWidthmm}+${configData.startShelf}+${configData.endShelf}+${configData.zone}`;
@@ -7591,7 +7610,7 @@ export async function migrateCrestv1( req, res ) {
 
             const vmDetails = await planoVmService.upsertOne(
                 {
-                  'vmName': vmInsertData.vmName,
+                  'productName': vmInsertData.vmName,
                 },
                 vmInsertData,
             );
@@ -7604,23 +7623,8 @@ export async function migrateCrestv1( req, res ) {
             };
           } ) );
 
-          const existingTemplateWithMaxIndex = await fixtureConfigService.sortAndFindOne(
-              { fixtureCategory: fixtureConfigDoc.fixtureCategory,
-                fixtureWidth: fixtureConfigDoc.fixtureWidth }, {}, { templateIndex: -1 } );
-
-          let templateIndex = 1;
-
-          if ( existingTemplateWithMaxIndex.length ) {
-            templateIndex = existingTemplateWithMaxIndex[0].toObject().templateIndex + 1;
-          }
-
-          let templateName = `Template-${templateIndex}-${fixtureConfigDoc.fixtureCategory}`;
-
-          const isTemplateExist = await fixtureConfigService.findOne( { crestMapKey: mapKey } );
-          if ( isTemplateExist ) {
-            templateIndex = undefined;
-            templateName = undefined;
-          }
+          const baseFixtureName = `${fixtureConfigDoc.fixtureCategory}`;
+          const uniqueFixtureName = await generateFixtureTemplateName( baseFixtureName, fixtureConfigDoc.fixtureWidth );
 
 
           const fixtureTemplateData = {
@@ -7628,8 +7632,7 @@ export async function migrateCrestv1( req, res ) {
             'shelfConfig': shelfTemplate,
             'vmConfig': vmTemplate,
             'clientId': fixtureConfigDoc.clientId,
-            'fixtureName': templateName,
-            'templateIndex': templateIndex,
+            'fixtureName': uniqueFixtureName,
             'header': {
               label: fixture.header ? fixture.header : fixture.fixtureSubname[0],
               isEnabled: true,
@@ -7662,16 +7665,16 @@ export async function migrateCrestv1( req, res ) {
             'associatedElementType': 'wall',
             'associatedElementNumber': 1,
             'relativePosition': {
-              'x': roundToTwo( ( index * ( constantDetailedFixtureLength / mmToFeet ) ) ),
+              'x': roundToTwo( ( index * ( constantFixtureLength / mmToFeet ) ) ),
               'y': 0,
               'unit': 'ft',
             },
             'fixtureNumber': fixtureCounter,
-            // 'relativeDetailedPosition': {
-            //   'x': roundToTwo( ( index * ( constantDetailedFixtureLength / mmToFeet ) ) ),
-            //   'y': 0,
-            //   'unit': 'ft',
-            // },
+            'relativeDetailedPosition': {
+              'x': roundToTwo( ( index * ( constantDetailedFixtureLength / mmToFeet ) ) ),
+              'y': 0,
+              'unit': 'ft',
+            },
             'associatedElementFixtureNumber': index+1,
             'fixtureConfigId': fixtureTemplate.toObject()._id,
           };
@@ -7762,20 +7765,13 @@ export async function migrateCrestv1( req, res ) {
 
               if ( vm.productName === 'Creatr' && zone.zoneName === 'Mid' ) {
                 configData = vmConfig.find( ( config ) => config.vmWidthmm === 905 );
+                configData.zone = 'stretch';
               }
 
               if ( vm.productName === 'Creatr' && zone.zoneName === 'Mid' && pids.length ) {
                 configData = vmConfig.find( ( config ) => config.vmWidthmm === 230 );
               }
 
-              if ( configData.vmWidthmm === 905 ) {
-                configData.zone = 'stretch';
-              }
-
-              if ( configData.vmWidthmm === 230 ) {
-                configData.zone = 'left';
-              }
-
               if ( !configData ) return;
 
               const vmIdentifier = `vm${k+1}=${vm.productName}+${configData.vmHeightmm}+${configData.vmWidthmm}+${configData.startShelf}+${configData.endShelf}+${configData.zone}`;
@@ -7847,7 +7843,7 @@ export async function migrateCrestv1( req, res ) {
 
             const vmDetails = await planoVmService.upsertOne(
                 {
-                  'vmName': vmInsertData.vmName,
+                  'productName': vmInsertData.vmName,
                 },
                 vmInsertData,
             );
@@ -7860,31 +7856,16 @@ export async function migrateCrestv1( req, res ) {
             };
           } ) );
 
-          const existingTemplateWithMaxIndex = await fixtureConfigService.sortAndFindOne(
-              { fixtureCategory: fixtureConfigDoc.fixtureCategory,
-                fixtureWidth: fixtureConfigDoc.fixtureWidth }, {}, { templateIndex: -1 } );
+          const baseFixtureName = `${fixtureConfigDoc.fixtureCategory}`;
+          const uniqueFixtureName = await generateFixtureTemplateName( baseFixtureName, fixtureConfigDoc.fixtureWidth );
 
-          let templateIndex = 1;
-
-          if ( existingTemplateWithMaxIndex.length ) {
-            templateIndex = existingTemplateWithMaxIndex[0].toObject().templateIndex + 1;
-          }
-
-          let templateName = `Template-${templateIndex}-${fixtureConfigDoc.fixtureCategory}`;
-
-          const isTemplateExist = await fixtureConfigService.findOne( { crestMapKey: mapKey } );
-          if ( isTemplateExist ) {
-            templateIndex = undefined;
-            templateName = undefined;
-          }
 
           const fixtureTemplateData = {
             ...fixtureConfigDoc,
             'shelfConfig': shelfTemplate,
             'vmConfig': vmTemplate,
             'clientId': fixtureConfigDoc.clientId,
-            'fixtureName': templateName,
-            'templateIndex': templateIndex,
+            'fixtureName': uniqueFixtureName,
             'header': {
               label: fixture.header ? fixture.header : fixture.fixtureSubname[0],
               isEnabled: true,
@@ -7917,16 +7898,16 @@ export async function migrateCrestv1( req, res ) {
             'associatedElementType': 'wall',
             'associatedElementNumber': 2,
             'relativePosition': {
+              'x': roundToTwo( ( finalXDistance - ( constantFixtureWidth/mmToFeet ) ) ),
+              'y': roundToTwo( ( ( index * ( ( constantFixtureLength/mmToFeet ) ) ) + ( ( leftFixtures.length ? 1 : 0 ) * constantFixtureWidth/mmToFeet ) ) ),
+              'unit': 'ft',
+            },
+            'fixtureNumber': fixtureCounter,
+            'relativeDetailedPosition': {
               'x': roundToTwo( ( finalXDetailedDistance - ( constantDetailedFixtureLength/mmToFeet ) ) ),
               'y': roundToTwo( ( ( index * ( ( constantDetailedFixtureWidth/mmToFeet ) ) ) + ( ( leftFixtures.length ? 1 : 0 ) * constantDetailedFixtureWidth/mmToFeet ) ) ),
               'unit': 'ft',
             },
-            'fixtureNumber': fixtureCounter,
-            // 'relativeDetailedPosition': {
-            //   'x': roundToTwo( ( finalXDetailedDistance - ( constantDetailedFixtureLength/mmToFeet ) ) ),
-            //   'y': roundToTwo( ( ( index * ( ( constantDetailedFixtureWidth/mmToFeet ) ) ) + ( ( leftFixtures.length ? 1 : 0 ) * constantDetailedFixtureWidth/mmToFeet ) ) ),
-            //   'unit': 'ft',
-            // },
             'associatedElementFixtureNumber': index+1,
             'fixtureConfigId': fixtureTemplate.toObject()._id,
           };
@@ -8017,20 +7998,13 @@ export async function migrateCrestv1( req, res ) {
 
               if ( vm.productName === 'Creatr' && zone.zoneName === 'Mid' ) {
                 configData = vmConfig.find( ( config ) => config.vmWidthmm === 905 );
+                configData.zone = 'stretch';
               }
 
               if ( vm.productName === 'Creatr' && zone.zoneName === 'Mid' && pids.length ) {
                 configData = vmConfig.find( ( config ) => config.vmWidthmm === 230 );
               }
 
-              if ( configData.vmWidthmm === 905 ) {
-                configData.zone = 'stretch';
-              }
-
-              if ( configData.vmWidthmm === 230 ) {
-                configData.zone = 'left';
-              }
-
               if ( !configData ) return;
 
               const vmIdentifier = `vm${k+1}=${vm.productName}+${configData.vmHeightmm}+${configData.vmWidthmm}+${configData.startShelf}+${configData.endShelf}+${configData.zone}`;
@@ -8101,7 +8075,7 @@ export async function migrateCrestv1( req, res ) {
 
             const vmDetails = await planoVmService.upsertOne(
                 {
-                  'vmNameName': vmInsertData.vmName,
+                  'productName': vmInsertData.vmName,
                 },
                 vmInsertData,
             );
@@ -8114,31 +8088,16 @@ export async function migrateCrestv1( req, res ) {
             };
           } ) );
 
-          const existingTemplateWithMaxIndex = await fixtureConfigService.sortAndFindOne(
-              { fixtureCategory: fixtureConfigDoc.fixtureCategory,
-                fixtureWidth: fixtureConfigDoc.fixtureWidth }, {}, { templateIndex: -1 } );
-
-          let templateIndex = 1;
+          const baseFixtureName = `${fixtureConfigDoc.fixtureCategory}`;
+          const uniqueFixtureName = await generateFixtureTemplateName( baseFixtureName, fixtureConfigDoc.fixtureWidth );
 
-          if ( existingTemplateWithMaxIndex.length ) {
-            templateIndex = existingTemplateWithMaxIndex[0].toObject().templateIndex + 1;
-          }
-
-          let templateName = `Template-${templateIndex}-${fixtureConfigDoc.fixtureCategory}`;
-
-          const isTemplateExist = await fixtureConfigService.findOne( { crestMapKey: mapKey } );
-          if ( isTemplateExist ) {
-            templateIndex = undefined;
-            templateName = undefined;
-          }
 
           const fixtureTemplateData = {
             ...fixtureConfigDoc,
             'shelfConfig': shelfTemplate,
             'vmConfig': vmTemplate,
             'clientId': fixtureConfigDoc.clientId,
-            'fixtureName': templateName,
-            'templateIndex': templateIndex,
+            'fixtureName': uniqueFixtureName,
             'header': {
               label: fixture.header ? fixture.header : fixture.fixtureSubname[0],
               isEnabled: true,
@@ -8171,16 +8130,16 @@ export async function migrateCrestv1( req, res ) {
             'associatedElementType': 'wall',
             'associatedElementNumber': 3,
             'relativePosition': {
+              'x': roundToTwo( ( index * ( constantFixtureLength / mmToFeet ) ) ),
+              'y': roundToTwo( ( finalYDistance - ( constantFixtureWidth / mmToFeet ) ) ),
+              'unit': 'ft',
+            },
+            'fixtureNumber': fixtureCounter,
+            'relativeDetailedPosition': {
               'x': roundToTwo( ( index * ( constantDetailedFixtureLength / mmToFeet ) ) ),
               'y': roundToTwo( ( finalYDetailedDistance - ( constantDetailedFixtureWidth / mmToFeet ) ) ),
               'unit': 'ft',
             },
-            'fixtureNumber': fixtureCounter,
-            // 'relativeDetailedPosition': {
-            //   'x': roundToTwo( ( index * ( constantDetailedFixtureLength / mmToFeet ) ) ),
-            //   'y': roundToTwo( ( finalYDetailedDistance - ( constantDetailedFixtureWidth / mmToFeet ) ) ),
-            //   'unit': 'ft',
-            // },
             'associatedElementFixtureNumber': index+1,
             'fixtureConfigId': fixtureTemplate.toObject()._id,
           };
@@ -8232,17 +8191,17 @@ export async function migrateCrestv1( req, res ) {
 
           const centerRow = Math.floor( totalRows / 2 );
 
-          // const startingX = roundToTwo( ( finalXDistance / 2 - ( maxFixturesPerRow / 2 ) * ( constantFixtureLength / mmToFeet ) ) );
+          const startingX = roundToTwo( ( finalXDistance / 2 - ( maxFixturesPerRow / 2 ) * ( constantFixtureLength / mmToFeet ) ) );
           const detailedStartingX = roundToTwo( ( finalXDetailedDistance / 2 - ( maxFixturesPerRow / 2 ) * ( constantDetailedFixtureLength / mmToFeet ) ) );
 
-          // const startingY = finalYDistance / 2 - centerRow * ( constantFixtureWidth / mmToFeet );
+          const startingY = finalYDistance / 2 - centerRow * ( constantFixtureWidth / mmToFeet );
           const detailedStartingY = finalYDetailedDistance / 2 - centerRow * ( constantDetailedFixtureWidth / mmToFeet );
 
           const colIndex = Math.floor( index / 2 );
           const rowIndex = index % 2 === 0 ? 1 : 0;
 
-          // const xPos = roundToTwo( startingX + colIndex * ( constantFixtureLength / mmToFeet ) );
-          // const yPos = roundToTwo( startingY + rowIndex * ( constantFixtureWidth / mmToFeet ) );
+          const xPos = roundToTwo( startingX + colIndex * ( constantFixtureLength / mmToFeet ) );
+          const yPos = roundToTwo( startingY + rowIndex * ( constantFixtureWidth / mmToFeet ) );
 
           const detailedXPos = roundToTwo( ( detailedStartingX + colIndex * ( constantDetailedFixtureLength / mmToFeet ) ) );
           const detailedYPos = roundToTwo( ( detailedStartingY + rowIndex * ( constantDetailedFixtureWidth / mmToFeet ) ) );
@@ -8251,7 +8210,7 @@ export async function migrateCrestv1( req, res ) {
           if ( !fixtureConfig ) continue;
           const fixtureConfigDoc = fixtureConfig.toObject();
 
-          let mapKey = `${fixtureConfigDoc.fixtureCategory}${fixtureConfigDoc.fixtureWidth.value}${fixtureConfigDoc.fixtureWidth.unit},${fixture.centerSubMain}`;
+          let mapKey = `${fixtureConfigDoc.fixtureCategory}${fixtureConfigDoc.fixtureWidth.value}${fixtureConfigDoc.fixtureWidth.unit},${fixture.header}`;
 
           const fixtureProductSubBrandName = new Set();
 
@@ -8259,7 +8218,7 @@ export async function migrateCrestv1( req, res ) {
           const shelfTemplate = fixtureConfigDoc.shelfConfig.map( ( configShelf, j ) => {
             const shelfSection = fixture?.centerSuperSubMain?.find( ( product ) => !product.isVisualMerchandiser );
 
-            const shelfIdentifier = `shelf${j + 1}=${fixture.centerSubMain}`;
+            const shelfIdentifier = `shelf${j + 1}=${shelfSection?.productName}`;
 
             mapKey += ','+shelfIdentifier;
 
@@ -8282,7 +8241,7 @@ export async function migrateCrestv1( req, res ) {
             };
           } );
 
-          const vmConfig = fixture.centerSuperSubMain?.flatMap( ( vm, k ) => {
+          const vmConfig = fixture.centerSuperSubMain?.flatMap( ( vm ) => {
             if ( !vm?.isVisualMerchandiser ) {
               return [];
             }
@@ -8290,15 +8249,11 @@ export async function migrateCrestv1( req, res ) {
 
             const [ configData1, configData2 ] = [ vmConfig[0], vmConfig[1] ];
 
-            const vmIdentifier = `vm${k+1}=${vm.name}+${configData1.vmHeightmm}+${configData1.vmWidthmm}+${configData1.startShelf}+${configData1.endShelf}+${configData1.zone}`;
-
-            mapKey += ','+vmIdentifier;
-
             return [
               {
                 startYPosition: configData1.startShelf,
                 endYPosition: configData1.endShelf,
-                xZone: 'left',
+                xZone: configData1.zone,
                 vmName: vm.name + ' - 1',
                 vmHeight: configData1.vmHeightmm,
                 vmWidth: configData1.vmWidthmm,
@@ -8306,7 +8261,7 @@ export async function migrateCrestv1( req, res ) {
               {
                 startYPosition: configData2.startShelf,
                 endYPosition: configData2.endShelf,
-                xZone: 'stretch',
+                xZone: configData2.zone,
                 vmName: vm.name + ' - 2',
                 vmHeight: configData2.vmHeightmm,
                 vmWidth: configData2.vmWidthmm,
@@ -8345,31 +8300,16 @@ export async function migrateCrestv1( req, res ) {
             };
           } ) );
 
-          const existingTemplateWithMaxIndex = await fixtureConfigService.sortAndFindOne(
-              { fixtureCategory: fixtureConfigDoc.fixtureCategory,
-                fixtureWidth: fixtureConfigDoc.fixtureWidth }, {}, { templateIndex: -1 } );
-
-          let templateIndex = 1;
+          const baseFixtureName = `${fixtureConfigDoc.fixtureCategory}`;
+          const uniqueFixtureName = await generateFixtureTemplateName( baseFixtureName, fixtureConfigDoc.fixtureWidth );
 
-          if ( existingTemplateWithMaxIndex.length ) {
-            templateIndex = existingTemplateWithMaxIndex[0].toObject().templateIndex + 1;
-          }
-
-          let templateName = `Template-${templateIndex}-${fixtureConfigDoc.fixtureCategory}`;
-
-          const isTemplateExist = await fixtureConfigService.findOne( { crestMapKey: mapKey } );
-          if ( isTemplateExist ) {
-            templateIndex = undefined;
-            templateName = undefined;
-          }
 
           const fixtureTemplateData = {
             ...fixtureConfigDoc,
             'shelfConfig': shelfTemplate,
             'vmConfig': vmTemplate,
             'clientId': fixtureConfigDoc.clientId,
-            'fixtureName': templateName,
-            'templateIndex': templateIndex,
+            'fixtureName': uniqueFixtureName,
             'header': {
               label: fixture.centerSubMain,
               isEnabled: true,
@@ -8401,16 +8341,16 @@ export async function migrateCrestv1( req, res ) {
             'planoId': layoutDoc.planoId,
             'floorId': layoutDoc._id,
             'relativePosition': {
+              'x': xPos,
+              'y': yPos,
+              'unit': 'ft',
+            },
+            'fixtureNumber': fixtureCounter,
+            'relativeDetailedPosition': {
               'x': detailedXPos,
               'y': detailedYPos,
               'unit': 'ft',
             },
-            'fixtureNumber': fixtureCounter,
-            // 'relativeDetailedPosition': {
-            //   'x': detailedXPos,
-            //   'y': detailedYPos,
-            //   'unit': 'ft',
-            // },
             'associatedElementFixtureNumber': index+1,
             'fixtureConfigId': fixtureTemplate.toObject()._id,
           };

package/src/controllers/storeBuilder.controller.js

@@ -2728,10 +2728,10 @@ export async function storeFixturesv2( req, res ) {
                     } ),
                 );
 
-                const centerFixtures = await storeFixtureService.findAndSort( {
+                const centerFixtures = await storeFixtureService.find( {
                   floorId: floor._id,
                   fixtureType: 'floor',
-                }, {}, { associatedElementFixtureNumber: 1 } );
+                } );
 
                 const centerFixturesWithStatus = await Promise.all(
                     centerFixtures.map( async ( fixture ) => {