tango-app-api-store-builder 1.0.0-beta-215 → 1.0.0-beta-217

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -1362,9 +1362,12 @@ export async function updateStoreFixture( req, res ) {
           let getMaxTemp = await fixtureConfigService.aggregate( tempQuery );
           templateIndex = getMaxTemp?.[0]?.tempId + 1;
         }
-        templateData.fixtureName= `${header}-${data.fixtureCategory}-varient-${templateIndex}`,
+        templateData.fixtureName= `${header}-${data.fixtureCategory}-variant-${templateIndex}`,
         templateData.templateType = 'sub';
         templateData.masterTemplateId = fixtureMasterTemplate._id;
+        templateData.templateIndex = templateIndex;
+        templateData.createdAt = new Date();
+        templateData.updatedAt = new Date();
         let subTemplate = await fixtureConfigService.create( templateData );
         configId = subTemplate._id;
 

package/src/controllers/script.controller.js

@@ -9698,44 +9698,45 @@ function transformProducts( products, shelvesByZone, fixtureData ) {
 
 // ---------------------Plano Migrate-------------------------
 
-export async function getAllPlanoIds( req, res ) {
+export async function getAllPlanoIds(req, res){
   try {
-    if ( !req.query?.clientId ) {
-      return res.sendError( 'Client id is required', 400 );
+
+    if (!req.query?.clientId) {
+      return res.sendError('Client id is required', 400);
     }
-    const floorsData = await storeBuilderService.aggregate( [
+    const floorsData = await storeBuilderService.aggregate([
       {
-        '$match': {
-          'clientId': '11',
-        },
-      }, {
-        '$group': {
-          '_id': '$planoId',
-          'storeName': {
-            '$first': '$storeName',
-          },
-          'storeId': {
-            '$first': '$storeId',
-          },
-        },
+      '$match': {
+        'clientId': '11'
+      }
       }, {
-        '$project': {
-          'planoId': '$_id',
-          'storeName': 1,
-          'storeId': 1,
+      '$group': {
+        '_id': '$planoId',
+        'storeName': {
+        '$first': '$storeName'
         },
+        'storeId': {
+        '$first': '$storeId'
+        }
+      }
+      }, {  
+      '$project': {
+        'planoId': '$_id',
+        'storeName': 1,
+        'storeId': 1
+      }
       }, {
-        '$sort': { storeName: 1 },
-      },
-    ] );
+      '$sort': { storeName: 1 }
+      }
+    ]);
 
-    if ( floorsData ) {
-      return res.sendSuccess( floorsData );
+    if (floorsData) {
+      return res.sendSuccess(floorsData);
     } else {
-      return res.sendError( 'No floor data found', 204 );
+      return res.sendError("No floor data found", 204)
     }
-  } catch ( error ) {
-    console.log( '@@ ~ getAllPlanoIds [ERR]:', error );
-    return res.sendError( e, 500 );
+  } catch (error) {
+    console.log("@@ ~ getAllPlanoIds [ERR]:", error);
+    return res.sendError(e, 500);
   }
-}
+}

package/src/controllers/storeBuilder.controller.js

@@ -2849,14 +2849,19 @@ export async function storeFixturesv2( req, res ) {
 
                             const shelfDetails = await Promise.all(
                                 shelves.map( async ( shelf ) => {
-                                  const productCount = await planoMappingService.count( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'product' } );
+                                  const productDetails = await planoMappingService.find( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'product' }, { _id: 1 } );
+                                  let productIdList = productDetails.map( ( ele ) => ele._id );
+                                  let status = await planoComplianceService.find( { fixtureId: fixture._id, shelfId: shelf.toObject(), planoMappingId: { $in: productIdList } }, { compliance: 1 } );
+                                  status = status.map( ( ele ) => ele?.compliance );
+                                  const compliance = status.length ? ( status.includes( 'missing' ) || status.includes( 'misplaced' ) ) ? 'imProper' : 'proper' : '';
 
                                   const vmCount = await planoMappingService.count( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'vm' } );
 
                                   return {
                                     ...shelf.toObject(),
-                                    productCount: productCount,
+                                    productCount: productDetails.length,
                                     vmCount: vmCount,
+                                    compliance,
                                   };
                                 } ),
                             );
@@ -2953,14 +2958,20 @@ export async function storeFixturesv2( req, res ) {
 
                       const shelfDetails = await Promise.all(
                           shelves.map( async ( shelf ) => {
-                            const productCount = await planoMappingService.count( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'product' } );
+                            const productDetails = await planoMappingService.find( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'product' }, { _id: 1 } );
+                            let productIdList = productDetails.map( ( ele ) => ele._id );
+                            let status = await planoComplianceService.find( { fixtureId: fixture._id, shelfId: shelf.toObject(), planoMappingId: { $in: productIdList } }, { compliance: 1 } );
+                            status = status.map( ( ele ) => ele?.compliance );
+                            const compliance = status.length ? ( status.includes( 'missing' ) || status.includes( 'misplaced' ) ) ? 'imProper' : 'proper' : '';
+
 
                             const vmCount = await planoMappingService.count( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'vm' } );
 
                             return {
                               ...shelf.toObject(),
-                              productCount: productCount,
+                              productCount: productDetails.length,
                               vmCount: vmCount,
+                              compliance,
                             };
                           } ),
                       );
