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

monopyly/credit/transactions/_transactions.py

@@ -2,7 +2,7 @@
 Tools for interacting with the credit transactions in the database.
 """
 
-from authanor.database.handler import DatabaseHandler, DatabaseViewHandler
+from dry_foundation.database.handler import DatabaseHandler, DatabaseViewHandler
 
 from ...common.forms.utils import execute_on_form_validation
 from ...common.transactions import TransactionHandler, TransactionTagHandler
@@ -38,7 +38,13 @@ class CreditTransactionHandler(
     @classmethod
     @DatabaseViewHandler.view_query
     def get_transactions(
-        cls, statement_ids=None, card_ids=None, active=None, sort_order="DESC"
+        cls,
+        statement_ids=None,
+        card_ids=None,
+        active=None,
+        sort_order="DESC",
+        offset=None,
+        limit=None,
     ):
         """
         Get credit card transactions from the database.
@@ -66,6 +72,13 @@ class CreditTransactionHandler(
             An indicator of whether the transactions should be ordered
             in ascending (oldest at top) or descending (newest at top)
             order.
+        offset : int, optional
+            The number of transactions by which to offset the results
+            returned by this query. The default is `None`, in which case
+            no offset will be added.
+        limit : int, optional
+            A limit on the number of transactions retrieved from the
+            database.
 
         Returns
         -------
@@ -77,7 +90,7 @@ class CreditTransactionHandler(
         criteria.add_match_filter(CreditCard, "id", card_ids)
         criteria.add_match_filter(CreditCard, "active", active)
         transactions = super()._get_transactions(
-            criteria=criteria, sort_order=sort_order
+            criteria=criteria, sort_order=sort_order, offset=offset, limit=limit
         )
         return transactions
 
@@ -196,7 +209,7 @@ class CreditTagHandler(TransactionTagHandler, model=TransactionTagHandler.model)
         return tags
 
     @classmethod
-    def _filter_entries(cls, query, criteria):
+    def _filter_entries(cls, query, criteria, offset, limit):
         # Add a join to enable filtering by transaction ID or subtransaction ID
         join_transaction = CreditTransactionView in criteria.discriminators
         join_subtransaction = (
@@ -206,7 +219,7 @@ class CreditTagHandler(TransactionTagHandler, model=TransactionTagHandler.model)
             query = query.join(credit_tag_link_table).join(CreditSubtransaction)
             if join_transaction:
                 query = query.join(CreditTransactionView)
-        return super()._filter_entries(query, criteria)
+        return super()._filter_entries(query, criteria, offset, limit)
 
 
 @execute_on_form_validation

monopyly/credit/transactions/activity/parser.py

@@ -4,12 +4,14 @@ import csv
 from abc import ABC, abstractmethod
 from pathlib import Path
 
-from flask import current_app
+from flask import abort, current_app
 from werkzeug.utils import secure_filename
 
 from ....common.utils import parse_date
 from .data import ActivityLoadingError, TransactionActivities, TransactionActivityLoader
 
+SUPPORTED_BANKS = ("Bank of America", "Chase", "Discover")
+
 
 def parse_transaction_activity_file(transaction_file):
     """
@@ -91,7 +93,7 @@ class _TransactionDateColumnIdentifier(_ColumnIdentifier):
         elif "date" in standardized_title.split():
             if "trans." in standardized_title:
                 return True
-            elif standardized_title == "date":
+            elif standardized_title == "date" or standardized_title == "posted date":
                 return None
         return False
 
@@ -104,8 +106,8 @@ class _TransactionTotalColumnIdentifier(_ColumnIdentifier):
 
 class _TransactionDescriptionColumnIdentifier(_ColumnIdentifier):
     def check(self, standardized_title):
-        """Check if the title indicates this column contains a description."""
-        return standardized_title in ("description", "desc.")
+        """Check if the title indicates this column contains a description (payee)."""
+        return standardized_title in ("description", "desc.", "payee")
 
 
 class _TransactionCategoryColumnIdentifier(_ColumnIdentifier):
@@ -184,9 +186,15 @@ class _TransactionActivityParser:
         }
         for column_type in self.column_types:
             if raw_column_indices[column_type] is None:
-                raise RuntimeError(
-                    f"The '{column_type}' column could not be identified in the data."
+                current_app.logger.debug(
+                    f"The '{column_type}' column could not be identified in the data. "
+                )
+                msg = (
+                    "The data was unable to be parsed, most likely because it did not "
+                    "match a recognized format. Supported data formats include those "
+                    f"from the following banks: {', '.join(SUPPORTED_BANKS)}."
                 )
+                abort(400, msg)
         return raw_column_indices
 
     def _determine_expenditure_sign(self, raw_data):

monopyly/credit/transactions/activity/reconciliation.py

@@ -222,7 +222,26 @@ class _Matchmaker(ABC):
         field : str
             The string of text to be tokenized.
         """
-        return set(wordpunct_tokenize(field.replace("'", "").casefold()))
+        replacements = [
+            # Remove disruptive punctuation
+            ("1-800", "1800"),
+            ("-", " "),
+            (".", " "),
+            (",", " "),
+            ("(", " "),
+            (")", " "),
+            ("'", ""),
+            # Standardize characters
+            ("&", "and"),
+            ("é", "e"),
+        ]
+        for original, replacement in replacements:
+            field = field.replace(original, replacement)
+        tokens = set(wordpunct_tokenize(field.replace("'", "").casefold()))
+        removals = ["and", "the", "of"]
+        for word in removals:
+            tokens.discard(word)
+        return tokens
 
     def _compute_transaction_activity_similarity_score(
         self, merchant_tokens, notes_tokens, activity_tokens

monopyly/database/__init__.py

@@ -2,17 +2,10 @@
 Expose commonly used database functionality to the rest of the package.
 """
 
-import sqlite3
 from pathlib import Path
 
-import click
+from dry_foundation.database import SQLAlchemy as _SQLAlchemy
 from flask import current_app
-from flask.cli import with_appcontext
-from fuisce.database import SQLAlchemy as _SQLAlchemy
-
-from ..core.actions import get_timestamp
-
-BASE_DB_NAME = f"monopyly.sqlite"
 
 
 class SQLAlchemy(_SQLAlchemy):
@@ -51,51 +44,3 @@ class SQLAlchemy(_SQLAlchemy):
 
 
 SQLAlchemy.create_default_interface(echo_engine=False)
-
-
-@click.command("init-db")
-@with_appcontext
-def init_db_command():
-    """Initialize the database from the command line (if it does not exist)."""
-    db_path = current_app.config["DATABASE"]
-    if not db_path.is_file():
-        current_app.db.initialize(current_app)
-        click.echo(f"Initialized the database ('{db_path}')")
-        preload_path = current_app.config.get("PRELOAD_DATA_PATH")
-        if preload_path:
-            click.echo(f"Prepopulated the database using '{preload_path}'")
-    else:
-        click.echo(f"Database exists, using '{db_path}'")
-
-
-@click.command("back-up-db")
-@with_appcontext
-def back_up_db_command():
-    """Back up the database from the command line."""
-    timestamp = get_timestamp()
-    # Connect to the database
-    db = sqlite3.connect(current_app.config["DATABASE"])
-    # Create and connect to the backup database
-    backup_db_dir_path = Path(current_app.instance_path) / "db_backups"
-    backup_db_dir_path.mkdir(exist_ok=True, parents=True)
-    backup_db_path = backup_db_dir_path / f"backup_{timestamp}.sqlite"
-    backup_db = sqlite3.connect(backup_db_path)
-    # Back up the database and print status
-    back_up_db(db, backup_db)
-    click.echo(f"Backup complete ({timestamp})")
-
-
-def back_up_db(db, backup_db):
-    """Create a backup of the database."""
-    # Backup the database
-    with backup_db:
-        db.backup(backup_db)
-    # Close the connections
-    backup_db.close()
-    db.close()
-
-
-def register_db_cli_commands(app):
-    """Register database CLI commands with the app."""
-    app.cli.add_command(init_db_command)
-    app.cli.add_command(back_up_db_command)