tango-app-api-store-builder 1.0.0-beta-14 → 1.0.0-beta-16

package/package.json

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

package/src/controllers/storeBuilder.controller.js

@@ -577,6 +577,7 @@ export async function storeFixturesv1( req, res ) {
                             return {
                               ...fixture.toObject(),
                               status: complianceCount === 0 ? '' : complianceCount === productCount ? 'complete' : 'incomplete',
+                              productCount: productCount,
                             };
                           } ),
                       );
@@ -606,14 +607,18 @@ export async function storeFixturesv1( req, res ) {
                       return {
                         ...fixture.toObject(),
                         status: complianceCount === 0 ? '' : complianceCount === productCount ? 'complete' : 'incomplete',
+                        productCount: productCount,
                       };
                     } ),
                 );
 
+                const productCount = await planoMappingService.count( { floorId: floor._id } );
+
                 return {
                   ...floor.toObject(),
                   layoutPolygon: layoutPolygonWithFixtures,
                   centerFixture: centerFixturesWithStatus,
+                  productCount: productCount,
                 };
               } ),
           );
@@ -1059,6 +1064,11 @@ export async function scan( req, res ) {
 
 export async function scanv1( req, res ) {
   try {
+    if ( !req.body.floorId ) return res.sendError( 'Floor id is required', 400 );
+
+    if ( !req.body.fixtureId ) return res.sendError( 'Fixture id is required', 400 );
+
+    if ( !req.body.rfId ) return res.sendError( 'RFID is required', 400 );
     const fixture = await storeFixtureService.findOne(
         { _id: new mongoose.Types.ObjectId( req.body.fixtureId ) },
         { storeId: 1, storeName: 1, planoId: '$_id', productResolutionLevel: 1 },
@@ -1066,13 +1076,10 @@ export async function scanv1( req, res ) {
 
     if ( !fixture ) return res.sendError( 'No data found', 204 );
 
-    if ( fixture.productResolutionLevel === 'L1' ) {
-      if ( !req.body.floorId ) return res.sendError( 'Floor id is required', 400 );
-
-      if ( !req.body.fixtureId ) return res.sendError( 'Fixture id is required', 400 );
+    const currentDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
 
-      if ( !req.body.rfId ) return res.sendError( 'RFID is required', 400 );
 
+    if ( fixture.productResolutionLevel === 'L1' ) {
       const mappingQuery = {
         planoId: req.body.planoId,
         floorId: req.body.floorId,
@@ -1082,8 +1089,6 @@ export async function scanv1( req, res ) {
 
       const productMapping = await planoMappingService.findOne( mappingQuery );
 
-      const currentDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
-
       if ( !productMapping ) {
         const misplacedQuery = {
           planoId: req.body.planoId,
@@ -1102,7 +1107,22 @@ export async function scanv1( req, res ) {
         let misplacedProductDetails = await planoProductService.findOne( { _id: misplacedProductMapping.toObject().productId } );
 
         await planoComplianceService.updateOne( { ...misplacedQuery, date: currentDate }, complianceData );
-        return res.sendSuccess( { data: { ...misplacedProductMapping.toObject(), ...( misplacedProductDetails ? misplacedProductDetails?.toObject() : {} ) }, status: false } );
+
+        const [ totalProducts, scannedProducts, misplacedProducts, missingProducts ] = await Promise.all( [
+          planoMappingService.count( { fixtureId: fixture.toObject()._id } ),
+          planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate } ),
+          planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'misplaced' } ),
+          planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'missing' } ),
+        ] );
+
+        const metrics = {
+          total: totalProducts,
+          scanned: scannedProducts,
+          misplaced: misplacedProducts,
+          missing: missingProducts,
+        };
+
+        return res.sendSuccess( { data: { ...misplacedProductMapping.toObject(), ...( misplacedProductDetails ? misplacedProductDetails?.toObject() : {} ) }, metrics: metrics, status: false } );
       }
 
       const complianceData = { ...productMapping.toObject(), planoMappingId: productMapping.toObject()._id, compliance: 'proper' };
@@ -1112,14 +1132,22 @@ export async function scanv1( req, res ) {
 
       await planoComplianceService.updateOne( { ...mappingQuery, date: currentDate }, complianceData );
 
-      return res.sendSuccess( { data: { ...productMapping.toObject(), ...( productDetails ? productDetails?.toObject() : {} ) }, status: true } );
-    } else if ( fixture.productResolutionLevel === 'L2' ) {
-      if ( !req.body.floorId ) return res.sendError( 'Floor id is required', 400 );
-
-      if ( !req.body.fixtureId ) return res.sendError( 'Fixture id is required', 400 );
-
-      if ( !req.body.rfId ) return res.sendError( 'RFID is required', 400 );
+      const [ totalProducts, scannedProducts, misplacedProducts, missingProducts ] = await Promise.all( [
+        planoMappingService.count( { fixtureId: fixture.toObject()._id } ),
+        planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate } ),
+        planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'misplaced' } ),
+        planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'missing' } ),
+      ] );
+
+      const metrics = {
+        total: totalProducts,
+        scanned: scannedProducts,
+        misplaced: misplacedProducts,
+        missing: missingProducts,
+      };
 
