tango-app-api-infra 3.9.5-vms.75 → 3.9.5-vms.76

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.9.5-vms.75",
+    "version": "3.9.5-vms.76",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/footfallDirectory.controllers.js

@@ -1065,7 +1065,7 @@ export async function ticketList( req, res ) {
       if ( req.user.userType === 'tango' ) {
         searchQuery.query.bool.must.push( {
           terms: {
-            'status': Array.isArray( inputData?.status ) ?
+            'status.keyword': Array.isArray( inputData?.status ) ?
               inputData?.status :
               [ inputData?.status ],
           },
@@ -1162,7 +1162,9 @@ export async function ticketList( req, res ) {
     }
 
     if ( inputData.filterByStatus && inputData.filterByStatus!=='' ) {
-      if ( req?.user?.userType == 'tango' ) {
+      inputData.filterByStatus = inputData?.filterByStatus?.split( ',' );
+
+      if ( req?.user?.userType === 'tango' ) {
         {
           switch ( inputData?.tangoType ) {
             case 'store':
@@ -1191,7 +1193,7 @@ export async function ticketList( req, res ) {
             case 'internal':
               searchQuery.query.bool.must.push( {
                 'terms': {
-                  'status': Array.isArray( inputData?.filterByStatus ) ?
+                  'status.keyword': Array.isArray( inputData?.filterByStatus ) ?
                     inputData?.filterByStatus :
                     [ inputData?.filterByStatus ],
                 },
@@ -1315,6 +1317,285 @@ export async function ticketList( req, res ) {
       }
     }
 
+    if ( inputData?.filterByReviewer && inputData?.filterByReviewer !== '' ) {
+      let percQuery = null;
+      const value = inputData.filterByReviewer;
+
+      // Helper function: remove trailing '%' and convert to number
+      const percValue = ( val ) => {
+        if ( typeof val === 'string' ) {
+          return parseFloat( val.replace( '%', '' ).trim() );
+        }
+        return parseFloat( val );
+      };
+
+      // Example filter values: "<90", "<=90", ">=90", "50 to 90"
+      if ( /^<=?\d+$/.test( value ) ) {
+        // "<90" or "<=90"
+        const num = percValue( value.replace( /[^\d]/g, '' ) );
+        const op = value.includes( '=' ) ? 'lte' : 'lt';
+        percQuery = {
+          script: {
+            script: {
+              source: `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) ${op === 'lt' ? '<' : '<='} params.num`,
+              params: { num },
+            },
+          },
+        };
+      } else if ( /^>=?\d+$/.test( value ) ) {
+        // ">=90"
+        const num = percValue( value.replace( /[^\d]/g, '' ) );
+        const op = value.includes( '=' ) ? 'gte' : 'gt';
+        percQuery = {
+          script: {
+            script: {
+              source: `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) ${op === 'gt' ? '>' : '>='} params.num`,
+              params: { num },
+            },
+          },
+        };
+      } else if ( /^(\d+)\s*to\s*(\d+)$/.test( value ) ) {
+        // "50 to 90"
+        const match = value.match( /^(\d+)\s*to\s*(\d+)$/ );
+        const from = percValue( match[1] );
+        const to = percValue( match[2] );
+        percQuery = {
+          script: {
+            script: {
+              source:
+                `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) >= params.from && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) <= params.to`,
+              params: { from, to },
+            },
+          },
+        };
+      }
+      // fallback: treat as exact match (e.g., "90")
+      if ( !percQuery && /^\d+$/.test( value ) ) {
+        percQuery = {
+          script: {
+            script: {
+              source: `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) == params.num`,
+              params: { num: percValue( value ) },
+            },
+          },
+        };
+      }
+
+      if ( percQuery ) {
+        searchQuery.query.bool.must.push( {
+          nested: {
+            path: 'mappingInfo',
+            query: {
+              bool: {
+                must: [
+                  { term: { 'mappingInfo.type': 'review' } },
+                  percQuery,
+                ],
+              },
+            },
+          },
+        } );
+      }
+    }
+
+    if ( inputData?.filterByApprover && inputData?.filterByApprover !== '' ) {
+      let percQuery = null;
+      const value = inputData.filterByApprover;
+
+      // Helper function: remove trailing '%' and convert to number
+      const percValue = ( val ) => {
+        if ( typeof val === 'string' ) {
+          return parseFloat( val.replace( '%', '' ).trim() );
+        }
+        return parseFloat( val );
+      };
+
+      // Example filter values: "<90", "<=90", ">=90", "50 to 90"
+      if ( /^<=?\d+$/.test( value ) ) {
+        // "<90" or "<=90"
+        const num = percValue( value.replace( /[^\d]/g, '' ) );
+        const op = value.includes( '=' ) ? 'lte' : 'lt';
+        percQuery = {
+          script: {
+            script: {
+              source: `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) ${op === 'lt' ? '<' : '<='} params.num`,
+              params: { num },
+            },
+          },
+        };
+      } else if ( /^>=?\d+$/.test( value ) ) {
+        // ">=90"
+        const num = percValue( value.replace( /[^\d]/g, '' ) );
+        const op = value.includes( '=' ) ? 'gte' : 'gt';
+        percQuery = {
+          script: {
+            script: {
+              source: `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) ${op === 'gt' ? '>' : '>='} params.num`,
+              params: { num },
+            },
+          },
+        };
+      } else if ( /^(\d+)\s*to\s*(\d+)$/.test( value ) ) {
+        // "50 to 90"
+        const match = value.match( /^(\d+)\s*to\s*(\d+)$/ );
+        const from = percValue( match[1] );
+        const to = percValue( match[2] );
+        percQuery = {
+          script: {
+            script: {
+              source:
+                `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) >= params.from && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) <= params.to`,
+              params: { from, to },
+            },
+          },
+        };
+      }
+      // fallback: treat as exact match (e.g., "90")
+      if ( !percQuery && /^\d+$/.test( value ) ) {
+        percQuery = {
+          script: {
+            script: {
+              source: `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) == params.num`,
+              params: { num: percValue( value ) },
+            },
+          },
+        };
+      }
+
+      if ( percQuery ) {
+        searchQuery.query.bool.must.push( {
+          nested: {
+            path: 'mappingInfo',
+            query: {
+              bool: {
+                must: [
+                  { term: { 'mappingInfo.type': 'approve' } },
+                  percQuery,
+                ],
+              },
+            },
+          },
+        } );
+      }
+    }
+
+    if ( inputData?.filterByTango && inputData?.filterByTango !== '' ) {
+      let percQuery = null;
+      const value = inputData.filterByTango;
+
+      // Helper function: remove trailing '%' and convert to number
+      const percValue = ( val ) => {
+        if ( typeof val === 'string' ) {
+          return parseFloat( val.replace( '%', '' ).trim() );
+        }
+        return parseFloat( val );
+      };
+
+      // Example filter values: "<90", "<=90", ">=90", "50 to 90"
+      if ( /^<=?\d+$/.test( value ) ) {
+        // "<90" or "<=90"
+        const num = percValue( value.replace( /[^\d]/g, '' ) );
+        const op = value.includes( '=' ) ? 'lte' : 'lt';
+        percQuery = {
+          script: {
+            script: {
+              source: `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) ${op === 'lt' ? '<' : '<='} params.num`,
+              params: { num },
+            },
+          },
+        };
+      } else if ( /^>=?\d+$/.test( value ) ) {
+        // ">=90"
+        const num = percValue( value.replace( /[^\d]/g, '' ) );
+        const op = value.includes( '=' ) ? 'gte' : 'gt';
+        percQuery = {
+          script: {
+            script: {
+              source: `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) ${op === 'gt' ? '>' : '>='} params.num`,
+              params: { num },
+            },
+          },
+        };
+      } else if ( /^(\d+)\s*to\s*(\d+)$/.test( value ) ) {
+        // "50 to 90"
+        const match = value.match( /^(\d+)\s*to\s*(\d+)$/ );
+        const from = percValue( match[1] );
+        const to = percValue( match[2] );
+        percQuery = {
+          script: {
+            script: {
+              source:
+                `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) >= params.from && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) <= params.to`,
+              params: { from, to },
+            },
+          },
+        };
+      }
+      // fallback: treat as exact match (e.g., "90")
+      if ( !percQuery && /^\d+$/.test( value ) ) {
+        percQuery = {
+          script: {
+            script: {
+              source: `doc['mappingInfo.revicedPerc.keyword'].size()!=0 && Integer.parseInt(doc['mappingInfo.revicedPerc.keyword'].value.replace('%','')) == params.num`,
+              params: { num: percValue( value ) },
+            },
+          },
+        };
+      }
+
+      if ( percQuery ) {
+        searchQuery.query.bool.must.push( {
+          nested: {
+            path: 'mappingInfo',
+            query: {
+              bool: {
+                must: [
+                  { term: { 'mappingInfo.type': 'tangoreview' } },
+                  percQuery,
+                ],
+              },
+            },
+          },
+        } );
+      }
+    }
+
+    if ( inputData?.filterByReviewedBy && inputData?.filterByReviewedBy !== '' ) {
+      inputData.filterByReviewedBy = inputData?.filterByReviewedBy?.split( ',' );
+      searchQuery.query.bool.must.push( {
+        nested: {
+          path: 'mappingInfo',
+          query: {
+            bool: {
+              must: [
+                { term: { 'mappingInfo.type': 'review' } },
+                { terms: { 'mappingInfo.createdByEmail': inputData?.filterByReviewedBy } },
+
+              ],
+            },
+          },
+        },
+      } );
+    }
+
+    if ( inputData?.fileterByApprovedBy && inputData?.fileterByApprovedBy !== '' ) {
+      inputData.fileterByApprovedBy = inputData?.fileterByApprovedBy?.split( ',' );
+      searchQuery.query.bool.must.push( {
+        nested: {
+          path: 'mappingInfo',
+          query: {
+            bool: {
+              must: [
+                { term: { 'mappingInfo.type': 'approve' } },
+                { terms: { 'mappingInfo.createdByEmail': inputData?.fileterByApprovedBy } },
+
+              ],
+            },
+          },
+        },
+      } );
+    }
+
     if ( req?.user?.userType === 'tango' && inputData.tangoType !== 'internal' ) {
       searchQuery.query.bool.must.push(
           {
@@ -1428,7 +1709,7 @@ export async function ticketList( req, res ) {
     // You can add more filters as needed
     const searchResult = await getOpenSearchData( openSearch.footfallDirectory, searchQuery );
     const count = searchResult?.body?.hits?.total?.value || 0;
-
+    logger.info( { searchResult } );
     if ( count === 0 ) {
       return res.sendError( 'no data found', 204 );
     }

package/src/dtos/footfallDirectory.dtos.js

@@ -158,12 +158,12 @@ export const ticketListSchema = Joi.object().keys( {
   sortOrder: Joi.number().valid( -1, 1 ).optional(),
   tangoType: Joi.string().valid( 'store', 'internal', '' ).optional(),
   permissionType: Joi.string().valid( 'review', 'approve' ).optional(),
-  filterByStatus: Joi.array().items( Joi.string().required() ).optional(),
-  filterByReviewer: Joi.string().optional(),
-  filterByApprover: Joi.string().optional(),
-  filterByTango: Joi.string().optional(),
-  filterByReviewedBy: Joi.array().items( Joi.string().required() ).optional(),
-  fileterByApprovedBy: Joi.array().items( Joi.string().required() ).optional(),
+  filterByStatus: Joi.string().optional().allow( '' ),
+  filterByReviewer: Joi.string().optional().allow( '' ),
+  filterByApprover: Joi.string().optional().allow( '' ),
+  filterByTango: Joi.string().optional().allow( '' ),
+  filterByReviewedBy: Joi.string().optional().allow( '' ),
+  fileterByApprovedBy: Joi.string().optional().allow( '' ),
   fromDate: Joi.string()
       .pattern( /^\d{4}-\d{2}-\d{2}$/, 'YYYY-MM-DD format' )
       .required()