@@ -72,8 +72,8 @@ def _sanitize_legacy_data(cls, v):
7272 return None
7373
7474 @classmethod
75- def _extract_basic_group_data (cls , group : Group ) -> dict :
76- """Extract common group data for schema conversion"""
75+ def dump_basic_group_data (cls , group : Group ) -> dict :
76+ """Helper function to extract common group data for schema conversion"""
7777 return remap_keys (
7878 group .model_dump (
7979 include = {
@@ -93,11 +93,6 @@ def _extract_basic_group_data(cls, group: Group) -> dict:
9393 },
9494 )
9595
96- @classmethod
97- def from_domain_model (cls , group : Group ) -> Self :
98- # Adapts these domain models into this schema
99- return cls .model_validate (cls ._extract_basic_group_data (group ))
100-
10196
10297class GroupGet (BasicGroupGet ):
10398 access_rights : Annotated [GroupAccessRights , Field (alias = "accessRights" )]
@@ -116,7 +111,7 @@ def from_domain_model(cls, group: Group, access_rights: AccessRightsDict) -> Sel
116111 # Adapts these domain models into this schema
117112 return cls .model_validate (
118113 {
119- ** cls ._extract_basic_group_data (group ),
114+ ** cls .dump_basic_group_data (group ),
120115 "access_rights" : access_rights ,
121116 }
122117 )
@@ -259,7 +254,7 @@ def from_domain_model(
259254 cls ,
260255 groups_by_type : GroupsByTypeTuple ,
261256 my_product_group : tuple [Group , AccessRightsDict ] | None ,
262- my_support_group : Group | None ,
257+ product_support_group : Group | None ,
263258 ) -> Self :
264259 assert groups_by_type .primary # nosec
265260 assert groups_by_type .everyone # nosec
@@ -276,8 +271,10 @@ def from_domain_model(
276271 else None
277272 ),
278273 support = (
279- BasicGroupGet .from_domain_model (my_support_group )
280- if my_support_group
274+ BasicGroupGet .model_validate (
275+ BasicGroupGet .dump_basic_group_data (product_support_group )
276+ )
277+ if product_support_group
281278 else None
282279 ),
283280 )
0 commit comments