maleo-identity 0.1.45__tar.gz → 0.1.60__tar.gz

{maleo_identity-0.1.45 → maleo_identity-0.1.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-identity
-Version: 0.1.45
+Version: 0.1.60
 Summary: MaleoIdentity service package
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary
@@ -41,15 +41,15 @@ Requires-Dist: identify>=2.6.15
 Requires-Dist: idna>=3.11
 Requires-Dist: importlib_metadata>=8.7.0
 Requires-Dist: iniconfig>=2.1.0
-Requires-Dist: maleo-enums>=0.0.81
-Requires-Dist: maleo-metadata>=0.7.75
+Requires-Dist: maleo-enums>=0.0.85
+Requires-Dist: maleo-metadata>=0.7.89
 Requires-Dist: mypy_extensions>=1.1.0
-Requires-Dist: nexo-crypto>=0.0.4
-Requires-Dist: nexo-enums>=0.0.4
-Requires-Dist: nexo-logging>=0.0.4
-Requires-Dist: nexo-schemas>=0.0.4
-Requires-Dist: nexo-types>=0.0.4
-Requires-Dist: nexo-utils>=0.0.4
+Requires-Dist: nexo-crypto>=0.0.5
+Requires-Dist: nexo-enums>=0.0.5
+Requires-Dist: nexo-logging>=0.0.5
+Requires-Dist: nexo-schemas>=0.0.9
+Requires-Dist: nexo-types>=0.0.5
+Requires-Dist: nexo-utils>=0.0.5
 Requires-Dist: nodeenv>=1.9.1
 Requires-Dist: opentelemetry-api>=1.37.0
 Requires-Dist: opentelemetry-sdk>=1.37.0

{maleo_identity-0.1.45 → maleo_identity-0.1.60}/maleo_identity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-identity
-Version: 0.1.45
+Version: 0.1.60
 Summary: MaleoIdentity service package
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary
@@ -41,15 +41,15 @@ Requires-Dist: identify>=2.6.15
 Requires-Dist: idna>=3.11
 Requires-Dist: importlib_metadata>=8.7.0
 Requires-Dist: iniconfig>=2.1.0
-Requires-Dist: maleo-enums>=0.0.81
-Requires-Dist: maleo-metadata>=0.7.75
+Requires-Dist: maleo-enums>=0.0.85
+Requires-Dist: maleo-metadata>=0.7.89
 Requires-Dist: mypy_extensions>=1.1.0
-Requires-Dist: nexo-crypto>=0.0.4
-Requires-Dist: nexo-enums>=0.0.4
-Requires-Dist: nexo-logging>=0.0.4
-Requires-Dist: nexo-schemas>=0.0.4
-Requires-Dist: nexo-types>=0.0.4
-Requires-Dist: nexo-utils>=0.0.4
+Requires-Dist: nexo-crypto>=0.0.5
+Requires-Dist: nexo-enums>=0.0.5
+Requires-Dist: nexo-logging>=0.0.5
+Requires-Dist: nexo-schemas>=0.0.9
+Requires-Dist: nexo-types>=0.0.5
+Requires-Dist: nexo-utils>=0.0.5
 Requires-Dist: nodeenv>=1.9.1
 Requires-Dist: opentelemetry-api>=1.37.0
 Requires-Dist: opentelemetry-sdk>=1.37.0

{maleo_identity-0.1.45 → maleo_identity-0.1.60}/maleo_identity.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ src/constants/organization_relation.py
 src/constants/patient.py
 src/constants/user.py
 src/constants/user_medical_role.py
+src/constants/user_organization.py
 src/constants/user_organization_role.py
 src/constants/user_profile.py
 src/constants/user_system_role.py
@@ -26,6 +27,7 @@ src/enums/organization_relation.py
 src/enums/patient.py
 src/enums/user.py
 src/enums/user_medical_role.py
+src/enums/user_organization.py
 src/enums/user_organization_role.py
 src/enums/user_profile.py
 src/enums/user_system_role.py
@@ -38,6 +40,7 @@ src/mixins/organization_relation.py
 src/mixins/patient.py
 src/mixins/user.py
 src/mixins/user_medical_role.py
+src/mixins/user_organization.py
 src/mixins/user_organization_role.py
 src/mixins/user_profile.py
 src/mixins/user_system_role.py
@@ -50,6 +53,7 @@ src/schemas/organization_relation.py
 src/schemas/patient.py
 src/schemas/user.py
 src/schemas/user_medical_role.py
+src/schemas/user_organization.py
 src/schemas/user_organization_role.py
 src/schemas/user_profile.py
 src/schemas/user_system_role.py
@@ -61,8 +65,7 @@ src/types/organization_relation.py
 src/types/patient.py
 src/types/user.py
 src/types/user_medical_role.py
+src/types/user_organization.py
 src/types/user_organization_role.py
 src/types/user_profile.py
-src/types/user_system_role.py
-src/utils/__init__.py
-src/utils/organization.py
+src/types/user_system_role.py

{maleo_identity-0.1.45 → maleo_identity-0.1.60}/maleo_identity.egg-info/requires.txt

@@ -32,15 +32,15 @@ identify>=2.6.15
 idna>=3.11
 importlib_metadata>=8.7.0
 iniconfig>=2.1.0
-maleo-enums>=0.0.81
-maleo-metadata>=0.7.75
+maleo-enums>=0.0.85
+maleo-metadata>=0.7.89
 mypy_extensions>=1.1.0
-nexo-crypto>=0.0.4
-nexo-enums>=0.0.4
-nexo-logging>=0.0.4
-nexo-schemas>=0.0.4
-nexo-types>=0.0.4
-nexo-utils>=0.0.4
+nexo-crypto>=0.0.5
+nexo-enums>=0.0.5
+nexo-logging>=0.0.5
+nexo-schemas>=0.0.9
+nexo-types>=0.0.5
+nexo-utils>=0.0.5
 nodeenv>=1.9.1
 opentelemetry-api>=1.37.0
 opentelemetry-sdk>=1.37.0

{maleo_identity-0.1.45 → maleo_identity-0.1.60}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo-identity"
-version = "0.1.45"
+version = "0.1.60"
 description = "MaleoIdentity service package"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }
