From 86f4cb7701e5d568521561d1c8f452a0c0d9172e Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Wed, 20 Mar 2024 17:24:44 +0100 Subject: [PATCH] refactor: Use objection instead of knex for factories --- .../api/v1/executions/get-executions.test.js | 10 ++++++++-- packages/backend/test/factories/app-auth-client.js | 4 +--- packages/backend/test/factories/app-config.js | 2 +- packages/backend/test/factories/config.js | 2 +- packages/backend/test/factories/execution-step.js | 4 +--- packages/backend/test/factories/execution.js | 4 +--- packages/backend/test/factories/flow.js | 2 +- packages/backend/test/factories/permission.js | 2 +- packages/backend/test/factories/role.js | 2 +- .../backend/test/factories/saml-auth-provider.ee.js | 6 +++--- packages/backend/test/factories/subscription.js | 2 +- packages/backend/test/factories/user.js | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/backend/src/controllers/api/v1/executions/get-executions.test.js b/packages/backend/src/controllers/api/v1/executions/get-executions.test.js index 585ffab3..cc5cbc08 100644 --- a/packages/backend/src/controllers/api/v1/executions/get-executions.test.js +++ b/packages/backend/src/controllers/api/v1/executions/get-executions.test.js @@ -42,9 +42,12 @@ describe('GET /api/v1/executions', () => { const currentUserExecutionTwo = await createExecution({ flowId: currentUserFlow.id, - deletedAt: new Date().toISOString(), }); + await currentUserExecutionTwo + .$query() + .patchAndFetch({ deletedAt: new Date().toISOString() }); + await createPermission({ action: 'read', subject: 'Execution', @@ -87,9 +90,12 @@ describe('GET /api/v1/executions', () => { const anotherUserExecutionTwo = await createExecution({ flowId: anotherUserFlow.id, - deletedAt: new Date().toISOString(), }); + await anotherUserExecutionTwo + .$query() + .patchAndFetch({ deletedAt: new Date().toISOString() }); + await createPermission({ action: 'read', subject: 'Execution', diff --git a/packages/backend/test/factories/app-auth-client.js b/packages/backend/test/factories/app-auth-client.js index 296d8315..3d51f80f 100644 --- a/packages/backend/test/factories/app-auth-client.js +++ b/packages/backend/test/factories/app-auth-client.js @@ -17,9 +17,7 @@ export const createAppAuthClient = async (params = {}) => { params.formattedAuthDefaults = params?.formattedAuthDefaults || formattedAuthDefaults; - const appAuthClient = await AppAuthClient.query() - .insert(params) - .returning('*'); + const appAuthClient = await AppAuthClient.query().insertAndFetch(params); return appAuthClient; }; diff --git a/packages/backend/test/factories/app-config.js b/packages/backend/test/factories/app-config.js index d626e1b4..4d81cce6 100644 --- a/packages/backend/test/factories/app-config.js +++ b/packages/backend/test/factories/app-config.js @@ -3,7 +3,7 @@ import AppConfig from '../../src/models/app-config.js'; export const createAppConfig = async (params = {}) => { params.key = params?.key || 'gitlab'; - const appConfig = await AppConfig.query().insert(params).returning('*'); + const appConfig = await AppConfig.query().insertAndFetch(params); return appConfig; }; diff --git a/packages/backend/test/factories/config.js b/packages/backend/test/factories/config.js index 49801b8b..a8d59787 100644 --- a/packages/backend/test/factories/config.js +++ b/packages/backend/test/factories/config.js @@ -7,7 +7,7 @@ export const createConfig = async (params = {}) => { value: params?.value || { data: 'sampleConfig' }, }; - const config = await Config.query().insert(configData).returning('*'); + const config = await Config.query().insertAndFetch(configData); return config; }; diff --git a/packages/backend/test/factories/execution-step.js b/packages/backend/test/factories/execution-step.js index a470fcc1..842e3a9f 100644 --- a/packages/backend/test/factories/execution-step.js +++ b/packages/backend/test/factories/execution-step.js @@ -9,9 +9,7 @@ export const createExecutionStep = async (params = {}) => { params.dataIn = params?.dataIn || { dataIn: 'dataIn' }; params.dataOut = params?.dataOut || { dataOut: 'dataOut' }; - const executionStep = await ExecutionStep.query() - .insert(params) - .returning('*'); + const executionStep = await ExecutionStep.query().insertAndFetch(params); return executionStep; }; diff --git a/packages/backend/test/factories/execution.js b/packages/backend/test/factories/execution.js index ade693c1..22ad2b7d 100644 --- a/packages/backend/test/factories/execution.js +++ b/packages/backend/test/factories/execution.js @@ -4,10 +4,8 @@ import { createFlow } from './flow'; export const createExecution = async (params = {}) => { params.flowId = params?.flowId || (await createFlow()).id; params.testRun = params?.testRun || false; - params.createdAt = params?.createdAt || new Date().toISOString(); - params.updatedAt = params?.updatedAt || new Date().toISOString(); - const execution = await Execution.query().insert(params).returning('*'); + const execution = await Execution.query().insertAndFetch(params); return execution; }; diff --git a/packages/backend/test/factories/flow.js b/packages/backend/test/factories/flow.js index 2e576828..c23d4e0e 100644 --- a/packages/backend/test/factories/flow.js +++ b/packages/backend/test/factories/flow.js @@ -7,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 Flow.query().insert(params).returning('*'); + const flow = await Flow.query().insertAndFetch(params); return flow; }; diff --git a/packages/backend/test/factories/permission.js b/packages/backend/test/factories/permission.js index a81da493..d5434971 100644 --- a/packages/backend/test/factories/permission.js +++ b/packages/backend/test/factories/permission.js @@ -7,7 +7,7 @@ export const createPermission = async (params = {}) => { params.subject = params?.subject || 'User'; params.conditions = params?.conditions || ['isCreator']; - const permission = await Permission.query().insert(params).returning('*'); + const permission = await Permission.query().insertAndFetch(params); return permission; }; diff --git a/packages/backend/test/factories/role.js b/packages/backend/test/factories/role.js index 5091fbd1..b06d93db 100644 --- a/packages/backend/test/factories/role.js +++ b/packages/backend/test/factories/role.js @@ -4,7 +4,7 @@ export const createRole = async (params = {}) => { params.name = params?.name || 'Viewer'; params.key = params?.key || 'viewer'; - const role = await Role.query().insert(params).returning('*'); + const role = await Role.query().insertAndFetch(params); return role; }; diff --git a/packages/backend/test/factories/saml-auth-provider.ee.js b/packages/backend/test/factories/saml-auth-provider.ee.js index e18bc4c6..f205eda1 100644 --- a/packages/backend/test/factories/saml-auth-provider.ee.js +++ b/packages/backend/test/factories/saml-auth-provider.ee.js @@ -25,9 +25,9 @@ export const createSamlAuthProvider = async (params = {}) => { params.defaultRoleId = params?.defaultRoleId || (await createRole()).id; params.active = params?.active || true; - const samlAuthProvider = await SamlAuthProvider.query() - .insert(params) - .returning('*'); + const samlAuthProvider = await SamlAuthProvider.query().insertAndFetch( + params + ); return samlAuthProvider; }; diff --git a/packages/backend/test/factories/subscription.js b/packages/backend/test/factories/subscription.js index 95b158e7..f63bcc96 100644 --- a/packages/backend/test/factories/subscription.js +++ b/packages/backend/test/factories/subscription.js @@ -15,7 +15,7 @@ export const createSubscription = async (params = {}) => { params.nextBillDate = params?.nextBillDate || DateTime.now().plus({ days: 30 }).toISODate(); - const subscription = await Subscription.query().insert(params).returning('*'); + const subscription = await Subscription.query().insertAndFetch(params); return subscription; }; diff --git a/packages/backend/test/factories/user.js b/packages/backend/test/factories/user.js index 11dbc062..fe4719f2 100644 --- a/packages/backend/test/factories/user.js +++ b/packages/backend/test/factories/user.js @@ -8,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 User.query().insert(params).returning('*'); + const user = await User.query().insertAndFetch(params); return user; };