From d0d2d77a2e8bf14212007d3e098ad036daf6b3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Wed, 22 Mar 2023 00:09:06 +0800 Subject: [PATCH] Added the limitation so that essential accounts, like cash, and the accounts in use, cannot be deleted. --- src/accounting/account/views.py | 3 + src/accounting/models.py | 10 +++ .../templates/accounting/account/detail.html | 17 +++-- tests/test_account.py | 76 ++++++++++++++----- 4 files changed, 84 insertions(+), 22 deletions(-) diff --git a/src/accounting/account/views.py b/src/accounting/account/views.py index 6fae6ac..e7d2463 100644 --- a/src/accounting/account/views.py +++ b/src/accounting/account/views.py @@ -157,6 +157,9 @@ def delete_account(account: Account) -> redirect: :return: The redirection to the account list on success, or the account detail on error. """ + if not account.can_delete: + flash(s(lazy_gettext("The account cannot be deleted.")), "error") + return redirect(inherit_next(__get_detail_uri(account))) account.delete() sort_accounts_in(account.base_code, account.id) db.session.commit() diff --git a/src/accounting/models.py b/src/accounting/models.py index 4fd1236..7c8ddab 100644 --- a/src/accounting/models.py +++ b/src/accounting/models.py @@ -236,6 +236,16 @@ class Account(db.Model): return True return False + @property + def can_delete(self) -> bool: + """Returns whether the account can be deleted. + + :return: True if the account can be deleted, or False otherwise. + """ + if self.code in {"1111-001", "3351-001", "3353-001"}: + return False + return len(self.line_items) == 0 + def delete(self) -> None: """Deletes this account. diff --git a/src/accounting/templates/accounting/account/detail.html b/src/accounting/templates/accounting/account/detail.html index cf6be43..cd28b37 100644 --- a/src/accounting/templates/accounting/account/detail.html +++ b/src/accounting/templates/accounting/account/detail.html @@ -41,10 +41,17 @@ First written: 2023/1/31 {{ A_("Order") }} {% if accounting_can_edit() %} - + {% if obj.can_delete %} + + {% else %} + + {% endif %} {% endif %} @@ -56,7 +63,7 @@ First written: 2023/1/31 {% endif %} -{% if accounting_can_edit() %} +{% if accounting_can_edit() and obj.can_delete %}
{% if request.args.next %} diff --git a/tests/test_account.py b/tests/test_account.py index 6ccd1d7..9140434 100644 --- a/tests/test_account.py +++ b/tests/test_account.py @@ -18,7 +18,7 @@ """ import unittest -from datetime import timedelta +from datetime import timedelta, date import httpx import sqlalchemy as sa @@ -28,6 +28,7 @@ from flask.testing import FlaskCliRunner from test_site import db from testlib import create_test_app, get_client, set_locale +from testlib_journal_entry import add_journal_entry NEXT_URI: str = "/_next" """The next URI.""" @@ -55,6 +56,8 @@ class AccountData: cash: AccountData = AccountData("1111", 1, "Cash") """The cash account.""" +petty: AccountData = AccountData("1112", 1, "Bank") +"""The petty cash account.""" bank: AccountData = AccountData("1113", 1, "Bank") """The bank account.""" stock: AccountData = AccountData("1121", 1, "Stock") @@ -194,7 +197,7 @@ class AccountTestCase(unittest.TestCase): "title": f"{cash.title}-2"}) self.assertEqual(response.status_code, 403) - response = client.post(f"{PREFIX}/{cash.code}/delete", + response = client.post(f"{PREFIX}/{bank.code}/delete", data={"csrf_token": csrf_token}) self.assertEqual(response.status_code, 403) @@ -202,12 +205,12 @@ class AccountTestCase(unittest.TestCase): self.assertEqual(response.status_code, 403) with self.app.app_context(): - bank_id: int = Account.find_by_code(bank.code).id + cash_id: int = Account.find_by_code(cash.code).id - response = client.post(f"{PREFIX}/bases/{bank.base_code}", + response = client.post(f"{PREFIX}/bases/{cash.base_code}", data={"csrf_token": csrf_token, "next": NEXT_URI, - f"{bank_id}-no": "5"}) + f"{cash_id}-no": "5"}) self.assertEqual(response.status_code, 403) def test_viewer(self) -> None: @@ -243,7 +246,7 @@ class AccountTestCase(unittest.TestCase): "title": f"{cash.title}-2"}) self.assertEqual(response.status_code, 403) - response = client.post(f"{PREFIX}/{cash.code}/delete", + response = client.post(f"{PREFIX}/{bank.code}/delete", data={"csrf_token": csrf_token}) self.assertEqual(response.status_code, 403) @@ -251,12 +254,12 @@ class AccountTestCase(unittest.TestCase): self.assertEqual(response.status_code, 200) with self.app.app_context(): - bank_id: int = Account.find_by_code(bank.code).id + cash_id: int = Account.find_by_code(cash.code).id - response = client.post(f"{PREFIX}/bases/{bank.base_code}", + response = client.post(f"{PREFIX}/bases/{cash.base_code}", data={"csrf_token": csrf_token, "next": NEXT_URI, - f"{bank_id}-no": "5"}) + f"{cash_id}-no": "5"}) self.assertEqual(response.status_code, 403) def test_editor(self) -> None: @@ -294,7 +297,7 @@ class AccountTestCase(unittest.TestCase): self.assertEqual(response.status_code, 302) self.assertEqual(response.headers["Location"], f"{PREFIX}/{cash.code}") - response = self.client.post(f"{PREFIX}/{cash.code}/delete", + response = self.client.post(f"{PREFIX}/{bank.code}/delete", data={"csrf_token": self.csrf_token}) self.assertEqual(response.status_code, 302) self.assertEqual(response.headers["Location"], PREFIX) @@ -303,12 +306,12 @@ class AccountTestCase(unittest.TestCase): self.assertEqual(response.status_code, 200) with self.app.app_context(): - bank_id: int = Account.find_by_code(bank.code).id + cash_id: int = Account.find_by_code(cash.code).id - response = self.client.post(f"{PREFIX}/bases/{bank.base_code}", + response = self.client.post(f"{PREFIX}/bases/{cash.base_code}", data={"csrf_token": self.csrf_token, "next": NEXT_URI, - f"{bank_id}-no": "5"}) + f"{cash_id}-no": "5"}) self.assertEqual(response.status_code, 302) self.assertEqual(response.headers["Location"], NEXT_URI) @@ -640,15 +643,54 @@ class AccountTestCase(unittest.TestCase): :return: None. """ from accounting.models import Account - detail_uri: str = f"{PREFIX}/{cash.code}" - delete_uri: str = f"{PREFIX}/{cash.code}/delete" + detail_uri: str = f"{PREFIX}/{bank.code}" + delete_uri: str = f"{PREFIX}/{bank.code}/delete" list_uri: str = PREFIX response: httpx.Response + response = self.client.post(f"{PREFIX}/store", + data={"csrf_token": self.csrf_token, + "base_code": petty.base_code, + "title": petty.title}) + self.assertEqual(response.status_code, 302) + self.assertEqual(response.headers["Location"], + f"{PREFIX}/{petty.code}") + + response = self.client.post("/accounting/currencies/store", + data={"csrf_token": self.csrf_token, + "code": "USD", + "name": "US Dollars"}) + self.assertEqual(response.status_code, 302) + self.assertEqual(response.headers["Location"], + "/accounting/currencies/USD") + + add_journal_entry(self.client, + form={"csrf_token": self.csrf_token, + "next": NEXT_URI, + "date": date.today().isoformat(), + "currency-1-code": "USD", + "currency-1-credit-1-account_code": petty.code, + "currency-1-credit-1-amount": "20"}) + with self.app.app_context(): self.assertEqual({x.code for x in Account.query.all()}, - {cash.code, bank.code}) + {cash.code, petty.code, bank.code}) + # Cannot delete the cash account + response = self.client.post(f"{PREFIX}/{cash.code}/delete", + data={"csrf_token": self.csrf_token}) + self.assertEqual(response.status_code, 302) + self.assertEqual(response.headers["Location"], + f"{PREFIX}/{cash.code}") + + # Cannot delete the account that is in use + response = self.client.post(f"{PREFIX}/{petty.code}/delete", + data={"csrf_token": self.csrf_token}) + self.assertEqual(response.status_code, 302) + self.assertEqual(response.headers["Location"], + f"{PREFIX}/{petty.code}") + + # Success response = self.client.get(detail_uri) self.assertEqual(response.status_code, 200) response = self.client.post(delete_uri, @@ -658,7 +700,7 @@ class AccountTestCase(unittest.TestCase): with self.app.app_context(): self.assertEqual({x.code for x in Account.query.all()}, - {bank.code}) + {cash.code, petty.code}) response = self.client.get(detail_uri) self.assertEqual(response.status_code, 404)