CdR: move Status to CoreData file (#800)

Author: Marc-Andrieu

app/modules/cdr/coredata_cdr.py

@@ -1,7 +1,12 @@
 from datetime import UTC, datetime
 
+from app.modules.cdr.types_cdr import CdrStatus
 from app.types.core_data import BaseCoreData
 
 
 class CdrYear(BaseCoreData):
     year: int = datetime.now(UTC).year
+
+
+class Status(BaseCoreData):
+    status: CdrStatus = CdrStatus.pending

app/modules/cdr/endpoints_cdr.py

@@ -321,7 +321,7 @@ async def update_cdr_user(
             name=curriculum_db.name,
         )
 
-    cdr_status = await get_core_data(schemas_cdr.Status, db)
+    cdr_status = await get_core_data(coredata_cdr.Status, db)
     if cdr_status.status == CdrStatus.onsite:
         try:
             await ws_manager.send_message_to_room(
@@ -765,7 +765,7 @@ async def create_product(
         user=user,
         db=db,
     )
-    status = await get_core_data(schemas_cdr.Status, db)
+    status = await get_core_data(coredata_cdr.Status, db)
     if status.status == CdrStatus.closed:
         raise HTTPException(
             status_code=403,
@@ -964,7 +964,7 @@ async def create_product_variant(
         seller_id=seller_id,
         product_id=product_id,
     )
-    status = await get_core_data(schemas_cdr.Status, db)
+    status = await get_core_data(coredata_cdr.Status, db)
     if status.status == CdrStatus.closed:
         raise HTTPException(
             status_code=403,
@@ -1225,7 +1225,7 @@ async def create_document(
     **User must be part of the seller's group to use this endpoint**
     """
     await is_user_in_a_seller_group(seller_id=seller_id, user=user, db=db)
-    status = await get_core_data(schemas_cdr.Status, db)
+    status = await get_core_data(coredata_cdr.Status, db)
     if status.status == CdrStatus.closed:
         raise HTTPException(
             status_code=403,
@@ -1468,7 +1468,7 @@ async def create_purchase(
 
     **User must create a purchase for themself and for an online available product or be part of the seller's group to use this endpoint**
     """
-    status = await get_core_data(schemas_cdr.Status, db)
+    status = await get_core_data(coredata_cdr.Status, db)
     if status.status in [CdrStatus.pending, CdrStatus.closed]:
         raise HTTPException(
             status_code=403,
@@ -1929,7 +1929,7 @@ async def create_signature(
 
     **User must sign numerically or be part of the seller's group to use this endpoint**
     """
-    status = await get_core_data(schemas_cdr.Status, db)
+    status = await get_core_data(coredata_cdr.Status, db)
     if status.status == CdrStatus.pending:
         raise HTTPException(
             status_code=403,
@@ -2044,7 +2044,7 @@ async def create_curriculum(
 
     **User must be CDR Admin to use this endpoint**
     """
-    status = await get_core_data(schemas_cdr.Status, db)
+    status = await get_core_data(coredata_cdr.Status, db)
     if status.status == CdrStatus.closed:
         raise HTTPException(
             status_code=403,
@@ -2159,7 +2159,7 @@ async def create_curriculum_membership(
     )
     await db.flush()
 
-    cdr_status = await get_core_data(schemas_cdr.Status, db)
+    cdr_status = await get_core_data(coredata_cdr.Status, db)
     if cdr_status.status == CdrStatus.onsite:
         try:
             await ws_manager.send_message_to_room(
@@ -2236,7 +2236,7 @@ async def update_curriculum_membership(
     )
     await db.flush()
 
-    cdr_status = await get_core_data(schemas_cdr.Status, db)
+    cdr_status = await get_core_data(coredata_cdr.Status, db)
     if cdr_status.status == CdrStatus.onsite:
         try:
             await ws_manager.send_message_to_room(
@@ -2313,7 +2313,7 @@ async def delete_curriculum_membership(
     )
     await db.flush()
 
-    cdr_status = await get_core_data(schemas_cdr.Status, db)
+    cdr_status = await get_core_data(coredata_cdr.Status, db)
     if cdr_status.status == CdrStatus.onsite:
         try:
             await ws_manager.send_message_to_room(
@@ -2388,7 +2388,7 @@ async def create_payment(
 
     **User must be CDR Admin to use this endpoint**
     """
-    status = await get_core_data(schemas_cdr.Status, db)
+    status = await get_core_data(coredata_cdr.Status, db)
     if status.status == CdrStatus.pending:
         raise HTTPException(
             status_code=403,
@@ -2569,25 +2569,25 @@ async def update_cdr_year(
 
 @module.router.get(
     "/cdr/status/",
-    response_model=schemas_cdr.Status,
+    response_model=coredata_cdr.Status,
     status_code=200,
 )
 async def get_status(
     db: AsyncSession = Depends(get_db),
 ):
-    return await get_core_data(schemas_cdr.Status, db)
+    return await get_core_data(coredata_cdr.Status, db)
 
 
 @module.router.patch(
     "/cdr/status/",
     status_code=204,
 )
 async def update_status(
-    status: schemas_cdr.Status,
+    status: coredata_cdr.Status,
     db: AsyncSession = Depends(get_db),
     user: models_users.CoreUser = Depends(is_user_in(GroupType.admin_cdr)),
 ):
-    current_status = await get_core_data(schemas_cdr.Status, db)
+    current_status = await get_core_data(coredata_cdr.Status, db)
     match status.status:
         case CdrStatus.pending:
             if current_status.status != CdrStatus.closed:

app/modules/cdr/schemas_cdr.py

@@ -7,11 +7,9 @@
 from app.core.memberships import schemas_memberships
 from app.core.users.schemas_users import CoreUserSimple
 from app.modules.cdr.types_cdr import (
-    CdrStatus,
     DocumentSignatureType,
     PaymentType,
 )
-from app.types.core_data import BaseCoreData
 from app.types.floors_type import FloorsType
 from app.types.websocket import WSMessageModel
 from app.utils import validators
@@ -255,10 +253,6 @@ class PaymentComplete(PaymentBase):
     model_config = ConfigDict(from_attributes=True)
 
 
-class Status(BaseCoreData):
-    status: CdrStatus = CdrStatus.pending
-
-
 class PaymentUrl(BaseModel):
     url: str