Check if financial accounts exist on dry-run.

Author: MarcoSteinacher

django/finance/accounting/book.py

@@ -72,6 +72,9 @@ def get_transaction(self, transaction_id):
     def delete_transaction(self, transaction_id):
         raise NotImplementedError
 
+    def account_exists(self, account: Account):
+        raise NotImplementedError
+
     def save(self):
         raise NotImplementedError
 
@@ -165,6 +168,10 @@ def delete_transaction(self, transaction_id):
         backend_id = self.get_backend_id(transaction_id)
         del self._db[backend_id]
 
+    def account_exists(self, account: Account):
+        # DummyBook accounts always exist
+        return True
+
     def save(self):
         for transaction in self._db.values():
             transaction["saved"] = True

django/finance/accounting/cashctrl.py

@@ -197,6 +197,8 @@ def get_cct_account(self, account_nbr):
 
         # Check cache first
         if account_nbr in self._account_cache:
+            if self._account_cache[account_nbr] is None:
+                raise KeyError(f"Account with number {account_nbr} not found in CashCtrl.")
             return self._account_cache[account_nbr]
 
         # Build filter as the CashCtrl REST API expects and URL-encode it
@@ -219,7 +221,8 @@ def get_cct_account(self, account_nbr):
                 return acct.get("id")
 
         # TODO Throw exception if account not found
-        raise ValueError(f"Account with number {account_nbr} not found in CashCtrl.")
+        self._account_cache[account_nbr] = None
+        raise KeyError(f"Account with number {account_nbr} not found in CashCtrl.")
 
     def get_cct_transaction(self, transaction_id):
         # Call _get_api_url + journal/read.json?id=[transaction_id] and fetch the transaction
@@ -322,6 +325,14 @@ def delete_transaction(self, transaction_id, autosave=True):
         if autosave:
             self.save()
 
+    def account_exists(self, account: Account):
+        self._open_book_transactional()
+        try:
+            self._book_transaction.get_cct_account(account)
+        except KeyError:
+            return False
+        return True
+
     def save(self):
         if not self._book_transaction:
             return False

django/finance/accounting/gnucash.py

@@ -68,6 +68,13 @@ def delete_transaction(self, transaction_id):
         self._book.delete(gnc_transaction)
         self.save()
 
+    def account_exists(self, account: Account):
+        try:
+            self._get_gnc_account(account)
+        except KeyError:
+            return False
+        return True
+
     def save(self):
         if not self._book:
             return False

django/finance/tests/test_accounting.py

@@ -315,6 +315,11 @@ def test_delete_transaction(self):
             self.assertEqual(book._save_transactions, False)
             self.assertEqual(book.delete_transaction("invalid"), None)
 
+    def test_account_exists(self):
+        DummyBook.dummy_db = {}
+        with AccountingManager() as book:
+            self.assertTrue(book.account_exists(Account("Test", "1000")))
+
     def test_save(self):
         DummyBook.dummy_db = {}
         with AccountingManager() as book:

django/finance/tests/test_accounting_cct.py

@@ -188,7 +188,9 @@ def fetch_account_responses(url, **kw):
                     },
                     status_code=200,
                 )
