fix: cache regression

Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>

Author: ulemons

backend/src/database/repositories/memberRepository.ts

@@ -50,7 +50,7 @@ import {
   includeMemberToSegments,
 } from '@crowd/data-access-layer/src/members/segments'
 import { IDbMemberData } from '@crowd/data-access-layer/src/members/types'
-import { optionsQx } from '@crowd/data-access-layer/src/queryExecutor'
+import { optionsBgQx, optionsQx } from '@crowd/data-access-layer/src/queryExecutor'
 import {
   fetchManySegments,
   getSegmentMergeSuggestionCounts,
@@ -1259,7 +1259,7 @@ class MemberRepository {
     let memberResponse = null
 
     const qx = optionsQx(options)
-    const bgQx = optionsQx({ ...options, transaction: null })
+    const bgQx = optionsBgQx(options)
 
     memberResponse = await queryMembersAdvanced(qx, bgQx, options.redis, {
       filter: { id: { eq: id } },

backend/src/services/memberService.ts

@@ -21,7 +21,7 @@ import {
   insertMemberSegmentAggregates,
   queryMembersAdvanced,
 } from '@crowd/data-access-layer/src/members'
-import { QueryExecutor, optionsQx } from '@crowd/data-access-layer/src/queryExecutor'
+import { QueryExecutor, optionsBgQx, optionsQx } from '@crowd/data-access-layer/src/queryExecutor'
 import {
   decrementMemberMergeSuggestionCounts,
   fetchManySegments,
@@ -944,7 +944,7 @@ export default class MemberService extends LoggerBase {
 
   async findAllAutocomplete(data) {
     const qx = optionsQx(this.options)
-    const bgQx = optionsQx({ ...this.options, transaction: null })
+    const bgQx = optionsBgQx(this.options)
 
     return queryMembersAdvanced(qx, bgQx, this.options.redis, {
       filter: data.filter,
@@ -970,7 +970,7 @@ export default class MemberService extends LoggerBase {
     }
 
     const qx = optionsQx(this.options)
-    const bgQx = optionsQx({ ...this.options, transaction: null })
+    const bgQx = optionsBgQx(this.options)
 
     return queryMembersAdvanced(qx, bgQx, this.options.redis, {
       ...data,

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

@@ -195,8 +195,11 @@ export async function queryMembersAdvanced(
   // Initialize cache
   const cache = new MemberQueryCache(redis)
 
-  // Build cache key — countOnly is excluded so count and full-result caches share the same key.
-  // Normalize empty search to null so "" and null produce the same key (buildSearchCTE treats them identically).
+  // Normalize search once: trim whitespace, lowercase (buildSearchCTE lowercases anyway),
+  // convert empty string to null so "" and null hash identically.
+  const normalizedSearch = search?.trim().toLowerCase() || null
+
+  // Full result key — includes pagination and projection so page 1 and page 2 are separate entries.
   const cacheKey = cache.buildCacheKey({
     fields,
     filter,
@@ -205,18 +208,26 @@ export async function queryMembersAdvanced(
     limit,
     offset,
     orderBy,
-    search: search?.trim() || null,
+    search: normalizedSearch,
+    segmentId,
+  })
+
+  // Count key — excludes pagination/projection and include flags since the count query
+  // only depends on filter, search, and segmentId (buildCountQuery hardcodes includeMemberOrgs=false).
+  const countCacheKey = cache.buildCountCacheKey({
+    filter,
+    search: normalizedSearch,
     segmentId,
   })
 
   // Try to get from cache first
   const cachedResult = countOnly ? null : await cache.get(cacheKey)
-  const cachedCount = countOnly ? await cache.getCount(cacheKey) : null
+  const cachedCount = countOnly ? await cache.getCount(countCacheKey) : null
 
   if (cachedResult) {
     refreshCacheInBackground(bgQx, redis, cacheKey, {
       filter,
-      search,
+      search: normalizedSearch,
       limit,
       offset,
       orderBy,
@@ -233,16 +244,16 @@ export async function queryMembersAdvanced(
   }
 
   if (countOnly && cachedCount !== null) {
-    refreshCountCacheInBackground(bgQx, redis, cacheKey, {
+    refreshCountCacheInBackground(bgQx, redis, countCacheKey, {
       filter,
-      search,
+      search: normalizedSearch,
       segmentId,
       include,
       includeAllAttributes,
       attributeSettings,
     })
 
-    log.debug(`Members advanced count query cache hit: ${cacheKey}`)
+    log.debug(`Members advanced count query cache hit: ${countCacheKey}`)
     return {
       rows: [],
       count: cachedCount,
@@ -253,7 +264,7 @@ export async function queryMembersAdvanced(
 
   return await executeQuery(qx, redis, cacheKey, {
     filter,
-    search,
+    search: normalizedSearch,
     limit,
     offset,
     orderBy,
@@ -299,6 +310,11 @@ export async function executeQuery(
   }: IQueryMembersAdvancedParams,
 ): Promise<PageData<IDbMemberData>> {
   const cache = new MemberQueryCache(redis)
+  const countCacheKey = cache.buildCountCacheKey({
+    filter,
+    search: search ?? null,
+    segmentId,
+  })
   const withAggregates = !!segmentId
   const searchConfig = buildSearchCTE(search)
 
@@ -352,8 +368,7 @@ export async function executeQuery(
     const result = await qx.selectOne(countQuery, params)
     const count = parseInt(result.count, 10)
 
-    // Cache the count
-    await cache.setCount(cacheKey, count, 21600) // 6 hours TTL
+    await cache.setCount(countCacheKey, count, 21600)
 
     return {
       rows: [],
@@ -540,8 +555,8 @@ export async function executeQuery(
   const result = { rows, count, limit, offset }
 
   await Promise.all([
-    cache.set(cacheKey, result, 21600), // 6 hours TTL
-    cache.setCount(cacheKey, count, 21600), // also warm count cache so countOnly=true hits next time
+    cache.set(cacheKey, result, 21600),
+    cache.setCount(countCacheKey, count, 21600),
   ])
 
   return result

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

@@ -30,8 +30,8 @@ export class MemberQueryCache {
     filter?: Record<string, unknown>
     include?: IncludeOptions
     includeAllAttributes?: boolean
-    limit: number
-    offset: number
+    limit?: number
+    offset?: number
     orderBy?: string
     search?: string
     segmentId?: string
@@ -61,6 +61,18 @@ export class MemberQueryCache {
     return `members_advanced:${hash}`
   }
 
+  buildCountCacheKey(params: {
+    filter?: Record<string, unknown>
+    search?: string
+    segmentId?: string
+  }): string {
+    return this.buildCacheKey({
+      filter: params.filter,
+      search: params.search,
+      segmentId: params.segmentId,
+    })
+  }
+
   async get(cacheKey: string): Promise<PageData<IDbMemberData> | null> {
     try {
       const cachedResult = await this.cache.get(cacheKey)

services/libs/data-access-layer/src/queryExecutor.ts

@@ -20,10 +20,16 @@ export function formatQuery(query: string, params?: object): string {
 }
 
 export class SequelizeQueryExecutor implements QueryExecutor {
-  constructor(private readonly sequelize: Sequelize) {}
+  constructor(
+    private readonly sequelize: Sequelize,
+    private readonly noTransaction = false,
+  ) {}
 
   protected prepareOptions(options: any): any {
-    return options
+    // When noTransaction=true, explicitly opt out of any CLS or implicit
+    // transaction binding — used for background/fire-and-forget work that
+    // must not inherit a parent request's transaction.
+    return this.noTransaction ? { ...options, transaction: null } : options
   }
 
   select(query: string, params?: object): Promise<any> {
@@ -166,3 +172,12 @@ export function optionsQx(options: any): QueryExecutor {
 
   return new SequelizeQueryExecutor(seq)
 }
+
+/**
+ * Creates a QueryExecutor for fire-and-forget background work.
+ * Always runs outside any transaction — safe to use after the caller's
+ * request transaction has been committed.
+ */
+export function optionsBgQx(options: any): QueryExecutor {
+  return new SequelizeQueryExecutor(options.database.sequelize, true)
+}