NPO-Accounting/conservancy_beancount Changeset - 110e5038e103

Changeset - 110e5038e103

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-06-09 13:04:27
brettcsmith@brettcsmith.org

reports: Balance.__init__ better handles multiple amounts of same currency.

This is something that should've happened with 3d704e286
but I didn't think of it at the time.

2 files changed with 23 insertions and 1 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

@@ ... / @@ -61,66 +61,68 @@ from typing import ( @@
     TypeVar,
     Union,
+)
 from ..beancount_types import (
     MetaKey,
     MetaValue,
+)
 DecimalCompat = data.DecimalCompat
 BalanceType = TypeVar('BalanceType', bound='Balance')
 ElementType = Callable[..., odf.element.Element]
 LinkType = Union[str, Tuple[str, Optional[str]]]
 RelatedType = TypeVar('RelatedType', bound='RelatedPostings')
 RT = TypeVar('RT', bound=Sequence)
 ST = TypeVar('ST')
 T = TypeVar('T')
 class Balance(Mapping[str, data.Amount]):
     """A collection of amounts mapped by currency
     Each key is a Beancount currency string, and each value represents the
     balance in that currency.
     """
     __slots__ = ('_currency_map', 'tolerance')
     TOLERANCE = Decimal('0.01')
     def __init__(self,
                  source: Iterable[data.Amount]=(),
                  tolerance: Optional[Decimal]=None,
     ) -> None:
         if tolerance is None:
             tolerance = self.TOLERANCE
         self._currency_map = {amount.currency: amount for amount in source}
         self.tolerance = tolerance
         self._currency_map: Dict[str, data.Amount] = {}
         for amount in source:
             self._add_amount(self._currency_map, amount)
     def _add_amount(self,
                     currency_map: MutableMapping[str, data.Amount],
                     amount: data.Amount,
     ) -> None:
         code = amount.currency
         try:
             current_number = currency_map[code].number
         except KeyError:
             current_number = Decimal(0)
         currency_map[code] = data.Amount(current_number + amount.number, code)
     def _add_other(self,
                    currency_map: MutableMapping[str, data.Amount],
                    other: Union[data.Amount, 'Balance'],
     ) -> None:
         if isinstance(other, Balance):
             for amount in other.values():
                 self._add_amount(currency_map, amount)
         else:
             self._add_amount(currency_map, other)
     def __repr__(self) -> str:
         values = [repr(amt) for amt in self.values()]
         return f"{type(self).__name__}({values!r})"
     def __str__(self) -> str:
         return self.format()
     def __abs__(self: BalanceType) -> BalanceType:
         return type(self)(bc_amount.abs(amt) for amt in self.values())

tests/test_reports_balance.py

➞

Show inline comments

@@ ... / @@ -52,64 +52,84 @@ def test_empty_balance(): @@
     'JPY INR BRL',
 ])
 def test_zero_balance(currencies):
     keys = currencies.split()
     balance = core.Balance(testutil.Amount(0, key) for key in keys)
     assert balance
     assert len(balance) == len(keys)
     assert balance.is_zero()
     assert all(balance[key].number == 0 for key in keys)
     assert all(balance[key].currency == key for key in keys)
 @pytest.mark.parametrize('currencies', [
     'USD',
     'EUR GBP',
     'JPY INR BRL',
 ])
 def test_nonzero_balance(currencies):
     amounts = dict(zip(currencies.split(), itertools.count(110, 100)))
     balance = core.Balance(amounts_from_map(amounts))
     assert balance
     assert len(balance) == len(amounts)
     assert not balance.is_zero()
     assert all(balance[key] == testutil.Amount(amt, key) for key, amt in amounts.items())
 def test_mixed_balance():
     amounts = {'USD': 0, 'EUR': 120}
     balance = core.Balance(amounts_from_map(amounts))
     assert balance
     assert len(balance) == 2
     assert not balance.is_zero()
     assert all(balance[key] == testutil.Amount(amt, key) for key, amt in amounts.items())
 def test_init_recurring_currency():
     balance = core.Balance([
         testutil.Amount(20),
         testutil.Amount(40),
         testutil.Amount(60, 'EUR'),
         testutil.Amount(-80),
     ])
     assert balance
     assert balance['EUR'] == testutil.Amount(60, 'EUR')
     assert balance['USD'] == testutil.Amount(-20)
 def test_init_zeroed_out():
     balance = core.Balance([
         testutil.Amount(25),
         testutil.Amount(40, 'EUR'),
         testutil.Amount(-25),
         testutil.Amount(-40, 'EUR'),
     ])
     assert balance.is_zero()
 @pytest.mark.parametrize('mapping,expected', [
     ({}, True),
     ({'USD': 0}, True),
     ({'USD': 0, 'EUR': 0}, True),
     ({'USD': -10, 'EUR': 0}, False),
     ({'EUR': -10}, False),
     ({'USD': -10, 'EUR': -20}, False),
     ({'USD': 10, 'EUR': -20}, False),
     ({'JPY': 10}, False),
     ({'JPY': 10, 'BRL': 0}, False),
     ({'JPY': 10, 'BRL': 20}, False),
     ({'USD': '0.00015'}, True),
     ({'EUR': '-0.00052'}, True),
 ])
 def test_eq_zero(mapping, expected):
     balance = core.Balance(amounts_from_map(mapping))
     assert balance.eq_zero() == expected
     assert balance.is_zero() == expected
 @pytest.mark.parametrize('mapping,expected', [
     ({}, True),
     ({'USD': 0}, True),
     ({'USD': 0, 'EUR': 0}, True),
     ({'EUR': -10}, False),
     ({'USD': 10, 'EUR': -20}, False),
     ({'USD': -10, 'EUR': -20}, False),
     ({'JPY': 10}, True),
     ({'JPY': 10, 'BRL': 0}, True),
     ({'JPY': 10, 'BRL': 20}, True),
     ({'USD': '0.00015'}, True),
     ({'EUR': '-0.00052'}, True),
     ({'RUB': core.Balance.TOLERANCE}, True),

0 comments (0 inline, 0 general)