fixes autoinclusion

Author: pcrespov

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

@@ -149,7 +149,12 @@ class GroupCreate(InputSchema):
 
     def to_model(self) -> StandardGroupCreate:
         data = _rename_keys(
-            self.model_dump(mode="json", exclude_unset=True),
+            self.model_dump(
+                mode="json",
+                # NOTE: intentionally inclusion_rules are not exposed to the REST api
+                include={"label", "description", "thumbnail"},
+                exclude_unset=True,
+            ),
             name_map={"label": "name"},
         )
         return StandardGroupCreate(**data)
@@ -162,7 +167,12 @@ class GroupUpdate(InputSchema):
 
     def to_model(self) -> StandardGroupUpdate:
         data = _rename_keys(
-            self.model_dump(mode="json", exclude_unset=True),
+            self.model_dump(
+                mode="json",
+                # NOTE: intentionally inclusion_rules are not exposed to the REST api
+                include={"label", "description", "thumbnail"},
+                exclude_unset=True,
+            ),
             name_map={"label": "name"},
         )
         return StandardGroupUpdate(**data)

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

@@ -82,12 +82,20 @@ class StandardGroupCreate(BaseModel):
     name: str
     description: str | None = None
     thumbnail: str | None = None
+    inclusion_rules: Annotated[
+        dict[str, str],
+        Field(
+            default_factory=dict,
+            description="Maps user's column and regular expression",
+        ),
+    ] = DEFAULT_FACTORY
 
 
 class StandardGroupUpdate(BaseModel):
     name: str | None = None
     description: str | None = None
     thumbnail: str | None = None
+    inclusion_rules: dict[str, str] | None = None
 
 
 class GroupAtDB(Group):

packages/pytest-simcore/src/pytest_simcore/simcore_webserver_groups_fixtures.py

@@ -74,7 +74,7 @@ async def standard_groups_owner(
                 "name": "SPARC",
                 "description": "Stimulating Peripheral Activity to Relieve Conditions",
                 "thumbnail": "https://commonfund.nih.gov/sites/default/files/sparc-image-homepage500px.png",
-                "inclusionRules": {"email": r"@(sparc)+\.(io|com)$"},
+                "inclusion_rules": {"email": r"@(sparc)+\.(io|com)$"},
             },
         )
         team_black_group = await _create_organization(
@@ -84,7 +84,7 @@ async def standard_groups_owner(
                 "name": "team Black",
                 "description": "THE incredible black team",
                 "thumbnail": None,
-                "inclusionRules": {"email": r"@(black)+\.(io|com)$"},
+                "inclusion_rules": {"email": r"@(black)+\.(io|com)$"},
             },
         )
 

services/web/server/tests/unit/with_dbs/01/groups/test_groups_handlers_users.py

@@ -418,9 +418,12 @@ async def test_add_user_gets_added_to_group(
     user_role: UserRole,
     expected: ExpectedResponse,
 ):
+
     assert client.app
     async with AsyncExitStack() as users_stack:
         for email in (
+            # SEE StandardGroupCreate.inclusion_rules in
+            #  packages/pytest-simcore/src/pytest_simcore/simcore_webserver_groups_fixtures.py
             "[email protected]",
             "[email protected]",
             "[email protected]",