Update migration command

twentyhq · Oct 29, 2024 · 318c6ed · 318c6ed
1 parent a7a53a9
commit 318c6ed
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/...base/commands/upgrade-version/0-32/0-32-copy-webhook-operation-into-operations-command.ts b/...base/commands/upgrade-version/0-32/0-32-copy-webhook-operation-into-operations-command.ts
@@ -1,13 +1,14 @@
 import { InjectRepository } from '@nestjs/typeorm';
 
 import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
+import { ObjectLiteral, Repository } from 'typeorm';
 import chalk from 'chalk';
 
 import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { BaseCommandOptions } from 'src/database/commands/base.command';
+import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';
 
 @Command({
   name: 'upgrade-0.32:copy-webhook-operation-into-operations',
@@ -43,11 +44,21 @@ export class CopyWebhookOperationIntoOperationsCommand extends ActiveWorkspacesC
 
       for (const webhook of webhooks) {
         if ('operation' in webhook) {
+          let newOperation = webhook.operation;
+
+          const [firstWebhookPart, lastWebhookPart] = newOperation.split('.');
+
+          if (['created', 'updated', 'deleted'].includes(firstWebhookPart)) {
+            newOperation = `${lastWebhookPart}.${firstWebhookPart}`;
+          }
+
           await webhookRepository.update(webhook.id, {
-            operations: [webhook.operation],
+            operation: newOperation,
+            operations: [newOperation],
           });
+
           this.logger.log(
-            chalk.yellow(`Copied webhook operation to operations`),
+            chalk.yellow(`Handled webhook operation updates for ${webhook.id}`),
           );
         }
       }

diff --git a/packages/twenty-zapier/src/utils/triggers/triggers.utils.ts b/packages/twenty-zapier/src/utils/triggers/triggers.utils.ts
@@ -33,7 +33,9 @@ export const subscribe = async (
     );
     return result.data.createWebhook;
   } catch (e) {
-    // Remove that catch code when operations column exists in all active workspace schemas
+    // Remove that catch code when VERSION 0.32 is deployed
+    // probably removable after 01/11/2024
+    // (ie: when operations column exists in all active workspace schemas)
     const data = {
       targetUrl: bundle.targetUrl,
       operation: `${bundle.inputData.nameSingular}.${operation}`,