tango-app-api-infra 3.9.5-vms.61 → 3.9.5-vms.63

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -6,9 +6,9 @@ import { findOneRevopDownload, upsertRevopDownload } from '../services/revopDown
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc.js';
 import timezone from 'dayjs/plugin/timezone.js';
-import { findUser } from '../services/user.service.js';
 import { findOneClient } from '../services/client.service.js';
-
+import { findUser, findOneUser } from '../services/user.service.js';
+import { sendPushNotification } from 'tango-app-api-middleware';
 dayjs.extend( utc );
 dayjs.extend( timezone );
 
@@ -157,6 +157,7 @@ export async function tangoReviewTicket( req, res ) {
     };
     let findTicket = await getOpenSearchData( openSearch.footfallDirectory, findQuery );
     let Ticket = findTicket.body?.hits?.hits;
+    console.log( '🚀 ~ tangoReviewTicket ~ Ticket:', Ticket );
     if ( Ticket.length === 0 ) {
       return res.sendError( 'Ticket not found', 400 );
     }
@@ -391,6 +392,28 @@ export async function tangoReviewTicket( req, res ) {
       );
     }
 
+    if ( Ticket[0]?._source?.type==='store' ) {
+      let userData = await findOneUser( { email: Ticket[0]?._source?.createdByEmail } );
+      let title = `Received response for the Footfall ticket raised.`;
+      let createdOn = dayjs( Ticket[0]?._source?.dateString ).format( 'DD MMM YYYY' );
+      let description = `Raised on ${createdOn}`;
+      console.log( '🚀 ~ ticketCreation ~ userData.role:', userData.email );
+      let Data = {
+        'title': title,
+        'body': description,
+        'type': 'closed',
+        'date': Ticket[0]?._source?.dateString,
+        'storeId': Ticket[0]?._source?.storeId,
+        'clientId': Ticket[0]?._source?.clientId,
+        'ticketId': Ticket[0]?._source?.ticketId,
+      };
+      if ( userData && userData.fcmToken ) {
+        const fcmToken = userData.fcmToken;
+        await sendPushNotification( title, description, fcmToken, Data );
+      }
+    }
+    // return;
+
     let id = `${inputData.storeId}_${inputData.dateString}_footfall-directory-tagging`;
     if ( inputData.ticketType === 'internal' ) {
       id = `${inputData.storeId}_${inputData.dateString}_internal_footfall-directory-tagging`;
@@ -883,14 +906,14 @@ export async function ticketList( req, res ) {
     };
 
     if ( inputData.sortBy ) {
-      let sortOrder = inputData.sortOrder === 1? 'asc': 'desc';
+      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;
+      let sortField = inputData.sortBy == 'footfall' ? 'footfallCount' : inputData.sortBy == 'issueDate' ? 'dateString' : inputData.sortBy;
       if ( stringKeywordFields.includes( sortField ) ) {
         sortField = `${sortField}.keyword`;
       }
@@ -930,7 +953,7 @@ export async function ticketList( req, res ) {
       searchQuery.query.bool.must.push( {
         term: {
           'mappingInfo.type': ticketsFeature ? 'review' : ticketsApproveFeature ?
-            'approve' :'tagging',
+            'approve' : 'tagging',
         },
       },
       {
@@ -944,14 +967,14 @@ export async function ticketList( req, res ) {
       searchQuery.query.bool.must.push( {
         term: {
           'mappingInfo.type': inputData?.permissionType == 'review' ? 'review' :
-        'approve',
+            'approve',
         },
       } );
     }
 
     if ( inputData.searchValue && inputData.searchValue !== '' ) {
-      searchQuery.query.bool['should'] =[];
-      searchQuery.query.bool.should=[
+      searchQuery.query.bool['should'] = [];
+      searchQuery.query.bool.should = [
 
         {
           'wildcard': {
@@ -1034,7 +1057,7 @@ export async function ticketList( req, res ) {
         }
       }
     } else {
-      if ( inputData?.permissionType ==='approve' ) {
+      if ( inputData?.permissionType === 'approve' ) {
         for ( let item of ticketListData ) {
           temp.push( {
 
@@ -1058,7 +1081,7 @@ export async function ticketList( req, res ) {
 
           } );
         }
-      } else if ( inputData?.permissionType ==='review' ) {
+      } else if ( inputData?.permissionType === 'review' ) {
         for ( let item of ticketListData ) {
           temp.push( {
 
@@ -2365,7 +2388,7 @@ export async function openTicketList( req, res ) {
     // INSERT_YOUR_CODE
     // Add sorting by revicedPerc descending (highest revised accuracy first)
     openSearchQuery.sort = [
-      { 'revicedPerc.keyword': { order: inputData?.sortOrder === 1? 'asc':'desc' } },
+      { 'revicedPerc.keyword': { order: inputData?.sortOrder === 1 ? 'asc' : 'desc' } },
     ];
 
 
@@ -2587,7 +2610,7 @@ export async function updateTempStatus( req, res ) {
       );
 
 
-      const taggedImages = getSearchResp?.body?.hits?.hits?.length > 0? getSearchResp?.body?.hits?.hits : [];
+      const taggedImages = getSearchResp?.body?.hits?.hits?.length > 0 ? getSearchResp?.body?.hits?.hits : [];
       const logs = {
         type: inputData.type,
         storeId: taggedImages?.[0]?._source?.storeId,

package/src/validations/footfallDirectory.validation.js

@@ -549,11 +549,17 @@ export async function ticketCreation( req, res, next ) {
       }
     }
 
-    let checkreview = getConfig.footfallDirectoryConfigs.revision.filter( ( data ) => data.actionType === 'reviewer' && data.isChecked === true );
-    let checkapprove = getConfig.footfallDirectoryConfigs.revision.filter( ( data ) => data.actionType === 'approver' && data.isChecked === true );
+    const revision = getConfig.footfallDirectoryConfigs?.revision ?? [];
 
-    if ( checkreview.length > 0 || checkapprove.length > 0 ) {
-      let userQuery = [
+    const hasReviewer = revision.some(
+        ( data ) => data.actionType === 'reviewer' && data.isChecked === true,
+    );
+    const hasApprover = revision.some(
+        ( data ) => data.actionType === 'approver' && data.isChecked === true,
+    );
+
+    if ( hasReviewer || hasApprover ) {
+      const userQuery = [
         {
           $match: {
             clientId: getstoreName.clientId,
@@ -561,40 +567,49 @@ export async function ticketCreation( req, res, next ) {
           },
         },
       ];
-      let finduserList = await aggregateUser( userQuery );
 
+      const finduserList = await aggregateUser( userQuery );
 
-      for ( let userData of finduserList ) {
-        let title = `${getstoreName?.storeName} Have raised a ticket for a Footfall Mismatch`;
-        let createdOn = dayjs().format( 'DD MMM YYYY' );
-        let description = `Created on ${createdOn}`;
-        let Data = {
-          'title': title,
-          'body': description,
-          'type': 'create',
-          'date': record.dateString,
-          'storeId': record.storeId,
-          'clientId': record.clientId,
-          'ticketId': record.ticketId,
-        };
+      const createdOn = dayjs().format( 'DD MMM YYYY' );
+      const title = `${getstoreName?.storeName} Have raised a ticket for a Footfall Mismatch`;
+      const description = `Created on ${createdOn}`;
 
-        const ticketsFeature = userData?.rolespermission?.some( ( f ) => f.featureName === 'FootfallDirectory' && ( f.modules.find( ( m ) => m.name == 'reviewer' && ( m.isAdd == true || m.isEdit == true ) ) ) );
+      const Data = {
+        title,
+        body: description,
+        type: 'create',
+        date: record.dateString,
+        storeId: record.storeId,
+        clientId: record.clientId,
+        ticketId: record.ticketId,
+      };
 
-        if ( ticketsFeature ) {
-          let notifyuser = await getAssinedStore( userData, req.body.storeId );
-          if ( userData && userData.fcmToken && notifyuser ) {
-            const fcmToken = userData.fcmToken;
-            await sendPushNotification( title, description, fcmToken, Data );
-          }
-        }
-      }
+      await Promise.all(
+          ( finduserList || [] ).map( async ( userData ) => {
+            const ticketsFeature = userData?.rolespermission?.some(
+                ( f ) =>
+                  f.featureName === 'FootfallDirectory' &&
+              f.modules?.some(
+                  ( m ) =>
+                    m.name === 'reviewer' && ( m.isAdd === true || m.isEdit === true ),
+              ),
+            );
+
+            if ( !ticketsFeature ) return;
+
+            const notifyUser = await getAssinedStore( userData, req.body.storeId );
+            if ( !notifyUser || !userData?.fcmToken ) return;
+
+            await sendPushNotification( title, description, userData.fcmToken, Data );
+          } ),
+      );
     }
 
 
     const id = `${inputData.storeId}_${inputData.dateString}_footfall-directory-tagging`;
     const insertResult = await insertWithId( openSearch.footfallDirectory, id, record );
     if ( insertResult && insertResult.statusCode === 201 ) {
-    // After successful ticket creation, update status to "submitted" in revop index for the relevant records
+      // After successful ticket creation, update status to "submitted" in revop index for the relevant records
 
 
       const bulkUpdateBody = taggingImages.map( ( img ) => [
@@ -718,14 +733,14 @@ export async function ticketCreation( req, res, next ) {
         const startDateObj = new Date( currentDateObj );
 
         if ( breachDays === 30 ) {
-        // Consider within this month
+          // Consider within this month
           startDateObj.setDate( 1 ); // First day of current month
         } else if ( breachDays === 60 ) {
-        // Consider this month and last month
+          // Consider this month and last month
           startDateObj.setMonth( startDateObj.getMonth() - 1 );
           startDateObj.setDate( 1 ); // First day of last month
         } else {
-        // For other values, calculate months from days
+          // For other values, calculate months from days
           const breachMonths = Math.ceil( breachDays / 30 );
           startDateObj.setMonth( startDateObj.getMonth() - breachMonths + 1 );
           startDateObj.setDate( 1 );
@@ -773,21 +788,21 @@ export async function ticketCreation( req, res, next ) {
         }
 
         if ( breachTicketsCount >= breachCount ) {
-        // Calculate remaining future days in the config period
+          // Calculate remaining future days in the config period
           const futureDates = [];
 
           // Calculate end date of config period
           const configEndDateObj = new Date( currentDateObj );
           if ( breachDays === 30 ) {
-          // End of current month
+            // End of current month
             configEndDateObj.setMonth( configEndDateObj.getMonth() + 1 );
             configEndDateObj.setDate( 0 ); // Last day of current month
           } else if ( breachDays === 60 ) {
-          // End of next month
+            // End of next month
             configEndDateObj.setMonth( configEndDateObj.getMonth() + 2 );
             configEndDateObj.setDate( 0 ); // Last day of next month
           } else {
-          // For other values, add the remaining days
+            // For other values, add the remaining days
             const remainingDays = breachDays - ( Math.floor( ( currentDateObj - startDateObj ) / ( 1000 * 60 * 60 * 24 ) ) );
             configEndDateObj.setDate( configEndDateObj.getDate() + remainingDays );
           }
@@ -1793,71 +1808,85 @@ export async function ticketApprove( req, res, next ) {
   }
 }
 
-
 export async function getAssinedStore( user, storeId ) {
-  if ( user && user.userType === 'client' && user.role !== 'superadmin' ) {
-    let storeIds = new Set( user.assignedStores?.map( ( store ) => store.storeId ) );
-
-    // Fetch clusters and teams in parallel
-    const [ clustersList, teamsList ] = await Promise.all( [
-      findcluster( { clientId: user.clientId, Teamlead: { $elemMatch: { email: user.email } } } ),
-      findteams( { clientId: user.clientId, Teamlead: { $elemMatch: { email: user.email } } } ),
-    ] );
-
-    // Process clusters
-    if ( clustersList.length > 0 ) {
-      for ( let cluster of clustersList ) {
-        cluster.stores.forEach( ( store ) => storeIds.add( store.storeId ) );
-      }
-    }
+  if ( !user || user.userType !== 'client' || user.role === 'superadmin' ) {
+    return;
+  }
 
-    // Process teams
-    if ( teamsList.length > 0 ) {
-      for ( let team of teamsList ) {
-        for ( let user of team.users ) {
-          let findUser = await findOneUser( { _id: user.userId } );
-          if ( findUser && findUser.assignedStores?.length > 0 ) {
-            findUser.assignedStores.forEach( ( store ) => storeIds.add( store.storeId ) );
-          }
+  const clientId = user.clientId;
+  const storeIds = new Set(
+      user.assignedStores?.map( ( store ) => store.storeId ) ?? [],
+  );
 
-          // Fetch clusters for the user
-          let userClustersList = await findcluster( { clientId: user.clientId, Teamlead: { $elemMatch: { email: findUser.email } } } );
-          if ( userClustersList.length > 0 ) {
-            for ( let cluster of userClustersList ) {
-              cluster.stores.forEach( ( store ) => storeIds.add( store.storeId ) );
-            }
-          }
-        }
-      }
-    }
-    let TeamMember = await findteams( { clientId: user.clientId, users: { $elemMatch: { email: user.email } } } );
-    if ( TeamMember && TeamMember.length > 0 ) {
-      for ( let team of TeamMember ) {
-        let clusterList = await findcluster( { clientId: user.clientId, teams: { $elemMatch: { name: team.teamName } } } );
-        if ( clusterList.length > 0 ) {
-          for ( let cluster of clusterList ) {
-            cluster.stores.forEach( ( store ) => storeIds.add( store.storeId ) );
-          }
-        }
-      }
+  const addClusterStores = ( clusters ) => {
+    if ( !clusters?.length ) return;
+    for ( const cluster of clusters ) {
+      cluster.stores?.forEach( ( store ) => storeIds.add( store.storeId ) );
     }
-    let TeamLeader = await findteams( { clientId: user.clientId, Teamlead: { $elemMatch: { email: user.email } } } );
-    if ( TeamLeader && TeamLeader.length > 0 ) {
-      for ( let team of TeamLeader ) {
-        let clusterList = await findcluster( { clientId: user.clientId, teams: { $elemMatch: { name: team.teamName } } } );
-        if ( clusterList.length > 0 ) {
-          for ( let cluster of clusterList ) {
-            cluster.stores.forEach( ( store ) => storeIds.add( store.storeId ) );
-          }
-        }
-      }
+  };
+
+  // Fetch all top-level data in parallel
+  const [ clustersList, teamsList, teamMemberList ] = await Promise.all( [
+    findcluster( {
+      clientId,
+      Teamlead: { $elemMatch: { email: user.email } },
+    } ),
+    findteams( {
+      clientId,
+      Teamlead: { $elemMatch: { email: user.email } },
+    } ),
+    findteams( {
+      clientId,
+      users: { $elemMatch: { email: user.email } },
+    } ),
+  ] );
+
+  // 1) Clusters where this user is Teamlead
+  addClusterStores( clustersList );
+
+  // 2) Teams where this user is Teamlead → their users + their clusters
+  if ( teamsList?.length ) {
+    for ( const team of teamsList ) {
+      if ( !team.users?.length ) continue;
+
+      await Promise.all(
+          team.users.map( async ( teamUser ) => {
+            const foundUser = await findOneUser( { _id: teamUser.userId } );
+            if ( !foundUser ) return;
+
+            // Direct assigned stores of that user
+            if ( foundUser.assignedStores?.length ) {
+              foundUser.assignedStores.forEach( ( store ) =>
+                storeIds.add( store.storeId ),
+              );
+            }
+
+            // Clusters where this user is Teamlead
+            const userClustersList = await findcluster( {
+              clientId,
+              Teamlead: { $elemMatch: { email: foundUser.email } },
+            } );
+            addClusterStores( userClustersList );
+          } ),
+      );
     }
-    // Convert Set back to Array if needed
-    let assignedStores = Array.from( storeIds );
-    if ( assignedStores.includes( storeId ) ) {
-      return true;
-    } else {
-      return true;
+  }
+
+  // 3) Teams where this user is a member → clusters by teamName
+  if ( teamMemberList?.length ) {
+    for ( const team of teamMemberList ) {
+      const clusterList = await findcluster( {
+        clientId,
+        teams: { $elemMatch: { name: team.teamName } },
+      } );
+      addClusterStores( clusterList );
     }
   }
+
+  const assignedStores = Array.from( storeIds );
+
+  // Previously you returned `true` in both branches.
+  // Assuming you actually want to check membership:
+  return assignedStores.includes( storeId );
 }
+