Skip to content

fix: organization query (CM-1129) #4052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ulemons wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −1
Draft

fix: organization query (CM-1129) #4052

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 31 additions & 1 deletion backend/src/database/repositories/organizationRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1296,6 +1296,25 @@ class OrganizationRepository {
return { lfxMembershipFilter, updatedfilter }
}

private static handleSearchFilter(filter: any): {
searchTerm: string | null
updatedFilter: any
} {
if (!filter || typeof filter !== 'object') {
return { searchTerm: null, updatedFilter: filter }
}

const updatedFilter = { ...filter }
let searchTerm: string | null = null

if (typeof updatedFilter.search === 'string' && updatedFilter.search.trim()) {
searchTerm = updatedFilter.search.trim()
}
delete updatedFilter.search

return { searchTerm, updatedFilter }
}

static async findAndCountAll(
{
countOnly = false,
Expand Down Expand Up @@ -1428,6 +1447,10 @@ class OrganizationRepository {

const withAggregates = include.aggregates

const { searchTerm, updatedFilter: filterWithoutSearch } =
OrganizationRepository.handleSearchFilter(filter)
filter = filterWithoutSearch

const { lfxMembershipFilter, updatedfilter } =
OrganizationRepository.handleLfxMembershipFilter(filter)
filter = updatedfilter // updated filter without lfxMembershipFilter
Expand Down Expand Up @@ -1458,13 +1481,19 @@ class OrganizationRepository {
segmentId = segment.id
}

const params = {
const params: Record<string, any> = {
limit,
offset,
segmentId,
tenantId: options.currentTenant.id,
}

let searchWhereClause = ''
if (searchTerm) {
params.searchTerm = `%${searchTerm}%`
searchWhereClause = `AND o."displayName" ILIKE $(searchTerm)`
}

const filterString = RawQueryParser.parseFilters(
filter,
OrganizationRepository.QUERY_FILTER_COLUMN_MAP,
Expand Down Expand Up @@ -1498,6 +1527,7 @@ class OrganizationRepository {
WHERE 1=1
AND o."tenantId" = $(tenantId)
${lfxMembershipFilterWhereClause}
${searchWhereClause}
AND (${filterString})
`
const countQuery = createQuery('COUNT(*)')
Expand Down
Loading