Initial Typescript models.

queries/analytics/stats/getActiveVisitors.ts

@@ -3,14 +3,14 @@ import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
 
-export async function getActiveVisitors(...args) {
+export async function getActiveVisitors(...args: [websiteId: string]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId) {
+async function relationalQuery(websiteId: string) {
   const date = subMinutes(new Date(), 5);
   const params = [date];
 
@@ -25,7 +25,7 @@ async function relationalQuery(websiteId) {
   );
 }
 
-async function clickhouseQuery(websiteId) {
+async function clickhouseQuery(websiteId: string) {
   const { rawQuery, getDateFormat } = clickhouse;
   const params = [websiteId];
 

queries/analytics/stats/getRealtimeData.js

@@ -1,30 +0,0 @@
-import { getPageviews } from '../pageview/getPageviews';
-import { getSessions } from '../session/getSessions';
-import { getEvents } from '../event/getEvents';
-
-export async function getRealtimeData(websites, time) {
-  const [pageviews, sessions, events] = await Promise.all([
-    getPageviews(websites, time),
-    getSessions(websites, time),
-    getEvents(websites, time),
-  ]);
-
-  return {
-    pageviews: pageviews.map(({ id, ...props }) => ({
-      __id: `p${id}`,
-      pageviewId: id,
-      ...props,
-    })),
-    sessions: sessions.map(({ id, ...props }) => ({
-      __id: `s${id}`,
-      sessionId: id,
-      ...props,
-    })),
-    events: events.map(({ id, ...props }) => ({
-      __id: `e${id}`,
-      eventId: id,
-      ...props,
-    })),
-    timestamp: Date.now(),
-  };
-}

queries/analytics/stats/getRealtimeData.ts

@@ -0,0 +1,3 @@
+export async function getRealtimeData() {
+  throw new Error('Not Implemented');
+}

queries/analytics/stats/getWebsiteStats.ts

@@ -3,22 +3,23 @@ import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
 import cache from 'lib/cache';
 
-export async function getWebsiteStats(...args) {
+export async function getWebsiteStats(
+  ...args: [websiteId: string, data: { startDate: Date; endDate: Date; filters: object }]
+) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {
+async function relationalQuery(
+  websiteId: string,
+  data: { startDate: Date; endDate: Date; filters: object },
+) {
+  const { startDate, endDate, filters = {} } = data;
   const { getDateQuery, getTimestampInterval, parseFilters, rawQuery } = prisma;
-  const params = [start_at, end_at];
-  const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
-    'pageview',
-    null,
-    filters,
-    params,
-  );
+  const params = [startDate, endDate];
+  const { filterQuery, joinSession } = parseFilters(filters, params);
 
   return rawQuery(
     `select sum(t.c) as "pageviews",
@@ -36,19 +37,22 @@ async function relationalQuery(websiteId, { start_at, end_at, filters = {} }) {
           ${joinSession}
         where website.website_id='${websiteId}'
           and pageview.created_at between $1 and $2
-          ${pageviewQuery}
-          ${sessionQuery}
+          ${filterQuery}
         group by 1, 2
      ) t`,
     params,
   );
 }
 
-async function clickhouseQuery(websiteId, { start_at, end_at, filters = {} }) {
+async function clickhouseQuery(
+  websiteId: string,
+  data: { startDate: Date; endDate: Date; filters: object },
+) {
+  const { startDate, endDate, filters = {} } = data;
   const { rawQuery, getDateQuery, getBetweenDates, parseFilters } = clickhouse;
   const website = await cache.fetchWebsite(websiteId);
   const params = [websiteId, website?.revId || 0];
-  const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);
+  const { filterQuery } = parseFilters(filters, params);
 
   return rawQuery(
     `select 
@@ -66,9 +70,8 @@ async function clickhouseQuery(websiteId, { start_at, end_at, filters = {} }) {
        where event_name = ''
          and website_id = $1
          and rev_id = $2
-         and ${getBetweenDates('created_at', start_at, end_at)}
-         ${pageviewQuery}
-         ${sessionQuery}
+         and ${getBetweenDates('created_at', startDate, endDate)}
+         ${filterQuery}
        group by session_id, time_series
      ) t;`,
     params,