Dev (#1702)

* Initial Typescript models.

* Re-add realtime data

* get distinct sessions for session metrics

* Add queries for new schema.

* Fix Typo.

* Add some api/team endpoints.

* Fix destructure error.

* Fix getWebsites call.

* Ignore typescript build errors.

* Fix enum issue.

* add clickhouse route to deleteWebsite

* Fix Website auth.

* Updated lint-staged config.

* Add permission checks.

* Add user role api.

* Fix error when updating website.

* Fix isAdmin check.  Fix Schema.

* Initial conversion to react-basics.

* Remove user/team transfer from website update.

* delete website in relational query

* Fix login secure token creation.

* Add event type to event.

* Allow user to be added to team with role.

* Updated login form.

* Add Role to TeamUser.

* Add database migration.

* Refactored permissions check. Updated redis lib.

* Feat/um 114 roles and permissions (#1683)

* Auth checkpoint.

* Merge branch 'dev' into feat/um-114-roles-and-permissions

* Add 02 migration.

* Added lib/types.

* Updated schema.

* Updated roles and permissions logic.

* Implement react-basics styles. Fix queries.

* Update website details layout.

* Add 01 migration.

* Fix admin create.

* Update react-basics.

Co-authored-by: Francis Cao <franciscao@gmail.com>
Co-authored-by: Mike Cao <mike@mikecao.com>
Co-authored-by: Mike Cao <moocao@gmail.com>

queries/analytics/session/createSession.ts

@@ -2,11 +2,12 @@ import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import kafka from 'lib/kafka';
 import prisma from 'lib/prisma';
 import cache from 'lib/cache';
+import { Prisma } from '@prisma/client';
 
-export async function createSession(...args) {
+export async function createSession(args: Prisma.SessionCreateInput) {
   return runQuery({
-    [PRISMA]: () => relationalQuery(...args),
-    [CLICKHOUSE]: () => clickhouseQuery(...args),
+    [PRISMA]: () => relationalQuery(args),
+    [CLICKHOUSE]: () => clickhouseQuery(args),
   }).then(async data => {
     if (cache.enabled) {
       await cache.storeSession(data);
@@ -16,11 +17,21 @@ export async function createSession(...args) {
   });
 }
 
-async function relationalQuery(data) {
+async function relationalQuery(data: Prisma.SessionCreateInput) {
   return prisma.client.session.create({ data });
 }
 
-async function clickhouseQuery(data) {
+async function clickhouseQuery(data: {
+  id: string;
+  websiteId: string;
+  hostname?: string;
+  browser?: string;
+  os?: string;
+  device?: string;
+  screen?: string;
+  language?: string;
+  country?: string;
+}) {
   const { id, websiteId, hostname, browser, os, device, screen, language, country } = data;
   const { getDateFormat, sendMessage } = kafka;
   const website = await cache.fetchWebsite(websiteId);

queries/analytics/session/getSession.ts

@@ -1,21 +1,22 @@
 import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
+import { Prisma } from '@prisma/client';
 
-export async function getSession(...args) {
+export async function getSession(args: { id: string }) {
   return runQuery({
-    [PRISMA]: () => relationalQuery(...args),
-    [CLICKHOUSE]: () => clickhouseQuery(...args),
+    [PRISMA]: () => relationalQuery(args),
+    [CLICKHOUSE]: () => clickhouseQuery(args),
   });
 }
 
-async function relationalQuery(where) {
+async function relationalQuery(where: Prisma.SessionWhereUniqueInput) {
   return prisma.client.session.findUnique({
     where,
   });
 }
 
-async function clickhouseQuery({ id: sessionId }) {
+async function clickhouseQuery({ id: sessionId }: { id: string }) {
   const { rawQuery, findFirst } = clickhouse;
   const params = [sessionId];
 

queries/analytics/session/getSessionMetrics.ts

@@ -3,17 +3,26 @@ import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
 import cache from 'lib/cache';
 
-export async function getSessionMetrics(...args) {
+export async function getSessionMetrics(
+  ...args: [
+    websiteId: string,
+    data: { startDate: Date; endDate: Date; field: string; filters: object },
+  ]
+) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId, { startDate, endDate, field, filters = {} }) {
+async function relationalQuery(
+  websiteId: string,
+  data: { startDate: Date; endDate: Date; field: string; filters: object },
+) {
+  const { startDate, endDate, field, filters = {} } = data;
   const { parseFilters, rawQuery } = prisma;
   const params = [startDate, endDate];
-  const { pageviewQuery, sessionQuery, joinSession } = parseFilters(null, filters, params);
+  const { filterQuery, joinSession } = parseFilters(filters, params);
 
   return rawQuery(
     `select ${field} x, count(*) y
@@ -26,8 +35,7 @@ async function relationalQuery(websiteId, { startDate, endDate, field, filters =
         ${joinSession}
       where website.website_id='${websiteId}'
       and pageview.created_at between $1 and $2
-      ${pageviewQuery}
-      ${sessionQuery}
+      ${filterQuery}
     )
     group by 1
     order by 2 desc`,
@@ -35,21 +43,24 @@ async function relationalQuery(websiteId, { startDate, endDate, field, filters =
   );
 }
 
-async function clickhouseQuery(websiteId, { startDate, endDate, field, filters = {} }) {
+async function clickhouseQuery(
+  websiteId: string,
+  data: { startDate: Date; endDate: Date; field: string; filters: object },
+) {
+  const { startDate, endDate, field, filters = {} } = data;
   const { parseFilters, getBetweenDates, rawQuery } = 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 ${field} x, count(*) y
+    `select ${field} x, count(distinct session_id) y
     from event as x
     where website_id = $1
       and rev_id = $2
       and event_name = ''
       and ${getBetweenDates('created_at', startDate, endDate)}
-      ${pageviewQuery}
-      ${sessionQuery}
+      ${filterQuery}
     group by x
     order by y desc`,
     params,