| Président·e |
diff --git a/migrations/versions/67-raid-security-file-consent.py b/migrations/versions/67-raid-security-file-consent.py
new file mode 100644
index 0000000000..df9d486e08
--- /dev/null
+++ b/migrations/versions/67-raid-security-file-consent.py
@@ -0,0 +1,52 @@
+from collections.abc import Sequence
+from typing import TYPE_CHECKING
+
+from app.types.sqlalchemy import TZDateTime
+
+if TYPE_CHECKING:
+ from pytest_alembic import MigrationContext
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "e0e6f306bed7"
+down_revision: str | None = "320892a84fd8"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+
+ op.add_column(
+ "raid_security_file",
+ sa.Column(
+ "consent_given",
+ sa.Boolean(),
+ nullable=False,
+ server_default="False",
+ ),
+ )
+ op.add_column(
+ "raid_security_file",
+ sa.Column("consent_given_at", TZDateTime(), nullable=True),
+ )
+
+
+def downgrade() -> None:
+ op.drop_column("raid_security_file", "consent_given")
+ op.drop_column("raid_security_file", "consent_given_at")
+
+
+def pre_test_upgrade(
+ alembic_runner: "MigrationContext",
+ alembic_connection: sa.Connection,
+) -> None:
+ pass
+
+
+def test_upgrade(
+ alembic_runner: "MigrationContext",
+ alembic_connection: sa.Connection,
+) -> None:
+ pass
diff --git a/migrations/versions/68-raid-payment-for-volunteer.py b/migrations/versions/68-raid-payment-for-volunteer.py
new file mode 100644
index 0000000000..52ce5ee524
--- /dev/null
+++ b/migrations/versions/68-raid-payment-for-volunteer.py
@@ -0,0 +1,84 @@
+"""Add payment fields to raid_volunteer and create raid_volunteer_checkout table
+
+Create Date: 2026-09-04 14:49:46.689444
+"""
+
+from collections.abc import Sequence
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from pytest_alembic import MigrationContext
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "1638e8a71c27"
+down_revision: str | None = "e0e6f306bed7"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.create_table(
+ "raid_volunteer_checkout",
+ sa.Column("id", sa.String(), nullable=False),
+ sa.Column("volunteer_user_id", sa.String(), nullable=False),
+ sa.Column("edition_id", sa.Uuid(), nullable=False),
+ sa.Column("checkout_id", sa.Uuid(), nullable=False),
+ sa.ForeignKeyConstraint(["checkout_id"], ["checkout_checkout.id"]),
+ sa.ForeignKeyConstraint(
+ ["volunteer_user_id", "edition_id"],
+ ["raid_volunteer.user_id", "raid_volunteer.edition_id"],
+ name="fk_raid_volunteer_checkout_volunteer",
+ ),
+ sa.PrimaryKeyConstraint("id"),
+ )
+ op.create_index(
+ op.f("ix_raid_volunteer_checkout_id"),
+ "raid_volunteer_checkout",
+ ["id"],
+ unique=False,
+ )
+ # Add columns with default values for existing rows
+ op.add_column(
+ "raid_volunteer",
+ sa.Column("payment", sa.Boolean(), nullable=False, server_default=sa.false()),
+ )
+ op.add_column(
+ "raid_volunteer",
+ sa.Column(
+ "t_shirt_payment",
+ sa.Boolean(),
+ nullable=False,
+ server_default=sa.false(),
+ ),
+ )
+ # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.drop_column("raid_volunteer", "t_shirt_payment")
+ op.drop_column("raid_volunteer", "payment")
+ op.drop_index(
+ op.f("ix_raid_volunteer_checkout_id"),
+ table_name="raid_volunteer_checkout",
+ )
+ op.drop_table("raid_volunteer_checkout")
+ # ### end Alembic commands ###
+
+
+def pre_test_upgrade(
+ alembic_runner: "MigrationContext",
+ alembic_connection: sa.Connection,
+) -> None:
+ pass
+
+
+def test_upgrade(
+ alembic_runner: "MigrationContext",
+ alembic_connection: sa.Connection,
+) -> None:
+ pass
diff --git a/migrations/versions/69-raid-scholarship-price.py b/migrations/versions/69-raid-scholarship-price.py
new file mode 100644
index 0000000000..9664384bfa
--- /dev/null
+++ b/migrations/versions/69-raid-scholarship-price.py
@@ -0,0 +1,107 @@
+"""69-raid-scholarship-price
+
+Create Date: 2026-09-11 10:28:18.162848
+"""
+
+from collections.abc import Sequence
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from pytest_alembic import MigrationContext
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "cfdbcbca654a"
+down_revision: str | None = "1638e8a71c27"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.add_column(
+ "raid_participant",
+ sa.Column("school_authorization_id", sa.String(), nullable=True),
+ )
+ op.add_column(
+ "raid_participant",
+ sa.Column(
+ "has_scholarship",
+ sa.Boolean(),
+ nullable=False,
+ server_default=sa.false(),
+ ),
+ )
+ op.create_foreign_key(
+ "raid_participant_school_authorization_id_fkey",
+ "raid_participant",
+ "raid_document",
+ ["school_authorization_id"],
+ ["id"],
+ )
+ # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+ # ### commands auto generated by Alembic - please adjust! ###
+ op.drop_constraint(
+ "raid_participant_school_authorization_id_fkey",
+ "raid_participant",
+ type_="foreignkey",
+ )
+ op.drop_column("raid_participant", "has_scholarship")
+ op.drop_column("raid_participant", "school_authorization_id")
+ # ### end Alembic commands ###
+
+
+def pre_test_upgrade(
+ alembic_runner: "MigrationContext",
+ alembic_connection: sa.Connection,
+) -> None:
+ pass
+
+
+def test_upgrade(
+ alembic_runner: "MigrationContext",
+ alembic_connection: sa.Connection,
+) -> None:
+ """Verify the new scholarship columns exist after the upgrade."""
+ columns = {
+ row[0]
+ for row in alembic_connection.execute(
+ sa.text(
+ "SELECT column_name FROM information_schema.columns "
+ "WHERE table_name = 'raid_participant'",
+ ),
+ ).fetchall()
+ }
+ assert "school_authorization_id" in columns
+ assert "has_scholarship" in columns
+
+ # `has_scholarship` must be NOT NULL with a false default for existing rows.
+ row = alembic_connection.execute(
+ sa.text(
+ "SELECT is_nullable, column_default FROM information_schema.columns "
+ "WHERE table_name = 'raid_participant' AND column_name = 'has_scholarship'",
+ ),
+ ).fetchone()
+ assert row is not None
+ is_nullable, column_default = row
+ assert is_nullable == "NO"
+ assert column_default is not None
+ assert "false" in column_default.lower()
+
+ # The school authorization column must reference raid_document.
+ fk = alembic_connection.execute(
+ sa.text(
+ "SELECT 1 FROM information_schema.table_constraints tc "
+ "JOIN information_schema.key_column_usage kcu "
+ "ON tc.constraint_name = kcu.constraint_name "
+ "WHERE tc.table_name = 'raid_participant' "
+ "AND tc.constraint_type = 'FOREIGN KEY' "
+ "AND kcu.column_name = 'school_authorization_id'",
+ ),
+ ).fetchone()
+ assert fk is not None
diff --git a/tests/modules/raid/test_pdf_generation.py b/tests/modules/raid/test_pdf_generation.py
index cbbf121018..f3b7b5801c 100644
--- a/tests/modules/raid/test_pdf_generation.py
+++ b/tests/modules/raid/test_pdf_generation.py
@@ -30,6 +30,8 @@ def _create_mock_participant(user_id: str | None = None) -> MagicMock:
participant.user_id = user_id
participant.situation = Situation.centrale
participant.is_minor = False
+ participant.school_authorization_id = None
+ participant.has_scholarship = False
participant.student_card_id = None
participant.id_card = None
participant.medical_certificate = None
@@ -67,6 +69,7 @@ def _create_mock_information() -> MagicMock:
info.rescue = None
info.security_responsible = None
info.volunteer_responsible = None
+ info.course_responsible = None
return info
@@ -141,7 +144,7 @@ async def test_get_all_team_files_zip_uses_team_id_for_pdf(self):
with (
patch(
- "app.modules.raid.utils.utils_raid.cruds_raid.get_all_teams",
+ "app.modules.raid.utils.utils_raid.cruds_raid.get_all_teams_including_security_files",
new=AsyncMock(return_value=[team]),
),
patch(
@@ -171,7 +174,7 @@ async def test_get_all_security_files_zip_uses_user_id_for_pdf(self):
with (
patch(
- "app.modules.raid.utils.utils_raid.cruds_raid.get_all_teams",
+ "app.modules.raid.utils.utils_raid.cruds_raid.get_all_teams_including_security_files",
new=AsyncMock(return_value=[team]),
),
patch(
diff --git a/tests/modules/raid/test_schemas_raid.py b/tests/modules/raid/test_schemas_raid.py
index 5d44238a37..62bfe21c05 100644
--- a/tests/modules/raid/test_schemas_raid.py
+++ b/tests/modules/raid/test_schemas_raid.py
@@ -75,6 +75,55 @@ def test_participant_update_allows_empty_body() -> None:
schemas_raid.RaidParticipantUpdate()
+# -- RaidParticipant scholarship fields -----------------------------------
+
+
+def test_participant_create_scholarship_defaults_false() -> None:
+ u = schemas_raid.RaidParticipantCreate(
+ user_id="u1",
+ edition_id=uuid4(),
+ status=RaidRegistrationStatus.draft,
+ )
+ assert u.has_scholarship is False
+ assert u.school_authorization_id is None
+
+
+def test_participant_create_accepts_scholarship_fields() -> None:
+ doc_id = str(uuid4())
+ u = schemas_raid.RaidParticipantCreate(
+ user_id="u1",
+ edition_id=uuid4(),
+ status=RaidRegistrationStatus.draft,
+ has_scholarship=True,
+ school_authorization_id=doc_id,
+ )
+ assert u.has_scholarship is True
+ assert u.school_authorization_id == doc_id
+
+
+def test_participant_update_accepts_school_authorization_id() -> None:
+ doc_id = str(uuid4())
+ u = schemas_raid.RaidParticipantUpdate(school_authorization_id=doc_id)
+ assert u.school_authorization_id == doc_id
+
+
+def test_participant_update_accepts_has_scholarship() -> None:
+ """The update schema carries the scholarship flag (admin-only upstream)."""
+ u = schemas_raid.RaidParticipantUpdate(has_scholarship=True)
+ assert u.has_scholarship is True
+
+ unset = schemas_raid.RaidParticipantUpdate()
+ assert unset.has_scholarship is None # absent = don't touch
+
+
+def test_participant_restricted_requires_scholarship_flag() -> None:
+ """The read schema exposes has_scholarship as a required field."""
+ fields = schemas_raid.RaidParticipantRestricted.model_fields
+ assert "has_scholarship" in fields
+ assert "school_authorization_id" in fields
+ assert fields["has_scholarship"].is_required()
+
+
def test_participant_update_preserves_other_school_when_other() -> None:
u = schemas_raid.RaidParticipantUpdate(
situation=Situation.other,
diff --git a/tests/modules/raid/test_security_file_fk.py b/tests/modules/raid/test_security_file_fk.py
index 59de5143cb..8484fe4f06 100644
--- a/tests/modules/raid/test_security_file_fk.py
+++ b/tests/modules/raid/test_security_file_fk.py
@@ -91,6 +91,7 @@ def _create_mock_security_file_base() -> schemas_raid.SecurityFileBase:
emergency_person_name="Doe",
emergency_person_phone="0600000000",
file_id=None,
+ consent_given=True,
)
diff --git a/tests/modules/raid/test_utils_raid.py b/tests/modules/raid/test_utils_raid.py
index bc282b930b..8618114722 100644
--- a/tests/modules/raid/test_utils_raid.py
+++ b/tests/modules/raid/test_utils_raid.py
@@ -21,7 +21,12 @@
from app.modules.raid import coredata_raid
from app.modules.raid.models_raid import RaidParticipant, RaidTeam
-from app.modules.raid.raid_type import Difficulty, Situation, Size
+from app.modules.raid.raid_type import (
+ Difficulty,
+ DocumentValidation,
+ Situation,
+ Size,
+)
from app.modules.raid.utils.utils_raid import (
calculate_raid_payment,
get_all_security_files_zip,
@@ -83,21 +88,106 @@ def prices() -> coredata_raid.RaidPrice:
student_price=50,
t_shirt_price=15,
external_price=90,
+ volunteer_price=0,
+ scholarship_price=25,
)
def _participant(**kwargs):
+ school_authorization = kwargs.pop("school_authorization", None)
defaults: dict[str, Any] = {
"user_id": str(uuid4()),
"edition_id": uuid4(),
"payment": False,
"t_shirt_payment": False,
"t_shirt_size": None,
+ "has_scholarship": False,
"situation": None,
"student_card_id": None,
}
defaults.update(kwargs)
- return RaidParticipant(**defaults)
+ participant = RaidParticipant(**defaults)
+ participant.school_authorization = school_authorization
+ return participant
+
+
+def _accepted_doc() -> Any:
+ """A school authorization document already accepted by an admin."""
+ doc = Mock()
+ doc.validation = DocumentValidation.accepted
+ return doc
+
+
+def test_payment_scholarship(prices) -> None:
+ p = _participant(
+ situation=Situation.centrale,
+ student_card_id=str(uuid.uuid4()),
+ has_scholarship=True,
+ school_authorization=_accepted_doc(),
+ )
+ price, label = calculate_raid_payment(p, prices)
+ assert price == 25
+ assert "boursier" in label
+
+
+def test_payment_scholarship_takes_precedence_over_external(prices) -> None:
+ """Scholarship wins even without any student card / central situation."""
+ p = _participant(
+ situation=Situation.other,
+ has_scholarship=True,
+ school_authorization=_accepted_doc(),
+ )
+ price, label = calculate_raid_payment(p, prices)
+ assert price == 25
+ assert "boursier" in label
+
+
+def test_payment_scholarship_with_tshirt(prices) -> None:
+ p = _participant(
+ situation=Situation.other,
+ has_scholarship=True,
+ school_authorization=_accepted_doc(),
+ t_shirt_size=Size.M,
+ )
+ price, label = calculate_raid_payment(p, prices)
+ assert price == 40 # 25 scholarship + 15 t-shirt
+ assert "boursier" in label
+
+
+def test_payment_scholarship_without_document_is_external(prices) -> None:
+ """The flag alone must not unlock the discounted price."""
+ p = _participant(situation=Situation.other, has_scholarship=True)
+ price, label = calculate_raid_payment(p, prices)
+ assert price == 90
+ assert "externe" in label
+
+
+def test_payment_scholarship_with_pending_document_is_external(prices) -> None:
+ """A pending (not yet accepted) document does not grant the discount."""
+ doc = Mock()
+ doc.validation = DocumentValidation.pending
+ p = _participant(
+ situation=Situation.other,
+ has_scholarship=True,
+ school_authorization=doc,
+ )
+ price, label = calculate_raid_payment(p, prices)
+ assert price == 90
+ assert "externe" in label
+
+
+def test_payment_raises_if_scholarship_price_missing() -> None:
+ """Prices must explicitly include scholarship_price."""
+ bad_prices = coredata_raid.RaidPrice(
+ student_price=50,
+ t_shirt_price=15,
+ external_price=90,
+ scholarship_price=None,
+ )
+ p = _participant(situation=Situation.other)
+ with pytest.raises(HTTPException) as exc_info:
+ calculate_raid_payment(p, bad_prices)
+ assert exc_info.value.status_code == 404
def test_payment_centrale_with_student_card(prices) -> None:
@@ -328,7 +418,7 @@ async def test_get_all_security_files_zip_no_teams(mocker: MockerFixture) -> Non
edition_id = uuid4()
mocker.patch(
- "app.modules.raid.cruds_raid.get_all_teams",
+ "app.modules.raid.cruds_raid.get_all_teams_including_security_files",
new=AsyncMock(return_value=[]),
)
@@ -347,7 +437,7 @@ async def test_get_all_team_files_zip_no_teams(mocker: MockerFixture) -> None:
edition_id = uuid4()
mocker.patch(
- "app.modules.raid.cruds_raid.get_all_teams",
+ "app.modules.raid.cruds_raid.get_all_teams_including_security_files",
new=AsyncMock(return_value=[]),
)
diff --git a/tests/modules/raid/test_utils_raid_extended.py b/tests/modules/raid/test_utils_raid_extended.py
index 5a324e73b3..8d1f6386d7 100644
--- a/tests/modules/raid/test_utils_raid_extended.py
+++ b/tests/modules/raid/test_utils_raid_extended.py
@@ -16,6 +16,7 @@
from app.modules.raid import coredata_raid, schemas_raid
from app.modules.raid.raid_type import (
Difficulty,
+ DocumentValidation,
Situation,
Size,
)
@@ -145,6 +146,9 @@ async def test_validate_payment_raised_when_checkout_not_found():
mock_cruds.get_participant_checkout_by_checkout_id = AsyncMock(
return_value=None,
)
+ mock_cruds.get_volunteer_checkout_by_checkout_id = AsyncMock(
+ return_value=None,
+ )
with pytest.raises(RaidPayementError) as exc_info:
await validate_payment(checkout_payment, AsyncMock())
@@ -300,11 +304,14 @@ def test_calculate_raid_payment_student_with_card():
participant.payment = False
participant.t_shirt_size = None
participant.t_shirt_payment = False
+ participant.has_scholarship = False
prices = coredata_raid.RaidPrice(
student_price=50.0,
t_shirt_price=15.0,
external_price=90.0,
+ scholarship_price=25.0,
+ volunteer_price=0.0,
)
price, checkout_name = calculate_raid_payment(participant, prices)
@@ -321,11 +328,14 @@ def test_calculate_raid_payment_student_without_card():
participant.payment = False
participant.t_shirt_size = None
participant.t_shirt_payment = False
+ participant.has_scholarship = False
prices = coredata_raid.RaidPrice(
student_price=50.0,
t_shirt_price=15.0,
external_price=90.0,
+ scholarship_price=25.0,
+ volunteer_price=0.0,
)
price, checkout_name = calculate_raid_payment(participant, prices)
@@ -342,11 +352,14 @@ def test_calculate_raid_payment_other_school():
participant.payment = False
participant.t_shirt_size = None
participant.t_shirt_payment = False
+ participant.has_scholarship = False
prices = coredata_raid.RaidPrice(
student_price=50.0,
t_shirt_price=15.0,
external_price=90.0,
+ scholarship_price=25.0,
+ volunteer_price=0.0,
)
price, checkout_name = calculate_raid_payment(participant, prices)
@@ -363,11 +376,14 @@ def test_calculate_raid_payment_corporate_partner():
participant.payment = False
participant.t_shirt_size = None
participant.t_shirt_payment = False
+ participant.has_scholarship = False
prices = coredata_raid.RaidPrice(
student_price=50.0,
t_shirt_price=15.0,
external_price=90.0,
+ scholarship_price=25.0,
+ volunteer_price=0.0,
)
price, _ = calculate_raid_payment(participant, prices)
@@ -375,6 +391,54 @@ def test_calculate_raid_payment_corporate_partner():
assert price == 90.0 # Corporate partner is always external
+def test_calculate_raid_payment_scholarship():
+ """Test calculate_raid_payment for participant with scholarship."""
+ participant = Mock(spec=schemas_raid.RaidParticipant)
+ participant.situation = Situation.centrale
+ participant.student_card_id = "card_123"
+ participant.payment = False
+ participant.t_shirt_size = None
+ participant.t_shirt_payment = False
+ participant.has_scholarship = True
+ participant.school_authorization = Mock(validation=DocumentValidation.accepted)
+
+ prices = coredata_raid.RaidPrice(
+ student_price=50.0,
+ t_shirt_price=15.0,
+ external_price=90.0,
+ scholarship_price=25.0,
+ volunteer_price=0.0,
+ )
+
+ price, _ = calculate_raid_payment(participant, prices)
+
+ assert price == 25.0 # Scholarship price applies
+
+
+def test_calculate_raid_payment_scholarship_without_accepted_document():
+ """Flag without an accepted school authorization stays on external price."""
+ participant = Mock(spec=schemas_raid.RaidParticipant)
+ participant.situation = Situation.other
+ participant.student_card_id = None
+ participant.payment = False
+ participant.t_shirt_size = None
+ participant.t_shirt_payment = False
+ participant.has_scholarship = True
+ participant.school_authorization = None
+
+ prices = coredata_raid.RaidPrice(
+ student_price=50.0,
+ t_shirt_price=15.0,
+ external_price=90.0,
+ scholarship_price=25.0,
+ volunteer_price=0.0,
+ )
+
+ price, _ = calculate_raid_payment(participant, prices)
+
+ assert price == 90.0 # No accepted document -> external price
+
+
def test_calculate_raid_payment_with_tshirt():
"""Test calculate_raid_payment includes t-shirt when applicable."""
participant = Mock(spec=schemas_raid.RaidParticipant)
@@ -383,11 +447,14 @@ def test_calculate_raid_payment_with_tshirt():
participant.payment = False
participant.t_shirt_size = Size.L
participant.t_shirt_payment = False
+ participant.has_scholarship = False
prices = coredata_raid.RaidPrice(
student_price=50.0,
t_shirt_price=15.0,
external_price=90.0,
+ scholarship_price=25.0,
+ volunteer_price=0.0,
)
price, _ = calculate_raid_payment(participant, prices)
@@ -403,11 +470,14 @@ def test_calculate_raid_payment_already_paid():
participant.payment = True
participant.t_shirt_size = None
participant.t_shirt_payment = False
+ participant.has_scholarship = False
prices = coredata_raid.RaidPrice(
student_price=50.0,
t_shirt_price=15.0,
external_price=90.0,
+ scholarship_price=25.0,
+ volunteer_price=0.0,
)
price, _ = calculate_raid_payment(participant, prices)
@@ -423,11 +493,14 @@ def test_calculate_raid_payment_tshirt_alone():
participant.payment = True
participant.t_shirt_size = Size.L
participant.t_shirt_payment = False
+ participant.has_scholarship = False
prices = coredata_raid.RaidPrice(
student_price=50.0,
t_shirt_price=15.0,
external_price=90.0,
+ scholarship_price=25.0,
+ volunteer_price=0.0,
)
price, _ = calculate_raid_payment(participant, prices)
@@ -443,11 +516,14 @@ def test_calculate_raid_payment_fully_paid():
participant.payment = True
participant.t_shirt_size = Size.L
participant.t_shirt_payment = True
+ participant.has_scholarship = False
prices = coredata_raid.RaidPrice(
student_price=50.0,
t_shirt_price=15.0,
external_price=90.0,
+ scholarship_price=25.0,
+ volunteer_price=0.0,
)
price, _ = calculate_raid_payment(participant, prices)
@@ -463,6 +539,7 @@ def test_calculate_raid_payment_invalid_price():
participant.payment = False
participant.t_shirt_size = None
participant.t_shirt_payment = False
+ participant.has_scholarship = False
prices = coredata_raid.RaidPrice(
student_price=None,
@@ -488,11 +565,14 @@ def test_calculate_raid_payment_situation_none():
participant.payment = False
participant.t_shirt_size = None
participant.t_shirt_payment = False
+ participant.has_scholarship = False
prices = coredata_raid.RaidPrice(
student_price=50.0,
t_shirt_price=15.0,
external_price=90.0,
+ scholarship_price=25.0,
+ volunteer_price=0.0,
)
price, _ = calculate_raid_payment(participant, prices)
@@ -522,6 +602,8 @@ async def test_validate_payment_all_combinations():
prices.student_price = 50.0
prices.external_price = 90.0
prices.t_shirt_price = 15.0
+ prices.scholarship_price = 25.0
+ prices.volunteer_price = 0.0
with patch("app.modules.raid.utils.utils_raid.cruds_raid") as mock_cruds:
mock_cruds.get_participant_checkout_by_checkout_id = AsyncMock(
@@ -547,3 +629,91 @@ async def test_validate_payment_all_combinations():
participant_checkout.edition_id,
db,
)
+
+
+@pytest.mark.asyncio
+async def test_validate_payment_scholarship_amount_confirms_payment():
+ """The payment callback recognizes the scholarship price on its own."""
+ db = AsyncMock()
+ checkout_payment = schemas_payment.CheckoutPayment(
+ id=uuid4(),
+ checkout_id=uuid4(),
+ paid_amount=25.0, # scholarship price
+ )
+
+ participant_checkout = Mock()
+ participant_checkout.participant_user_id = "user_scholar"
+ participant_checkout.edition_id = uuid4()
+
+ prices = Mock()
+ prices.student_price = 50.0
+ prices.external_price = 90.0
+ prices.t_shirt_price = 15.0
+ prices.scholarship_price = 25.0
+ prices.volunteer_price = 0.0
+
+ with patch("app.modules.raid.utils.utils_raid.cruds_raid") as mock_cruds:
+ mock_cruds.get_participant_checkout_by_checkout_id = AsyncMock(
+ return_value=participant_checkout,
+ )
+ mock_cruds.confirm_payment = AsyncMock()
+ mock_cruds.confirm_t_shirt_payment = AsyncMock()
+
+ with patch(
+ "app.modules.raid.utils.utils_raid.get_core_data",
+ new=AsyncMock(return_value=prices),
+ ):
+ await validate_payment(checkout_payment, db)
+
+ mock_cruds.confirm_payment.assert_called_once_with(
+ "user_scholar",
+ participant_checkout.edition_id,
+ db,
+ )
+ mock_cruds.confirm_t_shirt_payment.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_validate_payment_scholarship_with_tshirt_confirms_both():
+ """The payment callback recognizes scholarship + t-shirt combination."""
+ db = AsyncMock()
+ checkout_payment = schemas_payment.CheckoutPayment(
+ id=uuid4(),
+ checkout_id=uuid4(),
+ paid_amount=40.0, # scholarship + t-shirt
+ )
+
+ participant_checkout = Mock()
+ participant_checkout.participant_user_id = "user_scholar"
+ participant_checkout.edition_id = uuid4()
+
+ prices = Mock()
+ prices.student_price = 50.0
+ prices.external_price = 90.0
+ prices.t_shirt_price = 15.0
+ prices.scholarship_price = 25.0
+ prices.volunteer_price = 0.0
+
+ with patch("app.modules.raid.utils.utils_raid.cruds_raid") as mock_cruds:
+ mock_cruds.get_participant_checkout_by_checkout_id = AsyncMock(
+ return_value=participant_checkout,
+ )
+ mock_cruds.confirm_payment = AsyncMock()
+ mock_cruds.confirm_t_shirt_payment = AsyncMock()
+
+ with patch(
+ "app.modules.raid.utils.utils_raid.get_core_data",
+ new=AsyncMock(return_value=prices),
+ ):
+ await validate_payment(checkout_payment, db)
+
+ mock_cruds.confirm_payment.assert_called_once_with(
+ "user_scholar",
+ participant_checkout.edition_id,
+ db,
+ )
+ mock_cruds.confirm_t_shirt_payment.assert_called_once_with(
+ "user_scholar",
+ participant_checkout.edition_id,
+ db,
+ )
diff --git a/tests/modules/raid/test_validation_checker.py b/tests/modules/raid/test_validation_checker.py
index 3ad0584746..a2aa77c596 100644
--- a/tests/modules/raid/test_validation_checker.py
+++ b/tests/modules/raid/test_validation_checker.py
@@ -53,12 +53,14 @@ def _make_validated_participant(
is_minor: bool = False,
with_student_card: bool | None = None,
with_parent_auth: bool | None = None,
+ with_school_authorization: bool = True,
payment: bool = True,
t_shirt_size: Size | None = None,
t_shirt_payment: bool = True,
attestation: bool = True,
with_security_file: bool = True,
security_contacts: bool = True,
+ has_scholarship: bool = False,
) -> Mock:
"""Assemble a participant that would pass every check by default."""
edition_id = edition_id or uuid4()
@@ -72,6 +74,7 @@ def _make_validated_participant(
participant.edition_id = edition_id
participant.situation = situation
participant.is_minor = is_minor
+ participant.has_scholarship = has_scholarship
participant.attestation_on_honour = attestation
participant.payment = payment
participant.t_shirt_size = t_shirt_size
@@ -85,6 +88,9 @@ def _make_validated_participant(
participant.parent_authorization = (
_make_doc(DocumentValidation.accepted) if with_parent_auth else None
)
+ participant.school_authorization = (
+ _make_doc(DocumentValidation.accepted) if with_school_authorization else None
+ )
participant.security_file = (
_make_security_file(security_contacts) if with_security_file else None
)
@@ -214,6 +220,39 @@ def test_check_all_documents_accepted_requires_student_card_for_otherschool() ->
assert exc_info.value.detail == "Missing student card"
+def test_check_all_documents_accepted_requires_school_authorization_for_scholarship() -> (
+ None
+):
+ p = _make_validated_participant(
+ situation=Situation.centrale,
+ is_minor=False,
+ with_school_authorization=False,
+ has_scholarship=True,
+ )
+ with pytest.raises(HTTPException) as exc_info:
+ validation_checker._check_all_documents_accepted(p)
+ assert exc_info.value.detail == "Missing school authorization"
+
+
+def test_check_all_documents_accepted_rejects_school_authorization_not_accepted() -> (
+ None
+):
+ p = _make_validated_participant(has_scholarship=True)
+ p.school_authorization = _make_doc(DocumentValidation.pending)
+ with pytest.raises(HTTPException) as exc_info:
+ validation_checker._check_all_documents_accepted(p)
+ assert exc_info.value.detail == "Document school authorization is not accepted"
+
+
+def test_check_all_documents_accepted_ignores_school_auth_without_scholarship() -> None:
+ """A missing school authorization is fine when has_scholarship is False."""
+ p = _make_validated_participant(
+ has_scholarship=False,
+ with_school_authorization=False,
+ )
+ validation_checker._check_all_documents_accepted(p) # no raise
+
+
def test_check_all_documents_accepted_requires_parent_auth_when_minor() -> None:
p = _make_validated_participant(
situation=Situation.centrale,
@@ -443,12 +482,18 @@ def test_count_total_required_documents_centrale() -> None:
spec=models_raid.RaidParticipant,
situation=Situation.centrale,
is_minor=False,
+ has_scholarship=False,
)
assert validation_checker.count_total_required_documents(p) == 4
def test_count_total_required_documents_other_minor() -> None:
- p = Mock(spec=models_raid.RaidParticipant, situation=Situation.other, is_minor=True)
+ p = Mock(
+ spec=models_raid.RaidParticipant,
+ situation=Situation.other,
+ is_minor=True,
+ has_scholarship=False,
+ )
assert validation_checker.count_total_required_documents(p) == 4
@@ -457,7 +502,32 @@ def test_count_total_required_documents_centrale_minor() -> None:
spec=models_raid.RaidParticipant,
situation=Situation.centrale,
is_minor=True,
+ has_scholarship=False,
+ )
+ assert validation_checker.count_total_required_documents(p) == 5
+
+
+def test_count_total_required_documents_other_minor_scholarship() -> None:
+ p = Mock(
+ spec=models_raid.RaidParticipant,
+ situation=Situation.other,
+ is_minor=True,
+ has_scholarship=True,
+ )
+ # id_card + medical_certificate + raid_rules + parent_authorization
+ # + school_authorization (no student card for `other`)
+ assert validation_checker.count_total_required_documents(p) == 5
+
+
+def test_count_total_required_documents_centrale_scholarship() -> None:
+ p = Mock(
+ spec=models_raid.RaidParticipant,
+ situation=Situation.centrale,
+ is_minor=False,
+ has_scholarship=True,
)
+ # id_card + medical_certificate + raid_rules + student_card
+ # + school_authorization
assert validation_checker.count_total_required_documents(p) == 5
@@ -467,8 +537,47 @@ def test_count_accepted_documents_all_present() -> None:
assert validation_checker.count_accepted_documents(p) == 5
+def test_count_accepted_documents_scholarship_all_present() -> None:
+ p = _make_validated_participant(situation=Situation.centrale, has_scholarship=True)
+ # id_card + medical_certificate + raid_rules + student_card + school_authorization
+ assert validation_checker.count_accepted_documents(p) == 5
+
+
+def test_count_accepted_documents_scholarship_without_doc_not_counted() -> None:
+ p = _make_validated_participant(
+ situation=Situation.centrale,
+ has_scholarship=True,
+ with_school_authorization=False,
+ )
+ # id_card + medical_certificate + raid_rules + student_card
+ assert validation_checker.count_accepted_documents(p) == 4
+
+
def test_count_accepted_documents_pending_not_counted() -> None:
p = _make_validated_participant()
p.id_card = _make_doc(DocumentValidation.pending)
# lost id_card -> 2 (medical + raid_rules) + student_card
assert validation_checker.count_accepted_documents(p) == 3
+
+
+def test_compute_participant_progress_temporary_school_authorization_counts_half() -> (
+ None
+):
+ """A `temporary` school authorization scores half a slot for scholars."""
+ complete = _make_validated_participant(has_scholarship=True)
+ partial = _make_validated_participant(has_scholarship=True)
+ partial.school_authorization = _make_doc(DocumentValidation.temporary)
+
+ complete_progress = validation_checker.compute_participant_progress(complete)
+ partial_progress = validation_checker.compute_participant_progress(partial)
+
+ # centrale + scholarship: 11 slots total, the school authorization slot
+ # is worth 0.5 instead of 1.0.
+ assert complete_progress - partial_progress == pytest.approx(100 * 0.5 / 11)
+ assert complete_progress > partial_progress > 0
+
+
+def test_compute_participant_progress_full_with_scholarship() -> None:
+ p = _make_validated_participant(has_scholarship=True)
+ progress = validation_checker.compute_participant_progress(p)
+ assert progress >= 70
diff --git a/tests/modules/test_raid.py b/tests/modules/test_raid.py
index 1a01af223e..8ebbfcfb76 100644
--- a/tests/modules/test_raid.py
+++ b/tests/modules/test_raid.py
@@ -7,16 +7,16 @@
the participant/volunteer payloads stay small and mirror the real API shape.
"""
-import asyncio
import datetime
import uuid
import pytest
import pytest_asyncio
from fastapi.testclient import TestClient
-from sqlalchemy import update
+from sqlalchemy import delete, update
from app.core.groups import models_groups
+from app.core.payment import cruds_payment, models_payment
from app.core.users import cruds_users, models_users, schemas_users
from app.modules.raid import coredata_raid, cruds_raid, models_raid, schemas_raid
from app.modules.raid.endpoints_raid import RaidPermissions
@@ -29,6 +29,7 @@
Situation,
Size,
)
+from app.utils.tools import save_bytes_as_data
from tests.commons import (
add_coredata_to_db,
add_object_to_db,
@@ -36,6 +37,7 @@
create_groups_with_permissions,
create_user_with_groups,
get_TestingSessionLocal,
+ mocked_checkout_id,
)
# ---------------------------------------------------------------------------
@@ -103,6 +105,7 @@ async def init_objects() -> None:
t_shirt_price=15,
partner_price=70,
external_price=90,
+ scholarship_price=25,
),
)
await add_coredata_to_db(coredata_raid.RaidInformation())
@@ -298,7 +301,7 @@ def test_delete_edition_with_participants_rejected(client: TestClient) -> None:
def test_get_participant_self(client: TestClient) -> None:
r = client.get(
- f"/raid/participants/{user_captain.id}",
+ "/raid/participants/me",
headers={"Authorization": f"Bearer {token_captain}"},
)
assert r.status_code == 200
@@ -413,6 +416,18 @@ def test_update_participant_invalid_document(client: TestClient) -> None:
assert r.status_code == 404
+def test_update_participant_with_unknown_school_authorization(
+ client: TestClient,
+) -> None:
+ """PATCH /participants validates the school authorization document too."""
+ r = client.patch(
+ f"/raid/participants/{user_captain.id}",
+ json={"school_authorization_id": "does-not-exist"},
+ headers={"Authorization": f"Bearer {token_captain}"},
+ )
+ assert r.status_code == 404
+
+
def test_submit_without_attestation_400(client: TestClient) -> None:
r = client.post(
f"/raid/participants/{user_captain.id}/submit",
@@ -442,7 +457,9 @@ def test_admin_validate_fails_before_prerequisites(client: TestClient) -> None:
assert r.status_code == 400
-async def _prepare_full_validation_state() -> None:
+async def test_admin_validate_full_happy_path(
+ client: TestClient,
+) -> None:
"""Promote captain + second to every prerequisite (except difficulty/meeting)."""
async with get_TestingSessionLocal()() as db:
docs = {}
@@ -506,20 +523,17 @@ async def _prepare_full_validation_state() -> None:
)
await db.commit()
-
-def test_admin_validate_full_happy_path(client: TestClient) -> None:
- asyncio.get_event_loop().run_until_complete(_prepare_full_validation_state())
-
r = client.patch(
f"/raid/participants/{user_captain.id}/validate",
headers={"Authorization": f"Bearer {token_admin}"},
)
- assert r.status_code == 204, r.json()
+ assert r.status_code == 204
r = client.get(
f"/raid/participants/{user_captain.id}",
headers={"Authorization": f"Bearer {token_admin}"},
)
+ assert r.status_code == 200
assert r.json()["status"] == "validated"
@@ -559,6 +573,7 @@ def test_admin_reopen_to_draft(client: TestClient) -> None:
f"/raid/participants/{user_captain.id}",
headers={"Authorization": f"Bearer {token_admin}"},
)
+ assert r2.status_code == 200
assert r2.json()["status"] == "draft"
@@ -569,9 +584,10 @@ def test_cancel_by_self(client: TestClient) -> None:
)
assert r.status_code == 204
r2 = client.get(
- f"/raid/participants/{user_solo.id}",
+ "/raid/participants/me",
headers={"Authorization": f"Bearer {token_solo}"},
)
+ assert r2.status_code == 200
assert r2.json()["status"] == "cancelled"
@@ -608,10 +624,12 @@ def test_get_team_by_participant(client: TestClient) -> None:
def test_update_team_by_captain(client: TestClient) -> None:
- team = client.get(
+ r = client.get(
f"/raid/participants/{user_captain.id}/team",
headers={"Authorization": f"Bearer {token_captain}"},
- ).json()
+ )
+ assert r.status_code == 200
+ team = r.json()
r = client.patch(
f"/raid/teams/{team['id']}",
json={"name": "MainTeam-Renamed"},
@@ -620,6 +638,15 @@ def test_update_team_by_captain(client: TestClient) -> None:
assert r.status_code == 204
+def test_update_my_team_as_captain(client: TestClient) -> None:
+ r = client.get(
+ "/raid/participants/me/team",
+ headers={"Authorization": f"Bearer {token_captain}"},
+ )
+ assert r.status_code == 200
+ assert r.json()["captain"]["user_id"] == user_captain.id
+
+
# ---------------------------------------------------------------------------
# Documents
# ---------------------------------------------------------------------------
@@ -634,6 +661,24 @@ def test_upload_document(client: TestClient) -> None:
assert r.status_code == 201
+def test_upload_school_authorization_document(client: TestClient) -> None:
+ """Uploading a school authorization assigns it to the participant."""
+ r = client.post(
+ "/raid/document/schoolAuthorization",
+ files={"file": ("school_auth.pdf", b"blob", "application/pdf")},
+ headers={"Authorization": f"Bearer {token_captain}"},
+ )
+ assert r.status_code == 201
+ doc_id = r.json()["id"]
+
+ r = client.get(
+ "/raid/participants/me",
+ headers={"Authorization": f"Bearer {token_captain}"},
+ )
+ assert r.status_code == 200
+ assert r.json()["school_authorization_id"] == doc_id
+
+
def test_validate_document_requires_admin(client: TestClient) -> None:
r = client.post(
f"/raid/document/{doc_pending.id}/validate?validation=accepted",
@@ -776,22 +821,20 @@ def test_update_volunteer_self(client: TestClient) -> None:
assert r.status_code == 204
-def test_validate_volunteer_fails_with_car_but_no_seats(
+async def test_validate_volunteer_fails_with_car_but_no_seats(
client: TestClient,
) -> None:
- async def _break_car():
- async with get_TestingSessionLocal()() as db:
- await db.execute(
- update(models_raid.RaidVolunteer)
- .where(
- models_raid.RaidVolunteer.user_id == user_volunteer.id,
- models_raid.RaidVolunteer.edition_id == active_edition.id,
- )
- .values(has_car=True, car_seats=None),
- )
- await db.commit()
- asyncio.get_event_loop().run_until_complete(_break_car())
+ async with get_TestingSessionLocal()() as db:
+ await db.execute(
+ update(models_raid.RaidVolunteer)
+ .where(
+ models_raid.RaidVolunteer.user_id == user_volunteer.id,
+ models_raid.RaidVolunteer.edition_id == active_edition.id,
+ )
+ .values(has_car=True, car_seats=None),
+ )
+ await db.commit()
r = client.patch(
f"/raid/volunteers/{user_volunteer.id}/validate",
@@ -801,20 +844,18 @@ async def _break_car():
assert "car_seats" in r.json()["detail"]
-def test_validate_volunteer_success(client: TestClient) -> None:
- async def _restore():
- async with get_TestingSessionLocal()() as db:
- await db.execute(
- update(models_raid.RaidVolunteer)
- .where(
- models_raid.RaidVolunteer.user_id == user_volunteer.id,
- models_raid.RaidVolunteer.edition_id == active_edition.id,
- )
- .values(has_car=True, car_seats=4),
- )
- await db.commit()
+async def test_validate_volunteer_success(client: TestClient) -> None:
- asyncio.get_event_loop().run_until_complete(_restore())
+ async with get_TestingSessionLocal()() as db:
+ await db.execute(
+ update(models_raid.RaidVolunteer)
+ .where(
+ models_raid.RaidVolunteer.user_id == user_volunteer.id,
+ models_raid.RaidVolunteer.edition_id == active_edition.id,
+ )
+ .values(has_car=True, car_seats=4),
+ )
+ await db.commit()
r = client.patch(
f"/raid/volunteers/{user_volunteer.id}/validate",
@@ -847,6 +888,446 @@ def test_get_volunteer_me_after_delete(client: TestClient) -> None:
assert r.status_code == 404
+# ---------------------------------------------------------------------------
+# Scholarship flow (has_scholarship + school_authorization document)
+# ---------------------------------------------------------------------------
+
+
+async def _setup_scholarship_participant(
+ user: models_users.CoreUser,
+) -> None:
+ """Promote an existing participant to a scholarship participant ready to validate."""
+ # Team completeness requires a second member; give the team a bare one.
+ second_user = await create_user_with_groups([])
+ await _set_user_identity(
+ second_user.id,
+ "+33672000099",
+ datetime.date(2000, 1, 31),
+ )
+
+ async with get_TestingSessionLocal()() as db:
+ docs = {}
+ for doc_type in (
+ DocumentType.idCard,
+ DocumentType.medicalCertificate,
+ DocumentType.raidRules,
+ DocumentType.studentCard,
+ DocumentType.schoolAuthorization,
+ ):
+ doc = models_raid.Document(
+ id=str(uuid.uuid4()),
+ edition_id=active_edition.id,
+ name=f"{doc_type.value}.pdf",
+ uploaded_at=datetime.datetime.now(tz=datetime.UTC).date(),
+ type=doc_type,
+ validation=DocumentValidation.accepted,
+ )
+ db.add(doc)
+ docs[doc_type] = doc
+
+ security = models_raid.SecurityFile(
+ id=str(uuid.uuid4()),
+ edition_id=active_edition.id,
+ allergy=None,
+ asthma=False,
+ intensive_care_unit=None,
+ intensive_care_unit_when=None,
+ ongoing_treatment=None,
+ sicknesses=None,
+ hospitalization=None,
+ surgical_operation=None,
+ trauma=None,
+ family=None,
+ emergency_person_firstname="Jane",
+ emergency_person_name="Doe",
+ emergency_person_phone="0600000000",
+ file_id=None,
+ )
+ db.add(security)
+
+ db.add(
+ models_raid.RaidParticipant(
+ user_id=second_user.id,
+ edition_id=active_edition.id,
+ status=RaidRegistrationStatus.draft,
+ situation=Situation.other,
+ is_minor=False,
+ ),
+ )
+ await db.flush()
+
+ team = models_raid.RaidTeam(
+ id=str(uuid.uuid4()),
+ edition_id=active_edition.id,
+ name=f"ScholarTeam-{user.id}",
+ difficulty=Difficulty.sports,
+ meeting_place=MeetingPlace.centrale,
+ captain_id=user.id,
+ second_id=second_user.id,
+ )
+ db.add(team)
+ await db.flush()
+
+ await db.execute(
+ update(models_raid.RaidParticipant)
+ .where(
+ models_raid.RaidParticipant.user_id == user.id,
+ models_raid.RaidParticipant.edition_id == active_edition.id,
+ )
+ .values(
+ status=RaidRegistrationStatus.submitted,
+ situation=Situation.other, # scholarship applies without student card
+ has_scholarship=True,
+ id_card_id=docs[DocumentType.idCard].id,
+ medical_certificate_id=docs[DocumentType.medicalCertificate].id,
+ raid_rules_id=docs[DocumentType.raidRules].id,
+ school_authorization_id=docs[DocumentType.schoolAuthorization].id,
+ security_file_id=security.id,
+ attestation_on_honour=True,
+ payment=True,
+ t_shirt_payment=True,
+ is_minor=False,
+ ),
+ )
+ await db.commit()
+
+
+async def test_scholarship_participant_can_be_validated(client: TestClient) -> None:
+ """A scholarship participant with an accepted school authorization validates."""
+ user = await create_user_with_groups([])
+ await _set_user_identity(user.id, "+33671000001", datetime.date(2000, 1, 1))
+ token = create_api_access_token(user)
+
+ r = client.post(
+ "/raid/participants",
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 201
+
+ await _setup_scholarship_participant(user)
+
+ r = client.patch(
+ f"/raid/participants/{user.id}/validate",
+ headers={"Authorization": f"Bearer {token_admin}"},
+ )
+ assert r.status_code == 204, r.json()
+
+ r = client.get(
+ f"/raid/participants/{user.id}",
+ headers={"Authorization": f"Bearer {token_admin}"},
+ )
+ assert r.status_code == 200
+ body = r.json()
+ assert body["status"] == "validated"
+ assert body["has_scholarship"] is True
+ assert body["school_authorization_id"] is not None
+
+
+async def test_scholarship_participant_rejected_without_school_authorization(
+ client: TestClient,
+) -> None:
+ """Admin validation fails while the school authorization is missing."""
+ user = await create_user_with_groups([])
+ await _set_user_identity(user.id, "+33671000002", datetime.date(2000, 2, 2))
+ token = create_api_access_token(user)
+
+ r = client.post(
+ "/raid/participants",
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 201
+
+ await _setup_scholarship_participant(user)
+
+ async with get_TestingSessionLocal()() as db:
+ await db.execute(
+ update(models_raid.RaidParticipant)
+ .where(
+ models_raid.RaidParticipant.user_id == user.id,
+ models_raid.RaidParticipant.edition_id == active_edition.id,
+ )
+ .values(school_authorization_id=None),
+ )
+ await db.commit()
+
+ r = client.patch(
+ f"/raid/participants/{user.id}/validate",
+ headers={"Authorization": f"Bearer {token_admin}"},
+ )
+ assert r.status_code == 400
+ assert r.json()["detail"] == "Missing school authorization"
+
+
+async def test_school_authorization_lazy_load_does_not_break_read(
+ client: TestClient,
+) -> None:
+ """Reading a participant with a school authorization must not lazy-load."""
+ user = await create_user_with_groups([])
+ await _set_user_identity(user.id, "+33671000003", datetime.date(2000, 3, 3))
+ token = create_api_access_token(user)
+
+ r = client.post(
+ "/raid/participants",
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 201
+
+ await _setup_scholarship_participant(user)
+
+ r = client.get(
+ f"/raid/participants/{user.id}",
+ headers={"Authorization": f"Bearer {token_admin}"},
+ )
+ assert r.status_code == 200
+ body = r.json()
+ assert body["school_authorization_id"] is not None
+ assert body["school_authorization"]["validation"] == "accepted"
+
+
+async def _reset_mocked_checkout() -> None:
+ """The mocked payment tool reuses a single checkout row without updating
+ its amount; purge it so each /raid/pay test observes its own charge."""
+ async with get_TestingSessionLocal()() as db:
+ await db.execute(
+ delete(models_raid.RaidParticipantCheckout).where(
+ models_raid.RaidParticipantCheckout.checkout_id
+ == str(mocked_checkout_id),
+ ),
+ )
+ await db.execute(
+ delete(models_payment.Checkout).where(
+ models_payment.Checkout.id == mocked_checkout_id,
+ ),
+ )
+ await db.commit()
+
+
+async def test_pay_endpoint_uses_scholarship_price(client: TestClient) -> None:
+ """POST /raid/pay charges the scholarship price for scholars."""
+ user = await create_user_with_groups([])
+ await _set_user_identity(user.id, "+33671000004", datetime.date(2000, 4, 4))
+ token = create_api_access_token(user)
+
+ r = client.post(
+ "/raid/participants",
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 201
+
+ await _setup_scholarship_participant(user)
+ # The helper sets payment=True; the pay endpoint needs an unpaid participant.
+ async with get_TestingSessionLocal()() as db:
+ await db.execute(
+ update(models_raid.RaidParticipant)
+ .where(
+ models_raid.RaidParticipant.user_id == user.id,
+ models_raid.RaidParticipant.edition_id == active_edition.id,
+ )
+ .values(payment=False, t_shirt_payment=True),
+ )
+ await db.commit()
+
+ r = client.get(
+ "/raid/pay",
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 201, r.json()
+ url = r.json()["url"]
+ assert url
+
+ # The mocked checkout stores the amount charged for this participant.
+ async with get_TestingSessionLocal()() as db:
+ checkout = await cruds_payment.get_checkout_by_id(mocked_checkout_id, db)
+ assert checkout is not None
+ assert checkout.name == "Inscription Raid - Tarif boursier"
+ assert checkout.amount == 25
+
+
+async def test_participant_can_set_scholarship_flag(client: TestClient) -> None:
+ """PATCH /participants accepts has_scholarship from the participant itself."""
+ r = client.patch(
+ f"/raid/participants/{user_second.id}",
+ json={"has_scholarship": True},
+ headers={"Authorization": f"Bearer {token_second}"},
+ )
+ assert r.status_code == 204, r.json()
+
+ r = client.get(
+ f"/raid/participants/{user_second.id}",
+ headers={"Authorization": f"Bearer {token_admin}"},
+ )
+ assert r.status_code == 200
+ assert r.json()["has_scholarship"] is True
+
+ # Revoke it back so later tests are unaffected.
+ r = client.patch(
+ f"/raid/participants/{user_second.id}",
+ json={"has_scholarship": False},
+ headers={"Authorization": f"Bearer {token_second}"},
+ )
+ assert r.status_code == 204
+
+
+async def test_scholarship_price_requires_accepted_school_authorization(
+ client: TestClient,
+) -> None:
+ """Self-declared scholarship does not unlock the discounted price."""
+ await _reset_mocked_checkout()
+ user = await create_user_with_groups([])
+ await _set_user_identity(user.id, "+33671000005", datetime.date(2000, 5, 5))
+ token = create_api_access_token(user)
+
+ r = client.post(
+ "/raid/participants",
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 201
+
+ # Declare scholarship but upload no school authorization document.
+ r = client.patch(
+ f"/raid/participants/{user.id}",
+ json={"has_scholarship": True},
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 204
+
+ r = client.get(
+ "/raid/pay",
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 201, r.json()
+
+ async with get_TestingSessionLocal()() as db:
+ checkout = await cruds_payment.get_checkout_by_id(mocked_checkout_id, db)
+ assert checkout is not None
+ # No accepted document: falls back to the external price.
+ assert checkout.name == "Inscription Raid - Tarif externe"
+ assert checkout.amount == 90
+
+
+async def test_scholarship_price_applies_with_accepted_school_authorization(
+ client: TestClient,
+) -> None:
+ """Scholar price only once the school authorization is accepted."""
+ await _reset_mocked_checkout()
+ user = await create_user_with_groups([])
+ await _set_user_identity(user.id, "+33671000006", datetime.date(2000, 6, 6))
+ token = create_api_access_token(user)
+
+ r = client.post(
+ "/raid/participants",
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 201
+
+ # Upload + assign a pending school authorization, declare the scholarship.
+ upload = client.post(
+ "/raid/document/schoolAuthorization",
+ files={"file": ("school_auth.pdf", b"blob", "application/pdf")},
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert upload.status_code == 201
+
+ r = client.patch(
+ f"/raid/participants/{user.id}",
+ json={"has_scholarship": True},
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 204
+
+ r = client.get(
+ "/raid/pay",
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 201
+ async with get_TestingSessionLocal()() as db:
+ checkout = await cruds_payment.get_checkout_by_id(mocked_checkout_id, db)
+ assert checkout is not None
+ # Pending document is not enough: still the external price.
+ assert checkout.amount == 90
+
+ # The mocked payment tool does not update an existing checkout row.
+ await _reset_mocked_checkout()
+
+ # Admin accepts the document: the scholar price now applies.
+ async with get_TestingSessionLocal()() as db:
+ participant = await cruds_raid.get_participant_by_user_id(
+ user.id,
+ active_edition.id,
+ db,
+ )
+ assert participant is not None
+ assert participant.school_authorization_id is not None
+ await cruds_raid.update_document_validation(
+ participant.school_authorization_id,
+ DocumentValidation.accepted,
+ db,
+ )
+ await db.commit()
+
+ r = client.get(
+ "/raid/pay",
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ assert r.status_code == 201
+ async with get_TestingSessionLocal()() as db:
+ checkout = await cruds_payment.get_checkout_by_id(mocked_checkout_id, db)
+ assert checkout is not None
+ assert checkout.name == "Inscription Raid - Tarif boursier"
+ assert checkout.amount == 25
+
+
+async def test_school_authorization_document_is_readable_by_owner(
+ client: TestClient,
+) -> None:
+ """GET /raid/document/{id} resolves ownership of a school authorization."""
+ doc_id = str(uuid.uuid4())
+ await save_bytes_as_data(
+ file_bytes=b"%PDF-1.4 school authorization",
+ directory="raid",
+ filename=doc_id,
+ extension="pdf",
+ )
+ doc = models_raid.Document(
+ id=doc_id,
+ edition_id=active_edition.id,
+ name="school_auth.pdf",
+ uploaded_at=datetime.datetime.now(tz=datetime.UTC).date(),
+ type=DocumentType.schoolAuthorization,
+ validation=DocumentValidation.pending,
+ )
+ await add_object_to_db(doc)
+
+ async with get_TestingSessionLocal()() as db:
+ await db.execute(
+ update(models_raid.RaidParticipant)
+ .where(
+ models_raid.RaidParticipant.user_id == user_captain.id,
+ models_raid.RaidParticipant.edition_id == active_edition.id,
+ )
+ .values(school_authorization_id=doc_id),
+ )
+ await db.commit()
+
+ r = client.get(
+ f"/raid/document/{doc_id}",
+ headers={"Authorization": f"Bearer {token_captain}"},
+ )
+ assert r.status_code == 200
+
+ # Cleanup for later tests.
+ async with get_TestingSessionLocal()() as db:
+ await db.execute(
+ update(models_raid.RaidParticipant)
+ .where(
+ models_raid.RaidParticipant.user_id == user_captain.id,
+ models_raid.RaidParticipant.edition_id == active_edition.id,
+ )
+ .values(school_authorization_id=None),
+ )
+ await db.commit()
+
+
# ---------------------------------------------------------------------------
# Raw CRUD integration tests (edition-aware)
# ---------------------------------------------------------------------------
|