mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-24 04:04:06 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: Fix executions bulk deletion (#5074)

Browse source 
since QueryBuilder api doesn't use entity field transforms, we should remove the usage of QueryBuilder wherever there is a filter on a transformed column.
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2023-01-03 10:58:34 +01:00 committed by GitHub
parent ee28213538
commit 3754c5c734
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
packages/cli/src/executions/executions.service.ts
View file

@ -12,10 +12,11 @@ import {
jsonParse, jsonParse,
Workflow, Workflow,
} from 'n8n-workflow'; } from 'n8n-workflow';
import { FindOperator, In, IsNull, LessThanOrEqual, Not, Raw } from 'typeorm'; import { FindConditions, FindOperator, In, IsNull, LessThanOrEqual, Not, Raw } from 'typeorm';
import * as ActiveExecutions from '@/ActiveExecutions'; import * as ActiveExecutions from '@/ActiveExecutions';
import config from '@/config'; import config from '@/config';
import { User } from '@/databases/entities/User'; import type { User } from '@/databases/entities/User';
import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
import { import {
IExecutionFlattedResponse, IExecutionFlattedResponse,
IExecutionResponse, IExecutionResponse,
@ -199,7 +200,7 @@ export class ExecutionsService {
.map(({ id }) => id), .map(({ id }) => id),
); );
const findWhere = { workflowId: In(sharedWorkflowIds) }; const findWhere: FindConditions<ExecutionEntity> = { workflowId: In(sharedWorkflowIds) };
const rangeQuery: string[] = []; const rangeQuery: string[] = [];
const rangeQueryParams: { const rangeQueryParams: {
@ -452,66 +453,39 @@ export class ExecutionsService {
throw new Error('Either "deleteBefore" or "ids" must be present in the request body'); throw new Error('Either "deleteBefore" or "ids" must be present in the request body');
} }
const binaryDataManager = BinaryDataManager.getInstance(); const where: FindConditions<ExecutionEntity> = { workflowId: In(sharedWorkflowIds) };
// delete executions by date, if user may access the underlying workflows
if (deleteBefore) { if (deleteBefore) {
const filters: IDataObject = { // delete executions by date, if user may access the underlying workflows
startedAt: LessThanOrEqual(deleteBefore), where.startedAt = LessThanOrEqual(deleteBefore);
}; Object.assign(where, requestFilters);
} else if (ids) {
// delete executions by IDs, if user may access the underlying workflows
where.id = In(ids);
} else return;
let query = Db.collections.Execution.createQueryBuilder() const executions = await Db.collections.Execution.find({
.select('id') select: ['id'],
.where({ where,
...filters, });
workflowId: In(sharedWorkflowIds),
});
if (requestFilters) { if (!executions.length) {
query = query.andWhere(requestFilters); if (ids) {
}
const executions = await query.getMany();
if (!executions.length) return;
const idsToDelete = executions.map(({ id }) => id);
await Promise.all(
idsToDelete.map(async (id) => binaryDataManager.deleteBinaryDataByExecutionId(id)),
);
await Db.collections.Execution.delete({ id: In(idsToDelete) });
return;
}
// delete executions by IDs, if user may access the underlying workflows
if (ids) {
const executions = await Db.collections.Execution.find({
where: {
id: In(ids),
workflowId: In(sharedWorkflowIds),
},
});
if (!executions.length) {
LoggerProxy.error('Failed to delete an execution due to insufficient permissions', { LoggerProxy.error('Failed to delete an execution due to insufficient permissions', {
userId: req.user.id, userId: req.user.id,
executionIds: ids, executionIds: ids,
}); });
return;
} }
return;
const idsToDelete = executions.map(({ id }) => id);
await Promise.all(
idsToDelete.map(async (id) => binaryDataManager.deleteBinaryDataByExecutionId(id)),
);
await Db.collections.Execution.delete(idsToDelete);
} }
const idsToDelete = executions.map(({ id }) => id);
const binaryDataManager = BinaryDataManager.getInstance();
await Promise.all(
idsToDelete.map(async (id) => binaryDataManager.deleteBinaryDataByExecutionId(id)),
);
await Db.collections.Execution.delete(idsToDelete);
} }
} }