Skip to content
Draft
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
1 change: 1 addition & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"script:trigger-webhook": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/trigger-webhook.ts",
"script:send-weekly-analytics-email": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/send-weekly-analytics-email.ts",
"script:merge-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/merge-organizations.ts",
"script:merge-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/merge-members.ts",
"script:refresh-materialized-views": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/refresh-materialized-views.ts",
"script:unmerge-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/unmerge-members.ts",
"script:member-unmerge-testing": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/member-unmerge-testing.ts",
Expand Down
5 changes: 4 additions & 1 deletion backend/src/bin/scripts/merge-members.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ if (parameters.help || !parameters.originalId || !parameters.targetId) {
])

options.currentTenant = { id: originalMember.tenantId }
options.currentUser = { id: 'b2b6d667-ca17-4aa8-bfd6-a84520d748a2' }
options['userData'] = { ip: '93.34.149.15', userAgent: 'test' }
options['requestId'] = 'e576950b-7c85-4ce1-b475-7f41ecd07fc5'

for (const targetId of targetIds) {
const targetMember = await findMemberById(qx, targetId, [
Expand All @@ -89,7 +92,7 @@ if (parameters.help || !parameters.originalId || !parameters.targetId) {
log.info(`Merging ${targetId} into ${originalId}...`)
const service = new CommonMemberService(optionsQx(options), options.temporal, log)
try {
await service.merge(originalId, targetId)
await service.merge(originalId, targetId, options)
} catch (err) {
log.error(`Error merging members: ${err.message}`)
process.exit(1)
Expand Down
Loading
Loading