From f59378002ed11baf15bb9ab7f613ea9ddcb2be80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Thu, 9 Mar 2023 06:56:04 +0800 Subject: [PATCH] Removed the list_transactions view that is not used now. --- .../accounting/transaction/list.html | 96 ------------------- src/accounting/transaction/queries.py | 65 ------------- src/accounting/transaction/views.py | 16 ---- tests/test_transaction.py | 27 ------ 4 files changed, 204 deletions(-) delete mode 100644 src/accounting/templates/accounting/transaction/list.html delete mode 100644 src/accounting/transaction/queries.py diff --git a/src/accounting/templates/accounting/transaction/list.html b/src/accounting/templates/accounting/transaction/list.html deleted file mode 100644 index 3fb142c..0000000 --- a/src/accounting/templates/accounting/transaction/list.html +++ /dev/null @@ -1,96 +0,0 @@ -{# -The Mia! Accounting Flask Project -list.html: The transaction list - - Copyright (c) 2023 imacat. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -Author: imacat@mail.imacat.idv.tw (imacat) -First written: 2023/2/18 -#} -{% extends "accounting/base.html" %} - -{% block accounting_scripts %} - -{% endblock %} - -{% block header %}{% block title %}{% if request.args.q %}{{ A_("Search Result for \"%(query)s\"", query=request.args.q) }}{% else %}{{ A_("Transaction Management") }}{% endif %}{% endblock %}{% endblock %} - -{% block content %} - -
- {% if accounting_can_edit() %} -
- - -
- {% endif %} - -
- -
- -
- -{% include "accounting/include/add-txn-material-fab.html" %} - -{% if list %} - {% include "accounting/include/pagination.html" %} - -
- {% for item in list %} - - {{ item.date|accounting_format_date }} {{ item }} - - {% endfor %} -
-{% else %} -

{{ A_("There is no data.") }}

-{% endif %} - -{% endblock %} diff --git a/src/accounting/transaction/queries.py b/src/accounting/transaction/queries.py deleted file mode 100644 index 52f62ab..0000000 --- a/src/accounting/transaction/queries.py +++ /dev/null @@ -1,65 +0,0 @@ -# The Mia! Accounting Flask Project. -# Author: imacat@mail.imacat.idv.tw (imacat), 2023/2/18 - -# Copyright (c) 2023 imacat. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -"""The queries for the transaction management. - -""" -from datetime import datetime - -import sqlalchemy as sa -from flask import request - -from accounting.models import Transaction -from accounting.utils.query import parse_query_keywords - - -def get_transaction_query() -> list[Transaction]: - """Returns the transactions, optionally filtered by the query. - - :return: The transactions. - """ - keywords: list[str] = parse_query_keywords(request.args.get("q")) - if len(keywords) == 0: - return Transaction.query\ - .order_by(Transaction.date, Transaction.no).all() - conditions: list[sa.BinaryExpression] = [] - for k in keywords: - sub_conditions: list[sa.BinaryExpression] \ - = [Transaction.note.contains(k)] - date: datetime - try: - date = datetime.strptime(k, "%Y") - sub_conditions.append( - sa.extract("year", Transaction.date) == date.year) - except ValueError: - pass - try: - date = datetime.strptime(k, "%Y/%m") - sub_conditions.append(sa.and_( - sa.extract("year", Transaction.date) == date.year, - sa.extract("month", Transaction.date) == date.month)) - except ValueError: - pass - try: - date = datetime.strptime(f"2000/{k}", "%Y/%m/%d") - sub_conditions.append(sa.and_( - sa.extract("month", Transaction.date) == date.month, - sa.extract("day", Transaction.date) == date.day)) - except ValueError: - pass - conditions.append(sa.or_(*sub_conditions)) - return Transaction.query.filter(*conditions)\ - .order_by(Transaction.date, Transaction.no).all() diff --git a/src/accounting/transaction/views.py b/src/accounting/transaction/views.py index 11dfd7d..5159951 100644 --- a/src/accounting/transaction/views.py +++ b/src/accounting/transaction/views.py @@ -30,13 +30,11 @@ from accounting.locale import lazy_gettext from accounting.models import Transaction from accounting.utils.flash_errors import flash_form_errors from accounting.utils.next_uri import inherit_next, or_next -from accounting.utils.pagination import Pagination from accounting.utils.permission import has_permission, can_view, can_edit from accounting.utils.txn_types import TransactionType from accounting.utils.user import get_current_user_pk from .forms import sort_transactions_in, TransactionReorderForm from .operators import TransactionOperator, TXN_TYPE_TO_OP, get_txn_op -from .queries import get_transaction_query from .template_filters import with_type, to_transfer, format_amount_input, \ text2html @@ -49,20 +47,6 @@ bp.add_app_template_filter(format_amount_input, bp.add_app_template_filter(text2html, "accounting_txn_text2html") -@bp.get("", endpoint="list") -@has_permission(can_view) -def list_transactions() -> str: - """Lists the transactions. - - :return: The transaction list. - """ - transactions: list[Transaction] = get_transaction_query() - pagination: Pagination = Pagination[Transaction](transactions) - return render_template("accounting/transaction/list.html", - list=pagination.list, pagination=pagination, - txn_types=TransactionType) - - @bp.get("/create/", endpoint="create") @has_permission(can_edit) def show_add_transaction_form(txn_type: TransactionType) -> str: diff --git a/tests/test_transaction.py b/tests/test_transaction.py index 5e61c19..853a7d5 100644 --- a/tests/test_transaction.py +++ b/tests/test_transaction.py @@ -84,9 +84,6 @@ class CashIncomeTransactionTestCase(unittest.TestCase): update_form["csrf_token"] = csrf_token response: httpx.Response - response = client.get(PREFIX) - self.assertEqual(response.status_code, 403) - response = client.get(f"{PREFIX}/{txn_id}") self.assertEqual(response.status_code, 403) @@ -119,9 +116,6 @@ class CashIncomeTransactionTestCase(unittest.TestCase): update_form["csrf_token"] = csrf_token response: httpx.Response - response = client.get(PREFIX) - self.assertEqual(response.status_code, 200) - response = client.get(f"{PREFIX}/{txn_id}") self.assertEqual(response.status_code, 200) @@ -151,9 +145,6 @@ class CashIncomeTransactionTestCase(unittest.TestCase): update_form: dict[str, str] = self.__get_update_form(txn_id) response: httpx.Response - response = self.client.get(PREFIX) - self.assertEqual(response.status_code, 200) - response = self.client.get(f"{PREFIX}/{txn_id}") self.assertEqual(response.status_code, 200) @@ -645,9 +636,6 @@ class CashExpenseTransactionTestCase(unittest.TestCase): update_form["csrf_token"] = csrf_token response: httpx.Response - response = client.get(PREFIX) - self.assertEqual(response.status_code, 403) - response = client.get(f"{PREFIX}/{txn_id}") self.assertEqual(response.status_code, 403) @@ -680,9 +668,6 @@ class CashExpenseTransactionTestCase(unittest.TestCase): update_form["csrf_token"] = csrf_token response: httpx.Response - response = client.get(PREFIX) - self.assertEqual(response.status_code, 200) - response = client.get(f"{PREFIX}/{txn_id}") self.assertEqual(response.status_code, 200) @@ -712,9 +697,6 @@ class CashExpenseTransactionTestCase(unittest.TestCase): update_form: dict[str, str] = self.__get_update_form(txn_id) response: httpx.Response - response = self.client.get(PREFIX) - self.assertEqual(response.status_code, 200) - response = self.client.get(f"{PREFIX}/{txn_id}") self.assertEqual(response.status_code, 200) @@ -1213,9 +1195,6 @@ class TransferTransactionTestCase(unittest.TestCase): update_form["csrf_token"] = csrf_token response: httpx.Response - response = client.get(PREFIX) - self.assertEqual(response.status_code, 403) - response = client.get(f"{PREFIX}/{txn_id}") self.assertEqual(response.status_code, 403) @@ -1248,9 +1227,6 @@ class TransferTransactionTestCase(unittest.TestCase): update_form["csrf_token"] = csrf_token response: httpx.Response - response = client.get(PREFIX) - self.assertEqual(response.status_code, 200) - response = client.get(f"{PREFIX}/{txn_id}") self.assertEqual(response.status_code, 200) @@ -1280,9 +1256,6 @@ class TransferTransactionTestCase(unittest.TestCase): update_form: dict[str, str] = self.__get_update_form(txn_id) response: httpx.Response - response = self.client.get(PREFIX) - self.assertEqual(response.status_code, 200) - response = self.client.get(f"{PREFIX}/{txn_id}") self.assertEqual(response.status_code, 200)