tango-app-api-store-builder 1.0.0-beta-72 → 1.0.0-beta-74

package/package.json

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

package/src/controllers/script.controller.js

@@ -1967,7 +1967,122 @@ export async function updateFixtureFeedback( req, res ) {
       return res.sendError( 'Unauthorized', 401 );
     }
 
-    
+    if ( !req.body.length ) {
+      return res.sendError( 'Store List is required', 400 );
+    }
+
+    const storeList = req.body;
+
+    for ( let i = 0; i < storeList.length; i++ ) {
+      const store = storeList[i];
+
+      // const issueTypes = [
+      //   'Fixture size is wrong',
+      //   'Fixture type is wrong',
+      //   'Fixture brand is wrong',
+      //   'Fixture not in the store',
+      //   'Shelves count/Product Category/Capacity is wrong',
+      //   'Others',
+      // ];
+
+      const planogram = await planoService.findOne( { storeName: store.storeName } );
+
+      const fixtureTaskList = await planoTaskService.find( { planoId: planogram.toObject()._id, type: 'fixture' } );
+
+      for ( let j = 0; j < fixtureTaskList.length; j++ ) {
+        const fixtureTask = fixtureTaskList[j].toObject();
+
+        const [ q1 ] = fixtureTask.answers;
+
+        if ( q1.value === true ) {
+          continue;
+        }
+
+        const fixture = await storeFixtureService.findOne( { _id: fixtureTask.fixtureId } );
+
+        const fixtureDoc = fixture?.toObject();
+
+
+        if ( q1.issues.includes( 'Shelves count/Product Category/Capacity is wrong' ) ) {
+          const taskShelves = q1.data.shelves;
+
+          const fixtureShelves = await fixtureShelfService.findAndSort( { fixtureId: fixtureTask.fixtureId }, {}, { shelfNumber: 1 } );
+
+          const shelfCount = q1.data.shelves.length;
+
+          const fixtureCapacity = q1.data.shelves.reduce( ( sum, item ) => sum + ( item.productCapacity ? item.productCapacity : 0 ), 0 );
+
+          const updateFixture = await storeFixtureService.updateOne( { _id: fixtureDoc._id }, { shelfcount: shelfCount, fixtureCapacity: fixtureCapacity } );
+
+          console.log( updateFixture );
+
+          for ( let k = 0; k < taskShelves.length; k++ ) {
+            const taskShelf = taskShelves[k];
+            const productCapacity = taskShelf.productCapacity;
+            const section = taskShelf.section;
+            const subBrand = taskShelf.subBrand;
+            const formattedsubBrand = subBrand.length ? ( subBrand.length > 1 ? subBrand.join( ' + ' ) : subBrand[0] ) : undefined;
+            if ( taskShelves.length === fixtureShelves.length ) {
+              const fixtureShelf = fixtureShelves.filter( ( shelf ) => {
+                return shelf.toObject().shelfNumber === k+1;
+              } );
+
+              const updateShelf = await fixtureShelfService.updateOne( { _id: fixtureShelf?.[0].toObject()._id }, { shelfCapacity: productCapacity, sectionName: formattedsubBrand, sectionZone: section } );
+
+              console.log( updateShelf );
+            } else if ( taskShelves.length < fixtureShelves.length ) {
+              const fixtureShelf = fixtureShelves.filter( ( shelf ) => {
+                return shelf.toObject().shelfNumber === k+1;
+              } );
+
+
+              const updateShelf = await fixtureShelfService.updateOne( { _id: fixtureShelf?.[0].toObject()._id }, { shelfCapacity: productCapacity, sectionName: formattedsubBrand, sectionZone: section } );
+
+              console.log( updateShelf );
+
+
+              const shelfDifference = fixtureShelves.length - taskShelves.length;
+
+              const shelvesToDelete = fixtureShelves.slice( -shelfDifference );
+
+              shelvesToDelete.map( async ( shelf ) => {
+                await fixtureShelfService.deleteOne( { _id: shelf.toObject()._id } );
+              } );
+            } else if ( taskShelves.length > fixtureShelves.length ) {
+              if ( k + 1 <= fixtureShelves.length ) {
+                const fixtureShelf = fixtureShelves.filter( ( shelf ) => {
+                  return shelf.toObject().shelfNumber === k+1;
+                } );
+
+
+                const updateShelf = await fixtureShelfService.updateOne( { _id: fixtureShelf?.[0].toObject()._id }, { shelfCapacity: productCapacity, sectionName: formattedsubBrand, sectionZone: section } );
+
+                console.log( updateShelf );
+              } else if ( k + 1 > fixtureShelves.length ) {
+                const insertData = {
+                  'clientId': planogram.toObject().clientId,
+                  'storeName': planogram.toObject().storeName,
+                  'storeId': planogram.toObject().storeId,
+                  'planoId': planogram.toObject()._id,
+                  'floorId': fixtureDoc.floorId,
+                  'fixtureId': fixtureDoc._id,
+                  'shelfNumber': k+1,
+                  'shelfOrder': 'LTR',
+                  'shelfCapacity': productCapacity,
+                  'sectionName': formattedsubBrand,
+                  'sectionZone': section,
+                };
+
+
+                await fixtureShelfService.create( insertData );
+              }
+            }
+          }
+        }
+      }
+    }
+
+    res.sendSuccess( 'Updated successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'updatelayoutFeedback', error: e } );
     return res.sendError( e.message || 'Internal Server Error', 500 );

package/src/controllers/storeBuilder.controller.js

@@ -607,7 +607,7 @@ export async function storeFixturesv1( req, res ) {
                               date: currentDate,
                             } );
 
