diff --git a/packages/backend/test/factories/config.js b/packages/backend/test/factories/config.js index fe21d765..49801b8b 100644 --- a/packages/backend/test/factories/config.js +++ b/packages/backend/test/factories/config.js @@ -1,4 +1,5 @@ import { faker } from '@faker-js/faker'; +import Config from '../../src/models/config'; export const createConfig = async (params = {}) => { const configData = { @@ -6,10 +7,7 @@ export const createConfig = async (params = {}) => { value: params?.value || { data: 'sampleConfig' }, }; - const [config] = await global.knex - .table('config') - .insert(configData) - .returning('*'); + const config = await Config.query().insert(configData).returning('*'); return config; }; diff --git a/packages/backend/test/factories/connection.js b/packages/backend/test/factories/connection.js index aff7abff..b7188ee0 100644 --- a/packages/backend/test/factories/connection.js +++ b/packages/backend/test/factories/connection.js @@ -1,5 +1,6 @@ import appConfig from '../../src/config/app'; import { AES } from 'crypto-js'; +import Connection from '../../src/models/connection'; export const createConnection = async (params = {}) => { params.key = params?.key || 'deepl'; @@ -16,10 +17,7 @@ export const createConnection = async (params = {}) => { appConfig.encryptionKey ).toString(); - const [connection] = await global.knex - .table('connections') - .insert(params) - .returning('*'); + const connection = await Connection.query().insert(params).returning('*'); return connection; }; diff --git a/packages/backend/test/factories/execution-step.js b/packages/backend/test/factories/execution-step.js index 01b9daa5..a470fcc1 100644 --- a/packages/backend/test/factories/execution-step.js +++ b/packages/backend/test/factories/execution-step.js @@ -1,3 +1,4 @@ +import ExecutionStep from '../../src/models/execution-step'; import { createExecution } from './execution'; import { createStep } from './step'; @@ -8,8 +9,7 @@ export const createExecutionStep = async (params = {}) => { params.dataIn = params?.dataIn || { dataIn: 'dataIn' }; params.dataOut = params?.dataOut || { dataOut: 'dataOut' }; - const [executionStep] = await global.knex - .table('executionSteps') + const executionStep = await ExecutionStep.query() .insert(params) .returning('*'); diff --git a/packages/backend/test/factories/execution.js b/packages/backend/test/factories/execution.js index 67ea6340..ade693c1 100644 --- a/packages/backend/test/factories/execution.js +++ b/packages/backend/test/factories/execution.js @@ -1,3 +1,4 @@ +import Execution from '../../src/models/execution'; import { createFlow } from './flow'; export const createExecution = async (params = {}) => { @@ -6,10 +7,7 @@ export const createExecution = async (params = {}) => { params.createdAt = params?.createdAt || new Date().toISOString(); params.updatedAt = params?.updatedAt || new Date().toISOString(); - const [execution] = await global.knex - .table('executions') - .insert(params) - .returning('*'); + const execution = await Execution.query().insert(params).returning('*'); return execution; }; diff --git a/packages/backend/test/factories/flow.js b/packages/backend/test/factories/flow.js index 09cebbbd..2e576828 100644 --- a/packages/backend/test/factories/flow.js +++ b/packages/backend/test/factories/flow.js @@ -1,3 +1,4 @@ +import Flow from '../../src/models/flow'; import { createUser } from './user'; export const createFlow = async (params = {}) => { @@ -6,7 +7,7 @@ export const createFlow = async (params = {}) => { params.createdAt = params?.createdAt || new Date().toISOString(); params.updatedAt = params?.updatedAt || new Date().toISOString(); - const [flow] = await global.knex.table('flows').insert(params).returning('*'); + const flow = await Flow.query().insert(params).returning('*'); return flow; }; diff --git a/packages/backend/test/factories/permission.js b/packages/backend/test/factories/permission.js index bc604adf..a81da493 100644 --- a/packages/backend/test/factories/permission.js +++ b/packages/backend/test/factories/permission.js @@ -1,3 +1,4 @@ +import Permission from '../../src/models/permission'; import { createRole } from './role'; export const createPermission = async (params = {}) => { @@ -6,10 +7,7 @@ export const createPermission = async (params = {}) => { params.subject = params?.subject || 'User'; params.conditions = params?.conditions || ['isCreator']; - const [permission] = await global.knex - .table('permissions') - .insert(params) - .returning('*'); + const permission = await Permission.query().insert(params).returning('*'); return permission; }; diff --git a/packages/backend/test/factories/role.js b/packages/backend/test/factories/role.js index f2ed88bc..5091fbd1 100644 --- a/packages/backend/test/factories/role.js +++ b/packages/backend/test/factories/role.js @@ -1,8 +1,10 @@ +import Role from '../../src/models/role'; + export const createRole = async (params = {}) => { params.name = params?.name || 'Viewer'; params.key = params?.key || 'viewer'; - const [role] = await global.knex.table('roles').insert(params).returning('*'); + const role = await Role.query().insert(params).returning('*'); return role; }; diff --git a/packages/backend/test/factories/step.js b/packages/backend/test/factories/step.js index 9fb0ec84..fd230764 100644 --- a/packages/backend/test/factories/step.js +++ b/packages/backend/test/factories/step.js @@ -1,3 +1,4 @@ +import Step from '../../src/models/step'; import { createFlow } from './flow'; export const createStep = async (params = {}) => { @@ -16,7 +17,7 @@ export const createStep = async (params = {}) => { params.appKey = params?.appKey || (params.type === 'action' ? 'deepl' : 'webhook'); - const [step] = await global.knex.table('steps').insert(params).returning('*'); + const step = await Step.query().insert(params).returning('*'); return step; }; diff --git a/packages/backend/test/factories/user.js b/packages/backend/test/factories/user.js index 6ae60d36..11dbc062 100644 --- a/packages/backend/test/factories/user.js +++ b/packages/backend/test/factories/user.js @@ -1,5 +1,6 @@ import { createRole } from './role'; import { faker } from '@faker-js/faker'; +import User from '../../src/models/user'; export const createUser = async (params = {}) => { params.roleId = params?.roleId || (await createRole()).id; @@ -7,7 +8,7 @@ export const createUser = async (params = {}) => { params.email = params?.email || faker.internet.email(); params.password = params?.password || faker.internet.password(); - const [user] = await global.knex.table('users').insert(params).returning('*'); + const user = await User.query().insert(params).returning('*'); return user; };