tango-app-api-store-builder 1.0.0-beta-77 → 1.0.0-beta-79

package/package.json

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

package/src/controllers/script.controller.js

@@ -2548,6 +2548,7 @@ export async function createCrestPlanogram( req, res ) {
       for ( let index = 0; index < leftFixtures.length; index++ ) {
         const fixture = leftFixtures[index];
         const fixtureConfig = await fixtureConfigService.findOne( { fixtureCategory: fixture.fixtureType } );
+        if ( !fixtureConfig ) continue;
         const fixtureConfigDoc = fixtureConfig.toObject();
 
         const fixtureData = {
@@ -2650,41 +2651,37 @@ export async function createCrestPlanogram( req, res ) {
           const vmConfig = fixtureConfigDoc.vmConfig.filter( ( vm ) => vm.position === fixture.productZones[i].zoneName );
 
           for ( const vm of vms ) {
-            let vmTemplate = await planoProductService.findOne( { productName: vm.productName, fixtureConfigId: fixtureConfig._id } );
-            if ( !vmTemplate ) {
-              let configData = vmConfig[0];
+            let configData = vmConfig[0];
 
-              if ( vm.productName === 'Creatr' && fixture.productZones[i].zoneName === 'Mid' ) {
-                configData = vmConfig.find( ( config ) => config.vmNumber === 3 );
-              }
+            if ( vm.productName === 'Creatr' && fixture.productZones[i].zoneName === 'Mid' ) {
+              configData = vmConfig.find( ( config ) => config.vmNumber === 3 );
+            }
 
-              if ( vm.productName !== 'Creatr' && fixture.productZones[i].zoneName === 'Mid' ) {
-                configData = vmConfig.find( ( config ) => config.vmNumber === 2 );
-              }
+            if ( !configData ) continue;
+            const insertData = {
+              'clientId': '11',
+              'productId': 'VMCR',
+              'type': 'vm',
+              'productName': vm.productName,
+              'productHeight': {
+                'value': configData.vmHeightmm,
+                'unit': 'mm',
+              },
+              'productWidth': {
+                'value': configData.vmWidthmm,
+                'unit': 'mm',
+              },
+              'startYPosition': configData.startShelf,
+              'endYPosition': configData.endShelf,
+              'xZone': configData.zone,
+              'fixtureConfigId': fixtureConfig._id,
+            };
 
-              const insertData = {
-                'clientId': '11',
-                'productId': 'VMCR',
-                'type': 'vm',
-                'productName': vm.productName,
-                'productHeight': {
-                  'value': configData.vmHeightmm,
-                  'unit': 'mm',
-                },
-                'productWidth': {
-                  'value': configData.vmWidthmm,
-                  'unit': 'mm',
-                },
-                'startYPosition': configData.startShelf,
-                'endYPosition': configData.endShelf,
-                'xZone': configData.zone,
-                'fixtureConfigId': fixtureConfig._id,
-              };
+            const vmTemplate = await planoProductService.upsertOne(
+                { 'productName': vm.productName, 'fixtureConfigId': fixtureConfig._id, 'productHeight.value': configData.vmHeightmm,
+                  'productWidth.value': configData.vmWidthmm, 'startYPosition': configData.startShelf, 'endYPosition': configData.endShelf, 'xZone': configData.zone },
+                insertData );
 
-              vmTemplate = await planoProductService.upsertOne(
-                  { productName: vm.productName, fixtureConfigId: fixtureConfig._id },
-                  insertData );
-            }
 
             const vmData = {
               'clientId': layoutDoc.clientId,
@@ -2711,6 +2708,7 @@ export async function createCrestPlanogram( req, res ) {
       for ( let index = 0; index < backFixtures.length; index++ ) {
         const fixture = backFixtures[index];
         const fixtureConfig = await fixtureConfigService.findOne( { fixtureCategory: fixture.fixtureType } );
+        if ( !fixtureConfig ) continue;
         const fixtureConfigDoc = fixtureConfig.toObject();
 
         const fixtureData = {
@@ -2812,41 +2810,38 @@ export async function createCrestPlanogram( req, res ) {
           const vmConfig = fixtureConfigDoc.vmConfig.filter( ( vm ) => vm.position === fixture.productZones[i].zoneName );
 
           for ( const vm of vms ) {
-            let vmTemplate = await planoProductService.findOne( { productName: vm.productName, fixtureConfigId: fixtureConfig._id } );
-            if ( !vmTemplate ) {
-              let configData = vmConfig[0];
+            let configData = vmConfig[0];
 
-              if ( vm.productName === 'Creatr' && fixture.productZones[i].zoneName === 'Mid' ) {
-                configData = vmConfig.find( ( config ) => config.vmNumber === 3 );
-              }
+            if ( vm.productName === 'Creatr' && fixture.productZones[i].zoneName === 'Mid' ) {
+              configData = vmConfig.find( ( config ) => config.vmNumber === 3 );
+            }
 
-              if ( vm.productName !== 'Creatr' && fixture.productZones[i].zoneName === 'Mid' ) {
-                configData = vmConfig.find( ( config ) => config.vmNumber === 2 );
-              }
 
-              const insertData = {
-                'clientId': '11',
-                'productId': 'VMCR',
-                'type': 'vm',
-                'productName': vm.productName,
-                'productHeight': {
-                  'value': configData.vmHeightmm,
-                  'unit': 'mm',
-                },
-                'productWidth': {
-                  'value': configData.vmWidthmm,
-                  'unit': 'mm',
-                },
-                'startYPosition': configData.startShelf,
-                'endYPosition': configData.endShelf,
-                'xZone': configData.zone,
-                'fixtureConfigId': fixtureConfig._id,
-              };
+            if ( !configData ) continue;
+            const insertData = {
+              'clientId': '11',
+              'productId': 'VMCR',
+              'type': 'vm',
+              'productName': vm.productName,
+              'productHeight': {
+                'value': configData.vmHeightmm,
+                'unit': 'mm',
+              },
+              'productWidth': {
+                'value': configData.vmWidthmm,
+                'unit': 'mm',
+              },
+              'startYPosition': configData.startShelf,
+              'endYPosition': configData.endShelf,
+              'xZone': configData.zone,
+              'fixtureConfigId': fixtureConfig._id,
+            };
+
+            const vmTemplate = await planoProductService.upsertOne(
+                { 'productName': vm.productName, 'fixtureConfigId': fixtureConfig._id, 'productHeight.value': configData.vmHeightmm,
+                  'productWidth.value': configData.vmWidthmm, 'startYPosition': configData.startShelf, 'endYPosition': configData.endShelf, 'xZone': configData.zone },
+                insertData );
 
-              vmTemplate = await planoProductService.upsertOne(
-                  { productName: vm.productName, fixtureConfigId: fixtureConfig._id },
-                  insertData );
-            }
 
             const vmData = {
               'clientId': layoutDoc.clientId,
@@ -2873,6 +2868,7 @@ export async function createCrestPlanogram( req, res ) {
       for ( let index = 0; index < rightFixtures.length; index++ ) {
         const fixture = rightFixtures[index];
         const fixtureConfig = await fixtureConfigService.findOne( { fixtureCategory: fixture.fixtureType } );
+        if ( !fixtureConfig ) continue;
         const fixtureConfigDoc = fixtureConfig.toObject();
 
         const fixtureData = {
@@ -2974,41 +2970,40 @@ export async function createCrestPlanogram( req, res ) {
           const vmConfig = fixtureConfigDoc.vmConfig.filter( ( vm ) => vm.position === fixture.productZones[i].zoneName );
 
           for ( const vm of vms ) {
-            let vmTemplate = await planoProductService.findOne( { productName: vm.productName, fixtureConfigId: fixtureConfig._id } );
-            if ( !vmTemplate ) {
-              let configData = vmConfig[0];
+            let configData = vmConfig[0];
 
-              if ( vm.productName === 'Creatr' && fixture.productZones[i].zoneName === 'Mid' ) {
-                configData = vmConfig.find( ( config ) => config.vmNumber === 3 );
-              }
 
-              if ( vm.productName !== 'Creatr' && fixture.productZones[i].zoneName === 'Mid' ) {
-                configData = vmConfig.find( ( config ) => config.vmNumber === 2 );
-              }
+            if ( vm.productName === 'Creatr' && fixture.productZones[i].zoneName === 'Mid' ) {
+              configData = vmConfig.find( ( config ) => config.vmNumber === 3 );
+            }
 
-              const insertData = {
-                'clientId': '11',
-                'productId': 'VMCR',
-                'type': 'vm',
-                'productName': vm.productName,
-                'productHeight': {
-                  'value': configData.vmHeightmm,
-                  'unit': 'mm',
-                },
-                'productWidth': {
-                  'value': configData.vmWidthmm,
-                  'unit': 'mm',
-                },
-                'startYPosition': configData.startShelf,
-                'endYPosition': configData.endShelf,
-                'xZone': configData.zone,
-                'fixtureConfigId': fixtureConfig._id,
-              };
 
-              vmTemplate = await planoProductService.upsertOne(
-                  { productName: vm.productName, fixtureConfigId: fixtureConfig._id },
-                  insertData );
-            }
+            if ( !configData ) continue;
+
+            const insertData = {
+              'clientId': '11',
+              'productId': 'VMCR',
+              'type': 'vm',
+              'productName': vm.productName,
+              'productHeight': {
+                'value': configData.vmHeightmm,
+                'unit': 'mm',
+              },
+              'productWidth': {
+                'value': configData.vmWidthmm,
+                'unit': 'mm',
+              },
+              'startYPosition': configData.startShelf,
+              'endYPosition': configData.endShelf,
+              'xZone': configData.zone,
+              'fixtureConfigId': fixtureConfig._id,
+            };
+
+            const vmTemplate = await planoProductService.upsertOne(
+                { 'productName': vm.productName, 'fixtureConfigId': fixtureConfig._id, 'productHeight.value': configData.vmHeightmm,
+                  'productWidth.value': configData.vmWidthmm, 'startYPosition': configData.startShelf, 'endYPosition': configData.endShelf, 'xZone': configData.zone },
+                insertData );
+
 
             const vmData = {
               'clientId': layoutDoc.clientId,
@@ -3053,6 +3048,7 @@ export async function createCrestPlanogram( req, res ) {
         const detailedYPos = roundToTwo( ( detailedStartingY + rowIndex * ( constantDetailedFixtureWidth / mmToFeet ) ) );
 
         const fixtureConfig = await fixtureConfigService.findOne( { fixtureCategory: fixture.main } );
+        if ( !fixtureConfig ) continue;
         const fixtureConfigDoc = fixtureConfig.toObject();
 
         const fixtureData = {
@@ -3148,34 +3144,33 @@ export async function createCrestPlanogram( req, res ) {
         const vmConfig = fixtureConfigDoc.vmConfig;
 
         if ( vm ) {
-          let vmTemplate1 = await planoProductService.findOne( { productName: vm.name, fixtureConfigId: fixtureConfig._id } );
-          if ( !vmTemplate1 ) {
-            const configData1 = vmConfig[0];
+          const configData1 = vmConfig[0];
 
 
-            const insertData1 = {
-              'clientId': '11',
-              'productId': 'VMCR',
-              'type': 'vm',
-              'productName': vm.name,
-              'productHeight': {
-                'value': configData1.vmHeightmm,
-                'unit': 'mm',
-              },
-              'productWidth': {
-                'value': configData1.vmWidthmm,
-                'unit': 'mm',
-              },
-              'startYPosition': configData1.startShelf,
-              'endYPosition': configData1.endShelf,
-              'xZone': configData1.zone,
-              'fixtureConfigId': fixtureConfig._id,
-            };
+          const insertData1 = {
+            'clientId': '11',
+            'productId': 'VMCR',
+            'type': 'vm',
+            'productName': vm.name,
+            'productHeight': {
+              'value': configData1.vmHeightmm,
+              'unit': 'mm',
+            },
+            'productWidth': {
+              'value': configData1.vmWidthmm,
+              'unit': 'mm',
+            },
+            'startYPosition': configData1.startShelf,
+            'endYPosition': configData1.endShelf,
+            'xZone': configData1.zone,
+            'fixtureConfigId': fixtureConfig._id,
+          };
+
+          const vmTemplate1 = await planoProductService.upsertOne(
+              { 'productName': vm.name, 'fixtureConfigId': fixtureConfig._id, 'productHeight.value': configData1.vmHeightmm,
+                'productWidth.value': configData1.vmWidthmm, 'startYPosition': configData1.startShelf, 'endYPosition': configData1.endShelf, 'xZone': configData1.zone },
+              insertData1 );
 
-            vmTemplate1 = await planoProductService.upsertOne(
-                { productName: vm.productName, fixtureConfigId: fixtureConfig._id },
-                insertData1 );
-          }
 
           const vmData1 = {
             'clientId': layoutDoc.clientId,
@@ -3196,34 +3191,33 @@ export async function createCrestPlanogram( req, res ) {
               vmData1,
           );
 
-          let vmTemplate2 = await planoProductService.findOne( { productName: ' ', fixtureConfigId: fixtureConfig._id } );
-          if ( !vmTemplate2 ) {
-            const configData2 = vmConfig[1];
+          const configData2 = vmConfig[1];
 
+          const insertData2 = {
+            'clientId': '11',
+            'productId': 'VMCR',
+            'type': 'vm',
+            'productName': ' ',
+            'productHeight': {
+              'value': configData2.vmHeightmm,
+              'unit': 'mm',
+            },
+            'productWidth': {
+              'value': configData2.vmWidthmm,
+              'unit': 'mm',
+            },
+            'startYPosition': configData2.startShelf,
+            'endYPosition': configData2.endShelf,
+            'xZone': configData2.zone,
+            'fixtureConfigId': fixtureConfig._id,
+          };
 
-            const insertData2 = {
-              'clientId': '11',
-              'productId': 'VMCR',
-              'type': 'vm',
-              'productName': ' ',
-              'productHeight': {
-                'value': configData2.vmHeightmm,
-                'unit': 'mm',
-              },
-              'productWidth': {
-                'value': configData2.vmWidthmm,
-                'unit': 'mm',
-              },
-              'startYPosition': configData2.startShelf,
-              'endYPosition': configData2.endShelf,
-              'xZone': configData2.zone,
-              'fixtureConfigId': fixtureConfig._id,
-            };
 
-            vmTemplate2 = await planoProductService.upsertOne(
-                { productName: ' ', fixtureConfigId: fixtureConfig._id },
-                insertData2 );
-          }
+          const vmTemplate2 = await planoProductService.upsertOne(
+              { 'productName': ' ', 'fixtureConfigId': fixtureConfig._id, 'productHeight.value': configData2.vmHeightmm,
+                'productWidth.value': configData2.vmWidthmm, 'startYPosition': configData2.startShelf, 'endYPosition': configData2.endShelf, 'xZone': configData2.zone },
+              insertData2 );
+
 
           const vmData2 = {
             'clientId': layoutDoc.clientId,

package/src/controllers/storeBuilder.controller.js

@@ -1037,6 +1037,7 @@ export async function fixtureShelfProductv1( req, res ) {
     };
 
     fixture.imageUrl = await signedUrl( params );
+    let fixtureConfigDetails = await fixtureConfigService.findOne( { _id: fixture?.fixtureConfigId } );
 
     const currentDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
 
@@ -1080,7 +1081,7 @@ export async function fixtureShelfProductv1( req, res ) {
     if ( fixture.toObject().productResolutionLevel === 'L1' ) {
       const productMappings = await planoMappingService.find( { fixtureId: new mongoose.Types.ObjectId( fixtureId ), type: 'product' } );
       const productDetails = await getProducts( productMappings );
-      return res.sendSuccess( { ...fixture.toObject(), products: productDetails, vms: vmDetails, productCount: productMappings.length } );
+      return res.sendSuccess( { ...fixture.toObject(), fixtureConfigLength: fixtureConfigDetails?.fixtureLength, products: productDetails, vms: vmDetails, productCount: productMappings.length } );
     }
 
     if ( [ 'L2', 'L4' ].includes( fixture.toObject().productResolutionLevel ) ) {
@@ -1094,7 +1095,7 @@ export async function fixtureShelfProductv1( req, res ) {
             return { ...shelf.toObject(), products: productDetails };
           } ),
       );
-      return res.sendSuccess( { ...fixture.toObject(), shelves: shelfProducts, vms: vmDetails, productCount: productCount } );
+      return res.sendSuccess( { ...fixture.toObject(), fixtureConfigLength: fixtureConfigDetails?.fixtureLength, shelves: shelfProducts, vms: vmDetails, productCount: productCount } );
     }
 
     if ( fixture.toObject().productResolutionLevel === 'L3' ) {
@@ -1110,7 +1111,7 @@ export async function fixtureShelfProductv1( req, res ) {
         acc[sectionName].push( { ...shelf.toObject(), products: productDetails } );
         return acc;
       }, Promise.resolve( {} ) );
-      return res.sendSuccess( { ...fixture.toObject(), categories: await groupedShelves, vms: vmDetails, productCount: productCount } );
+      return res.sendSuccess( { ...fixture.toObject(), fixtureConfigLength: fixtureConfigDetails?.fixtureLength, categories: await groupedShelves, vms: vmDetails, productCount: productCount } );
     }
 
     return res.sendError( 'Incorrect resolution level', 400 );

package/src/routes/storeBuilder.routes.js

@@ -10,7 +10,7 @@ export const storeBuilderRouter = express.Router();
 storeBuilderRouter
     .post( '/createStoreLayout', isAllowedSessionHandler, validate( validateDtos.createBuilder ), storeBuilderController.createStoreBuilder )
     .post( '/updateStoreLayout', isAllowedSessionHandler, validate( validateDtos.updateStoreLayout ), storeBuilderController.updateStoreLayout )
-    .post( '/storeLayoutList', validate( validateDtos.storeLayoutList ), storeBuilderController.getLayoutList )
+    .post( '/storeLayoutList', isAllowedSessionHandler, validate( validateDtos.storeLayoutList ), storeBuilderController.getLayoutList )
     .post( '/updateFloor', isAllowedSessionHandler, validate( validateDtos.updateFloor ), storeBuilderController.updateFloor )
     .post( '/uploadBulkStore', isAllowedSessionHandler, storeBuilderController.uploadBulkStore )
     .post( '/uploadFile', isAllowedSessionHandler, storeBuilderController.uploadFile )
@@ -23,8 +23,8 @@ storeBuilderRouter
     // .post( '/FixtureShelfDetails', storeBuilderController.fixtureShelfProduct )
     // .post( '/scan', storeBuilderController.scan )
     .post( '/storeLayout', isAllowedSessionHandler, validate( validateDtos.storeList ), storeBuilderController.storeLayout )
-    .post( '/storeFixtures', validate( validateDtos.storeList ), storeBuilderController.storeFixturesv1 )
-    .post( '/FixtureShelfDetails', validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv1 )
+    .post( '/storeFixtures', isAllowedSessionHandler, validate( validateDtos.storeList ), storeBuilderController.storeFixturesv1 )
+    .post( '/FixtureShelfDetails', isAllowedSessionHandler, validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv1 )
     .post( '/scan', isAllowedSessionHandler, storeBuilderController.scanv1 )
     .post( '/updateMissing', isAllowedSessionHandler, storeBuilderController.updateMissing )
     .post( '/bulkFixtureUpload', isAllowedSessionHandler, storeBuilderController.bulkFixtureUpload )
@@ -41,5 +41,5 @@ storeBuilderRouter
     .post( '/getFixtureTypes', isAllowedSessionHandler, storeBuilderController.getFixtureTypes )
     .post( '/getFixtureLengths', isAllowedSessionHandler, storeBuilderController.getFixtureLengths )
     .post( '/getFixtureBrands', isAllowedSessionHandler, storeBuilderController.getFixtureBrands )
-    .post( '/checkPlanoExist', storeBuilderController.checkPlanoExist )
+    .post( '/checkPlanoExist', isAllowedSessionHandler, storeBuilderController.checkPlanoExist )
     .post( '/storeLayoutElements', isAllowedSessionHandler, storeBuilderController.storeLayoutElements );