-                            const shelves = await fixtureShelfService.find( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1 } );
+                            const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 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.find( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1 } );
+                      const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1 }, { shelfNumber: 1 } );
 
                       const shelfDetails = await Promise.all(
                           shelves.map( async ( shelf ) => {
@@ -1072,7 +1072,10 @@ export async function fixtureShelfProductv1( req, res ) {
       }
     } ) );
     const vmMap = new Map( vms.map( ( vm ) => [ vm._id.toString(), vm.toObject() ] ) );
-    const vmDetails = vmMappings.map( ( mapping ) => vmMap.get( mapping.productId.toString() ) || {} );
+    const vmDetails = vmMappings.map( ( mapping ) => ( {
+      ...vmMap.get( mapping.productId.toString() ),
+      _id: mapping._id,
+    } ) );
 
     if ( fixture.toObject().productResolutionLevel === 'L1' ) {
       const productMappings = await planoMappingService.find( { fixtureId: new mongoose.Types.ObjectId( fixtureId ), type: 'product' } );
@@ -1081,7 +1084,7 @@ export async function fixtureShelfProductv1( req, res ) {
     }
 
     if ( [ 'L2', 'L4' ].includes( fixture.toObject().productResolutionLevel ) ) {
-      const fixtureShelves = await fixtureShelfService.find( { fixtureId: new mongoose.Types.ObjectId( fixtureId ) } );
+      const fixtureShelves = await fixtureShelfService.findAndSort( { fixtureId: new mongoose.Types.ObjectId( fixtureId ) }, {}, { shelfNumber: 1 } );
       // if ( !fixtureShelves.length ) return res.sendError( 'No shelves found for the fixture', 204 );
       const productCount = await planoMappingService.count( { fixtureId: new mongoose.Types.ObjectId( fixtureId ), type: 'product' } );
       const shelfProducts = await Promise.all(
@@ -1095,7 +1098,7 @@ export async function fixtureShelfProductv1( req, res ) {
     }
 
     if ( fixture.toObject().productResolutionLevel === 'L3' ) {
-      const fixtureShelves = await fixtureShelfService.find( { fixtureId: new mongoose.Types.ObjectId( fixtureId ) } );
+      const fixtureShelves = await fixtureShelfService.findAndSort( { fixtureId: new mongoose.Types.ObjectId( fixtureId ) }, {}, { shelfNumber: 1 } );
       // if ( !fixtureShelves.length ) return res.sendError( 'No shelves found for the fixture', 204 );
       const productCount = await planoMappingService.count( { fixtureId: new mongoose.Types.ObjectId( fixtureId ), type: 'product' } );
       const groupedShelves = fixtureShelves.reduce( async ( accPromise, shelf ) => {
@@ -2048,7 +2051,7 @@ export async function storeFixturesTask( req, res ) {
                               date_string: req.body?.date,
                             }, { status: 1 } );
 
-                            const shelves = await fixtureShelfService.find( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1 } );
+                            const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1 }, { shelfNumber: 1 } );
 
                             const shelfDetails = await Promise.all(
                                 shelves.map( async ( shelf ) => {
@@ -2128,7 +2131,7 @@ export async function storeFixturesTask( req, res ) {
                         date_string: req.body?.date,
                       }, { status: 1 } );
 
-                      const shelves = await fixtureShelfService.find( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1 } );
+                      const shelves = await fixtureShelfService.findAndSort( { fixtureId: fixture._id }, { shelfNumber: 1, sectionName: 1, sectionZone: 1, shelfCapacity: 1 }, { shelfNumber: 1 } );
 
                       const shelfDetails = await Promise.all(
                           shelves.map( async ( shelf ) => {

package/src/routes/storeBuilder.routes.js

@@ -23,13 +23,13 @@ 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 )
     .post( '/uploadImage', isAllowedSessionHandler, storeBuilderController.uploadImage )
-    .post( '/storeFixturesTask', isAllowedSessionHandler, storeBuilderController.storeFixturesTask )
+    .post( '/storeFixturesTask', storeBuilderController.storeFixturesTask )
     .post( '/qrFileUpload', isAllowedSessionHandler, storeBuilderController.qrFileUpload )
     .post( '/updateQrCvProcessRequest', isAllowedSessionHandler, storeBuilderController.updateQrCvProcessRequest )
     .post( '/getQrCvProcessRequest', isAllowedSessionHandler, storeBuilderController.getQrCvProcessRequest )
@@ -40,6 +40,6 @@ storeBuilderRouter
     .post( '/getshelfSections', isAllowedSessionHandler, storeBuilderController.getShelfSections )
     .post( '/getFixtureTypes', isAllowedSessionHandler, storeBuilderController.getFixtureTypes )
     .post( '/getFixtureLengths', isAllowedSessionHandler, storeBuilderController.getFixtureLengths )
-    .post( '/getFixtureBrands', isAllowedSessionHandler, storeBuilderController.getFixtureBrands )
+    .post( '/getFixtureBrands', storeBuilderController.getFixtureBrands )
     .post( '/checkPlanoExist', isAllowedSessionHandler, storeBuilderController.checkPlanoExist )
     .post( '/storeLayoutElements', isAllowedSessionHandler, storeBuilderController.storeLayoutElements );

package/src/service/fixtureShelf.service.js

@@ -4,6 +4,10 @@ export async function find( query={}, field={} ) {
   return model.fixtureShelfModel.find( query, field );
 }
 
+export async function findAndSort( query={}, field={}, sortField={} ) {
+  return model.fixtureShelfModel.find( query, field ).sort( sortField );
+}
+
 export async function findOne( query={}, field={} ) {
   return model.fixtureShelfModel.findOne( query, field );
 }
@@ -27,3 +31,7 @@ export async function create( data ) {
 export async function count( data ) {
   return model.fixtureShelfModel.countDocuments( data );
 }
+
+export async function deleteOne( query ) {
+  return model.fixtureShelfModel.deleteOne( query );
+}