⚡ Add mongodb migration

packages/cli/src/ActiveWorkflowRunner.ts

@@ -35,7 +35,6 @@ import {
 
 import * as express from 'express';
 
-
 export class ActiveWorkflowRunner {
 	private activeWorkflows: ActiveWorkflows | null = null;
 
@@ -240,6 +239,7 @@ export class ActiveWorkflowRunner {
 			} as IWebhookDb;
 
 			try {
+
 				await Db.collections.Webhook?.insert(webhook);
 
 				const webhookExists = await workflow.runWebhookMethod('checkExists', webhookData, NodeExecuteFunctions, mode, false);
@@ -257,7 +257,7 @@ export class ActiveWorkflowRunner {
 				// if it's a workflow from the the insert
 				// TODO check if there is standard error code for deplicate key violation that works
 				// with all databases
-				if (error.name === 'QueryFailedError') {
+				if (error.name === 'MongoError' || error.name === 'QueryFailedError') {
 
 					errorMessage = `The webhook path [${webhook.webhookPath}] and method [${webhook.method}] already exist.`;
 
@@ -303,6 +303,11 @@ export class ActiveWorkflowRunner {
 			await workflow.runWebhookMethod('delete', webhookData, NodeExecuteFunctions, mode, false);
 		}
 
+		// if it's a mongo objectId convert it to string
+		if (typeof workflowData.id === 'object') {
+			workflowData.id = workflowData.id.toString();
+		}
+
 		const webhook = {
 			workflowId: workflowData.id,
 		} as IWebhookDb;
@@ -310,7 +315,6 @@ export class ActiveWorkflowRunner {
 		await Db.collections.Webhook?.delete(webhook);
 	}
 
-
 	/**
 	 * Runs the given workflow
 	 *

packages/cli/src/Db.ts

@@ -36,7 +36,8 @@ import {
 } from './databases/postgresdb/migrations';
 
 import {
-	InitialMigration1587563438936
+	InitialMigration1587563438936,
+	WebhookModel1592679094242,
 } from './databases/mongodb/migrations';
 
 import {
@@ -68,7 +69,7 @@ export async function init(): Promise<IDatabaseCollections> {
 				entityPrefix,
 				url: await GenericHelpers.getConfigValue('database.mongodb.connectionUrl') as string,
 				useNewUrlParser: true,
-				migrations: [InitialMigration1587563438936],
+				migrations: [InitialMigration1587563438936, WebhookModel1592679094242],
 				migrationsRun: true,
 				migrationsTableName: `${entityPrefix}migrations`,
 			};

packages/cli/src/databases/mongodb/WebhookEntity.ts

@@ -2,6 +2,8 @@ import {
 	Column,
 	Entity,
 	Index,
+	ObjectID,
+	ObjectIdColumn,
 } from 'typeorm';
 
 import {
@@ -9,9 +11,11 @@ import {
  } from '../../Interfaces';
 
 @Entity()
-@Index(['webhookPath', 'method'], { unique: true })
 export class WebhookEntity implements IWebhookDb {
 
+	@ObjectIdColumn()
+	id: ObjectID;
+
 	@Column()
 	workflowId: number;
 

packages/cli/src/databases/mongodb/migrations/1592679094242-WebhookModel.ts

@@ -0,0 +1,57 @@
+import {
+	MigrationInterface,
+} from 'typeorm';
+
+import {
+	IWorkflowDb,
+	NodeTypes,
+	WebhookHelpers,
+} from '../../..';
+
+import {
+	Workflow,
+} from 'n8n-workflow/dist/src/Workflow';
+
+import {
+	IWebhookDb,
+} from '../../../Interfaces';
+
+import * as config from '../../../../config';
+
+import {
+	MongoQueryRunner,
+} from 'typeorm/driver/mongodb/MongoQueryRunner';
+
+export class WebhookModel1592679094242 implements MigrationInterface {
+	name = 'WebhookModel1592679094242';
+
+	async up(queryRunner: MongoQueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+		const workflows = await queryRunner.cursor( `${tablePrefix}workflow_entity`, { active: true }).toArray() as IWorkflowDb[];
+		const data: IWebhookDb[] = [];
+		const nodeTypes = NodeTypes();
+		for (const workflow of workflows) {
+			const workflowInstance = new Workflow({ id: workflow.id as string, name: workflow.name, nodes: workflow.nodes, connections: workflow.connections, active: workflow.active, nodeTypes, staticData: workflow.staticData, settings: workflow.settings });
+			const webhooks = WebhookHelpers.getWorkflowWebhooksBasic(workflowInstance);
+			for (const webhook of webhooks) {
+				data.push({
+					workflowId: workflowInstance.id as string,
+					webhookPath: webhook.path,
+					method: webhook.httpMethod,
+					node: webhook.node,
+				 });
+			}
+		}
+
+		if (data.length !== 0) {
+			await queryRunner.manager.insertMany(`${tablePrefix}webhook_entity`, data);
+		}
+
+		await queryRunner.manager.createCollectionIndex(`${tablePrefix}webhook_entity`, ['webhookPath',  'method'], { unique: true, background: false });
+	}
+
+	async down(queryRunner: MongoQueryRunner): Promise<void> {
+		const tablePrefix = config.get('database.tablePrefix');
+		await queryRunner.dropTable(`${tablePrefix}webhook_entity`);
+	}
+}

packages/cli/src/databases/mongodb/migrations/index.ts

@@ -1 +1,2 @@
 export * from './1587563438936-InitialMigration';
+export * from './1592679094242-WebhookModel';

packages/cli/src/databases/postgresdb/migrations/1589476000887-WebhookModel.ts

@@ -36,11 +36,6 @@ export class WebhookModel1589476000887 implements MigrationInterface {
 		const nodeTypes = NodeTypes();
 		for (const workflow of workflows) {
 			const workflowInstance = new Workflow({ id: workflow.id as string, name: workflow.name, nodes: workflow.nodes, connections: workflow.connections, active: workflow.active, nodeTypes, staticData: workflow.staticData, settings: workflow.settings });
-			// I'm writing something more simple than this. I tried to use the built in method
-			// getWorkflowWebhooks but it needs additionaldata and to get it I need the credentials
-			// and for some reason when I use
-			//	const credentials = await WorkflowCredentials(node);
-			// to get the credentials I got an error I think is cuz the database is yet not ready.
 			const webhooks = WebhookHelpers.getWorkflowWebhooksBasic(workflowInstance);
 			for (const webhook of webhooks) {
 				data.push({