tango-app-api-store-builder 1.0.0-beta-55 → 1.0.0-beta-57

package/package.json

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

package/src/controllers/script.controller.js

@@ -259,8 +259,8 @@ export async function createFloors( req, res ) {
       const maxYDetailedDistance = Math.max( floorYDetailedDistanceFeet, backYDetailedDistanceFeet );
 
 
-      const finalXDistance = maxXDistance < ( backXDistanceFeet + floorXDistanceFeet )? ( ( backXDistanceFeet + floorXDistanceFeet ) + ( ( 2 * constantFixtureLength )/mmToFeet ) ) : maxXDistance;
-      const finalXDetailedDistance = maxXDetailedDistance < ( backXDetailedDistanceFeet + floorXDetailedDistanceFeet )? ( ( backXDetailedDistanceFeet + floorXDetailedDistanceFeet ) + ( ( 2 * constantDetailedFixtureLength )/mmToFeet ) ) : maxXDetailedDistance;
+      const finalXDistance = maxXDistance < ( backXDistanceFeet + floorXDistanceFeet )? ( ( backXDistanceFeet + floorXDistanceFeet ) + ( ( 2 * constantFixtureLength )/mmToFeet ) ) : ( floorFixtures.length && backFixtures.length ) ? ( maxXDistance + ( ( 2 * constantFixtureLength )/mmToFeet ) ) : maxXDistance;
+      const finalXDetailedDistance = maxXDetailedDistance < ( backXDetailedDistanceFeet + floorXDetailedDistanceFeet )? ( ( backXDetailedDistanceFeet + floorXDetailedDistanceFeet ) + ( ( 2 * constantDetailedFixtureLength )/mmToFeet ) ) : ( floorFixtures.length && backFixtures.length ) ? ( maxXDetailedDistance + ( ( 2 * constantDetailedFixtureLength )/mmToFeet ) ) : maxXDetailedDistance;
 
       const finalYDistance = maxYDistance < ( leftYDistanceFeet + rightYDistanceFeet + floorYDistanceFeet ) ? ( ( leftYDistanceFeet + rightYDistanceFeet + floorYDistanceFeet ) + ( ( 2 * constantFixtureWidth )/mmToFeet ) ) : ( maxYDistance + ( ( constantFixtureWidth )/mmToFeet ) );
       const finalYDetailedDistance = maxYDetailedDistance < ( leftYDetailedDistanceFeet + rightYDetailedDistanceFeet + floorYDetailedDistanceFeet ) ? ( ( leftYDetailedDistanceFeet + rightYDetailedDistanceFeet + floorYDetailedDistanceFeet ) + ( ( 2 * constantDetailedFixtureWidth )/mmToFeet ) ) : ( maxYDetailedDistance + ( ( constantDetailedFixtureWidth )/mmToFeet ) );
@@ -337,7 +337,7 @@ export async function createFloors( req, res ) {
 
       await storeBuilderService.create( floorInsertData );
 
-      // console.log( floorInsertData );
+      console.log( floorInsertData );
     } ) );
 
     return res.sendSuccess( { message: 'Floor data inserted successfully' } );
