fix analytic order inheritance

dxFeed · Oct 24, 2023 · 8e86bd7 · 8e86bd7
1 parent d1379d2
commit 8e86bd7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/DXFeedFramework/Events/Market/AnalyticOrder.swift b/DXFeedFramework/Events/Market/AnalyticOrder.swift
@@ -13,7 +13,7 @@ import Foundation
 /// that is available about orders on the market at any given moment of time.
 ///
 /// [For more details see](https://docs.dxfeed.com/dxfeed/api/com/dxfeed/event/market/AnalyticOrder.html)
-public class AnalyticOrder: OrderBase {
+public class AnalyticOrder: Order {
     public override var type: EventCode {
         return .analyticOrder
     }

diff --git a/DXFeedFramework/Native/Events/Markets/AnalyticOrder+Ext.swift b/DXFeedFramework/Native/Events/Markets/AnalyticOrder+Ext.swift
@@ -33,5 +33,7 @@ extension AnalyticOrder {
         self.icebergHiddenSize = native.iceberg_hidden_size
         self.icebergExecutedSize = native.iceberg_executed_size
         self.icebergFlags = native.iceberg_flags
+
+        self.marketMaker = native.order_base.market_maker != nil ? String(pointee: native.order_base.market_maker) : nil
     }
 }
diff --git a/DXFeedFramework/Native/Events/Markets/AnalyticOrderMapper.swift b/DXFeedFramework/Native/Events/Markets/AnalyticOrderMapper.swift
@@ -47,6 +47,12 @@ class AnalyticOrderMapper: Mapper {
         pointer.pointee.iceberg_executed_size = order.icebergExecutedSize
         pointer.pointee.iceberg_flags = order.icebergFlags
 
+        if let marketMaker = order.marketMaker {
+            pointer.pointee.order_base.market_maker = marketMaker.toCStringRef()
+        } else {
+            pointer.pointee.order_base.market_maker = nil
+        }
+
         let eventType = pointer.withMemoryRebound(to: dxfg_event_type_t.self, capacity: 1) { pointer in
             pointer.pointee.clazz = DXFG_EVENT_ANALYTIC_ORDER
             return pointer