+      return res.sendSuccess( { data: { ...productMapping.toObject(), ...( productDetails ? productDetails?.toObject() : {} ) }, metrics: metrics, status: true } );
+    } else if ( fixture.productResolutionLevel === 'L2' ) {
       if ( !req.body.shelfId && req.body.rfId ) {
         const shelf = await fixtureShelfService.findOne( { planoId: req.body.planoId, floorId: req.body.floorId, fixtureId: req.body.fixtureId, rfId: req.body.rfId } );
         if ( !shelf ) return res.sendError( 'No matching shelf for the rfId', 400 );
@@ -1138,8 +1166,6 @@ export async function scanv1( req, res ) {
 
       const productMapping = await planoMappingService.findOne( mappingQuery );
 
-      const currentDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
-
       if ( !productMapping ) {
         const misplacedQuery = {
           planoId: req.body.planoId,
@@ -1162,7 +1188,23 @@ export async function scanv1( req, res ) {
         let misplacedProductDetails = await planoProductService.findOne( { _id: misplacedProductMapping.toObject().productId } );
 
         await planoComplianceService.updateOne( { ...misplacedQuery, date: currentDate }, complianceData );
-        return res.sendSuccess( { data: { ...misplacedProductMapping.toObject(), ...( misplacedProductDetails ? misplacedProductDetails?.toObject() : {} ) }, status: false } );
+
+
+        const [ totalProducts, scannedProducts, misplacedProducts, missingProducts ] = await Promise.all( [
+          planoMappingService.count( { fixtureId: fixture.toObject()._id } ),
+          planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate } ),
+          planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'misplaced' } ),
+          planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'missing' } ),
+        ] );
+
+        const metrics = {
+          total: totalProducts,
+          scanned: scannedProducts,
+          misplaced: misplacedProducts,
+          missing: missingProducts,
+        };
+
+        return res.sendSuccess( { data: { ...misplacedProductMapping.toObject(), ...( misplacedProductDetails ? misplacedProductDetails?.toObject() : {} ) }, metrics: metrics, status: false } );
       }
 
       const complianceData = { ...productMapping.toObject(), planoMappingId: productMapping.toObject()._id, compliance: 'proper' };
