maleo-identity 0.0.42__py3-none-any.whl → 0.0.44__py3-none-any.whl

maleo_identity/models/transfers/parameters/general/organization_role.py

@@ -1,16 +1,17 @@
 from __future__ import annotations
-from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_identity.models.schemas.general.organization_role import MaleoIdentityOrganizationRoleGeneralSchemas
-from maleo_identity.models.schemas.parameters.organization_role import MaleoIdentityOrganizationRoleParametersSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
+from maleo_identity.models.schemas.organization_role import MaleoIdentityOrganizationRoleSchemas
 
 class MaleoIdentityOrganizationRoleGeneralParametersTransfers:
     class GetSingleQuery(
-        MaleoIdentityOrganizationRoleGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses
+        MaleoIdentityOrganizationRoleSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses
     ): pass
 
     class GetSingle(
-        MaleoIdentityOrganizationRoleGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses,
-        MaleoIdentityOrganizationRoleParametersSchemas.Base
+        MaleoIdentityOrganizationRoleSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses,
+        MaleoIdentityOrganizationRoleSchemas.Key,
+        MaleoIdentityGeneralSchemas.OrganizationId
     ): pass

maleo_identity/models/transfers/parameters/general/user.py

@@ -1,38 +1,47 @@
 from __future__ import annotations
-from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_identity.models.schemas.parameters.user import MaleoIdentityUserParametersSchemas
-from maleo_identity.models.schemas.general.user import MaleoIdentityUserGeneralSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_metadata.models.expanded_schemas.user_type import MaleoMetadataUserTypeExpandedSchemas
+from maleo_identity.models.schemas.user import MaleoIdentityUserSchemas
 
 class MaleoIdentityUserGeneralParametersTransfers:
     class GetSingleQuery(
-        MaleoIdentityUserGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses
+        MaleoIdentityUserSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses
     ): pass
 
     class BaseGetSingle(
-        BaseGeneralSchemas.IdentifierValue,
-        MaleoIdentityUserGeneralSchemas.IdentifierType
+        BaseParameterSchemas.IdentifierValue,
+        MaleoIdentityUserSchemas.IdentifierType
     ): pass
 
     class GetSinglePassword(BaseGetSingle): pass
 
     class GetSingle(
-        MaleoIdentityUserGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses,
+        MaleoIdentityUserSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses,
         BaseGetSingle
     ): pass
 
-    class CreateOrUpdateQuery(MaleoIdentityUserGeneralSchemas.Expand): pass
+    class CreateOrUpdateQuery(MaleoIdentityUserSchemas.Expand): pass
 
-    class UpdateData(MaleoIdentityUserParametersSchemas.Base): pass
+    class UpdateData(
+        MaleoIdentityUserSchemas.Phone,
+        MaleoIdentityUserSchemas.Email,
+        MaleoIdentityUserSchemas.Username,
+        MaleoMetadataUserTypeExpandedSchemas.SimpleUserType
+    ): pass
 
