tango-app-api-store-builder 1.0.0-beta-59 → 1.0.0-beta-61

package/package.json

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

package/src/controllers/script.controller.js

@@ -17,6 +17,9 @@ import mongoose from 'mongoose';
 
 export async function getStoreNames( req, res ) {
   try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
     if ( !req.files.file ) {
       return res.sendError( 'Excel file is required', 400 );
     }
@@ -40,6 +43,9 @@ export async function getStoreNames( req, res ) {
 
 export async function createFixtureConfig( req, res ) {
   try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
     if ( !req.files.file ) {
       return res.sendError( 'Invalid or missing Excel file', 400 );
     }
@@ -105,6 +111,9 @@ export async function createFixtureConfig( req, res ) {
 
 export async function createPlano( req, res ) {
   try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
     if ( !req.files.file ) {
       return res.sendError( 'Invalid or missing Excel file', 400 );
     }
@@ -156,6 +165,9 @@ export async function createPlano( req, res ) {
 
 export async function createFloors( req, res ) {
   try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
     if ( !req.files.file ) {
       return res.sendError( 'Invalid or missing Excel file', 400 );
     }
@@ -350,6 +362,9 @@ export async function createFloors( req, res ) {
 
 export async function createFixturesShelves( req, res ) {
   try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
     if ( !req.files.file ) {
       return res.sendError( 'Invalid or missing Excel file', 400 );
     }
@@ -573,8 +588,6 @@ export async function createFixturesShelves( req, res ) {
 
               await fixtureShelfService.create( shelfData );
 
-              console.log( 'Shelf Data:', createdShelf );
-
               shelfIndex++;
             }
           }
@@ -582,7 +595,7 @@ export async function createFixturesShelves( req, res ) {
       }
 
       for ( let index = 0; index < backFixtures.length; index++ ) {
-        const fixture = rightFixtures[index];
+        const fixture = backFixtures[index];
 
         const fixtureData = {
           'clientId': layoutDoc.clientId,
@@ -682,9 +695,7 @@ export async function createFixturesShelves( req, res ) {
                 'sectionZone': section.sectionId,
               };
 
-              const createdShelf = await fixtureShelfService.create( shelfData );
-
-              console.log( 'Shelf Data:', createdShelf );
+              await fixtureShelfService.create( shelfData );
 
               shelfIndex++;
             }
@@ -794,9 +805,6 @@ export async function createFixturesShelves( req, res ) {
               };
 
               await fixtureShelfService.create( shelfData );
-
-              console.log( 'Shelf Data:', createdShelf );
-
               shelfIndex++;
             }
           }
@@ -921,8 +929,6 @@ export async function createFixturesShelves( req, res ) {
 
               await fixtureShelfService.create( shelfData );
 
-              console.log( 'Shelf Data:', createdShelf );
-
               shelfIndex++;
             }
           }
@@ -940,6 +946,9 @@ export async function createFixturesShelves( req, res ) {
 
 export async function updateFixturesShelves( req, res ) {
   try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
     if ( !req.files.file ) {
       return res.sendError( 'Invalid or missing Excel file', 400 );
     }
@@ -1531,6 +1540,9 @@ export async function updateFixturesShelves( req, res ) {
 
 export async function createVmData( req, res ) {
   try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
     if ( !req.files.file ) {
       return res.sendError( 'Invalid or missing Excel file', 400 );
     }
@@ -1576,6 +1588,9 @@ export async function createVmData( req, res ) {
 
 export async function lk98lK1993Update( req, res ) {
   try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
     const modelFixture = await storeFixtureService.findOne( { storeName: 'LKST98', fixtureNumber: 1 } );
 
     const modelShelves = await fixtureShelfService.find( { fixtureId: modelFixture.toObject()._id } );
@@ -1639,6 +1654,9 @@ export async function lk98lK1993Update( req, res ) {
 
 export async function updateInventory( req, res ) {
   try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
     if ( !req.files.file ) {
       return res.sendError( 'Invalid or missing Excel file', 400 );
     }
@@ -1678,6 +1696,9 @@ export async function updateInventory( req, res ) {
 
 export async function updateRfidProduct( req, res ) {
   try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
     const productMappings = await planoMappingService.find( { fixtureId: req.body.fixtureId } );
 
     console.log( productMappings );
@@ -1704,6 +1725,9 @@ export async function updateRfidProduct( req, res ) {
 
 export async function updateRfidProduct2( req, res ) {
   try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
     const data = req.body.data;
 
     for ( let i = 0; i < data.length; i++ ) {

package/src/controllers/storeBuilder.controller.js

@@ -2057,6 +2057,16 @@ export async function storeFixturesTask( req, res ) {
                                 } ),
                             );
 
+                            const vms = await planoMappingService.find( { fixtureId: fixture._id, type: 'vm' } );
+
+                            const vmDetails = await Promise.all( vms.map( async ( vm ) => {
+                              const vmTemplate = await planoProductService.findOne( { _id: vm.toObject().productId } );
+                              return {
+                                ...vm.toObject(),
+                                ...vmTemplate?.toObject(),
+                              };
+                            } ) );
+
                             return {
                               ...fixture.toObject(),
                               status: compliance?.status ? compliance.status : '',
@@ -2064,6 +2074,7 @@ export async function storeFixturesTask( req, res ) {
                               productCount: productCount,
                               vmCount: vmCount,
                               shelfDetails: shelfDetails,
+                              vms: vmDetails,
                             };
                           } ),
                       );
@@ -2125,6 +2136,17 @@ export async function storeFixturesTask( req, res ) {
                           } ),
                       );
 
+                      const vms = await planoMappingService.find( { fixtureId: fixture._id, type: 'vm' } );
+
+                      const vmDetails = await Promise.all( vms.map( async ( vm ) => {
+                        const vmTemplate = await planoProductService.findOne( { _id: vm.toObject().productId } );
+
+                        return {
+                          ...vm.toObject(),
+                          ...vmTemplate?.toObject(),
+                        };
+                      } ) );
+
                       return {
                         ...fixture.toObject(),
                         status: compliance?.status ? compliance.status : '',
@@ -2132,6 +2154,7 @@ export async function storeFixturesTask( req, res ) {
                         productCount: productCount,
                         vmCount: vmCount,
                         shelfDetails: shelfDetails,
+                        vms: vmDetails,
                       };
                     } ),
                 );

package/src/controllers/task.controller.js

@@ -153,7 +153,7 @@ export async function createTask( req, res ) {
         approvalEnable: false,
         redoStatus: false,
         isPlano: true,
-        planoType: task.checkListName == 'Product Verification' ? 'product' : task.checkListName == 'Fixture Verification' ? 'fixture' : task.checkListName == 'Layout Verification' ? 'layout' : 'vm',
+        planoType: task.checkListName == 'Product Verification' ? 'product' : task.checkListName == 'Layout and Fixture Verification' ? 'layoutFixture' : 'vm',
       };
       let query = [
         {

package/src/routes/storeBuilder.routes.js

@@ -23,7 +23,7 @@ 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( '/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 )

package/src/routes/task.routes.js

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