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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-14",
+    "version": "1.0.0-beta-15",
     "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,
                 };
               } ),
           );
@@ -1213,6 +1218,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 +1227,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 } );
@@ -1232,6 +1239,9 @@ export async function scanv1( req, res ) {
           await planoComplianceService.updateOne( { ...misplacedQuery, date: currentDate }, complianceData );
           return res.sendSuccess( { data: { ...misplacedProductMapping.toObject(), ...( misplacedProductDetails ? misplacedProductDetails?.toObject() : {} ) }, 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;
 
@@ -1240,6 +1250,7 @@ export async function scanv1( req, res ) {
         }
       }
 
+
       const complianceData = { ...productMapping.toObject(), compliance: 'proper' };
       delete complianceData._id;
 
@@ -1353,14 +1364,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 {