reorganize class to make diff more readable

Author: despairblue

packages/cli/src/commands/import/credentials.ts

@@ -85,6 +85,49 @@ export class ImportCredentialsCommand extends BaseCommand {
 		this.reportSuccess(credentials.length);
 	}
 
+	async catch(error: Error) {
+		this.logger.error(
+			'An error occurred while importing credentials. See log messages for details.',
+		);
+		this.logger.error(error.message);
+	}
+
+	private reportSuccess(total: number) {
+		this.logger.info(
+			`Successfully imported ${total} ${total === 1 ? 'credential.' : 'credentials.'}`,
+		);
+	}
+
+	private async storeCredential(credential: Partial<CredentialsEntity>, user: User) {
+		const result = await this.transactionManager.upsert(CredentialsEntity, credential, ['id']);
+
+		const sharingExists = await this.transactionManager.existsBy(SharedCredentials, {
+			credentialsId: credential.id,
+			role: 'credential:owner',
+		});
+
+		if (!sharingExists) {
+			await this.transactionManager.upsert(
+				SharedCredentials,
+				{
+					credentialsId: result.identifiers[0].id as string,
+					userId: user.id,
+					role: 'credential:owner',
+				},
+				['credentialsId', 'userId'],
+			);
+		}
+	}
+
+	private async getOwner() {
+		const owner = await Container.get(UserRepository).findOneBy({ role: 'global:owner' });
+		if (!owner) {
+			throw new ApplicationError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
+		}
+
+		return owner;
+	}
+
 	private async checkRelations(credentials: ICredentialsEncrypted[], userId?: string) {
 		if (!userId) {
 			return {
@@ -163,49 +206,6 @@ export class ImportCredentialsCommand extends BaseCommand {
 		});
 	}
 
-	async catch(error: Error) {
-		this.logger.error(
-			'An error occurred while importing credentials. See log messages for details.',
-		);
-		this.logger.error(error.message);
-	}
-
-	private reportSuccess(total: number) {
-		this.logger.info(
-			`Successfully imported ${total} ${total === 1 ? 'credential.' : 'credentials.'}`,
-		);
-	}
-
-	private async storeCredential(credential: Partial<CredentialsEntity>, user: User) {
-		const result = await this.transactionManager.upsert(CredentialsEntity, credential, ['id']);
-
-		const sharingExists = await this.transactionManager.existsBy(SharedCredentials, {
-			credentialsId: credential.id,
-			role: 'credential:owner',
-		});
-
-		if (!sharingExists) {
-			await this.transactionManager.upsert(
-				SharedCredentials,
-				{
-					credentialsId: result.identifiers[0].id as string,
-					userId: user.id,
-					role: 'credential:owner',
-				},
-				['credentialsId', 'userId'],
-			);
-		}
-	}
-
-	private async getOwner() {
-		const owner = await Container.get(UserRepository).findOneBy({ role: 'global:owner' });
-		if (!owner) {
-			throw new ApplicationError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
-		}
-
-		return owner;
-	}
-
 	private async getAssignee(userId: string) {
 		const user = await Container.get(UserRepository).findOneBy({ id: userId });
 

packages/cli/src/commands/import/workflow.ts

@@ -4,16 +4,16 @@ import { ApplicationError, jsonParse } from 'n8n-workflow';
 import fs from 'fs';
 import glob from 'fast-glob';
 
+import { UM_FIX_INSTRUCTION } from '@/constants';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { disableAutoGeneratedIds } from '@db/utils/commandHelpers';
 import { generateNanoId } from '@db/utils/generators';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import type { IWorkflowToImport } from '@/Interfaces';
 import { ImportService } from '@/services/import.service';
 import { BaseCommand } from '../BaseCommand';
 import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
-import { UserRepository } from '@/databases/repositories/user.repository';
-import { UM_FIX_INSTRUCTION } from '@/constants';
 
 function assertHasWorkflowsToImport(workflows: unknown): asserts workflows is IWorkflowToImport[] {
 	if (!Array.isArray(workflows)) {
@@ -127,13 +127,13 @@ export class ImportWorkflowsCommand extends BaseCommand {
 		};
 	}
 
-	private async getWorkflowOwner(workflow: WorkflowEntity) {
-		const sharing = await Container.get(SharedWorkflowRepository).findOneBy({
-			workflowId: workflow.id,
-			role: 'workflow:owner',
-		});
+	async catch(error: Error) {
+		this.logger.error('An error occurred while importing workflows. See log messages for details.');
+		this.logger.error(error.message);
+	}
 
-		return sharing?.userId;
+	private reportSuccess(total: number) {
+		this.logger.info(`Successfully imported ${total} ${total === 1 ? 'workflow.' : 'workflows.'}`);
 	}
 
 	private async getOwner() {
@@ -145,6 +145,15 @@ export class ImportWorkflowsCommand extends BaseCommand {
 		return owner;
 	}
 
+	private async getWorkflowOwner(workflow: WorkflowEntity) {
+		const sharing = await Container.get(SharedWorkflowRepository).findOneBy({
+			workflowId: workflow.id,
+			role: 'workflow:owner',
+		});
+
+		return sharing?.userId;
+	}
+
 	private async workflowExists(workflow: WorkflowEntity) {
 		return await Container.get(WorkflowRepository).existsBy({ id: workflow.id });
 	}
@@ -180,13 +189,4 @@ export class ImportWorkflowsCommand extends BaseCommand {
 			return workflowInstances;
 		}
 	}
-
-	async catch(error: Error) {
-		this.logger.error('An error occurred while importing workflows. See log messages for details.');
-		this.logger.error(error.message);
-	}
-
-	private reportSuccess(total: number) {
-		this.logger.info(`Successfully imported ${total} ${total === 1 ? 'workflow.' : 'workflows.'}`);
-	}
 }