refactor: Remove reintroduced non-null assertions in Db calls (n8n-…

…io#3162) * 🔥 Remove reintroduced non-null assertions * 🔥 Remove duplicate cred references * 🔥 Remove unneeded `@ts-ignore` * 🔥 Remove another `@ts-ignore` * 🔥 Remove outdated suite version * 🔥 Remove leftover non-null assertion Co-authored-by: Ben Hesseldieck <[email protected]> * 🔥 Remove more leftovers * 🔥 Remove unneeded optional chaining operators Co-authored-by: Ben Hesseldieck <[email protected]>
kentosho · Apr 28, 2022 · 5e2589e · 5e2589e
1 parent 2b00881
commit 5e2589e
Show file tree

Hide file tree

Showing 18 changed files with 132 additions and 299 deletions.
diff --git a/packages/cli/commands/db/revert.ts b/packages/cli/commands/db/revert.ts
@@ -28,7 +28,7 @@ export class DbRevertMigrationCommand extends Command {
 		let connection: Connection | undefined;
 		try {
 			await Db.init();
-			connection = Db.collections.Credentials?.manager.connection;
+			connection = Db.collections.Credentials.manager.connection;
 
 			if (!connection) {
 				throw new Error(`No database connection available.`);

diff --git a/packages/cli/commands/import/workflow.ts b/packages/cli/commands/import/workflow.ts
@@ -82,7 +82,7 @@ export class ImportWorkflowsCommand extends Command {
 
 			// Make sure the settings exist
 			await UserSettings.prepareUserSettings();
-			const credentials = (await Db.collections.Credentials?.find()) ?? [];
+			const credentials = (await Db.collections.Credentials.find()) ?? [];
 
 			let totalImported = 0;
 

diff --git a/packages/cli/src/ActiveExecutions.ts b/packages/cli/src/ActiveExecutions.ts
@@ -70,9 +70,7 @@ export class ActiveExecutions {
 
 			const execution = ResponseHelper.flattenExecutionData(fullExecutionData);
 
-			const executionResult = await Db.collections.Execution!.save(
-				execution as IExecutionFlattedDb,
-			);
+			const executionResult = await Db.collections.Execution.save(execution as IExecutionFlattedDb);
 			executionId =
 				typeof executionResult.id === 'object'
 					? // @ts-ignore
@@ -87,8 +85,7 @@ export class ActiveExecutions {
 				waitTill: null,
 			};
 
-			// @ts-ignore
-			await Db.collections.Execution!.update(executionId, execution);
+			await Db.collections.Execution.update(executionId, execution);
 		}
 
 		// @ts-ignore

diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -83,7 +83,7 @@ export class ActiveWorkflowRunner {
 			// This is not officially supported but there is no reason
 			// it should not work.
 			// Clear up active workflow table
-			await Db.collections.Webhook?.clear();
+			await Db.collections.Webhook.clear();
 		}
 
 		this.activeWorkflows = new ActiveWorkflows();
@@ -189,7 +189,7 @@ export class ActiveWorkflowRunner {
 			path = path.slice(0, -1);
 		}
 
-		let webhook = (await Db.collections.Webhook?.findOne({
+		let webhook = (await Db.collections.Webhook.findOne({
 			webhookPath: path,
 			method: httpMethod,
 		})) as IWebhookDb;
@@ -200,7 +200,7 @@ export class ActiveWorkflowRunner {
 			// check if a dynamic webhook path exists
 			const pathElements = path.split('/');
 			webhookId = pathElements.shift();
-			const dynamicWebhooks = await Db.collections.Webhook?.find({
+			const dynamicWebhooks = await Db.collections.Webhook.find({
 				webhookId,
 				method: httpMethod,
 				pathLength: pathElements.length,
@@ -332,7 +332,7 @@ export class ActiveWorkflowRunner {
 	 * @memberof ActiveWorkflowRunner
 	 */
 	async getWebhookMethods(path: string): Promise<string[]> {
-		const webhooks = await Db.collections.Webhook?.find({ webhookPath: path });
+		const webhooks = await Db.collections.Webhook.find({ webhookPath: path });
 
 		// Gather all request methods in string array
 		const webhookMethods: string[] = webhooks.map((webhook) => webhook.method);
@@ -443,7 +443,7 @@ export class ActiveWorkflowRunner {
 
 			try {
 				// eslint-disable-next-line no-await-in-loop
-				await Db.collections.Webhook?.insert(webhook);
+				await Db.collections.Webhook.insert(webhook);
 				const webhookExists = await workflow.runWebhookMethod(
 					'checkExists',
 					webhookData,
@@ -556,7 +556,7 @@ export class ActiveWorkflowRunner {
 			workflowId: workflowData.id,
 		} as IWebhookDb;
 
-		await Db.collections.Webhook?.delete(webhook);
+		await Db.collections.Webhook.delete(webhook);
 	}
 
 	/**