Merge pull request #3282 from specklesystems/fabians/core-ioc-59

chore(server): core IoC #59 - legacyGetPaginatedUsersCount rename fix

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

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

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({

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({