feat: Implement getStepWithTestExecutions query
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import { Knex } from "knex";
|
import { Knex } from 'knex';
|
||||||
|
|
||||||
export async function up(knex: Knex): Promise<void> {
|
export async function up(knex: Knex): Promise<void> {
|
||||||
return knex.schema.createTable('steps', (table) => {
|
return knex.schema.createTable('steps', (table) => {
|
||||||
@@ -7,11 +7,11 @@ export async function up(knex: Knex): Promise<void> {
|
|||||||
table.string('app_key').notNullable();
|
table.string('app_key').notNullable();
|
||||||
table.string('type').notNullable();
|
table.string('type').notNullable();
|
||||||
table.integer('connection_id').references('id').inTable('connections');
|
table.integer('connection_id').references('id').inTable('connections');
|
||||||
table.text('parameters')
|
table.text('parameters');
|
||||||
|
|
||||||
table.timestamps(true, true);
|
table.timestamps(true, true);
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
|
|
||||||
export async function down(knex: Knex): Promise<void> {
|
export async function down(knex: Knex): Promise<void> {
|
||||||
return knex.schema.dropTable('steps');
|
return knex.schema.dropTable('steps');
|
||||||
|
@@ -0,0 +1,15 @@
|
|||||||
|
import { Knex } from 'knex';
|
||||||
|
|
||||||
|
export async function up(knex: Knex): Promise<void> {
|
||||||
|
return knex.schema.alterTable('execution_steps', (table) => {
|
||||||
|
table.jsonb('data_in').alter();
|
||||||
|
table.jsonb('data_out').alter();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function down(knex: Knex): Promise<void> {
|
||||||
|
return knex.schema.alterTable('execution_steps', (table) => {
|
||||||
|
table.text('data_in').alter();
|
||||||
|
table.text('data_out').alter();
|
||||||
|
});
|
||||||
|
}
|
@@ -0,0 +1,13 @@
|
|||||||
|
import { Knex } from 'knex';
|
||||||
|
|
||||||
|
export async function up(knex: Knex): Promise<void> {
|
||||||
|
return knex.schema.alterTable('steps', (table) => {
|
||||||
|
table.jsonb('parameters').alter();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function down(knex: Knex): Promise<void> {
|
||||||
|
return knex.schema.alterTable('steps', (table) => {
|
||||||
|
table.text('parameters').alter();
|
||||||
|
});
|
||||||
|
}
|
@@ -0,0 +1,42 @@
|
|||||||
|
import { GraphQLNonNull, GraphQLString, GraphQLList } from 'graphql';
|
||||||
|
import RequestWithCurrentUser from '../../types/express/request-with-current-user';
|
||||||
|
import stepType from '../types/step';
|
||||||
|
|
||||||
|
type Params = {
|
||||||
|
stepId: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getStepWithTestExecutionsResolver = async (
|
||||||
|
params: Params,
|
||||||
|
req: RequestWithCurrentUser
|
||||||
|
) => {
|
||||||
|
const step = await req.currentUser
|
||||||
|
.$relatedQuery('steps')
|
||||||
|
.findOne({ 'steps.id': params.stepId })
|
||||||
|
.throwIfNotFound();
|
||||||
|
|
||||||
|
const previousStepsWithCurrentStep = await req.currentUser
|
||||||
|
.$relatedQuery('steps')
|
||||||
|
.withGraphJoined('executionSteps')
|
||||||
|
.select('steps.*', 'executionSteps.data_out as output')
|
||||||
|
.where('flow_id', '=', step.flowId)
|
||||||
|
.andWhere('position', '<=', step.position)
|
||||||
|
.distinctOn('executionSteps.step_id')
|
||||||
|
.orderBy([
|
||||||
|
'executionSteps.step_id',
|
||||||
|
{ column: 'executionSteps.created_at', order: 'desc' },
|
||||||
|
]);
|
||||||
|
|
||||||
|
return previousStepsWithCurrentStep;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getStepWithTestExecutions = {
|
||||||
|
type: GraphQLList(stepType),
|
||||||
|
args: {
|
||||||
|
stepId: { type: GraphQLNonNull(GraphQLString) },
|
||||||
|
},
|
||||||
|
resolve: (_: any, params: Params, req: RequestWithCurrentUser) =>
|
||||||
|
getStepWithTestExecutionsResolver(params, req),
|
||||||
|
};
|
||||||
|
|
||||||
|
export default getStepWithTestExecutions;
|
@@ -6,6 +6,7 @@ import getAppConnections from './queries/get-app-connections';
|
|||||||
import testConnection from './queries/test-connection';
|
import testConnection from './queries/test-connection';
|
||||||
import getFlow from './queries/get-flow';
|
import getFlow from './queries/get-flow';
|
||||||
import getFlows from './queries/get-flows';
|
import getFlows from './queries/get-flows';
|
||||||
|
import getStepWithTestExecutions from './queries/get-step-with-test-executions';
|
||||||
|
|
||||||
const rootQuery = new GraphQLObjectType({
|
const rootQuery = new GraphQLObjectType({
|
||||||
name: 'Query',
|
name: 'Query',
|
||||||
@@ -17,6 +18,7 @@ const rootQuery = new GraphQLObjectType({
|
|||||||
testConnection,
|
testConnection,
|
||||||
getFlow,
|
getFlow,
|
||||||
getFlows,
|
getFlows,
|
||||||
|
getStepWithTestExecutions,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
15
packages/backend/src/graphql/types/execution-step.ts
Normal file
15
packages/backend/src/graphql/types/execution-step.ts
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
import { GraphQLObjectType, GraphQLString, GraphQLBoolean } from 'graphql';
|
||||||
|
import { GraphQLJSONObject } from 'graphql-type-json';
|
||||||
|
|
||||||
|
const executionStepType = new GraphQLObjectType({
|
||||||
|
name: 'ExecutionStep',
|
||||||
|
fields: {
|
||||||
|
executionId: { type: GraphQLString },
|
||||||
|
stepId: { type: GraphQLString },
|
||||||
|
status: { type: GraphQLString },
|
||||||
|
dataIn: { type: GraphQLJSONObject },
|
||||||
|
dataOut: { type: GraphQLJSONObject },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export default executionStepType;
|
@@ -5,6 +5,7 @@ import {
|
|||||||
GraphQLInt,
|
GraphQLInt,
|
||||||
GraphQLInputObjectType,
|
GraphQLInputObjectType,
|
||||||
} from 'graphql';
|
} from 'graphql';
|
||||||
|
import { GraphQLJSONObject } from 'graphql-type-json';
|
||||||
import ConnectionType from './connection';
|
import ConnectionType from './connection';
|
||||||
|
|
||||||
const stepType = new GraphQLObjectType({
|
const stepType = new GraphQLObjectType({
|
||||||
@@ -27,9 +28,10 @@ const stepType = new GraphQLObjectType({
|
|||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
parameters: { type: GraphQLString },
|
parameters: { type: GraphQLJSONObject },
|
||||||
connection: { type: ConnectionType },
|
connection: { type: ConnectionType },
|
||||||
flow: { type: FlowType },
|
flow: { type: FlowType },
|
||||||
|
output: { type: GraphQLJSONObject },
|
||||||
position: { type: GraphQLInt },
|
position: { type: GraphQLInt },
|
||||||
status: { type: GraphQLString },
|
status: { type: GraphQLString },
|
||||||
};
|
};
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
import Base from './base';
|
import Base from './base';
|
||||||
import Execution from './execution';
|
import Execution from './execution';
|
||||||
|
import Step from './step';
|
||||||
|
|
||||||
class ExecutionStep extends Base {
|
class ExecutionStep extends Base {
|
||||||
id!: string;
|
id!: string;
|
||||||
@@ -33,6 +34,14 @@ class ExecutionStep extends Base {
|
|||||||
to: 'executions.id',
|
to: 'executions.id',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
step: {
|
||||||
|
relation: Base.BelongsToOneRelation,
|
||||||
|
modelClass: Step,
|
||||||
|
join: {
|
||||||
|
from: 'execution_steps.step_id',
|
||||||
|
to: 'steps.id',
|
||||||
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
import Base from './base';
|
import Base from './base';
|
||||||
import Flow from './flow';
|
import Flow from './flow';
|
||||||
import Connection from './connection';
|
import Connection from './connection';
|
||||||
|
import ExecutionStep from './execution-step';
|
||||||
|
|
||||||
enum StepEnumType {
|
enum StepEnumType {
|
||||||
'trigger',
|
'trigger',
|
||||||
@@ -19,6 +20,7 @@ class Step extends Base {
|
|||||||
parameters: string;
|
parameters: string;
|
||||||
connection?: Connection;
|
connection?: Connection;
|
||||||
flow?: Flow;
|
flow?: Flow;
|
||||||
|
executionSteps?: [ExecutionStep];
|
||||||
|
|
||||||
static tableName = 'steps';
|
static tableName = 'steps';
|
||||||
|
|
||||||
@@ -56,6 +58,14 @@ class Step extends Base {
|
|||||||
to: 'connections.id',
|
to: 'connections.id',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
executionSteps: {
|
||||||
|
relation: Base.HasManyRelation,
|
||||||
|
modelClass: ExecutionStep,
|
||||||
|
join: {
|
||||||
|
from: 'steps.id',
|
||||||
|
to: 'execution_steps.step_id',
|
||||||
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user