-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
Add try catch to command #8381
Merged
Merged
Add try catch to command #8381
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,44 +31,54 @@ export class CopyWebhookOperationIntoOperationsCommand extends ActiveWorkspacesC | |
this.logger.log('Running command to copy operation to operations'); | ||
|
||
for (const workspaceId of activeWorkspaceIds) { | ||
this.logger.log(`Running command for workspace ${workspaceId}`); | ||
try { | ||
this.logger.log(`Running command for workspace ${workspaceId}`); | ||
|
||
const webhookRepository = | ||
await this.twentyORMGlobalManager.getRepositoryForWorkspace( | ||
workspaceId, | ||
'webhook', | ||
); | ||
const webhookRepository = | ||
await this.twentyORMGlobalManager.getRepositoryForWorkspace( | ||
workspaceId, | ||
'webhook', | ||
); | ||
|
||
const webhooks = await webhookRepository.find(); | ||
const webhooks = await webhookRepository.find(); | ||
|
||
for (const webhook of webhooks) { | ||
if ('operation' in webhook) { | ||
let newOpe = webhook.operation; | ||
for (const webhook of webhooks) { | ||
if ('operation' in webhook) { | ||
let newOpe = webhook.operation; | ||
|
||
newOpe = newOpe.replace(/\bcreate\b(?=\.|$)/g, 'created'); | ||
newOpe = newOpe.replace(/\bupdate\b(?=\.|$)/g, 'updated'); | ||
newOpe = newOpe.replace(/\bdelete\b(?=\.|$)/g, 'deleted'); | ||
newOpe = newOpe.replace(/\bdestroy\b(?=\.|$)/g, 'destroyed'); | ||
newOpe = newOpe.replace(/\bcreate\b(?=\.|$)/g, 'created'); | ||
newOpe = newOpe.replace(/\bupdate\b(?=\.|$)/g, 'updated'); | ||
newOpe = newOpe.replace(/\bdelete\b(?=\.|$)/g, 'deleted'); | ||
newOpe = newOpe.replace(/\bdestroy\b(?=\.|$)/g, 'destroyed'); | ||
|
||
const [firstWebhookPart, lastWebhookPart] = newOpe.split('.'); | ||
const [firstWebhookPart, lastWebhookPart] = newOpe.split('.'); | ||
|
||
if ( | ||
['created', 'updated', 'deleted', 'destroyed'].includes( | ||
firstWebhookPart, | ||
) | ||
) { | ||
newOpe = `${lastWebhookPart}.${firstWebhookPart}`; | ||
} | ||
if ( | ||
['created', 'updated', 'deleted', 'destroyed'].includes( | ||
firstWebhookPart, | ||
) | ||
) { | ||
newOpe = `${lastWebhookPart}.${firstWebhookPart}`; | ||
} | ||
|
||
await webhookRepository.update(webhook.id, { | ||
operation: newOpe, | ||
operations: [newOpe], | ||
}); | ||
await webhookRepository.update(webhook.id, { | ||
operation: newOpe, | ||
operations: [newOpe], | ||
}); | ||
|
||
this.logger.log( | ||
chalk.yellow(`Handled webhook operation updates for ${webhook.id}`), | ||
); | ||
this.logger.log( | ||
chalk.yellow( | ||
`Handled webhook operation updates for ${webhook.id}`, | ||
), | ||
); | ||
} | ||
} | ||
} catch (e) { | ||
this.logger.log( | ||
chalk.red( | ||
`Error when running command on workspace ${workspaceId}: ${e}`, | ||
), | ||
); | ||
Comment on lines
+76
to
+81
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. style: Consider using logger.error() instead of logger.log() for error conditions. Also, error object might need toString() for proper serialization. |
||
} | ||
} | ||
} | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
logic: Add null check for split() result - malformed operations could cause undefined lastWebhookPart