@@ -1172,14 +1214,22 @@ export async function scanv1( req, res ) {
 
       await planoComplianceService.updateOne( { ...mappingQuery, date: currentDate }, complianceData );
 
-      return res.sendSuccess( { data: { ...productMapping.toObject(), ...( productDetails ? productDetails?.toObject() : {} ) }, status: true } );
-    } else if ( fixture.productResolutionLevel === 'L3' ) {
-      if ( !req.body.floorId ) return res.sendError( 'Floor id is required', 400 );
-
-      if ( !req.body.rfId ) return res.sendError( 'RFID is required', 400 );
-
-      if ( !req.body.fixtureId ) return res.sendError( 'Fixture id is required', 400 );
+      const [ totalProducts, scannedProducts, misplacedProducts, missingProducts ] = await Promise.all( [
+        planoMappingService.count( { fixtureId: fixture.toObject()._id } ),
+        planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate } ),
+        planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'misplaced' } ),
+        planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'missing' } ),
+      ] );
+
+      const metrics = {
+        total: totalProducts,
+        scanned: scannedProducts,
+        misplaced: misplacedProducts,
+        missing: missingProducts,
+      };
 
+      return res.sendSuccess( { data: { ...productMapping.toObject(), ...( productDetails ? productDetails?.toObject() : {} ) }, metrics: metrics, status: true } );
+    } else if ( fixture.productResolutionLevel === 'L3' ) {
       if ( !req.body.shelfId && req.body.rfId ) {
         const shelf = await fixtureShelfService.findOne( { planoId: req.body.planoId, floorId: req.body.floorId, fixtureId: req.body.fixtureId, rfId: req.body.rfId } );
         if ( !shelf ) return res.sendError( 'No matching shelf for the rfId', 400 );
@@ -1198,8 +1248,6 @@ export async function scanv1( req, res ) {
 
       const productMapping = await planoMappingService.findOne( mappingQuery );
 
-      const currentDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
-
       if ( !productMapping ) {
         const shelf = await fixtureShelfService.findOne( { _id: new mongoose.Types.ObjectId( req.body.shelfId ) } );
 
@@ -1213,6 +1261,7 @@ export async function scanv1( req, res ) {
         };
         const misplacedProductMapping = await planoMappingService.findOne( misplacedQuery );
 
+
         if ( !misplacedProductMapping ) {
           const shelf = await fixtureShelfService.findOne( misplacedQuery );
           if ( !shelf ) {
@@ -1221,6 +1270,7 @@ export async function scanv1( req, res ) {
           return res.sendSuccess( { shelfId: shelf.toObject()._id } );
         }
 
+
         const misplacedProductShelf = await fixtureShelfService.findOne( { _id: misplacedProductMapping.toObject().shelfId } );
 
         let misplacedProductDetails = await planoProductService.findOne( { _id: misplacedProductMapping.toObject().productId } );
@@ -1230,16 +1280,47 @@ export async function scanv1( req, res ) {
           delete complianceData._id;
 
           await planoComplianceService.updateOne( { ...misplacedQuery, date: currentDate }, complianceData );
-          return res.sendSuccess( { data: { ...misplacedProductMapping.toObject(), ...( misplacedProductDetails ? misplacedProductDetails?.toObject() : {} ) }, status: true } );
+
+          const [ totalProducts, scannedProducts, misplacedProducts, missingProducts ] = await Promise.all( [
+            planoMappingService.count( { fixtureId: fixture.toObject()._id } ),
+            planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate } ),
+            planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'misplaced' } ),
+            planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'missing' } ),
+          ] );
+
+          const metrics = {
+            total: totalProducts,
+            scanned: scannedProducts,
+            misplaced: misplacedProducts,
+            missing: missingProducts,
+          };
+          return res.sendSuccess( { data: { ...misplacedProductMapping.toObject(), ...( misplacedProductDetails ? misplacedProductDetails?.toObject() : {} ) }, metrics: metrics, status: true } );
         } else {
+          if ( shelf.toObject()._id.toString() !== misplacedProductShelf.toObject()._id.toString() ) {
+            return res.sendError( 'RFID conflict with section', 400 );
+          }
           const complianceData = { ...misplacedProductMapping.toObject(), planoMappingId: misplacedProductMapping.toObject()._id, compliance: 'misplaced' };
           delete complianceData._id;
 
           await planoComplianceService.updateOne( { ...misplacedQuery, date: currentDate }, complianceData );
-          return res.sendSuccess( { data: { ...misplacedProductMapping.toObject(), ...( misplacedProductDetails ? misplacedProductDetails?.toObject() : {} ) }, status: false } );
+          const [ totalProducts, scannedProducts, misplacedProducts, missingProducts ] = await Promise.all( [
+            planoMappingService.count( { fixtureId: fixture.toObject()._id } ),
+            planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate } ),
+            planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'misplaced' } ),
+            planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'missing' } ),
+          ] );
+
+          const metrics = {
+            total: totalProducts,
+            scanned: scannedProducts,
+            misplaced: misplacedProducts,
+            missing: missingProducts,
+          };
+          return res.sendSuccess( { data: { ...misplacedProductMapping.toObject(), ...( misplacedProductDetails ? misplacedProductDetails?.toObject() : {} ) }, metrics: metrics, status: false } );
         }
       }
 
