Skip to content

Commit 021761f

Browse files
authored
fix: update status code for merge errors (#3061)
1 parent 07b4cee commit 021761f

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

backend/src/services/memberService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ export default class MemberService extends LoggerBase {
11061106
)
11071107

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

11121112
const secondaryActivityCount = 0
@@ -1252,7 +1252,7 @@ export default class MemberService extends LoggerBase {
12521252
mergeAction?.state === MergeActionState.IN_PROGRESS ||
12531253
mergeAction?.state === MergeActionState.PENDING
12541254
) {
1255-
throw new Error409(this.options.language, 'merge.errors.multipleMerge', mergeAction?.state)
1255+
throw new Error409(this.options.language, 'merge.errors.multiple', mergeAction?.state)
12561256
}
12571257

12581258
let tx

backend/src/services/organizationService.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
organizationMergeAction,
77
organizationUnmergeAction,
88
} from '@crowd/audit-logs'
9-
import { Error409, websiteNormalizer } from '@crowd/common'
9+
import { Error400, Error409, websiteNormalizer } from '@crowd/common'
1010
import { hasLfxMembership } from '@crowd/data-access-layer/src/lfx_memberships'
1111
import { findMergeAction } from '@crowd/data-access-layer/src/mergeActions/repo'
1212
import { findOrgAttributes, upsertOrgIdentities } from '@crowd/data-access-layer/src/organizations'
@@ -459,7 +459,7 @@ export default class OrganizationService extends LoggerBase {
459459
mergeAction?.state === MergeActionState.IN_PROGRESS ||
460460
mergeAction?.state === MergeActionState.PENDING
461461
) {
462-
throw new Error409(this.options.language, 'merge.errors.multipleMerge', mergeAction?.state)
462+
throw new Error409(this.options.language, 'merge.errors.multiple', mergeAction?.state)
463463
}
464464

465465
try {
@@ -489,8 +489,9 @@ export default class OrganizationService extends LoggerBase {
489489
mergedId: originalId,
490490
}
491491
}
492+
492493
if (toMergeWithLfxMembership) {
493-
throw new Error('Cannot merge LFX membership organization as a secondary one!')
494+
throw new Error400(this.options.language, 'merge.errors.mergeLfxSecondary')
494495
}
495496

496497
this.log.info({ originalId, toMergeId }, '[Merge Organizations] - Found organizations! ')

services/libs/common/src/i18n/en.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,9 @@ const en = {
165165

166166
merge: {
167167
errors: {
168-
multipleMerge: 'Cannot merge suggestions - found existing merge with {0} state',
168+
multiple: 'Cannot merge suggestions - found existing merge with {0} state',
169+
lfxSecondary: 'Cannot merge LFX membership organization as a secondary one!',
170+
noIdentities: 'Original member only has one identity, cannot extract it!',
169171
},
170172
},
171173

0 commit comments

Comments
 (0)