refactor(core): Continue moving typeorm operators to repositories (no-changelog) (#8186)

Follow-up to: #8163

packages/cli/src/workflows/workflow.service.ee.ts

@@ -1,17 +1,12 @@
-import type { EntityManager } from 'typeorm';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
-import type { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import type { User } from '@db/entities/User';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { UserService } from '@/services/user.service';
-import { WorkflowService } from './workflow.service';
 import type {
 	CredentialUsedByWorkflow,
 	WorkflowWithSharingsAndCredentials,
 } from './workflows.types';
 import { CredentialsService } from '@/credentials/credentials.service';
 import { ApplicationError, NodeOperationError } from 'n8n-workflow';
-import { RoleService } from '@/services/role.service';
 import { Service } from 'typedi';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
@@ -19,23 +14,25 @@ import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
+import { RoleService } from '@/services/role.service';
+import type { EntityManager } from 'typeorm';
+import { UserRepository } from '@/databases/repositories/user.repository';
 
 @Service()
 export class EnterpriseWorkflowService {
 	constructor(
-		private readonly workflowService: WorkflowService,
-		private readonly userService: UserService,
-		private readonly roleService: RoleService,
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly credentialsRepository: CredentialsRepository,
+		private readonly userRepository: UserRepository,
+		private readonly roleService: RoleService,
 	) {}
 
 	async isOwned(
 		user: User,
 		workflowId: string,
 	): Promise<{ ownsWorkflow: boolean; workflow?: WorkflowEntity }> {
-		const sharing = await this.workflowService.getSharing(
+		const sharing = await this.sharedWorkflowRepository.getSharing(
 			user,
 			workflowId,
 			{ allowGlobalScope: false },
@@ -49,28 +46,11 @@ export class EnterpriseWorkflowService {
 		return { ownsWorkflow: true, workflow };
 	}
 
-	async share(
-		transaction: EntityManager,
-		workflow: WorkflowEntity,
-		shareWithIds: string[],
-	): Promise<SharedWorkflow[]> {
-		const users = await this.userService.getByIds(transaction, shareWithIds);
+	async share(transaction: EntityManager, workflow: WorkflowEntity, shareWithIds: string[]) {
+		const users = await this.userRepository.getByIds(transaction, shareWithIds);
 		const role = await this.roleService.findWorkflowEditorRole();
 
-		const newSharedWorkflows = users.reduce<SharedWorkflow[]>((acc, user) => {
-			if (user.isPending) {
-				return acc;
-			}
-			const entity: Partial<SharedWorkflow> = {
-				workflowId: workflow.id,
-				userId: user.id,
-				roleId: role?.id,
-			};
-			acc.push(this.sharedWorkflowRepository.create(entity));
-			return acc;
-		}, []);
-
-		return transaction.save(newSharedWorkflows);
+		await this.sharedWorkflowRepository.share(transaction, workflow, users, role.id);
 	}
 
 	addOwnerAndSharings(workflow: WorkflowWithSharingsAndCredentials): void {

packages/cli/src/workflows/workflow.service.ts

@@ -1,14 +1,12 @@
 import Container, { Service } from 'typedi';
 import type { INode, IPinData } from 'n8n-workflow';
 import { NodeApiError, Workflow } from 'n8n-workflow';
-import type { FindOptionsWhere } from 'typeorm';
 import pick from 'lodash/pick';
 import omit from 'lodash/omit';
 import { v4 as uuid } from 'uuid';
 import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import config from '@/config';
-import type { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import type { User } from '@db/entities/User';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { validateEntity } from '@/GenericHelpers';
@@ -25,7 +23,6 @@ import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import { OwnershipService } from '@/services/ownership.service';
 import { WorkflowHistoryService } from './workflowHistory/workflowHistory.service.ee';
 import { BinaryDataService } from 'n8n-core';
-import type { Scope } from '@n8n/permissions';
 import { Logger } from '@/Logger';
 import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
 import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
@@ -34,10 +31,6 @@ import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 
-export type WorkflowsGetSharedOptions =
-	| { allowGlobalScope: true; globalScope: Scope }
-	| { allowGlobalScope: false };
-
 @Service()
 export class WorkflowService {
 	constructor(
@@ -57,24 +50,6 @@ export class WorkflowService {
 		private readonly activeWorkflowRunner: ActiveWorkflowRunner,
 	) {}
 
-	async getSharing(
-		user: User,
-		workflowId: string,
-		options: WorkflowsGetSharedOptions,
-		relations: string[] = ['workflow'],
-	): Promise<SharedWorkflow | null> {
-		const where: FindOptionsWhere<SharedWorkflow> = { workflowId };
-
-		// Omit user from where if the requesting user has relevant
-		// global workflow permissions. This allows the user to
-		// access workflows they don't own.
-		if (!options.allowGlobalScope || !user.hasGlobalScope(options.globalScope)) {
-			where.userId = user.id;
-		}
-
-		return this.sharedWorkflowRepository.findOne({ where, relations });
-	}
-
 	/**
 	 * Find the pinned trigger to execute the workflow from, if any.
 	 *

packages/cli/src/workflows/workflows.controller.ts

@@ -386,10 +386,14 @@ workflowsController.put(
 			workflow = undefined;
 			// Allow owners/admins to share
 			if (req.user.hasGlobalScope('workflow:share')) {
-				const sharedRes = await Container.get(WorkflowService).getSharing(req.user, workflowId, {
-					allowGlobalScope: true,
-					globalScope: 'workflow:share',
-				});
+				const sharedRes = await Container.get(SharedWorkflowRepository).getSharing(
+					req.user,
+					workflowId,
+					{
+						allowGlobalScope: true,
+						globalScope: 'workflow:share',
+					},
+				);
 				workflow = sharedRes?.workflow;
 			}
 			if (!workflow) {