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

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -265,25 +265,10 @@ export async function tangoReviewTicket( req, res ) {
           record.mappingInfo = record.mappingInfo.map( ( item ) => {
             return {
               ...item,
-              status: 'Closed',
+              status: item.type === 'approve'? 'Tango Review Done':'Closed',
             };
           } );
         }
-        // If no review mapping existed, push a new one
-        // if ( record.mappingInfo.length === 0 ) {
-        //   record.mappingInfo.push( {
-        //     type: 'tangoreview',
-        //     mode: inputData.mappingInfo?.mode,
-        //     revicedFootfall: inputData.mappingInfo?.revicedFootfall,
-        //     revicedPerc: inputData.mappingInfo?.revicedPerc,
-        //     count: inputData.mappingInfo?.count,
-        //     revisedDetail: inputData.mappingInfo?.revisedDetail,
-        //     status: 'Closed',
-        //     createdByEmail: req?.user?.email,
-        //     createdByUserName: req?.user?.userName,
-        //     createdByRole: req?.user?.role,
-        //   } );
-        // }
       }
       record.mappingInfo.push(
           {
@@ -323,29 +308,6 @@ export async function tangoReviewTicket( req, res ) {
 
         record.mappingInfo = [ ...ticketData?.[0]?._source?.mappingInfo.slice( 0, -1 ),
           ...temp ];
-        // if ( Array.isArray( record.mappingInfo ) ) {
-        //   record.mappingInfo = record.mappingInfo.map( ( item ) => {
-        //     return {
-        //       ...item,
-        //       status: 'Closed',
-        //     };
-        //   } );
-        // }
-        // If no review mapping existed, push a new one
-        // if ( record.mappingInfo.length === 0 ) {
-        //   record.mappingInfo.push( {
-        //     type: 'tangoreview',
-        //     mode: inputData.mappingInfo?.mode,
-        //     revicedFootfall: inputData.mappingInfo?.revicedFootfall,
-        //     revicedPerc: inputData.mappingInfo?.revicedPerc,
-        //     count: inputData.mappingInfo?.count,
-        //     revisedDetail: inputData.mappingInfo?.revisedDetail,
-        //     status: 'Closed',
-        //     createdByEmail: req?.user?.email,
-        //     createdByUserName: req?.user?.userName,
-        //     createdByRole: req?.user?.role,
-        //   } );
-        // }
       }
     } else {
       if ( Array.isArray( record.mappingInfo ) ) {
@@ -370,25 +332,10 @@ export async function tangoReviewTicket( req, res ) {
           record.mappingInfo = record.mappingInfo.map( ( item ) => {
             return {
               ...item,
-              status: 'Closed',
+              status: item.type === 'approve'?'Tango Review Done': 'Closed',
             };
           } );
         }
-        // If no review mapping existed, push a new one
-        // if ( record.mappingInfo.length === 0 ) {
-        //   record.mappingInfo.push( {
-        //     type: 'tangoreview',
-        //     mode: inputData.mappingInfo?.mode,
-        //     revicedFootfall: inputData.mappingInfo?.revicedFootfall,
-        //     revicedPerc: inputData.mappingInfo?.revicedPerc,
-        //     count: inputData.mappingInfo?.count,
-        //     revisedDetail: inputData.mappingInfo?.revisedDetail,
-        //     status: 'Closed',
-        //     createdByEmail: req?.user?.email,
-        //     createdByUserName: req?.user?.userName,
-        //     createdByRole: req?.user?.role,
-        //   } );
-        // }
       }
       record.mappingInfo.push(
           {
@@ -1090,10 +1037,7 @@ export async function ticketList( req, res ) {
     if ( inputData.sortBy ) {
       let sortOrder = inputData.sortOrder === 1 ? 'asc' : 'desc';
 
-      // Remove default sort so we don't duplicate/conflict
-      // INSERT_YOUR_CODE
-      // If sortBy is present, check if the field needs ".keyword" (for string fields like storeName, storeId, ticketId)
-      // This avoids OpenSearch errors about sorting on text fields.
+
       const stringKeywordFields = [ 'storeName', 'storeId', 'ticketId', 'status', 'type', 'clientId' ];
       let sortField = inputData.sortBy == 'footfall' ? 'footfallCount' : inputData.sortBy == 'issueDate' ? 'dateString' : inputData.sortBy;
       if ( stringKeywordFields.includes( sortField ) ) {
@@ -1121,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 ],
           },
@@ -1217,6 +1161,441 @@ export async function ticketList( req, res ) {
       }
     }
 
+    if ( inputData.filterByStatus && inputData.filterByStatus!=='' ) {
+      inputData.filterByStatus = inputData?.filterByStatus?.split( ',' );
+
+      if ( req?.user?.userType === 'tango' ) {
+        {
+          switch ( inputData?.tangoType ) {
+            case 'store':
+              searchQuery.query.bool.must.push( {
+                nested: {
+                  path: 'mappingInfo',
+                  query: {
+                    bool: {
+                      must: [
+                        {
+                          term: {
+                            'mappingInfo.type': 'tangoreview',
+                          },
+                        },
+                        {
+                          terms: {
+                            'mappingInfo.status': inputData?.filterByStatus,
+                          },
+                        },
+                      ],
+                    },
+                  },
+                },
+              } );
+              break;
+            case 'internal':
+              searchQuery.query.bool.must.push( {
+                'terms': {
+                  'status.keyword': Array.isArray( inputData?.filterByStatus ) ?
+                    inputData?.filterByStatus :
+                    [ inputData?.filterByStatus ],
+                },
+              } );
+              break;
+              defaut:
+              searchQuery.query.bool.must.push( {
+                nested: {
+                  path: 'mappingInfo',
+                  query: {
+                    bool: {
+                      must: [
+                        {
+                          term: {
+                            'mappingInfo.type': 'tangoreview',
+                          },
+                        },
+                        {
+                          terms: {
+                            'mappingInfo.status': inputData?.filterByStatus,
+                          },
+                        },
+                      ],
+                    },
+                  },
+                },
+              } );
+          }
+        }
+      } else if ( ticketsFeature && !ticketsApproveFeature ) {
+        searchQuery.query.bool.must.push( {
+          nested: {
+            path: 'mappingInfo',
+            query: {
+              bool: {
+                must: [
+                  {
+                    term: {
+                      'mappingInfo.type': 'review',
+                    },
+                  },
+                  {
+                    terms: {
+                      'mappingInfo.status': inputData?.filterByStatus,
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        } );
+      } else if ( ticketsFeature && ticketsApproveFeature ) {
+        switch ( inputData.permisisionType ) {
+          case 'review':
+            searchQuery.query.bool.must.push( {
+              nested: {
+                path: 'mappingInfo',
+                query: {
+                  bool: {
+                    must: [
+                      {
+                        term: {
+                          'mappingInfo.type': 'review',
+                        },
+                      },
+                      {
+                        terms: {
+                          'mappingInfo.status': inputData?.filterByStatus,
+                        },
+                      },
+                    ],
+                  },
+                },
+              },
+            } );
+            break;
+          case 'approve':
+            searchQuery.query.bool.must.push( {
+              nested: {
+                path: 'mappingInfo',
+                query: {
+                  bool: {
+                    must: [
+                      {
+                        term: {
+                          'mappingInfo.type': 'approve',
+                        },
+                      },
+                      {
+                        terms: {
+                          'mappingInfo.status': inputData?.filterByStatus,
+                        },
+                      },
+                    ],
+                  },
+                },
+              },
+            } );
+          default: searchQuery.query.bool.must.push( {
+            nested: {
+              path: 'mappingInfo',
+              query: {
+                bool: {
+                  must: [
+                    {
+                      term: {
+                        'mappingInfo.type': 'approve',
+                      },
+                    },
+                    {
+                      terms: {
+                        'mappingInfo.status': inputData?.filterByStatus,
+                      },
+                    },
+                  ],
+                },
+              },
+            },
+          } );
+        }
+      }
+    }
+
+    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(
           {
@@ -1330,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()

package/src/routes/footfallDirectory.routes.js

@@ -16,7 +16,6 @@ footfallDirectoryRouter.post( '/tango-review-accuracy-ticket', isAllowedSessionH
 footfallDirectoryRouter.get( '/ticket-summary', isAllowedSessionHandler, bulkValidate( ticketSummaryValid ), ticketSummary );
 
 footfallDirectoryRouter.get( '/ticket-list', isAllowedSessionHandler, bulkValidate( ticketListValid ), ticketList );
-// footfallDirectoryRouter.get( '/ticket-list', isAllowedSessionHandler, bulkValidate( ticketListValid ), ticketList );
 footfallDirectoryRouter.get( '/get-tickets', isAllowedSessionHandler, bulkValidate( getTicketsValid ), getTickets );
 footfallDirectoryRouter.get( '/get-tagged-stores', isAllowedSessionHandler, bulkValidate( getTaggedStoresValid ), getAssinedStore, getClusters, getTaggedStores );
 footfallDirectoryRouter.put( '/update-status', isAllowedSessionHandler, bulkValidate( updateStatusValid ), updateStatus );

package/src/validations/footfallDirectory.validation.js

@@ -1639,7 +1639,7 @@ export async function ticketApprove( req, res, next ) {
               revicedPerc: Math.round( ( revisedFootfall / footfallCount ) * 100 || 0 ) + '%',
               count: tempAcc,
               revisedDetail: formattedTaggingData,
-              status: 'Closed',
+              status: 'Under Tango Review',
               createdByEmail: req?.user?.email,
               createdByUserName: req?.user?.userName,
               createdByRole: req?.user?.role,