@@ -3527,14 +3538,18 @@ export async function storeFixturesTaskv2( req, res ) {
 
                             const shelfDetails = await Promise.all(
                                 shelves.map( async ( shelf ) => {
-                                  const productCount = await planoMappingService.count( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'product' } );
-
+                                  const productDetails = await planoMappingService.find( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'product' }, { _id: 1 } );
+                                  let productIdList = productDetails.map( ( ele ) => ele._id );
+                                  let status = await planoComplianceService.find( { fixtureId: fixture._id, shelfId: shelf.toObject(), planoMappingId: { $in: productIdList } }, { compliance: 1 } );
+                                  status = status.map( ( ele ) => ele?.compliance );
+                                  const compliance = status.length ? ( status.includes( 'missing' ) || status.includes( 'misplaced' ) ) ? 'imProper' : 'proper' : '';
                                   const vmCount = await planoMappingService.count( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'vm' } );
 
                                   return {
                                     ...shelf.toObject(),
-                                    productCount: productCount,
+                                    productCount: productDetails.length,
                                     vmCount: vmCount,
+                                    compliance,
                                   };
                                 } ),
                             );
@@ -3631,14 +3646,17 @@ export async function storeFixturesTaskv2( req, res ) {
 
                       const shelfDetails = await Promise.all(
                           shelves.map( async ( shelf ) => {
-                            const productCount = await planoMappingService.count( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'product' } );
-
                             const vmCount = await planoMappingService.count( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'vm' } );
-
+                            const productDetails = await planoMappingService.find( { fixtureId: fixture._id, shelfId: shelf.toObject(), type: 'product' }, { _id: 1 } );
+                            let productIdList = productDetails.map( ( ele ) => ele._id );
+                            let status = await planoComplianceService.find( { fixtureId: fixture._id, shelfId: shelf.toObject(), planoMappingId: { $in: productIdList } }, { compliance: 1 } );
+                            status = status.map( ( ele ) => ele?.compliance );
+                            const compliance = status.length ? ( status.includes( 'missing' ) || status.includes( 'misplaced' ) ) ? 'imProper' : 'proper' : '';
                             return {
                               ...shelf.toObject(),
-                              productCount: productCount,
+                              productCount: productDetails.length,
                               vmCount: vmCount,
+                              compliance,
                             };
                           } ),
                       );
@@ -6295,3 +6313,37 @@ export async function getFixtureAIDetails( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function searchProduct( req, res ) {
+  try {
+    if ( !req.body?.planoId ) {
+      return res.sendError( 'PlanoId is required', 400 );
+    }
+    if ( !req.body.floorId ) {
+      return res.sendError( 'FloorId is required', 400 );
+    }
+    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' } } ], planoId: req.body.planoId, floorId: req.body.floorId } );
+    if ( !getProductDetails.length ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    let result = await Promise.all( getProductDetails.map( async ( ele ) => {
+      let productDetails = await planoProductService.findOne( { _id: ele.productId }, { _id: 0, productName: 1, productImageUrl: 1, productType: 1 } );
+      let fixtureDetails = await storeFixtureService.findOne( { _id: ele.fixtureId }, { _id: 0, associatedElementFixtureNumber: 1, associatedElementNumber: 1, fixtureType: 1 } );
+      let shelfDetails = await fixtureShelfService.findOne( { _id: ele.shelfId }, { _id: 0, shelfNumber: 1 } );
+
+      return {
+        ...ele.toObject(),
+        ...productDetails?.toObject(),
+        ...fixtureDetails?.toObject(),
+        ...shelfDetails?.toObject(),
+      };
+    } ) );
+    return res.sendSuccess( result );
+  } catch ( e ) {
+    logger.error( { functionName: 'searchProduct', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/routes/storeBuilder.routes.js

@@ -50,7 +50,8 @@ storeBuilderRouter
     .post( '/fixtureShelfDetailsv2', isAllowedSessionHandler, validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv2 )
     .post( '/fixtureShelfDetailsv3', isAllowedSessionHandler, validate( validateDtos.fixtureShelfProduct ), storeBuilderController.fixtureShelfProductv3 )
     .post( '/storeFixturesTaskv2', isAllowedSessionHandler, storeBuilderController.storeFixturesTaskv2 )
-    .post( '/storeFixturesTaskv3', isAllowedSessionHandler, storeBuilderController.storeFixturesTaskv3 );
+    .post( '/storeFixturesTaskv3', isAllowedSessionHandler, storeBuilderController.storeFixturesTaskv3 )
+    .post( '/searchProduct', isAllowedSessionHandler, storeBuilderController.searchProduct );
 
 storeBuilderRouter
     .post( '/planoList', isAllowedSessionHandler, storeBuilderController.planoList )