fix: organization timeseries should use activityRelations and for members it should use postgres

Signed-off-by: Uroš Marolt <uros@marolt.me>

Author: themarolt

services/apps/cache_worker/src/activities/dashboard-cache/refreshDashboardCache.ts

@@ -69,7 +69,7 @@ export async function getNewMembersTimeseries(
 export async function getActiveMembersTimeseries(
   params: IQueryTimeseriesParams,
 ): Promise<ITimeseriesDatapoint[]> {
-  return getTimeseriesOfActiveMembers(dbStoreQx(qdb), params)
+  return getTimeseriesOfActiveMembers(dbStoreQx(svc.postgres.reader), params)
 }
 
 export async function getNewOrganizationsTimeseries(
@@ -81,7 +81,7 @@ export async function getNewOrganizationsTimeseries(
 export async function getActiveOrganizationsTimeseries(
   params: IQueryTimeseriesParams,
 ): Promise<ITimeseriesDatapoint[]> {
-  return getTimeseriesOfActiveOrganizations(dbStoreQx(qdb), params)
+  return getTimeseriesOfActiveOrganizations(dbStoreQx(svc.postgres.reader), params)
 }
 
 export async function getActivitiesNumber(params: IQueryTimeseriesParams): Promise<number> {

services/libs/data-access-layer/src/organizations/organizations.ts

@@ -471,10 +471,9 @@ export async function getTimeseriesOfActiveOrganizations(
   const query = `
     SELECT
       COUNT_DISTINCT("organizationId") AS count,
-      DATE_TRUNC('day', timestamp)
-    FROM activities
-    WHERE "deletedAt" IS NULL
-      AND "organizationId" IS NOT NULL
+      DATE_TRUNC('day', timestamp) as date
+    FROM "activityRelations"
+    WHERE "organizationId" IS NOT NULL
       ${params.segmentIds ? 'AND "segmentId" IN ($(segmentIds:csv))' : ''}
       AND timestamp >= $(startDate)
       AND timestamp < $(endDate)