groot/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1752 from automatisch/fix-step-factory

Browse Source 
fix: Adjust step factory to use objection instead of knex
This commit is contained in:
Ömer Faruk Aydın
2024-03-20 02:15:13 +01:00
committed by GitHub
parent bddd9896e4 4a99d5eab7
commit 76f77e8a4c
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/graphql/queries/get-flow.test.js
View File

@@ -136,7 +136,7 @@ describe('graphQL getFlow query', () => {
id: actionStep.id, id: actionStep.id,
key: 'translateText', key: 'translateText',
parameters: {}, parameters: {},
position: 1, position: 2,
status: actionStep.status, status: actionStep.status,
type: 'action', type: 'action',
webhookUrl: 'http://localhost:3000/null', webhookUrl: 'http://localhost:3000/null',
@@ -223,7 +223,7 @@ describe('graphQL getFlow query', () => {
id: actionStep.id, id: actionStep.id,
key: 'translateText', key: 'translateText',
parameters: {}, parameters: {},
position: 1, position: 2,
status: actionStep.status, status: actionStep.status,
type: 'action', type: 'action',
webhookUrl: 'http://localhost:3000/null', webhookUrl: 'http://localhost:3000/null',

16
packages/backend/test/factories/step.js
View File

@@ -5,19 +5,21 @@ export const createStep = async (params = {}) => {
params.flowId = params?.flowId || (await createFlow()).id; params.flowId = params?.flowId || (await createFlow()).id;
params.type = params?.type || 'action'; params.type = params?.type || 'action';
const lastStep = await global.knex const lastStep = await Step.query()
.table('steps') .where('flow_id', params.flowId)
.where('flowId', params.flowId) .andWhere('deleted_at', null)
.andWhere('deletedAt', '!=', null) .orderBy('position', 'desc')
.orderBy('createdAt', 'desc') .limit(1)
.first(); .first();
params.position = params?.position || (lastStep?.position || 0) + 1; params.position =
params?.position || (lastStep?.position ? lastStep.position + 1 : 1);
params.status = params?.status || 'completed'; params.status = params?.status || 'completed';
params.appKey = params.appKey =
params?.appKey || (params.type === 'action' ? 'deepl' : 'webhook'); params?.appKey || (params.type === 'action' ? 'deepl' : 'webhook');
const step = await Step.query().insert(params).returning('*'); const step = await Step.query().insertAndFetch(params);
return step; return step;
}; };