admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-19 11:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): Fix broken execution query when using projectId (#11852)

Browse Source
This commit is contained in:
Marc Littlemore
2024-11-25 08:48:45 +00:00
committed by GitHub
parent 03135702f1
commit a061dbca07
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cli/src/databases/repositories/execution.repository.ts
View File

@@ -981,7 +981,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
if (projectId) {
qb.innerJoin(WorkflowEntity, 'w', 'w.id = execution.workflowId')
.innerJoin(SharedWorkflow, 'sw', 'sw.workflowId = w.id')
.where('sw.projectId = :projectId', { projectId });
.andWhere('sw.projectId = :projectId', { projectId });
}
return qb;

30
packages/cli/test/integration/execution.service.integration.test.ts
View File

@@ -327,6 +327,36 @@ describe('ExecutionService', () => {
});
});
test('should filter executions by `projectId` and expected `status`', async () => {
const firstProject = await createTeamProject();
const secondProject = await createTeamProject();
const firstWorkflow = await createWorkflow(undefined, firstProject);
const secondWorkflow = await createWorkflow(undefined, secondProject);
await createExecution({ status: 'success' }, firstWorkflow);
await createExecution({ status: 'error' }, firstWorkflow);
await createExecution({ status: 'success' }, secondWorkflow);
const query: ExecutionSummaries.RangeQuery = {
kind: 'range',
range: { limit: 20 },
accessibleWorkflowIds: [firstWorkflow.id],
projectId: firstProject.id,
status: ['error'],
};
const output = await executionService.findRangeWithCount(query);
expect(output).toEqual({
count: 1,
estimated: false,
results: expect.arrayContaining([
expect.objectContaining({ workflowId: firstWorkflow.id, status: 'error' }),
]),
});
});
test('should exclude executions by inaccessible `workflowId`', async () => {
const accessibleWorkflow = await createWorkflow();
const inaccessibleWorkflow = await createWorkflow();