From a0c8dd81422498d10c0b10e0dc9b85f1c2460744 Mon Sep 17 00:00:00 2001 From: Kristaps Fabians Geikins Date: Tue, 15 Oct 2024 13:28:38 +0300 Subject: [PATCH] chore(server): core IoC #59 - legacyGetPaginatedUsersCount rename fix --- packages/server/modules/core/repositories/users.ts | 2 +- .../modules/core/services/users/adminUsersListService.js | 4 ++-- .../server/modules/core/tests/integration/userEmails.spec.ts | 4 ++-- packages/server/modules/core/tests/usersAdmin.spec.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/server/modules/core/repositories/users.ts b/packages/server/modules/core/repositories/users.ts index 670ddaadb..c5065ac9e 100644 --- a/packages/server/modules/core/repositories/users.ts +++ b/packages/server/modules/core/repositories/users.ts @@ -323,7 +323,7 @@ export const legacyGetPaginatedUsersFactory = /** * @deprecated Use countUsers instead */ -export const legacyGetPaginatedUsersCount = +export const legacyGetPaginatedUsersCountFactory = (deps: { db: Knex }): LegacyGetPaginatedUsersCount => async (searchQuery = null) => { const query = tables diff --git a/packages/server/modules/core/services/users/adminUsersListService.js b/packages/server/modules/core/services/users/adminUsersListService.js index 761c8a386..9b386b825 100644 --- a/packages/server/modules/core/services/users/adminUsersListService.js +++ b/packages/server/modules/core/services/users/adminUsersListService.js @@ -1,6 +1,6 @@ const { db } = require('@/db/knex') const { - legacyGetPaginatedUsersCount, + legacyGetPaginatedUsersCountFactory, legacyGetPaginatedUsersFactory } = require('@/modules/core/repositories/users') const { resolveTarget } = require('@/modules/serverinvites/helpers/core') @@ -67,7 +67,7 @@ function sanitizeParams(params) { * @param {{ countServerInvites: import('@/modules/serverinvites/domain/operations').CountServerInvites}} param0 */ function getTotalCounts({ countServerInvites }) { - const countUsers = legacyGetPaginatedUsersCount({ db }) + const countUsers = legacyGetPaginatedUsersCountFactory({ db }) /** * Get total users & invites that we can find using these params diff --git a/packages/server/modules/core/tests/integration/userEmails.spec.ts b/packages/server/modules/core/tests/integration/userEmails.spec.ts index e9873f9fe..cb8533750 100644 --- a/packages/server/modules/core/tests/integration/userEmails.spec.ts +++ b/packages/server/modules/core/tests/integration/userEmails.spec.ts @@ -5,7 +5,7 @@ import { countAdminUsersFactory, getUserByEmailFactory, getUserFactory, - legacyGetPaginatedUsersCount, + legacyGetPaginatedUsersCountFactory, legacyGetPaginatedUsersFactory, legacyGetUserByEmailFactory, listUsers, @@ -48,7 +48,7 @@ import { createUserFactory } from '@/modules/core/services/users/management' import { UsersEmitter } from '@/modules/core/events/usersEmitter' const getUsers = legacyGetPaginatedUsersFactory({ db }) -const countUsers = legacyGetPaginatedUsersCount({ db }) +const countUsers = legacyGetPaginatedUsersCountFactory({ db }) const getUser = getUserFactory({ db }) const requestNewEmailVerification = requestNewEmailVerificationFactory({ diff --git a/packages/server/modules/core/tests/usersAdmin.spec.js b/packages/server/modules/core/tests/usersAdmin.spec.js index 530e5e36d..3082b769a 100644 --- a/packages/server/modules/core/tests/usersAdmin.spec.js +++ b/packages/server/modules/core/tests/usersAdmin.spec.js @@ -11,7 +11,7 @@ const { Roles } = require('@speckle/shared') const cryptoRandomString = require('crypto-random-string') const { legacyGetPaginatedUsersFactory, - legacyGetPaginatedUsersCount, + legacyGetPaginatedUsersCountFactory, getUserFactory, storeUserFactory, countAdminUsersFactory, @@ -46,7 +46,7 @@ const { const { UsersEmitter } = require('@/modules/core/events/usersEmitter') const getUsers = legacyGetPaginatedUsersFactory({ db }) -const countUsers = legacyGetPaginatedUsersCount({ db }) +const countUsers = legacyGetPaginatedUsersCountFactory({ db }) const findEmail = findEmailFactory({ db }) const requestNewEmailVerification = requestNewEmailVerificationFactory({