@@ -456,8 +456,8 @@ export async function createFixturesShelves( req, res ) {
       const maxYDistance = Math.max( floorYDistanceFeet, backYDistanceFeet );
       const maxYDetailedDistance = Math.max( floorYDetailedDistanceFeet, backYDetailedDistanceFeet );
 
-      const finalXDistance = maxXDistance < ( backXDistanceFeet + floorXDistanceFeet )? ( ( backXDistanceFeet + floorXDistanceFeet ) + ( ( 2 * constantFixtureLength )/mmToFeet ) ) : maxXDistance;
-      const finalXDetailedDistance = maxXDetailedDistance < ( backXDetailedDistanceFeet + floorXDetailedDistanceFeet )? ( ( backXDetailedDistanceFeet + floorXDetailedDistanceFeet ) + ( ( 2 * constantDetailedFixtureLength )/mmToFeet ) ) : maxXDistance;
+      const finalXDistance = maxXDistance < ( backXDistanceFeet + floorXDistanceFeet )? ( ( backXDistanceFeet + floorXDistanceFeet ) + ( ( 2 * constantFixtureLength )/mmToFeet ) ) : ( floorFixtures.length && backFixtures.length ) ? ( maxXDistance + ( ( 2 * constantFixtureLength )/mmToFeet ) ) : maxXDistance;
+      const finalXDetailedDistance = maxXDetailedDistance < ( backXDetailedDistanceFeet + floorXDetailedDistanceFeet )? ( ( backXDetailedDistanceFeet + floorXDetailedDistanceFeet ) + ( ( 2 * constantDetailedFixtureLength )/mmToFeet ) ) : ( floorFixtures.length && backFixtures.length ) ? ( maxXDetailedDistance + ( ( 2 * constantDetailedFixtureLength )/mmToFeet ) ) : maxXDetailedDistance;
 
       const finalYDistance = maxYDistance < ( leftYDistanceFeet + rightYDistanceFeet + floorYDistanceFeet ) ? ( ( leftYDistanceFeet + rightYDistanceFeet + floorYDistanceFeet ) + ( ( 2 * constantFixtureWidth )/mmToFeet ) ) : ( maxYDistance + ( ( constantFixtureWidth )/mmToFeet ) );
       const finalYDetailedDistance = maxYDetailedDistance < ( leftYDetailedDistanceFeet + rightYDetailedDistanceFeet + floorYDetailedDistanceFeet ) ? ( ( leftYDetailedDistanceFeet + rightYDetailedDistanceFeet + floorYDetailedDistanceFeet ) + ( ( 2 * constantDetailedFixtureWidth )/mmToFeet ) ) : ( maxYDetailedDistance + ( ( constantDetailedFixtureWidth )/mmToFeet ) );
@@ -519,7 +519,7 @@ export async function createFixturesShelves( req, res ) {
 
         const createdFixture = await storeFixtureService.create( fixtureData );
 
-        // console.log( 'Fixture Data', fixtureData );
+        console.log( 'Fixture Data', fixtureData );
 
 
         const vms = typeof fixture?.['VM Template ID'] === 'string' ? fixture?.['VM Template ID']?.split( ', ' ).map( ( item ) => item.trim() ) : [];
@@ -573,7 +573,7 @@ export async function createFixturesShelves( req, res ) {
 
               await fixtureShelfService.create( shelfData );
 
-              // console.log( 'Shelf Data:', createdShelf );
+              console.log( 'Shelf Data:', createdShelf );
 
               shelfIndex++;
             }
@@ -635,7 +635,7 @@ export async function createFixturesShelves( req, res ) {
 
         const createdFixture = await storeFixtureService.create( fixtureData );
 
-        // console.log( 'Fixture Data', fixtureData );
+        console.log( 'Fixture Data', fixtureData );
 
         const vms = typeof fixture?.['VM Template ID'] === 'string' ? fixture?.['VM Template ID']?.split( ', ' ).map( ( item ) => item.trim() ) : [];
 
@@ -684,7 +684,7 @@ export async function createFixturesShelves( req, res ) {
 
               const createdShelf = await fixtureShelfService.create( shelfData );
 
-              // console.log( 'Shelf Data:', createdShelf );
+              console.log( 'Shelf Data:', createdShelf );
 
               shelfIndex++;
             }
@@ -746,7 +746,7 @@ export async function createFixturesShelves( req, res ) {
 
         const createdFixture = await storeFixtureService.create( fixtureData );
 
-        // console.log( 'Fixture Data', fixtureData );
+        console.log( 'Fixture Data', fixtureData );
 
         const vms = typeof fixture?.['VM Template ID'] === 'string' ? fixture?.['VM Template ID']?.split( ', ' ).map( ( item ) => item.trim() ) : [];
 
@@ -795,7 +795,7 @@ export async function createFixturesShelves( req, res ) {
 
               await fixtureShelfService.create( shelfData );
 
-              // console.log( 'Shelf Data:', createdShelf );
+              console.log( 'Shelf Data:', createdShelf );
 
               shelfIndex++;
             }
@@ -871,7 +871,7 @@ export async function createFixturesShelves( req, res ) {
         };
 
         const createdFixture = await storeFixtureService.create( fixtureData );
-        // console.log( 'Fixture Data', fixtureData );
+        console.log( 'Fixture Data', fixtureData );
 
         const vms = typeof fixture?.['VM Template ID'] === 'string' ? fixture?.['VM Template ID']?.split( ', ' ).map( ( item ) => item.trim() ) : [];
 
@@ -921,7 +921,7 @@ export async function createFixturesShelves( req, res ) {
 
               await fixtureShelfService.create( shelfData );
 
-              // console.log( 'Shelf Data:', createdShelf );
+              console.log( 'Shelf Data:', createdShelf );
 
               shelfIndex++;
             }

package/src/controllers/storeBuilder.controller.js

@@ -13,6 +13,7 @@ import * as planoMappingService from '../service/planoMapping.service.js';
 import * as planoComplianceService from '../service/planoCompliance.service.js';
 import * as planoTaskComplianceService from '../service/planoTask.service.js';
 import * as planoQrConversionRequestService from '../service/planoQrConversionRequest.service.js';
+import * as fixtureConfigService from '../service/fixtureConfig.service.js';
 
 import path from 'path';
 
@@ -2521,8 +2522,171 @@ export const getShelfSections = async ( req, res ) => {
 
     return res.sendSuccess( data?.sectionNames );
   } catch ( error ) {
-    logger.error( 'upsertFixtures =>', error );
+    logger.error( 'getShelfSections =>', error );
     return res.sendError( 'Internal Server Error', 500 );
   }
 };
 
+export const getFixtureTypes = async ( req, res ) => {
+  try {
+    const pipeline = [
+      {
+        '$match': {
+          'clientId': req.body.clientId,
+        },
+      },
+      {
+        $project:
+          {
+            fixtureCategory: 1,
+          },
+      },
+      {
+        '$match': {
+          'fixtureCategory': { '$ne': null },
+        },
+      },
+      {
+        $group: {
+          _id: '$fixtureCategory',
+        },
+      },
+      {
+        $group: {
+          '_id': null,
+          'fixtureCategory': { '$push': '$_id' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          fixtureCategory: 1,
+        },
+      },
+    ];
+
+    const sections = await fixtureConfigService.aggregate( pipeline );
+
+    if ( !sections.length ) {
+      return res.sendError( 'No data found', 204 );
+    }
+
+    const [ data ] = sections;
+
+    return res.sendSuccess( data?.fixtureCategory );
+  } catch ( error ) {
+    logger.error( 'getFixtureTypes =>', error );
+    return res.sendError( 'Internal Server Error', 500 );
+  }
+};
+
+export const getFixtureLengths = async ( req, res ) => {
+  try {
+    const pipeline = [
+      {
+        '$match': {
+          'clientId': req.body.clientId,
+        },
+      },
+      {
+        $project:
+          {
+            fixtureLength: 1,
+          },
+      },
+      {
+        '$match': {
+          '$and': [
+            { 'fixtureLength': { '$ne': null } },
+            { 'fixtureLength.value': { '$ne': 0 } },
+          ]
+          ,
+        },
+      },
+      {
+        $group: {
+          _id: '$fixtureLength',
+        },
+      },
+      {
+        $group: {
+          '_id': null,
+          'fixtureLength': { '$push': '$_id' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          fixtureLength: 1,
+        },
+      },
+    ];
+
+    const sections = await fixtureConfigService.aggregate( pipeline );
+
+    if ( !sections.length ) {
+      return res.sendError( 'No data found', 204 );
+    }
+
+    const [ data ] = sections;
+
+    return res.sendSuccess( data?.fixtureLength );
+  } catch ( error ) {
+    logger.error( 'getFixtureLengths =>', error );
+    return res.sendError( 'Internal Server Error', 500 );
+  }
+};
+
+
+export const getFixtureBrands = async ( req, res ) => {
+  try {
+    const pipeline = [
+      {
+        '$match': {
+          'clientId': req.body.clientId,
+        },
+      },
+      {
+        $project:
+          {
+            fixtureBrandCategory: 1,
+          },
+      },
+      {
+        '$match': {
+          'fixtureBrandCategory': { '$ne': null },
+        },
+      },
+      {
+        $group: {
+          _id: '$fixtureBrandCategory',
+        },
+      },
+      {
+        $group: {
+          '_id': null,
+          'fixtureBrandCategory': { '$push': '$_id' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          fixtureBrandCategory: 1,
+        },
+      },
+    ];
+
+    const sections = await storeFixtureService.aggregate( pipeline );
+
+    if ( !sections.length ) {
+      return res.sendError( 'No data found', 204 );
+    }
+
+    const [ data ] = sections;
+
+    return res.sendSuccess( data?.fixtureBrandCategory );
+  } catch ( error ) {
+    logger.error( 'getFixtureBrands =>', error );
+    return res.sendError( 'Internal Server Error', 500 );
+  }
+};

package/src/controllers/task.controller.js

@@ -350,7 +350,7 @@ export async function getTaskDetails( req, res ) {
       return res.sendError( 'Store id is required', 400 );
     }
     let date = req.query?.date || dayjs().format( 'YYYY-MM-DD' );
-    let getDetails = await processedService.find( { store_id: req.query.storeId, date_string: date, isPlano: true, checklistStatus: { $ne: 'submit' }, userId: req.user._id }, { checkListName: 1, taskType: '$planoType' } );
+    let getDetails = await processedService.find( { store_id: req.query.storeId, date_string: date, isPlano: true, checklistStatus: { $ne: 'submit' }, userId: req.user._id }, { checkListName: 1, taskType: '$planoType', checklistStatus: 1 } );
     return res.sendSuccess( getDetails );
   } catch ( e ) {
     logger.error( { functionName: 'getTaskDetails', error: e } );

package/src/routes/storeBuilder.routes.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { validate } from 'tango-app-api-middleware';
+import { validate, isAllowedSessionHandler } from 'tango-app-api-middleware';
 import * as storeBuilderController from '../controllers/storeBuilder.controller.js';
 // import * as scriptController from '../controllers/script.controller.js';
 import * as validateDtos from '../dtos/validation.dtos.js';
@@ -8,32 +8,35 @@ import * as validateDtos from '../dtos/validation.dtos.js';
 export const storeBuilderRouter = express.Router();
 
 storeBuilderRouter
-    .post( '/createStoreLayout', validate( validateDtos.createBuilder ), storeBuilderController.createStoreBuilder )
-    .post( '/updateStoreLayout', validate( validateDtos.updateStoreLayout ), storeBuilderController.updateStoreLayout )
-    .post( '/storeLayoutList', validate( validateDtos.storeLayoutList ), storeBuilderController.getLayoutList )
-    .post( '/updateFloor', validate( validateDtos.updateFloor ), storeBuilderController.updateFloor )
-    .post( '/uploadBulkStore', storeBuilderController.uploadBulkStore )
-    .post( '/uploadFile', storeBuilderController.uploadFile )
+    .post( '/createStoreLayout', isAllowedSessionHandler, validate( validateDtos.createBuilder ), storeBuilderController.createStoreBuilder )
+    .post( '/updateStoreLayout', isAllowedSessionHandler, validate( validateDtos.updateStoreLayout ), storeBuilderController.updateStoreLayout )
+    .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 )
     // .post( '/storeLayout', validate( validateDtos.storeList ), storeBuilderController.storeFixtures )
-    .post( '/storeDetails', validate( validateDtos.storeDetails ), storeBuilderController.getStoreDetails )
-    .delete( '/deleteStoreLayout/:id', validate( validateDtos.deleteStoreLayout ), storeBuilderController.deleteStoreLayout )
-    .post( '/removeFile', storeBuilderController.deleteFile )
-    .post( '/deleteFloor', storeBuilderController.deleteFloor )
-    .post( '/updateStatus', validate( validateDtos.updateStatus ), storeBuilderController.updateStatus )
+    .post( '/storeDetails', isAllowedSessionHandler, validate( validateDtos.storeDetails ), storeBuilderController.getStoreDetails )
+    .delete( '/deleteStoreLayout/:id', isAllowedSessionHandler, validate( validateDtos.deleteStoreLayout ), storeBuilderController.deleteStoreLayout )
+    .post( '/removeFile', isAllowedSessionHandler, storeBuilderController.deleteFile )
+    .post( '/deleteFloor', isAllowedSessionHandler, storeBuilderController.deleteFloor )
+    .post( '/updateStatus', isAllowedSessionHandler, validate( validateDtos.updateStatus ), storeBuilderController.updateStatus )
     // .post( '/FixtureShelfDetails', storeBuilderController.fixtureShelfProduct )
     // .post( '/scan', storeBuilderController.scan )
-    .post( '/storeLayout', validate( validateDtos.storeList ), storeBuilderController.storeLayout )
-    .post( '/storeFixtures', validate( validateDtos.storeList ), storeBuilderController.storeFixturesv1 )
-    .post( '/FixtureShelfDetails', validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv1 )
-    .post( '/scan', storeBuilderController.scanv1 )
-    .post( '/updateMissing', storeBuilderController.updateMissing )
-    .post( '/bulkFixtureUpload', storeBuilderController.bulkFixtureUpload )
-    .post( '/uploadImage', storeBuilderController.uploadImage )
-    .post( '/storeFixturesTask', storeBuilderController.storeFixturesTask )
-    .post( '/qrFileUpload', storeBuilderController.qrFileUpload )
-    .post( '/updateQrCvProcessRequest', storeBuilderController.updateQrCvProcessRequest )
-    .post( '/getQrCvProcessRequest', storeBuilderController.getQrCvProcessRequest )
-    .post( '/fixtureQrUpdate', storeBuilderController.fixtureQrUpdate )
-    .post( '/updateDeatailedDistance', storeBuilderController.updateDetailedDistance )
-    .post( '/upsertFixture', storeBuilderController.upsertFixtures )
-    .post( '/getshelfSections', storeBuilderController.getShelfSections );
+    .post( '/storeLayout', isAllowedSessionHandler, validate( validateDtos.storeList ), storeBuilderController.storeLayout )
+    .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 )
+    .post( '/uploadImage', isAllowedSessionHandler, storeBuilderController.uploadImage )
+    .post( '/storeFixturesTask', isAllowedSessionHandler, storeBuilderController.storeFixturesTask )
+    .post( '/qrFileUpload', isAllowedSessionHandler, storeBuilderController.qrFileUpload )
+    .post( '/updateQrCvProcessRequest', isAllowedSessionHandler, storeBuilderController.updateQrCvProcessRequest )
+    .post( '/getQrCvProcessRequest', isAllowedSessionHandler, storeBuilderController.getQrCvProcessRequest )
+    .post( '/fixtureQrUpdate', isAllowedSessionHandler, storeBuilderController.fixtureQrUpdate )
+    .post( '/updateDeatailedDistance', isAllowedSessionHandler, storeBuilderController.updateDetailedDistance )
+    .post( '/upsertFixture', isAllowedSessionHandler, storeBuilderController.upsertFixtures )
+    .post( '/getshelfSections', isAllowedSessionHandler, storeBuilderController.getShelfSections )
+    .post( '/getFixtureTypes', isAllowedSessionHandler, storeBuilderController.getFixtureTypes )
+    .post( '/getFixtureLengths', isAllowedSessionHandler, storeBuilderController.getFixtureLengths )
+    .post( '/getFixtureBrands', isAllowedSessionHandler, storeBuilderController.getFixtureBrands );

package/src/routes/task.routes.js

@@ -5,10 +5,10 @@ import * as taskController from '../controllers/task.controller.js';
 export const storeBuilderTaskRouter = express.Router();
 
 storeBuilderTaskRouter
-    .post( '/createTask', taskController.createTask )
-    .post( '/createPlano', taskController.createPlano )
+    .post( '/createTask', isAllowedSessionHandler, taskController.createTask )
+    .post( '/createPlano', isAllowedSessionHandler, taskController.createPlano )
     .get( '/taskDetails', isAllowedSessionHandler, taskController.getTaskDetails )
-    .post( '/uploadImage', taskController.uploadImage )
-    .post( '/updateStatus', taskController.updateStatus )
-    .post( '/updateAnswers', taskController.updateAnswers )
-    .get( '/getFixtureDetails', taskController.getFixtureDetails );
+    .post( '/uploadImage', isAllowedSessionHandler, taskController.uploadImage )
+    .post( '/updateStatus', isAllowedSessionHandler, taskController.updateStatus )
+    .post( '/updateAnswers', isAllowedSessionHandler, taskController.updateAnswers )
+    .get( '/getFixtureDetails', isAllowedSessionHandler, taskController.getFixtureDetails );