Changeset 12774 for main/waeup.ikoba

Timestamp:

16 Mar 2015, 12:27:21 (10 years ago)

Author:

uli

Message:

Store payment items in payments.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/payments

Files:

• payment.py (modified) (1 diff)
• tests/test_payment.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/payments/payment.py

@@ -186 +186 @@
     grok.provides(IPayment)
 
+    @property
+    def amount(self):
+        """Total amount.
+
+        Sum of all contained payment items.
+        """
+        amounts = [item.amount for item in self.payment_items]
+        return sum(amounts, decimal.Decimal("0.00"))
+
     def __init__(self, payer, payable, payee=None):
         super(Payment, self).__init__()
-        item_amounts = [decimal.Decimal("0.00"), ]
-        item_amounts += [item.amount for item in payable.payment_items]
-        self.amount = sum(item_amounts)
+        items = tuple([x for x in payable.payment_items])
+        self.payment_items = items
         self.payer_id = payer.payer_id
         self.payable_id = payable.payable_id

main/waeup.ikoba/trunk/src/waeup/ikoba/payments/tests/test_payment.py

@@ -61 +61 @@
 
     payable_id = u'id1'
-    items = (
-        (u'item 1', decimal.Decimal("1.00")),
-        (u'item 2', decimal.Decimal("2.12")),
-        )
 
     def __init__(self, payable_id=u'PAYABLE_01', title=u'title',
@@ -340 +336 @@
         self.assertEqual(p1.amount, decimal.Decimal("0.00"))
 
+    def test_amount_changed_after_init(self):
+        # amount is dynamic: changes to payment items are reflected
+        payable = FakePayable(payment_items=())
+        p1 = Payment(self.payer, payable)
+        assert p1.amount == decimal.Decimal("0.00")
+        p1.payment_items = (PaymentItem(amount=decimal.Decimal("5.55")), )
+        assert p1.amount == decimal.Decimal("5.55")
+        p1.payment_items = (
+            PaymentItem(amount=decimal.Decimal("5.55")),
+            PaymentItem(amount=decimal.Decimal("1.11")),
+            )
+        assert p1.amount == decimal.Decimal("6.66")
+
+    def test_payment_items(self):
+        # we can get payment items from a payment
+        payable = FakePayable(payment_items=FAKE_PAYMENT_ITEMS)
+        p1 = Payment(self.payer, payable)
+        assert isinstance(p1.payment_items, tuple)
+
+    def test_payment_items_number(self):
+        # payment item values are respected
+        payable = FakePayable()
+        item = PaymentItem(amount=decimal.Decimal("9.99"))
+        payable.payment_items = [item, ]
+        payment = Payment(self.payer, payable)
+        assert len(payment.payment_items) == 1
+        assert payment.payment_items[0] is item
+
 
 class PaymentItemTests(unittest.TestCase):