feat: use member id for caching specific calls (#3690)

Author: ulemons

backend/src/api/member/memberMerge.ts

@@ -1,5 +1,7 @@
 import { CommonMemberService } from '@crowd/common_services'
-import { MemberQueryCache, optionsQx } from '@crowd/data-access-layer'
+import { optionsQx } from '@crowd/data-access-layer'
+
+import MemberService from '@/services/memberService'
 
 import Permissions from '../../security/permissions'
 import track from '../../segment/track'
@@ -8,14 +10,14 @@ import PermissionChecker from '../../services/user/permissionChecker'
 export default async (req, res) => {
   new PermissionChecker(req).validateHas(Permissions.values.memberEdit)
 
-  const memberService = new CommonMemberService(optionsQx(req), req.temporal, req.log)
+  const commonMemberService = new CommonMemberService(optionsQx(req), req.temporal, req.log)
+  const memberService = new MemberService(req)
 
-  const payload = await memberService.merge(req.params.memberId, req.body.memberToMerge, req)
+  const payload = await commonMemberService.merge(req.params.memberId, req.body.memberToMerge, req)
 
   // Invalidate member query cache after merge
   try {
-    const cache = new MemberQueryCache(req.redis)
-    await cache.invalidateAll()
+    await memberService.invalidateMemberQueryCache([req.params.memberId, req.body.memberToMerge])
     req.log.debug('Invalidated member query cache after merge')
   } catch (error) {
     // Don't fail the merge if cache invalidation fails

backend/src/services/memberService.ts

@@ -10,6 +10,7 @@ import { CommonMemberService, getGithubInstallationToken } from '@crowd/common_s
 import { findMemberAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
 import {
   MemberField,
+  MemberQueryCache,
   addMemberRole,
   fetchManyMemberOrgsWithOrgData,
   fetchMemberBotSuggestionsBySegment,
@@ -67,18 +68,6 @@ import SettingsService from './settingsService'
 export default class MemberService extends LoggerBase {
   options: IServiceOptions
 
-  private async invalidateMemberQueryCache(): Promise<void> {
-    this.log.info('Member cache invalidation is temporary disabled')
-    // try {
-    //   const cache = new MemberQueryCache(this.options.redis)
-    //   await cache.invalidateAll()
-    //   this.log.debug('Invalidated member query cache')
-    // } catch (error) {
-    //   // Don't fail the operation if cache invalidation fails
-    //   this.log.warn('Failed to invalidate member query cache', { error })
-    // }
-  }
-
   constructor(options: IServiceOptions) {
     super(options.log)
     this.options = options
@@ -758,7 +747,7 @@ export default class MemberService extends LoggerBase {
           await SequelizeRepository.commitTransaction(tx)
 
           // Invalidate member query cache after unmerge
-          await this.invalidateMemberQueryCache()
+          await this.invalidateMemberQueryCache([memberId, secondaryMember.id])
 
           return { member, secondaryMember }
         }),
@@ -1269,7 +1258,7 @@ export default class MemberService extends LoggerBase {
       await SequelizeRepository.commitTransaction(transaction)
 
       // Invalidate member query cache after update
-      await this.invalidateMemberQueryCache()
+      await this.invalidateMemberQueryCache([id])
 
       const commonMemberService = new CommonMemberService(
         optionsQx(this.options),
@@ -1324,7 +1313,7 @@ export default class MemberService extends LoggerBase {
       await SequelizeRepository.commitTransaction(transaction)
 
       // Invalidate member query cache after bulk delete
-      await this.invalidateMemberQueryCache()
+      await this.invalidateMemberQueryCache(ids)
     } catch (error) {
       await SequelizeRepository.rollbackTransaction(transaction)
       throw error
@@ -1473,4 +1462,25 @@ export default class MemberService extends LoggerBase {
     const qx = SequelizeRepository.getQueryExecutor(this.options)
     return fetchMemberBotSuggestionsBySegment(qx, segmentId, args.limit ?? 10, args.offset ?? 0)
   }
+
+  async invalidateMemberQueryCache(memberIds?: string[]): Promise<void> {
+    try {
+      const cache = new MemberQueryCache(this.options.redis)
+
+      if (memberIds && memberIds.length > 0) {
+        // Invalidate specific member cache entries
+        for (const memberId of memberIds) {
+          await cache.invalidateByPattern(`members_advanced:${memberId}:*`)
+        }
+        this.log.debug(`Invalidated member query cache for ${memberIds.length} specific members`)
+      } else {
+        // Invalidate all cache entries
+        await cache.invalidateAll()
+        this.log.debug('Invalidated all member query cache')
+      }
+    } catch (error) {
+      // Don't fail the operation if cache invalidation fails
+      this.log.warn('Failed to invalidate member query cache', { error })
+    }
+  }
 }

services/libs/data-access-layer/src/members/queryCache.ts

@@ -51,7 +51,14 @@ export class MemberQueryCache {
     )
 
     const hash = createHash('md5').update(JSON.stringify(cleanParams)).digest('hex')
-    return `members_advanced_${hash}`
+
+    const filterId = (params.filter?.id as Record<string, unknown>)?.eq
+
+    if (filterId && typeof filterId === 'string') {
+      return `members_advanced:${filterId}:${hash}`
+    }
+
+    return `members_advanced:${hash}`
   }
 
   async get(cacheKey: string): Promise<PageData<IDbMemberData> | null> {
@@ -97,4 +104,15 @@ export class MemberQueryCache {
       log.warn('Error invalidating member query cache', { error })
     }
   }
+
+  async invalidateByPattern(pattern: string): Promise<void> {
+    try {
+      const keysDeleted = await this.cache.deleteByKeyPattern(pattern)
+      log.info(
+        `Invalidated member query cache by pattern: ${keysDeleted} entries deleted for pattern ${pattern}`,
+      )
+    } catch (error) {
+      log.warn('Error invalidating member query cache by pattern', { error, pattern })
+    }
+  }
 }