From 9d6441aceb0b3ca12123b24362285f3e0459f92a Mon Sep 17 00:00:00 2001 From: Kristaps Fabians Geikins Date: Tue, 10 Sep 2024 14:57:46 +0300 Subject: [PATCH] chore(server): stats IoC 3 - getTotalObjectCountFactory --- packages/server/modules/stats/graph/resolvers/stats.ts | 4 ++-- packages/server/modules/stats/repositories/index.ts | 4 ++-- packages/server/modules/stats/tests/stats.spec.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/server/modules/stats/graph/resolvers/stats.ts b/packages/server/modules/stats/graph/resolvers/stats.ts index 295eebd79..dc5605392 100644 --- a/packages/server/modules/stats/graph/resolvers/stats.ts +++ b/packages/server/modules/stats/graph/resolvers/stats.ts @@ -8,7 +8,7 @@ import { getUserHistory, getTotalStreamCountFactory, getTotalCommitCountFactory, - getTotalObjectCount, + getTotalObjectCountFactory, getTotalUserCount } from '@/modules/stats/repositories/index' import { Roles, Scopes } from '@speckle/shared' @@ -37,7 +37,7 @@ export = { }, async totalObjectCount() { - return await getTotalObjectCount() + return await getTotalObjectCountFactory({ db })() }, async totalUserCount() { diff --git a/packages/server/modules/stats/repositories/index.ts b/packages/server/modules/stats/repositories/index.ts index 5c2b30b18..58b0829d0 100644 --- a/packages/server/modules/stats/repositories/index.ts +++ b/packages/server/modules/stats/repositories/index.ts @@ -13,9 +13,9 @@ export const getTotalCommitCountFactory = (deps: { db: Knex }) => async () => { return parseInt(result.rows[0].count) } -export async function getTotalObjectCount() { +export const getTotalObjectCountFactory = (deps: { db: Knex }) => async () => { const query = 'SELECT COUNT(*) FROM objects' - const result = await knex.raw(query) + const result = await deps.db.raw(query) return parseInt(result.rows[0].count) } diff --git a/packages/server/modules/stats/tests/stats.spec.ts b/packages/server/modules/stats/tests/stats.spec.ts index b69aa6bbd..406fd3fa4 100644 --- a/packages/server/modules/stats/tests/stats.spec.ts +++ b/packages/server/modules/stats/tests/stats.spec.ts @@ -16,7 +16,7 @@ import { getUserHistory, getTotalStreamCountFactory, getTotalCommitCountFactory, - getTotalObjectCount, + getTotalObjectCountFactory, getTotalUserCount } from '@/modules/stats/repositories/index' import { Scopes } from '@speckle/shared' @@ -49,7 +49,7 @@ describe('Server stats services @stats-services', function () { }) it('should return the total number of objects on this server', async () => { - const res = await getTotalObjectCount() + const res = await getTotalObjectCountFactory({ db })() expect(res).to.equal(params.numObjects) })