Skip to content

Pagination and total_count improvements in organization merge suggestions #1701

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

Merged
merged 2 commits into from
Oct 17, 2023
Merged

Pagination and total_count improvements in organization merge suggestions #1701

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0eb3fc6
pagination and total_count fixes using segments
epipav Oct 16, 2023
f4cee83
Merge branch 'main' into bugfix/org-merge-suggestions-with-segments
epipav Oct 16, 2023
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
56 changes: 38 additions & 18 deletions backend/src/database/repositories/organizationRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1518,29 +1518,49 @@ class OrganizationRepository {
const segmentIds = SequelizeRepository.getSegmentIds(options)

const orgs = await options.database.sequelize.query(
`SELECT
"organizationsToMerge".id,
"organizationsToMerge"."toMergeId",
"organizationsToMerge"."total_count",
"organizationsToMerge"."similarity"
FROM
(
SELECT DISTINCT ON (Greatest(Hashtext(Concat(org.id, otm."toMergeId")), Hashtext(Concat(otm."toMergeId", org.id))))
org.id,
otm."toMergeId",
org."createdAt",
COUNT(*) OVER() AS total_count,
`WITH
cte AS (
SELECT
Greatest(Hashtext(Concat(org.id, otm."toMergeId")), Hashtext(Concat(otm."toMergeId", org.id))) as hash,
org.id,
otm."toMergeId",
org."createdAt",
otm."similarity"
FROM organizations org
INNER JOIN "organizationToMerge" otm ON org.id = otm."organizationId"
JOIN "organizationToMerge" otm ON org.id = otm."organizationId"
JOIN "organizationSegments" os ON os."organizationId" = org.id
JOIN "organizationSegments" to_merge_segments on to_merge_segments."organizationId" = otm."toMergeId"
WHERE org."tenantId" = :tenantId
AND os."segmentId" IN (:segmentIds)
ORDER BY Greatest(Hashtext(Concat(org.id, otm."toMergeId")), Hashtext(Concat(otm."toMergeId", org.id))), org.id
) AS "organizationsToMerge"
ORDER BY
"organizationsToMerge"."similarity" DESC, "organizationsToMerge".id
LIMIT :limit OFFSET :offset
AND to_merge_segments."segmentId" IN (:segmentIds)
),

count_cte AS (
SELECT COUNT(DISTINCT hash) AS total_count
FROM cte
),

final_select AS (
SELECT DISTINCT ON (hash)
id,
"toMergeId",
"createdAt",
"similarity"
FROM cte
ORDER BY hash, id
)

SELECT
"organizationsToMerge".id,
"organizationsToMerge"."toMergeId",
count_cte."total_count",
"organizationsToMerge"."similarity"
FROM
final_select AS "organizationsToMerge",
count_cte
ORDER BY
"organizationsToMerge"."similarity" DESC, "organizationsToMerge".id
LIMIT :limit OFFSET :offset
`,
{
replacements: {
Expand Down