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

monopyly/credit/forms.py

@@ -2,20 +2,18 @@
 Generate credit card forms for the user to complete.
 """
 
-from werkzeug.exceptions import abort
+from flask import abort
 from wtforms.fields import (
     BooleanField,
     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,
@@ -335,7 +333,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)

monopyly/database/models.py

@@ -1,9 +1,7 @@
 import datetime
-from typing import List, Optional
 
 from dry_foundation.database.models import AuthorizedAccessMixin, Model
-from sqlalchemy import Column, Date, Float, ForeignKey, Integer, String, Table
-from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy import Column, ForeignKey, Integer, Table
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 
@@ -15,7 +13,7 @@ class User(Model):
     password: Mapped[str]
     # Relationships
     banks: Mapped["Bank"] = relationship(back_populates="user", cascade="all, delete")
-    bank_account_types: Mapped["BankAccountTypeView"] = relationship(
+    bank_account_type_views: Mapped[list["BankAccountTypeView"]] = relationship(
         back_populates="user", viewonly=True
     )
 
@@ -25,16 +23,23 @@ class InternalTransaction(Model):
     # Columns
     id: Mapped[int] = mapped_column(primary_key=True)
     # Relationships
-    bank_transactions: Mapped[List["BankTransactionView"]] = relationship(
+    bank_transactions: Mapped[list["BankTransaction"]] = relationship(
         back_populates="internal_transaction"
     )
-    credit_transactions: Mapped[List["CreditTransactionView"]] = relationship(
+    bank_transaction_views: Mapped[list["BankTransactionView"]] = relationship(
+        back_populates="internal_transaction", viewonly=True
+    )
+    credit_transactions: Mapped[list["CreditTransaction"]] = relationship(
         back_populates="internal_transaction"
     )
+    credit_transaction_views: Mapped[list["CreditTransactionView"]] = relationship(
+        back_populates="internal_transaction", viewonly=True
+    )
 
+    @property
+    def transaction_views(self):
+        return self.bank_transaction_views + self.credit_transaction_views
 
-# Not sure why these tables are necessary, because they should already be reflected;
-# perhaps explore or wait until sqlalchemy 2.0
 
 bank_tag_link_table = Table(
     "bank_tag_links",
@@ -62,20 +67,21 @@ credit_tag_link_table = Table(
 
 class TransactionTag(AuthorizedAccessMixin, Model):
     __tablename__ = "transaction_tags"
+    _alt_authorized_ids = (0,)
     # Columns
     id: Mapped[int] = mapped_column(primary_key=True)
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id"))
-    parent_id: Mapped[Optional[int]] = mapped_column(ForeignKey("transaction_tags.id"))
+    parent_id: Mapped[int | None] = mapped_column(ForeignKey("transaction_tags.id"))
     tag_name: Mapped[str]
     # Relationships
     parent: Mapped["TransactionTag"] = relationship(
         back_populates="children", remote_side=[id]
     )
-    children: Mapped[List["TransactionTag"]] = relationship(back_populates="parent")
-    bank_subtransactions: Mapped[List["BankSubtransaction"]] = relationship(
+    children: Mapped[list["TransactionTag"]] = relationship(back_populates="parent")
+    bank_subtransactions: Mapped[list["BankSubtransaction"]] = relationship(
         back_populates="tags", secondary=bank_tag_link_table
     )
-    credit_subtransactions: Mapped[List["CreditSubtransaction"]] = relationship(
+    credit_subtransactions: Mapped[list["CreditSubtransaction"]] = relationship(
         back_populates="tags", secondary=credit_tag_link_table
     )
 
@@ -95,10 +101,10 @@ class Bank(AuthorizedAccessMixin, Model):
     bank_name: Mapped[str]
     # Relationships
     user: Mapped["User"] = relationship(back_populates="banks")
-    bank_accounts: Mapped[List["BankAccountView"]] = relationship(
+    bank_account_views: Mapped[list["BankAccountView"]] = relationship(
         back_populates="bank", cascade="all, delete", viewonly=True
     )
-    credit_accounts: Mapped[List["CreditAccount"]] = relationship(
+    credit_accounts: Mapped[list["CreditAccount"]] = relationship(
         back_populates="bank", cascade="all, delete"
     )
 
@@ -110,7 +116,7 @@ class BankAccountType(AuthorizedAccessMixin, Model):
     id: Mapped[int] = mapped_column(primary_key=True)
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id"))
     type_name: Mapped[str]
-    type_abbreviation: Mapped[Optional[str]]
+    type_abbreviation: Mapped[str | None]
     # Relationships
     view: Mapped["BankAccountTypeView"] = relationship(
         back_populates="account_type", uselist=False, viewonly=True
@@ -124,13 +130,13 @@ class BankAccountTypeView(AuthorizedAccessMixin, Model):
     id = mapped_column(Integer, ForeignKey("bank_account_types.id"), primary_key=True)
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id"))
     type_name: Mapped[str]
-    type_abbreviation: Mapped[Optional[str]]
+    type_abbreviation: Mapped[str | None]
     type_common_name: Mapped[str]
     # Relationships
     account_type: Mapped["BankAccountType"] = relationship(back_populates="view")
-    user: Mapped["User"] = relationship(back_populates="bank_account_types")
-    accounts: Mapped[List["BankAccountView"]] = relationship(
-        back_populates="account_type", viewonly=True
+    user: Mapped["User"] = relationship(back_populates="bank_account_type_views")
+    account_views: Mapped[list["BankAccountView"]] = relationship(
+        back_populates="account_type_view", viewonly=True
     )
 
 
@@ -166,12 +172,12 @@ class BankAccountView(AuthorizedAccessMixin, Model):
     projected_balance: Mapped[float]
     # Relationships
     account: Mapped["BankAccount"] = relationship(back_populates="view")
-    bank: Mapped["Bank"] = relationship(back_populates="bank_accounts")
-    account_type: Mapped["BankAccountTypeView"] = relationship(
-        back_populates="accounts", viewonly=True
+    bank: Mapped["Bank"] = relationship(back_populates="bank_account_views")
+    account_type_view: Mapped["BankAccountTypeView"] = relationship(
+        back_populates="account_views", viewonly=True
     )
-    transactions: Mapped[List["BankTransactionView"]] = relationship(
-        back_populates="account", viewonly=True
+    transaction_views: Mapped[list["BankTransactionView"]] = relationship(
+        back_populates="account_view", viewonly=True
     )
 
 
@@ -182,16 +188,19 @@ class BankTransaction(AuthorizedAccessMixin, Model):
     subtype = "bank"
     # Columns
     id: Mapped[int] = mapped_column(primary_key=True)
-    internal_transaction_id: Mapped[Optional[int]] = mapped_column(
+    internal_transaction_id: Mapped[int | None] = mapped_column(
         ForeignKey("internal_transactions.id")
     )
     account_id: Mapped[int] = mapped_column(ForeignKey("bank_accounts_view.id"))
     transaction_date: Mapped[datetime.date]
-    merchant: Mapped[Optional[str]]
+    merchant: Mapped[str | None]
     #  Relationships
     view: Mapped["BankTransactionView"] = relationship(
         back_populates="transaction", uselist=False, viewonly=True
     )
+    internal_transaction: Mapped["InternalTransaction"] = relationship(
+        back_populates="bank_transactions"
+    )
 
 
 class BankTransactionView(AuthorizedAccessMixin, Model):
@@ -203,23 +212,25 @@ class BankTransactionView(AuthorizedAccessMixin, Model):
     id: Mapped[int] = mapped_column(
         ForeignKey("bank_transactions.id"), primary_key=True
     )
-    internal_transaction_id: Mapped[Optional[int]] = mapped_column(
+    internal_transaction_id: Mapped[int | None] = mapped_column(
         ForeignKey("internal_transactions.id")
     )
     account_id: Mapped[int] = mapped_column(ForeignKey("bank_accounts_view.id"))
     transaction_date: Mapped[datetime.date]
-    merchant: Mapped[Optional[str]]
+    merchant: Mapped[str | None]
     total: Mapped[float]
-    notes: Mapped[Optional[str]]
+    notes: Mapped[str | None]
     balance: Mapped[float]
     # Relationships
     transaction: Mapped["BankTransaction"] = relationship(back_populates="view")
     internal_transaction: Mapped["InternalTransaction"] = relationship(
-        back_populates="bank_transactions"
+        back_populates="bank_transaction_views"
+    )
+    account_view: Mapped["BankAccountView"] = relationship(
+        back_populates="transaction_views", viewonly=True
     )
-    account: Mapped["BankAccountView"] = relationship(back_populates="transactions")
-    subtransactions: Mapped[List["BankSubtransaction"]] = relationship(
-        back_populates="transaction", lazy="selectin"
+    subtransactions: Mapped[list["BankSubtransaction"]] = relationship(
+        back_populates="transaction_view", lazy="selectin", cascade="all, delete"
     )
 
 
@@ -232,10 +243,10 @@ class BankSubtransaction(AuthorizedAccessMixin, Model):
     subtotal: Mapped[float]
     note: Mapped[str]
     # Relationships
-    transaction: Mapped["BankTransactionView"] = relationship(
+    transaction_view: Mapped["BankTransactionView"] = relationship(
         back_populates="subtransactions", viewonly=True
     )
-    tags: Mapped[List["TransactionTag"]] = relationship(
+    tags: Mapped[list["TransactionTag"]] = relationship(
         back_populates="bank_subtransactions",
         secondary=bank_tag_link_table,
         lazy="selectin",
@@ -253,7 +264,7 @@ class CreditAccount(AuthorizedAccessMixin, Model):
     # ((Should probably have an 'active' field))
     # Relationships
     bank: Mapped["Bank"] = relationship(back_populates="credit_accounts")
-    cards: Mapped[List["CreditCard"]] = relationship(
+    cards: Mapped[list["CreditCard"]] = relationship(
         back_populates="account", cascade="all, delete"
     )
 
@@ -268,7 +279,7 @@ class CreditCard(AuthorizedAccessMixin, Model):
     active: Mapped[int]
     # Relationships
     account: Mapped["CreditAccount"] = relationship(back_populates="cards")
-    statements: Mapped[List["CreditStatementView"]] = relationship(
+    statement_views: Mapped[list["CreditStatementView"]] = relationship(
         back_populates="card", viewonly=True
     )
 
@@ -301,9 +312,9 @@ class CreditStatementView(AuthorizedAccessMixin, Model):
     payment_date: Mapped[datetime.date]
     # Relationships
     statement: Mapped["CreditStatement"] = relationship(back_populates="view")
-    card: Mapped["CreditCard"] = relationship(back_populates="statements")
-    transactions: Mapped[List["CreditTransactionView"]] = relationship(
-        back_populates="statement", viewonly=True
+    card: Mapped["CreditCard"] = relationship(back_populates="statement_views")
+    transaction_views: Mapped[list["CreditTransactionView"]] = relationship(
+        back_populates="statement_view", viewonly=True
     )
 
 
@@ -314,7 +325,7 @@ class CreditTransaction(AuthorizedAccessMixin, Model):
     subtype = "credit"
     # Columns
     id: Mapped[int] = mapped_column(primary_key=True)
-    internal_transaction_id: Mapped[Optional[int]] = mapped_column(
+    internal_transaction_id: Mapped[int | None] = mapped_column(
         ForeignKey("internal_transactions.id")
     )
     statement_id: Mapped[int] = mapped_column(ForeignKey("credit_statements_view.id"))
@@ -324,6 +335,9 @@ class CreditTransaction(AuthorizedAccessMixin, Model):
     view: Mapped["CreditTransactionView"] = relationship(
         back_populates="transaction", uselist=False, viewonly=True
     )
+    internal_transaction: Mapped["InternalTransaction"] = relationship(
+        back_populates="credit_transactions"
+    )
 
 
 class CreditTransactionView(AuthorizedAccessMixin, Model):
@@ -335,7 +349,7 @@ class CreditTransactionView(AuthorizedAccessMixin, Model):
     id: Mapped[int] = mapped_column(
         ForeignKey("credit_transactions.id"), primary_key=True
     )
-    internal_transaction_id: Mapped[Optional[int]] = mapped_column(
+    internal_transaction_id: Mapped[int | None] = mapped_column(
         ForeignKey("internal_transactions.id")
     )
     statement_id: Mapped[int] = mapped_column(ForeignKey("credit_statements_view.id"))
@@ -348,13 +362,13 @@ class CreditTransactionView(AuthorizedAccessMixin, Model):
         back_populates="view", uselist=False
     )
     internal_transaction: Mapped["InternalTransaction"] = relationship(
-        back_populates="credit_transactions"
+        back_populates="credit_transaction_views"
     )
-    statement: Mapped["CreditStatementView"] = relationship(
-        back_populates="transactions", viewonly=True
+    statement_view: Mapped["CreditStatementView"] = relationship(
+        back_populates="transaction_views", viewonly=True
     )
-    subtransactions: Mapped[List["CreditSubtransaction"]] = relationship(
-        back_populates="transaction", lazy="selectin"
+    subtransactions: Mapped[list["CreditSubtransaction"]] = relationship(
+        back_populates="transaction_view", lazy="selectin", cascade="all, delete"
     )
 
 
@@ -375,10 +389,10 @@ class CreditSubtransaction(AuthorizedAccessMixin, Model):
     subtotal: Mapped[float]
     note: Mapped[str]
     # Relationships
-    transaction: Mapped["CreditTransactionView"] = relationship(
+    transaction_view: Mapped["CreditTransactionView"] = relationship(
         back_populates="subtransactions", viewonly=True
     )
-    tags: Mapped[List["TransactionTag"]] = relationship(
+    tags: Mapped[list["TransactionTag"]] = relationship(
         back_populates="credit_subtransactions",
         secondary=credit_tag_link_table,
         lazy="selectin",

monopyly/database/preloads.sql

@@ -4,7 +4,12 @@ INSERT INTO users
 VALUES
   (0, 'global', 'n/a');
 
-/* Set some default account types (user_id=0 indicates the "global" user) */
+/* Set a default transaction tag for credit payments */
+INSERT INTO transaction_tags
+       (user_id, parent_id, tag_name)
+VALUES (0, NULL, 'Credit payments');
+
+/* Set some default account types */
 INSERT INTO bank_account_types
   (user_id, type_name, type_abbreviation)
 VALUES