From d6ee8ee86966a03429bcb136f0d14d7730da5f58 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Fri, 3 Nov 2023 15:48:25 -0700
Subject: [PATCH] Revert "rename url filter to url_path"

This reverts commit 92f32ce7faa59e4420473009608fd817a1f48868.
---
 src/lib/constants.ts                     | 2 +-
 src/lib/types.ts                         | 2 +-
 src/pages/api/websites/[id]/events.ts    | 8 ++++----
 src/pages/api/websites/[id]/metrics.ts   | 8 ++++----
 src/pages/api/websites/[id]/pageviews.ts | 8 ++++----
 src/pages/api/websites/[id]/stats.ts     | 8 ++++----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index ca9cc5b0..4c468c1c 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -45,7 +45,7 @@ export const SESSION_COLUMNS = [
 ];
 
 export const FILTER_COLUMNS = {
-  url_path: 'url_path',
+  url: 'url_path',
   referrer: 'referrer_domain',
   title: 'page_title',
   query: 'url_query',
diff --git a/src/lib/types.ts b/src/lib/types.ts
index c3d07b52..98fbc29b 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -189,7 +189,7 @@ export interface QueryFilters {
   timezone?: string;
   unit?: string;
   eventType?: number;
-  url_path?: string;
+  url?: string;
   referrer?: string;
   title?: string;
   query?: string;
diff --git a/src/pages/api/websites/[id]/events.ts b/src/pages/api/websites/[id]/events.ts
index 98b92d31..05a651ab 100644
--- a/src/pages/api/websites/[id]/events.ts
+++ b/src/pages/api/websites/[id]/events.ts
@@ -14,7 +14,7 @@ export interface WebsiteEventsRequestQuery {
   endAt: string;
   unit?: string;
   timezone?: string;
-  url_path: string;
+  url: string;
 }
 
 const schema = {
@@ -24,7 +24,7 @@ const schema = {
     endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
     unit: UnitTypeTest,
     timezone: TimezoneTest,
-    url_path: yup.string(),
+    url: yup.string(),
   }),
 };
 
@@ -36,7 +36,7 @@ export default async (
   await useAuth(req, res);
   await useValidate(schema, req, res);
 
-  const { id: websiteId, timezone, url_path } = req.query;
+  const { id: websiteId, timezone, url } = req.query;
   const { startDate, endDate, unit } = await parseDateRangeQuery(req);
 
   if (req.method === 'GET') {
@@ -49,7 +49,7 @@ export default async (
       endDate,
       timezone,
       unit,
-      url_path,
+      url,
     });
 
     return ok(res, events);
diff --git a/src/pages/api/websites/[id]/metrics.ts b/src/pages/api/websites/[id]/metrics.ts
index cf3ef06a..56b0b066 100644
--- a/src/pages/api/websites/[id]/metrics.ts
+++ b/src/pages/api/websites/[id]/metrics.ts
@@ -13,7 +13,7 @@ export interface WebsiteMetricsRequestQuery {
   type: string;
   startAt: number;
   endAt: number;
-  url_path?: string;
+  url?: string;
   referrer?: string;
   title?: string;
   query?: string;
@@ -33,7 +33,7 @@ const schema = {
     type: yup.string().required(),
     startAt: yup.number().required(),
     endAt: yup.number().required(),
-    url_path: yup.string(),
+    url: yup.string(),
     referrer: yup.string(),
     title: yup.string(),
     query: yup.string(),
@@ -59,7 +59,7 @@ export default async (
   const {
     id: websiteId,
     type,
-    url_path,
+    url,
     referrer,
     title,
     query,
@@ -83,7 +83,7 @@ export default async (
     const filters = {
       startDate,
       endDate,
-      url_path,
+      url,
       referrer,
       title,
       query,
diff --git a/src/pages/api/websites/[id]/pageviews.ts b/src/pages/api/websites/[id]/pageviews.ts
index 428913a5..7356c504 100644
--- a/src/pages/api/websites/[id]/pageviews.ts
+++ b/src/pages/api/websites/[id]/pageviews.ts
@@ -12,7 +12,7 @@ export interface WebsitePageviewRequestQuery {
   endAt: number;
   unit?: string;
   timezone?: string;
-  url_path?: string;
+  url?: string;
   referrer?: string;
   title?: string;
   os?: string;
@@ -32,7 +32,7 @@ const schema = {
     endAt: yup.number().required(),
     unit: UnitTypeTest,
     timezone: TimezoneTest,
-    url_path: yup.string(),
+    url: yup.string(),
     referrer: yup.string(),
     title: yup.string(),
     os: yup.string(),
@@ -55,7 +55,7 @@ export default async (
   const {
     id: websiteId,
     timezone,
-    url_path,
+    url,
     referrer,
     title,
     os,
@@ -78,7 +78,7 @@ export default async (
       endDate,
       timezone,
       unit,
-      url_path,
+      url,
       referrer,
       title,
       os,
diff --git a/src/pages/api/websites/[id]/stats.ts b/src/pages/api/websites/[id]/stats.ts
index 094e860d..4e8d2a88 100644
--- a/src/pages/api/websites/[id]/stats.ts
+++ b/src/pages/api/websites/[id]/stats.ts
@@ -11,7 +11,7 @@ export interface WebsiteStatsRequestQuery {
   id: string;
   startAt: number;
   endAt: number;
-  url_path?: string;
+  url?: string;
   referrer?: string;
   title?: string;
   query?: string;
@@ -30,7 +30,7 @@ const schema = {
     id: yup.string().uuid().required(),
     startAt: yup.number().required(),
     endAt: yup.number().required(),
-    url_path: yup.string(),
+    url: yup.string(),
     referrer: yup.string(),
     title: yup.string(),
     query: yup.string(),
@@ -54,7 +54,7 @@ export default async (
 
   const {
     id: websiteId,
-    url_path,
+    url,
     referrer,
     title,
     query,
@@ -78,7 +78,7 @@ export default async (
     const prevEndDate = subMinutes(endDate, diff);
 
     const filters = {
-      url_path,
+      url,
       referrer,
       title,
       query,