to_domain_model

Author: pcrespov

packages/models-library/src/models_library/api_schemas_webserver/groups.py

@@ -151,7 +151,7 @@ class GroupCreate(InputSchema):
     description: str
     thumbnail: AnyUrl | None = None
 
-    def to_model(self) -> StandardGroupCreate:
+    def to_domain_model(self) -> StandardGroupCreate:
         data = remap_keys(
             self.model_dump(
                 mode="json",
@@ -169,7 +169,7 @@ class GroupUpdate(InputSchema):
     description: str | None = None
     thumbnail: AnyUrl | None = None
 
-    def to_model(self) -> StandardGroupUpdate:
+    def to_domain_model(self) -> StandardGroupUpdate:
         data = remap_keys(
             self.model_dump(
                 mode="json",

packages/models-library/src/models_library/api_schemas_webserver/projects.py

@@ -171,7 +171,7 @@ class ProjectPatch(InputSchema):
     ] = Field(default=None)
     quality: dict[str, Any] | None = Field(default=None)
 
-    def to_model(self) -> dict[str, Any]:
+    def to_domain_model(self) -> dict[str, Any]:
         return self.model_dump(exclude_unset=True, by_alias=False)
 
 

packages/models-library/src/models_library/api_schemas_webserver/users.py

@@ -293,7 +293,7 @@ class MyTokenCreate(InputSchemaWithoutCamelCase):
     token_key: IDStr
     token_secret: IDStr
 
-    def to_model(self) -> UserThirdPartyToken:
+    def to_domain_model(self) -> UserThirdPartyToken:
         return UserThirdPartyToken(
             service=self.service,
             token_key=self.token_key,

services/web/server/src/simcore_service_webserver/groups/_groups_rest.py

@@ -114,7 +114,7 @@ async def create_group(request: web.Request):
     group, access_rights = await _groups_service.create_standard_group(
         request.app,
         user_id=req_ctx.user_id,
-        create=create.to_model(),
+        create=create.to_domain_model(),
     )
 
     created_group = GroupGet.from_domain_model(group, access_rights)
@@ -135,7 +135,7 @@ async def update_group(request: web.Request):
         request.app,
         user_id=req_ctx.user_id,
         group_id=path_params.gid,
-        update=update.to_model(),
+        update=update.to_domain_model(),
     )
 
     updated_group = GroupGet.from_domain_model(group, access_rights)

services/web/server/src/simcore_service_webserver/projects/models.py

@@ -101,7 +101,7 @@ class ProjectPatchExtended(ProjectPatch):
 
     model_config = ConfigDict(populate_by_name=True, extra="forbid")
 
-    def to_model(self) -> dict[str, Any]:
+    def to_domain_model(self) -> dict[str, Any]:
         return remap_keys(
             self.model_dump(exclude_unset=True, by_alias=False),
             rename={"trashed_at": "trashed"},

services/web/server/src/simcore_service_webserver/projects/projects_api.py

@@ -254,7 +254,7 @@ async def patch_project(
     project_patch: ProjectPatch | ProjectPatchExtended,
     product_name: ProductName,
 ):
-    patch_project_data = project_patch.to_model()
+    patch_project_data = project_patch.to_domain_model()
     db: ProjectDBAPI = app[APP_PROJECT_DBAPI]
 
     # 1. Get project

services/web/server/src/simcore_service_webserver/users/_tokens_rest.py

@@ -58,7 +58,7 @@ async def create_token(request: web.Request) -> web.Response:
     token_create = await parse_request_body_as(MyTokenCreate, request)
 
     token = await _tokens_service.create_token(
-        request.app, req_ctx.user_id, token_create.to_model()
+        request.app, req_ctx.user_id, token_create.to_domain_model()
     )
 
     return envelope_json_response(MyTokenGet.from_domain_model(token), web.HTTPCreated)

services/web/server/tests/unit/isolated/test_groups_models.py

@@ -82,13 +82,13 @@ def test_input_schemas_to_models(faker: Faker):
     input_schema = GroupCreate(
         label=faker.word(), description=faker.sentence(), thumbnail=faker.url()
     )
-    domain_model = input_schema.to_model()
+    domain_model = input_schema.to_domain_model()
     assert isinstance(domain_model, StandardGroupCreate)
     assert domain_model.name == input_schema.label
 
     # input : scheam -> model
     input_schema = GroupUpdate(label=faker.word())
-    domain_model = input_schema.to_model()
+    domain_model = input_schema.to_domain_model()
     assert isinstance(domain_model, StandardGroupUpdate)
     assert domain_model.name == input_schema.label