monopyly 1.5.2__py3-none-any.whl → 1.6.1__py3-none-any.whl

monopyly/core/blueprint.py

@@ -9,3 +9,5 @@ bp = Blueprint("core", __name__)
 
 # Import routes after defining blueprint to avoid circular imports
 from . import context_processors, errors, filters, routes
+
+__all__ = ["context_processors", "errors", "filters", "routes"]

monopyly/core/context_processors.py

@@ -2,8 +2,7 @@
 Filters defined for the application.
 """
 
-from datetime import date
-from importlib import import_module
+from dry_foundation.utils import define_basic_template_global_variables
 
 from .actions import determine_summary_balance_svg_viewbox_width
 from .blueprint import bp
@@ -11,13 +10,8 @@ from .blueprint import bp
 
 @bp.app_context_processor
 def inject_global_template_variables():
-    """Inject template variablees globally into the template context."""
-    template_globals = {
-        "app_version": _display_version(),
-        "copyright_statement": f"© {date.today().year}",
-        "date_today": date.today(),
-    }
-    return template_globals
+    """Inject template variables globally into the template context."""
+    return define_basic_template_global_variables("monopyly._version")
 
 
 @bp.app_context_processor
@@ -27,15 +21,3 @@ def inject_utility_functions():
         "calculate_summary_balance_width": determine_summary_balance_svg_viewbox_width,
     }
     return utility_functions
-
-
-def _display_version():
-    """Show the version (without commit information)."""
-    try:
-        version = import_module("monopyly._version").version
-    except ModuleNotFoundError:
-        # Fallback action in case Hatch VCS fails
-        display_version = ""
-    else:
-        display_version = version.split("+")[0]
-    return display_version

monopyly/core/filters.py

@@ -2,8 +2,6 @@
 Filters defined for the application.
 """
 
-from math import floor, log10
-
 from .blueprint import bp
 
 

monopyly/core/routes.py

@@ -74,7 +74,7 @@ def story():
 
 
 @bp.route("/credits")
-def credits():
+def application_credits():
     return render_template("core/credits.html")
 
 

monopyly/credit/actions.py

@@ -94,9 +94,8 @@ def get_potential_preceding_card(card):
                 card_ids=(other_card.id,),
             )
             latest_statement = statements.first()
-            if latest_statement:
-                if latest_statement.balance > 0:
-                    return other_card
+            if latest_statement and latest_statement.balance > 0:
+                return other_card
     # Card does not meet all of these conditions
     return None
 
@@ -110,8 +109,8 @@ def transfer_credit_card_statement(form, card_id, prior_card_id):
         statements = CreditStatementHandler.get_statements(card_ids=(prior_card_id,))
         latest_statement = statements.first()
         CreditStatementHandler.update_entry(latest_statement.id, card_id=card_id)
-        # Deactivate the old card
-        prior_card = CreditCardHandler.get_entry(prior_card_id)
+        # Deactivate the old card (after ensuring it exists and is accessible)
+        CreditCardHandler.get_entry(prior_card_id)
         CreditCardHandler.update_entry(prior_card_id, active=0)
 
 

monopyly/credit/blueprint.py

@@ -9,3 +9,5 @@ bp = Blueprint("credit", __name__, url_prefix="/credit")
 
 # Import routes after defining blueprint to avoid circular imports
 from . import routes
+
+__all__ = ["routes"]

monopyly/credit/cards.py

@@ -137,7 +137,7 @@ def save_card(form, card_id=None):
 
     Parameters
     ----------
-    form : flask_wtf.FlaskForm
+    form : CreditCardForm
         The form beign used to provide the data being saved.
     card_id : int
         The ID of hte card to be saved. If provided, the named card will

monopyly/credit/forms.py

@@ -2,25 +2,23 @@
 Generate credit card forms for the user to complete.
 """
 
-from werkzeug.exceptions import abort
+from flask import abort
 from wtforms.fields import (
     BooleanField,
+    DateField,
     FieldList,
     FormField,
     IntegerField,
     RadioField,
-    StringField,
     SubmitField,
 )
 from wtforms.validators import DataRequired, Optional
 
-from ..banking.banks import BankHandler
-from ..banking.forms import BankSelectField, BankSubform
+from ..banking.forms import BankSubform
 from ..common.forms import AcquisitionSubform, EntryForm, EntrySubform, TransactionForm
 from ..common.forms.fields import (
     CustomChoiceSelectField,
     LastFourDigitsField,
-    OptionalDateField,
     StringField,
 )
 from ..common.forms.utils import Autocompleter
@@ -154,6 +152,10 @@ class CardStatementTransferForm(EntryForm):
     transfer = RadioField("transfer", choices=[("yes", "Yes"), ("no", "No")])
     submit = SubmitField("Continue")
 
+    def gather_entry_data(self, entry):
+        """Gather data for the form from the given database entry."""
+        raise NotImplementedError
+
 
 class CreditTransactionForm(TransactionForm):
     """Form to input/edit credit card transactions."""
@@ -195,7 +197,7 @@ class CreditTransactionForm(TransactionForm):
         # Fields to identify the card/bank information for the statement
         card_info = FormField(CardSubform)
         # Fields pertaining to the statement
-        issue_date = OptionalDateField("Statement Date")
+        issue_date = DateField("Statement Date", [Optional()])
 
         def get_statement(self, transaction_date):
             """Get the credit card statement described by the form data."""
@@ -335,7 +337,7 @@ class CreditTransactionForm(TransactionForm):
         """Gather data for the form from the given database entry."""
         if isinstance(entry, CreditTransactionView):
             data = self._gather_transaction_data(entry)
-            statement_info = entry.statement
+            statement_info = entry.statement_view
         elif isinstance(entry, (CreditCard, CreditStatementView)):
             data = {}
             statement_info = entry

monopyly/credit/routes.py

@@ -2,12 +2,10 @@
 Routes for credit card financials.
 """
 
