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

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

@@ -12,17 +12,17 @@ from maleo.soma.schemas.parameter.general import (
 )
 from maleo.soma.types.base import ListOfDataStatuses
 from maleo.metadata.schemas.data.organization_type import SimpleOrganizationTypeMixin
-from maleo.identity.enums.organization import IdentifierType, ExpandableField
-from maleo.identity.mixins.organization import Key, Name, Expand
+from maleo.identity.enums.organization import IdentifierType, IncludableField
+from maleo.identity.mixins.organization import Key, Name, Include
 from maleo.identity.types.base.organization import IdentifierValueType
 
 
-class ReadSingleQueryParameter(Expand, ReadSingleQueryParameterSchema):
+class ReadSingleQueryParameter(Include, ReadSingleQueryParameterSchema):
     pass
 
 
 class ReadSingleParameter(
-    Expand, ReadSingleParameterSchema[IdentifierType, IdentifierValueType]
+    Include, ReadSingleParameterSchema[IdentifierType, IdentifierValueType]
 ):
     @overload
     @classmethod
@@ -32,7 +32,7 @@ class ReadSingleParameter(
         value: int,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -42,7 +42,7 @@ class ReadSingleParameter(
         value: UUID,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -52,7 +52,7 @@ class ReadSingleParameter(
         value: str,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
@@ -61,14 +61,14 @@ class ReadSingleParameter(
         value: IdentifierValueType,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter":
         return cls(
             identifier=identifier,
             value=value,
             statuses=statuses,
             use_cache=use_cache,
-            expand=expand,
+            include=include,
         )
 
 
@@ -77,14 +77,14 @@ class CreateOrUpdateBody(Name, Key, OptionalParentId, SimpleOrganizationTypeMixi
 
 
 class CreateParameter(
-    Expand,
+    Include,
     CreateOrUpdateBody,
 ):
     pass
 
 
 class UpdateParameter(
-    Expand,
+    Include,
     CreateOrUpdateBody,
     IdentifierValueMixin[IdentifierValueType],
     IdentifierTypeMixin[IdentifierType],

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

@@ -1,14 +1,14 @@
 from maleo.soma.mixins.general import OrganizationId
 from maleo.soma.mixins.parameter import OptionalListOfDataStatuses, UseCache
 from maleo.soma.schemas.parameter.general import ReadSingleQueryParameterSchema
-from maleo.identity.mixins.organization_role import Key, Expand
+from maleo.identity.mixins.organization_role import Key, Include
 
 
-class ReadSingleQueryParameter(Expand, ReadSingleQueryParameterSchema):
+class ReadSingleQueryParameter(Include, ReadSingleQueryParameterSchema):
     pass
 
 
 class ReadSingleParameter(
-    Expand, UseCache, OptionalListOfDataStatuses, Key, OrganizationId
+    Include, UseCache, OptionalListOfDataStatuses, Key, OrganizationId
 ):
     pass

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

@@ -14,7 +14,7 @@ from maleo.soma.types.base import ListOfDataStatuses
 from maleo.metadata.schemas.data.blood_type import OptionalSimpleBloodTypeMixin
 from maleo.metadata.schemas.data.gender import OptionalSimpleGenderMixin
 from maleo.metadata.schemas.data.user_type import SimpleUserTypeMixin
-from maleo.identity.enums.user import IdentifierType, ExpandableField
+from maleo.identity.enums.user import IdentifierType, IncludableField
 from maleo.identity.mixins.user import (
     Username,
     Email,
@@ -22,7 +22,7 @@ from maleo.identity.mixins.user import (
     Password,
     PasswordConfirmation,
     RegistrationCode,
-    Expand,
+    Include,
 )
 from maleo.identity.mixins.user_profile import (
     OptionalIdCard,
@@ -40,12 +40,12 @@ from maleo.identity.mixins.user_profile import (
 from maleo.identity.types.base.user import IdentifierValueType
 
 
-class ReadSingleQueryParameter(Expand, ReadSingleQueryParameterSchema):
+class ReadSingleQueryParameter(Include, ReadSingleQueryParameterSchema):
     pass
 
 
 class ReadSingleParameter(
-    Expand, ReadSingleParameterSchema[IdentifierType, IdentifierValueType]
+    Include, ReadSingleParameterSchema[IdentifierType, IdentifierValueType]
 ):
     @overload
     @classmethod
@@ -55,7 +55,7 @@ class ReadSingleParameter(
         value: int,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -65,7 +65,7 @@ class ReadSingleParameter(
         value: UUID,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -75,7 +75,7 @@ class ReadSingleParameter(
         value: str,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
@@ -84,14 +84,14 @@ class ReadSingleParameter(
         value: IdentifierValueType,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter":
         return cls(
             identifier=identifier,
             value=value,
             statuses=statuses,
             use_cache=use_cache,
-            expand=expand,
+            include=include,
         )
 
 
@@ -106,7 +106,7 @@ class UpdateBody(Phone, Email, Username):
 
 
 class UpdateParameter(
-    Expand,
+    Include,
     UpdateBody,
     IdentifierValueMixin[IdentifierValueType],
     IdentifierTypeMixin[IdentifierType],
@@ -119,14 +119,14 @@ class CreateBody(Password, UpdateBody, SimpleUserTypeMixin, OptionalOrganization
 
 
 class CreateParameter(
-    Expand,
+    Include,
     CreateBody,
 ):
     pass
 
 
 class RegisterParameter(
-    Expand,
+    Include,
     OptionalAvatarName,
     OptionalAvatarContentType,
     OptionalAvatar,

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

@@ -1,18 +1,18 @@
 from maleo.soma.mixins.general import OrganizationId, UserId
 from maleo.soma.mixins.parameter import OptionalListOfDataStatuses, UseCache
 from maleo.soma.schemas.parameter.general import ReadSingleQueryParameterSchema
-from maleo.identity.mixins.user_organization import Expand
+from maleo.identity.mixins.user_organization import Include
 
 
-class ReadSingleQueryParameter(Expand, ReadSingleQueryParameterSchema):
+class ReadSingleQueryParameter(Include, ReadSingleQueryParameterSchema):
     pass
 
 
 class ReadSingleParameter(
-    Expand, UseCache, OptionalListOfDataStatuses, OrganizationId, UserId
+    Include, UseCache, OptionalListOfDataStatuses, OrganizationId, UserId
 ):
     pass
 
 
-class CreateParameter(Expand, UserId, OrganizationId):
+class CreateParameter(Include, UserId, OrganizationId):
     pass

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

@@ -2,14 +2,14 @@ from maleo.soma.mixins.general import OrganizationId, UserId
 from maleo.soma.mixins.parameter import OptionalListOfDataStatuses, UseCache
 from maleo.soma.schemas.parameter.general import ReadSingleQueryParameterSchema
 from maleo.identity.mixins.organization_role import Key
-from maleo.identity.mixins.user_organization_role import Expand
+from maleo.identity.mixins.user_organization_role import Include
 
 
-class ReadSingleQueryParameter(Expand, ReadSingleQueryParameterSchema):
+class ReadSingleQueryParameter(Include, ReadSingleQueryParameterSchema):
     pass
 
 
 class ReadSingleParameter(
-    Expand, UseCache, OptionalListOfDataStatuses, Key, OrganizationId, UserId
+    Include, UseCache, OptionalListOfDataStatuses, Key, OrganizationId, UserId
 ):
     pass

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

@@ -10,9 +10,9 @@ from maleo.soma.schemas.parameter.general import (
 from maleo.soma.types.base import ListOfDataStatuses
 from maleo.metadata.schemas.data.blood_type import OptionalSimpleBloodTypeMixin
 from maleo.metadata.schemas.data.gender import OptionalSimpleGenderMixin
-from maleo.identity.enums.user_profile import IdentifierType, ExpandableField
+from maleo.identity.enums.user_profile import IdentifierType, IncludableField
 from maleo.identity.mixins.user_profile import (
-    Expand,
+    Include,
     OptionalIdCard,
     LeadingTitle,
     FirstName,
@@ -28,14 +28,14 @@ from maleo.identity.types.base.user_profile import IdentifierValueType
 
 
 class ReadSingleQueryParameter(
-    Expand,
+    Include,
     ReadSingleQueryParameterSchema,
 ):
     pass
 
 
 class ReadSingleParameter(
-    Expand, ReadSingleParameterSchema[IdentifierType, IdentifierValueType]
+    Include, ReadSingleParameterSchema[IdentifierType, IdentifierValueType]
 ):
     @overload
     @classmethod
@@ -45,7 +45,7 @@ class ReadSingleParameter(
         value: int,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -55,7 +55,7 @@ class ReadSingleParameter(
         value: UUID,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -65,7 +65,7 @@ class ReadSingleParameter(
         value: str,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter": ...
     @classmethod
     def new(
@@ -74,18 +74,18 @@ class ReadSingleParameter(
         value: IdentifierValueType,
         statuses: ListOfDataStatuses = ALL_STATUSES,
         use_cache: bool = True,
-        expand: Optional[List[ExpandableField]] = None,
+        include: Optional[List[IncludableField]] = None,
     ) -> "ReadSingleParameter":
         return cls(
             identifier=identifier,
             value=value,
             statuses=statuses,
             use_cache=use_cache,
-            expand=expand,
+            include=include,
         )
 
 
-class CreateOrUpdateQuery(Expand):
+class CreateOrUpdateQuery(Include):
     pass
 
 

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

@@ -2,18 +2,18 @@ from maleo.soma.mixins.general import UserId
 from maleo.soma.mixins.parameter import OptionalListOfDataStatuses, UseCache
 from maleo.soma.schemas.parameter.general import ReadSingleQueryParameterSchema
 from maleo.metadata.schemas.data.system_role import SimpleSystemRoleMixin
-from maleo.identity.mixins.user_system_role import Expand
+from maleo.identity.mixins.user_system_role import Include
 
 
 class ReadSingleQueryParameter(
-    Expand,
+    Include,
     ReadSingleQueryParameterSchema,
 ):
     pass
 
 
 class ReadSingleParameter(
-    Expand,
+    Include,
     UseCache,
     OptionalListOfDataStatuses,
     SimpleSystemRoleMixin,
@@ -23,7 +23,7 @@ class ReadSingleParameter(
 
 
 class CreateParameter(
-    Expand,
+    Include,
     SimpleSystemRoleMixin,
     UserId,
 ):

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

@@ -12,11 +12,11 @@ from maleo.soma.schemas.parameter.service 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 ReadMultipleChildrenQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfKeys,
     IsLeaf,
@@ -29,7 +29,7 @@ class ReadMultipleChildrenQueryParameter(
 
 
 class ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfKeys,
     IsLeaf,
@@ -45,7 +45,7 @@ class ReadMultipleQueryParameter(
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfKeys,
     IsLeaf,

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

@@ -6,11 +6,11 @@ from maleo.soma.mixins.parameter import (
     OptionalListOfKeys,
     OptionalListOfOrganizationIds,
 )
-from maleo.identity.mixins.organization_role import Expand
+from maleo.identity.mixins.organization_role import Include
 
 
 class ReadMultipleFromOrganizationQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfKeys,
 ):
@@ -18,7 +18,7 @@ class ReadMultipleFromOrganizationQueryParameter(
 
 
 class ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfKeys,
     OptionalListOfOrganizationIds,
@@ -27,7 +27,7 @@ class ReadMultipleQueryParameter(
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfKeys,
     OptionalListOfOrganizationIds,

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

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

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

@@ -7,17 +7,17 @@ from maleo.soma.schemas.parameter.service import (
     ReadPaginatedMultipleQueryParameterSchema,
     ReadPaginatedMultipleParameterSchema,
 )
-from maleo.identity.mixins.user_organization_role import Expand
+from maleo.identity.mixins.user_organization_role import Include
 
 
 class ReadMultipleFromUserOrganizationQueryParameter(
-    Expand, ReadPaginatedMultipleQueryParameterSchema, OptionalListOfKeys
+    Include, ReadPaginatedMultipleQueryParameterSchema, OptionalListOfKeys
 ):
     pass
 
 
 class ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfKeys,
     OptionalListOfUserIds,
@@ -27,7 +27,7 @@ class ReadMultipleQueryParameter(
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfKeys,
     OptionalListOfUserIds,

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

@@ -5,11 +5,11 @@ from maleo.soma.schemas.parameter.service 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 ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalListOfSimpleBloodTypesMixin,
     OptionalListOfSimpleGendersMixin,
@@ -19,7 +19,7 @@ class ReadMultipleQueryParameter(
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalListOfSimpleBloodTypesMixin,
     OptionalListOfSimpleGendersMixin,

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

@@ -4,17 +4,17 @@ from maleo.soma.schemas.parameter.service import (
     ReadPaginatedMultipleParameterSchema,
 )
 from maleo.metadata.schemas.data.system_role import OptionalSimpleSystemRoleMixin
-from maleo.identity.mixins.user_system_role import Expand
+from maleo.identity.mixins.user_system_role import Include
 
 
 class ReadMultipleFromuserQueryParameter(
-    Expand, ReadPaginatedMultipleQueryParameterSchema, OptionalSimpleSystemRoleMixin
+    Include, ReadPaginatedMultipleQueryParameterSchema, OptionalSimpleSystemRoleMixin
 ):
     pass
 
 
 class ReadMultipleQueryParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleQueryParameterSchema,
     OptionalSimpleSystemRoleMixin,
     OptionalListOfUserIds,
@@ -23,7 +23,7 @@ class ReadMultipleQueryParameter(
 
 
 class ReadMultipleParameter(
-    Expand,
+    Include,
     ReadPaginatedMultipleParameterSchema,
     OptionalSimpleSystemRoleMixin,
     OptionalListOfUserIds,

{maleo_identity-0.0.90.dist-info → maleo_identity-0.0.91.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: maleo-identity
-Version: 0.0.90
+Version: 0.0.91
 Summary: MaleoIdentity service package
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
-Requires-Dist: maleo_soma>=0.1.93
-Requires-Dist: maleo_metadata>=0.2.50
+Requires-Dist: maleo-metadata>=0.2.52
 
 # README #