chore: new analytics bar file refactor (#1880)

juspay · Dec 9, 2024 · 71714a4 · 71714a4
1 parent 25c9d23
commit 71714a4
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 116 deletions.
diff --git a/src/container/NewAnalyticsContainer.res b/src/container/NewAnalyticsContainer.res
@@ -22,7 +22,6 @@ let make = () => {
         "YYYY-MM-DDTHH:mm:00[Z]",
       )
       let body = NewAnalyticsUtils.requestBody(
-        ~dimensions=[],
         ~startTime=date,
         ~endTime=date,
         ~metrics=[#sessionized_payment_processed_amount],

diff --git a/src/screens/NewAnalytics/NewAnalyticsUtils.res b/src/screens/NewAnalytics/NewAnalyticsUtils.res
@@ -42,23 +42,17 @@ let fillMissingDataPoints = (
 }
 
 open NewAnalyticsTypes
-
 let requestBody = (
-  ~dimensions as _: array<dimension>,
   ~startTime: string,
   ~endTime: string,
   ~metrics: array<metrics>,
   ~groupByNames: option<array<string>>=None,
-  ~filters as _: option<array<dimension>>=[]->Some,
-  ~customFilter as _: option<dimension>=None,
-  ~excludeFilterValue as _: option<array<status>>=None,
-  ~applyFilterFor as _: option<array<status>>=None,
+  ~filter: option<JSON.t>=None,
   ~delta: option<bool>=None,
   ~granularity: option<string>=None,
   ~distributionValues: option<JSON.t>=None,
 ) => {
   let metrics = metrics->Array.map(v => (v: metrics :> string))
-  let filter = Dict.make()->JSON.Encode.object->Some
 
   [
     AnalyticsUtils.getFilterRequestBody(
@@ -210,3 +204,78 @@ let getMetaDataValue = (~data, ~index, ~key) => {
   ->getDictFromJsonObject
   ->getFloat(key, 0.0)
 }
+
+let getBarGraphObj = (
+  ~array: array<JSON.t>,
+  ~key: string,
+  ~name: string,
+  ~color,
+): BarGraphTypes.dataObj => {
+  let data = array->Array.map(item => {
+    item->getDictFromJsonObject->getFloat(key, 0.0)
+  })
+  let dataObj: BarGraphTypes.dataObj = {
+    showInLegend: false,
+    name,
+    data,
+    color,
+  }
+  dataObj
+}
+
+let bargraphTooltipFormatter = (~title, ~metricType) => {
+  open BarGraphTypes
+
+  (
+    @this
+    (this: pointFormatter) => {
+      let title = `<div style="font-size: 16px; font-weight: bold;">${title}</div>`
+
+      let defaultValue = {color: "", x: "", y: 0.0, point: {index: 0}}
+      let primartPoint = this.points->getValueFromArray(0, defaultValue)
+
+      let getRowsHtml = (~iconColor, ~date, ~value, ~comparisionComponent="") => {
+        let valueString = valueFormatter(value, metricType)
+        `<div style="display: flex; align-items: center;">
+            <div style="width: 10px; height: 10px; background-color:${iconColor}; border-radius:3px;"></div>
+            <div style="margin-left: 8px;">${date}${comparisionComponent}</div>
+            <div style="flex: 1; text-align: right; font-weight: bold;margin-left: 25px;">${valueString}</div>
+        </div>`
+      }
+
+      let tableItems =
+        [
+          getRowsHtml(~iconColor=primartPoint.color, ~date=primartPoint.x, ~value=primartPoint.y),
+        ]->Array.joinWith("")
+
+      let content = `
+          <div style=" 
+          padding:5px 12px;
+          display:flex;
+          flex-direction:column;
+          justify-content: space-between;
+          gap: 7px;">
+              ${title}
+              <div style="
+                margin-top: 5px;
+                display:flex;
+                flex-direction:column;
+                gap: 7px;">
+                ${tableItems}
+              </div>
+        </div>`
+
+      `<div style="
+    padding: 10px;
+    width:fit-content;
+    border-radius: 7px;
+    background-color:#FFFFFF;
+    padding:10px;
+    box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2);
+    border: 1px solid #E5E5E5;
+    position:relative;">
+        ${content}
+    </div>`
+    }
+  )->asTooltipPointFormatter
+}
diff --git a/...s/NewAnalytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistribution.res b/...s/NewAnalytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistribution.res
@@ -104,15 +104,11 @@ let make = (
       )
 
       let body = NewAnalyticsUtils.requestBody(
-        ~dimensions=[],
         ~startTime=startTimeVal,
         ~endTime=endTimeVal,
         ~delta=entity.requestBodyConfig.delta,
-        ~filters=entity.requestBodyConfig.filters,
         ~metrics=entity.requestBodyConfig.metrics,
         ~groupByNames=[groupBy.value]->Some,
-        ~customFilter=entity.requestBodyConfig.customFilter,
-        ~applyFilterFor=entity.requestBodyConfig.applyFilterFor,
       )
 
       let response = await updateDetails(url, body, Post)

diff --git a/...Analytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistributionUtils.res b/...Analytics/PaymentAnalytics/FailedPaymentsDistribution/FailedPaymentsDistributionUtils.res
@@ -1,4 +1,3 @@
-open NewPaymentAnalyticsUtils
 open FailedPaymentsDistributionTypes
 open LogicUtils
 

diff --git a/src/screens/NewAnalytics/PaymentAnalytics/NewPaymentAnalyticsUtils.res b/src/screens/NewAnalytics/PaymentAnalytics/NewPaymentAnalyticsUtils.res
@@ -35,24 +35,6 @@ let getLineGraphObj = (
   dataObj
 }
 
-let getBarGraphObj = (
-  ~array: array<JSON.t>,
-  ~key: string,
-  ~name: string,
-  ~color,
-): BarGraphTypes.dataObj => {
-  let data = array->Array.map(item => {
-    item->getDictFromJsonObject->getFloat(key, 0.0)
-  })
-  let dataObj: BarGraphTypes.dataObj = {
-    showInLegend: false,
-    name,
-    data,
-    color,
-  }
-  dataObj
-}
-
 let getBarGraphData = (json: JSON.t, key: string, barColor: string): BarGraphTypes.data => {
   json
   ->getArrayFromJson([])
@@ -183,64 +165,6 @@ let tooltipFormatter = (
   )->asTooltipPointFormatter
 }
 
-let bargraphTooltipFormatter = (~title, ~metricType) => {
-  open BarGraphTypes
-  open NewAnalyticsUtils
-
-  (
-    @this
-    (this: pointFormatter) => {
-      let title = `<div style="font-size: 16px; font-weight: bold;">${title}</div>`
-
-      let defaultValue = {color: "", x: "", y: 0.0, point: {index: 0}}
-      let primartPoint = this.points->getValueFromArray(0, defaultValue)
-
-      let getRowsHtml = (~iconColor, ~date, ~value, ~comparisionComponent="") => {
-        let valueString = valueFormatter(value, metricType)
-        `<div style="display: flex; align-items: center;">
-            <div style="width: 10px; height: 10px; background-color:${iconColor}; border-radius:3px;"></div>
-            <div style="margin-left: 8px;">${date}${comparisionComponent}</div>
-            <div style="flex: 1; text-align: right; font-weight: bold;margin-left: 25px;">${valueString}</div>
-        </div>`
-      }
-
-      let tableItems =
-        [
-          getRowsHtml(~iconColor=primartPoint.color, ~date=primartPoint.x, ~value=primartPoint.y),
-        ]->Array.joinWith("")
-
-      let content = `
-          <div style=" 
-          padding:5px 12px;
-          display:flex;
-          flex-direction:column;
-          justify-content: space-between;
-          gap: 7px;">
-              ${title}
-              <div style="
-                margin-top: 5px;
-                display:flex;
-                flex-direction:column;
-                gap: 7px;">
-                ${tableItems}
-              </div>
-        </div>`
-
-      `<div style="
-    padding: 10px;
-    width:fit-content;
-    border-radius: 7px;
-    background-color:#FFFFFF;
-    padding:10px;
-    box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2);
-    border: 1px solid #E5E5E5;
-    position:relative;">
-        ${content}
-    </div>`
-    }
-  )->asTooltipPointFormatter
-}
-
 let getSmartRetryMetricType = isSmartRetryEnabled => {
   open NewAnalyticsTypes
   switch isSmartRetryEnabled {

diff --git a/...NewAnalytics/PaymentAnalytics/PaymentsOverviewSection/NewPaymentsOverviewSectionUtils.res b/...NewAnalytics/PaymentAnalytics/PaymentsOverviewSection/NewPaymentsOverviewSectionUtils.res
@@ -32,14 +32,10 @@ let defaultValue =
 let getPayload = (~entity, ~metrics, ~startTime, ~endTime) => {
   open NewAnalyticsTypes
   NewAnalyticsUtils.requestBody(
-    ~dimensions=[],
     ~startTime,
     ~endTime,
     ~delta=entity.requestBodyConfig.delta,
-    ~filters=entity.requestBodyConfig.filters,
     ~metrics,
-    ~customFilter=entity.requestBodyConfig.customFilter,
-    ~applyFilterFor=entity.requestBodyConfig.applyFilterFor,
   )
 }
 

diff --git a/src/screens/NewAnalytics/PaymentAnalytics/PaymentsProcessed/PaymentsProcessed.res b/src/screens/NewAnalytics/PaymentAnalytics/PaymentsProcessed/PaymentsProcessed.res
@@ -185,26 +185,18 @@ let make = (
       )
 
       let primaryBody = NewAnalyticsUtils.requestBody(
-        ~dimensions=[],
         ~startTime=startTimeVal,
         ~endTime=endTimeVal,
         ~delta=entity.requestBodyConfig.delta,
-        ~filters=entity.requestBodyConfig.filters,
         ~metrics=entity.requestBodyConfig.metrics,
-        ~customFilter=entity.requestBodyConfig.customFilter,
-        ~applyFilterFor=entity.requestBodyConfig.applyFilterFor,
         ~granularity=granularity.value->Some,
       )
 
       let secondaryBody = NewAnalyticsUtils.requestBody(
-        ~dimensions=[],
         ~startTime=compareToStartTime,
         ~endTime=compareToEndTime,
         ~delta=entity.requestBodyConfig.delta,
-        ~filters=entity.requestBodyConfig.filters,
         ~metrics=entity.requestBodyConfig.metrics,
-        ~customFilter=entity.requestBodyConfig.customFilter,
-        ~applyFilterFor=entity.requestBodyConfig.applyFilterFor,
         ~granularity=granularity.value->Some,
       )
 

diff --git a/src/screens/NewAnalytics/PaymentAnalytics/PaymentsSuccessRate/PaymentsSuccessRate.res b/src/screens/NewAnalytics/PaymentAnalytics/PaymentsSuccessRate/PaymentsSuccessRate.res
@@ -93,26 +93,18 @@ let make = (
       )
 
       let primaryBody = NewAnalyticsUtils.requestBody(
-        ~dimensions=[],
         ~startTime=startTimeVal,
         ~endTime=endTimeVal,
         ~delta=entity.requestBodyConfig.delta,
-        ~filters=entity.requestBodyConfig.filters,
         ~metrics=entity.requestBodyConfig.metrics,
-        ~customFilter=entity.requestBodyConfig.customFilter,
-        ~applyFilterFor=entity.requestBodyConfig.applyFilterFor,
         ~granularity=granularity.value->Some,
       )
 
       let secondaryBody = NewAnalyticsUtils.requestBody(
-        ~dimensions=[],
         ~startTime=compareToStartTime,
         ~endTime=compareToEndTime,
         ~delta=entity.requestBodyConfig.delta,
-        ~filters=entity.requestBodyConfig.filters,
         ~metrics=entity.requestBodyConfig.metrics,
-        ~customFilter=entity.requestBodyConfig.customFilter,
-        ~applyFilterFor=entity.requestBodyConfig.applyFilterFor,
         ~granularity=granularity.value->Some,
       )
 

diff --git a/...lytics/PaymentAnalytics/SuccessfulPaymentsDistribution/SuccessfulPaymentsDistribution.res b/...lytics/PaymentAnalytics/SuccessfulPaymentsDistribution/SuccessfulPaymentsDistribution.res
@@ -101,15 +101,11 @@ let make = (
       )
 
       let body = NewAnalyticsUtils.requestBody(
-        ~dimensions=[],
         ~startTime=startTimeVal,
         ~endTime=endTimeVal,
         ~delta=entity.requestBodyConfig.delta,
-        ~filters=entity.requestBodyConfig.filters,
         ~metrics=entity.requestBodyConfig.metrics,
         ~groupByNames=[groupBy.value]->Some,
-        ~customFilter=entity.requestBodyConfig.customFilter,
-        ~applyFilterFor=entity.requestBodyConfig.applyFilterFor,
       )
 
       let response = await updateDetails(url, body, Post)

diff --git a/...s/PaymentAnalytics/SuccessfulPaymentsDistribution/SuccessfulPaymentsDistributionUtils.res b/...s/PaymentAnalytics/SuccessfulPaymentsDistribution/SuccessfulPaymentsDistributionUtils.res
@@ -1,4 +1,3 @@
-open NewPaymentAnalyticsUtils
 open SuccessfulPaymentsDistributionTypes
 open LogicUtils
 

diff --git a/...Analytics/SmartRetryAnalytics/SmartRetryPaymentsProcessed/SmartRetryPaymentsProcessed.res b/...Analytics/SmartRetryAnalytics/SmartRetryPaymentsProcessed/SmartRetryPaymentsProcessed.res
@@ -163,7 +163,6 @@ let make = (
       )
 
       let primaryBody = NewAnalyticsUtils.requestBody(
-        ~dimensions=[],
         ~startTime=startTimeVal,
         ~endTime=endTimeVal,
         ~delta=entity.requestBodyConfig.delta,
@@ -172,7 +171,6 @@ let make = (
       )
 
       let secondaryBody = NewAnalyticsUtils.requestBody(
-        ~dimensions=[],
         ~startTime=compareToStartTime,
         ~endTime=compareToEndTime,
         ~delta=entity.requestBodyConfig.delta,