Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions backend/src/database/repositories/memberRepository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,11 @@ class MemberRepository {
include: Record<string, boolean> = {},
) {
let memberResponse = null
memberResponse = await queryMembersAdvanced(optionsQx(options), options.redis, {

const qx = optionsQx(options)
const bgQx = optionsQx({ ...options, transaction: null })

memberResponse = await queryMembersAdvanced(qx, bgQx, options.redis, {
filter: { id: { eq: id } },
limit: 1,
offset: 0,
Expand All @@ -1211,7 +1215,7 @@ class MemberRepository {
if (memberResponse.count === 0) {
// try it again without segment information (no aggregates)
// for members without activities
memberResponse = await queryMembersAdvanced(optionsQx(options), options.redis, {
memberResponse = await queryMembersAdvanced(qx, bgQx, options.redis, {
filter: { id: { eq: id } },
limit: 1,
offset: 0,
Expand Down
10 changes: 8 additions & 2 deletions backend/src/services/memberService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1353,7 +1353,10 @@ export default class MemberService extends LoggerBase {
}

async findAllAutocomplete(data) {
return queryMembersAdvanced(optionsQx(this.options), this.options.redis, {
const qx = optionsQx(this.options)
const bgQx = optionsQx({ ...this.options, transaction: null })

return queryMembersAdvanced(qx, bgQx, this.options.redis, {
filter: data.filter,
offset: data.offset,
orderBy: data.orderBy,
Expand Down Expand Up @@ -1398,7 +1401,10 @@ export default class MemberService extends LoggerBase {
throw new Error400(this.options.language, 'member.segmentsRequired')
}

return queryMembersAdvanced(optionsQx(this.options), this.options.redis, {
const qx = optionsQx(this.options)
const bgQx = optionsQx({ ...this.options, transaction: null })

return queryMembersAdvanced(qx, bgQx, this.options.redis, {
...data,
segmentId,
attributesSettings: memberAttributeSettings,
Expand Down
5 changes: 3 additions & 2 deletions services/libs/data-access-layer/src/members/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ const QUERY_FILTER_COLUMN_MAP: Map<string, { name: string; queryable?: boolean }

export async function queryMembersAdvanced(
qx: QueryExecutor,
bgQx: QueryExecutor,
redis: RedisClient,
{
filter = {},
Expand Down Expand Up @@ -186,7 +187,7 @@ export async function queryMembersAdvanced(
const cachedCount = countOnly ? await cache.getCount(cacheKey) : null

if (cachedResult) {
refreshCacheInBackground(qx, redis, cacheKey, {
refreshCacheInBackground(bgQx, redis, cacheKey, {
filter,
search,
limit,
Expand All @@ -204,7 +205,7 @@ export async function queryMembersAdvanced(
}

if (countOnly && cachedCount !== null) {
refreshCountCacheInBackground(qx, redis, cacheKey, {
refreshCountCacheInBackground(bgQx, redis, cacheKey, {
filter,
search,
segmentId,
Expand Down
Loading