Myeclpay fix (#745)

### Description

Please explain the changes you made here.

### Checklist

- [ ] Created tests which fail without the change (if possible)
- [ ] All tests passing
- [ ] Extended the documentation, if necessary

Author: armanddidierjean

app/core/myeclpay/endpoints_myeclpay.py

@@ -2,7 +2,7 @@
 import logging
 import urllib
 import uuid
-from datetime import UTC, date, datetime, timedelta
+from datetime import UTC, datetime, timedelta
 from pathlib import Path
 from uuid import UUID
 
@@ -43,7 +43,6 @@
 )
 from app.core.myeclpay.utils_myeclpay import (
     LATEST_TOS,
-    MAX_TRANSACTION_TOTAL,
     QRCODE_EXPIRATION,
     is_user_latest_tos_signed,
     validate_transfer_callback,
@@ -306,7 +305,7 @@ async def init_transfer_structure_manager(
         db=db,
     )
 
-    confirmation_url = f"{settings.CLIENT_URL}myeclpay/structures/confirm-transfer?token={confirmation_token}"
+    confirmation_url = f"{settings.CLIENT_URL}myeclpay/structures/confirm-manager-transfer?token={confirmation_token}"
 
     if settings.SMTP_ACTIVE:
         mail = mail_templates.get_mail_myeclpay_structure_transfer(
@@ -504,8 +503,8 @@ async def create_store(
 )
 async def get_store_history(
     store_id: UUID,
-    start_date: date | None = None,
-    end_date: date | None = None,
+    start_date: datetime | None = None,
+    end_date: datetime | None = None,
     db: AsyncSession = Depends(get_db),
     user: CoreUser = Depends(is_user()),
 ):
@@ -537,22 +536,11 @@ async def get_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,
+        start_datetime=start_date,
+        end_datetime=end_date,
     )
     for transaction in transactions:
         history_refund: schemas_myeclpay.HistoryRefund | None = None
@@ -595,8 +583,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,
+        start_datetime=start_date,
+        end_datetime=end_date,
     )
     if len(transfers) > 0:
         hyperion_error_logger.error(
@@ -607,8 +595,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,
+        start_datetime=start_date,
+        end_datetime=end_date,
     )
     for refund in refunds:
         if refund.debited_wallet_id == store.wallet_id:
@@ -1118,18 +1106,6 @@ async def register_user(
     )
 
 
