tango-app-api-infra 3.9.5-vms.90 → 3.9.5-vms.93

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -151,6 +151,7 @@ export async function tangoReviewTicket( req, res ) {
       query: {
         bool: {
           must: [
+
             {
               term: {
                 'storeId.keyword': inputData.storeId,
@@ -177,6 +178,11 @@ export async function tangoReviewTicket( req, res ) {
       query: {
         bool: {
           must: [
+            {
+              term: {
+                'type.keyword': 'store',
+              },
+            },
             {
               term: {
                 'storeId.keyword': inputData.storeId,
@@ -505,6 +511,12 @@ export async function tangoReviewAccuracyClosedTicket( req, res ) {
       query: {
         bool: {
           must: [
+            {
+              term: {
+                'type.keyword': 'store',
+              },
+            },
+
             {
               term: {
                 'storeId.keyword': inputData.storeId,
@@ -572,36 +584,17 @@ export async function tangoReviewAccuracyClosedTicket( req, res ) {
             subComments: inputData?.subComments ||'',
           } ) );
 
-      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',
-      //     };
-      //   } );
-      // }
-
-      record.mappingInfo.push(
-          {
-            type: 'finalRevision',
-            mode: 'web',
-            revicedFootfall: temp?.[0]?.revicedFootfall,
-            revicedPerc: temp?.[0].revicedPerc,
-            count: temp?.[0].count,
-            revisedDetail: temp?.[0]?.revisedDetail,
-            status: 'Closed',
-            createdByEmail: req?.user?.email,
-            createdByUserName: req?.user?.userName,
-            createdByRole: req?.user?.role,
-            createdAt: new Date(),
+      const temp2 = record.mappingInfo
+          .filter( ( item ) => item.type === 'finalRevision' )
+          .map( ( item ) => ( {
+            ...item,
             comments: inputData?.comments || '',
-            subComments: inputData?.subComments || '',
-          },
-      );
-    }
+            subComments: inputData?.subComments ||'',
+          } ) );
 
+      record.mappingInfo = [ ...ticketData?.[0]?._source?.mappingInfo.slice( 0, -2 ),
+        ...temp, ...temp2 ];
+    }
 
     // return;
 
@@ -610,84 +603,6 @@ export async function tangoReviewAccuracyClosedTicket( req, res ) {
     const insertResult = await updateOpenSearchData( openSearch.footfallDirectory, id, { doc: record } );
 
     if ( insertResult && ( insertResult.statusCode === 201 || insertResult.statusCode === 200 ) ) {
-      const query = {
-        storeId: inputData?.storeId,
-        isVideoStream: true,
-      };
-      const getStoreType = await countDocumnetsCamera( query );
-      const revopInfoQuery = {
-        size: 10000,
-        query: {
-          bool: {
-            must: [
-              {
-                term: {
-                  'storeId.keyword': inputData.storeId,
-                },
-              },
-              {
-                term: {
-                  'dateString': inputData.dateString,
-                },
-              },
-              {
-                term: {
-                  'isParent': false,
-                },
-              },
-              {
-                term: {
-                  isChecked: true,
-                },
-              },
-            ],
-          },
-        },
-        _source: [ 'tempId' ],
-
-      };
-      const revopInfo = await getOpenSearchData( openSearch.revop, revopInfoQuery );
-      // Get all tempIds from revopInfo response
-      const tempIds = revopInfo?.body?.hits?.hits?.map( ( hit ) => hit?._source?.tempId ).filter( Boolean ) || [];
-      // Prepare management eyeZone query based on storeId and dateString
-      const managerEyeZoneQuery = {
-        size: 1,
-        query: {
-          bool: {
-            must: [
-              {
-                term: {
-                  'storeId.keyword': inputData.storeId,
-                },
-              },
-              {
-                term: {
-                  'storeDate': inputData.dateString,
-                },
-              },
-            ],
-          },
-        },
-        _source: [ 'originalToTrackerCustomerMapping' ],
-      };
-
-      // Query the managerEyeZone index for the matching document
-      const managerEyeZoneResp = await getOpenSearchData( openSearch.managerEyeZone, managerEyeZoneQuery );
-      const managerEyeZoneHit = managerEyeZoneResp?.body?.hits?.hits?.[0]?._source;
-      // Extract originalToTrackerCustomerMapping if it exists
-      const mapping =
-            managerEyeZoneHit && managerEyeZoneHit.originalToTrackerCustomerMapping ?
-              managerEyeZoneHit.originalToTrackerCustomerMapping :
-              {};
-
-      // Find tempIds that exist in both revopInfo results and manager mapping
-      const temp = [];
-      tempIds.filter( ( tid ) => mapping[tid] !== null ? temp.push( { tempId: mapping[tid] } ) :'' );
-      const isSendMessge = await sendSqsMessage( inputData, temp, getStoreType, inputData.storeId );
-      if ( isSendMessge == true ) {
-        logger.info( '....1' );
-      }
-
       return res.sendSuccess( 'Ticket closed successfully' );
     } else {
       return res.sendError( 'Internal Server Error', 500 );
@@ -1511,6 +1426,220 @@ export async function ticketSummary( req, res ) {
           avgTicket: ticketPercentageAvg+'%',
           avgAccuracy: ticketAccuracy+'%',
         };
+      } else if ( !ticketsFeature && ticketsApproveFeature ) {
+        const storeQuery = {
+          size: 0,
+          query: {
+            bool: {
+              must: [
+                {
+                  'range': {
+                    'dateString': {
+                      'gte': inputData?.fromDate,
+                      'lte': inputData?.toDate,
+                      'format': 'yyyy-MM-dd',
+                    },
+                  },
+                },
+                {
+                  terms: {
+                    'clientId.keyword': Array.isArray( inputData.clientId ) ?
+                      inputData.clientId :
+                      [ inputData.clientId ],
+                  },
+
+                },
+                {
+                  nested: {
+                    path: 'mappingInfo',
+                    query: {
+                      bool: {
+                        must: [
+                          {
+                            term: {
+                              'mappingInfo.type': inputData.permissionType === 'review'? 'review':'approve',
+                            },
+                          },
+                        ],
+                      },
+                    },
+                  },
+                },
+
+              ],
+            },
+          },
+        };
+
+        // Helper function to clone deep and replace mappingInfo.status for openTickets/closed/etc
+        function buildStoreQueryWithStatus( baseQuery, statusValue ) {
+          let q = JSON.parse( JSON.stringify( baseQuery ) );
+          // Remove any previous mappingInfo.status term
+          let nested = q.query.bool.must.find( ( m ) => m.nested );
+          if ( nested ) {
+            // filter out all mappingInfo.status
+            nested.nested.query.bool.must = nested?.nested?.query?.bool?.must.filter( ( mustItem ) => {
+              return !( mustItem.term && mustItem.term['mappingInfo.status'] );
+            } );
+            // add desired status
+            nested.nested.query.bool.must.push( {
+              term: {
+                'mappingInfo.status': statusValue,
+              },
+            } );
+          }
+          return q;
+        }
+
+        const buildAggStoreQuery = ( baseQuery, filters = [] ) => {
+          const q = JSON.parse( JSON.stringify( baseQuery ) );
+
+          // locate nested section
+          const nested = q.query.bool.must.find( ( m ) => m.nested );
+
+          if ( nested ) {
+            // remove old status filters
+            nested.nested.query.bool.must =
+              nested.nested.query.bool.must.filter( ( m ) => !( m.term && m.term['mappingInfo.status'] ) );
+
+            // add new filters
+            nested.nested.query.bool.must.push( ...filters );
+          }
+
+          return {
+            ...q,
+            size: 0,
+            aggs: {
+              avg_value: {
+                avg: 'mappingInfp.reviced',
+              },
+            },
+          };
+        };
+
+
+        // Get OpenSearch connection
+
+        const baseStoreQuery = JSON.parse( JSON.stringify( storeQuery ) );
+
+        // Total Tickets (all tickets with mappingInfo.type == tangoreview)
+        let totalTickets = 0;
+
+        let allQuery = JSON.parse( JSON.stringify( baseStoreQuery ) );
+
+        allQuery.size = 0;
+        const totalResp = await getOpenSearchData( openSearch.footfallDirectory, allQuery );
+        totalTickets = totalResp?.body?.hits?.total?.value || 0;
+
+        // openTickets: mappingInfo.status: 'Open'
+        let openTickets = 0;
+
+        let otQ = buildStoreQueryWithStatus( baseStoreQuery, 'Open' );
+        otQ.size = 0;
+        const openResp = await getOpenSearchData( openSearch.footfallDirectory, otQ );
+        openTickets = openResp?.body?.hits?.total?.value || 0;
+        // logger.info( { msd: '..............2', openResp } );
+
+
+        // inprogress: mappingInfo.status: 'in-Progress'
+        let inprogress = 0;
+
+        let ipQ = buildStoreQueryWithStatus( baseStoreQuery, 'In-Progress' );
+        ipQ.size = 0;
+        const ipResp = await getOpenSearchData( openSearch.footfallDirectory, ipQ );
+        inprogress = ipResp?.body?.hits?.total?.value || 0;
+
+        // closedTickets: mappingInfo.status: 'closed'
+        let closedTickets = 0;
+
+        let clQ = buildStoreQueryWithStatus( baseStoreQuery, 'Closed' );
+        clQ.size = 0;
+        const clResp = await getOpenSearchData( openSearch.footfallDirectory, clQ );
+        closedTickets = clResp?.body?.hits?.total?.value || 0;
+        // dueToday: Tickets whose dueDate is today (format 'yyyy-MM-dd')
+        let dueToday = 0;
+        let todayDateString = new Date().toISOString().slice( 0, 10 );
+
+        // Build a query for tickets with mappingInfo.dueDate == todayDateString
+        let dueTodayQuery = JSON.parse( JSON.stringify( baseStoreQuery ) );
+        // Locate nested mappingInfo query
+        let nestedDue = dueTodayQuery.query.bool.must.find( ( m ) => m.nested );
+        if ( nestedDue ) {
+          // Remove any previous mappingInfo.dueDate term
+          nestedDue.nested.query.bool.must = nestedDue.nested.query.bool.must.filter(
+              ( mustItem ) => !( mustItem.term && mustItem.term['mappingInfo.dueDate'] ),
+          );
+          // Add new dueDate filter
+          nestedDue.nested.query.bool.must.push( {
+            term: { 'mappingInfo.dueDate': todayDateString },
+          } );
+        }
+        dueTodayQuery.size = 0;
+        const dueTodayResp = await getOpenSearchData( openSearch.footfallDirectory, dueTodayQuery );
+        dueToday = dueTodayResp?.body?.hits?.total?.value || 0;
+
+
+        // filter expired Tickets
+        let expiredTickets = 0;
+
+        let eQ = buildStoreQueryWithStatus( baseStoreQuery, 'Under Tango Review' );
+        eQ.size = 0;
+        const eResp = await getOpenSearchData( openSearch.footfallDirectory, eQ );
+        expiredTickets = eResp?.body?.hits?.total?.value || 0;
+
+        // filter under tango review
+
+        let undertangoTickets = 0;
+
+        let utrQ = buildStoreQueryWithStatus( baseStoreQuery, 'Under Tango Review' );
+        utrQ.size = 0;
+        const utrResp = await getOpenSearchData( openSearch.footfallDirectory, utrQ );
+        undertangoTickets = utrResp?.body?.hits?.total?.value || 0;
+
+        let ticketPercentageAvg =0;
+        let avgTicketPercentageQuery = JSON.parse( JSON.stringify( baseStoreQuery ) );
+        avgTicketPercentageQuery.size = 0;
+        avgTicketPercentageQuery.aggs = {
+          avg_ticket_percentage: {
+            avg: {
+              script: {
+                source: `
+                  if (doc.containsKey('reviced') && doc['reviced'].size()!=0 && 
+                      doc.containsKey('footfallCount') && doc['footfallCount'].size()!=0 && doc['footfallCount'].value != 0) {
+                    return (doc['reviced'].value / doc['footfallCount'].value) * 100;
+                  } else {
+                    return null;
+                  }
+                `,
+                lang: 'painless',
+              },
+            },
+          },
+        };
+
+        const avgTicketPercentageResp = await getOpenSearchData( openSearch.footfallDirectory, avgTicketPercentageQuery );
+
+        ticketPercentageAvg = avgTicketPercentageResp?.body?.aggregations?.avg_ticket_percentage?.value?.toFixed( 2 ) || '0';
+        logger.info( { avgTicketPercentageResp } );
+        let ticketAccuracy = 0;
+
+        let belowQ = buildAggStoreQuery( baseStoreQuery );
+        logger.info( { belowQ } );
+        const accuracyResp = await getOpenSearchData( openSearch.footfallDirectory, belowQ );
+        ticketAccuracy = accuracyResp?.body?.aggregations?.avg_value?.value?.toFixed( 2 ) || '0';
+        logger.info( { accuracyResp } );
+        // Final result object
+        result = {
+          totalTickets,
+          openTickets,
+          inprogress,
+          closedTickets,
+          dueToday: dueToday,
+          Expired: expiredTickets,
+          underTangoReview: undertangoTickets,
+          avgTicket: ticketPercentageAvg+'%',
+          avgAccuracy: ticketAccuracy+'%',
+        };
       } else if ( ticketsFeature && ticketsApproveFeature ) {
         if ( inputData?.permissionType === 'review' ) {
           const storeQuery = {
@@ -2212,6 +2341,20 @@ export async function ticketList( req, res ) {
       },
     };
 
+    if ( req?.user?.userType !== 'tango', req?.user?.role !== 'superadmin' ) {
+      if ( req?.body?.assignedStores?.length > 0 ) {
+        searchQuery.query.bool.must.push( {
+          terms: {
+            'storeId.keyword': Array.isArray( req?.body?.assignedStores ) ?
+              req?.body?.assignedStores :
+              [ req?.body?.assignedStores ],
+          },
+        } );
+      } else {
+        return res.sendError( 'no data', 204 );
+      }
+    }
+
     if ( inputData.sortBy ) {
       let sortOrder = inputData.sortOrder === 1 ? 'asc' : 'desc';
 
@@ -2423,6 +2566,28 @@ export async function ticketList( req, res ) {
             },
           },
         } );
+      } else if ( !ticketsFeature && ticketsApproveFeature ) {
+        searchQuery.query.bool.must.push( {
+          nested: {
+            path: 'mappingInfo',
+            query: {
+              bool: {
+                must: [
+                  {
+                    term: {
+                      'mappingInfo.type': 'approve',
+                    },
+                  },
+                  {
+                    terms: {
+                      'mappingInfo.status': inputData?.filterByStatus,
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        } );
       } else if ( ticketsFeature && ticketsApproveFeature ) {
         switch ( inputData.permisisionType ) {
           case 'review':
@@ -2992,9 +3157,18 @@ export async function ticketList( req, res ) {
               'Ticket ID': item?.ticketId,
               'store Name': item?.storeName,
               'store ID': item?.storeId,
-              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.createdAt,
-              'Issue Date': item?.dateString,
-              'Due Date': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.dueDate,
+              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.createdAt? dayjs( item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.createdAt ).format( 'DD MMM, YYYY' ) : '',
+              'Issue Date': item?.dateString ? dayjs( item.dateString ).format( 'DD MMM, YYYY' ) : '',
+              'Due Date': ( () => {
+                const dueDate = item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.dueDate;
+                if ( dueDate ) {
+                  if ( dayjs( dueDate ).isSame( dayjs(), 'day' ) ) {
+                    return 'Due Today';
+                  }
+                  return dayjs( dueDate ).format( 'DD MMM, YYYY' );
+                }
+                return '';
+              } )(),
               'Actual FF': item?.footfallCount,
               'Store (%)': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
               'Reviewer (%)': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
@@ -3011,20 +3185,29 @@ export async function ticketList( req, res ) {
           for ( let item of ticketListData ) {
             temp.push( {
 
-              ticketId: item?.ticketId,
-              storeId: item?.storeId,
-              storeName: item?.storeName,
-              ticketRaised: item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.createdAt,
-              issueDate: item?.dateString,
-              dueDate: item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.dueDate,
-              footfall: item?.footfallCount,
-              storeRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
-              reviewerRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
-              approverRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.revicedPerc || '--',
-              tangoRevisedAccuracy: item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.revicedPerc || '--',
-              status: item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.status || '--',
-              comments: item?.mappingInfo?.find( ( f ) => f.type === 'finalRevision' )?.comments || '--',
-              subComments: item?.mappingInfo?.find( ( f ) => f.type === 'finalRevision' )?.subComments || '--',
+              'ticketId': item?.ticketId,
+              'storeId': item?.storeId,
+              'storeName': item?.storeName,
+              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.createdAt? dayjs( item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.createdAt ).format( 'DD MMM, YYYY' ) : '',
+              'Issue Date': item?.dateString ? dayjs( item.dateString ).format( 'DD MMM, YYYY' ) : '',
+              'Due Date': ( () => {
+                const dueDate = item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.dueDate;
+                if ( dueDate ) {
+                  if ( dayjs( dueDate ).isSame( dayjs(), 'day' ) ) {
+                    return 'Due Today';
+                  }
+                  return dayjs( dueDate ).format( 'DD MMM, YYYY' );
+                }
+                return '';
+              } )(),
+              'footfall': item?.footfallCount,
+              'storeRevisedAccuracy': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
+              'reviewerRevisedAccuracy': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
+              'approverRevisedAccuracy': item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.revicedPerc || '--',
+              'tangoRevisedAccuracy': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.revicedPerc || '--',
+              'status': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.status || '--',
+              'comments': item?.mappingInfo?.find( ( f ) => f.type === 'finalRevision' )?.comments || '--',
+              'subComments': item?.mappingInfo?.find( ( f ) => f.type === 'finalRevision' )?.subComments || '--',
 
             } );
           }
@@ -3033,29 +3216,50 @@ export async function ticketList( req, res ) {
         if ( inputData?.isExport ) {
           const exportData = [];
           for ( let item of ticketListData ) {
+            console.log( item );
             exportData.push( {
 
               'Ticket ID': item?.ticketId,
               'Store Name': item?.storeName,
               'Store ID': item?.storeId,
-              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.createdAt,
-              'Issue Date': item?.dateString,
+              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.createdAt? dayjs( item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.createdAt ).format( 'DD MMM, YYYY' ) : '',
+              'Issue Date': item?.dateString ? dayjs( item.dateString ).format( 'DD MMM, YYYY' ) : '',
               'Ticket Type': item?.type,
               'Actual FF': item?.footfallCount,
-              // Use the dueDate from the last mappingInfo item whose type is NOT 'finalRevisoon'
+              // Use the dueDate from the last mappingInfo item whose type is NOT 'finalRevison'
+
               'Due Date': ( () => {
                 if ( Array.isArray( item?.mappingInfo ) ) {
-                  const filtered = item.mappingInfo.filter( ( f ) => f.dueDate && f.type !== 'finalRevisoon' );
+                  const filtered = item.mappingInfo.filter( ( f ) => f.dueDate && f.type !== 'finalRevison' );
                   return filtered.length > 0 ? filtered[filtered.length - 1].dueDate : '';
                 }
                 return '';
               } )(),
+              'Due Date (Formatted)': ( () => {
+                if ( Array.isArray( item?.mappingInfo ) ) {
+                  // Find last mappingInfo whose type is NOT 'finalRevison'
+                  const filtered = item.mappingInfo.filter(
+                      ( f ) => f.dueDate && f.type !== 'finalRevison',
+                  );
+                  if ( filtered.length > 0 ) {
+                    const lastDueDate = filtered[filtered.length - 1].dueDate;
+                    if ( lastDueDate ) {
+                      if ( dayjs( lastDueDate ).isSame( dayjs(), 'day' ) ) {
+                        return 'Due Today';
+                      }
+                      return dayjs( lastDueDate ).format( 'DD MMM, YYYY' );
+                    }
+                  }
+                }
+                return '';
+              } )(),
+
               'Store (%)': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
               'Reviewer (%)': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
               'Approver (%)': item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.revicedPerc || '--',
               'Tango (%)': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.revicedPerc || '--',
-              'Ticket Status': item?.status,
-              'Tango Status': item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.status || '--',
+              'Ticket Status': item?.type === 'store'? item?.status : '',
+              'Tango Status': item?.type === 'store'? item?.mappingInfo?.find( ( f ) => f.type === 'tangoreview' )?.status || '--' : item.status,
 
             } );
           }
@@ -3067,12 +3271,12 @@ export async function ticketList( req, res ) {
               ticketId: item?.ticketId,
               storeId: item?.storeId,
               storeName: item?.storeName,
-              ticketRaised: item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.createdAt,
+              ticketRaised: item?.mappingInfo?.find( ( f ) => f?.type === 'tagging' )?.createdAt,
               issueDate: item?.dateString,
               footfall: item?.footfallCount,
               dueDate: ( () => {
                 if ( Array.isArray( item?.mappingInfo ) ) {
-                  const filtered = item.mappingInfo.filter( ( f ) => f.dueDate && f.type !== 'finalRevisoon' );
+                  const filtered = item.mappingInfo.filter( ( f ) => f?.dueDate && f?.type !== 'finalRevisoon' );
                   return filtered.length > 0 ? filtered[filtered.length - 1].dueDate : '';
                 }
                 return '';
@@ -3099,9 +3303,18 @@ export async function ticketList( req, res ) {
               'Ticket ID': item?.ticketId,
               'Store Name': item?.storeName,
               'Store ID': item?.storeId,
-              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.createdAt,
-              'Issue Date': item?.dateString,
-              'Due Date': item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.dueDate,
+              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.createdAt? dayjs( item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.createdAt ).format( 'DD MMM, YYYY' ) : '',
+              'Issue Date': item?.dateString ? dayjs( item.dateString ).format( 'DD MMM, YYYY' ) : '',
+              'Due Date': ( () => {
+                const dueDate = item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.dueDate;
+                if ( dueDate ) {
+                  if ( dayjs( dueDate ).isSame( dayjs(), 'day' ) ) {
+                    return 'Due Today';
+                  }
+                  return dayjs( dueDate ).format( 'DD MMM, YYYY' );
+                }
+                return '';
+              } )(),
               'Actual FF': item?.footfallCount,
               'Store (%)': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
               'Reviewer (%)': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
@@ -3146,10 +3359,19 @@ export async function ticketList( req, res ) {
               'Ticket ID': item?.ticketId,
               'Store Name': item?.storeName,
               'Store ID': item?.storeId,
-              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.createdAt,
-              'Issue Date': item?.dateString,
+              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.createdAt? dayjs( item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.createdAt ).format( 'DD MMM, YYYY' ) : '',
+              'Issue Date': item?.dateString ? dayjs( item.dateString ).format( 'DD MMM, YYYY' ) : '',
+              'Due Date': ( () => {
+                const dueDate = item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.dueDate;
+                if ( dueDate ) {
+                  if ( dayjs( dueDate ).isSame( dayjs(), 'day' ) ) {
+                    return 'Due Today';
+                  }
+                  return dayjs( dueDate ).format( 'DD MMM, YYYY' );
+                }
+                return '';
+              } )(),
               'Actual FF': item?.footfallCount,
-              'Due Date': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.dueDate,
               'Store (%)': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
               'Reviewer (%)': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
               'Status': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.status || '--',
@@ -3189,10 +3411,20 @@ export async function ticketList( req, res ) {
               'Ticket ID': item?.ticketId,
               'Store ID': item?.storeId,
               'Store Name': item?.storeName,
-              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.createdAt,
-              'Issue Date': item?.dateString,
+              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.createdAt? dayjs( item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.createdAt ).format( 'DD MMM, YYYY' ) : '',
+              'Issue Date': item?.dateString ? dayjs( item.dateString ).format( 'DD MMM, YYYY' ) : '',
+              'Due Date': ( () => {
+                const dueDate = item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.dueDate;
+                if ( dueDate ) {
+                  if ( dayjs( dueDate ).isSame( dayjs(), 'day' ) ) {
+                    return 'Due Today';
+                  }
+                  return dayjs( dueDate ).format( 'DD MMM, YYYY' );
+                }
+                return '';
+              } )(),
               'Actual FF': item?.footfallCount,
-              'Due Date': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.dueDate,
+
               'Store (%)': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
               'Reviewer (%)': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
               'Status': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.status || '--',
@@ -3230,9 +3462,18 @@ export async function ticketList( req, res ) {
               'Ticket ID': item?.ticketId,
               'Store Name': item?.storeName,
               'Store ID': item?.storeId,
-              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.createdAt,
-              'Issue Date': item?.dateString,
-              'Due Date': item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.dueDate,
+              'Ticket Raised': item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.createdAt? dayjs( item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.createdAt ).format( 'DD MMM, YYYY' ) : '',
+              'Issue Date': item?.dateString ? dayjs( item.dateString ).format( 'DD MMM, YYYY' ) : '',
+              'Due Date': ( () => {
+                const dueDate = item?.mappingInfo?.find( ( f ) => f.type === 'approve' )?.dueDate;
+                if ( dueDate ) {
+                  if ( dayjs( dueDate ).isSame( dayjs(), 'day' ) ) {
+                    return 'Due Today';
+                  }
+                  return dayjs( dueDate ).format( 'DD MMM, YYYY' );
+                }
+                return '';
+              } )(),
               'Actual FF': item?.footfallCount,
               'Store (%)': item?.mappingInfo?.find( ( f ) => f.type === 'tagging' )?.revicedPerc || '--',
               'Reviewer (%)': item?.mappingInfo?.find( ( f ) => f.type === 'review' )?.revicedPerc || '--',
@@ -3287,7 +3528,7 @@ export async function getTickets( req, res ) {
     const inputData = req.query;
 
 
-    let source = [ 'storeId', 'type', 'dateString', 'ticketName', 'revicedFootfall', 'revicedPerc', 'mappingInfo', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'junkCount', 'junkACCount', 'comments', 'employee', 'houseKeeping', 'junk', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'junkStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail', 'type' ];
+    let source = [ 'storeId', 'createdByEmail', 'type', 'dateString', 'ticketName', 'revicedFootfall', 'revicedPerc', 'mappingInfo', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'junkCount', 'junkACCount', 'comments', 'employee', 'houseKeeping', 'junk', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'junkStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail', 'type' ];
     let filter = [
 
       {
@@ -3334,6 +3575,7 @@ export async function getTickets( req, res ) {
       response.map( ( hit ) => {
         const defaultData = {
           storeId: hit._source.storeId,
+          createdByEmail: hit?._source?.createdByEmail,
           dateString: hit?._source?.dateString,
           ticketName: hit?._source?.ticketName,
           status: hit?._source?.status?.revicedFootfall,
@@ -4457,6 +4699,14 @@ async function extractTempIds( document ) {
 export async function reviewerList( req, res ) {
   try {
     const inputData = req.query;
+
+    console.log( '🚀 ~ reviewerList ~ inputData.tangotype:', inputData.tangotype );
+    if ( inputData.tangotype!=''&&inputData.tangotype==='internal' ) {
+      const getUserlist = await findUser( { userType: 'tango' }, { userName: 1, email: 1, role: 1 } );
+      return res.sendSuccess( getUserlist || [] );
+    }
+
+
     // Build the query for users who have rolespermission with featureName "FootfallDirectory",
     // and a module "Reviewer" where isAdd or isEdit is true.
     const reviewerRoleQuery = {

package/src/dtos/footfallDirectory.dtos.js

@@ -515,6 +515,7 @@ export const downloadTicketsValid = {
 
 export const reviewerListSchema = Joi.object().keys( {
   clientId: Joi.string().required(),
+  tangotype: Joi.string().optional(),
   type: Joi.string().required().allow( 'approve', 'review' ),
 } );
 

package/src/routes/footfallDirectory.routes.js

@@ -15,7 +15,7 @@ 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 ), getAssinedStore, 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

@@ -1,4 +1,4 @@
-import { bulkUpdate, getOpenSearchCount, getOpenSearchData, insertWithId, logger, sendMessageToFIFOQueue, updateOpenSearchData } from 'tango-app-api-middleware';
+import { bulkUpdate, getOpenSearchCount, getOpenSearchData, insertWithId, logger, sendMessageToFIFOQueue, updateOpenSearchData, getOpenSearchById } from 'tango-app-api-middleware';
 import { aggregateCluster } from '../services/cluster.service.js';
 import { findOneRevopDownload } from '../services/revopDownload.service.js';
 import { findOneStore } from '../services/store.service.js';
@@ -957,13 +957,14 @@ export async function ticketReview( req, res, next ) {
     // check the createtion permission from the user permission
     const userInfo = req?.user;
     const ticketsFeature = userInfo?.rolespermission?.some( ( f ) => f.featureName === 'FootfallDirectory' && ( f.modules.find( ( m ) => m.name == 'reviewer' && ( m.isAdd == true || m.isEdit == true ) ) ) );
+    logger.info( { ticketsFeature, userInfo } );
     if ( !ticketsFeature ) {
       return res.sendError( 'Forbidden to Reiew this Ticket', 403 );
     }
 
     // get store info by the storeId into mongo db
     const getstoreName = await findOneStore( { storeId: inputData.storeId, status: 'active' }, { storeId: 1, storeName: 1, clientId: 1 } );
-
+    logger.info( { getstoreName } );
     if ( !getstoreName || getstoreName == null ) {
       return res.sendError( 'The store ID is either inActive or not found', 400 );
     }
@@ -1074,6 +1075,8 @@ export async function ticketReview( req, res, next ) {
       return res.sendError( 'The Client ID is either not configured or not found', 400 );
     }
 
+    logger.info( { config } );
+
     // Get taggingLimitation from config (check both possible paths)
     const taggingLimitation = getConfig?.effectiveLimitation?.values;
     // Initialize count object from taggingLimitation
@@ -1148,7 +1151,7 @@ export async function ticketReview( req, res, next ) {
 
       const revopData = await getOpenSearchData( openSearch.revop, revopQuery );
       const buckets = revopData?.body?.aggregations?.type_counts?.buckets || [];
-
+      logger.info( { revopData } );
       // Map OpenSearch revopsType values to count object keys
       buckets.forEach( ( bucket ) => {
         const revopsType = bucket.key;
@@ -1181,6 +1184,7 @@ export async function ticketReview( req, res, next ) {
     if ( footfallCount - revisedFootfall == 0 ) {
       return res.sendError( 'Cannot review a ticket because footfall hasn’t changed', 400 );
     }
+    logger.info( { footfallCount, revisedFootfall } );
     const taggingData = {
       size: 10000,
       query: {
@@ -1213,6 +1217,16 @@ export async function ticketReview( req, res, next ) {
       query: {
         bool: {
           must: [
+            {
+              term: {
+                'type.keyword': 'store',
+              },
+            },
+            {
+              term: {
+                'type.keyword': 'store',
+              },
+            },
             {
               term: {
                 'storeId.keyword': inputData.storeId,
@@ -1233,6 +1247,7 @@ export async function ticketReview( req, res, next ) {
     if ( !ticketData || ticketData?.length == 0 ) {
       return res.sendError( 'You don’t have any tagged images right now', 400 );
     }
+    logger.info( { ticketData, mappingInfo: ticketData?.[0]?._source?.mappingInfo } );
     const record = {
 
       status: 'Reviewer-Closed',
@@ -1245,7 +1260,7 @@ export async function ticketReview( req, res, next ) {
       // createdByRole: req?.user?.role,
 
     };
-
+    logger.info( { record } );
     if ( Array.isArray( record.mappingInfo ) ) {
       const temp = record.mappingInfo
           .filter( ( item ) => item.type === 'review' )
@@ -1287,7 +1302,7 @@ export async function ticketReview( req, res, next ) {
     // Retrieve client footfallDirectoryConfigs revision
     let isAutoCloseEnable = getConfig?.footfallDirectoryConfigs?.isAutoCloseEnable; ;
     let autoCloseAccuracy = getConfig?.footfallDirectoryConfigs?.autoCloseAccuracy;
-
+    logger.info( { isAutoCloseEnable, autoCloseAccuracy } );
 
     const getNumber = autoCloseAccuracy.split( '%' )[0];
     let autoCloseAccuracyValue = parseFloat( ( autoCloseAccuracy || getNumber ).replace( '%', '' ) );
@@ -1366,13 +1381,14 @@ export async function ticketReview( req, res, next ) {
             createdAt: new Date(),
           },
       );
+      logger.info( { revisedPercentage } );
     } else {
       // If ticket is closed, do not proceed with revision mapping
       let revisionArray = [];
 
 
       revisionArray = getConfig?.footfallDirectoryConfigs?.revision || [];
-
+      logger.info( { revisionArray } );
 
       // Default fallbacks
       let revisionMapping = null;
@@ -1405,7 +1421,7 @@ export async function ticketReview( req, res, next ) {
           }
         }
       }
-
+      logger.info( { record } );
       // Insert appropriate mappingInfo blocks
       if ( revisionMapping ) {
         // If reviewer and checked
@@ -1422,7 +1438,7 @@ export async function ticketReview( req, res, next ) {
     let checkreview = getConfig.footfallDirectoryConfigs.revision.filter( ( data ) => data.actionType === 'reviewer' && data.isChecked === true );
 
 
-    if ( checkreview.length > 0 ) {
+    if ( checkreview.length > 0&&record.status!='Reviewer-Closed' ) {
       let userQuery = [
         {
           $match: {
@@ -1441,6 +1457,7 @@ export async function ticketReview( req, res, next ) {
         let createdOn = dayjs().format( 'DD MMM YYYY' );
         let description = `Created on ${createdOn}`;
 
+
         let Data = {
           'title': title,
           'body': description,
@@ -1463,6 +1480,36 @@ export async function ticketReview( req, res, next ) {
     }
 
     const id = `${inputData.storeId}_${inputData.dateString}_footfall-directory-tagging`;
+    console.log( '-----', record.status );
+    if ( record.status==='Reviewer-Closed' ) {
+      console.log( '🚀 ~ ticketReview ~ id:', id );
+      let Ticket = await getOpenSearchById( openSearch.footfallDirectory, id );
+      console.log( '🚀 ~ ticketReview ~ Ticket:', Ticket.body );
+      if ( Ticket?.body?._source?.type==='store' ) {
+        let findTagging = Ticket?.body?._source?.mappingInfo.filter( ( data ) => data.type==='tagging' );
+        if ( findTagging?.length>0&&findTagging[0].createdByEmail!='' ) {
+          let userData = await findOneUser( { email: findTagging[0]?.createdByEmail } );
+          console.log( '🚀 ~ ticketReview ~ findTagging[0]?.createdByEmail:', findTagging[0]?.createdByEmail );
+          let title = `Received response for the Footfall ticket raised.`;
+          let createdOn = dayjs( Ticket?.body?._source?.dateString ).format( 'DD MMM YYYY' );
+          let description = `Raised on ${createdOn}`;
+
+          let Data = {
+            'title': title,
+            'body': description,
+            'type': 'closed',
+            'date': Ticket?.body?._source?.dateString,
+            'storeId': Ticket?.body?._source?.storeId,
+            'clientId': Ticket?.body?._source?.clientId,
+            'ticketId': Ticket?.body?._source?.ticketId,
+          };
+          if ( userData && userData.fcmToken ) {
+            const fcmToken = userData.fcmToken;
+            await sendPushNotification( title, description, fcmToken, Data );
+          }
+        }
+      }
+    }
     const insertResult = await updateOpenSearchData( openSearch.footfallDirectory, id, { doc: record } );
 
     if ( insertResult && insertResult.statusCode === 201 || insertResult.statusCode === 200 ) {
@@ -1552,7 +1599,7 @@ export async function ticketReview( req, res, next ) {
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { error: err, funtion: 'ticketreview' } );
-    return res.sendError( err, 500 );
+    return res.sendError( error, 500 );
   }
 }
 
@@ -1834,6 +1881,11 @@ export async function ticketApprove( req, res, next ) {
       query: {
         bool: {
           must: [
+            {
+              term: {
+                'type.keyword': 'store',
+              },
+            },
             {
               term: {
                 'storeId.keyword': inputData.storeId,
@@ -2136,6 +2188,37 @@ export async function ticketApprove( req, res, next ) {
     }
 
     const id = `${inputData.storeId}_${inputData.dateString}_footfall-directory-tagging`;
+    console.log( '🚀 ~ ticketReview ~ id:', id );
+    console.log( '🚀 ~ ticketReview ~ id:', id );
+    console.log( '🚀 ~ ticketReview ~ id:', id );
+    if ( record.status==='Approver-Closed' ) {
+      let Ticket = await getOpenSearchById( openSearch.footfallDirectory, id );
+      console.log( '🚀 ~ ticketApprove ~ Ticket:', Ticket?.body );
+      if ( Ticket?.body?._source?.type==='store' ) {
+        let findTagging = Ticket?.body?._source?.mappingInfo.filter( ( data ) => data.type==='tagging' );
+        console.log( '🚀 ~ ticketApprove ~ findTagging[0].createdByEmail:', findTagging[0].createdByEmail );
+        if ( findTagging?.length>0&&findTagging[0].createdByEmail!='' ) {
+          let userData = await findOneUser( { email: findTagging[0]?.createdByEmail } );
+          let title = `Received response for the Footfall ticket raised.`;
+          let createdOn = dayjs( Ticket?.body?._source?.dateString ).format( 'DD MMM YYYY' );
+          let description = `Raised on ${createdOn}`;
+
+          let Data = {
+            'title': title,
+            'body': description,
+            'type': 'closed',
+            'date': Ticket?.body?._source?.dateString,
+            'storeId': Ticket?.body?._source?.storeId,
+            'clientId': Ticket?.body?._source?.clientId,
+            'ticketId': Ticket?.body?._source?.ticketId,
+          };
+          if ( userData && userData.fcmToken ) {
+            const fcmToken = userData.fcmToken;
+            await sendPushNotification( title, description, fcmToken, Data );
+          }
+        }
+      }
+    }
     const insertResult = await updateOpenSearchData( openSearch.footfallDirectory, id, { doc: record } );