NPO-Accounting/conservancy_beancount Changeset - b2e35d098aa3

Changeset - b2e35d098aa3

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-06-15 14:16:34
brettcsmith@brettcsmith.org

reports: Add Balance subtraction methods.

2 files changed with 45 insertions and 0 deletions:

conservancy_beancount/reports/core.py

tests/test_reports_balance.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/core.py

➞

Show inline comments

@@ ... / @@ -130,12 +130,15 @@ class Balance(Mapping[str, data.Amount]): @@
     def __add__(self: BalanceType, other: Union[data.Amount, 'Balance']) -> BalanceType:
         retval_map = self._currency_map.copy()
         self._add_other(retval_map, other)
         return type(self)(retval_map.values())
     def __sub__(self: BalanceType, other: Union[data.Amount, 'Balance']) -> BalanceType:
         return self.__add__(-other)
     def __eq__(self, other: Any) -> bool:
         if isinstance(other, Balance):
             clean_self = self.clean_copy()
             clean_other = other.clean_copy()
             return len(clean_self) == len(clean_other) and all(
                 clean_self[key] == clean_other.get(key) for key in clean_self
@@ ... / @@ -225,12 +228,16 @@ class MutableBalance(Balance): @@
     __slots__ = ()
     def __iadd__(self: BalanceType, other: Union[data.Amount, Balance]) -> BalanceType:
         self._add_other(self._currency_map, other)
         return self
     def __isub__(self: BalanceType, other: Union[data.Amount, Balance]) -> BalanceType:
         self._add_other(self._currency_map, -other)
         return self
 class RelatedPostings(Sequence[data.Posting]):
     """Collect and query related postings
     This class provides common functionality for collecting related postings
     and running queries on them: iterating over them, tallying their balance,

tests/test_reports_balance.py

➞

Show inline comments

@@ ... / @@ -267,12 +267,50 @@ def test_iadd_amount(number, currency): @@
         assert balance['USD'] == testutil.Amount(500 + number)
     else:
         assert len(balance) == 2
         assert balance['USD'] == testutil.Amount(500)
         assert balance[currency] == add_amount
 @pytest.mark.parametrize('number,currency', {
     (50, 'USD'),
     (-50, 'USD'),
     (50000, 'BRL'),
     (-4000, 'BRL'),
 })
 def test_sub_amount(number, currency):
     start_amount = testutil.Amount(500, 'USD')
     start_bal = core.Balance([start_amount])
     sub_amount = testutil.Amount(number, currency)
     actual = start_bal - sub_amount
     if currency == 'USD':
         assert len(actual) == 1
         assert actual['USD'] == testutil.Amount(500 - number)
     else:
         assert len(actual) == 2
         assert actual['USD'] == start_amount
         assert actual[currency] == -sub_amount
     assert start_bal == {'USD': start_amount}
 @pytest.mark.parametrize('number,currency', {
     (50, 'USD'),
     (-50, 'USD'),
     (50000, 'BRL'),
     (-4000, 'BRL'),
 })
 def test_isub_amount(number, currency):
     balance = core.MutableBalance([testutil.Amount(500, 'USD')])
     sub_amount = testutil.Amount(number, currency)
     balance -= sub_amount
     if currency == 'USD':
         assert len(balance) == 1
         assert balance['USD'] == testutil.Amount(500 - number)
     else:
         assert len(balance) == 2
         assert balance['USD'] == testutil.Amount(500)
         assert balance[currency] == -sub_amount
 @pytest.mark.parametrize('mapping', [
     {},
     {'USD': 0},
     {'EUR': 10},
     {'JPY': 20, 'BRL': 30},
     {'EUR': -15},

0 comments (0 inline, 0 general)