From eb6071d824fb010f05258c4b6794f68bdc9661c2 Mon Sep 17 00:00:00 2001 From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com> Date: Tue, 10 Dec 2024 16:10:23 +0100 Subject: [PATCH] @odeimaiz review: deprecated inclusion rules --- .../src/models_library/api_schemas_webserver/groups.py | 6 ++---- .../src/simcore_service_webserver/api/v0/openapi.yaml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/models-library/src/models_library/api_schemas_webserver/groups.py b/packages/models-library/src/models_library/api_schemas_webserver/groups.py index 9d5ec4fd30b..d595447c3d3 100644 --- a/packages/models-library/src/models_library/api_schemas_webserver/groups.py +++ b/packages/models-library/src/models_library/api_schemas_webserver/groups.py @@ -67,8 +67,8 @@ class GroupGet(OutputSchema): dict[str, str], Field( default_factory=dict, - description="Maps user's column and regular expression", alias="inclusionRules", + deprecated=True, ), ] = DEFAULT_FACTORY @@ -84,9 +84,8 @@ def from_model(cls, group: Group, access_rights: AccessRightsDict) -> Self: "name", "description", "thumbnail", - "inclusion_rules", }, - exclude={"access_rights"}, + exclude={"access_rights", "inclusion_rules"}, exclude_unset=True, by_alias=False, ), @@ -125,7 +124,6 @@ def from_model(cls, group: Group, access_rights: AccessRightsDict) -> Self: "label": "SPARCi", "description": "Stimulating Peripheral Activity to Relieve Conditions", "thumbnail": "https://placekitten.com/15/15", - "inclusionRules": {"email": r"@(sparc)+\.(io|com|us)$"}, "accessRights": {"read": True, "write": True, "delete": True}, }, ] diff --git a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml b/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml index bb3ddf22091..9a92419e514 100644 --- a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml +++ b/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml @@ -9874,7 +9874,7 @@ components: type: string type: object title: Inclusionrules - description: Maps user's column and regular expression + deprecated: true type: object required: - gid