From 6ee9bb07dae3960571860cff5a9e84f9f488e51d Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 2 Apr 2024 00:32:19 -0700
Subject: [PATCH] add funnel updates to relational query

---
 src/pages/api/reports/funnel.ts            | 3 ++-
 src/queries/analytics/reports/getFunnel.ts | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/api/reports/funnel.ts b/src/pages/api/reports/funnel.ts
index d2a6ae8c..35759a30 100644
--- a/src/pages/api/reports/funnel.ts
+++ b/src/pages/api/reports/funnel.ts
@@ -34,7 +34,8 @@ const schema = {
           value: yup.string().required(),
         }),
       )
-      .min(2),
+      .min(2)
+      .required(),
     window: yup.number().positive().required(),
     dateRange: yup
       .object()
diff --git a/src/queries/analytics/reports/getFunnel.ts b/src/queries/analytics/reports/getFunnel.ts
index 81333c6b..a7dfd542 100644
--- a/src/queries/analytics/reports/getFunnel.ts
+++ b/src/queries/analytics/reports/getFunnel.ts
@@ -82,7 +82,7 @@ async function relationalQuery(
             from website_event
             where website_id = {{websiteId::uuid}}
               and created_at between {{startDate}} and {{endDate}}
-              and ${column} ${operator} {param${i}:String}
+              and ${column} ${operator} {{${i}}}
           )`;
         } else {
           pv.levelQuery += `
@@ -96,7 +96,7 @@ async function relationalQuery(
                   `l.created_at `,
                   `${windowMinutes} minute`,
                 )}
-                and we.${column} ${operator} {param${i}:String}
+                and we.${column} ${operator} {{${i}}}
                 and we.created_at <= {{endDate}}
           )`;
         }