Projects/dibbler
10
2
Fork 0
Code Issues 19 Pull Requests 1 Activity

fixup! WIP

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-06-12 21:46:52 +02:00
parent 3c9bca8b55
commit d4511981ff
12 changed files with 345 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/models/test_transaction.py
View File

@@ -40,34 +40,3 @@ def test_transaction_no_duplicate_timestamps(sql_session: Session):
with pytest.raises(IntegrityError):
sql_session.commit()
def test_transaction_buy_product_wrong_amount(sql_session: Session) -> None:
user, product = insert_test_data(sql_session)
# Set price by adding a product
transaction = Transaction.add_product(
time=datetime(2023, 10, 1, 12, 0, 0),
user_id=user.id,
product_id=product.id,
amount=27,
per_product=27,
product_count=1,
)
sql_session.add(transaction)
sql_session.commit()
# Attempt to buy product with wrong amount
transaction2 = Transaction.buy_product(
time=datetime(2023, 10, 1, 12, 0, 1),
user_id=user.id,
product_id=product.id,
amount=(27 * 2) + 1, # Wrong amount
product_count=2,
)
sql_session.add(transaction2)
with pytest.raises(ValueError):
sql_session.commit()

1
tests/models/test_user.py
View File

@@ -59,7 +59,6 @@ def test_user_transactions(sql_session: Session):
),
Transaction.buy_product(
time=datetime(2023, 10, 1, 12, 0, 1),
amount=27,
product_count=1,
user_id=user2.id,
product_id=product.id,

43
tests/queries/test_buy_product.py
View File

@@ -4,7 +4,6 @@ from datetime import datetime
from sqlalchemy.orm import Session
from dibbler.models import Product, Transaction, User
from dibbler.queries.buy_product import buy_product
from dibbler.queries.product_stock import product_stock
from dibbler.queries.user_balance import user_balance
@@ -48,11 +47,10 @@ def insert_test_data(sql_session: Session) -> tuple[User, Product]:
def test_buy_product_basic(sql_session: Session) -> None:
user, product = insert_test_data(sql_session)
transaction = buy_product(
sql_session=sql_session,
transaction = Transaction.buy_product(
time=datetime(2023, 10, 1, 12, 0, 0),
user=user,
product=product,
user_id=user.id,
product_id=product.id,
product_count=1,
)
@@ -73,11 +71,10 @@ def test_buy_product_with_penalty(sql_session: Session) -> None:
sql_session.add_all(transactions)
sql_session.commit()
transaction = buy_product(
sql_session=sql_session,
transaction = Transaction.buy_product(
time=datetime(2023, 10, 1, 12, 0, 0),
user=user,
product=product,
user_id=user.id,
product_id=product.id,
product_count=1,
)
sql_session.add(transaction)
@@ -99,11 +96,10 @@ def test_buy_product_with_interest(sql_session: Session) -> None:
sql_session.add_all(transactions)
sql_session.commit()
transaction = buy_product(
sql_session=sql_session,
transaction = Transaction.buy_product(
time=datetime(2023, 10, 1, 12, 0, 0),
user=user,
product=product,
user_id=user.id,
product_id=product.id,
product_count=1,
)
sql_session.add(transaction)
@@ -125,11 +121,10 @@ def test_buy_product_with_changing_penalty(sql_session: Session) -> None:
sql_session.add_all(transactions)
sql_session.commit()
transaction = buy_product(
sql_session=sql_session,
transaction = Transaction.buy_product(
time=datetime(2023, 10, 1, 12, 0, 0),
user=user,
product=product,
user_id=user.id,
product_id=product.id,
product_count=1,
)
sql_session.add(transaction)
@@ -146,11 +141,10 @@ def test_buy_product_with_changing_penalty(sql_session: Session) -> None:
sql_session.add(adjust_penalty)
sql_session.commit()
transaction = buy_product(
sql_session=sql_session,
transaction = Transaction.buy_product(
time=datetime(2023, 10, 1, 14, 0, 0),
user=user,
product=product,
user_id=user.id,
product_id=product.id,
product_count=1,
)
sql_session.add(transaction)
@@ -170,12 +164,11 @@ def test_buy_product_with_penalty_interest_combined(sql_session: Session) -> Non
def test_buy_product_more_than_stock(sql_session: Session) -> None:
user, product = insert_test_data(sql_session)
transaction = buy_product(
sql_session=sql_session,
transaction = Transaction.buy_product(
time=datetime(2023, 10, 1, 13, 0, 0),
product_count=10,
user=user,
product=product,
user_id=user.id,
product_id=product.id,
)
sql_session.add(transaction)

3
tests/queries/test_product_price.py
View File

@@ -49,7 +49,6 @@ def insert_test_data(sql_session: Session) -> None:
),
Transaction.buy_product(
time=datetime(2023, 10, 1, 12, 0, 1),
amount=27,
product_count=1,
user_id=user2.id,
product_id=product1.id,
@@ -76,7 +75,6 @@ def insert_test_data(sql_session: Session) -> None:
),
Transaction.buy_product(
time=datetime(2023, 10, 1, 12, 0, 5),
amount=50,
product_count=1,
user_id=user1.id,
product_id=product3.id,
@@ -139,7 +137,6 @@ def test_product_price_with_negative_stock_single_addition(sql_session: Session)
transaction = Transaction.buy_product(
time=datetime(2023, 10, 1, 13, 0, 0),
amount=27 * 5,
product_count=10,
user_id=user1.id,
product_id=product1.id,

2
tests/queries/test_product_stock.py
View File

@@ -60,7 +60,6 @@ def test_product_stock_complex_history(sql_session: Session) -> None:
),
Transaction.buy_product(
time=datetime(2023, 10, 1, 13, 0, 1),
amount=27 * 3,
user_id=user1.id,
product_id=product.id,
product_count=3,
@@ -123,7 +122,6 @@ def test_negative_product_stock(sql_session: Session) -> None:
),
Transaction.buy_product(
time=datetime(2023, 10, 1, 14, 0, 1),
amount=50,
user_id=user1.id,
product_id=product.id,
product_count=2,

3
tests/queries/test_user_balance.py
View File

@@ -4,7 +4,7 @@ from sqlalchemy import select
from sqlalchemy.orm import Session
from dibbler.models import Product, Transaction, User
from dibbler.queries.user_balance import user_balance
from dibbler.queries.user_balance import user_balance, user_balance_log
def insert_test_data(sql_session: Session) -> None:
@@ -50,7 +50,6 @@ def insert_test_data(sql_session: Session) -> None:
),
Transaction.buy_product(
time=datetime(2023, 10, 1, 12, 0, 1),
amount=27,
product_count=1,
user_id=user2.id,
product_id=product1.id,