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

package/package.json

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

package/src/controllers/storeBuilder.controller.js

@@ -512,14 +512,23 @@ 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;
-      default:
+      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:
+        break;
     }
     let shelfList = [];
     for ( let shelf of shelfDetails ) {
@@ -527,19 +536,11 @@ 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 } );
-      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 productComplianceDetails = await planoComplianceService.find( { ...query, productId: { $in: productIdList }, createdAt: { $gte: dayjs().startOf( 'day' ).format(), $lte: dayjs().endOf( 'day' ).format() } } );
       let product = [];
       productDetails.forEach( ( item ) => {
         let data = { ...item._doc, status: 'missing' };
-        let findCompliance = productComplianceDetails.find( ( ele ) => {
-          if()
-        });
+        let findCompliance = productComplianceDetails.find( ( ele ) => ele.productId.toString() == item._id.toString() );
         if ( findCompliance ) {
           data.status = findCompliance.compliance;
         }