clean up to marketbook/runnerbook when requesting orders

fixes #83
betcode-org · May 23, 2017 · 29a6c1d · 29a6c1d
1 parent 77becc8
commit 29a6c1d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/betfairlightweight/__init__.py b/betfairlightweight/__init__.py
@@ -6,7 +6,7 @@
 from . import filters
 
 __title__ = 'betfairlightweight'
-__version__ = '1.1.8'
+__version__ = '1.1.9'
 __author__ = 'Liam Pauling'
 
 # Set default logging handler to avoid "No handler found" warnings.

diff --git a/betfairlightweight/resources/bettingresources.py b/betfairlightweight/resources/bettingresources.py
@@ -313,7 +313,8 @@ class RunnerBookOrder(object):
     """
 
     def __init__(self, betId, avgPriceMatched, bspLiability, orderType, persistenceType, placedDate, price, side,
-                 sizeCancelled, sizeLapsed, sizeMatched, sizeRemaining, sizeVoided, status, size):
+                 sizeCancelled, sizeLapsed, sizeMatched, sizeRemaining, sizeVoided, status, size,
+                 customerStrategyRef=None, customerOrderRef=None):
         self.bet_id = betId
         self.avg_price_matched = avgPriceMatched
         self.bsp_liability = bspLiability
@@ -329,6 +330,8 @@ def __init__(self, betId, avgPriceMatched, bspLiability, orderType, persistenceT
         self.size_voided = sizeVoided
         self.status = status
         self.size = size
+        self.customer_strategy_ref = customerStrategyRef
+        self.customer_order_ref = customerOrderRef
 
 
 class RunnerBookMatch(object):
@@ -341,7 +344,7 @@ class RunnerBookMatch(object):
     :type size: float
     """
 
-    def __init__(self, betId, matchId, price, side, size, matchDate):
+    def __init__(self, price, side, size, betId=None, matchId=None, matchDate=None):
         self.bet_id = betId
         self.match_id = matchId
         self.price = price
@@ -366,7 +369,7 @@ class RunnerBook(object):
     """
 
     def __init__(self, selectionId, status, handicap, adjustmentFactor=None, lastPriceTraded=None, totalMatched=None,
-                 removalDate=None, sp=None, ex=None, orders=None, matches=None):
+                 removalDate=None, sp=None, ex=None, orders=None, matches=None, matchesByStrategy=None):
         self.selection_id = selectionId
         self.status = status
         self.total_matched = totalMatched
@@ -378,6 +381,7 @@ def __init__(self, selectionId, status, handicap, adjustmentFactor=None, lastPri
         self.ex = RunnerBookEX(**ex) if ex else None
         self.orders = [RunnerBookOrder(**i) for i in orders] if orders else []
         self.matches = [RunnerBookMatch(**i) for i in matches] if matches else []
+        self.matches_by_strategy = matchesByStrategy
 
     def __str__(self):
         return 'RunnerBook: %s' % self.selection_id