Made order_id more consistant and made models store their original data

sibblegp · sibblegp · Jan 5, 2014 · Jan 5, 2014 · Jan 5, 2014 · Jan 6, 2014
commit c847601b59a63d318377113838fd8f4900d0ae2a
diff --git a/coinbase/models/button.py b/coinbase/models/button.py
@@ -5,6 +5,7 @@
 class CoinbaseButton(object):

    def __init__(self, button):
+        self.data = button
        # Sometimes it's called code (create button) and sometimes id (sub item of create button)
        # so we map them together
        if 'id' in button:

diff --git a/coinbase/models/order.py b/coinbase/models/order.py
@@ -7,7 +7,9 @@

 class CoinbaseOrder(object):
    def __init__(self, order):
-        self.id = order['id']
+        self.data = order
+
+        self.order_id = order['id']
        # TODO: Account for timezone properly
        #self.created_at = datetime.strptime(order['created_at'], '%Y-%m-%dT%H:%M:%S-08:00')
        self.created_at = order['created_at']

diff --git a/coinbase/models/transaction.py b/coinbase/models/transaction.py
@@ -6,6 +6,7 @@
 class CoinbaseTransaction(object):

    def __init__(self, transaction):
+        self.data = transaction

        self.transaction_id = transaction['id']
        self.created_at = transaction.get('created_at', None)

diff --git a/coinbase/models/transfer.py b/coinbase/models/transfer.py
@@ -5,6 +5,8 @@
 class CoinbaseTransfer(object):

    def __init__(self, transfer):
+        self.data = transfer
+
        self.type = transfer['type']
        self.code = transfer['code']
        self.created_at = transfer['created_at']

diff --git a/coinbase/tests.py b/coinbase/tests.py
@@ -224,7 +224,7 @@ def test_creating_order(self):

        order = self.account.create_order("93865b9cae83706ae59220c013bc0afd")

-        this(order.id).should.equal("7RTTRDVP")
+        this(order.order_id).should.equal("7RTTRDVP")
        this(order.total_btc).should.equal(CoinbaseAmount(1, 'BTC'))

        this(order.button.button_id).should.equal("93865b9cae83706ae59220c013bc0afd")
@@ -239,7 +239,7 @@ def test_order_list(self):

        orders = self.account.orders()
        this(orders).should.be.an(list)
-        this(orders[0].id).should.equal("A7C52JQT")
+        this(orders[0].order_id).should.equal("A7C52JQT")

    @httprettified
    def test_getting_order(self):
@@ -250,7 +250,7 @@ def test_getting_order(self):

        order = self.account.get_order("A7C52JQT")

-        this(order.id).should.equal("A7C52JQT")
+        this(order.order_id).should.equal("A7C52JQT")
        this(order.status).should.equal("completed")
        this(order.total_btc).should.equal(CoinbaseAmount(Decimal(".1"), "BTC"))
        this(order.button.name).should.equal("test")