Feat: refactoring tests

tests/commons.py

@@ -14,7 +14,7 @@
 from app.core.auth import schemas_auth
 from app.core.config import Settings
 from app.core.groups import cruds_groups
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.core.payment import cruds_payment, models_payment, schemas_payment
 from app.core.payment.payment_tool import PaymentTool
 from app.core.users import cruds_users
@@ -108,13 +108,13 @@ def change_redis_client_status(activated: bool) -> None:
 
 async def create_user_with_groups(
     groups: list[GroupType],
+    account_type: AccountType = AccountType.external,
     user_id: str | None = None,
     email: str | None = None,
     password: str | None = None,
     name: str | None = None,
     firstname: str | None = None,
     floor: FloorsType | None = None,
-    external: bool = False,
 ) -> models_core.CoreUser:
     """
     Add a dummy user to the database
@@ -133,7 +133,7 @@ async def create_user_with_groups(
         name=name or get_random_string(),
         firstname=firstname or get_random_string(),
         floor=floor,
-        external=external,
+        account_type=account_type,
         nickname=None,
         birthday=None,
         promo=None,

tests/test_PH.py

@@ -6,7 +6,7 @@
 from fastapi.testclient import TestClient
 
 from app.core import models_core
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.modules.ph import models_ph
 from tests.commons import (
     add_object_to_db,
@@ -33,7 +33,10 @@ async def init_objects() -> None:
     token_ph = create_api_access_token(ph_user_ph)
 
     global ph_user_simple
-    ph_user_simple = await create_user_with_groups([GroupType.student])
+    ph_user_simple = await create_user_with_groups(
+        [],
+        AccountType.student,
+    )
 
     global token_simple
     token_simple = create_api_access_token(ph_user_simple)

tests/test_advert.py

@@ -6,7 +6,7 @@
 from fastapi.testclient import TestClient
 
 from app.core import models_core
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.modules.advert import models_advert
 from tests.commons import (
     add_object_to_db,
@@ -41,13 +41,19 @@ async def init_objects() -> None:
     )
     await add_object_to_db(advertiser)
 
-    user_advertiser = await create_user_with_groups([GroupType.student, GroupType.CAA])
+    user_advertiser = await create_user_with_groups(
+        [GroupType.CAA],
+        AccountType.student,
+    )
 
     global token_advertiser
     token_advertiser = create_api_access_token(user_advertiser)
 
     global user_simple
-    user_simple = await create_user_with_groups([GroupType.student])
+    user_simple = await create_user_with_groups(
+        [],
+        AccountType.student,
+    )
 
     global token_simple
     token_simple = create_api_access_token(user_simple)

tests/test_amap.py

@@ -5,7 +5,7 @@
 from fastapi.testclient import TestClient
 
 from app.core import models_core
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.modules.amap import models_amap
 from app.modules.amap.types_amap import AmapSlotType, DeliveryStatusType
 from tests.commons import (
@@ -39,8 +39,11 @@ async def init_objects() -> None:
         order, \
         deletable_order_by_admin
 
-    amap_user = await create_user_with_groups([GroupType.amap])
-    student_user = await create_user_with_groups([GroupType.student])
+    amap_user = await create_user_with_groups([GroupType.amap], AccountType.student)
+    student_user = await create_user_with_groups(
+        [],
+        AccountType.student,
+    )
 
     product = models_amap.Product(
         id=str(uuid.uuid4()),

tests/test_auth.py

@@ -8,7 +8,7 @@
 
 from app.core import models_core
 from app.core.auth import models_auth
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType
 from tests.commons import (
     add_object_to_db,
     create_api_access_token,
@@ -30,13 +30,15 @@ async def init_objects() -> None:
     global user
     user = await create_user_with_groups(
         groups=[],
+        account_type=AccountType.student,
         email="email@myecl.fr",
         password="azerty",
     )
 
     global ecl_user
     ecl_user = await create_user_with_groups(
-        groups=[GroupType.student],
+        groups=[],
+        account_type=AccountType.student,
         email="email@etu.ec-lyon.fr",
         password="azerty",
     )
@@ -46,7 +48,6 @@ async def init_objects() -> None:
         groups=[],
         email="external@myecl.fr",
         password="azerty",
-        external=True,
     )
 
     global access_token

tests/test_booking.py

@@ -5,7 +5,7 @@
 from fastapi.testclient import TestClient
 
 from app.core import models_core
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.modules.booking import models_booking
 from tests.commons import (
     add_object_to_db,
@@ -39,13 +39,16 @@ async def init_objects() -> None:
     token_admin = create_api_access_token(admin_user)
 
     global manager_user
-    manager_user = await create_user_with_groups([GroupType.student, GroupType.BDE])
+    manager_user = await create_user_with_groups(
+        [GroupType.BDE],
+        AccountType.student,
+    )
 
     global token_manager
     token_manager = create_api_access_token(manager_user)
 
     global simple_user
-    simple_user = await create_user_with_groups([GroupType.student])
+    simple_user = await create_user_with_groups([], AccountType.student)
 
     global token_simple
     token_simple = create_api_access_token(simple_user)

tests/test_calendar.py

@@ -5,7 +5,7 @@
 from fastapi.testclient import TestClient
 
 from app.core import models_core
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.modules.booking.types_booking import Decision
 from app.modules.calendar import models_calendar
 from app.modules.calendar.types_calendar import CalendarEventType
@@ -27,14 +27,15 @@
 async def init_objects() -> None:
     global calendar_user_bde
     calendar_user_bde = await create_user_with_groups(
-        [GroupType.student, GroupType.BDE],
+        [GroupType.BDE],
+        AccountType.student,
     )
 
     global token_bde
     token_bde = create_api_access_token(calendar_user_bde)
 
     global calendar_user_simple
-    calendar_user_simple = await create_user_with_groups([GroupType.student])
+    calendar_user_simple = await create_user_with_groups([], AccountType.student)
 
     global token_simple
     token_simple = create_api_access_token(calendar_user_simple)

tests/test_campaign.py

@@ -5,7 +5,7 @@
 from fastapi.testclient import TestClient
 
 from app.core import models_core
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.modules.campaign import models_campaign
 from app.modules.campaign.types_campaign import ListType
 from tests.commons import (
@@ -28,8 +28,11 @@
 async def init_objects() -> None:
     global CAA_user, AE_user
 
-    CAA_user = await create_user_with_groups([GroupType.CAA, GroupType.AE])
-    AE_user = await create_user_with_groups([GroupType.AE])
+    CAA_user = await create_user_with_groups(
+        [GroupType.CAA, GroupType.AE],
+        AccountType.student,
+    )
+    AE_user = await create_user_with_groups([GroupType.AE], AccountType.student)
 
     global section
     global campaign_list

tests/test_cdr.py

@@ -6,7 +6,7 @@
 from pytest_mock import MockerFixture
 
 from app.core import models_core
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.modules.cdr import models_cdr
 from app.modules.cdr.types_cdr import (
     CdrStatus,
@@ -71,21 +71,28 @@
 async def init_objects():
     global cdr_admin
     cdr_admin = await create_user_with_groups(
-        [GroupType.student, GroupType.admin_cdr],
+        [GroupType.admin_cdr],
+        AccountType.student,
         email="cdr_admin@etu.ec-lyon.fr",
     )
 
     global token_admin
     token_admin = create_api_access_token(cdr_admin)
 
     global cdr_bde
-    cdr_bde = await create_user_with_groups([GroupType.student, GroupType.BDE])
+    cdr_bde = await create_user_with_groups(
+        [GroupType.BDE],
+        AccountType.student,
+    )
 
     global token_bde
     token_bde = create_api_access_token(cdr_bde)
 
     global cdr_user
-    cdr_user = await create_user_with_groups([GroupType.student])
+    cdr_user = await create_user_with_groups(
+        [],
+        AccountType.student,
+    )
 
     global token_user
     token_user = create_api_access_token(cdr_user)
@@ -238,7 +245,8 @@ async def init_objects():
     await add_object_to_db(unused_curriculum)
 
     cdr_user_with_curriculum_without_purchase = await create_user_with_groups(
-        [GroupType.student],
+        [],
+        AccountType.student,
     )
     curriculum_membership = models_cdr.CurriculumMembership(
         user_id=cdr_user_with_curriculum_without_purchase.id,
@@ -249,7 +257,8 @@ async def init_objects():
     global cdr_user_with_curriculum_with_non_validated_purchase
     cdr_user_with_curriculum_with_non_validated_purchase = (
         await create_user_with_groups(
-            [GroupType.student],
+            [],
+            AccountType.student,
         )
     )
     curriculum_membership_for_user_with_curriculum_with_non_validated_purchase = (

tests/test_cdr_result.py

@@ -4,7 +4,7 @@
 import pytest_asyncio
 
 from app.core import models_core
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.modules.cdr import models_cdr
 from app.modules.cdr.utils_cdr import construct_dataframe_from_users_purchases
 from tests.commons import (
@@ -53,7 +53,8 @@
 async def init_objects():
     global cdr_admin
     cdr_admin = await create_user_with_groups(
-        [GroupType.student, GroupType.admin_cdr],
+        [GroupType.admin_cdr],
+        AccountType.student,
         email="cdr_admin@etu.ec-lyon.fr",
     )
 
@@ -62,7 +63,8 @@ async def init_objects():
 
     global cdr_user1
     cdr_user1 = await create_user_with_groups(
-        [GroupType.student],
+        [],
+        AccountType.student,
         email="demo@demo.fr",
         name="Demo",
         firstname="Oui",
@@ -72,10 +74,16 @@ async def init_objects():
     token_user = create_api_access_token(cdr_user1)
 
     global cdr_user2
-    cdr_user2 = await create_user_with_groups([GroupType.student])
+    cdr_user2 = await create_user_with_groups(
+        [],
+        AccountType.student,
+    )
 
     global cdr_user3
-    cdr_user3 = await create_user_with_groups([GroupType.student])
+    cdr_user3 = await create_user_with_groups(
+        [],
+        AccountType.student,
+    )
 
     global seller1
     seller1 = models_cdr.Seller(

tests/test_cinema.py

@@ -5,7 +5,7 @@
 from fastapi.testclient import TestClient
 
 from app.core import models_core
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.modules.cinema import models_cinema
 from tests.commons import (
     add_object_to_db,
@@ -29,7 +29,10 @@ async def init_objects() -> None:
     token_cinema = create_api_access_token(cinema_user_cinema)
 
     global cinema_user_simple
-    cinema_user_simple = await create_user_with_groups([GroupType.student])
+    cinema_user_simple = await create_user_with_groups(
+        [],
+        AccountType.student,
+    )
 
     global token_simple
     token_simple = create_api_access_token(cinema_user_simple)

tests/test_core.py

@@ -26,7 +26,7 @@ async def init_objects() -> None:
     user_simple = await create_user_with_groups([GroupType.AE])
     global token_simple
     token_simple = create_api_access_token(user_simple)
-    module_visibility = models_core.ModuleVisibility(
+    module_visibility = models_core.ModuleGroupVisibility(
         root=root,
         allowed_group_id=group_id,
     )
@@ -61,9 +61,9 @@ def test_add_module_visibility(client: TestClient) -> None:
     assert response.status_code == 201
 
 
-def test_delete_loaners(client: TestClient) -> None:
+def test_delete_visibility(client: TestClient) -> None:
     response = client.delete(
-        f"/module-visibility/{root}/{group_id}",
+        f"/module-visibility/{root}/groups/{group_id}",
         headers={"Authorization": f"Bearer {token_admin}"},
     )
     assert response.status_code == 204

tests/test_flappybird.py

@@ -5,7 +5,7 @@
 from fastapi.testclient import TestClient
 
 from app.core import models_core
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.modules.flappybird import models_flappybird
 from tests.commons import (
     add_object_to_db,
@@ -23,7 +23,10 @@
 @pytest_asyncio.fixture(scope="module", autouse=True)
 async def init_objects() -> None:
     global user
-    user = await create_user_with_groups([GroupType.student])
+    user = await create_user_with_groups(
+        [],
+        AccountType.student,
+    )
 
     global admin_user
     admin_user = await create_user_with_groups([GroupType.admin])