maleo-identity 0.0.89__py3-none-any.whl → 0.0.91__py3-none-any.whl

maleo/identity/constants/organization_role.py

@@ -1,26 +1,26 @@
 from typing import Dict, List
 from maleo.soma.schemas.resource import Resource, ResourceIdentifier
 from maleo.identity.enums.organization import (
-    ExpandableField as OrganizationExpandableField,
+    IncludableField as OrganizationIncludableField,
 )
 from maleo.identity.enums.organization_role import (
-    ExpandableField as OrganizationRoleExpandableField,
+    IncludableField as OrganizationRoleIncludableField,
 )
 
 EXPANDABLE_FIELDS_DEPENDENCIES_MAP: Dict[
-    OrganizationRoleExpandableField, List[OrganizationRoleExpandableField]
+    OrganizationRoleIncludableField, List[OrganizationRoleIncludableField]
 ] = {
-    OrganizationRoleExpandableField.ORGANIZATION: [
-        OrganizationRoleExpandableField.ORGANIZATION_TYPE,
-        OrganizationRoleExpandableField.REGISTRATION_CODE,
+    OrganizationRoleIncludableField.ORGANIZATION: [
+        OrganizationRoleIncludableField.ORGANIZATION_TYPE,
+        OrganizationRoleIncludableField.REGISTRATION_CODE,
     ]
 }
 
 ORGANIZATION_EXPANDABLE_FIELDS_MAP: Dict[
-    OrganizationRoleExpandableField, OrganizationExpandableField
+    OrganizationRoleIncludableField, OrganizationIncludableField
 ] = {
-    OrganizationRoleExpandableField.ORGANIZATION_TYPE: OrganizationExpandableField.ORGANIZATION_TYPE,
-    OrganizationRoleExpandableField.REGISTRATION_CODE: OrganizationExpandableField.REGISTRATION_CODE,
+    OrganizationRoleIncludableField.ORGANIZATION_TYPE: OrganizationIncludableField.ORGANIZATION_TYPE,
+    OrganizationRoleIncludableField.REGISTRATION_CODE: OrganizationIncludableField.REGISTRATION_CODE,
 }
 
 RESOURCE = Resource(

maleo/identity/constants/user.py

@@ -1,7 +1,7 @@
 from typing import Callable, Dict, List
 from uuid import UUID
 from maleo.soma.schemas.resource import Resource, ResourceIdentifier
-from maleo.identity.enums.user import IdentifierType, ExpandableField
+from maleo.identity.enums.user import IdentifierType, IncludableField
 from maleo.identity.types.base.user import IdentifierValueType
 
 IDENTIFIER_TYPE_VALUE_TYPE_MAP: Dict[
@@ -13,9 +13,9 @@ IDENTIFIER_TYPE_VALUE_TYPE_MAP: Dict[
     IdentifierType.EMAIL: str,
 }
 
-EXPANDABLE_FIELDS_DEPENDENCIES_MAP: Dict[ExpandableField, List[ExpandableField]] = {
-    ExpandableField.PROFILE: [ExpandableField.GENDER, ExpandableField.BLOOD_TYPE],
-    ExpandableField.SYSTEM_ROLES: [ExpandableField.SYSTEM_ROLE_DETAILS],
+EXPANDABLE_FIELDS_DEPENDENCIES_MAP: Dict[IncludableField, List[IncludableField]] = {
+    IncludableField.PROFILE: [IncludableField.GENDER, IncludableField.BLOOD_TYPE],
+    IncludableField.SYSTEM_ROLES: [IncludableField.SYSTEM_ROLE_DETAILS],
 }
 
 RESOURCE = Resource(

maleo/identity/constants/user_organization.py

@@ -1,49 +1,49 @@
 from typing import Dict, List
 from maleo.soma.schemas.resource import Resource, ResourceIdentifier
-from maleo.identity.enums.user import ExpandableField as UserExpandableField
+from maleo.identity.enums.user import IncludableField as UserIncludableField
 from maleo.identity.enums.organization import (
-    ExpandableField as OrganizationExpandableField,
+    IncludableField as OrganizationIncludableField,
 )
 from maleo.identity.enums.user_organization import (
-    ExpandableField as UserOrganizationExpandableField,
+    IncludableField as UserOrganizationIncludableField,
 )
 
 EXPANDABLE_FIELDS_DEPENDENCIES_MAP: Dict[
-    UserOrganizationExpandableField, List[UserOrganizationExpandableField]
+    UserOrganizationIncludableField, List[UserOrganizationIncludableField]
 ] = {
-    UserOrganizationExpandableField.USER: [
-        UserOrganizationExpandableField.USER_TYPE,
-        UserOrganizationExpandableField.PROFILE,
+    UserOrganizationIncludableField.USER: [
+        UserOrganizationIncludableField.USER_TYPE,
+        UserOrganizationIncludableField.PROFILE,
     ],
-    UserOrganizationExpandableField.PROFILE: [
-        UserOrganizationExpandableField.BLOOD_TYPE,
-        UserOrganizationExpandableField.GENDER,
+    UserOrganizationIncludableField.PROFILE: [
+        UserOrganizationIncludableField.BLOOD_TYPE,
+        UserOrganizationIncludableField.GENDER,
     ],
-    UserOrganizationExpandableField.SYSTEM_ROLES: [
-        UserOrganizationExpandableField.SYSTEM_ROLE_DETAILS
+    UserOrganizationIncludableField.SYSTEM_ROLES: [
+        UserOrganizationIncludableField.SYSTEM_ROLE_DETAILS
     ],
-    UserOrganizationExpandableField.ORGANIZATION: [
-        UserOrganizationExpandableField.ORGANIZATION_TYPE,
-        UserOrganizationExpandableField.REGISTRATION_CODE,
+    UserOrganizationIncludableField.ORGANIZATION: [
+        UserOrganizationIncludableField.ORGANIZATION_TYPE,
+        UserOrganizationIncludableField.REGISTRATION_CODE,
     ],
 }
 
 USER_EXPANDABLE_FIELDS_MAP: Dict[
-    UserOrganizationExpandableField, UserExpandableField
+    UserOrganizationIncludableField, UserIncludableField
 ] = {
-    UserOrganizationExpandableField.USER_TYPE: UserExpandableField.USER_TYPE,
-    UserOrganizationExpandableField.PROFILE: UserExpandableField.PROFILE,
-    UserOrganizationExpandableField.BLOOD_TYPE: UserExpandableField.BLOOD_TYPE,
-    UserOrganizationExpandableField.GENDER: UserExpandableField.GENDER,
-    UserOrganizationExpandableField.SYSTEM_ROLES: UserExpandableField.SYSTEM_ROLES,
-    UserOrganizationExpandableField.SYSTEM_ROLE_DETAILS: UserExpandableField.SYSTEM_ROLE_DETAILS,
+    UserOrganizationIncludableField.USER_TYPE: UserIncludableField.USER_TYPE,
+    UserOrganizationIncludableField.PROFILE: UserIncludableField.PROFILE,
+    UserOrganizationIncludableField.BLOOD_TYPE: UserIncludableField.BLOOD_TYPE,
+    UserOrganizationIncludableField.GENDER: UserIncludableField.GENDER,
+    UserOrganizationIncludableField.SYSTEM_ROLES: UserIncludableField.SYSTEM_ROLES,
+    UserOrganizationIncludableField.SYSTEM_ROLE_DETAILS: UserIncludableField.SYSTEM_ROLE_DETAILS,
 }
 
 ORGANIZATION_EXPANDABLE_FIELDS_MAP: Dict[
-    UserOrganizationExpandableField, OrganizationExpandableField
+    UserOrganizationIncludableField, OrganizationIncludableField
 ] = {
-    UserOrganizationExpandableField.ORGANIZATION_TYPE: OrganizationExpandableField.ORGANIZATION_TYPE,
-    UserOrganizationExpandableField.REGISTRATION_CODE: OrganizationExpandableField.REGISTRATION_CODE,
+    UserOrganizationIncludableField.ORGANIZATION_TYPE: OrganizationIncludableField.ORGANIZATION_TYPE,
+    UserOrganizationIncludableField.REGISTRATION_CODE: OrganizationIncludableField.REGISTRATION_CODE,
 }
 
 RESOURCE = Resource(

maleo/identity/constants/user_organization_role.py

@@ -1,38 +1,38 @@
 from typing import Dict, List
 from maleo.soma.schemas.resource import Resource, ResourceIdentifier
-from maleo.identity.enums.user import ExpandableField as UserExpandableField
+from maleo.identity.enums.user import IncludableField as UserIncludableField
 from maleo.identity.enums.organization import (
-    ExpandableField as OrganizationExpandableField,
+    IncludableField as OrganizationIncludableField,
 )
 from maleo.identity.enums.user_organization_role import (
-    ExpandableField as UserOrganizationRoleExpandableField,
+    IncludableField as UserOrganizationRoleIncludableField,
 )
 
 EXPANDABLE_FIELDS_DEPENDENCIES_MAP: Dict[
-    UserOrganizationRoleExpandableField, List[UserOrganizationRoleExpandableField]
+    UserOrganizationRoleIncludableField, List[UserOrganizationRoleIncludableField]
 ] = {
-    UserOrganizationRoleExpandableField.USER: [
-        UserOrganizationRoleExpandableField.USER_TYPE,
-        UserOrganizationRoleExpandableField.PROFILE,
+    UserOrganizationRoleIncludableField.USER: [
+        UserOrganizationRoleIncludableField.USER_TYPE,
+        UserOrganizationRoleIncludableField.PROFILE,
     ],
-    UserOrganizationRoleExpandableField.ORGANIZATION: [
-        UserOrganizationRoleExpandableField.ORGANIZATION_TYPE,
-        UserOrganizationRoleExpandableField.REGISTRATION_CODE,
+    UserOrganizationRoleIncludableField.ORGANIZATION: [
+        UserOrganizationRoleIncludableField.ORGANIZATION_TYPE,
+        UserOrganizationRoleIncludableField.REGISTRATION_CODE,
     ],
 }
 
 USER_EXPANDABLE_FIELDS_MAP: Dict[
-    UserOrganizationRoleExpandableField, UserExpandableField
+    UserOrganizationRoleIncludableField, UserIncludableField
 ] = {
-    UserOrganizationRoleExpandableField.USER_TYPE: UserExpandableField.USER_TYPE,
-    UserOrganizationRoleExpandableField.PROFILE: UserExpandableField.PROFILE,
+    UserOrganizationRoleIncludableField.USER_TYPE: UserIncludableField.USER_TYPE,
+    UserOrganizationRoleIncludableField.PROFILE: UserIncludableField.PROFILE,
 }
 
 ORGANIZATION_EXPANDABLE_FIELDS_MAP: Dict[
-    UserOrganizationRoleExpandableField, OrganizationExpandableField
+    UserOrganizationRoleIncludableField, OrganizationIncludableField
 ] = {
-    UserOrganizationRoleExpandableField.ORGANIZATION_TYPE: OrganizationExpandableField.ORGANIZATION_TYPE,
-    UserOrganizationRoleExpandableField.REGISTRATION_CODE: OrganizationExpandableField.REGISTRATION_CODE,
+    UserOrganizationRoleIncludableField.ORGANIZATION_TYPE: OrganizationIncludableField.ORGANIZATION_TYPE,
+    UserOrganizationRoleIncludableField.REGISTRATION_CODE: OrganizationIncludableField.REGISTRATION_CODE,
 }
 
 RESOURCE = Resource(

maleo/identity/constants/user_system_role.py

@@ -1,8 +1,8 @@
 from typing import Dict, List
 from maleo.soma.schemas.resource import Resource, ResourceIdentifier
-from maleo.identity.enums.user_system_role import ExpandableField
+from maleo.identity.enums.user_system_role import IncludableField
 
-EXPANDABLE_FIELDS_DEPENDENCIES_MAP: Dict[ExpandableField, List[ExpandableField]] = {}
+EXPANDABLE_FIELDS_DEPENDENCIES_MAP: Dict[IncludableField, List[IncludableField]] = {}
 
 RESOURCE = Resource(
     identifiers=[

maleo/identity/dtos/data/user_profile.py

@@ -1,4 +1,6 @@
 from maleo.soma.mixins.general import UserId
+from maleo.metadata.schemas.data.gender import OptionalSimpleGenderMixin
+from maleo.metadata.schemas.data.blood_type import OptionalSimpleBloodTypeMixin
 from maleo.identity.mixins.user_profile import (
     IdCard,
     LeadingTitle,
@@ -15,6 +17,8 @@ from maleo.identity.mixins.user_profile import (
 
 class UserProfileDTO(
     AvatarName,
+    OptionalSimpleBloodTypeMixin,
+    OptionalSimpleGenderMixin,
     BirthDate,
     BirthPlace,
     FullName,

maleo/identity/dtos/data/user_system_role.py

@@ -0,0 +1,9 @@
+from maleo.soma.mixins.general import UserId
+from maleo.metadata.schemas.data.system_role import SimpleSystemRoleMixin
+
+
+class UserSystemRoleDTO(
+    SimpleSystemRoleMixin,
+    UserId,
+):
+    pass

maleo/identity/enums/organization.py

@@ -7,6 +7,6 @@ class IdentifierType(StrEnum):
     KEY = "key"
 
 
-class ExpandableField(StrEnum):
+class IncludableField(StrEnum):
     ORGANIZATION_TYPE = "organization_type"
     REGISTRATION_CODE = "registration_code"

maleo/identity/enums/organization_role.py

@@ -1,7 +1,7 @@
 from enum import StrEnum
 
 
-class ExpandableField(StrEnum):
+class IncludableField(StrEnum):
     ORGANIZATION = "organization"
     ORGANIZATION_TYPE = "organization.organization_type"
     REGISTRATION_CODE = "organization.registration_code"

maleo/identity/enums/user.py

@@ -8,7 +8,7 @@ class IdentifierType(StrEnum):
     EMAIL = "email"
 
 
-class ExpandableField(StrEnum):
+class IncludableField(StrEnum):
     USER_TYPE = "user_type"
     SYSTEM_ROLES = "system_roles"
     SYSTEM_ROLE_DETAILS = "system_roles.system_role_details"

maleo/identity/enums/user_organization.py

@@ -1,7 +1,7 @@
 from enum import StrEnum
 
 
-class ExpandableField(StrEnum):
+class IncludableField(StrEnum):
     USER = "user"
     USER_TYPE = "user_type"
     SYSTEM_ROLES = "system_roles"

maleo/identity/enums/user_organization_role.py

@@ -1,7 +1,7 @@
 from enum import StrEnum
 
 
-class ExpandableField(StrEnum):
+class IncludableField(StrEnum):
     USER = "user"
     USER_TYPE = "user.user_type"
     SYSTEM_ROLES = "system_roles"

maleo/identity/enums/user_profile.py

@@ -14,6 +14,6 @@ class ValidImageMimeType(StrEnum):
     PNG = "image/png"
 
 
-class ExpandableField(StrEnum):
+class IncludableField(StrEnum):
     GENDER = "gender_details"
     BLOOD_TYPE = "blood_type_details"

maleo/identity/enums/user_system_role.py

@@ -1,5 +1,5 @@
 from enum import StrEnum
 
 
-class ExpandableField(StrEnum):
+class IncludableField(StrEnum):
     SYSTEM_ROLE = "system_role"

maleo/identity/mixins/organization.py

@@ -1,9 +1,9 @@
 from pydantic import BaseModel, Field
-from maleo.soma.mixins.parameter import Expand as BaseExpand
-from maleo.identity.enums.organization import ExpandableField
+from maleo.soma.mixins.parameter import Include as BaseInclude
+from maleo.identity.enums.organization import IncludableField
 
 
-class Expand(BaseExpand[ExpandableField]):
+class Include(BaseInclude[IncludableField]):
     pass
 
 

maleo/identity/mixins/organization_role.py

@@ -1,9 +1,9 @@
 from pydantic import BaseModel, Field
-from maleo.soma.mixins.parameter import Expand as BaseExpand
-from maleo.identity.enums.organization_role import ExpandableField
+from maleo.soma.mixins.parameter import Include as BaseInclude
+from maleo.identity.enums.organization_role import IncludableField
 
 
-class Expand(BaseExpand[ExpandableField]):
+class Include(BaseInclude[IncludableField]):
     pass
 
 

maleo/identity/mixins/user.py

@@ -1,11 +1,11 @@
 from pydantic import BaseModel, Field
 from uuid import UUID
-from maleo.soma.mixins.parameter import Expand as BaseExpand
+from maleo.soma.mixins.parameter import Include as BaseInclude
 from maleo.soma.types.base import OptionalListOfStrings
-from maleo.identity.enums.user import ExpandableField
+from maleo.identity.enums.user import IncludableField
 
 
-class Expand(BaseExpand[ExpandableField]):
+class Include(BaseInclude[IncludableField]):
     pass
 
 

maleo/identity/mixins/user_organization.py

@@ -1,6 +1,6 @@
-from maleo.soma.mixins.parameter import Expand as BaseExpand
-from maleo.identity.enums.user_organization import ExpandableField
+from maleo.soma.mixins.parameter import Include as BaseInclude
+from maleo.identity.enums.user_organization import IncludableField
 
 
-class Expand(BaseExpand[ExpandableField]):
+class Include(BaseInclude[IncludableField]):
     pass

maleo/identity/mixins/user_organization_role.py

@@ -1,6 +1,6 @@
-from maleo.soma.mixins.parameter import Expand as BaseExpand
-from maleo.identity.enums.user_organization_role import ExpandableField
+from maleo.soma.mixins.parameter import Include as BaseInclude
+from maleo.identity.enums.user_organization_role import IncludableField
 
 
-class Expand(BaseExpand[ExpandableField]):
+class Include(BaseInclude[IncludableField]):
     pass

maleo/identity/mixins/user_profile.py

@@ -1,11 +1,11 @@
 from pydantic import BaseModel, Field
 from typing import Optional
-from maleo.soma.mixins.parameter import Expand as BaseExpand
+from maleo.soma.mixins.parameter import Include as BaseInclude
 from maleo.soma.types.base import OptionalDate, OptionalString
-from maleo.identity.enums.user_profile import ExpandableField
+from maleo.identity.enums.user_profile import IncludableField
 
 
-class Expand(BaseExpand[ExpandableField]):
+class Include(BaseInclude[IncludableField]):
     pass
 
 

maleo/identity/mixins/user_system_role.py

@@ -1,6 +1,6 @@
-from maleo.soma.mixins.parameter import Expand as BaseExpand
-from maleo.identity.enums.user_system_role import ExpandableField
+from maleo.soma.mixins.parameter import Include as BaseInclude
+from maleo.identity.enums.user_system_role import IncludableField
 
 
-class Expand(BaseExpand[ExpandableField]):
+class Include(BaseInclude[IncludableField]):
     pass

maleo/identity/schemas/parameter/client/organization.py

@@ -12,11 +12,11 @@ from maleo.soma.schemas.parameter.client import (
 from maleo.metadata.schemas.data.organization_type import (
     OptionalListOfSimpleOrganizationTypesMixin,
 )
-from maleo.identity.mixins.organization import Expand
+from maleo.identity.mixins.organization import Include
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfKeys,
     IsLeaf,
@@ -32,7 +32,7 @@ class ReadMultipleParameter(
 
 
 class ReadMultipleChildrenParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfKeys,
     IsLeaf,
@@ -46,7 +46,7 @@ class ReadMultipleChildrenParameter(
 
 
 class ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfKeys,
     IsLeaf,
@@ -62,7 +62,7 @@ class ReadMultipleQueryParameter(
 
 
 class ReadMultipleChildrenQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfKeys,
     IsLeaf,

maleo/identity/schemas/parameter/client/organization_role.py

@@ -7,17 +7,17 @@ from maleo.soma.schemas.parameter.client import (
     ReadPaginatedMultipleParameterSchema,
     ReadPaginatedMultipleQueryParameterSchema,
 )
-from maleo.identity.mixins.organization_role import Expand
+from maleo.identity.mixins.organization_role import Include
 
 
 class ReadMultipleFromOrganizationParameter(
-    Expand, ReadPaginatedMultipleParameterSchema, OptionalListOfKeys, OrganizationId
+    Include, ReadPaginatedMultipleParameterSchema, OptionalListOfKeys, OrganizationId
 ):
     pass
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfKeys,
     OptionalListOfOrganizationIds,
@@ -26,7 +26,7 @@ class ReadMultipleParameter(
 
 
 class ReadMultipleFromOrganizationQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfKeys,
 ):
@@ -34,7 +34,7 @@ class ReadMultipleFromOrganizationQueryParameter(
 
 
 class ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfKeys,
     OptionalListOfOrganizationIds,

maleo/identity/schemas/parameter/client/user.py

@@ -10,12 +10,12 @@ from maleo.identity.mixins.user import (
     OptionalListOfUsernames,
     OptionalListOfEmails,
     OptionalListOfPhones,
-    Expand,
+    Include,
 )
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfSimpleBloodTypesMixin,
     OptionalListOfSimpleGendersMixin,
@@ -30,7 +30,7 @@ class ReadMultipleParameter(
 
 
 class ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfSimpleBloodTypesMixin,
     OptionalListOfSimpleGendersMixin,

maleo/identity/schemas/parameter/client/user_organization.py

@@ -7,11 +7,11 @@ from maleo.soma.schemas.parameter.client import (
     ReadPaginatedMultipleParameterSchema,
     ReadPaginatedMultipleQueryParameterSchema,
 )
-from maleo.identity.mixins.user_organization import Expand
+from maleo.identity.mixins.user_organization import Include
 
 
 class ReadMultipleFromUserParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfOrganizationIds,
     UserId,
@@ -20,7 +20,7 @@ class ReadMultipleFromUserParameter(
 
 
 class ReadMultipleFromOrganizationParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfUserIds,
     OrganizationId,
@@ -29,7 +29,7 @@ class ReadMultipleFromOrganizationParameter(
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfUserIds,
     OptionalListOfOrganizationIds,
@@ -38,7 +38,7 @@ class ReadMultipleParameter(
 
 
 class ReadMultipleFromUserQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfOrganizationIds,
 ):
@@ -46,7 +46,7 @@ class ReadMultipleFromUserQueryParameter(
 
 
 class ReadMultipleFromOrganizationQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfUserIds,
 ):
@@ -54,7 +54,7 @@ class ReadMultipleFromOrganizationQueryParameter(
 
 
 class ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfUserIds,
     OptionalListOfOrganizationIds,

maleo/identity/schemas/parameter/client/user_organization_role.py

@@ -8,11 +8,11 @@ from maleo.soma.schemas.parameter.client import (
     ReadPaginatedMultipleParameterSchema,
     ReadPaginatedMultipleQueryParameterSchema,
 )
-from maleo.identity.mixins.user_organization_role import Expand
+from maleo.identity.mixins.user_organization_role import Include
 
 
 class ReadMultipleFromUserOrganizationParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfKeys,
     UserId,
@@ -22,7 +22,7 @@ class ReadMultipleFromUserOrganizationParameter(
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfKeys,
     OptionalListOfUserIds,
@@ -32,7 +32,7 @@ class ReadMultipleParameter(
 
 
 class ReadMultipleFromUserOrganizationQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfKeys,
 ):
@@ -40,7 +40,7 @@ class ReadMultipleFromUserOrganizationQueryParameter(
 
 
 class ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfKeys,
     OptionalListOfUserIds,

maleo/identity/schemas/parameter/client/user_profile.py

@@ -5,11 +5,11 @@ from maleo.soma.schemas.parameter.client import (
 )
 from maleo.metadata.schemas.data.blood_type import OptionalListOfSimpleBloodTypesMixin
 from maleo.metadata.schemas.data.gender import OptionalListOfSimpleGendersMixin
-from maleo.identity.mixins.user_profile import Expand
+from maleo.identity.mixins.user_profile import Include
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfSimpleBloodTypesMixin,
     OptionalListOfSimpleGendersMixin,
@@ -19,7 +19,7 @@ class ReadMultipleParameter(
 
 
 class ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfSimpleBloodTypesMixin,
     OptionalListOfSimpleGendersMixin,

maleo/identity/schemas/parameter/client/user_system_role.py

@@ -5,11 +5,11 @@ from maleo.soma.schemas.parameter.client import (
     ReadPaginatedMultipleQueryParameterSchema,
 )
 from maleo.metadata.schemas.data.system_role import OptionalListOfSimpleSystemRolesMixin
-from maleo.identity.mixins.user_system_role import Expand
+from maleo.identity.mixins.user_system_role import Include
 
 
 class ReadMultipleFromUserParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfSimpleSystemRolesMixin,
     UserId,
@@ -18,7 +18,7 @@ class ReadMultipleFromUserParameter(
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfSimpleSystemRolesMixin,
     OptionalListOfUserIds,
@@ -27,7 +27,7 @@ class ReadMultipleParameter(
 
 
 class ReadMultipleFromUserQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfSimpleSystemRolesMixin,
 ):
@@ -35,7 +35,7 @@ class ReadMultipleFromUserQueryParameter(
 
 
 class ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfSimpleSystemRolesMixin,
     OptionalListOfUserIds,