tango-app-api-infra 3.9.5-vms.62 → 3.9.5-vms.64

package/package.json

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

package/src/validations/footfallDirectory.validation.js

@@ -564,11 +564,13 @@ export async function ticketCreation( req, res, next ) {
           $match: {
             clientId: getstoreName.clientId,
             role: 'admin',
+            isActive: true,
           },
         },
       ];
 
       const finduserList = await aggregateUser( userQuery );
+      console.log( '🚀 ~ ticketCreation ~ finduserList:', finduserList.length );
 
       const createdOn = dayjs().format( 'DD MMM YYYY' );
       const title = `${getstoreName?.storeName} Have raised a ticket for a Footfall Mismatch`;
@@ -594,10 +596,12 @@ export async function ticketCreation( req, res, next ) {
                     m.name === 'reviewer' && ( m.isAdd === true || m.isEdit === true ),
               ),
             );
+            console.log( '🚀 ~ ticketCreation ~ ticketsFeature:', ticketsFeature );
 
             if ( !ticketsFeature ) return;
 
             const notifyUser = await getAssinedStore( userData, req.body.storeId );
+            console.log( '🚀 ~ ticketCreation ~ notifyUser:', notifyUser );
             if ( !notifyUser || !userData?.fcmToken ) return;
 
             await sendPushNotification( title, description, userData.fcmToken, Data );
@@ -1260,11 +1264,12 @@ export async function ticketReview( req, res, next ) {
           $match: {
             clientId: getstoreName.clientId,
             role: 'admin',
+            isActive: true,
           },
         },
       ];
       let finduserList = await aggregateUser( userQuery );
-      console.log( '🚀 ~ ticketReview ~ finduserList:', finduserList );
+      console.log( '🚀 ~ ticketReview ~ finduserList:', finduserList.length );
 
       // return;
       for ( let userData of finduserList ) {
@@ -1759,6 +1764,7 @@ export async function ticketApprove( req, res, next ) {
           $match: {
             clientId: getstoreName.clientId,
             role: 'admin',
+            isActive: true,
           },
         },
       ];
@@ -1808,71 +1814,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 ) );
-            }
-          }
-        }
-      }
+  const addClusterStores = ( clusters ) => {
+    if ( !clusters?.length ) return;
+    for ( const cluster of clusters ) {
+      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 ) );
-          }
-        }
-      }
-    }
-    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 );
 }
+