Merge branch 'main' into mulan/ct-783-new-analytics-clickevent-for-sltp

dydxprotocol · Apr 30, 2024 · 8b8260e · 8b8260e
2 parents d396798 + 0d50ae9
commit 8b8260e
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 318 deletions.
diff --git a/detekt-baseline.xml b/detekt-baseline.xml
diff --git a/detekt.yml b/detekt.yml
@@ -3,4 +3,20 @@ naming:
     # some of our package folders are structured /exchange.dydx.abacus instead of:
     # /exchange -> /dydx -> /abacus
     # didn't seem worth the potential thrash in PRs to fix (feel free to fix if you feel differently)
-    active: false
+    active: false
+
+complexity:
+  CognitiveComplexMethod:
+    active: false
+  ComplexCondition:
+    active: false
+  CyclomaticComplexMethod:
+    active: false
+  LongParameterList:
+    active: false
+  LargeClass:
+    threshold: 1000 # up from 600
+  LongMethod:
+    threshold: 100 # up from 60
+  TooManyFunctions:
+    active: false
diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/StateManagerAdaptor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/StateManagerAdaptor.kt
@@ -2333,7 +2333,11 @@ open class StateManagerAdaptor(
                     val interval = Clock.System.now().toEpochMilliseconds()
                         .toDouble() - placeOrderRecord.timestampInMilliseconds
                     tracking(
-                        if (placeOrderRecord.isTriggerOrder) AnalyticsEvent.TriggerPlaceOrderConfirmed.rawValue else AnalyticsEvent.TradePlaceOrderConfirmed.rawValue,
+                        if (placeOrderRecord.isTriggerOrder) {
+                            AnalyticsEvent.TriggerPlaceOrderConfirmed.rawValue
+                        } else {
+                            AnalyticsEvent.TradePlaceOrderConfirmed.rawValue
+                        },
                         ParsingHelper.merge(
                             trackingParams(interval),
                             orderAnalyticsPayload,
@@ -2349,7 +2353,11 @@ open class StateManagerAdaptor(
                     val interval = Clock.System.now().toEpochMilliseconds()
                         .toDouble() - cancelOrderRecord.timestampInMilliseconds
                     tracking(
-                        if (cancelOrderRecord.isTriggerOrder) AnalyticsEvent.TriggerCancelOrderConfirmed.rawValue else AnalyticsEvent.TradeCancelOrderConfirmed.rawValue,
+                        if (cancelOrderRecord.isTriggerOrder) {
+                            AnalyticsEvent.TriggerCancelOrderConfirmed.rawValue
+                        } else {
+                            AnalyticsEvent.TradeCancelOrderConfirmed.rawValue
+                        },
                         ParsingHelper.merge(
                             trackingParams(interval),
                             orderAnalyticsPayload,

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/V4StateManagerAdaptor.kt
@@ -1149,9 +1149,17 @@ class V4StateManagerAdaptor(
 
         tracking(
             if (isCancel) {
-                if (isTriggerOrder) AnalyticsEvent.TriggerCancelOrder.rawValue else AnalyticsEvent.TradeCancelOrder.rawValue
+                if (isTriggerOrder) {
+                    AnalyticsEvent.TriggerCancelOrder.rawValue
+                } else {
+                    AnalyticsEvent.TradeCancelOrder.rawValue
+                }
             } else {
-                if (isTriggerOrder) AnalyticsEvent.TriggerPlaceOrder.rawValue else AnalyticsEvent.TradePlaceOrder.rawValue
+                if (isTriggerOrder) {
+                    AnalyticsEvent.TriggerPlaceOrder.rawValue
+                } else {
+                    AnalyticsEvent.TradePlaceOrder.rawValue
+                }
             },
             ParsingHelper.merge(uiTrackingParams(uiDelayTimeMs), analyticsPayload)
                 ?.toIMap(),
@@ -1169,18 +1177,34 @@ class V4StateManagerAdaptor(
         if (error != null) {
             tracking(
                 if (isCancel) {
-                    if (isTriggerOrder) AnalyticsEvent.TriggerCancelOrderSubmissionFailed.rawValue else AnalyticsEvent.TradeCancelOrderSubmissionFailed.rawValue
+                    if (isTriggerOrder) {
+                        AnalyticsEvent.TriggerCancelOrderSubmissionFailed.rawValue
+                    } else {
+                        AnalyticsEvent.TradeCancelOrderSubmissionFailed.rawValue
+                    }
                 } else {
-                    if (isTriggerOrder) AnalyticsEvent.TriggerPlaceOrderSubmissionFailed.rawValue else AnalyticsEvent.TradePlaceOrderSubmissionFailed.rawValue
+                    if (isTriggerOrder) {
+                        AnalyticsEvent.TriggerPlaceOrderSubmissionFailed.rawValue
+                    } else {
+                        AnalyticsEvent.TradePlaceOrderSubmissionFailed.rawValue
+                    }
                 },
                 ParsingHelper.merge(errorTrackingParams(error), analyticsPayload)?.toIMap(),
             )
         } else {
             tracking(
                 if (isCancel) {
-                    if (isTriggerOrder) AnalyticsEvent.TriggerCancelOrderSubmissionConfirmed.rawValue else AnalyticsEvent.TradeCancelOrderSubmissionConfirmed.rawValue
+                    if (isTriggerOrder) {
+                        AnalyticsEvent.TriggerCancelOrderSubmissionConfirmed.rawValue
+                    } else {
+                        AnalyticsEvent.TradeCancelOrderSubmissionConfirmed.rawValue
+                    }
                 } else {
-                    if (isTriggerOrder) AnalyticsEvent.TriggerPlaceOrderSubmissionConfirmed.rawValue else AnalyticsEvent.TradePlaceOrderSubmissionConfirmed.rawValue
+                    if (isTriggerOrder) {
+                        AnalyticsEvent.TriggerPlaceOrderSubmissionConfirmed.rawValue
+                    } else {
+                        AnalyticsEvent.TradePlaceOrderSubmissionConfirmed.rawValue
+                    }
                 },
                 analyticsPayload,
             )
@@ -1234,7 +1258,15 @@ class V4StateManagerAdaptor(
                 cancelPayload,
                 existingOrder,
             )
-            submitCancelOrder(cancelPayload.orderId, marketId, callback, cancelPayload, cancelOrderAnalyticsPayload, uiClickTimeMs, true)
+            submitCancelOrder(
+                cancelPayload.orderId,
+                marketId,
+                callback,
+                cancelPayload,
+                cancelOrderAnalyticsPayload,
+                uiClickTimeMs,
+                true,
+            )
         }
 
         payload.placeOrderPayloads.forEach { placePayload ->

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/SubaccountSupervisor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/SubaccountSupervisor.kt
@@ -306,7 +306,11 @@ internal class SubaccountSupervisor(
                     val interval = Clock.System.now().toEpochMilliseconds()
                         .toDouble() - placeOrderRecord.timestampInMilliseconds
                     tracking(
-                        if (placeOrderRecord.isTriggerOrder) AnalyticsEvent.TriggerPlaceOrderConfirmed.rawValue else AnalyticsEvent.TradePlaceOrderConfirmed.rawValue,
+                        if (placeOrderRecord.isTriggerOrder) {
+                            AnalyticsEvent.TriggerPlaceOrderConfirmed.rawValue
+                        } else {
+                            AnalyticsEvent.TradePlaceOrderConfirmed.rawValue
+                        },
                         ParsingHelper.merge(
                             trackingParams(interval),
                             orderAnalyticsPayload,
@@ -322,7 +326,11 @@ internal class SubaccountSupervisor(
                     val interval = Clock.System.now().toEpochMilliseconds()
                         .toDouble() - cancelOrderRecord.timestampInMilliseconds
                     tracking(
-                        if (cancelOrderRecord.isTriggerOrder) AnalyticsEvent.TriggerCancelOrderConfirmed.rawValue else AnalyticsEvent.TradeCancelOrderConfirmed.rawValue,
+                        if (cancelOrderRecord.isTriggerOrder) {
+                            AnalyticsEvent.TriggerCancelOrderConfirmed.rawValue
+                        } else {
+                            AnalyticsEvent.TradeCancelOrderConfirmed.rawValue
+                        },
                         ParsingHelper.merge(
                             trackingParams(interval),
                             orderAnalyticsPayload,
@@ -659,9 +667,17 @@ internal class SubaccountSupervisor(
 
         tracking(
             if (isCancel) {
-                if (isTriggerOrder) AnalyticsEvent.TriggerCancelOrder.rawValue else AnalyticsEvent.TradeCancelOrder.rawValue
+                if (isTriggerOrder) {
+                    AnalyticsEvent.TriggerCancelOrder.rawValue
+                } else {
+                    AnalyticsEvent.TradeCancelOrder.rawValue
+                }
             } else {
-                if (isTriggerOrder) AnalyticsEvent.TriggerPlaceOrder.rawValue else AnalyticsEvent.TradePlaceOrder.rawValue
+                if (isTriggerOrder) {
+                    AnalyticsEvent.TriggerPlaceOrder.rawValue
+                } else {
+                    AnalyticsEvent.TradePlaceOrder.rawValue
+                }
             },
             ParsingHelper.merge(uiTrackingParams(uiDelayTimeMs), analyticsPayload)
                 ?.toIMap(),
@@ -679,18 +695,34 @@ internal class SubaccountSupervisor(
         if (error != null) {
             tracking(
                 if (isCancel) {
-                    if (isTriggerOrder) AnalyticsEvent.TriggerCancelOrderSubmissionFailed.rawValue else AnalyticsEvent.TradeCancelOrderSubmissionFailed.rawValue
+                    if (isTriggerOrder) {
+                        AnalyticsEvent.TriggerCancelOrderSubmissionFailed.rawValue
+                    } else {
+                        AnalyticsEvent.TradeCancelOrderSubmissionFailed.rawValue
+                    }
                 } else {
-                    if (isTriggerOrder) AnalyticsEvent.TriggerPlaceOrderSubmissionFailed.rawValue else AnalyticsEvent.TradePlaceOrderSubmissionFailed.rawValue
+                    if (isTriggerOrder) {
+                        AnalyticsEvent.TriggerPlaceOrderSubmissionFailed.rawValue
+                    } else {
+                        AnalyticsEvent.TradePlaceOrderSubmissionFailed.rawValue
+                    }
                 },
                 ParsingHelper.merge(errorTrackingParams(error), analyticsPayload)?.toIMap(),
             )
         } else {
             tracking(
                 if (isCancel) {
-                    if (isTriggerOrder) AnalyticsEvent.TriggerCancelOrderSubmissionConfirmed.rawValue else AnalyticsEvent.TradeCancelOrderSubmissionConfirmed.rawValue
+                    if (isTriggerOrder) {
+                        AnalyticsEvent.TriggerCancelOrderSubmissionConfirmed.rawValue
+                    } else {
+                        AnalyticsEvent.TradeCancelOrderSubmissionConfirmed.rawValue
+                    }
                 } else {
-                    if (isTriggerOrder) AnalyticsEvent.TriggerPlaceOrderSubmissionConfirmed.rawValue else AnalyticsEvent.TradePlaceOrderSubmissionConfirmed.rawValue
+                    if (isTriggerOrder) {
+                        AnalyticsEvent.TriggerPlaceOrderSubmissionConfirmed.rawValue
+                    } else {
+                        AnalyticsEvent.TradePlaceOrderSubmissionConfirmed.rawValue
+                    }
                 },
                 analyticsPayload,
             )
@@ -821,7 +853,15 @@ internal class SubaccountSupervisor(
                 cancelPayload,
                 existingOrder,
             )
-            submitCancelOrder(cancelPayload.orderId, marketId, callback, cancelPayload, cancelOrderAnalyticsPayload, uiClickTimeMs, true)
+            submitCancelOrder(
+                cancelPayload.orderId,
+                marketId,
+                callback,
+                cancelPayload,
+                cancelOrderAnalyticsPayload,
+                uiClickTimeMs,
+                true,
+            )
         }
 
         payload.placeOrderPayloads.forEach { placePayload ->

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/utils/AnalyticsUtils.kt b/src/commonMain/kotlin/exchange.dydx.abacus/utils/AnalyticsUtils.kt
@@ -7,10 +7,18 @@ import exchange.dydx.abacus.state.manager.HumanReadablePlaceOrderPayload
 import exchange.dydx.abacus.state.manager.HumanReadableTriggerOrdersPayload
 import kollections.toIMap
 
-enum class OrderAction(val rawValue: String) {
-    replace("REPLACE"),
-    cancel("CANCEL"),
-    create("CREATE"),
+@JsExport
+@Serializable
+enum class TriggerOrderAction(val rawValue: String) {
+    REPLACE("REPLACE"),
+    CANCEL("CANCEL"),
+    CREATE("CREATE"),
+    ;
+
+    companion object {
+        operator fun invoke(rawValue: String?) =
+            TriggerOrderAction.values().firstOrNull { it.rawValue == rawValue }
+    }
 }
 
 class AnalyticsUtils {
@@ -32,24 +40,32 @@ class AnalyticsUtils {
         val stopLossOrderTypes = listOf(OrderType.stopMarket, OrderType.stopLimit)
         val takeProfitOrderTypes = listOf(OrderType.takeProfitMarket, OrderType.takeProfitLimit)
 
-        var stopLossOrderAction: OrderAction? = null
-        var takeProfitOrderAction: OrderAction? = null
+        var stopLossOrderAction: TriggerOrderAction? = null
+        var takeProfitOrderAction: TriggerOrderAction? = null
 
         placeOrderPayloads.forEach { placePayload ->
             val orderType = OrderType.invoke(placePayload.type)
             if (stopLossOrderTypes.contains(orderType)) {
-                stopLossOrderAction = OrderAction.create
+                stopLossOrderAction = TriggerOrderAction.CREATE
             } else if (takeProfitOrderTypes.contains(orderType)) {
-                takeProfitOrderAction = OrderAction.create
+                takeProfitOrderAction = TriggerOrderAction.CREATE
             }
         }
 
         cancelOrderPayloads.forEach { cancelPayload ->
             val orderType = OrderType.invoke(cancelPayload.type)
             if (stopLossOrderTypes.contains(orderType)) {
-                stopLossOrderAction = if (stopLossOrderAction == null) OrderAction.cancel else OrderAction.replace
+                stopLossOrderAction = if (stopLossOrderAction == null) {
+                    TriggerOrderAction.CANCEL
+                } else {
+                    TriggerOrderAction.REPLACE
+                }
             } else if (takeProfitOrderTypes.contains(orderType)) {
-                takeProfitOrderAction = if (takeProfitOrderAction == null) OrderAction.cancel else OrderAction.replace
+                takeProfitOrderAction = if (takeProfitOrderAction == null) {
+                    TriggerOrderAction.CANCEL
+                } else {
+                    TriggerOrderAction.REPLACE
+                }
             }
         }