Feat: refactoring base visibility

app/modules/advert/endpoints_advert.py

@@ -7,7 +7,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.core import models_core, standard_responses
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.core.notification.notification_types import CustomTopic, Topic
 from app.core.notification.schemas_notification import Message
 from app.dependencies import (
@@ -31,7 +31,7 @@
 module = Module(
     root="advert",
     tag="Advert",
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )
 
 hyperion_error_logger = logging.getLogger("hyperion.error")

app/modules/amap/endpoints_amap.py

@@ -7,7 +7,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.core import models_core, schemas_core
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.core.notification.notification_types import CustomTopic, Topic
 from app.core.notification.schemas_notification import Message
 from app.core.users import cruds_users
@@ -30,7 +30,7 @@
 module = Module(
     root="amap",
     tag="AMAP",
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )
 
 hyperion_amap_logger = logging.getLogger("hyperion.amap")

app/modules/booking/endpoints_booking.py

@@ -8,7 +8,7 @@
 
 from app.core import models_core
 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.notification.schemas_notification import Message
 from app.dependencies import (
     get_db,
@@ -25,7 +25,7 @@
 module = Module(
     root="booking",
     tag="Booking",
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )
 
 hyperion_error_logger = logging.getLogger("hyperion.error")

app/modules/calendar/endpoints_calendar.py

@@ -6,7 +6,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 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.dependencies import get_db, is_user_a_member_of, is_user_an_ecl_member
 from app.modules.calendar import cruds_calendar, models_calendar, schemas_calendar
 from app.modules.calendar.types_calendar import Decision
@@ -16,7 +16,7 @@
 module = Module(
     root="event",
     tag="Calendar",
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )
 
 ical_file_path = "data/ics/ae_calendar.ics"

app/modules/centralisation/endpoints_centralisation.py

@@ -1,8 +1,8 @@
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType
 from app.types.module import Module
 
 module = Module(
     root="centralisation",
     tag="Centralisation",
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )

app/modules/cinema/endpoints_cinema.py

@@ -9,7 +9,7 @@
 
 from app.core import models_core, standard_responses
 from app.core.config import Settings
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.core.notification.notification_types import CustomTopic, Topic
 from app.core.notification.schemas_notification import Message
 from app.dependencies import (
@@ -34,7 +34,7 @@
 module = Module(
     root="cinema",
     tag="Cinema",
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )
 
 hyperion_error_logger = logging.getLogger("hyperion.error")

app/modules/flappybird/endpoints_flappybird.py

@@ -5,7 +5,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 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.dependencies import get_db, is_user_a_member, is_user_a_member_of
 from app.modules.flappybird import (
     cruds_flappybird,
@@ -17,7 +17,7 @@
 module = Module(
     root="flappybird",
     tag="Flappy Bird",
-    default_allowed_groups_ids=[GroupType.student],
+    default_allowed_account_types=[AccountType.student],
 )
 
 

app/modules/home/endpoints_home.py

@@ -1,8 +1,8 @@
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType
 from app.types.module import Module
 
 module = Module(
     root="home",
     tag="Home",
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )

app/modules/loan/endpoints_loan.py

@@ -7,7 +7,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 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.core.notification.schemas_notification import Message
 from app.dependencies import (
     get_db,
@@ -31,7 +31,7 @@
 module = Module(
     root="loan",
     tag="Loans",
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )
 
 

app/modules/ph/endpoints_ph.py

@@ -6,7 +6,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 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.core.notification.notification_types import CustomTopic, Topic
 from app.core.notification.schemas_notification import Message
 from app.dependencies import (
@@ -30,7 +30,7 @@
 module = Module(
     root="ph",
     tag="ph",
-    default_allowed_groups_ids=[GroupType.student],
+    default_allowed_account_types=[AccountType.student],
 )
 
 

app/modules/phonebook/endpoints_phonebook.py

@@ -7,7 +7,7 @@
 
 from app.core import models_core, standard_responses
 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.users import cruds_users
 from app.dependencies import (
     get_db,
@@ -28,7 +28,7 @@
 module = Module(
     root="phonebook",
     tag="Phonebook",
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )
 
 hyperion_error_logger = logging.getLogger("hyperion.error")

app/modules/raffle/endpoints_raffle.py

@@ -8,7 +8,7 @@
 
 from app.core import models_core, standard_responses
 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.users import cruds_users
 from app.core.users.endpoints_users import read_user
 from app.dependencies import (
@@ -33,7 +33,7 @@
 module = Module(
     root="tombola",
     tag="Raffle",
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )
 
 hyperion_raffle_logger = logging.getLogger("hyperion.raffle")

app/modules/raid/endpoints_raid.py

@@ -9,7 +9,7 @@
 from app.core import models_core, schemas_core
 from app.core.config import Settings
 from app.core.google_api.google_api import DriveGoogleAPI
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.core.payment.payment_tool import PaymentTool
 from app.dependencies import (
     get_db,
@@ -48,7 +48,7 @@
     root="raid",
     tag="Raid",
     payment_callback=validate_payment,
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )
 
 

app/modules/recommendation/endpoints_recommendation.py

@@ -6,7 +6,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.core import models_core, standard_responses
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.dependencies import (
     get_db,
     get_request_id,
@@ -28,7 +28,7 @@
 module = Module(
     root="recommendation",
     tag="Recommendation",
-    default_allowed_groups_ids=[GroupType.student, GroupType.staff],
+    default_allowed_account_types=[AccountType.student, AccountType.staff],
 )
 
 

app/types/module.py

@@ -3,7 +3,7 @@
 from fastapi import APIRouter
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.core.groups.groups_type import GroupType
+from app.core.groups.groups_type import AccountType, GroupType
 from app.core.payment import schemas_payment
 
 
@@ -12,7 +12,8 @@ def __init__(
         self,
         root: str,
         tag: str,
-        default_allowed_groups_ids: list[GroupType],
+        default_allowed_groups_ids: list[GroupType] | None = None,
+        default_allowed_account_types: list[AccountType] | None = None,
         router: APIRouter | None = None,
         payment_callback: Callable[
             [schemas_payment.CheckoutPayment, AsyncSession],
@@ -29,6 +30,7 @@ def __init__(
         """
         self.root = root
         self.default_allowed_groups_ids = default_allowed_groups_ids
+        self.default_allowed_account_types = default_allowed_account_types
         self.router = router or APIRouter(tags=[tag])
         self.payment_callback: (
             Callable[[schemas_payment.CheckoutPayment, AsyncSession], Awaitable[None]]