diff --git a/apps/condo/domains/organization/integrations/sbbol/sync/syncOrganization.js b/apps/condo/domains/organization/integrations/sbbol/sync/syncOrganization.js index 7815a46976f..1c84b611d80 100644 --- a/apps/condo/domains/organization/integrations/sbbol/sync/syncOrganization.js +++ b/apps/condo/domains/organization/integrations/sbbol/sync/syncOrganization.js @@ -100,7 +100,7 @@ const syncOrganization = async ({ context, user, userData, organizationInfo, dvS }) const employee = await OrganizationEmployee.getOne(adminContext, { organization: { id: organization.id }, - }, 'id') + }) await sendToCustomer({ organization }) return { organization, employee } diff --git a/apps/condo/domains/organization/integrations/sbbol/sync/syncOrganization.spec.js b/apps/condo/domains/organization/integrations/sbbol/sync/syncOrganization.spec.js index 0fab0bd6a46..b41d0bb368b 100644 --- a/apps/condo/domains/organization/integrations/sbbol/sync/syncOrganization.spec.js +++ b/apps/condo/domains/organization/integrations/sbbol/sync/syncOrganization.spec.js @@ -43,7 +43,7 @@ describe('syncOrganization from SBBOL', () => { const [connectedEmployee] = await OrganizationEmployeeApi.getAll(adminContext, { user: { id: user.id }, - }, 'id') + }) await OrganizationEmployeeApi.softDelete(adminContext, connectedEmployee.id, 'id', { ...dvSenderFields }) await syncOrganization({ @@ -202,7 +202,7 @@ describe('syncOrganization from SBBOL', () => { const existingOrganizationEmployee = await OrganizationEmployeeApi.getOne(adminContext, { user: { id: userClient.user.id }, organization: { id: existingOrganization.id }, - }, 'id') + }) organizationData.meta.inn = userClient.organization.tin await OrganizationApi.update(adminContext, existingOrganization.id, { importId: organizationData.importId, diff --git a/apps/condo/domains/organization/schema/AcceptOrRejectOrganizationInviteService.js b/apps/condo/domains/organization/schema/AcceptOrRejectOrganizationInviteService.js index c37528390ac..7ddf9663924 100644 --- a/apps/condo/domains/organization/schema/AcceptOrRejectOrganizationInviteService.js +++ b/apps/condo/domains/organization/schema/AcceptOrRejectOrganizationInviteService.js @@ -64,7 +64,7 @@ const AcceptOrRejectOrganizationInviteService = new GQLCustomSchema('AcceptOrRej isRejected = isRejected || false isAccepted = isAccepted || false - let employee = await OrganizationEmployee.getOne(context, { id, deletedAt: null }, 'id') + let employee = await OrganizationEmployee.getOne(context, { id, deletedAt: null }) if (!employee) throw new GQLError({ ...ERRORS.acceptOrRejectOrganizationInviteById.INVITE_NOT_FOUND, messageInterpolation: { id } }) // if the user accepts the invitation, then update the name, phone number and email address of the employee @@ -77,14 +77,14 @@ const AcceptOrRejectOrganizationInviteService = new GQLCustomSchema('AcceptOrRej name: authedItem.name ? authedItem.name : null, phone: authedItem.phone ? authedItem.phone : null, email: authedItem.email ? authedItem.email : null, - }, 'id') + }) } else { employee = await OrganizationEmployee.update(context, employee.id, { dv: 1, sender, isRejected, isAccepted, - }, 'id') + }) } return await getById('OrganizationEmployee', employee.id) @@ -102,7 +102,7 @@ const AcceptOrRejectOrganizationInviteService = new GQLCustomSchema('AcceptOrRej isRejected = isRejected || false isAccepted = isAccepted || false - let employee = await OrganizationEmployee.getOne(context, { inviteCode, user_is_null: true, deletedAt: null }, 'id') + let employee = await OrganizationEmployee.getOne(context, { inviteCode, user_is_null: true, deletedAt: null }) if (!employee) throw new GQLError({ ...ERRORS.acceptOrRejectOrganizationInviteByCode.INVITE_NOT_FOUND, messageInterpolation: { inviteCode } }) // if the user accepts the invitation, then update the name, phone number and email address of the employee @@ -118,7 +118,7 @@ const AcceptOrRejectOrganizationInviteService = new GQLCustomSchema('AcceptOrRej isRejected, isAccepted, ...needToUpdateUserData, - }, 'id') + }) return await getById('OrganizationEmployee', employee.id) }, diff --git a/apps/condo/domains/organization/schema/InviteNewOrganizationEmployeeService.js b/apps/condo/domains/organization/schema/InviteNewOrganizationEmployeeService.js index 292c7f6824c..86ebca4bcc1 100644 --- a/apps/condo/domains/organization/schema/InviteNewOrganizationEmployeeService.js +++ b/apps/condo/domains/organization/schema/InviteNewOrganizationEmployeeService.js @@ -193,7 +193,7 @@ const InviteNewOrganizationEmployeeService = new GQLCustomSchema('InviteNewOrgan phone, hasAllSpecializations, ...dvSenderData, - }, 'id') + }) for (const specializationIdObj of specializations) { await OrganizationEmployeeSpecialization.create(context, { diff --git a/apps/condo/domains/organization/schema/ReplaceOrganizationEmployeeRoleService.js b/apps/condo/domains/organization/schema/ReplaceOrganizationEmployeeRoleService.js index dc41b5abbb2..b037cc64406 100644 --- a/apps/condo/domains/organization/schema/ReplaceOrganizationEmployeeRoleService.js +++ b/apps/condo/domains/organization/schema/ReplaceOrganizationEmployeeRoleService.js @@ -163,7 +163,7 @@ const ReplaceOrganizationEmployeeRoleService = new GQLCustomSchema('ReplaceOrgan role: { connect: { id: newRoleId } }, }, })) - await OrganizationEmployee.updateMany(context, payloadToUpdate, 'id') + await OrganizationEmployee.updateMany(context, payloadToUpdate) if (withDeletionOldRole) { await loadListByChunks({ diff --git a/apps/condo/k6/webpack.config.js b/apps/condo/k6/webpack.config.js index 119f0a3d5ab..26529837f74 100644 --- a/apps/condo/k6/webpack.config.js +++ b/apps/condo/k6/webpack.config.js @@ -4,7 +4,6 @@ module.exports = { mode: 'production', entry: { 'registerMetersReadings.test': path.join(__dirname, 'src/registerMetersReadings.test.ts'), - 'getAllOrganizationEmployees.test': path.join(__dirname, 'src/getAllOrganizationEmployees.test.ts'), 'syncTourStep.test': path.join(__dirname, 'src/syncTourStep.test.ts'), 'ticket.test': path.join(__dirname, 'src/ticket.test.ts'), 'news.test': path.join(__dirname, 'src/news.test.ts'),