From b0c5899569148765eb1eb3cbb2c0453b9161903f Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 20 Mar 2023 11:26:45 -0700
Subject: [PATCH] update prisma / ch filters logic

---
 components/metrics/MetricsTable.js |  2 +-
 db/clickhouse/schema.sql           | 10 +++++-----
 lib/clickhouse.ts                  | 15 ++++++++++-----
 lib/prisma.ts                      | 15 ++++++++++-----
 pages/api/send.ts                  |  4 ++--
 pages/api/websites/[id]/metrics.ts | 27 +++++++++++++++++++++------
 6 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index 258ea1e8..945f7796 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -40,7 +40,7 @@ export default function MetricsTable({
 
   const { data, isLoading, isFetched, error } = useQuery(
     [
-      'websites:mnetrics',
+      'websites:metrics',
       { websiteId, type, modified, url, referrer, os, browser, device, country },
     ],
     () =>
diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
index eb59a295..c0a2f62d 100644
--- a/db/clickhouse/schema.sql
+++ b/db/clickhouse/schema.sql
@@ -85,11 +85,11 @@ SELECT website_id,
     subdivision1,
     subdivision2,
     city,
-    url_path String,
-    url_query String,
-    referrer_path String,
-    referrer_query String,
-    referrer_domain String,
+    url_path,
+    url_query,
+    referrer_path,
+    referrer_query,
+    referrer_domain,
     page_title,
     event_type,
     event_name,
diff --git a/lib/clickhouse.ts b/lib/clickhouse.ts
index a3030eeb..073a92e7 100644
--- a/lib/clickhouse.ts
+++ b/lib/clickhouse.ts
@@ -74,6 +74,9 @@ function getFilterQuery(filters = {}, params = {}) {
 
     switch (key) {
       case 'url':
+        arr.push(`and url_path = {${key}:String}`);
+        params[key] = filter;
+        break;
       case 'pageTitle':
       case 'os':
       case 'browser':
@@ -92,18 +95,20 @@ function getFilterQuery(filters = {}, params = {}) {
         break;
 
       case 'referrer':
-        arr.push(`and referrer ILIKE {${key}:String}`);
-        params[key] = `%${filter}`;
+        arr.push(`and referrer_domain= {${key}:String}`);
+        params[key] = filter;
         break;
 
       case 'domain':
-        arr.push(`and referrer NOT ILIKE {${key}:String}`);
-        arr.push(`and referrer NOT ILIKE '/%'`);
+        arr.push(`and referrer_domain NOT ILIKE {${key}:String}`);
+        arr.push(`and referrer_domain NOT ILIKE '/%'`);
         params[key] = `%://${filter}/%`;
         break;
 
       case 'query':
-        arr.push(`and url like '%?%'`);
+        arr.push(`and url_query= {${key}:String}`);
+        params[key] = filter;
+        break;
     }
 
     return arr;
diff --git a/lib/prisma.ts b/lib/prisma.ts
index 4461f044..20a5e4a6 100644
--- a/lib/prisma.ts
+++ b/lib/prisma.ts
@@ -74,6 +74,9 @@ function getFilterQuery(filters = {}, params = []): string {
 
     switch (key) {
       case 'url':
+        arr.push(`and url_path=$${params.length + 1}`);
+        params.push(decodeURIComponent(filter));
+        break;
       case 'os':
       case 'pageTitle':
       case 'browser':
@@ -92,18 +95,20 @@ function getFilterQuery(filters = {}, params = []): string {
         break;
 
       case 'referrer':
-        arr.push(`and referrer like $${params.length + 1}`);
-        params.push(`%${decodeURIComponent(filter)}%`);
+        arr.push(`and referrer_domain=$${params.length + 1}`);
+        params.push(decodeURIComponent(filter));
         break;
 
       case 'domain':
-        arr.push(`and referrer not like $${params.length + 1}`);
-        arr.push(`and referrer not like '/%'`);
+        arr.push(`and referrer_domain not like $${params.length + 1}`);
+        arr.push(`and referrer_domain not like '/%'`);
         params.push(`%://${filter}/%`);
         break;
 
       case 'query':
-        arr.push(`and url like '%?%'`);
+        arr.push(`and url_query=$${params.length + 1}`);
+        params.push(decodeURIComponent(filter));
+        break;
     }
 
     return arr;
diff --git a/pages/api/send.ts b/pages/api/send.ts
index abee3a9b..86632bf3 100644
--- a/pages/api/send.ts
+++ b/pages/api/send.ts
@@ -87,12 +87,12 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
   let referrerQuery;
   let referrerDomain;
 
-  if (referrer.substring(0, 4) === 'http') {
+  try {
     const newRef = new URL(referrer);
     referrerPath = newRef.pathname;
     referrerDomain = newRef.hostname;
     referrerQuery = newRef.search.substring(1);
-  } else {
+  } catch {
     referrerPath = referrer.split('?')[0];
     referrerQuery = referrer.split('?')[1];
   }
diff --git a/pages/api/websites/[id]/metrics.ts b/pages/api/websites/[id]/metrics.ts
index c547daee..ad57790e 100644
--- a/pages/api/websites/[id]/metrics.ts
+++ b/pages/api/websites/[id]/metrics.ts
@@ -6,7 +6,17 @@ import { NextApiResponse } from 'next';
 import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { getPageviewMetrics, getSessionMetrics, getWebsite } from 'queries';
 
-const sessionColumns = ['browser', 'os', 'device', 'screen', 'country', 'language'];
+const sessionColumns = [
+  'browser',
+  'os',
+  'device',
+  'screen',
+  'country',
+  'language',
+  'subdivision1',
+  'subdivision2',
+  'city',
+];
 const pageviewColumns = ['url', 'referrer', 'query', 'pageTitle'];
 
 function getTable(type) {
@@ -26,12 +36,17 @@ function getTable(type) {
 }
 
 function getColumn(type) {
-  if (type === 'event') {
-    return 'event_name';
-  }
-  if (type === 'query') {
-    return 'url';
+  switch (type) {
+    case 'url':
+      return 'url_path';
+    case 'referrer':
+      return 'referrer_domain';
+    case 'event':
+      return 'event_name';
+    case 'query':
+      return 'url_query';
   }
+
   return type;
 }