feat: logging payment data filled (#269)

Co-authored-by: Pritish Budhiraja <[email protected]>
juspay · Apr 4, 2024 · e9d76ae · e9d76ae
1 parent e3509f0
commit e9d76ae
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 23 deletions.
diff --git a/src/Components/SavedMethods.res b/src/Components/SavedMethods.res
@@ -71,21 +71,38 @@ let make = (
   | _ => false
   }
   let empty = cvcNumber == ""
+  let (token, customerId) = paymentToken
+  let customerMethod =
+    savedMethods
+    ->Array.filter(savedMethod => {
+      savedMethod.paymentToken === token
+    })
+    ->Array.get(0)
+    ->Option.getOr(PaymentType.defaultCustomerMethods)
+  let isUnknownPaymentMethod = customerMethod.paymentMethod === ""
+  let isCardPaymentMethod = customerMethod.paymentMethod === "card"
+  let isCardPaymentMethodValid = !customerMethod.requiresCvv || (complete && !empty)
 
-  let submitCallback = React.useCallback((ev: Window.event) => {
-    let json = ev.data->JSON.parseExn
-    let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
-    let (token, customerId) = paymentToken
+  React.useEffect(() => {
     let customerMethod =
       savedMethods
       ->Array.filter(savedMethod => {
         savedMethod.paymentToken === token
       })
       ->Array.get(0)
       ->Option.getOr(PaymentType.defaultCustomerMethods)
-    let isUnknownPaymentMethod = customerMethod.paymentMethod === ""
-    let isCardPaymentMethod = customerMethod.paymentMethod === "card"
-    let isCardPaymentMethodValid = !customerMethod.requiresCvv || (complete && !empty)
+    let complete =
+      areRequiredFieldsValid &&
+      !isUnknownPaymentMethod &&
+      (!isCardPaymentMethod || isCardPaymentMethodValid)
+    let paymentType = customerMethod.paymentMethodType->Option.getOr(customerMethod.paymentMethod)
+    handlePostMessageEvents(~complete, ~empty, ~paymentType, ~loggerState, ~savedMethod=true)
+    None
+  }, (areRequiredFieldsValid, empty, customerMethod, isCardPaymentMethodValid))
+
+  let submitCallback = React.useCallback((ev: Window.event) => {
+    let json = ev.data->JSON.parseExn
+    let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
 
     let savedPaymentMethodBody = switch customerMethod.paymentMethod {
     | "card" =>
@@ -144,7 +161,7 @@ let make = (
         }
       }
     }
-  }, (areRequiredFieldsValid, requiredFieldsBody, empty, complete))
+  }, (areRequiredFieldsValid, requiredFieldsBody, empty, complete, customerMethod))
   useSubmitPaymentData(submitCallback)
 
   <div className="flex flex-col overflow-auto h-auto no-scrollbar animate-slowShow">

diff --git a/src/Payments/ApplePay.res b/src/Payments/ApplePay.res
@@ -273,6 +273,13 @@ let make = (
           let bodyDict = PaymentBody.applePayRedirectBody(~connectors)
           processPayment(bodyDict)
         }
+        let value = "Payment Data Filled: New Payment Method"
+        loggerState.setLogInfo(
+          ~value,
+          ~eventName=PAYMENT_DATA_FILLED,
+          ~paymentMethod="APPLE_PAY",
+          (),
+        )
       } else {
         setApplePayClicked(_ => false)
       }

diff --git a/src/Payments/GPay.res b/src/Payments/GPay.res
@@ -170,8 +170,9 @@ let make = (
           let bodyDict = PaymentBody.gpayRedirectBody(~connectors)
           processPayment(bodyDict)
         }
+        let value = "Payment Data Filled: New Payment Method"
         loggerState.setLogInfo(
-          ~value="",
+          ~value,
           ~eventName=PAYMENT_DATA_FILLED,
           ~paymentMethod="GOOGLE_PAY",
           (),

diff --git a/src/Utilities/Utils.res b/src/Utilities/Utils.res
@@ -659,14 +659,12 @@ let handlePostMessageEvents = (
   ~empty,
   ~paymentType,
   ~loggerState: OrcaPaymentPage.OrcaLogger.loggerMake,
+  ~savedMethod=false,
 ) => {
   if complete && paymentType !== "" {
-    loggerState.setLogInfo(
-      ~value="Payment Data Filled",
-      ~eventName=PAYMENT_DATA_FILLED,
-      ~paymentMethod=paymentType,
-      (),
-    )
+    let value =
+      "Payment Data Filled" ++ (savedMethod ? ": Saved Payment Method" : ": New Payment Method")
+    loggerState.setLogInfo(~value, ~eventName=PAYMENT_DATA_FILLED, ~paymentMethod=paymentType, ())
   }
   handlePostMessage([
     ("elementType", "payment"->JSON.Encode.string),

diff --git a/src/orca-loader/Elements.res b/src/orca-loader/Elements.res
@@ -537,12 +537,6 @@ let make = (
                               let msg =
                                 [("applePaySyncPayment", true->JSON.Encode.bool)]->Dict.fromArray
                               mountedIframeRef->Window.iframePostMessage(msg)
-                              logger.setLogInfo(
-                                ~value="",
-                                ~eventName=PAYMENT_DATA_FILLED,
-                                ~paymentMethod="APPLE_PAY",
-                                (),
-                              )
                               resolve()
                             })
                             ->catch(err => {

diff --git a/src/orca-log-catcher/OrcaLogger.res b/src/orca-log-catcher/OrcaLogger.res
@@ -497,9 +497,9 @@ let make = (
     switch timeOut.contents {
     | Some(val) => {
         clearTimeout(val)
-        timeOut := Some(setTimeout(() => sendLogs(), 120000))
+        timeOut := Some(setTimeout(() => sendLogs(), 20000))
       }
-    | None => timeOut := Some(setTimeout(() => sendLogs(), 120000))
+    | None => timeOut := Some(setTimeout(() => sendLogs(), 20000))
     }
     beaconApiCall(mainLogFile)
     let len = mainLogFile->Array.length
@@ -521,6 +521,8 @@ let make = (
       REDIRECTING_USER,
       DISPLAY_BANK_TRANSFER_INFO_PAGE,
       DISPLAY_QR_CODE_INFO_PAGE,
+      DISPLAY_VOUCHER,
+      LOADER_CHANGED,
       SESSIONS_CALL,
       RETRIEVE_CALL,
     ]