+
       const complianceData = { ...productMapping.toObject(), compliance: 'proper' };
       delete complianceData._id;
 
@@ -1247,14 +1328,23 @@ export async function scanv1( req, res ) {
 
       await planoComplianceService.updateOne( { ...mappingQuery, planoMappingId: productMapping.toObject()._id, date: currentDate }, complianceData );
 
-      return res.sendSuccess( { data: { ...productMapping.toObject(), ...( productDetails ? productDetails?.toObject() : {} ) }, status: true } );
-    } else if ( fixture.productResolutionLevel === 'L4' ) {
-      if ( !req.body.floorId ) return res.sendError( 'Floor id is required', 400 );
-
-      if ( !req.body.rfId ) return res.sendError( 'RFID is required', 400 );
+      const [ totalProducts, scannedProducts, misplacedProducts, missingProducts ] = await Promise.all( [
+        planoMappingService.count( { fixtureId: fixture.toObject()._id } ),
+        planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate } ),
+        planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'misplaced' } ),
+        planoComplianceService.count( { fixtureId: fixture.toObject()._id, date: currentDate, compliance: 'missing' } ),
+      ] );
+
+      const metrics = {
+        total: totalProducts,
+        scanned: scannedProducts,
+        misplaced: misplacedProducts,
+        missing: missingProducts,
+      };
 
-      if ( !req.body.fixtureId ) return res.sendError( 'Fixture id is required', 400 );
 
+      return res.sendSuccess( { data: { ...productMapping.toObject(), ...( productDetails ? productDetails?.toObject() : {} ) }, metrics: metrics, status: true } );
+    } else if ( fixture.productResolutionLevel === 'L4' ) {
       if ( !req.body.shelfId && req.body.rfId ) {
         const shelf = await fixtureShelfService.findOne( { planoId: req.body.planoId, floorId: req.body.floorId, fixtureId: req.body.fixtureId, rfId: req.body.rfId } );
         if ( !shelf ) return res.sendError( 'No matching shelf for the rfId', 400 );
@@ -1283,8 +1373,6 @@ export async function scanv1( req, res ) {
         return res.sendSuccess( { shelfId: shelf.toObject()._id } );
       }
 
-      const currentDate = new Date( dayjs().format( 'YYYY-MM-DD' ) );
-
       if ( productMapping.toObject().rfId !== req.body.rfId ) {
         const complianceData = { ...productMapping.toObject(), planoMappingId: productMapping.toObject()._id, compliance: 'misplaced' };
         delete complianceData._id;
@@ -1353,14 +1441,13 @@ export async function updateMissing( req, res ) {
                 }
 
                 const mappingCompliance = await planoComplianceService.findOne( {
-                  shelfId: mapping.shelfId,
-                  shelfPosition: mapping.shelfPosition,
+                  planoMappingId: mapping._id,
                   date: currentDate,
                 } );
 
                 if ( !mappingCompliance ) {
                   delete mapping.toObject()._id;
-                  planoComplianceService.create( { ...mapping.toObject(), compliance: 'missing', date: currentDate } );
+                  planoComplianceService.create( { ...mapping.toObject(), planoMappingId: mapping._id, compliance: 'missing', date: currentDate } );
                 }
 
                 return {