feat: refactor if statements

umami-software · Nov 21, 2024 · d99b822 · d99b822
1 parent 5ca87dd
commit d99b822
Showing 1 changed file with 10 additions and 17 deletions.
diff --git a/src/queries/analytics/reports/getFunnel.ts b/src/queries/analytics/reports/getFunnel.ts
@@ -70,25 +70,18 @@ async function relationalQuery(
       (pv, cv, i) => {
         const levelNumber = i + 1;
         const startSum = i > 0 ? 'union ' : '';
-        const column = cv.type === 'url' ? 'url_path' : 'event_name';
+        const isURL = cv.type === 'url';
+        const column = isURL ? 'url_path' : 'event_name';
 
-        let operator: string;
-        let paramValue: string;
+        let operator = '=';
+        let paramValue = cv.value;
 
-        if (cv.type === 'url') {
-          if (cv.value.includes('*')) {
-            operator = '~';
-            paramValue = cv.value.replace(/\*/g, '.*');
-          } else if (cv.value.endsWith('*')) {
-            operator = 'like';
-            paramValue = cv.value.replace('*', '%');
-          } else {
-            operator = '=';
-            paramValue = cv.value;
-          }
-        } else {
-          operator = '=';
-          paramValue = cv.value;
+        if (isURL && cv.value.includes('*')) {
+          operator = '~';
+          paramValue = cv.value.replace(/\*/g, '.*');
+        } else if (isURL && cv.value.endsWith('*')) {
+          operator = 'like';
+          paramValue = cv.value.replace('*', '%');
         }
 
         if (levelNumber === 1) {