From e613a4e01c0d111f43afed3985546c15b4bac743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= Date: Wed, 12 Nov 2025 14:54:09 +0100 Subject: [PATCH] fix: dont count session events for current billing period --- packages/db/src/services/organization.service.ts | 2 ++ packages/db/src/services/project.service.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/db/src/services/organization.service.ts b/packages/db/src/services/organization.service.ts index e96a9003..ce887635 100644 --- a/packages/db/src/services/organization.service.ts +++ b/packages/db/src/services/organization.service.ts @@ -218,6 +218,7 @@ export async function getOrganizationBillingEventsCount( sb.select.count = 'COUNT(*) AS count'; sb.where.projectIds = `project_id IN (${organization.projects.map((project) => sqlstring.escape(project.id)).join(',')})`; sb.where.createdAt = `created_at BETWEEN ${sqlstring.escape(formatClickhouseDate(organization.subscriptionCurrentPeriodStart))} AND ${sqlstring.escape(formatClickhouseDate(organization.subscriptionCurrentPeriodEnd))}`; + sb.where.names = `name NOT IN ('session_start', 'session_end')`; const res = await chQuery<{ count: number }>(getSql()); return res[0]?.count; @@ -242,6 +243,7 @@ export async function getOrganizationBillingEventsCountSerie( sb.orderBy.day = `${interval} WITH FILL FROM toDate(${sqlstring.escape(formatClickhouseDate(startDate, true))}) TO toDate(${sqlstring.escape(formatClickhouseDate(endDate, true))}) STEP INTERVAL 1 ${interval.toUpperCase()}`; sb.where.projectIds = `project_id IN (${organization.projects.map((project) => sqlstring.escape(project.id)).join(',')})`; sb.where.createdAt = `${interval} BETWEEN ${sqlstring.escape(formatClickhouseDate(startDate, true))} AND ${sqlstring.escape(formatClickhouseDate(endDate, true))}`; + sb.where.names = `name NOT IN ('session_start', 'session_end')`; const res = await chQuery<{ count: number; day: string }>(getSql()); return res; diff --git a/packages/db/src/services/project.service.ts b/packages/db/src/services/project.service.ts index f13b8a4a..7e8a997a 100644 --- a/packages/db/src/services/project.service.ts +++ b/packages/db/src/services/project.service.ts @@ -104,7 +104,7 @@ export async function getProjects({ export const getProjectEventsCount = async (projectId: string) => { const res = await chQuery<{ count: number }>( - `SELECT count(*) as count FROM ${TABLE_NAMES.events} WHERE project_id = ${sqlstring.escape(projectId)}`, + `SELECT count(*) as count FROM ${TABLE_NAMES.events} WHERE project_id = ${sqlstring.escape(projectId)} AND name NOT IN ('session_start', 'session_end')`, ); return res[0]?.count; };