NPO-Accounting/conservancy_beancount Changeset - fd548f35f4b9

Changeset - fd548f35f4b9

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-06-23 20:46:31
brettcsmith@brettcsmith.org

accrual: Be case-insensitive when gathering payment-method.

This is a little nicer for the user, and lets us simplify surrounding
case-handling code.

2 files changed with 18 insertions and 15 deletions:

conservancy_beancount/reports/accrual.py

setup.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/accrual.py

➞

Show inline comments

@@ ... / @@ -461,52 +461,49 @@ class AgingReport(BaseReport): @@
 class BalanceReport(BaseReport):
     def _report(self, posts: AccrualPostings, index: int) -> Iterable[str]:
         posts = posts.since_last_nonzero()
         date_s = posts[0].meta.date.strftime('%Y-%m-%d')
         balance_s = posts.balance_at_cost().format(zero="Zero balance")
         if index:
             yield ""
         yield f"{posts.invoice}:"
         yield f"  {balance_s} outstanding since {date_s}"
 class OutgoingReport(BaseReport):
     PAYMENT_METHODS = {
         'ach': 'ACH',
         'check': 'Check',
         'creditcard': 'Credit Card',
         'debitcard': 'Debit Card',
         'fxwire': 'International Wire',
         'paypal': 'PayPal',
         'uswire': 'Domestic Wire',
         'vendorportal': 'Vendor Portal',
+    }
     PAYMENT_METHOD_RE = re.compile(
         rf'^([A-Z]{{3}})\s+({"|".join(PAYMENT_METHODS)})$',
         re.IGNORECASE,
+    )
     PAYMENT_METHOD_RE = re.compile(rf'^([a-z]{{3}})\s+({"|".join(PAYMENT_METHODS)})$')
     def __init__(self, rt_wrapper: rtutil.RT, out_file: TextIO) -> None:
         super().__init__(out_file)
         self.rt_wrapper = rt_wrapper
         self.rt_client = rt_wrapper.rt
     def _primary_rt_id(self, posts: AccrualPostings) -> rtutil.TicketAttachmentIds:
         rt_id = posts.rt_id
         if rt_id is None:
             raise ValueError("no rt-id links found")
         elif isinstance(rt_id, Sentinel):
             raise ValueError("multiple rt-id links found")
         parsed = rtutil.RT.parse(rt_id)
         if parsed is None:
             raise ValueError("rt-id is not a valid RT reference")
         else:
             return parsed
     def _report(self, posts: AccrualPostings, index: int) -> Iterable[str]:
         posts = posts.since_last_nonzero()
         try:
             ticket_id, _ = self._primary_rt_id(posts)
             ticket = self.rt_client.get_ticket(ticket_id)
             # Note we only use this when ticket is None.
@@ ... / @@ -558,71 +555,77 @@ class OutgoingReport(BaseReport): @@
         yield f"REQUESTOR: {requestor}"
         yield f"PAYMENT TO: {payment_to}"
         yield f"TOTAL TO PAY: {balance_s}"
         yield f"AGREEMENT: {contract_s}"
         yield f"PROJECT: {', '.join(projects)}"
         yield "\nBEANCOUNT ENTRIES:\n"
         last_txn: Optional[Transaction] = None
         for post in posts:
             txn = post.meta.txn
             if txn is not last_txn:
                 last_txn = txn
                 txn = self.rt_wrapper.txn_with_urls(txn, '{}')
                 # Suppress payment-method metadata from the report.
                 txn.meta.pop('payment-method', None)
                 for txn_post in txn.postings:
                     if txn_post.meta:
                         txn_post.meta.pop('payment-method', None)
                 yield bc_printer.format_entry(txn)
         cf_targets = {
             'payment-amount': payment_amount,
             'payment-to': payment_to,
+        }
         payment_methods = posts.meta_values('payment-method')
         payment_methods.discard(None)
         payment_method_count = len(payment_methods)
         if payment_method_count != 1:
         payment_methods = filters.iter_unique(
             post.meta['payment-method'].lower()
             for post in posts
             if isinstance(post.meta.get('payment-method'), str)
+        )
         payment_method: Optional[str] = next(payment_methods, None)
         if payment_method is None:
             payment_method_count = "no"
         elif next(payment_methods, None) is None:
             pass
         else:
             payment_method_count = "multiple"
             payment_method = None
         if payment_method is None:
             self.logger.warning(
                 "cannot set payment-method for rt:%s: %s metadata values found",
                 ticket_id, payment_method_count,
+            )
         else:
             payment_method = payment_methods.pop()
             if isinstance(payment_method, str):
                 match = self.PAYMENT_METHOD_RE.fullmatch(payment_method)
             else:
                 match = None
             match = self.PAYMENT_METHOD_RE.fullmatch(payment_method)
             if match is None:
                 self.logger.warning(
                     "cannot set payment-method for rt:%s: invalid value %r",
                     ticket_id, payment_method,
+                )
             else:
                 cf_targets['payment-method'] = '{} {}'.format(
                     match.group(1).upper(),
-                    self.PAYMENT_METHODS[match.group(2).lower()],
                     self.PAYMENT_METHODS[match.group(2)],
+                )
         cf_updates = {
             f'CF_{key}': value
             for key, value in cf_targets.items()
             if ticket.get(f'CF.{{{key}}}') != value
+        }
         if cf_updates:
             try:
                 ok = self.rt_client.edit_ticket(ticket_id, **cf_updates)
             except rt.RtError:
                 self.logger.debug("RT exception on edit_ticket", exc_info=True)
                 ok = False
             if not ok:
                 self.logger.warning("failed to set custom fields for rt:%s", ticket_id)
 class ReportType(enum.Enum):
     AGING = AgingReport
     BALANCE = BalanceReport
     OUTGOING = OutgoingReport
     AGE = AGING
     BAL = BALANCE
     OUT = OUTGOING

setup.py

➞

Show inline comments

 #!/usr/bin/env python3
 from setuptools import setup
 setup(
     name='conservancy_beancount',
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.4.0',
+    version='1.4.1',
     author='Software Freedom Conservancy',
     author_email='info@sfconservancy.org',
     license='GNU AGPLv3+',
     install_requires=[
         'babel>=2.6',  # Debian:python3-babel
         'beancount>=2.2',  # Debian:beancount
         # 1.4.1 crashes when trying to save some documents.
         'odfpy>=1.4.0,!=1.4.1',  # Debian:python3-odf
         'PyYAML>=3.0',  # Debian:python3-yaml
         'regex',  # Debian:python3-regex
         'rt>=2.0',
     ],
     setup_requires=[
         'pytest-mypy',
         'pytest-runner',  # Debian:python3-pytest-runner
     ],
     tests_require=[
         'mypy>=0.770',  # Debian:python3-mypy
         'pytest',  # Debian:python3-pytest
     ],
     packages=[
         'conservancy_beancount',

0 comments (0 inline, 0 general)