Skip to content

Commit 3e2cb2f

Browse files
committed
fix: memberToMerge and memberToMergeRaw fall out of sync (CM-1339)
Signed-off-by: Joana Maia <jmaia@contractor.linuxfoundation.org>
1 parent 7a486b3 commit 3e2cb2f

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

  • services/libs/data-access-layer/src

services/libs/data-access-layer/src/member_merge/index.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,17 @@ export async function removeMemberToMerge(
1616
toMergeId,
1717
},
1818
)
19+
await qx.result(
20+
`
21+
DELETE FROM "memberToMergeRaw"
22+
WHERE "memberId" = $(memberId)
23+
AND "toMergeId" = $(toMergeId)
24+
`,
25+
{
26+
memberId,
27+
toMergeId,
28+
},
29+
)
1930
}
2031

2132
export async function addMemberNoMerge(

services/libs/data-access-layer/src/old/apps/members_enrichment_worker/index.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,12 @@ export async function findExistingMember(
353353
export async function addMemberToMerge(tx: DbTransaction, memberId: string, toMergeId: string) {
354354
await tx.query(
355355
`INSERT INTO "memberToMerge" ("memberId", "toMergeId", similarity)
356-
VALUES ($1, $2, $3);"`,
356+
VALUES ($1, $2, $3) ON CONFLICT DO NOTHING`,
357+
[memberId, toMergeId, 0.9],
358+
)
359+
await tx.query(
360+
`INSERT INTO "memberToMergeRaw" ("memberId", "toMergeId", similarity)
361+
VALUES ($1, $2, $3) ON CONFLICT DO NOTHING`,
357362
[memberId, toMergeId, 0.9],
358363
)
359364
}

0 commit comments

Comments
 (0)