fixup! Write a set of queries to go along with the event sourcing model

dibbler/queries/joint_buy_product.py

@@ -25,12 +25,18 @@ def joint_buy_product(
     if product.id is None:
         raise ValueError("Product must be persisted in the database.")
 
-    if instigator not in users:
-        raise ValueError("Instigator must be in the list of users buying the product.")
+    if instigator.id is None:
+        raise ValueError("Instigator must be persisted in the database.")
+
+    if len(users) == 0:
+        raise ValueError("At least bying one user must be specified.")
 
     if any(user.id is None for user in users):
         raise ValueError("All users must be persisted in the database.")
 
+    if instigator not in users:
+        raise ValueError("Instigator must be in the list of users buying the product.")
+
     if product_count <= 0:
         raise ValueError("Product count must be positive.")
 

dibbler/queries/transaction_log.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
@@ -16,10 +18,10 @@ def transaction_log(
     user: User | None = None,
     product: Product | None = None,
     exclusive_after: bool = False,
-    after_time=None,
+    after_time: datetime | None = None,
     after_transaction_id: int | None = None,
     exclusive_before: bool = False,
-    before_time=None,
+    before_time: datetime | None = None,
     before_transaction_id: int | None = None,
     transaction_type: list[TransactionType] | None = None,
     negate_transaction_type_filter: bool = False,
@@ -45,7 +47,10 @@ def transaction_log(
         raise ValueError("Product must be persisted in the database.")
 
     if not (after_time is None or after_transaction_id is None):
-        raise ValueError("Cannot filter by both from_time and from_transaction_id.")
+        raise ValueError("Cannot filter by both after_time and after_transaction_id.")
+
+    if not (before_time is None or before_transaction_id is None):
+        raise ValueError("Cannot filter by both before_time and before_transaction_id.")
 
     query = select(Transaction)
     if user is not None:

tests/queries/test_adjust_interest.py

@@ -15,6 +15,18 @@ def insert_test_data(sql_session: Session) -> User:
     return user
 
 
+def test_adjust_interest_unitialized_user(sql_session: Session) -> None:
+    user = User("Uninitialized User")
+
+    with pytest.raises(ValueError, match="User must be persisted in the database."):
+        adjust_interest(
+            sql_session,
+            user=user,
+            new_interest=4,
+            message="Attempting to adjust interest for uninitialized user",
+        )
+
+
 def test_adjust_interest_no_history(sql_session: Session) -> None:
     user = insert_test_data(sql_session)
 

tests/queries/test_adjust_penalty.py

@@ -19,6 +19,19 @@ def insert_test_data(sql_session: Session) -> User:
     return user
 
 
+def test_adjust_penalty_unitialized_user(sql_session: Session) -> None:
+    user = User("Uninitialized User")
+
+    with pytest.raises(ValueError, match="User must be persisted in the database."):
+        adjust_penalty(
+            sql_session,
+            user=user,
+            new_penalty=-100,
+            new_penalty_multiplier=110,
+            message="Attempting to adjust penalty for uninitialized user",
+        )
+
+
 def test_adjust_penalty_no_history(sql_session: Session) -> None:
     user = insert_test_data(sql_session)
 

tests/queries/test_joint_buy_product.py

@@ -33,12 +33,12 @@ def insert_test_data(sql_session: Session) -> tuple[User, User, User, Product]:
     return user1, user2, user3, product
 
 
-def test_joint_buy_product_missing_product(sql_session: Session) -> None:
+def test_joint_buy_product_uninitialized_product(sql_session: Session) -> None:
     user = User("Test User 1")
     sql_session.add(user)
     sql_session.commit()
 
-    product = Product("1234567890123", "Test Product")
+    product = Product("1234567890123", "Uninitialized Product")
 
     with pytest.raises(ValueError):
         joint_buy_product(
@@ -50,18 +50,42 @@ def test_joint_buy_product_missing_product(sql_session: Session) -> None:
         )
 
 
-def test_joint_buy_product_missing_user(sql_session: Session) -> None:
-    user = User("Test User 1")
-
-    product = Product("1234567890123", "Test Product")
-    sql_session.add(product)
-    sql_session.commit()
+def test_joint_buy_product_no_users(sql_session: Session) -> None:
+    user, _, _, product = insert_test_data(sql_session)
 
     with pytest.raises(ValueError):
         joint_buy_product(
             sql_session,
             instigator=user,
-            users=[user],
+            users=[],
+            product=product,
+            product_count=1,
+        )
+
+
+def test_joint_buy_product_uninitialized_instigator(sql_session: Session) -> None:
+    user, user2, _, product = insert_test_data(sql_session)
+
+    uninitialized_user = User("Uninitialized User")
+    with pytest.raises(ValueError):
+        joint_buy_product(
+            sql_session,
+            instigator=uninitialized_user,
+            users=[user, user2],
+            product=product,
+            product_count=1,
+        )
+
+
+def test_joint_buy_product_uninitialized_user_in_list(sql_session: Session) -> None:
+    user, _, _, product = insert_test_data(sql_session)
+
+    uninitialized_user = User("Uninitialized User")
+    with pytest.raises(ValueError):
+        joint_buy_product(
+            sql_session,
+            instigator=user,
+            users=[user, uninitialized_user],
             product=product,
             product_count=1,
         )

tests/queries/test_product_owners.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 from pprint import pprint
 
+import pytest
 from sqlalchemy.orm import Session
 
 from dibbler.models import Product, User
@@ -20,6 +21,17 @@ def insert_test_data(sql_session: Session) -> tuple[Product, User]:
     return product, user
 
 
+def test_product_owners_unitilialized_product(sql_session: Session) -> None:
+    user = User("testuser")
+    sql_session.add(user)
+    sql_session.commit()
+
+    product = Product("1234567890123", "Uninitialized Product")
+
+    with pytest.raises(ValueError):
+        product_owners(sql_session, product)
+
+
 def test_product_owners_no_transactions(sql_session: Session) -> None:
     product, _ = insert_test_data(sql_session)
 

tests/queries/test_product_price.py

@@ -2,6 +2,7 @@ import math
 from datetime import datetime
 from pprint import pprint
 
+import pytest
 from sqlalchemy.orm import Session
 
 from dibbler.models import Product, Transaction, User
@@ -22,6 +23,17 @@ def insert_test_data(sql_session: Session) -> tuple[User, Product]:
     return user, product
 
 
+def test_product_price_uninitialized_product(sql_session: Session) -> None:
+    user = User("Test User")
+    sql_session.add(user)
+    sql_session.commit()
+
+    product = Product("1234567890123", "Uninitialized Product")
+
+    with pytest.raises(ValueError, match="Product must be persisted in the database."):
+        product_price(sql_session, product)
+
+
 def test_product_price_no_transactions(sql_session: Session) -> None:
     _, product = insert_test_data(sql_session)
 

tests/queries/test_product_stock.py

@@ -1,11 +1,9 @@
 from datetime import datetime
 
 import pytest
-from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from dibbler.models import Product, Transaction, User
-from dibbler.models.TransactionType import TransactionTypeSQL
 from dibbler.queries import joint_buy_product, product_stock
 
 
@@ -18,6 +16,17 @@ def insert_test_data(sql_session: Session) -> tuple[User, Product]:
     return user, product
 
 
+def test_product_stock_uninitialized_product(sql_session: Session) -> None:
+    user = User("Test User 1")
+    sql_session.add(user)
+    sql_session.commit()
+
+    product = Product("1234567890123", "Uninitialized Product")
+
+    with pytest.raises(ValueError):
+        product_stock(sql_session, product)
+
+
 def test_product_stock_basic_history(sql_session: Session) -> None:
     user, product = insert_test_data(sql_session)
 

tests/queries/test_transaction_log.py

@@ -83,6 +83,76 @@ def insert_default_test_transactions(
     return transactions
 
 
+def test_transaction_log_uninitialized_user(sql_session: Session) -> None:
+    user = User("Uninitialized User")
+
+    with pytest.raises(ValueError):
+        transaction_log(sql_session, user=user)
+
+
+def test_transaction_log_uninitialized_product(sql_session: Session) -> None:
+    product = Product("1234567890123", "Uninitialized Product")
+
+    with pytest.raises(ValueError):
+        transaction_log(sql_session, product=product)
+
+
+def test_transaction_log_after_product_and_user_not_allowed(sql_session: Session) -> None:
+    user, user2, product, product2 = insert_test_data(sql_session)
+    insert_default_test_transactions(sql_session, user, user2, product, product2)
+
+    with pytest.raises(ValueError):
+        transaction_log(
+            sql_session,
+            user=user,
+            product=product,
+            after_time=datetime(2023, 10, 1, 11, 0, 0),
+        )
+
+
+def test_transaction_log_after_datetime_and_transaction_id_not_allowed(
+    sql_session: Session,
+) -> None:
+    user, user2, product, product2 = insert_test_data(sql_session)
+    insert_default_test_transactions(sql_session, user, user2, product, product2)
+
+    with pytest.raises(ValueError):
+        transaction_log(
+            sql_session,
+            user=user,
+            after_time=datetime(2023, 10, 1, 11, 0, 0),
+            after_transaction_id=1,
+        )
+
+
+def test_user_transactions_before_product_and_user_not_allowed(sql_session: Session) -> None:
+    user, user2, product, product2 = insert_test_data(sql_session)
+    insert_default_test_transactions(sql_session, user, user2, product, product2)
+
+    with pytest.raises(ValueError):
+        transaction_log(
+            sql_session,
+            user=user,
+            product=product,
+            before_time=datetime(2023, 10, 1, 15, 0, 0),
+        )
+
+
+def test_transaction_log_before_datetime_and_transaction_id_not_allowed(
+    sql_session: Session,
+) -> None:
+    user, user2, product, product2 = insert_test_data(sql_session)
+    insert_default_test_transactions(sql_session, user, user2, product, product2)
+
+    with pytest.raises(ValueError):
+        transaction_log(
+            sql_session,
+            user=user,
+            before_time=datetime(2023, 10, 1, 15, 0, 0),
+            before_transaction_id=1,
+        )
+
+
 def test_user_transactions_no_transactions(sql_session: Session) -> None:
     insert_test_data(sql_session)
 
@@ -91,6 +161,13 @@ def test_user_transactions_no_transactions(sql_session: Session) -> None:
     assert len(transactions) == 0
 
 
+def test_transaction_log_basic(sql_session: Session) -> None:
+    user, user2, product, product2 = insert_test_data(sql_session)
+    insert_default_test_transactions(sql_session, user, user2, product, product2)
+
+    assert len(transaction_log(sql_session)) == 7
+
+
 def test_transaction_log_filtered_by_user(sql_session: Session) -> None:
     user, user2, product, product2 = insert_test_data(sql_session)
     insert_default_test_transactions(sql_session, user, user2, product, product2)
@@ -375,34 +452,6 @@ def test_transaction_log_before_transaction_id_after_date(sql_session: Session)
     )
 
 
-def test_transaction_log_after_product_and_user_not_allowed(sql_session: Session) -> None:
-    user, user2, product, product2 = insert_test_data(sql_session)
-    insert_default_test_transactions(sql_session, user, user2, product, product2)
-
-    with pytest.raises(ValueError):
-        transaction_log(
-            sql_session,
-            user=user,
-            product=product,
-            after_time=datetime(2023, 10, 1, 11, 0, 0),
-        )
-
-
-def test_transaction_log_after_datetime_and_transaction_id_not_allowed(
-    sql_session: Session,
-) -> None:
-    user, user2, product, product2 = insert_test_data(sql_session)
-    insert_default_test_transactions(sql_session, user, user2, product, product2)
-
-    with pytest.raises(ValueError):
-        transaction_log(
-            sql_session,
-            user=user,
-            after_time=datetime(2023, 10, 1, 11, 0, 0),
-            after_transaction_id=1,
-        )
-
-
 def test_transaction_log_limit(sql_session: Session) -> None:
     user, user2, product, product2 = insert_test_data(sql_session)
     transactions = insert_default_test_transactions(sql_session, user, user2, product, product2)