-from itertools import islice
-
 from dry_foundation.database import db_transaction
 from flask import (
+    abort,
     flash,
-    g,
     jsonify,
     redirect,
     render_template,
@@ -16,21 +14,17 @@ from flask import (
     url_for,
 )
 from sqlalchemy.exc import MultipleResultsFound
-from werkzeug.exceptions import abort
-from wtforms.validators import ValidationError
 
 from ..auth.tools import login_required
 from ..banking.accounts import BankAccountHandler
 from ..banking.banks import BankHandler
-from ..banking.transactions import BankTransactionHandler
-from ..common.forms import form_err_msg
 from ..common.forms.utils import extend_field_list_for_ajax
 from ..common.transactions import (
     categorize,
     get_linked_transaction,
     highlight_unmatched_transactions,
 )
-from ..common.utils import dedelimit_float, parse_date, sort_by_frequency
+from ..common.utils import dedelimit_float, parse_date
 from .accounts import CreditAccountHandler
 from .actions import (
     get_card_statement_grouping,
@@ -44,13 +38,16 @@ from .blueprint import bp
 from .cards import CreditCardHandler, save_card
 from .forms import CardStatementTransferForm, CreditCardForm, CreditTransactionForm
 from .statements import CreditStatementHandler
-from .transactions import CreditTagHandler, CreditTransactionHandler, save_transaction
+from .transactions import CreditTransactionHandler, save_transaction
 from .transactions.activity import (
     ActivityMatchmaker,
     TransactionActivities,
     parse_transaction_activity_file,
 )
 
+# Set a limit on the number of transactions loaded at one time for certain routes
+TRANSACTION_LIMIT = 100
+
 
 @bp.route("/cards")
 @login_required
@@ -206,7 +203,7 @@ def load_statement_details(statement_id):
     return render_template(
         "credit/statement_page.html",
         statement=statement,
-        statement_transactions=transactions,
+        transactions=transactions,
         bank_accounts=bank_accounts,
         chart_data=categories.assemble_chart_data(exclude=["Credit payments"]),
     )
@@ -261,7 +258,7 @@ def pay_credit_card(card_id, statement_id):
         bank_accounts=bank_accounts,
     )
     transactions_table_template = render_template(
-        "credit/transactions_table/transactions.html",
+        "credit/transactions_table/table.html",
         transactions=transactions,
     )
     return jsonify((summary_template, transactions_table_template))
@@ -299,7 +296,7 @@ def load_statement_reconciliation_details(statement_id):
         return render_template(
             "credit/statement_reconciliation/statement_reconciliation_page.html",
             statement=statement,
-            statement_transactions=transactions,
+            transactions=transactions,
             discrepant_records=matchmaker.match_discrepancies,
             discrepant_amount=abs(statement_transaction_balance - activities.total),
             unrecorded_activities=matchmaker.unmatched_activities,
@@ -345,14 +342,38 @@ def load_transactions(card_id):
     # Get all of the user's transactions for the selected cards
     sort_order = "DESC"
     transactions = CreditTransactionHandler.get_transactions(
-        card_ids=selected_card_ids, sort_order=sort_order, limit=100
-    )
+        card_ids=selected_card_ids, sort_order=sort_order
+    ).all()
     return render_template(
         "credit/transactions_page.html",
         filter_cards=cards,
         selected_card_ids=selected_card_ids,
         sort_order=sort_order,
-        transactions=transactions,
+        transactions=transactions[:TRANSACTION_LIMIT],
+        total_transactions=len(transactions),
+    )
+
+
+@bp.route("/_extra_transactions", methods=("POST",))
+@login_required
+def load_more_transactions():
+    # Get info about the transactions being displayed from the AJAX request
+    post_args = request.get_json()
+    selected_card_ids = map(int, post_args["selected_card_ids"])
+    sort_order = "ASC" if post_args["sort_order"] == "asc" else "DESC"
+    block_index = post_args["block_count"] - 1
+    full_view = post_args["full_view"]
+    # Get a subset of the remaining transactions to load
+    more_transactions = CreditTransactionHandler.get_transactions(
+        card_ids=selected_card_ids,
+        sort_order=sort_order,
+        offset=block_index * TRANSACTION_LIMIT,
+        limit=TRANSACTION_LIMIT,
+    )
+    return render_template(
+        "credit/transactions_table/transactions.html",
+        transactions=more_transactions,
+        full_view=full_view,
     )
 
 
@@ -368,7 +389,7 @@ def update_transactions_display():
         card_ids=card_ids, sort_order=sort_order, limit=100
     )
     return render_template(
-        "credit/transactions_table/transactions.html",
+        "credit/transactions_table/table.html",
         sort_order=sort_order,
         transactions=transactions,
         full_view=True,
@@ -507,52 +528,6 @@ def delete_transaction(transaction_id):
     return redirect(url_for("credit.load_transactions"))
 
 
-@bp.route("/tags")
-@login_required
-def load_tags():
-    # Get the tag hierarchy from the database
-    hierarchy = CreditTagHandler.get_hierarchy()
-    return render_template("credit/tags_page.html", tags_hierarchy=hierarchy)
-
-
-@bp.route("/_add_tag", methods=("POST",))
-@login_required
-@db_transaction
-def add_tag():
-    # Get the new tag (and potentially parent category) from the AJAX request
-    post_args = request.get_json()
-    tag_name = post_args["tag_name"]
-    parent_name = post_args.get("parent")
-    # Check that the tag name does not already exist
-    if CreditTagHandler.get_tags(tag_names=(tag_name,)):
-        raise ValueError("The given tag name already exists. Tag names must be unique.")
-    if parent_name:
-        parent_id = CreditTagHandler.find_tag(parent_name).id
-    else:
-        parent_id = None
-    tag = CreditTagHandler.add_entry(
-        parent_id=parent_id,
-        user_id=g.user.id,
-        tag_name=tag_name,
-    )
-    return render_template(
-        "credit/tag_tree/subtag_tree.html", tag=tag, tags_hierarchy={}
-    )
-
-
-@bp.route("/_delete_tag", methods=("POST",))
-@login_required
-@db_transaction
-def delete_tag():
-    # Get the tag to be deleted from the AJAX request
-    post_args = request.get_json()
-    tag_name = post_args["tag_name"]
-    tag = CreditTagHandler.find_tag(tag_name)
-    # Remove the tag from the database
-    CreditTagHandler.delete_entry(tag.id)
-    return ""
-
-
 @bp.route("/_suggest_transaction_autocomplete", methods=("POST",))
 @login_required
 def suggest_transaction_autocomplete():

monopyly/credit/transactions/__init__.py

@@ -3,3 +3,5 @@ Tools for interacting with the credit transactions in the database.
 """
 
 from ._transactions import CreditTagHandler, CreditTransactionHandler, save_transaction
+
+__all__ = ["CreditTagHandler", "CreditTransactionHandler", "save_transaction"]

monopyly/credit/transactions/_transactions.py

@@ -2,15 +2,12 @@
 Tools for interacting with the credit transactions in the database.
 """
 
-from dry_foundation.database.handler import DatabaseHandler, DatabaseViewHandler
+from dry_foundation.database.handler import DatabaseViewHandler
 
 from ...common.forms.utils import execute_on_form_validation
 from ...common.transactions import TransactionHandler, TransactionTagHandler
 from ...database.models import (
-    Bank,
-    CreditAccount,
     CreditCard,
-    CreditStatementView,
     CreditSubtransaction,
     CreditTransaction,
     CreditTransactionView,

monopyly/credit/transactions/activity/__init__.py

@@ -1,3 +1,9 @@
 from .data import TransactionActivities
 from .parser import parse_transaction_activity_file
 from .reconciliation import ActivityMatchmaker
+
+__all__ = [
+    "TransactionActivities",
+    "parse_transaction_activity_file",
+    "ActivityMatchmaker",
+]

monopyly/credit/transactions/activity/parser.py

@@ -5,7 +5,6 @@ from abc import ABC, abstractmethod
 from pathlib import Path
 
 from flask import abort, current_app
-from werkzeug.utils import secure_filename
 
 from ....common.utils import parse_date
 from .data import ActivityLoadingError, TransactionActivities, TransactionActivityLoader

monopyly/credit/transactions/activity/reconciliation.py

@@ -113,9 +113,11 @@ class _Matchmaker(ABC):
 
         def includes_activity(self, activity):
             for value in self.values():
-                if activity == value:
-                    return True
-                elif isinstance(value, TransactionActivityGroup) and activity in value:
+                same_activity = activity == value
+                same_group = (
+                    isinstance(value, TransactionActivityGroup) and activity in value
+                )
+                if same_activity or same_group:
                     return True
             return False
 

monopyly/database/__init__.py

@@ -41,6 +41,3 @@ class SQLAlchemy(_SQLAlchemy):
             raw_conn.close()
         # Top level initialization does not overwrite tables, so it goes at the end
         super().initialize(app)
-
-
-SQLAlchemy.create_default_interface(echo_engine=False)