-            return Exception("Unknown account number in URL")
+            elif "123456789" in str(url):
+                # Simulate unknown account
+                return Mock(json=lambda: {"total": 0, "data": []}, status_code=200)
         return Mock(
             json=lambda: {
                 "success": False,
@@ -557,3 +559,13 @@ def test_process_api_error(self, mock_post, mock_get):
                     "Test error processing",
                     autosave=False,
                 )
+
+    @patch("finance.accounting.cashctrl.requests.get")
+    def test_account_exists(self, mock_get):
+        with AccountingManager() as book:
+            # configure fake responses
+            mock_get.return_value.raise_for_status.side_effect = None
+            mock_get.side_effect = self.fetch_account_responses
+
+            self.assertTrue(book.account_exists(self.account1))
+            self.assertFalse(book.account_exists(Account("Invalid", "123456789")))

django/finance/tests/test_accounting_gnc.py

@@ -93,3 +93,8 @@ def test_add_split_transaction_and_autosave(
                 Transaction(splits, date="2020-01-02", description="Split Transaction Test"),
             )
             mock_save.assert_called_once()
+
+    def test_account_exists(self):
+        with AccountingManager() as book:
+            self.assertTrue(book.account_exists(Account("Test", "1000")))
+            self.assertFalse(book.account_exists(Account("Test", "123456789")))

django/geno/billing.py

@@ -21,6 +21,7 @@
 ## For QR bill and svg -> pdf
 from qrbill import QRBill
 from reportlab.graphics import renderPDF
+from requests import HTTPError
 from stdnum.ch import esr
 from svglib.svglib import svg2rlg
 
@@ -98,9 +99,14 @@ def create_invoices(
     all_placeholder_invoices = []
     all_email_messages = []
 
-    with AccountingManager(messages) as book:
+    book_messages = []
+    with AccountingManager(book_messages) as book:
         if not book:
-            return messages
+            contracts = []  # Can't proceed without an accounting book
+            for msg in book_messages:
+                messages.append(
+                    CohivaAdminViewMixin.make_response_item(msg, variant=ResponseVariant.ERROR)
+                )
         for contract in contracts:
             ## Create monthly invoices starting from the reference date
             options = {
@@ -124,7 +130,7 @@ def create_invoices(
                 )
                 messages.append(
                     CohivaAdminViewMixin.make_response_item(
-                        _("VERARBEITUNG ABGEBROCHEN!"), variant=ResponseVariant.ERROR
+                        _("VERARBEITUNG ABGEBROCHEN!"), variant=ResponseVariant.WARNING
                     )
                 )
                 break
@@ -780,6 +786,20 @@ def add_invoice_obj(
         raise InvoiceCreationError(f"Invoice type {invoice_type} is not implemented.")
 
     if dry_run:
+        # Just check if the accounts exist
+        try:
+            if not book.account_exists(acc_debit):
+                raise InvoiceCreationError(
+                    _("Account {account} does not exist.").format(account=acc_debit)
+                )
+            if not book.account_exists(acc_credit):
+                raise InvoiceCreationError(
+                    _("Account {account} does not exist.").format(account=acc_credit)
+                )
+        except HTTPError as e:
+            raise InvoiceCreationError(
+                _("Can't access accounting backend: {error}").format(error=e)
+            )
         return None
 
     if transaction_id:

django/geno/tests/test_billing.py

@@ -98,8 +98,9 @@ def test_create_invoices_contract_without_address(self):
         contract.rental_units.set([self.rentalunits[3]])
         messages = geno.billing.create_invoices(reference_date=datetime.date(2001, 6, 1))
         self.assertIn("Vertrag hat keine Vertragspartner/Adresse", messages[0]["info"])
+        self.assertEqual(messages[0]["variant"], "error")
         self.assertEqual(messages[1]["info"], "VERARBEITUNG ABGEBROCHEN!")
-        self.assertEqual(messages[1]["variant"], "error")
+        self.assertEqual(messages[1]["variant"], "warning")
         self.assertEqual(messages[-1]["info"], "3 Rechnungen für 1 Vertrag")
 
     @patch("geno.billing.add_invoice", wraps=add_invoice_exception_generator)

django/geno/transaction_types.py

@@ -34,7 +34,7 @@ def get_manual_transaction_types():
         for year in range(now.year + 1, geno_settings.TRANSACTION_MEMBERFEE_STARTYEAR - 1, -1):
             transaction_types.append((f"fee{year}", f"Mitgliederbeitrag {year}"))
 
-    if settings.GENO_ID == "Warmbaechli":
+    if settings.GENO_ID == "Warmbaechli" or (settings.DEMO and settings.DEBUG):
         transaction_types.append(("entry_as", "Beitrittsgebühr+Anteilschein(e) (Post)"))
         transaction_types.append(("share_as", "Anteilscheine (Bank)"))
         transaction_types.append(

django/geno/views.py

@@ -3666,7 +3666,6 @@ def post(self, request, *args, **kwargs):
         form = self.get_form()
         formset = self.get_formset()
         if form.is_valid() and formset.is_valid():
-            print("Form valid")
             ret = self.process(form, formset)
             if isinstance(ret, FileResponse):
                 return ret
@@ -3839,7 +3838,6 @@ def process(self, form, formset):
                         "Bitte eingeben oder Betrag löschen.",
                     )
                     self.error_flag = True
-                    print("ERROR")
                     break
                 line["date"] = line["date"].strftime("%d.%m.%Y")
                 line["total"] = nformat(line["amount"])
@@ -3954,7 +3952,6 @@ def process(self, form, formset):
                     )
                     self.error_flag = True
             else:
-                print("Output")
                 pdf_file = open("/tmp/%s" % output_filename, "rb")
                 resp = FileResponse(pdf_file, content_type="application/pdf")
                 resp["Content-Disposition"] = "attachment; filename=%s" % output_filename
@@ -4021,7 +4018,7 @@ def get_item_count(self):
         """Extract invoice count from the results."""
         if self.result and len(self.result) > 0:
             last_section = self.result[-1]
-            if last_section.get("objects"):
+            if isinstance(last_section, dict) and last_section.get("objects"):
                 objects = last_section["objects"]
                 if objects and isinstance(objects[-1], str) and "Rechnungen" in objects[-1]:
                     invoice_count_text = objects[-1]