Feat: add user simple schema in structure

aeecleclair · Jan 16, 2025 · e629886 · e629886
1 parent fc51084
commit e629886
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/app/core/myeclpay/cruds_myeclpay.py b/app/core/myeclpay/cruds_myeclpay.py
@@ -6,6 +6,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
 
+from app.core import schemas_core
 from app.core.myeclpay import models_myeclpay, schemas_myeclpay
 from app.core.myeclpay.types_myeclpay import (
     TransactionStatus,
@@ -116,6 +117,14 @@ async def get_structures(
             membership=structure.membership,
             manager_user_id=structure.manager_user_id,
             id=structure.id,
+            manager_user=schemas_core.CoreUserSimple(
+                id=structure.manager_user.id,
+                firstname=structure.manager_user.firstname,
+                name=structure.manager_user.name,
+                nickname=structure.manager_user.nickname,
+                account_type=structure.manager_user.account_type,
+                school_id=structure.manager_user.school_id,
+            ),
         )
         for structure in result.scalars().all()
     ]
@@ -142,6 +151,14 @@ async def get_structure_by_id(
             membership=structure.membership,
             manager_user_id=structure.manager_user_id,
             id=structure.id,
+            manager_user=schemas_core.CoreUserSimple(
+                id=structure.manager_user.id,
+                firstname=structure.manager_user.firstname,
+                name=structure.manager_user.name,
+                nickname=structure.manager_user.nickname,
+                account_type=structure.manager_user.account_type,
+                school_id=structure.manager_user.school_id,
+            ),
         )
         if structure
         else None

diff --git a/app/core/myeclpay/models_myeclpay.py b/app/core/myeclpay/models_myeclpay.py
@@ -84,6 +84,8 @@ class Structure(Base):
     membership: Mapped[AvailableAssociationMembership | None]
     manager_user_id: Mapped[str] = mapped_column(ForeignKey("core_user.id"))
 
+    manager_user: Mapped[models_core.CoreUser] = relationship(init=False, lazy="joined")
+
 
 class StructureManagerTransfert(Base):
     __tablename__ = "myeclpay_structure_manager_transfer"

diff --git a/app/core/myeclpay/schemas_myeclpay.py b/app/core/myeclpay/schemas_myeclpay.py
@@ -23,6 +23,7 @@ class StructureBase(BaseModel):
 
 class Structure(StructureBase):
     id: UUID
+    manager_user: schemas_core.CoreUserSimple
 
 
 class StructureUpdate(BaseModel):