tango-app-api-store-builder 1.1.15 → 1.1.16

package/package.json

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

package/src/controllers/storeBuilder.controller.js

@@ -8022,8 +8022,17 @@ export async function searchProduct( req, res ) {
     if ( !req.body.pid ) {
       return res.sendError( 'Pid is required', 400 );
     }
-    let getProductDetails = await planoMappingService.find( { $or: [ { pid: { $regex: req.body.pid, $options: 'i' } }, { rfId: { $regex: req.body.pid, $options: 'i' } }, { barCode: { $regex: req.body.pid, $options: 'i' } } ], planoId: req.body.planoId, floorId: req.body.floorId } );
-    console.log( getProductDetails );
+    let query = [
+      {
+        $match: {
+          planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+          floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+          $or: [ { pid: { $regex: req.body.pid, $options: 'i' } }, { rfId: { $regex: req.body.pid, $options: 'i' } }, { barCode: { $regex: req.body.pid, $options: 'i' } } ],
+        },
+      },
+    ];
+
+    let getProductDetails = await planoMappingService.aggregate( query );
     if ( !getProductDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
@@ -8033,10 +8042,11 @@ export async function searchProduct( req, res ) {
       let shelfDetails = await fixtureShelfService.findOne( { _id: ele.shelfId }, { _id: 0, shelfNumber: 1 } );
 
       return {
-        ...ele.toObject(),
+        ...ele,
         ...productDetails?.toObject(),
         ...fixtureDetails?.toObject(),
-        ...shelfDetails?.toObject(), shelfNumber: shelfDetails.shelfNumber-1,
+        ...shelfDetails?.toObject(),
+        ...( fixtureDetails?.fixtureType == 'wall' && { shelfNumber: shelfDetails?.shelfNumber-1 } ),
       };
     } ) );
     return res.sendSuccess( result );