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

package/src/controllers/storeBuilder.controller.js

@@ -607,7 +607,7 @@ export async function storeFixturesv1( req, res ) {
                               date: currentDate,
                             } );
 
-                            const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1 }, { shelfNumber: 1 } );
+                            const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1, shelfSplitup: 1 }, { shelfNumber: 1 } );
 
                             const shelfDetails = await Promise.all(
                                 shelves.map( async ( shelf ) => {
@@ -702,7 +702,7 @@ export async function storeFixturesv1( req, res ) {
                         date: currentDate,
                       } );
 
-                      const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1 }, { shelfNumber: 1 } );
+                      const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1, shelfSplitup: 1 }, { shelfNumber: 1 } );
 
                       const shelfDetails = await Promise.all(
                           shelves.map( async ( shelf ) => {
@@ -2051,7 +2051,7 @@ export async function storeFixturesTask( req, res ) {
                               date_string: req.body?.date,
                             }, { status: 1 } );
 
-                            const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1 }, { shelfNumber: 1 } );
+                            const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1, shelfSplitup: 1 }, { shelfNumber: 1 } );
 
                             const shelfDetails = await Promise.all(
                                 shelves.map( async ( shelf ) => {
@@ -2131,7 +2131,7 @@ export async function storeFixturesTask( req, res ) {
                         date_string: req.body?.date,
                       }, { status: 1 } );
 
-                      const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1 }, { shelfNumber: 1 } );
+                      const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1, shelfSplitup: 1 }, { shelfNumber: 1 } );
 
                       const shelfDetails = await Promise.all(
                           shelves.map( async ( shelf ) => {
@@ -2633,6 +2633,7 @@ export const getFixtureTypes = async ( req, res ) => {
         $project:
           {
             fixtureCategory: 1,
+            fixtureLength: 1,
           },
       },
       {
@@ -2643,12 +2644,13 @@ export const getFixtureTypes = async ( req, res ) => {
       {
         $group: {
           _id: '$fixtureCategory',
+          fixtureLength: { $first: '$fixtureLength' },
         },
       },
       {
         $group: {
           '_id': null,
-          'fixtureCategory': { '$push': '$_id' },
+          'fixtureCategory': { '$push': { $concat: [ '$_id', '-', { $toString: '$fixtureLength.value' }, '$fixtureLength.unit' ] } },
         },
       },
       {

package/src/controllers/task.controller.js

@@ -139,6 +139,8 @@ export async function createTask( req, res ) {
     }
     let endDate = dayjs().add( req.body.days, 'day' ).format( 'YYYY-MM-DD' );
     await Promise.all( taskDetails.map( async ( task ) => {
+      let splitName = task?.checkListName.split( ' ' );
+      splitName.pop();
       let data = {
         client_id: req.body.clientId,
         date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ),
@@ -180,7 +182,7 @@ export async function createTask( req, res ) {
         approvalEnable: false,
         redoStatus: false,
         isPlano: true,
-        planoType: task.checkListName == 'Product Verification' ? 'product' : task.checkListName == 'Layout and Fixture Verification' ? 'layoutFixture' : 'vm',
+        planoType: splitName.length == 1 ? splitName[0].toLowerCase() : splitName[0].toLowerCase() + splitName[2],
       };
       let query = [
         {

package/src/routes/script.routes.js

@@ -19,4 +19,8 @@ scriptRouter
     .post( '/getProdTaskData', scriptController.getProdTaskData )
     .post( '/updateLayoutFeedback', scriptController.updatelayoutFeedback )
     .post( '/updateFixtureFeedback', scriptController.updateFixtureFeedback )
-    .post( '/getFileNames', scriptController.extractZipFileNames );
+    .post( '/getFileNames', scriptController.extractZipFileNames )
+    .post( '/getVmTaskData', scriptController.getVmTaskData )
+    .post( '/updateVmData', scriptController.updateVmData )
+    .post( '/createCrestPlanogram', scriptController.createCrestPlanogram )
+    .post( '/updateCrestVms', scriptController.updateCrestVms );

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', isAllowedSessionHandler, validate( validateDtos.storeLayoutList ), storeBuilderController.getLayoutList )
+    .post( '/storeLayoutList', 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', isAllowedSessionHandler, validate( validateDtos.storeList ), storeBuilderController.storeFixturesv1 )
-    .post( '/FixtureShelfDetails', isAllowedSessionHandler, validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv1 )
+    .post( '/storeFixtures', validate( validateDtos.storeList ), storeBuilderController.storeFixturesv1 )
+    .post( '/FixtureShelfDetails', 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', isAllowedSessionHandler, storeBuilderController.checkPlanoExist )
+    .post( '/checkPlanoExist', storeBuilderController.checkPlanoExist )
     .post( '/storeLayoutElements', isAllowedSessionHandler, storeBuilderController.storeLayoutElements );

package/src/service/fixtureShelf.service.js

@@ -35,3 +35,15 @@ export async function count( data ) {
 export async function deleteOne( query ) {
   return model.fixtureShelfModel.deleteOne( query );
 }
+
+export async function deleteMany( query ) {
+  return model.fixtureShelfModel.deleteMany( query );
+}
+
+export async function upsertOne( query, record ) {
+  return model.fixtureShelfModel.findOneAndUpdate(
+      query,
+      record,
+      { upsert: true, new: true },
+  );
+}

package/src/service/planoMapping.service.js

@@ -26,3 +26,19 @@ export async function count( query ) {
 export async function create( data ) {
   return model.planoMappingModel.create( data );
 }
+
+export async function deleteOne( query ) {
+  return model.planoMappingModel.deleteOne( query );
+}
+
+export async function deleteMany( query ) {
+  return model.planoMappingModel.deleteMany( query );
+}
+
+export async function upsertOne( query, record ) {
+  return model.planoMappingModel.findOneAndUpdate(
+      query,
+      record,
+      { upsert: true, new: true },
+  );
+}

package/src/service/planoProduct.service.js

@@ -28,3 +28,11 @@ export async function updateOne( query, record ) {
 export async function create( data ) {
   return model.planoProductModel.create( data );
 }
+
+export async function upsertOne( query, record ) {
+  return model.planoProductModel.findOneAndUpdate(
+      query,
+      record,
+      { upsert: true, new: true },
+  );
+}

package/src/service/planogram.service.js

@@ -28,6 +28,14 @@ export async function deleteOne( query ) {
   return model.planogramModel.deleteOne( query );
 }
 
+export async function upsertOne( query, record ) {
+  return model.planogramModel.findOneAndUpdate(
+      query,
+      record,
+      { upsert: true, new: true },
+  );
+}
+
 export async function create( data ) {
   return model.planogramModel.create( data );
 }

package/src/service/storeBuilder.service.js

@@ -39,3 +39,11 @@ export async function updateMany( query, record ) {
 export async function create( data ) {
   return model.storeLayoutModel.create( data );
 }
+
+export async function upsertOne( query, record ) {
+  return model.storeLayoutModel.findOneAndUpdate(
+      query,
+      record,
+      { upsert: true, new: true },
+  );
+}

package/src/service/storeFixture.service.js

@@ -31,3 +31,19 @@ export async function findOneAndUpdate2( query={}, field={} ) {
 export async function create( data ) {
   return model.storeFixtureModel.create( data );
 }
+
+export async function deleteOne( query ) {
+  return model.storeFixtureModel.deleteOne( query );
+}
+
+export async function findAndSort( query={}, field={}, sortField={} ) {
+  return model.storeFixtureModel.find( query, field ).sort( sortField );
+}
+
+export async function upsertOne( query, record ) {
+  return model.storeFixtureModel.findOneAndUpdate(
+      query,
+      record,
+      { upsert: true, new: true },
+  );
+}