Filter history by date (#730)

Author: armanddidierjean

app/core/myeclpay/cruds_myeclpay.py

@@ -2,7 +2,7 @@
 from datetime import datetime
 from uuid import UUID
 
-from sqlalchemy import delete, or_, select, update
+from sqlalchemy import and_, delete, or_, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
 
@@ -651,6 +651,8 @@ async def get_transactions(
 async def get_transactions_by_wallet_id(
     wallet_id: UUID,
     db: AsyncSession,
+    start_datetime: datetime | None = None,
+    end_datetime: datetime | None = None,
 ) -> Sequence[models_myeclpay.Transaction]:
     result = await db.execute(
         select(models_myeclpay.Transaction)
@@ -659,6 +661,12 @@ async def get_transactions_by_wallet_id(
                 models_myeclpay.Transaction.debited_wallet_id == wallet_id,
                 models_myeclpay.Transaction.credited_wallet_id == wallet_id,
             ),
+            models_myeclpay.Transaction.creation >= start_datetime
+            if start_datetime
+            else and_(True),
+            models_myeclpay.Transaction.creation <= end_datetime
+            if end_datetime
+            else and_(True),
         )
         .options(
             selectinload(models_myeclpay.Transaction.debited_wallet),
@@ -718,10 +726,21 @@ async def confirm_transfer(
 async def get_transfers_by_wallet_id(
     wallet_id: UUID,
     db: AsyncSession,
+    start_datetime: datetime | None = None,
+    end_datetime: datetime | None = None,
 ) -> Sequence[models_myeclpay.Transfer]:
     result = await db.execute(
-        select(models_myeclpay.Transfer).where(
+        select(models_myeclpay.Transfer)
+        .where(
             models_myeclpay.Transfer.wallet_id == wallet_id,
+        )
+        .where(
+            models_myeclpay.Transfer.creation >= start_datetime
+            if start_datetime
+            else and_(True),
+            models_myeclpay.Transfer.creation <= end_datetime
+            if end_datetime
+            else and_(True),
         ),
     )
     return result.scalars().all()
@@ -867,6 +886,8 @@ async def get_refund_by_transaction_id(
 async def get_refunds_by_wallet_id(
     wallet_id: UUID,
     db: AsyncSession,
+    start_datetime: datetime | None = None,
+    end_datetime: datetime | None = None,
 ) -> Sequence[schemas_myeclpay.Refund]:
     result = (
         (
@@ -876,6 +897,12 @@ async def get_refunds_by_wallet_id(
                         models_myeclpay.Refund.debited_wallet_id == wallet_id,
                         models_myeclpay.Refund.credited_wallet_id == wallet_id,
                     ),
+                    models_myeclpay.Refund.creation >= start_datetime
+                    if start_datetime
+                    else and_(True),
+                    models_myeclpay.Refund.creation <= end_datetime
+                    if end_datetime
+                    else and_(True),
                 ),
             )
         )

app/core/myeclpay/endpoints_myeclpay.py

@@ -2,7 +2,7 @@
 import logging
 import urllib
 import uuid
-from datetime import UTC, datetime, timedelta
+from datetime import UTC, date, datetime, timedelta
 from pathlib import Path
 from uuid import UUID
 
@@ -491,6 +491,8 @@ async def create_store(
 )
 async def get_store_history(
     store_id: UUID,
+    start_date: date | None = None,
+    end_date: date | None = None,
     db: AsyncSession = Depends(get_db),
     user: CoreUser = Depends(is_user()),
 ):
@@ -520,11 +522,25 @@ async def get_store_history(
             detail="User is not authorized to see the store history",
         )
 
+    history = []
+
+    start_datetime = (
+        datetime.combine(start_date, datetime.min.time(), tzinfo=UTC)
+        if start_date
+        else None
+    )
+    end_datetime = (
+        datetime.combine(end_date, datetime.max.time(), tzinfo=UTC)
+        if end_date
+        else None
+    )
+
     transactions = await cruds_myeclpay.get_transactions_by_wallet_id(
         wallet_id=store.wallet_id,
         db=db,
+        start_datetime=start_datetime,
+        end_datetime=end_datetime,
     )
-    history = []
     for transaction in transactions:
         history_refund: schemas_myeclpay.HistoryRefund | None = None
         if transaction.refund is not None:
@@ -566,6 +582,8 @@ async def get_store_history(
     transfers = await cruds_myeclpay.get_transfers_by_wallet_id(
         wallet_id=store.wallet_id,
         db=db,
+        start_datetime=start_datetime,
+        end_datetime=end_datetime,
     )
     if len(transfers) > 0:
         hyperion_error_logger.error(
@@ -576,6 +594,8 @@ async def get_store_history(
     refunds = await cruds_myeclpay.get_refunds_by_wallet_id(
         wallet_id=store.wallet_id,
         db=db,
+        start_datetime=start_datetime,
+        end_datetime=end_datetime,
     )
     for refund in refunds:
         if refund.debited_wallet_id == store.wallet_id:
@@ -1529,6 +1549,8 @@ async def revoke_user_devices(
 async def get_user_wallet_history(
     db: AsyncSession = Depends(get_db),
     user: CoreUser = Depends(is_user()),
+    start_date: date | None = None,
+    end_date: date | None = None,
 ):
     """
     Get all transactions for the current user's wallet.
@@ -1546,12 +1568,25 @@ async def get_user_wallet_history(
             detail="User is not registered for MyECL Pay",
         )
 
+    start_datetime = (
+        datetime.combine(start_date, datetime.min.time(), tzinfo=UTC)
+        if start_date
+        else None
+    )
+    end_datetime = (
+        datetime.combine(end_date, datetime.max.time(), tzinfo=UTC)
+        if end_date
+        else None
+    )
+
     history: list[schemas_myeclpay.History] = []
 
     # First we get all received and send transactions
     transactions = await cruds_myeclpay.get_transactions_by_wallet_id(
         wallet_id=user_payment.wallet_id,
         db=db,
+        start_datetime=start_datetime,
+        end_datetime=end_datetime,
     )
 
     for transaction in transactions:
@@ -1594,6 +1629,8 @@ async def get_user_wallet_history(
     transfers = await cruds_myeclpay.get_transfers_by_wallet_id(
         wallet_id=user_payment.wallet_id,
         db=db,
+        start_datetime=start_datetime,
+        end_datetime=end_datetime,
     )
 
     for transfer in transfers:
@@ -1619,6 +1656,8 @@ async def get_user_wallet_history(
     refunds = await cruds_myeclpay.get_refunds_by_wallet_id(
         wallet_id=user_payment.wallet_id,
         db=db,
+        start_datetime=start_datetime,
+        end_datetime=end_datetime,
     )
     for refund in refunds:
         if refund.debited_wallet_id == user_payment.wallet_id:
@@ -1640,7 +1679,6 @@ async def get_user_wallet_history(
         )
 
     return history
-    # TODO: limite by datetime
 
 
 # TODO: do we keep this endpoint?

tests/test_myeclpay.py

@@ -267,7 +267,7 @@ async def init_objects() -> None:
         transaction_type=TransactionType.DIRECT,
         seller_user_id=ecl_user2.id,
         total=500,  # 5€
-        creation=datetime.now(UTC),
+        creation=datetime(2025, 5, 20, 12, 0, 0, tzinfo=UTC),
         status=TransactionStatus.CONFIRMED,
         store_note="transaction_from_ecl_user_to_store",
     )
@@ -282,7 +282,7 @@ async def init_objects() -> None:
         transaction_type=TransactionType.DIRECT,
         seller_user_id=ecl_user2.id,
         total=600,
-        creation=datetime.now(UTC),
+        creation=datetime(2025, 5, 19, 12, 0, 0, tzinfo=UTC),
         status=TransactionStatus.CONFIRMED,
         store_note="transaction_from_ecl_user_to_ecl_user2",
     )
@@ -297,7 +297,7 @@ async def init_objects() -> None:
         transaction_type=TransactionType.DIRECT,
         seller_user_id=ecl_user2.id,
         total=700,
-        creation=datetime.now(UTC),
+        creation=datetime(2025, 5, 18, 12, 0, 0, tzinfo=UTC),
         status=TransactionStatus.CONFIRMED,
         store_note="transaction_from_store_to_ecl_user",
     )
@@ -312,7 +312,7 @@ async def init_objects() -> None:
         transaction_type=TransactionType.DIRECT,
         seller_user_id=ecl_user2.id,
         total=800,
-        creation=datetime.now(UTC),
+        creation=datetime(2025, 5, 17, 12, 0, 0, tzinfo=UTC),
         status=TransactionStatus.CONFIRMED,
         store_note="transaction_from_ecl_user2_to_ecl_user",
     )
@@ -1336,6 +1336,51 @@ def test_get_transactions_success(client: TestClient):
     )
 
 
+def test_get_transactions_success_with_date(client: TestClient):
+    """Test successfully getting user transactions"""
+    response = client.get(
+        "/myeclpay/users/me/wallet/history",
+        params={
+            "start_date": "2025-05-18",
+            "end_date": "2025-05-19",
+        },
+        headers={"Authorization": f"Bearer {ecl_user_access_token}"},
+    )
+    assert response.status_code == 200
+
+    transactions = response.json()
+    assert len(transactions) == 2
+    transactions_dict = {UUID(t["id"]): t for t in transactions}
+
+    assert (
+        transactions_dict[transaction_from_ecl_user_to_ecl_user2.id][
+            "other_wallet_name"
+        ]
+        == "firstname ECL User 2 (nickname)"
+    )
+    assert (
+        transactions_dict[transaction_from_ecl_user_to_ecl_user2.id]["type"] == "given"
+    )
+    assert transactions_dict[transaction_from_ecl_user_to_ecl_user2.id]["total"] == 600
+    assert (
+        transactions_dict[transaction_from_ecl_user_to_ecl_user2.id]["status"]
+        == "confirmed"
+    )
+
+    assert (
+        transactions_dict[transaction_from_store_to_ecl_user.id]["other_wallet_name"]
+        == "Test Store"
+    )
+    assert (
+        transactions_dict[transaction_from_store_to_ecl_user.id]["type"] == "received"
+    )
+    assert transactions_dict[transaction_from_store_to_ecl_user.id]["total"] == 700
+    assert (
+        transactions_dict[transaction_from_store_to_ecl_user.id]["status"]
+        == "confirmed"
+    )
+
+
 def test_transfer_with_redirect_url_not_trusted(client: TestClient):
     """Test transferring with an unregistered user"""
     response = client.post(