-    class CreateData(MaleoIdentityUserParametersSchemas.Extended): pass
+    class CreateData(
+        MaleoIdentityUserSchemas.Password,
+        UpdateData,
+        MaleoIdentityUserSchemas.OptionalOrganizationId
+    ): pass
 
     class Update(
         CreateOrUpdateQuery,
         UpdateData,
-        BaseGeneralSchemas.IdentifierValue,
-        MaleoIdentityUserGeneralSchemas.IdentifierType
+        BaseParameterSchemas.IdentifierValue,
+        MaleoIdentityUserSchemas.IdentifierType
     ): pass
 
     class Create(

maleo_identity/models/transfers/parameters/general/user_organization.py

@@ -1,25 +1,29 @@
 from __future__ import annotations
-from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_identity.models.schemas.general.user_organization import MaleoIdentityUserOrganizationGeneralSchemas
-from maleo_identity.models.schemas.parameters.user_organization import MaleoIdentityUserOrganizationParametersSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
+from maleo_identity.models.schemas.user_organization import MaleoIdentityUserOrganizationSchemas
 
 class MaleoIdentityUserOrganizationGeneralParametersTransfers:
     class GetSingleQuery(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses
+        MaleoIdentityUserOrganizationSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses
     ): pass
 
     class GetSingle(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses,
-        MaleoIdentityUserOrganizationParametersSchemas.Base
+        MaleoIdentityUserOrganizationSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses,
+        MaleoIdentityGeneralSchemas.OrganizationId,
+        MaleoIdentityGeneralSchemas.UserId
     ): pass
 
     class AssignQuery(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand
+        MaleoIdentityUserOrganizationSchemas.Expand
     ): pass
 
-    class AssignData(MaleoIdentityUserOrganizationParametersSchemas.Base): pass
+    class AssignData(
+        MaleoIdentityGeneralSchemas.OrganizationId,
+        MaleoIdentityGeneralSchemas.UserId
+    ): pass
 
     class Assign(
         AssignData,

maleo_identity/models/transfers/parameters/general/user_organization_role.py

@@ -1,16 +1,18 @@
 from __future__ import annotations
-from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_identity.models.schemas.general.user_organization_role import MaleoIdentityUserOrganizationRoleGeneralSchemas
-from maleo_identity.models.schemas.parameters.user_organization_role import MaleoIdentityUserOrganizationRoleParametersSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
+from maleo_identity.models.schemas.user_organization_role import MaleoIdentityUserOrganizationRoleSchemas
 
 class MaleoIdentityUserOrganizationRoleGeneralParametersTransfers:
     class GetSingleQuery(
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses
+        MaleoIdentityUserOrganizationRoleSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses
     ): pass
 
     class GetSingle(
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses,
-        MaleoIdentityUserOrganizationRoleParametersSchemas.Base
+        MaleoIdentityUserOrganizationRoleSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses,
+        MaleoIdentityUserOrganizationRoleSchemas.Key,
+        MaleoIdentityGeneralSchemas.OrganizationId,
+        MaleoIdentityGeneralSchemas.UserId
     ): pass

maleo_identity/models/transfers/parameters/general/user_profile.py

@@ -1,26 +1,42 @@
 from __future__ import annotations
-from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_identity.models.schemas.parameters.user_profile import MaleoIdentityUserProfileParametersSchemas
-from maleo_identity.models.schemas.general.user_profile import MaleoIdentityUserProfileGeneralSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_metadata.models.expanded_schemas.blood_type import MaleoMetadataBloodTypeExpandedSchemas
+from maleo_metadata.models.expanded_schemas.gender import MaleoMetadataGenderExpandedSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
+from maleo_identity.models.schemas.user_profile import MaleoIdentityUserProfileSchemas
 
 class MaleoIdentityUserProfileGeneralParametersTransfers:
     class GetSingleQuery(
-        MaleoIdentityUserProfileGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses
+        MaleoIdentityUserProfileSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses
     ): pass
 
     class GetSingle(
-        MaleoIdentityUserProfileGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses,
-        BaseGeneralSchemas.IdentifierValue,
-        MaleoIdentityUserProfileGeneralSchemas.IdentifierType
+        MaleoIdentityUserProfileSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses,
+        BaseParameterSchemas.IdentifierValue,
+        MaleoIdentityUserProfileSchemas.IdentifierType
     ): pass
 
-    class CreateOrUpdateQuery(MaleoIdentityUserProfileGeneralSchemas.Expand): pass
+    class CreateOrUpdateQuery(MaleoIdentityUserProfileSchemas.Expand): pass
 
-    class CreateOrUpdateBody(MaleoIdentityUserProfileParametersSchemas.Base): pass
+    class CreateOrUpdateBody(
+        MaleoMetadataGenderExpandedSchemas.OptionalSimpleGender,
+        MaleoMetadataBloodTypeExpandedSchemas.OptionalSimpleBloodType,
+        MaleoIdentityUserProfileSchemas.BirthDate,
+        MaleoIdentityUserProfileSchemas.BirthPlace,
+        MaleoIdentityUserProfileSchemas.EndingTitle,
+        MaleoIdentityUserProfileSchemas.LastName,
+        MaleoIdentityUserProfileSchemas.MiddleName,
+        MaleoIdentityUserProfileSchemas.FirstName,
+        MaleoIdentityUserProfileSchemas.LeadingTitle,
+        MaleoIdentityUserProfileSchemas.IdCard
+    ): pass
 
-    class CreateOrUpdateData(MaleoIdentityUserProfileParametersSchemas.Extended): pass
+    class CreateOrUpdateData(
+        CreateOrUpdateBody,
+        MaleoIdentityGeneralSchemas.UserId
+    ): pass
 
     class Create(
         CreateOrUpdateData,
@@ -30,6 +46,6 @@ class MaleoIdentityUserProfileGeneralParametersTransfers:
     class Update(
         CreateOrUpdateData,
         CreateOrUpdateQuery,
-        BaseGeneralSchemas.IdentifierValue,
-        MaleoIdentityUserProfileGeneralSchemas.IdentifierType
+        BaseParameterSchemas.IdentifierValue,
+        MaleoIdentityUserProfileSchemas.IdentifierType
     ): pass

maleo_identity/models/transfers/parameters/general/user_system_role.py

@@ -1,25 +1,29 @@
 from __future__ import annotations
-from maleo_foundation.models.schemas.general import BaseGeneralSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 from maleo_metadata.models.expanded_schemas.system_role import MaleoMetadataSystemRoleExpandedSchemas
-from maleo_identity.models.schemas.general.user_system_role import MaleoIdentityUserSystemRoleGeneralSchemas
-from maleo_identity.models.schemas.parameters.user_system_role import MaleoIdentityUserSystemRoleParametersSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
+from maleo_identity.models.schemas.user_system_role import MaleoIdentityUserSystemRoleSchemas
 
 class MaleoIdentityUserSystemRoleGeneralParametersTransfers:
     class GetSingleQuery(
-        MaleoIdentityUserSystemRoleGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses
+        MaleoIdentityUserSystemRoleSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses
     ): pass
 
     class GetSingle(
-        MaleoIdentityUserSystemRoleGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses,
-        MaleoIdentityUserSystemRoleParametersSchemas.Base
+        MaleoIdentityUserSystemRoleSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses,
+        MaleoMetadataSystemRoleExpandedSchemas.SimpleSystemRole,
+        MaleoIdentityGeneralSchemas.UserId
     ): pass
 
-    class AssignQuery(MaleoIdentityUserSystemRoleGeneralSchemas.Expand): pass
+    class AssignQuery(MaleoIdentityUserSystemRoleSchemas.Expand): pass
 
     class AssignFromUserBody(MaleoMetadataSystemRoleExpandedSchemas.SimpleSystemRole): pass
 
-    class AssignData(MaleoIdentityUserSystemRoleParametersSchemas.Base): pass
+    class AssignData(
+        MaleoMetadataSystemRoleExpandedSchemas.SimpleSystemRole,
+        MaleoIdentityGeneralSchemas.UserId
+    ): pass
 
     class Assign(AssignData, AssignQuery): pass

maleo_identity/models/transfers/parameters/service/organization.py

@@ -1,26 +1,66 @@
 from __future__ import annotations
-from maleo_foundation.models.schemas import BaseGeneralSchemas
+from maleo_foundation.models.schemas.general import BaseGeneralSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 from maleo_foundation.models.transfers.parameters.service import BaseServiceParametersTransfers
 from maleo_metadata.models.expanded_schemas.organization_type import MaleoMetadataOrganizationTypeExpandedSchemas
-from maleo_identity.models.schemas.general.organization import MaleoIdentityOrganizationGeneralSchemas
+from maleo_identity.models.schemas.organization import MaleoIdentityOrganizationSchemas
 
 class MaleoIdentityOrganizationServiceParametersTransfers:
+    class GetMultipleChildrenQuery(
+        MaleoIdentityOrganizationSchemas.Expand,
+        BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
+        BaseParameterSchemas.OptionalListOfKeys,
+        BaseGeneralSchemas.IsLeaf,
+        BaseGeneralSchemas.IsParent,
+        MaleoMetadataOrganizationTypeExpandedSchemas.OptionalListOfSimpleOrganizationTypes,
+        BaseParameterSchemas.OptionalListOfUuids,
+        BaseParameterSchemas.OptionalListOfIds
+    ): pass
+
     class GetMultipleQuery(
-        MaleoIdentityOrganizationGeneralSchemas.Expand,
+        MaleoIdentityOrganizationSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        BaseGeneralSchemas.Keys,
-        MaleoIdentityOrganizationGeneralSchemas.OptionalListOfParentOrganizationId,
-        MaleoMetadataOrganizationTypeExpandedSchemas.OptionalListOfSimpleOrganizationType,
-        BaseGeneralSchemas.Uuids,
-        BaseGeneralSchemas.Ids
+        BaseParameterSchemas.OptionalListOfKeys,
+        BaseGeneralSchemas.IsLeaf,
+        BaseGeneralSchemas.IsChild,
+        BaseGeneralSchemas.IsParent,
+        BaseGeneralSchemas.IsRoot,
+        MaleoIdentityOrganizationSchemas.OptionalListOfParentIds,
+        MaleoMetadataOrganizationTypeExpandedSchemas.OptionalListOfSimpleOrganizationTypes,
+        BaseParameterSchemas.OptionalListOfUuids,
+        BaseParameterSchemas.OptionalListOfIds
+    ): pass
+
+    class GetMultipleStructuredQuery(
+        MaleoIdentityOrganizationSchemas.Expand,
+        BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityOrganizationSchemas.OptionalListOfParentIds,
+        MaleoMetadataOrganizationTypeExpandedSchemas.OptionalListOfSimpleOrganizationTypes,
+        BaseParameterSchemas.OptionalListOfUuids,
+        BaseParameterSchemas.OptionalListOfIds
     ): pass
 
     class GetMultiple(
-        MaleoIdentityOrganizationGeneralSchemas.Expand,
+        MaleoIdentityOrganizationSchemas.Expand,
+        BaseServiceParametersTransfers.GetPaginatedMultiple,
+        BaseParameterSchemas.OptionalListOfKeys,
+        BaseGeneralSchemas.IsLeaf,
+        BaseGeneralSchemas.IsChild,
+        BaseGeneralSchemas.IsParent,
+        BaseGeneralSchemas.IsRoot,
+        MaleoIdentityOrganizationSchemas.OptionalListOfParentIds,
+        MaleoMetadataOrganizationTypeExpandedSchemas.OptionalListOfSimpleOrganizationTypes,
+        BaseParameterSchemas.OptionalListOfUuids,
+        BaseParameterSchemas.OptionalListOfIds
+    ): pass
+
+    class GetMultipleStructured(
+        MaleoIdentityOrganizationSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultiple,
-        BaseGeneralSchemas.Keys,
-        MaleoIdentityOrganizationGeneralSchemas.OptionalListOfParentOrganizationId,
-        MaleoMetadataOrganizationTypeExpandedSchemas.OptionalListOfSimpleOrganizationType,
-        BaseGeneralSchemas.Uuids,
-        BaseGeneralSchemas.Ids
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityOrganizationSchemas.OptionalListOfParentIds,
+        MaleoMetadataOrganizationTypeExpandedSchemas.OptionalListOfSimpleOrganizationTypes,
+        BaseParameterSchemas.OptionalListOfUuids,
+        BaseParameterSchemas.OptionalListOfIds
     ): pass

maleo_identity/models/transfers/parameters/service/organization_role.py

@@ -1,24 +1,26 @@
 from __future__ import annotations
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 from maleo_foundation.models.transfers.parameters.service import BaseServiceParametersTransfers
-from maleo_identity.models.schemas.general.organization_role import MaleoIdentityOrganizationRoleGeneralSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
+from maleo_identity.models.schemas.organization_role import MaleoIdentityOrganizationRoleSchemas
 
 class MaleoIdentityOrganizationRoleServiceParametersTransfers:
     class GetMultipleFromOrganizationQuery(
-        MaleoIdentityOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityOrganizationRoleSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OptionalListOfKey
+        BaseParameterSchemas.OptionalListOfKeys
     ): pass
 
     class GetMultipleQuery(
-        MaleoIdentityOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityOrganizationRoleSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OptionalListOfKey,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OptionalListOfOrganizationId
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds
     ): pass
 
     class GetMultiple(
-        MaleoIdentityOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityOrganizationRoleSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultiple,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OptionalListOfKey,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OptionalListOfOrganizationId
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds
     ): pass

maleo_identity/models/transfers/parameters/service/user.py

@@ -1,34 +1,34 @@
 from __future__ import annotations
-from maleo_foundation.models.schemas import BaseGeneralSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 from maleo_foundation.models.transfers.parameters.service import BaseServiceParametersTransfers
 from maleo_metadata.models.expanded_schemas.user_type import MaleoMetadataUserTypeExpandedSchemas
 from maleo_metadata.models.expanded_schemas.blood_type import MaleoMetadataBloodTypeExpandedSchemas
 from maleo_metadata.models.expanded_schemas.gender import MaleoMetadataGenderExpandedSchemas
-from maleo_identity.models.schemas.general.user import MaleoIdentityUserGeneralSchemas
+from maleo_identity.models.schemas.user import MaleoIdentityUserSchemas
 
 class MaleoIdentityUserServiceParametersTransfers:
     class GetMultipleQuery(
-        MaleoIdentityUserGeneralSchemas.Expand,
+        MaleoIdentityUserSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodType,
-        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGender,
-        MaleoIdentityUserGeneralSchemas.Phones,
-        MaleoIdentityUserGeneralSchemas.Emails,
-        MaleoIdentityUserGeneralSchemas.Usernames,
-        MaleoMetadataUserTypeExpandedSchemas.OptionalListOfSimpleUserType,
-        BaseGeneralSchemas.Uuids,
-        BaseGeneralSchemas.Ids
+        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodTypes,
+        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGenders,
+        MaleoIdentityUserSchemas.OptionalListOfPhones,
+        MaleoIdentityUserSchemas.OptionalListOfEmails,
+        MaleoIdentityUserSchemas.OptionalListOfUsernames,
+        MaleoMetadataUserTypeExpandedSchemas.OptionalListOfSimpleUserTypes,
+        BaseParameterSchemas.OptionalListOfUuids,
+        BaseParameterSchemas.OptionalListOfIds
     ): pass
 
     class GetMultiple(
-        MaleoIdentityUserGeneralSchemas.Expand,
+        MaleoIdentityUserSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultiple,
-        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodType,
-        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGender,
-        MaleoIdentityUserGeneralSchemas.Phones,
-        MaleoIdentityUserGeneralSchemas.Emails,
-        MaleoIdentityUserGeneralSchemas.Usernames,
-        MaleoMetadataUserTypeExpandedSchemas.OptionalListOfSimpleUserType,
-        BaseGeneralSchemas.Uuids,
-        BaseGeneralSchemas.Ids
+        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodTypes,
+        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGenders,
+        MaleoIdentityUserSchemas.OptionalListOfPhones,
+        MaleoIdentityUserSchemas.OptionalListOfEmails,
+        MaleoIdentityUserSchemas.OptionalListOfUsernames,
+        MaleoMetadataUserTypeExpandedSchemas.OptionalListOfSimpleUserTypes,
+        BaseParameterSchemas.OptionalListOfUuids,
+        BaseParameterSchemas.OptionalListOfIds
     ): pass

maleo_identity/models/transfers/parameters/service/user_organization.py

@@ -1,30 +1,31 @@
 from __future__ import annotations
 from maleo_foundation.models.transfers.parameters.service import BaseServiceParametersTransfers
-from maleo_identity.models.schemas.general.user_organization import MaleoIdentityUserOrganizationGeneralSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
+from maleo_identity.models.schemas.user_organization import MaleoIdentityUserOrganizationSchemas
 
 class MaleoIdentityUserOrganizationServiceParametersTransfers:
     class GetMultipleFromUserQuery(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfOrganizationId
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds
     ): pass
 
     class GetMultipleFromOrganizationQuery(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfUserId
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass
 
     class GetMultipleQuery(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfOrganizationId,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfUserId
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass
 
     class GetMultiple(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultiple,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfOrganizationId,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfUserId
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass

maleo_identity/models/transfers/parameters/service/user_organization_role.py

@@ -1,26 +1,28 @@
 from __future__ import annotations
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 from maleo_foundation.models.transfers.parameters.service import BaseServiceParametersTransfers
-from maleo_identity.models.schemas.general.user_organization_role import MaleoIdentityUserOrganizationRoleGeneralSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
+from maleo_identity.models.schemas.user_organization_role import MaleoIdentityUserOrganizationRoleSchemas
 
 class MaleoIdentityUserOrganizationRoleServiceParametersTransfers:
     class GetMultipleFromUserOrOrganizationQuery(
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationRoleSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfKey
+        BaseParameterSchemas.OptionalListOfKeys
     ): pass
 
     class GetMultipleQuery(
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationRoleSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfKey,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfOrganizationId,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfUserId
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass
 
     class GetMultiple(
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationRoleSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultiple,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfKey,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfOrganizationId,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfUserId
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass

maleo_identity/models/transfers/parameters/service/user_profile.py

@@ -2,21 +2,22 @@ from __future__ import annotations
 from maleo_foundation.models.transfers.parameters.service import BaseServiceParametersTransfers
 from maleo_metadata.models.expanded_schemas.blood_type import MaleoMetadataBloodTypeExpandedSchemas
 from maleo_metadata.models.expanded_schemas.gender import MaleoMetadataGenderExpandedSchemas
-from maleo_identity.models.schemas.general.user_profile import MaleoIdentityUserProfileGeneralSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
+from maleo_identity.models.schemas.user_profile import MaleoIdentityUserProfileSchemas
 
 class MaleoIdentityUserProfileServiceParametersTransfers:
     class GetMultipleQuery(
-        MaleoIdentityUserProfileGeneralSchemas.Expand,
+        MaleoIdentityUserProfileSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodType,
-        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGender,
-        MaleoIdentityUserProfileGeneralSchemas.OptionalListOfUserId
+        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodTypes,
+        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGenders,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass
 
     class GetMultiple(
-        MaleoIdentityUserProfileGeneralSchemas.Expand,
+        MaleoIdentityUserProfileSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultiple,
-        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodType,
-        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGender,
-        MaleoIdentityUserProfileGeneralSchemas.OptionalListOfUserId
+        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodTypes,
+        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGenders,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass

maleo_identity/models/transfers/parameters/service/user_system_role.py

@@ -1,25 +1,26 @@
 from __future__ import annotations
 from maleo_foundation.models.transfers.parameters.service import BaseServiceParametersTransfers
 from maleo_metadata.models.expanded_schemas.system_role import MaleoMetadataSystemRoleExpandedSchemas
-from maleo_identity.models.schemas.general.user_system_role import MaleoIdentityUserSystemRoleGeneralSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
+from maleo_identity.models.schemas.user_system_role import MaleoIdentityUserSystemRoleSchemas
 
 class MaleoIdentityUserSystemRoleServiceParametersTransfers:
     class GetMultipleFromUserQuery(
-        MaleoIdentityUserSystemRoleGeneralSchemas.Expand,
+        MaleoIdentityUserSystemRoleSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRole
+        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRoles
     ): pass
 
     class GetMultipleQuery(
-        MaleoIdentityUserSystemRoleGeneralSchemas.Expand,
+        MaleoIdentityUserSystemRoleSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRole,
-        MaleoIdentityUserSystemRoleGeneralSchemas.OptionalListOfUserId
+        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRoles,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass
 
     class GetMultiple(
-        MaleoIdentityUserSystemRoleGeneralSchemas.Expand,
+        MaleoIdentityUserSystemRoleSchemas.Expand,
         BaseServiceParametersTransfers.GetPaginatedMultiple,
-        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRole,
-        MaleoIdentityUserSystemRoleGeneralSchemas.OptionalListOfUserId
+        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRoles,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass

maleo_identity/models/transfers/results/client/organization.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from pydantic import Field
 from maleo_foundation.models.transfers.results.client.service import BaseClientServiceResultsTransfers
-from maleo_identity.models.transfers.general.organization import OrganizationTransfers
+from maleo_identity.models.transfers.general.organization import OrganizationTransfers, StructuredOrganizationTransfers
 
 class MaleoIdentityOrganizationClientResultsTransfers:
     class Fail(BaseClientServiceResultsTransfers.Fail): pass
@@ -12,4 +12,10 @@ class MaleoIdentityOrganizationClientResultsTransfers:
         data:OrganizationTransfers = Field(..., description="Single organization data")
 
     class MultipleData(BaseClientServiceResultsTransfers.PaginatedMultipleData):
-        data:list[OrganizationTransfers] = Field(..., description="Multiple organizations data")
+        data:list[OrganizationTransfers] = Field(..., description="Multiple organizations data")
+
+    class SingleStructured(BaseClientServiceResultsTransfers.SingleData):
+        data:StructuredOrganizationTransfers = Field(..., description="Single structured organization data")
+
+    class MultipleStructured(BaseClientServiceResultsTransfers.PaginatedMultipleData):
+        data:list[StructuredOrganizationTransfers] = Field(..., description="Multiple structured organizations data")

maleo_identity/models/transfers/results/general/organization.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from pydantic import Field
 from maleo_foundation.models.transfers.results.service.general import BaseServiceGeneralResultsTransfers
-from maleo_identity.models.transfers.general.organization import OrganizationTransfers
+from maleo_identity.models.transfers.general.organization import OrganizationTransfers, StructuredOrganizationTransfers
 
 class MaleoIdentityOrganizationGeneralResultsTransfers:
     class Fail(BaseServiceGeneralResultsTransfers.Fail): pass
@@ -12,4 +12,10 @@ class MaleoIdentityOrganizationGeneralResultsTransfers:
         data:OrganizationTransfers = Field(..., description="Single organization data")
 
     class MultipleData(BaseServiceGeneralResultsTransfers.PaginatedMultipleData):
-        data:list[OrganizationTransfers] = Field(..., description="Multiple organizations data")
+        data:list[OrganizationTransfers] = Field(..., description="Multiple organizations data")
+
+    class SingleStructured(BaseServiceGeneralResultsTransfers.SingleData):
+        data:StructuredOrganizationTransfers = Field(..., description="Single structured organization data")
+
+    class MultipleStructured(BaseServiceGeneralResultsTransfers.PaginatedMultipleData):
+        data:list[StructuredOrganizationTransfers] = Field(..., description="Multiple structured organizations data")