NPO-Accounting/conservancy_beancount Changeset - f76fa35fad2a

Changeset - f76fa35fad2a

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Brett Smith - 4 years ago 2020-06-11 14:46:06
brettcsmith@brettcsmith.org

reports: RelatedPostings.all_meta_links() returns an iterator.

This preserves order.

3 files changed with 21 insertions and 8 deletions:

conservancy_beancount/reports/accrual.py

conservancy_beancount/reports/core.py

tests/test_reports_related_postings.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/accrual.py

➞

Show inline comments

@@ ... / @@ -544,25 +544,25 @@ class OutgoingReport(BaseReport): @@
             requestor_name = (
                 rt_requestor.get('RealName')
                 or ticket.get('CF.{payment-to}')
                 or ''
+            )
             requestor = f'{requestor_name} <{rt_requestor["EmailAddress"]}>'.strip()
         balance_s = posts.end_balance.format(None)
         raw_balance = -posts.balance()
         if raw_balance != posts.end_balance:
             balance_s = f'{raw_balance} ({balance_s})'
         contract_links = posts.all_meta_links('contract')
+        contract_links = list(posts.all_meta_links('contract'))
         if contract_links:
             contract_s = ' , '.join(self.rt_wrapper.iter_urls(
                 contract_links, missing_fmt='<BROKEN RT LINK: {}>',
             ))
         else:
             contract_s = "NO CONTRACT GOVERNS THIS TRANSACTION"
         projects = [v for v in posts.meta_values('project')
                     if isinstance(v, str)]
         yield "PAYMENT FOR APPROVAL:"
         yield f"REQUESTOR: {requestor}"
         yield f"TOTAL TO PAY: {balance_s}"

conservancy_beancount/reports/core.py

➞

Show inline comments

@@ ... / @@ -29,24 +29,25 @@ import odf.element # type:ignore[import] @@
 import odf.number  # type:ignore[import]
 import odf.opendocument  # type:ignore[import]
 import odf.style  # type:ignore[import]
 import odf.table  # type:ignore[import]
 import odf.text  # type:ignore[import]
 from decimal import Decimal
 from pathlib import Path
 from beancount.core import amount as bc_amount
 from .. import data
 from .. import filters
 from typing import (
     cast,
     overload,
     Any,
     BinaryIO,
     Callable,
     DefaultDict,
     Dict,
     Generic,
     Iterable,
     Iterator,
@@ ... / @@ -284,32 +285,33 @@ class RelatedPostings(Sequence[data.Posting]): @@
     def __getitem__(self: RelatedType,
                     index: Union[int, slice],
     ) -> Union[data.Posting, RelatedType]:
         if isinstance(index, slice):
             return type(self)(self._postings[index], _can_own=True)
         else:
             return self._postings[index]
     def __len__(self) -> int:
         return len(self._postings)
     def all_meta_links(self, key: MetaKey) -> Set[str]:
         retval: Set[str] = set()
     def _all_meta_links(self, key: MetaKey) -> Iterator[str]:
         for post in self:
             try:
-                retval.update(post.meta.get_links(key))
+                yield from post.meta.get_links(key)
             except TypeError:
                 pass
         return retval
     def all_meta_links(self, key: MetaKey) -> Iterator[str]:
         return filters.iter_unique(self._all_meta_links(key))
     def iter_with_balance(self) -> Iterator[Tuple[data.Posting, Balance]]:
         balance = MutableBalance()
         for post in self:
             balance += post.units
             yield post, balance
     def balance(self) -> Balance:
         for _, balance in self.iter_with_balance():
             pass
         try:
             return balance

tests/test_reports_related_postings.py

➞

Show inline comments

@@ ... / @@ -247,50 +247,61 @@ def test_meta_values_many_types(): @@
     assert related.meta_values('key') == expected
 @pytest.mark.parametrize('count', range(3))
 def test_all_meta_links_zero(count):
     postings = (
         testutil.Posting('Income:Donations', -n, testkey=str(n))
         for n in range(count)
+    )
     related = core.RelatedPostings(
         post._replace(meta=data.Metadata(post.meta))
         for post in postings
+    )
-    assert related.all_meta_links('approval') == set()
+    assert next(related.all_meta_links('approval'), None) is None
 def test_all_meta_links_singletons():
     postings = (
         testutil.Posting('Income:Donations', -10, statement=value)
         for value in itertools.chain(
             testutil.NON_LINK_METADATA_STRINGS,
             testutil.LINK_METADATA_STRINGS,
             testutil.NON_STRING_METADATA_VALUES,
         ))
     related = core.RelatedPostings(
         post._replace(meta=data.Metadata(post.meta))
         for post in postings
+    )
     assert related.all_meta_links('statement') == testutil.LINK_METADATA_STRINGS
+    assert set(related.all_meta_links('statement')) == testutil.LINK_METADATA_STRINGS
 def test_all_meta_links_multiples():
     postings = (
         testutil.Posting('Income:Donations', -10, approval=' '.join(value))
         for value in itertools.permutations(testutil.LINK_METADATA_STRINGS, 2)
+    )
     related = core.RelatedPostings(
         post._replace(meta=data.Metadata(post.meta))
         for post in postings
+    )
     assert related.all_meta_links('approval') == testutil.LINK_METADATA_STRINGS
     assert set(related.all_meta_links('approval')) == testutil.LINK_METADATA_STRINGS
 def test_all_meta_links_preserves_order():
     postings = (
         testutil.Posting('Income:Donations', -10, approval=c)
         for c in '121323'
+    )
     related = core.RelatedPostings(
         post._replace(meta=data.Metadata(post.meta))
         for post in postings
+    )
     assert list(related.all_meta_links('approval')) == list('123')
 def test_group_by_meta_zero():
     assert not list(core.RelatedPostings.group_by_meta([], 'metacurrency'))
 def test_group_by_meta_one(credit_card_cycle):
     posting = next(post for post in data.Posting.from_entries(credit_card_cycle)
                    if post.account.is_credit_card())
     actual = core.RelatedPostings.group_by_meta([posting], 'metacurrency')
     assert set(key for key, _ in actual) == {'USD'}
 def test_group_by_meta_many(two_accruals_three_payments):
     postings = [post for post in data.Posting.from_entries(two_accruals_three_payments)

0 comments (0 inline, 0 general)