NPO-Accounting/conservancy_beancount Changeset - 1124842ea7e0

Changeset - 1124842ea7e0

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Brett Smith - 4 years ago 2020-06-11 20:29:18
brettcsmith@brettcsmith.org

accrual: Actually use RT caching as intended.

Basically none of the reports were reading or writing the RT link cache
because they didn't instantiate an rtutil.RT properly to do that.

3 files changed with 18 insertions and 18 deletions:

conservancy_beancount/reports/accrual.py

setup.py

tests/test_reports_accrual.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/accrual.py

➞

Show inline comments

@@ ... @@
         'Contract',
         'Purchase Order',
+    ]
     COL_COUNT = len(COLUMNS)
     def __init__(self,
-                 rt_client: rt.Rt,
+                 rt_wrapper: rtutil.RT,
                  date: datetime.date,
                  logger: logging.Logger,
     ) -> None:
         super().__init__()
         self.rt_client = rt_client
         self.rt_wrapper = rtutil.RT(self.rt_client)
         self.rt_wrapper = rt_wrapper
         self.date = date
         self.logger = logger
     def init_styles(self) -> None:
         super().init_styles()
         self.style_widecol = self.replace_child(
@@ ... @@
             self.multilink_cell(self._link_seq(row, 'purchase-order')),
+        )
 class AgingReport(BaseReport):
     def __init__(self,
-                 rt_client: rt.Rt,
+                 rt_wrapper: rtutil.RT,
                  out_file: BinaryIO,
                  date: Optional[datetime.date]=None,
     ) -> None:
         if date is None:
             date = datetime.date.today()
         self.out_bin = out_file
         self.logger = logger.getChild(type(self).__name__)
-        self.ods = AgingODS(rt_client, date, self.logger)
+        self.ods = AgingODS(rt_wrapper, date, self.logger)
     def run(self, groups: PostGroups) -> None:
         rows: List[AccrualPostings] = []
         for group in groups.values():
             if group.is_zero():
                 # Cheap optimization: don't slice and dice groups we're not
@@ ... / @@ -498,16 +497,16 @@ class BalanceReport(BaseReport): @@
             yield ""
         yield f"{posts.invoice}:"
         yield f"  {posts.balance_at_cost()} outstanding since {date_s}"
 class OutgoingReport(BaseReport):
-    def __init__(self, rt_client: rt.Rt, out_file: TextIO) -> None:
+    def __init__(self, rt_wrapper: rtutil.RT, out_file: TextIO) -> None:
         super().__init__(out_file)
         self.rt_client = rt_client
         self.rt_wrapper = rtutil.RT(rt_client)
         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):
@@ ... / @@ -718,29 +717,29 @@ def main(arglist: Optional[Sequence[str]]=None, @@
         } or groups
     del postings
     report: Optional[BaseReport] = None
     output_path: Optional[Path] = None
     if args.report_type is ReportType.AGING:
         rt_client = config.rt_client()
         if rt_client is None:
         rt_wrapper = config.rt_wrapper()
         if rt_wrapper is None:
             logger.error("unable to generate aging report: RT client is required")
         else:
             now = datetime.datetime.now()
             if args.output_file is None:
                 args.output_file = Path(now.strftime('AgingReport_%Y-%m-%d_%H:%M.ods'))
                 logger.info("Writing report to %s", args.output_file)
             out_bin = cliutil.bytes_output(args.output_file, stdout)
-            report = AgingReport(rt_client, out_bin)
+            report = AgingReport(rt_wrapper, out_bin)
     elif args.report_type is ReportType.OUTGOING:
         rt_client = config.rt_client()
         if rt_client is None:
         rt_wrapper = config.rt_wrapper()
         if rt_wrapper is None:
             logger.error("unable to generate outgoing report: RT client is required")
         else:
             out_file = cliutil.text_output(args.output_file, stdout)
-            report = OutgoingReport(rt_client, out_file)
+            report = OutgoingReport(rt_wrapper, out_file)
     else:
         out_file = cliutil.text_output(args.output_file, stdout)
         report = BalanceReport(out_file)
     if report is None:
         returncode |= ReturnFlag.REPORT_ERRORS

setup.py

➞

Show inline comments

@@ ... / @@ -2,13 +2,13 @@ @@
 from setuptools import setup
 setup(
     name='conservancy_beancount',
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.1.9',
+    version='1.1.10',
     author='Software Freedom Conservancy',
     author_email='info@sfconservancy.org',
     license='GNU AGPLv3+',
     install_requires=[
         'babel>=2.6',  # Debian:python3-babel

tests/test_reports_accrual.py

➞

Show inline comments

@@ ... / @@ -422,16 +422,17 @@ def check_output(output, expect_patterns): @@
     output.seek(0)
     testutil.check_lines_match(iter(output), expect_patterns)
 def run_outgoing(rt_id, postings, rt_client=None):
     if rt_client is None:
         rt_client = RTClient()
     rt_wrapper = rtutil.RT(rt_client)
     if not isinstance(postings, core.RelatedPostings):
         postings = accruals_by_meta(postings, rt_id, 'rt-id', wrap_type=accrual.AccrualPostings)
     output = io.StringIO()
-    report = accrual.OutgoingReport(rt_client, output)
+    report = accrual.OutgoingReport(rt_wrapper, output)
     report.run({rt_id: postings})
     return output
 @pytest.mark.parametrize('invoice,expected', [
     ('rt:505/5050', "Zero balance outstanding since 2010-05-05"),
     ('rt:510/5100', "Zero balance outstanding since 2010-05-10"),
@@ ... / @@ -522,14 +523,14 @@ def run_aging_report(postings, today=None): @@
     groups = {
         key: group
         for _, related in accrual.AccrualPostings.group_by_meta(postings, 'invoice')
         for key, group in related.make_consistent()
+    }
     output = io.BytesIO()
     rt_client = RTClient()
     report = accrual.AgingReport(rt_client, output, today)
     rt_wrapper = rtutil.RT(RTClient())
     report = accrual.AgingReport(rt_wrapper, output, today)
     report.run(groups)
     return output
 def test_aging_report(accrual_postings):
     output = run_aging_report(accrual_postings)
     check_aging_ods(output)

0 comments (0 inline, 0 general)