|
6 | 6 | organizationMergeAction, |
7 | 7 | organizationUnmergeAction, |
8 | 8 | } from '@crowd/audit-logs' |
9 | | -import { Error409, websiteNormalizer } from '@crowd/common' |
| 9 | +import { Error400, Error409, websiteNormalizer } from '@crowd/common' |
10 | 10 | import { hasLfxMembership } from '@crowd/data-access-layer/src/lfx_memberships' |
11 | 11 | import { findMergeAction } from '@crowd/data-access-layer/src/mergeActions/repo' |
12 | 12 | import { findOrgAttributes, upsertOrgIdentities } from '@crowd/data-access-layer/src/organizations' |
@@ -459,7 +459,7 @@ export default class OrganizationService extends LoggerBase { |
459 | 459 | mergeAction?.state === MergeActionState.IN_PROGRESS || |
460 | 460 | mergeAction?.state === MergeActionState.PENDING |
461 | 461 | ) { |
462 | | - throw new Error409(this.options.language, 'merge.errors.multipleMerge', mergeAction?.state) |
| 462 | + throw new Error409(this.options.language, 'merge.errors.multiple', mergeAction?.state) |
463 | 463 | } |
464 | 464 |
|
465 | 465 | try { |
@@ -489,8 +489,9 @@ export default class OrganizationService extends LoggerBase { |
489 | 489 | mergedId: originalId, |
490 | 490 | } |
491 | 491 | } |
| 492 | + |
492 | 493 | 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') |
494 | 495 | } |
495 | 496 |
|
496 | 497 | this.log.info({ originalId, toMergeId }, '[Merge Organizations] - Found organizations! ') |
|
0 commit comments