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
Original file line number Diff line number Diff line change
Expand Up @@ -549,9 +549,10 @@ export function doesIncomingOrgExistInExistingOrgs(
.filter((i) => i.type === OrganizationIdentityType.PRIMARY_DOMAIN && i.verified)
.map((i) => i.value)

const existingVerifiedPrimaryDomainIdentityValues = existingOrg.identities
.filter((i) => i.type === OrganizationIdentityType.PRIMARY_DOMAIN && i.verified)
.map((i) => i.value)
// existingOrg.identities is already filtered to primary-domain + verified at the query level
const existingVerifiedPrimaryDomainIdentityValues = (existingOrg.identities || []).map(
(i) => i.value,
)

const incomingOrgStartDate = incomingOrg.startDate ? new Date(incomingOrg.startDate) : null
const incomingOrgEndDate = incomingOrg.endDate ? new Date(incomingOrg.endDate) : null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ export async function fetchMemberDataForLLMSquashing(
mo."dateStart",
mo."dateEnd",
mo.source,
jsonb_agg(oi) as identities
jsonb_agg(jsonb_build_object(
'organizationId', oi."organizationId",
'platform', oi.platform,
'value', oi.value,
'type', oi.type,
'verified', oi.verified
)) filter (where oi.type = 'primary-domain' and oi.verified = true) as identities
from "memberOrganizations" mo
inner join organizations o on mo."organizationId" = o.id
inner join "organizationIdentities" oi on oi."organizationId" = o.id
Expand Down Expand Up @@ -63,7 +69,7 @@ export async function fetchMemberDataForLLMSquashing(
mo."dateStart",
mo."dateEnd",
mo.source,
mo.identities) r)
coalesce(mo.identities, '[]'::jsonb) as identities) r)
)
from member_orgs mo
where mo."memberId" = m.id
Expand Down Expand Up @@ -174,7 +180,13 @@ export async function fetchMembersForLFIDEnrichment(db: DbStore, limit: number,
members."contributions",
members."score",
members."reach",
jsonb_agg(mi.*) as identities
jsonb_agg(jsonb_build_object(
'platform', mi.platform,
'value', mi.value,
'type', mi.type,
'verified', mi.verified,
'sourceId', mi."sourceId"
)) as identities
FROM members
INNER JOIN "memberIdentities" mi ON mi."memberId" = members.id
AND mi."deletedAt" is null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,12 @@ class MemberMergeSuggestionsRepository {
mem.attributes,
mem."displayName",
mem."joinedAt",
jsonb_agg(distinct mI) as identities,
jsonb_agg(distinct jsonb_build_object(
'platform', mI.platform,
'value', mI.value,
'type', mI.type,
'verified', mI.verified
)) as identities,
coalesce(
(
select jsonb_agg(
Expand Down
Loading