Skip to content

Organizations merge on conflict during enrichment hotfix #1664

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 5 commits into from
Oct 11, 2023
Merged

Organizations merge on conflict during enrichment hotfix #1664

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
224b44e
Fix member and acivity count in organization find
skwowet Oct 11, 2023
09a6c8b
Merge branch 'main' of github.com:CrowdDotDev/crowd.dev
skwowet Oct 11, 2023
0ba0c57
Merge branch 'main' of github.com:CrowdDotDev/crowd.dev
skwowet Oct 11, 2023
e4d2d5e
Merge branch 'main' of github.com:CrowdDotDev/crowd.dev
skwowet Oct 11, 2023
110d257
Organization enrichment hotfixes
skwowet Oct 11, 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
19 changes: 17 additions & 2 deletions backend/src/services/premium/enrichment/organizationEnrichmentService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export default class OrganizationEnrichmentService extends LoggerBase {

try {
const searchSyncEmitter = await getSearchSyncWorkerEmitter()
const unmergedOrgs: IOrganization[] = []
let unmergedOrgs: IOrganization[] = []

// check strong weak identities and move them if needed
for (const org of orgs) {
Expand Down Expand Up @@ -182,7 +182,22 @@ export default class OrganizationEnrichmentService extends LoggerBase {
}
}

this.log.info({ orgs: unmergedOrgs }, 'Updating organizations')
// Check if two or more orgs in the umergedOrgs list have same website
const duplicateOrgs = []
const uniqueWebsites = new Set()

for (const org of unmergedOrgs) {
if (uniqueWebsites.has(org.website)) {
duplicateOrgs.push(org)
} else {
uniqueWebsites.add(org.website)
}
}

// Remove duplicate organizations from unmergedOrgs
unmergedOrgs = unmergedOrgs.filter((org) => !duplicateOrgs.includes(org))

this.log.info('Duplicate organizations found in enriched list:', duplicateOrgs)

// TODO: Update cache
// await OrganizationCacheRepository.bulkUpdate(cacheOrgs, this.options, true)
Expand Down