Feat raid different prices (#754)

### Description

Goes hand to hand with :
aeecleclair/raid-registering#58

### Checklist

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

---------

Co-authored-by: Armand Didierjean <[email protected]>

Author: maximeroucher

app/modules/raid/coredata_raid.py

@@ -27,4 +27,5 @@ class RaidDriveFolders(core_data.BaseCoreData):
 class RaidPrice(core_data.BaseCoreData):
     student_price: int | None = None
     partner_price: int | None = None
+    external_price: int | None = None
     t_shirt_price: int | None = None

app/modules/raid/endpoints_raid.py

@@ -1106,24 +1106,44 @@ async def get_payment_url(
         raise MissingHelloAssoSlugError("HELLOASSO_SLUG")
 
     raid_prices = await get_core_data(coredata_raid.RaidPrice, db)
-    if not raid_prices.student_price or not raid_prices.t_shirt_price:
+    if (
+        not raid_prices.student_price
+        or not raid_prices.t_shirt_price
+        or not raid_prices.external_price
+    ):
         raise HTTPException(status_code=404, detail="Prices not set.")
+
     price = 0
     checkout_name = ""
     participant = await cruds_raid.get_participant_by_id(user.id, db)
-    if participant:
-        if not participant.payment:
-            price += raid_prices.student_price
-            checkout_name += "Inscription Raid"
+    if not participant:
+        raise HTTPException(status_code=404, detail="Participant not found.")
+
+    if participant.validation_progress != 100:
+        raise HTTPException(
+            status_code=400,
+            detail="You must complete your registration before paying.",
+        )
+
+    if not participant.payment:
         if (
-            participant.t_shirt_size
-            and participant.t_shirt_size != Size.None_
-            and not participant.t_shirt_payment
+            participant.student_card is not None
+            and participant.student_card.validation == DocumentValidation.accepted
         ):
-            price += raid_prices.t_shirt_price
-            if not participant.payment:
-                checkout_name += " + "
-            checkout_name += "T Shirt taille" + participant.t_shirt_size.value
+            price += raid_prices.student_price
+            checkout_name = "Inscription Raid - Tarif étudiant"
+        else:
+            price += raid_prices.external_price
+            checkout_name = "Inscription Raid - Tarif externe"
+    if (
+        participant.t_shirt_size
+        and participant.t_shirt_size != Size.None_
+        and not participant.t_shirt_payment
+    ):
+        price += raid_prices.t_shirt_price
+        if not participant.payment:
+            checkout_name += " + "
+        checkout_name += "T Shirt taille" + participant.t_shirt_size.value
     user_dict = user.__dict__
     user_dict.pop("school", None)
     checkout = await payment_tool.init_checkout(

app/modules/raid/models_raid.py

@@ -201,7 +201,6 @@ def validation_progress(self) -> float:
             self.t_shirt_size,
             self.situation,
             self.attestation_on_honour,
-            self.payment,
         ]
         number_validated: float = sum(
             [condition is not None for condition in conditions],

tests/commons.py

@@ -19,13 +19,15 @@
 from app.core.utils import security
 from app.core.utils.config import Settings
 from app.dependencies import get_settings
+from app.types import core_data
 from app.types.exceptions import RedisConnectionError
 from app.types.floors_type import FloorsType
 from app.types.scheduler import OfflineScheduler, Scheduler
 from app.types.sqlalchemy import Base
 from app.utils.redis import connect, disconnect
 from app.utils.tools import (
     get_random_string,
+    set_core_data,
 )
 
 
@@ -224,6 +226,23 @@ async def add_object_to_db(db_object: Base) -> None:
             await db.close()
 
 
+async def add_coredata_to_db(
+    core_data: core_data.BaseCoreData,
+) -> None:
+    """
+    Add a CoreData object
+    """
+    async with TestingSessionLocal() as db:
+        try:
+            await set_core_data(core_data, db=db)
+            await db.commit()
+        except Exception as error:
+            await db.rollback()
+            raise FailedToAddObjectToDB from error
+        finally:
+            await db.close()
+
+
 class MockedPaymentTool:
     original_payment_tool: PaymentTool
 

tests/test_raid.py

@@ -8,6 +8,7 @@
 import pytest_asyncio
 from fastapi.testclient import TestClient
 from PIL import Image
+from pytest_mock import MockerFixture
 
 from app.core.groups.groups_type import GroupType
 from app.core.users import models_users
@@ -26,6 +27,7 @@
     maximize_image,
 )
 from tests.commons import (
+    add_coredata_to_db,
     add_object_to_db,
     create_api_access_token,
     create_user_with_groups,
@@ -207,6 +209,14 @@ async def init_objects() -> None:
             "data/raid/" + path,
         )
 
+    await add_coredata_to_db(
+        coredata_raid.RaidPrice(
+            student_price=50,
+            t_shirt_price=15,
+            external_price=90,
+        ),
+    )
+
 
 def test_get_participant_by_id(client: TestClient):
     response = client.get(
@@ -638,7 +648,7 @@ def test_get_raid_price(client: TestClient):
 
 
 def test_update_raid_price(client: TestClient):
-    price_data = {"student_price": 50, "t_shirt_price": 15}
+    price_data = {"student_price": 50, "t_shirt_price": 15, "external_price": 90}
     response = client.patch(
         "/raid/price",
         json=price_data,
@@ -664,40 +674,38 @@ def test_delete_team(client: TestClient):
     assert response.status_code == 204
 
 
-async def test_get_payment_url_no_participant(client: TestClient, mocker):
+async def test_get_payment_url_no_participant(
+    client: TestClient,
+    mocker: MockerFixture,
+):
     # Mock the necessary dependencies
     mocker.patch("app.modules.raid.cruds_raid.get_participant_by_id", return_value=None)
-    mocker.patch(
-        "app.utils.tools.get_core_data",
-        return_value=coredata_raid.RaidPrice(student_price=50, t_shirt_price=15),
-    )
 
     mocker.patch("app.modules.raid.cruds_raid.create_participant_checkout")
 
     response = client.get(
         "/raid/pay",
         headers={"Authorization": f"Bearer {token_simple}"},
     )
-    assert response.status_code == 201
-    assert "url" in response.json()
-    assert response.json()["url"] == "https://some.url.fr/checkout"
+    assert response.status_code == 404
+    assert response.json()["detail"] == "Participant not found."
 
 
-async def test_get_payment_url_participant_no_payment(client: TestClient, mocker):
-    # Mock the necessary dependencies
+async def test_get_payment_url_participant_no_payment(
+    client: TestClient,
+    mocker: MockerFixture,
+):
+    # Mock the necessary dependencies test_get_payment_url_participant_already_paid
     mocker.patch(
         "app.modules.raid.cruds_raid.get_participant_by_id",
         return_value=Mock(
             payment=False,
             t_shirt_size=None,
             t_shirt_payment=False,
             id=str(uuid.uuid4()),
+            validation_progress=100,
         ),
     )
-    mocker.patch(
-        "app.utils.tools.get_core_data",
-        return_value=coredata_raid.RaidPrice(student_price=50, t_shirt_price=15),
-    )
 
     mocker.patch("app.modules.raid.cruds_raid.create_participant_checkout")
 
@@ -710,7 +718,10 @@ async def test_get_payment_url_participant_no_payment(client: TestClient, mocker
     assert response.json()["url"] == "https://some.url.fr/checkout"
 
 
-async def test_get_payment_url_participant_with_tshirt(client: TestClient, mocker):
+async def test_get_payment_url_participant_with_tshirt(
+    client: TestClient,
+    mocker: MockerFixture,
+):
     # Mock the necessary dependencies
     mocker.patch(
         "app.modules.raid.cruds_raid.get_participant_by_id",
@@ -719,12 +730,10 @@ async def test_get_payment_url_participant_with_tshirt(client: TestClient, mocke
             t_shirt_size=Mock(value="L"),
             t_shirt_payment=False,
             id=str(uuid.uuid4()),
+            validation_progress=100,
         ),
     )
-    mocker.patch(
-        "app.utils.tools.get_core_data",
-        return_value=coredata_raid.RaidPrice(student_price=50, t_shirt_price=15),
-    )
+
     mocker.patch(
         "app.core.payment.payment_tool.PaymentTool.init_checkout",
         return_value=Mock(
@@ -743,26 +752,32 @@ async def test_get_payment_url_participant_with_tshirt(client: TestClient, mocke
     assert response.json()["url"] == "https://some.url.fr/checkout"
 
 
-# async def test_get_payment_url_prices_not_set(client: TestClient, mocker):
-#     # Mock the necessary dependencies
-#     mocker.patch(
-#         "app.utils.tools.get_core_data",
-#         return_value=coredata_raid.RaidPrice(student_price=None, t_shirt_price=None),
-#     )
-#     mocker.patch(
-#         "app.core.payment.payment_tool.PaymentTool.init_checkout",
-#         return_value=Mock(id=str(uuid.uuid4()), payment_url="http://mock-url.com"),
-#     )
+async def test_get_payment_url_prices_not_set(
+    client: TestClient,
+    mocker: MockerFixture,
+):
+    # Mock the necessary dependencies
+    mocker.patch(
+        "app.modules.raid.endpoints_raid.get_core_data",
+        return_value=coredata_raid.RaidPrice(student_price=None, t_shirt_price=None),
+    )
+    mocker.patch(
+        "app.core.payment.payment_tool.PaymentTool.init_checkout",
+        return_value=Mock(id=str(uuid.uuid4()), payment_url="http://mock-url.com"),
+    )
 
-#     response = client.get(
-#         "/raid/pay",
-#         headers={"Authorization": f"Bearer {token_simple}"},
-#     )
-#     assert response.status_code == 404
-#     assert response.json()["detail"] == "Prices not set."
+    response = client.get(
+        "/raid/pay",
+        headers={"Authorization": f"Bearer {token_simple}"},
+    )
+    assert response.status_code == 404
+    assert response.json()["detail"] == "Prices not set."
 
 
-async def test_get_payment_url_participant_already_paid(client: TestClient, mocker):
+async def test_get_payment_url_participant_already_paid(
+    client: TestClient,
+    mocker: MockerFixture,
+):
     # Mock the necessary dependencies
     mocker.patch(
         "app.modules.raid.cruds_raid.get_participant_by_id",
@@ -771,12 +786,9 @@ async def test_get_payment_url_participant_already_paid(client: TestClient, mock
             t_shirt_size=None,
             t_shirt_payment=True,
             id=str(uuid.uuid4()),
+            validation_progress=100,
         ),
     )
-    mocker.patch(
-        "app.utils.tools.get_core_data",
-        return_value=coredata_raid.RaidPrice(student_price=50, t_shirt_price=15),
-    )
 
     mocker.patch("app.modules.raid.cruds_raid.create_participant_checkout")
 
@@ -967,7 +979,9 @@ def test_html_pdf_writer_init():
 #     assert result == f"data/raid/{mock_participant.id}.pdf"
 
 
-async def test_set_team_number_utility_empty_database(mocker):
+async def test_set_team_number_utility_empty_database(
+    mocker: MockerFixture,
+):
     """Test the set_team_number utility with an empty database (no existing teams)"""
     # Create mock objects
     mock_db = mocker.AsyncMock()
@@ -998,7 +1012,9 @@ async def test_set_team_number_utility_empty_database(mocker):
     assert args[1].number == 101  # 100 (sports separator) + 1
 
 
-async def test_set_team_number_utility_existing_teams(mocker):
+async def test_set_team_number_utility_existing_teams(
+    mocker: MockerFixture,
+):
     """Test the set_team_number utility with existing teams"""
     # Create mock objects
     mock_db = mocker.AsyncMock()
@@ -1029,7 +1045,9 @@ async def test_set_team_number_utility_existing_teams(mocker):
     assert args[1].number == 221  # 220 + 1
 
 
-async def test_set_team_number_utility_no_difficulty(mocker):
+async def test_set_team_number_utility_no_difficulty(
+    mocker: MockerFixture,
+):
     """Test the set_team_number utility with a team without difficulty"""
     # Create mock objects
     mock_db = mocker.AsyncMock()
@@ -1051,7 +1069,9 @@ async def test_set_team_number_utility_no_difficulty(mocker):
     mock_update_team.assert_not_called()
 
 
-async def test_set_team_number_utility_discovery_difficulty(mocker):
+async def test_set_team_number_utility_discovery_difficulty(
+    mocker: MockerFixture,
+):
     """Test the set_team_number utility with discovery difficulty"""
     # Create mock objects
     mock_db = mocker.AsyncMock()