-@router.get(
-    "/myeclpay/tos",
-    response_model=str,
-    status_code=200,
-)
-async def get_tos(user: CoreUser = Depends(is_user())):
-    """
-    Get MyECLPay latest TOS as a string
-    """
-    return Path("assets/myeclpay-terms-of-service.txt").read_text()
-
-
 @router.get(
     "/myeclpay/users/me/tos",
     status_code=200,
@@ -1160,7 +1136,6 @@ async def get_user_tos(
         accepted_tos_version=existing_user_payment.accepted_tos_version,
         latest_tos_version=LATEST_TOS,
         tos_content=Path("assets/myeclpay-terms-of-service.txt").read_text(),
-        max_transaction_total=MAX_TRANSACTION_TOTAL,
         max_wallet_balance=settings.MYECLPAY_MAXIMUM_WALLET_BALANCE,
     )
 
@@ -1563,8 +1538,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,
+    start_date: datetime | None = None,
+    end_date: datetime | None = None,
 ):
     """
     Get all transactions for the current user's wallet.
@@ -1582,25 +1557,14 @@ 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,
+        start_datetime=start_date,
+        end_datetime=end_date,
     )
 
     for transaction in transactions:
@@ -1643,8 +1607,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,
+        start_datetime=start_date,
+        end_datetime=end_date,
     )
 
     for transfer in transfers:
@@ -1670,8 +1634,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,
+        start_datetime=start_date,
+        end_datetime=end_date,
     )
     for refund in refunds:
         if refund.debited_wallet_id == user_payment.wallet_id:
@@ -2061,12 +2025,6 @@ async def store_scan_qrcode(
                 detail="Total must be greater than 0",
             )
 
-        if scan_info.tot > MAX_TRANSACTION_TOTAL:
-            raise HTTPException(
-                status_code=400,
-                detail=f"Total can not exceed {MAX_TRANSACTION_TOTAL}",
-            )
-
         if scan_info.iat < datetime.now(UTC) - timedelta(
             minutes=QRCODE_EXPIRATION,
         ):

app/core/myeclpay/schemas_myeclpay.py

@@ -3,6 +3,7 @@
 
 from pydantic import (
     BaseModel,
+    Field,
 )
 
 from app.core.memberships import schemas_memberships
@@ -94,7 +95,11 @@ class TOSSignatureResponse(BaseModel):
     accepted_tos_version: int
     latest_tos_version: int
     tos_content: str
-    max_transaction_total: int
+    # TODO: remove this field in the future
+    max_transaction_total: int = Field(
+        default=0,
+        deprecated="The limit is not applied anymore",
+    )
     max_wallet_balance: int
 
 

tests/test_myeclpay.py

@@ -1,6 +1,5 @@
 import base64
 from datetime import UTC, datetime, timedelta
-from pathlib import Path
 from uuid import UUID, uuid4
 
 import pytest_asyncio
@@ -782,8 +781,8 @@ async def test_get_store_history_with_date(client: TestClient):
     response = client.get(
         f"/myeclpay/stores/{store.id}/history",
         params={
-            "start_date": "2025-05-18",
-            "end_date": "2025-05-19",
+            "start_date": "2025-05-18T00:00:00Z",
+            "end_date": "2025-05-19T00:00:00Z",
         },
         headers={
             "Authorization": f"Bearer {store_seller_can_see_history_user_access_token}",
@@ -1339,14 +1338,6 @@ async def test_delete_manager_seller(client: TestClient):
     )
 
 
-async def test_get_tos(client: TestClient):
-    response = client.get(
-        "/myeclpay/tos",
-        headers={"Authorization": f"Bearer {ecl_user_access_token}"},
-    )
-    assert response.json() == Path("assets/myeclpay-terms-of-service.txt").read_text()
-
-
 async def test_get_tos_for_unregistered_user(client: TestClient):
     response = client.get(
         "/myeclpay/users/me/tos",
@@ -1744,8 +1735,8 @@ def test_get_transactions_success_with_date(client: TestClient):
     response = client.get(
         "/myeclpay/users/me/wallet/history",
         params={
-            "start_date": "2025-05-18",
-            "end_date": "2025-05-19",
+            "start_date": "2025-05-18T00:00:00Z",
+            "end_date": "2025-05-19T23:59:59Z",
         },
         headers={"Authorization": f"Bearer {ecl_user_access_token}"},
     )
@@ -2123,39 +2114,6 @@ def test_store_scan_store_negative_total(client: TestClient):
     ensure_qr_code_id_is_already_used(qr_code_id=qr_code_id, client=client)
 
 
-def test_store_scan_store_total_greater_than_max(client: TestClient):
-    qr_code_id = uuid4()
-
-    qr_code_content = QRCodeContentData(
-        id=qr_code_id,
-        tot=4000,
-        iat=datetime.now(UTC),
-        store=True,
-        key=ecl_user_wallet_device.id,
-    )
-
-    signature = ecl_user_wallet_device_private_key.sign(
-        qr_code_content.model_dump_json().encode("utf-8"),
-    )
-
-    response = client.post(
-        f"/myeclpay/stores/{store.id}/scan",
-        headers={"Authorization": f"Bearer {store_seller_can_bank_user_access_token}"},
-        json={
-            "id": str(qr_code_content.id),
-            "key": str(qr_code_content.key),
-            "tot": qr_code_content.tot,
-            "iat": qr_code_content.iat.isoformat(),
-            "store": qr_code_content.store,
-            "signature": base64.b64encode(signature).decode("utf-8"),
-        },
-    )
-    assert response.status_code == 400
-    assert response.json()["detail"] == "Total can not exceed 2000"
-
-    ensure_qr_code_id_is_already_used(qr_code_id=qr_code_id, client=client)
-
-
 def test_store_scan_store_missing_wallet(
     client: TestClient,
     mocker: MockerFixture,