diff --git a/api/rpk-api/firm/core/filter.py b/api/rpk-api/firm/core/filter.py index 7c48e15..7468cc0 100644 --- a/api/rpk-api/firm/core/filter.py +++ b/api/rpk-api/firm/core/filter.py @@ -159,7 +159,7 @@ class FilterSchema(Filter): order_by: Optional[list[str]] = None created_at__lte: Optional[str] = None created_at__gte: Optional[str] = None - created_by__in: Optional[str] = None + created_by__in: Optional[list[str]] = None updated_at__lte: Optional[str] = None updated_at__gte: Optional[str] = None - updated_by__in: Optional[str] = None + updated_by__in: Optional[list[str]] = None diff --git a/api/rpk-api/firm/core/schemas.py b/api/rpk-api/firm/core/schemas.py index 76c7830..504df14 100644 --- a/api/rpk-api/firm/core/schemas.py +++ b/api/rpk-api/firm/core/schemas.py @@ -5,7 +5,9 @@ from pydantic import BaseModel, Field class Reader(BaseModel): - id: Optional[PydanticObjectId] = Field(default=None, validation_alias="_id") + id: Optional[PydanticObjectId] = Field(validation_alias="_id") + created_by: PydanticObjectId = Field(title="Créé par") + updated_by: PydanticObjectId = Field(title="Modifié par") @classmethod def from_model(cls, model): diff --git a/api/rpk-api/firm/current_firm/__init__.py b/api/rpk-api/firm/current_firm/__init__.py index 79a05de..a4787d1 100644 --- a/api/rpk-api/firm/current_firm/__init__.py +++ b/api/rpk-api/firm/current_firm/__init__.py @@ -1,7 +1,7 @@ -from typing import Any +from typing import Any, Optional from beanie import PydanticObjectId -from pydantic import Field +from pydantic import Field, BaseModel from firm.core.models import CrudDocument, CrudDocumentConfig from firm.core.schemas import Writer, Reader @@ -32,7 +32,8 @@ class CurrentFirm(CrudDocument): return cls.model_validate(document) -class CurrentFirmSchemaRead(Reader): +class CurrentFirmSchemaRead(BaseModel): + id: Optional[PydanticObjectId] entity: EntityRead partner: EntityRead partner_list: list[EntityRead]