maleo-identity 0.0.43__py3-none-any.whl → 0.0.45__py3-none-any.whl

maleo_identity/models/transfers/general/organization.py

@@ -1,19 +1,15 @@
 from pydantic import BaseModel, Field
-from typing import Optional
+from typing import List, Optional
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_identity.models.schemas.results.organization import MaleoIdentityOrganizationResultsSchemas
-
-#! Do not use this class, use the inherited class
-class BaseOrganizationTransfers(
-    MaleoIdentityOrganizationResultsSchemas.General,
-    BaseGeneralSchemas.Status,
-    BaseGeneralSchemas.Timestamps,
-    BaseGeneralSchemas.Identifiers
-):
-    pass
+from maleo_metadata.models.expanded_schemas.organization_type import MaleoMetadataOrganizationTypeExpandedSchemas
+from maleo_identity.models.schemas.organization import MaleoIdentityOrganizationSchemas
 
 class OrganizationTransfers(
-    MaleoIdentityOrganizationResultsSchemas.General,
+    MaleoIdentityOrganizationSchemas.Name,
+    MaleoIdentityOrganizationSchemas.Key,
+    MaleoIdentityOrganizationSchemas.OptionalParentId,
+    MaleoMetadataOrganizationTypeExpandedSchemas.OptionalExpandedOrganizationType,
+    MaleoMetadataOrganizationTypeExpandedSchemas.SimpleOrganizationType,
     BaseGeneralSchemas.Status,
     BaseGeneralSchemas.Timestamps,
     BaseGeneralSchemas.Identifiers
@@ -21,4 +17,10 @@ class OrganizationTransfers(
     pass
 
 class OptionalExpandedOrganization(BaseModel):
-    organization_details:Optional[OrganizationTransfers] = Field(None, description="Organization's details")
+    organization_details:Optional[OrganizationTransfers] = Field(None, description="Organization's details")
+
+class StructuredOrganizationTransfers(OrganizationTransfers):
+    children:List["StructuredOrganizationTransfers"] = Field(..., description="Organization children")
+
+# this is required for forward reference resolution
+StructuredOrganizationTransfers.model_rebuild()

maleo_identity/models/transfers/general/organization_role.py

@@ -1,14 +1,15 @@
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-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
 from maleo_identity.models.transfers.general.organization import OptionalExpandedOrganization
 
 class OrganizationRoleTransfers(
-    MaleoIdentityOrganizationRoleGeneralSchemas.Name,
-    MaleoIdentityOrganizationRoleGeneralSchemas.Key,
-    MaleoIdentityOrganizationRoleGeneralSchemas.Order,
-    MaleoIdentityOrganizationRoleGeneralSchemas.IsDefault,
+    MaleoIdentityOrganizationRoleSchemas.Name,
+    MaleoIdentityOrganizationRoleSchemas.Key,
+    BaseGeneralSchemas.Order,
+    BaseGeneralSchemas.IsDefault,
     OptionalExpandedOrganization,
-    MaleoIdentityOrganizationRoleGeneralSchemas.OrganizationId,
+    MaleoIdentityGeneralSchemas.OrganizationId,
     BaseGeneralSchemas.Status,
     BaseGeneralSchemas.Timestamps,
     BaseGeneralSchemas.Identifiers

maleo_identity/models/transfers/general/user.py

@@ -1,12 +1,17 @@
 from pydantic import BaseModel, Field
 from typing import Optional
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_identity.models.schemas.results.user import MaleoIdentityUserResultsSchemas
+from maleo_metadata.models.expanded_schemas.user_type import MaleoMetadataUserTypeExpandedSchemas
+from maleo_identity.models.schemas.user import MaleoIdentityUserSchemas
 from maleo_identity.models.transfers.general.user_profile import OptionalExpandedUserProfile
 
 class UserTransfers(
     OptionalExpandedUserProfile,
-    MaleoIdentityUserResultsSchemas.General,
+    MaleoIdentityUserSchemas.Phone,
+    MaleoIdentityUserSchemas.Email,
+    MaleoIdentityUserSchemas.Username,
+    MaleoMetadataUserTypeExpandedSchemas.OptionalExpandedUserType,
+    MaleoMetadataUserTypeExpandedSchemas.SimpleUserType,
     BaseGeneralSchemas.Status,
     BaseGeneralSchemas.Timestamps,
     BaseGeneralSchemas.Identifiers
@@ -15,4 +20,4 @@ class UserTransfers(
 class OptionalExpandedUser(BaseModel):
     user_details:Optional[UserTransfers] = Field(None, description="User's details")
 
-class PasswordTransfers(MaleoIdentityUserResultsSchemas.PasswordGeneral): pass
+class PasswordTransfers(MaleoIdentityUserSchemas.Password): pass

maleo_identity/models/transfers/general/user_organization.py

@@ -1,12 +1,13 @@
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_identity.models.schemas.results.user_organization import MaleoIdentityUserOrganizationResultsSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
 from maleo_identity.models.transfers.general.organization import OptionalExpandedOrganization
 from maleo_identity.models.transfers.general.user import OptionalExpandedUser
 
 class UserOrganizationTransfers(
     OptionalExpandedOrganization,
+    MaleoIdentityGeneralSchemas.OrganizationId,
     OptionalExpandedUser,
-    MaleoIdentityUserOrganizationResultsSchemas.Base,
+    MaleoIdentityGeneralSchemas.UserId,
     BaseGeneralSchemas.Status,
     BaseGeneralSchemas.Timestamps,
     BaseGeneralSchemas.Identifiers

maleo_identity/models/transfers/general/user_organization_role.py

@@ -1,17 +1,18 @@
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-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
 from maleo_identity.models.transfers.general.organization import OptionalExpandedOrganization
 from maleo_identity.models.transfers.general.user import OptionalExpandedUser
 
 class UserOrganizationRoleTransfers(
-    MaleoIdentityUserOrganizationRoleGeneralSchemas.Name,
-    MaleoIdentityUserOrganizationRoleGeneralSchemas.Key,
-    MaleoIdentityUserOrganizationRoleGeneralSchemas.Order,
-    MaleoIdentityUserOrganizationRoleGeneralSchemas.IsDefault,
+    MaleoIdentityUserOrganizationRoleSchemas.Name,
+    MaleoIdentityUserOrganizationRoleSchemas.Key,
+    BaseGeneralSchemas.Order,
+    BaseGeneralSchemas.IsDefault,
     OptionalExpandedOrganization,
-    MaleoIdentityUserOrganizationRoleGeneralSchemas.OrganizationId,
+    MaleoIdentityGeneralSchemas.OrganizationId,
     OptionalExpandedUser,
-    MaleoIdentityUserOrganizationRoleGeneralSchemas.UserId,
+    MaleoIdentityGeneralSchemas.UserId,
     BaseGeneralSchemas.Status,
     BaseGeneralSchemas.Timestamps,
     BaseGeneralSchemas.Identifiers

maleo_identity/models/transfers/general/user_profile.py

@@ -1,10 +1,26 @@
 from pydantic import BaseModel, Field
 from typing import Optional
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_identity.models.schemas.results.user_profile import MaleoIdentityUserProfileResultsSchemas
+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 UserProfileTransfers(
-    MaleoIdentityUserProfileResultsSchemas.General,
+    MaleoMetadataBloodTypeExpandedSchemas.OptionalExpandedBloodType,
+    MaleoMetadataBloodTypeExpandedSchemas.OptionalSimpleBloodType,
+    MaleoMetadataGenderExpandedSchemas.OptionalExpandedGender,
+    MaleoMetadataGenderExpandedSchemas.OptionalSimpleGender,
+    MaleoIdentityUserProfileSchemas.BirthDate,
+    MaleoIdentityUserProfileSchemas.BirthPlace,
+    MaleoIdentityUserProfileSchemas.FullName,
+    MaleoIdentityUserProfileSchemas.EndingTitle,
+    MaleoIdentityUserProfileSchemas.LastName,
+    MaleoIdentityUserProfileSchemas.MiddleName,
+    MaleoIdentityUserProfileSchemas.FirstName,
+    MaleoIdentityUserProfileSchemas.LeadingTitle,
+    MaleoIdentityUserProfileSchemas.IdCard,
+    MaleoIdentityGeneralSchemas.UserId,
     BaseGeneralSchemas.Status,
     BaseGeneralSchemas.Timestamps,
     BaseGeneralSchemas.Identifiers

maleo_identity/models/transfers/general/user_system_role.py

@@ -1,12 +1,13 @@
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_metadata.models.expanded_schemas.system_role import MaleoMetadataSystemRoleExpandedSchemas
-from maleo_identity.models.schemas.results.user_system_role import MaleoIdentityUserSystemRoleResultsSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
 from maleo_identity.models.transfers.general.user import OptionalExpandedUser
 
 class UserSystemRoleTransfers(
     MaleoMetadataSystemRoleExpandedSchemas.OptionalExpandedSystemRole,
+    MaleoMetadataSystemRoleExpandedSchemas.SimpleSystemRole,
     OptionalExpandedUser,
-    MaleoIdentityUserSystemRoleResultsSchemas.Base,
+    MaleoIdentityGeneralSchemas.UserId,
     BaseGeneralSchemas.Status,
     BaseGeneralSchemas.Timestamps,
     BaseGeneralSchemas.Identifiers

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

@@ -1,26 +1,77 @@
 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.client import BaseClientParametersTransfers
 from maleo_metadata.models.expanded_schemas.organization_type import MaleoMetadataOrganizationTypeExpandedSchemas
-from maleo_identity.models.schemas.general.organization import MaleoIdentityOrganizationGeneralSchemas
+from maleo_identity.models.schemas.general import MaleoIdentityGeneralSchemas
+from maleo_identity.models.schemas.organization import MaleoIdentityOrganizationSchemas
 
 class MaleoIdentityOrganizationClientParametersTransfers:
     class GetMultiple(
-        MaleoIdentityOrganizationGeneralSchemas.Expand,
+        MaleoIdentityOrganizationSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultiple,
-        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 GetMultipleChildren(
+        MaleoIdentityOrganizationSchemas.Expand,
+        BaseClientParametersTransfers.GetPaginatedMultiple,
+        BaseParameterSchemas.OptionalListOfKeys,
+        BaseGeneralSchemas.IsLeaf,
+        BaseGeneralSchemas.IsParent,
+        MaleoIdentityGeneralSchemas.OrganizationId,
+        MaleoMetadataOrganizationTypeExpandedSchemas.OptionalListOfSimpleOrganizationTypes,
+        BaseParameterSchemas.OptionalListOfUuids,
+        BaseParameterSchemas.OptionalListOfIds
+    ): pass
+
+    class GetMultipleStructured(
+        BaseClientParametersTransfers.GetPaginatedMultiple,
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityOrganizationSchemas.OptionalListOfParentIds,
+        MaleoMetadataOrganizationTypeExpandedSchemas.OptionalListOfSimpleOrganizationTypes,
+        BaseParameterSchemas.OptionalListOfUuids,
+        BaseParameterSchemas.OptionalListOfIds
     ): pass
 
     class GetMultipleQuery(
-        MaleoIdentityOrganizationGeneralSchemas.Expand,
+        MaleoIdentityOrganizationSchemas.Expand,
+        BaseClientParametersTransfers.GetPaginatedMultipleQuery,
+        BaseParameterSchemas.OptionalListOfKeys,
+        BaseGeneralSchemas.IsLeaf,
+        BaseGeneralSchemas.IsChild,
+        BaseGeneralSchemas.IsParent,
+        BaseGeneralSchemas.IsRoot,
+        MaleoIdentityOrganizationSchemas.OptionalListOfParentIds,
+        MaleoMetadataOrganizationTypeExpandedSchemas.OptionalListOfSimpleOrganizationTypes,
+        BaseParameterSchemas.OptionalListOfUuids,
+        BaseParameterSchemas.OptionalListOfIds
+    ): pass
+
+    class GetMultipleChildrenQuery(
+        MaleoIdentityOrganizationSchemas.Expand,
+        BaseClientParametersTransfers.GetPaginatedMultipleQuery,
+        BaseParameterSchemas.OptionalListOfKeys,
+        BaseGeneralSchemas.IsLeaf,
+        BaseGeneralSchemas.IsParent,
+        MaleoMetadataOrganizationTypeExpandedSchemas.OptionalListOfSimpleOrganizationTypes,
+        BaseParameterSchemas.OptionalListOfUuids,
+        BaseParameterSchemas.OptionalListOfIds
+    ): pass
+
+    class GetMultipleStructuredQuery(
         BaseClientParametersTransfers.GetPaginatedMultipleQuery,
-        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/client/organization_role.py

@@ -1,31 +1,33 @@
 from __future__ import annotations
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 from maleo_foundation.models.transfers.parameters.client import BaseClientParametersTransfers
-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 MaleoIdentityOrganizationRoleClientParametersTransfers:
     class GetMultipleFromOrganization(
-        MaleoIdentityOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityOrganizationRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultiple,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OptionalListOfKey,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OrganizationId
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityGeneralSchemas.OrganizationId
     ): pass
     
     class GetMultiple(
-        MaleoIdentityOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityOrganizationRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultiple,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OptionalListOfKey,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OptionalListOfOrganizationId
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds
     ): pass
 
     class GetMultipleFromOrganizationQuery(
-        MaleoIdentityOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityOrganizationRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OptionalListOfKey
+        BaseParameterSchemas.OptionalListOfKeys
     ): pass
 
     class GetMultipleQuery(
-        MaleoIdentityOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityOrganizationRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OptionalListOfKey,
-        MaleoIdentityOrganizationRoleGeneralSchemas.OptionalListOfOrganizationId
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds
     ): pass

maleo_identity/models/transfers/parameters/client/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.client import BaseClientParametersTransfers
 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 MaleoIdentityUserClientParametersTransfers:
     class GetMultiple(
-        MaleoIdentityUserGeneralSchemas.Expand,
+        MaleoIdentityUserSchemas.Expand,
         BaseClientParametersTransfers.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
 
     class GetMultipleQuery(
-        MaleoIdentityUserGeneralSchemas.Expand,
+        MaleoIdentityUserSchemas.Expand,
         BaseClientParametersTransfers.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

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

@@ -1,44 +1,45 @@
 from __future__ import annotations
 from maleo_foundation.models.transfers.parameters.client import BaseClientParametersTransfers
-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 MaleoIdentityUserOrganizationClientParametersTransfers:
     class GetMultipleFromUser(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultiple,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfOrganizationId,
-        MaleoIdentityUserOrganizationGeneralSchemas.UserId
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds,
+        MaleoIdentityGeneralSchemas.UserId
     ): pass
 
     class GetMultipleFromOrganization(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultiple,
-        MaleoIdentityUserOrganizationGeneralSchemas.OrganizationId,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfUserId
+        MaleoIdentityGeneralSchemas.OrganizationId,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass
     
     class GetMultiple(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultiple,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfOrganizationId,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfUserId
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass
 
     class GetMultipleFromUserQuery(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfOrganizationId
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds
     ): pass
 
     class GetMultipleFromOrganizationQuery(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfUserId
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass
 
     class GetMultipleQuery(
-        MaleoIdentityUserOrganizationGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfOrganizationId,
-        MaleoIdentityUserOrganizationGeneralSchemas.OptionalListOfUserId
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass

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

@@ -1,34 +1,36 @@
 from __future__ import annotations
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 from maleo_foundation.models.transfers.parameters.client import BaseClientParametersTransfers
-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 MaleoIdentityUserOrganizationRoleClientParametersTransfers:
     class GetMultipleFromUserOrOrganization(
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultiple,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfKey,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OrganizationId,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.UserId
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityGeneralSchemas.OrganizationId,
+        MaleoIdentityGeneralSchemas.UserId
     ): pass
     
     class GetMultiple(
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultiple,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfKey,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfOrganizationId,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfUserId
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass
 
     class GetMultipleFromUserOrOrganizationQuery(
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfKey
+        BaseParameterSchemas.OptionalListOfKeys
     ): pass
 
     class GetMultipleQuery(
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.Expand,
+        MaleoIdentityUserOrganizationRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfKey,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfOrganizationId,
-        MaleoIdentityUserOrganizationRoleGeneralSchemas.OptionalListOfUserId
+        BaseParameterSchemas.OptionalListOfKeys,
+        MaleoIdentityGeneralSchemas.OptionalListOfOrganizationIds,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass

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

@@ -2,21 +2,22 @@ from __future__ import annotations
 from maleo_foundation.models.transfers.parameters.client import BaseClientParametersTransfers
 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 MaleoIdentityUserProfileClientParametersTransfers:
     class GetMultiple(
-        MaleoIdentityUserProfileGeneralSchemas.Expand,
+        MaleoIdentityUserProfileSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultiple,
-        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodType,
-        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGender,
-        MaleoIdentityUserProfileGeneralSchemas.OptionalListOfUserId
+        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodTypes,
+        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGenders,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass
 
     class GetMultipleQuery(
-        MaleoIdentityUserProfileGeneralSchemas.Expand,
+        MaleoIdentityUserProfileSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodType,
-        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGender,
-        MaleoIdentityUserProfileGeneralSchemas.OptionalListOfUserId
+        MaleoMetadataBloodTypeExpandedSchemas.OptionalListOfSimpleBloodTypes,
+        MaleoMetadataGenderExpandedSchemas.OptionalListOfSimpleGenders,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass

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

@@ -1,32 +1,33 @@
 from __future__ import annotations
 from maleo_foundation.models.transfers.parameters.client import BaseClientParametersTransfers
 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 MaleoIdentityUserSystemRoleClientParametersTransfers:
     class GetMultipleFromUser(
-        MaleoIdentityUserSystemRoleGeneralSchemas.Expand,
+        MaleoIdentityUserSystemRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultiple,
-        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRole,
-        MaleoIdentityUserSystemRoleGeneralSchemas.UserId
+        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRoles,
+        MaleoIdentityGeneralSchemas.UserId
     ): pass
     
     class GetMultiple(
-        MaleoIdentityUserSystemRoleGeneralSchemas.Expand,
+        MaleoIdentityUserSystemRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultiple,
-        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRole,
-        MaleoIdentityUserSystemRoleGeneralSchemas.OptionalListOfUserId
+        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRoles,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass
 
     class GetMultipleFromUserQuery(
-        MaleoIdentityUserSystemRoleGeneralSchemas.Expand,
+        MaleoIdentityUserSystemRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRole
+        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRoles
     ): pass
 
     class GetMultipleQuery(
-        MaleoIdentityUserSystemRoleGeneralSchemas.Expand,
+        MaleoIdentityUserSystemRoleSchemas.Expand,
         BaseClientParametersTransfers.GetPaginatedMultipleQuery,
-        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRole,
-        MaleoIdentityUserSystemRoleGeneralSchemas.OptionalListOfUserId
+        MaleoMetadataSystemRoleExpandedSchemas.OptionalListOfSimpleSystemRoles,
+        MaleoIdentityGeneralSchemas.OptionalListOfUserIds
     ): pass

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

@@ -1,30 +1,35 @@
 from __future__ import annotations
-from maleo_foundation.models.schemas.general import BaseGeneralSchemas
-from maleo_identity.models.schemas.parameters.organization import MaleoIdentityOrganizationParametersSchemas
-from maleo_identity.models.schemas.general.organization import MaleoIdentityOrganizationGeneralSchemas
+from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
+from maleo_metadata.models.expanded_schemas.organization_type import MaleoMetadataOrganizationTypeExpandedSchemas
+from maleo_identity.models.schemas.organization import MaleoIdentityOrganizationSchemas
 
 class MaleoIdentityOrganizationGeneralParametersTransfers:
     class GetSingleQuery(
-        MaleoIdentityOrganizationGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses
+        MaleoIdentityOrganizationSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses
     ): pass
 
     class GetSingle(
-        MaleoIdentityOrganizationGeneralSchemas.Expand,
-        BaseGeneralSchemas.Statuses,
-        BaseGeneralSchemas.IdentifierValue,
-        MaleoIdentityOrganizationGeneralSchemas.IdentifierType
+        MaleoIdentityOrganizationSchemas.Expand,
+        BaseParameterSchemas.OptionalListOfStatuses,
+        BaseParameterSchemas.IdentifierValue,
+        MaleoIdentityOrganizationSchemas.IdentifierType
     ): pass
 
-    class CreateOrUpdateQuery(MaleoIdentityOrganizationGeneralSchemas.Expand): pass
+    class CreateOrUpdateQuery(MaleoIdentityOrganizationSchemas.Expand): pass
 
-    class CreateOrUpdateData(MaleoIdentityOrganizationParametersSchemas.Base): pass
+    class CreateOrUpdateData(
+        MaleoIdentityOrganizationSchemas.Name,
+        MaleoIdentityOrganizationSchemas.Key,
+        MaleoIdentityOrganizationSchemas.OptionalParentId,
+        MaleoMetadataOrganizationTypeExpandedSchemas.SimpleOrganizationType
+    ): pass
 
     class Create(CreateOrUpdateData, CreateOrUpdateQuery): pass
 
     class Update(
         CreateOrUpdateData,
         CreateOrUpdateQuery,
-        BaseGeneralSchemas.IdentifierValue,
-        MaleoIdentityOrganizationGeneralSchemas.IdentifierType
+        BaseParameterSchemas.IdentifierValue,
+        MaleoIdentityOrganizationSchemas.IdentifierType
     ): pass