tango-app-api-store-builder 1.0.0-beta-76 → 1.0.0-beta-78

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 ) => {
@@ -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 );
@@ -2051,7 +2052,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 +2132,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 ) => {

package/src/routes/script.routes.js

@@ -22,4 +22,5 @@ scriptRouter
     .post( '/getFileNames', scriptController.extractZipFileNames )
     .post( '/getVmTaskData', scriptController.getVmTaskData )
     .post( '/updateVmData', scriptController.updateVmData )
-    .post( '/createCrestPlanogram', scriptController.createCrestPlanogram );
+    .post( '/createCrestPlanogram', scriptController.createCrestPlanogram )
+    .post( '/updateCrestVms', scriptController.updateCrestVms );

package/src/routes/storeBuilder.routes.js

@@ -24,7 +24,7 @@ storeBuilderRouter
     // .post( '/scan', storeBuilderController.scan )
     .post( '/storeLayout', isAllowedSessionHandler, validate( validateDtos.storeList ), storeBuilderController.storeLayout )
     .post( '/storeFixtures', validate( validateDtos.storeList ), storeBuilderController.storeFixturesv1 )
-    .post( '/FixtureShelfDetails', isAllowedSessionHandler, validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv1 )
+    .post( '/FixtureShelfDetails', validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv1 )
     .post( '/scan', isAllowedSessionHandler, storeBuilderController.scanv1 )
     .post( '/updateMissing', isAllowedSessionHandler, storeBuilderController.updateMissing )
     .post( '/bulkFixtureUpload', isAllowedSessionHandler, storeBuilderController.bulkFixtureUpload )

package/src/service/fixtureShelf.service.js

@@ -39,3 +39,11 @@ export async function 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

@@ -34,3 +34,11 @@ export async function 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

@@ -39,3 +39,11 @@ export async function 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 },
+  );
+}