Merge remote-tracking branch 'refs/remotes/origin/shared-code' into s…

…hared-code
juspay · Oct 4, 2024 · e01cd34 · e01cd34
2 parents a110012 + baaef9d
commit e01cd34
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 29 deletions.
diff --git a/shared-code/Utils/LogUtils.res b/shared-code/Utils/LogUtils.res
@@ -0,0 +1,45 @@
+type apiLogType = Request | Response | NoResponse | Err | Method
+
+let getApiLogValues = (
+  apiLogType: apiLogType,
+  url,
+  statusCode,
+  data,
+  ~paymentMethod=?,
+  ~result=?,
+) => {
+  switch apiLogType {
+  | Request => ([("url", url->JSON.Encode.string)], [])
+  | Response => (
+      [("url", url->JSON.Encode.string), ("statusCode", statusCode->JSON.Encode.string)],
+      [("response", data)],
+    )
+  | NoResponse => (
+      [
+        ("url", url->JSON.Encode.string),
+        ("statusCode", "504"->JSON.Encode.string),
+        ("response", data),
+      ],
+      [("response", data)],
+    )
+  | Err => (
+      [
+        ("url", url->JSON.Encode.string),
+        ("statusCode", statusCode->JSON.Encode.string),
+        ("response", data),
+      ],
+      [("response", data)],
+    )
+  | Method => {
+      let methodValue = switch paymentMethod {
+      | Some(method) => method->JSON.Encode.string
+      | None => ""->JSON.Encode.string
+      }
+      let resultValue = switch result {
+      | Some(res) => res
+      | None => Dict.make()->JSON.Encode.object
+      }
+      ([("method", methodValue)], [("result", resultValue)])
+    }
+  }
+}
diff --git a/src/Utilities/LoggerUtils.res b/src/Utilities/LoggerUtils.res
@@ -2,7 +2,7 @@ let logApi = (
   ~eventName,
   ~statusCode="",
   ~data: JSON.t=Dict.make()->JSON.Encode.object,
-  ~apiLogType: OrcaLogger.apiLogType,
+  ~apiLogType: LogUtils.apiLogType,
   ~url="",
   ~paymentMethod="",
   ~result: JSON.t=Dict.make()->JSON.Encode.object,
@@ -11,30 +11,8 @@ let logApi = (
   ~logCategory: OrcaLogger.logCategory=API,
   ~isPaymentSession: bool=false,
 ) => {
-  let (value, internalMetadata) = switch apiLogType {
-  | Request => ([("url", url->JSON.Encode.string)], [])
-  | Response => (
-      [("url", url->JSON.Encode.string), ("statusCode", statusCode->JSON.Encode.string)],
-      [("response", data)],
-    )
-  | NoResponse => (
-      [
-        ("url", url->JSON.Encode.string),
-        ("statusCode", "504"->JSON.Encode.string),
-        ("response", data),
-      ],
-      [("response", data)],
-    )
-  | Err => (
-      [
-        ("url", url->JSON.Encode.string),
-        ("statusCode", statusCode->JSON.Encode.string),
-        ("response", data),
-      ],
-      [("response", data)],
-    )
-  | Method => ([("method", paymentMethod->JSON.Encode.string)], [("result", result)])
-  }
+  let (value, internalMetadata) = LogUtils.getApiLogValues(apiLogType, url, statusCode, data)
+
   switch optLogger {
   | Some(logger) =>
     logger.setLogApi(

diff --git a/src/orca-log-catcher/OrcaLogger.res b/src/orca-log-catcher/OrcaLogger.res
@@ -1,4 +1,4 @@
-type apiLogType = Request | Response | NoResponse | Method | Err
+// type apiLogType = Request | Response | NoResponse | Method | Err
 type logType = DEBUG | INFO | ERROR | WARNING | SILENT
 type logCategory = API | USER_ERROR | USER_EVENT | MERCHANT_EVENT
 
@@ -240,7 +240,7 @@ type loggerMake = {
     ~logType: logType=?,
     ~logCategory: logCategory=?,
     ~paymentMethod: string=?,
-    ~apiLogType: apiLogType=?,
+    ~apiLogType: LogUtils.apiLogType=?,
     ~isPaymentSession: bool=?,
   ) => unit,
   setLogInitiated: unit => unit,
@@ -641,7 +641,7 @@ let make = (
     }
   }
 
-  let calculateLatencyHook = (~eventName, ~apiLogType=Method) => {
+  let calculateLatencyHook = (~eventName, ~apiLogType=LogUtils.Method) => {
     let currentTimestamp = Date.now()
     let latency = switch eventName {
     | PAYMENT_ATTEMPT => {
@@ -798,7 +798,7 @@ let make = (
     ~logType=INFO,
     ~logCategory=API,
     ~paymentMethod="",
-    ~apiLogType=Request,
+    ~apiLogType=LogUtils.Request,
     ~isPaymentSession=false,
   ) => {
     let eventNameStr = eventName->eventNameToStrMapper