From 6ff39dde8256839b4d5b2acf8fc57bed0dddcf16 Mon Sep 17 00:00:00 2001 From: Kristaps Fabians Geikins Date: Tue, 10 Sep 2024 15:06:42 +0300 Subject: [PATCH] chore(server): stats IoC 6 - getCommitHistoryFactory --- 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 3e2527098..2366065f9 100644 --- a/packages/server/modules/stats/graph/resolvers/stats.ts +++ b/packages/server/modules/stats/graph/resolvers/stats.ts @@ -3,7 +3,7 @@ import { Resolvers } from '@/modules/core/graph/generated/graphql' import { validateScopes } from '@/modules/shared' import { getStreamHistoryFactory, - getCommitHistory, + getCommitHistoryFactory, getObjectHistory, getUserHistory, getTotalStreamCountFactory, @@ -49,7 +49,7 @@ export = { }, async commitHistory() { - return await getCommitHistory() + return await getCommitHistoryFactory({ db })() }, async objectHistory() { diff --git a/packages/server/modules/stats/repositories/index.ts b/packages/server/modules/stats/repositories/index.ts index 0b763768d..e643a0005 100644 --- a/packages/server/modules/stats/repositories/index.ts +++ b/packages/server/modules/stats/repositories/index.ts @@ -45,7 +45,7 @@ export const getStreamHistoryFactory = (deps: { db: Knex }) => async () => { return result.rows } -export async function getCommitHistory() { +export const getCommitHistoryFactory = (deps: { db: Knex }) => async () => { const query = ` SELECT DATE_TRUNC('month', commits. "createdAt") AS created_month, @@ -55,7 +55,7 @@ export async function getCommitHistory() { GROUP BY DATE_TRUNC('month', commits. "createdAt") ` - const result = (await knex.raw(query)) as { + const result = (await deps.db.raw(query)) as { rows: Array<{ created_month: Date; count: string | number }> } result.rows.forEach((row) => (row.count = parseInt(row.count + ''))) diff --git a/packages/server/modules/stats/tests/stats.spec.ts b/packages/server/modules/stats/tests/stats.spec.ts index adb36490f..7631141d7 100644 --- a/packages/server/modules/stats/tests/stats.spec.ts +++ b/packages/server/modules/stats/tests/stats.spec.ts @@ -11,7 +11,7 @@ import { createManyObjects } from '@/test/helpers' import { getStreamHistoryFactory, - getCommitHistory, + getCommitHistoryFactory, getObjectHistory, getUserHistory, getTotalStreamCountFactory, @@ -63,7 +63,7 @@ describe('Server stats services @stats-services', function () { }) it('should return the commit creation history by month', async () => { - const res = await getCommitHistory() + const res = await getCommitHistoryFactory({ db })() expect(res).to.be.an('array') expect(res[0]).to.have.property('count') expect(res[0]).to.have.property('created_month')