@@ -47,15 +47,15 @@ dependencies = [
     "idna>=3.11",
     "importlib_metadata>=8.7.0",
     "iniconfig>=2.1.0",
-    "maleo-enums>=0.0.81",
-    "maleo-metadata>=0.7.75",
+    "maleo-enums>=0.0.85",
+    "maleo-metadata>=0.7.89",
     "mypy_extensions>=1.1.0",
-    "nexo-crypto>=0.0.4",
-    "nexo-enums>=0.0.4",
-    "nexo-logging>=0.0.4",
-    "nexo-schemas>=0.0.4",
-    "nexo-types>=0.0.4",
-    "nexo-utils>=0.0.4",
+    "nexo-crypto>=0.0.5",
+    "nexo-enums>=0.0.5",
+    "nexo-logging>=0.0.5",
+    "nexo-schemas>=0.0.9",
+    "nexo-types>=0.0.5",
+    "nexo-utils>=0.0.5",
     "nodeenv>=1.9.1",
     "opentelemetry-api>=1.37.0",
     "opentelemetry-sdk>=1.37.0",
@@ -103,7 +103,6 @@ packages = [
     "maleo.identity.mixins",
     "maleo.identity.schemas",
     "maleo.identity.types",
-    "maleo.identity.utils",
 ]
 
 [tool.setuptools.package-data]
@@ -113,7 +112,6 @@ packages = [
 "maleo.identity.mixins" = ["*.json", "*.yaml"]
 "maleo.identity.schemas" = ["*.json", "*.yaml"]
 "maleo.identity.types" = ["*.json", "*.yaml"]
-"maleo.identity.utils" = ["*.json", "*.yaml"]
 
 [tool.setuptools.package-dir]
 "maleo.identity" = "src"
@@ -121,5 +119,4 @@ packages = [
 "maleo.identity.enums" = "src/enums"
 "maleo.identity.mixins" = "src/mixins"
 "maleo.identity.schemas" = "src/schemas"
-"maleo.identity.types" = "src/types"
-"maleo.identity.utils" = "src/utils"
+"maleo.identity.types" = "src/types"

maleo_identity-0.1.60/src/constants/user_organization.py

@@ -0,0 +1,13 @@
+from nexo.schemas.resource import Resource, ResourceIdentifier
+
+
+USER_ORGANIZATION_RESOURCE = Resource(
+    identifiers=[
+        ResourceIdentifier(
+            key="user_organization",
+            name="User Organization",
+            slug="user-organizations",
+        )
+    ],
+    details=None,
+)

{maleo_identity-0.1.45 → maleo_identity-0.1.60}/src/enums/organization.py

@@ -2,15 +2,6 @@ from enum import StrEnum
 from nexo.types.string import ListOfStrs
 
 
-class Granularity(StrEnum):
-    STANDARD = "standard"
-    FULL = "full"
-
-    @classmethod
-    def choices(cls) -> ListOfStrs:
-        return [e.value for e in cls]
-
-
 class IdentifierType(StrEnum):
     ID = "id"
     UUID = "uuid"
@@ -23,3 +14,16 @@ class IdentifierType(StrEnum):
     @property
     def column(self) -> str:
         return self.value
+
+
+class ExpandableField(StrEnum):
+    ORGANIZATION_TYPE = "organization_type"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]
+
+
+OptExpandableField = ExpandableField | None
+ListOfExpandableFields = list[ExpandableField]
+OptListOfExpandableFields = ListOfExpandableFields | None

maleo_identity-0.1.60/src/enums/user_organization.py

@@ -0,0 +1,40 @@
+from enum import StrEnum
+from nexo.types.string import ListOfStrs, ManyStrs
+
+
+class IdentifierType(StrEnum):
+    ID = "id"
+    UUID = "uuid"
+    COMPOSITE = "composite"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]
+
+    @property
+    def columns(self) -> ManyStrs:
+        if self is IdentifierType.ID:
+            return ("id",)
+        elif self is IdentifierType.UUID:
+            return ("uuid",)
+        elif self is IdentifierType.COMPOSITE:
+            return ("user_id", "organization_id")
+        raise ValueError(f"Unknown column(s) for identifier type: {self}")
+
+
+class ExpandableField(StrEnum):
+    USER_TYPE = "user_type"
+    BLOOD_TYPE = "blood_type"
+    GENDER = "gender"
+    ORGANIZATION_TYPE = "organization_type"
+    ORGANIZATION_ROLE = "organization_role"
+    MEDICAL_ROLE = "medical_role"
+
+    @classmethod
+    def choices(cls) -> ListOfStrs:
+        return [e.value for e in cls]
+
+
+OptExpandableField = ExpandableField | None
+ListOfExpandableFields = list[ExpandableField]
+OptListOfExpandableFields = ListOfExpandableFields | None

{maleo_identity-0.1.45 → maleo_identity-0.1.60}/src/mixins/organization.py

@@ -4,7 +4,7 @@ from uuid import UUID
 from nexo.schemas.mixins.identity import Identifier, Key as BaseKey, Name as BaseName
 from nexo.types.string import OptStrT
 from nexo.types.uuid import OptUUIDT
-from ..enums.organization import IdentifierType
+from ..enums.organization import IdentifierType, OptListOfExpandableFields
 from ..types.organization import IdentifierValueType
 
 
@@ -20,6 +20,12 @@ class Secret(BaseModel, Generic[OptUUIDT]):
     secret: Annotated[OptUUIDT, Field(..., description="Secret")]
 
 
+class Expand(BaseModel):
+    expand: Annotated[
+        OptListOfExpandableFields, Field(None, description="Expanded field(s)")
+    ] = None
+
+
 class OrganizationIdentifier(Identifier[IdentifierType, IdentifierValueType]):
     @property
     def column_and_value(self) -> tuple[str, IdentifierValueType]:

maleo_identity-0.1.60/src/mixins/user_organization.py

@@ -0,0 +1,76 @@
+from pydantic import BaseModel, Field
+from typing import Annotated, Literal, TypeGuard
+from uuid import UUID
+from nexo.schemas.mixins.identity import Identifier
+from nexo.types.any import ManyAny
+from nexo.types.string import ManyStrs
+from ..enums.user_organization import IdentifierType, OptListOfExpandableFields
+from ..types.user_organization import CompositeIdentifierType, IdentifierValueType
+
+
+class Expand(BaseModel):
+    expand: Annotated[
+        OptListOfExpandableFields, Field(None, description="Expanded field(s)")
+    ] = None
+
+
+class UserOrganizationIdentifier(Identifier[IdentifierType, IdentifierValueType]):
+    @property
+    def columns_and_values(self) -> tuple[ManyStrs, ManyAny]:
+        values = self.value if isinstance(self.value, tuple) else (self.value,)
+        return self.type.columns, values
+
+
+class IdUserOrganizationIdentifier(Identifier[Literal[IdentifierType.ID], int]):
+    type: Annotated[
+        Literal[IdentifierType.ID],
+        Field(IdentifierType.ID, description="Identifier's type"),
+    ] = IdentifierType.ID
+    value: Annotated[int, Field(..., description="Identifier's value", ge=1)]
+
+
+class UUIDUserOrganizationIdentifier(Identifier[Literal[IdentifierType.UUID], UUID]):
+    type: Annotated[
+        Literal[IdentifierType.UUID],
+        Field(IdentifierType.UUID, description="Identifier's type"),
+    ] = IdentifierType.UUID
+
+
+class CompositeUserOrganizationIdentifier(
+    Identifier[Literal[IdentifierType.COMPOSITE], CompositeIdentifierType]
+):
+    type: Annotated[
+        Literal[IdentifierType.COMPOSITE],
+        Field(IdentifierType.COMPOSITE, description="Identifier's type"),
+    ] = IdentifierType.COMPOSITE
+    value: Annotated[
+        CompositeIdentifierType, Field(..., description="Identifier's value")
+    ]
+
+
+AnyUserOrganizationIdentifier = (
+    UserOrganizationIdentifier
+    | IdUserOrganizationIdentifier
+    | UUIDUserOrganizationIdentifier
+    | CompositeUserOrganizationIdentifier
+)
+
+
+def is_id_identifier(
+    identifier: AnyUserOrganizationIdentifier,
+) -> TypeGuard[IdUserOrganizationIdentifier]:
+    return identifier.type is IdentifierType.ID and isinstance(identifier.value, int)
+
+
+def is_uuid_identifier(
+    identifier: AnyUserOrganizationIdentifier,
+) -> TypeGuard[UUIDUserOrganizationIdentifier]:
+    return identifier.type is IdentifierType.UUID and isinstance(identifier.value, UUID)
+
+
+def is_composite_identifier(
+    identifier: AnyUserOrganizationIdentifier,
+) -> TypeGuard[CompositeUserOrganizationIdentifier]:
+    return identifier.type is IdentifierType.COMPOSITE and isinstance(
+        identifier.value, tuple
+    )

{maleo_identity-0.1.45 → maleo_identity-0.1.60}/src/schemas/common.py

@@ -1,6 +1,6 @@
 from datetime import date
 from pydantic import BaseModel, Field
-from typing import Annotated, Generic, TypeVar, Type
+from typing import Annotated
 from nexo.enums.identity import OptRhesus, RhesusMixin
 from nexo.enums.organization import (
     OrganizationRelation,
@@ -110,7 +110,7 @@ class OrganizationRegistrationCodeSchemaMixin(BaseModel):
     ] = None
 
 
-class StandardOrganizationSchema(
+class OrganizationSchema(
     OrganizationName[str],
     OrganizationKey[str],
     FullOrganizationTypeMixin[OrganizationTypeKeyOrStandardSchema],
@@ -120,10 +120,12 @@ class StandardOrganizationSchema(
     pass
 
 
+class OrganizationSchemaMixin(BaseModel):
+    organization: Annotated[OrganizationSchema, Field(..., description="Organization")]
+
+
 class SourceOrganizationSchemaMixin(BaseModel):
-    source: Annotated[
-        StandardOrganizationSchema, Field(..., description="Source organization")
-    ]
+    source: Annotated[OrganizationSchema, Field(..., description="Source organization")]
 
 
 class SourceOrganizationRelationSchema(
@@ -145,9 +147,7 @@ class SourceOrganizationRelationsSchemaMixin(BaseModel):
 
 
 class TargetOrganizationSchemaMixin(BaseModel):
-    target: Annotated[
-        StandardOrganizationSchema, Field(..., description="Target organization")
-    ]
+    target: Annotated[OrganizationSchema, Field(..., description="Target organization")]
 
 
 class TargetOrganizationRelationSchema(
@@ -168,28 +168,6 @@ class TargetOrganizationRelationsSchemaMixin(BaseModel):
     ] = list[TargetOrganizationRelationSchema]()
 
 
-class FullOrganizationSchema(
-    TargetOrganizationRelationsSchemaMixin,
-    SourceOrganizationRelationsSchemaMixin,
-    OrganizationRegistrationCodeSchemaMixin,
-    StandardOrganizationSchema,
-):
-    pass
-
-
-AnyOrganizationSchemaType = (
-    Type[StandardOrganizationSchema] | Type[FullOrganizationSchema]
-)
-AnyOrganizationSchema = StandardOrganizationSchema | FullOrganizationSchema
-AnyOrganizationSchemaT = TypeVar("AnyOrganizationSchemaT", bound=AnyOrganizationSchema)
-
-
-class OrganizationSchemaMixin(BaseModel, Generic[AnyOrganizationSchemaT]):
-    organization: Annotated[
-        AnyOrganizationSchemaT, Field(..., description="Organization")
-    ]
-
-
 class OrganizationRelationSchema(
     Meta,
     IsBidirectional[bool],
@@ -305,7 +283,7 @@ class UserSchemaMixin(BaseModel):
 class UserAndOrganizationSchema(
     UserMedicalRolesSchemaMixin,
     UserOrganizationRolesSchemaMixin,
-    OrganizationSchemaMixin[StandardOrganizationSchema],
+    OrganizationSchemaMixin,
     UserSchemaMixin,
     SimpleDataStatusMixin[DataStatusEnum],
     DataIdentifier,