tango-app-api-store-builder 1.0.0-beta-2 → 1.0.0-beta-3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-2",
+    "version": "1.0.0-beta-3",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",
@@ -23,7 +23,7 @@
         "joi": "^17.13.3",
         "mongodb": "^6.12.0",
         "nodemon": "^3.1.9",
-        "tango-api-schema": "^2.2.23",
+        "tango-api-schema": "^2.2.27",
         "tango-app-api-middleware": "^3.1.48",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/storeBuilder.controller.js

@@ -512,22 +512,13 @@ export async function fixtureShelfProduct( req, res ) {
     }
     let planoDetails = await planoService.findOne( { _id: fixtureDetails.planoId } );
     let shelfDetails = await fixtureShelfService.find( { fixtureId: req.body.fixtureId } );
-    let shelfId = shelfDetails.map( ( ele ) => ele._id );
     let query;
     switch ( planoDetails.productResolutionLevel ) {
       case 'L1':
         query = { floorId: fixtureDetails.floorId };
         break;
-      case 'L2':
-        query = { floorId: fixtureDetails.floorId, fixtureId: req.body.fixtureId };
-        break;
-      case 'L3':
-        query = { floorId: fixtureDetails.floorId, fixtureId: req.body.fixtureId, shelfId: { $in: shelfId } };
-        break;
-      case 'L4':
-        query = { floorId: fixtureDetails.floorId, fixtureId: req.body.fixtureId, shelfId: { $in: shelfId } };
-        break;
       default:
+        query = { floorId: fixtureDetails.floorId, fixtureId: req.body.fixtureId };
         break;
     }
     let shelfList = [];
@@ -536,11 +527,19 @@ export async function fixtureShelfProduct( req, res ) {
       let productMappingDetails = await planoMappingService.find( { shelfId: shelf._id } );
       let productIdList = productMappingDetails.map( ( item ) => item.productId );
       let productDetails = await planoProductService.find( { _id: productIdList } );
-      let productComplianceDetails = await planoComplianceService.find( { ...query, productId: { $in: productIdList }, createdAt: { $gte: dayjs().startOf( 'day' ).format(), $lte: dayjs().endOf( 'day' ).format() } } );
+      query = {
+        ...query,
+        ...(['L3','L4'].includes(planoDetails.productResolutionLevel)) ? {shelfId:shelf._id} : {},
+        productId: { $in: productIdList },
+        createdAt: { $gte: dayjs().startOf( 'day' ).format(), $lte: dayjs().endOf( 'day' ).format() },
+      };
+      let productComplianceDetails = await planoComplianceService.find( query );
       let product = [];
       productDetails.forEach( ( item ) => {
         let data = { ...item._doc, status: 'missing' };
-        let findCompliance = productComplianceDetails.find( ( ele ) => ele.productId.toString() == item._id.toString() );
+        let findCompliance = productComplianceDetails.find( ( ele ) => {
+          if()
+        });
         if ( findCompliance ) {
           data.status = findCompliance.compliance;
         }