feat: org id in get user/self/db

This commit is contained in:
Chris Milne 2026-06-08 10:26:17 +01:00
parent 6aad2e560f
commit bb4965ab07
2 changed files with 22 additions and 26 deletions

View file

@ -27,19 +27,15 @@ class User(Base):
oidc_id = Column(String, index=True, unique=True) oidc_id = Column(String, index=True, unique=True)
organisation_rel = relationship( organisation_rel = relationship(
"Organisation", "Organisation", secondary="orgusers", back_populates="user_rel"
secondary="orgusers",
back_populates="user_rel"
) )
@property @property
def organisations(self): def organisations(self):
return [org.name for org in self.organisation_rel] return [{"name": org.name, "id": org.id} for org in self.organisation_rel]
group_rel = relationship( group_rel = relationship(
"Group", "Group", secondary="user_groups", back_populates="user_rel"
secondary="user_groups",
back_populates="user_rel"
) )
@property @property

View file

@ -47,7 +47,7 @@ class UserResponse(CustomBaseModel):
first_name: str first_name: str
last_name: str last_name: str
email: str email: str
organisations: list[Optional[str]] organisations: list[Optional[dict[str, str|int]]]
groups: Optional[dict[str, list[str]]] = None groups: Optional[dict[str, list[str]]] = None