Skip to content

fix: update status code for merge errors #3061

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
skwowet merged 4 commits into from
May 13, 2025
Merged

fix: update status code for merge errors #3061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca5da8a
fix: update status code for merge errors
skwowet May 13, 2025
be23976
Merge branch 'main' into support/CM-2268
skwowet May 13, 2025
4348b4c
chore: make prettier happi
skwowet May 13, 2025
1149509
Merge branch 'support/CM-2268' of github.com:CrowdDotDev/crowd.dev in…
skwowet May 13, 2025
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
4 changes: 2 additions & 2 deletions backend/src/services/memberService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ export default class MemberService extends LoggerBase {
)

if (primaryIdentities.length === 0) {
throw new Error(`Original member only has one identity, cannot extract it!`)
throw new Error400(this.options.language, 'merge.errors.noIdentities')
}

const secondaryActivityCount = 0
Expand Down Expand Up @@ -1252,7 +1252,7 @@ export default class MemberService extends LoggerBase {
mergeAction?.state === MergeActionState.IN_PROGRESS ||
mergeAction?.state === MergeActionState.PENDING
) {
throw new Error409(this.options.language, 'merge.errors.multipleMerge', mergeAction?.state)
throw new Error409(this.options.language, 'merge.errors.multiple', mergeAction?.state)
}

let tx
Expand Down
7 changes: 4 additions & 3 deletions backend/src/services/organizationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
organizationMergeAction,
organizationUnmergeAction,
} from '@crowd/audit-logs'
import { Error409, websiteNormalizer } from '@crowd/common'
import { Error400, Error409, websiteNormalizer } from '@crowd/common'
import { hasLfxMembership } from '@crowd/data-access-layer/src/lfx_memberships'
import { findMergeAction } from '@crowd/data-access-layer/src/mergeActions/repo'
import { findOrgAttributes, upsertOrgIdentities } from '@crowd/data-access-layer/src/organizations'
Expand Down Expand Up @@ -459,7 +459,7 @@ export default class OrganizationService extends LoggerBase {
mergeAction?.state === MergeActionState.IN_PROGRESS ||
mergeAction?.state === MergeActionState.PENDING
) {
throw new Error409(this.options.language, 'merge.errors.multipleMerge', mergeAction?.state)
throw new Error409(this.options.language, 'merge.errors.multiple', mergeAction?.state)
}

try {
Expand Down Expand Up @@ -489,8 +489,9 @@ export default class OrganizationService extends LoggerBase {
mergedId: originalId,
}
}

if (toMergeWithLfxMembership) {
throw new Error('Cannot merge LFX membership organization as a secondary one!')
throw new Error400(this.options.language, 'merge.errors.mergeLfxSecondary')
}

this.log.info({ originalId, toMergeId }, '[Merge Organizations] - Found organizations! ')
Expand Down
4 changes: 3 additions & 1 deletion services/libs/common/src/i18n/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,9 @@ const en = {

merge: {
errors: {
multipleMerge: 'Cannot merge suggestions - found existing merge with {0} state',
multiple: 'Cannot merge suggestions - found existing merge with {0} state',
lfxSecondary: 'Cannot merge LFX membership organization as a secondary one!',
noIdentities: 'Original member only has one identity, cannot extract it!',
},
},

Expand Down
Loading