From 6a83a41f283293896bad5b27ca7a5a5bba814e44 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 9 Dec 2025 12:55:24 +0900 Subject: [PATCH] fixup! WIP --- dibbler/queries/__init__.py | 35 ++++++++++++++++++++++++++ tests/models/test_transaction.py | 2 +- tests/queries/test_adjust_interest.py | 3 +-- tests/queries/test_adjust_penalty.py | 3 +-- tests/queries/test_current_interest.py | 2 +- tests/queries/test_current_penalty.py | 2 +- tests/queries/test_product_price.py | 2 +- tests/queries/test_product_stock.py | 2 +- tests/queries/test_search_product.py | 2 +- tests/queries/test_search_user.py | 2 +- tests/queries/test_transaction_log.py | 2 +- tests/queries/test_user_balance.py | 2 +- 12 files changed, 46 insertions(+), 13 deletions(-) diff --git a/dibbler/queries/__init__.py b/dibbler/queries/__init__.py index e69de29..613b36b 100644 --- a/dibbler/queries/__init__.py +++ b/dibbler/queries/__init__.py @@ -0,0 +1,35 @@ +__all__ = [ + # "add_product", + # "add_user", + "adjust_interest", + "adjust_penalty", + "current_interest", + "current_penalty", + "joint_buy_product", + "product_price", + "product_price_log", + "product_stock", + # "products_owned_by_user", + "search_product", + "search_user", + "transaction_log", + "user_balance", + "user_balance_log", + # "users_owning_product", +] + +# from .add_product import add_product +# from .add_user import add_user +from .adjust_interest import adjust_interest +from .adjust_penalty import adjust_penalty +from .current_interest import current_interest +from .current_penalty import current_penalty +from .joint_buy_product import joint_buy_product +from .product_price import product_price, product_price_log +from .product_stock import product_stock +# from .products_owned_by_user import products_owned_by_user +from .search_product import search_product +from .search_user import search_user +from .transaction_log import transaction_log +from .user_balance import user_balance, user_balance_log +# from .users_owning_product import users_owning_product diff --git a/tests/models/test_transaction.py b/tests/models/test_transaction.py index 4c178a1..2f5ed79 100644 --- a/tests/models/test_transaction.py +++ b/tests/models/test_transaction.py @@ -5,7 +5,7 @@ from sqlalchemy.exc import IntegrityError from sqlalchemy.orm import Session from dibbler.models import Product, Transaction, User -from dibbler.queries.product_stock import product_stock +from dibbler.queries import product_stock def insert_test_data(sql_session: Session) -> tuple[User, Product]: diff --git a/tests/queries/test_adjust_interest.py b/tests/queries/test_adjust_interest.py index 294c24f..40741b5 100644 --- a/tests/queries/test_adjust_interest.py +++ b/tests/queries/test_adjust_interest.py @@ -5,8 +5,7 @@ from datetime import datetime from sqlalchemy.orm import Session from dibbler.models import Transaction, User -from dibbler.queries.adjust_interest import adjust_interest -from dibbler.queries.current_interest import current_interest +from dibbler.queries import adjust_interest, current_interest def test_adjust_interest_no_history(sql_session: Session) -> None: diff --git a/tests/queries/test_adjust_penalty.py b/tests/queries/test_adjust_penalty.py index c516947..8362857 100644 --- a/tests/queries/test_adjust_penalty.py +++ b/tests/queries/test_adjust_penalty.py @@ -8,8 +8,7 @@ from dibbler.models.Transaction import ( DEFAULT_PENALTY_MULTIPLIER_PERCENTAGE, DEFAULT_PENALTY_THRESHOLD, ) -from dibbler.queries.adjust_penalty import adjust_penalty -from dibbler.queries.current_penalty import current_penalty +from dibbler.queries import adjust_penalty, current_penalty def test_adjust_penalty_no_history(sql_session: Session) -> None: diff --git a/tests/queries/test_current_interest.py b/tests/queries/test_current_interest.py index de3af8d..0cac74c 100644 --- a/tests/queries/test_current_interest.py +++ b/tests/queries/test_current_interest.py @@ -4,7 +4,7 @@ from sqlalchemy.orm import Session from dibbler.models.Transaction import DEFAULT_INTEREST_RATE_PERCENTAGE from dibbler.models import Transaction, User -from dibbler.queries.current_interest import current_interest +from dibbler.queries import current_interest def test_current_interest_no_history(sql_session: Session) -> None: diff --git a/tests/queries/test_current_penalty.py b/tests/queries/test_current_penalty.py index 3e28c2c..6910070 100644 --- a/tests/queries/test_current_penalty.py +++ b/tests/queries/test_current_penalty.py @@ -7,7 +7,7 @@ from dibbler.models.Transaction import ( DEFAULT_PENALTY_MULTIPLIER_PERCENTAGE, DEFAULT_PENALTY_THRESHOLD, ) -from dibbler.queries.current_penalty import current_penalty +from dibbler.queries import current_penalty def test_current_penalty_no_history(sql_session: Session) -> None: diff --git a/tests/queries/test_product_price.py b/tests/queries/test_product_price.py index 16c804b..51c121b 100644 --- a/tests/queries/test_product_price.py +++ b/tests/queries/test_product_price.py @@ -5,7 +5,7 @@ from pprint import pprint from sqlalchemy.orm import Session from dibbler.models import Product, Transaction, User -from dibbler.queries.product_price import product_price, product_price_log +from dibbler.queries import product_price, product_price_log # TODO: see if we can use pytest_runtest_makereport to print the "product_price_log"s # only on failures instead of inlining it in every test function diff --git a/tests/queries/test_product_stock.py b/tests/queries/test_product_stock.py index d8ba334..d883c23 100644 --- a/tests/queries/test_product_stock.py +++ b/tests/queries/test_product_stock.py @@ -4,7 +4,7 @@ from sqlalchemy import select from sqlalchemy.orm import Session from dibbler.models import Product, Transaction, User -from dibbler.queries.product_stock import product_stock +from dibbler.queries import product_stock def insert_test_data(sql_session: Session) -> None: diff --git a/tests/queries/test_search_product.py b/tests/queries/test_search_product.py index e711413..ba94def 100644 --- a/tests/queries/test_search_product.py +++ b/tests/queries/test_search_product.py @@ -3,7 +3,7 @@ from datetime import datetime from sqlalchemy.orm import Session from dibbler.models import Product -from dibbler.queries.search_product import search_product +from dibbler.queries import search_product def test_search_product_no_products(sql_session: Session) -> None: diff --git a/tests/queries/test_search_user.py b/tests/queries/test_search_user.py index f09eec8..94b57c4 100644 --- a/tests/queries/test_search_user.py +++ b/tests/queries/test_search_user.py @@ -1,7 +1,7 @@ from sqlalchemy.orm import Session from dibbler.models import User -from dibbler.queries.search_user import search_user +from dibbler.queries import search_user USER = [ ("alice", 123), diff --git a/tests/queries/test_transaction_log.py b/tests/queries/test_transaction_log.py index da0949d..14da292 100644 --- a/tests/queries/test_transaction_log.py +++ b/tests/queries/test_transaction_log.py @@ -9,7 +9,7 @@ from dibbler.models import ( TransactionType, User, ) -from dibbler.queries.transaction_log import transaction_log +from dibbler.queries import transaction_log def insert_test_data(sql_session: Session) -> tuple[User, User, Product, Product]: diff --git a/tests/queries/test_user_balance.py b/tests/queries/test_user_balance.py index 3ae5f14..1f88ae8 100644 --- a/tests/queries/test_user_balance.py +++ b/tests/queries/test_user_balance.py @@ -5,7 +5,7 @@ from pprint import pprint from sqlalchemy.orm import Session from dibbler.models import Product, Transaction, User -from dibbler.queries.user_balance import user_balance, user_balance_log +from dibbler.queries import user_balance, user_balance_log # TODO: see if we can use pytest_runtest_makereport to print the "user_balance_log"s # only on failures instead of inlining it in every test function