Merge branch 'api' into dev

src/queries/analytics/getActiveVisitors.ts

@@ -15,7 +15,7 @@ async function relationalQuery(websiteId: string) {
 
   const result = await rawQuery(
     `
-    select count(distinct session_id) x
+    select count(distinct session_id) as visitors
     from website_event
     where website_id = {{websiteId::uuid}}
     and created_at >= {{startDate}}
@@ -32,7 +32,7 @@ async function clickhouseQuery(websiteId: string): Promise<{ x: number }> {
   const result = await rawQuery(
     `
     select
-      count(distinct session_id) x
+      count(distinct session_id) as "visitors"
     from website_event
     where website_id = {websiteId:UUID}
       and created_at >= {startDate:DateTime64}

src/queries/analytics/getValues.ts

@@ -42,7 +42,7 @@ async function relationalQuery(
 
   return rawQuery(
     `
-    select ${column} as "value", count(*)
+    select ${column} as "value", count(*) as "count"
     from website_event
     inner join session
       on session.session_id = website_event.session_id
@@ -98,7 +98,7 @@ async function clickhouseQuery(
 
   return rawQuery(
     `
-    select ${column} as value, count(*)
+    select ${column} as "value", count(*) as "count"
     from website_event
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime64} and {endDate:DateTime64}

src/queries/analytics/pageviews/getPageviewMetrics.ts

@@ -5,7 +5,13 @@ import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
 
 export async function getPageviewMetrics(
-  ...args: [websiteId: string, type: string, filters: QueryFilters, limit?: number, offset?: number]
+  ...args: [
+    websiteId: string,
+    type: string,
+    filters: QueryFilters,
+    limit?: number | string,
+    offset?: number | string,
+  ]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -17,8 +23,8 @@ async function relationalQuery(
   websiteId: string,
   type: string,
   filters: QueryFilters,
-  limit: number = 500,
-  offset: number = 0,
+  limit: number | string = 500,
+  offset: number | string = 0,
 ) {
   const column = FILTER_COLUMNS[type] || type;
   const { rawQuery, parseFilters } = prisma;
@@ -80,8 +86,8 @@ async function clickhouseQuery(
   websiteId: string,
   type: string,
   filters: QueryFilters,
-  limit: number = 500,
-  offset: number = 0,
+  limit: number | string = 500,
+  offset: number | string = 0,
 ): Promise<{ x: string; y: number }[]> {
   const column = FILTER_COLUMNS[type] || type;
   const { rawQuery, parseFilters } = clickhouse;

src/queries/analytics/sessions/getSessionMetrics.ts

@@ -5,7 +5,13 @@ import prisma from 'lib/prisma';
 import { QueryFilters } from 'lib/types';
 
 export async function getSessionMetrics(
-  ...args: [websiteId: string, type: string, filters: QueryFilters, limit?: number, offset?: number]
+  ...args: [
+    websiteId: string,
+    type: string,
+    filters: QueryFilters,
+    limit?: number | string,
+    offset?: number | string,
+  ]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -17,8 +23,8 @@ async function relationalQuery(
   websiteId: string,
   type: string,
   filters: QueryFilters,
-  limit: number = 500,
-  offset: number = 0,
+  limit: number | string = 500,
+  offset: number | string = 0,
 ) {
   const column = FILTER_COLUMNS[type] || type;
   const { parseFilters, rawQuery } = prisma;
@@ -60,8 +66,8 @@ async function clickhouseQuery(
   websiteId: string,
   type: string,
   filters: QueryFilters,
-  limit: number = 500,
-  offset: number = 0,
+  limit: number | string = 500,
+  offset: number | string = 0,
 ): Promise<{ x: string; y: number }[]> {
   const column = FILTER_COLUMNS[type] || type;
   const { parseFilters, rawQuery } = clickhouse;

src/queries/index.ts

@@ -27,6 +27,7 @@ export * from './analytics/sessions/getSessionDataProperties';
 export * from './analytics/sessions/getSessionDataValues';
 export * from './analytics/sessions/getSessionMetrics';
 export * from './analytics/sessions/getWebsiteSessions';
+export * from './analytics/sessions/getWebsiteSessionStats';
 export * from './analytics/sessions/getWebsiteSessionsWeekly';
 export * from './analytics/sessions/getSessionActivity';
 export * from './analytics/sessions/getSessionStats';

src/queries/prisma/report.ts

@@ -19,11 +19,11 @@ export async function getReports(
   criteria: ReportFindManyArgs,
   pageParams: PageParams = {},
 ): Promise<PageResult<Report[]>> {
-  const { query } = pageParams;
+  const { search } = pageParams;
 
   const where: Prisma.ReportWhereInput = {
     ...criteria.where,
-    ...prisma.getSearchParameters(query, [
+    ...prisma.getSearchParameters(search, [
       { name: 'contains' },
       { description: 'contains' },
       { type: 'contains' },

src/queries/prisma/website.ts

@@ -30,11 +30,11 @@ export async function getWebsites(
   criteria: WebsiteFindManyArgs,
   pageParams: PageParams,
 ): Promise<PageResult<Website[]>> {
-  const { query } = pageParams;
+  const { search } = pageParams;
 
   const where: Prisma.WebsiteWhereInput = {
     ...criteria.where,
-    ...prisma.getSearchParameters(query, [
+    ...prisma.getSearchParameters(search, [
       {
         name: 'contains',
       },