maleo-identity 0.1.31__py3-none-any.whl → 0.1.59__py3-none-any.whl

maleo/identity/schemas/organization_relation.py

@@ -1,18 +1,18 @@
 from pydantic import BaseModel, Field
 from typing import Annotated, Generic, Literal, TypeVar, overload
 from uuid import UUID
-from maleo.enums.organization import (
+from nexo.enums.organization import (
     OrganizationRelation,
     SimpleOrganizationRelationMixin,
     OptListOfOrganizationRelations,
     SimpleOrganizationRelationsMixin,
 )
-from maleo.enums.status import (
+from nexo.enums.status import (
     ListOfDataStatuses,
     FULL_DATA_STATUSES,
 )
-from maleo.schemas.mixins.filter import convert as convert_filter
-from maleo.schemas.mixins.identity import (
+from nexo.schemas.mixins.filter import convert as convert_filter
+from nexo.schemas.mixins.identity import (
     IdentifierMixin,
     Ids,
     UUIDs,
@@ -21,18 +21,18 @@ from maleo.schemas.mixins.identity import (
     IntTargetId,
     IntTargetIds,
 )
-from maleo.schemas.mixins.sort import convert as convert_sort
-from maleo.schemas.operation.enums import ResourceOperationStatusUpdateType
-from maleo.schemas.parameter import (
+from nexo.schemas.mixins.sort import convert as convert_sort
+from nexo.schemas.operation.enums import ResourceOperationStatusUpdateType
+from nexo.schemas.parameter import (
     ReadSingleParameter as BaseReadSingleParameter,
     ReadPaginatedMultipleParameter,
     StatusUpdateParameter as BaseStatusUpdateParameter,
     DeleteSingleParameter as BaseDeleteSingleParameter,
 )
-from maleo.types.boolean import OptBool
-from maleo.types.dict import StrToAnyDict
-from maleo.types.integer import OptListOfInts
-from maleo.types.uuid import OptListOfUUIDs
+from nexo.types.boolean import OptBool
+from nexo.types.dict import StrToAnyDict
+from nexo.types.integer import OptListOfInts
+from nexo.types.uuid import OptListOfUUIDs
 from ..enums.organization_relation import IdentifierType, OptListOfExpandableFields
 from ..mixins.organization_relation import (
     IsBidirectional,
@@ -43,24 +43,48 @@ from ..mixins.organization_relation import (
 from ..types.organization_relation import CompositeIdentifierType, IdentifierValueType
 
 
-class CreateParameter(
-    Expand,
+class BareCreateData(
     Meta,
     IsBidirectional[bool],
-    SimpleOrganizationRelationMixin[OrganizationRelation],
-    IntTargetId[int],
-    IntSourceId[int],
 ):
     is_bidirectional: Annotated[bool, Field(False, description="Is Bidirectional")] = (
         False
     )
 
 
+class BaseCreateData(
+    BareCreateData,
+    SimpleOrganizationRelationMixin[OrganizationRelation],
+):
+    pass
+
+
+class SimpleCreateData(
+    BaseCreateData,
+    IntTargetId[int],
+):
+    pass
+
+
+class FullCreateData(
+    SimpleCreateData,
+    IntSourceId[int],
+):
+    pass
+
+
+class CreateParameter(
+    Expand,
+    FullCreateData,
+):
+    pass
+
+
 class ReadMultipleParameter(
     Expand,
     ReadPaginatedMultipleParameter,
-    SimpleOrganizationRelationsMixin[OptListOfOrganizationRelations],
     IsBidirectional[OptBool],
+    SimpleOrganizationRelationsMixin[OptListOfOrganizationRelations],
     IntTargetIds[OptListOfInts],
     IntSourceIds[OptListOfInts],
     UUIDs[OptListOfUUIDs],
@@ -70,13 +94,13 @@ class ReadMultipleParameter(
     uuids: Annotated[OptListOfUUIDs, Field(None, description="UUIDs")] = None
     source_ids: Annotated[OptListOfInts, Field(None, description="Source's IDs")] = None
     target_ids: Annotated[OptListOfInts, Field(None, description="Target's IDs")] = None
-    is_bidirectional: Annotated[
-        OptBool, Field(None, description="Whether is bidirectional")
-    ] = None
     relations: Annotated[
         OptListOfOrganizationRelations,
         Field(None, description="Organization Relations"),
     ] = None
+    is_bidirectional: Annotated[
+        OptBool, Field(None, description="Whether is bidirectional")
+    ] = None
 
     @property
     def _query_param_fields(self) -> set[str]:
@@ -185,11 +209,13 @@ class ReadSingleParameter(
 
 
 class FullUpdateData(Meta, IsBidirectional[bool]):
-    pass
+    is_bidirectional: Annotated[bool, Field(..., description="Is Bidirectional")]
 
 
 class PartialUpdateData(Meta, IsBidirectional[OptBool]):
-    pass
+    is_bidirectional: Annotated[
+        OptBool, Field(None, description="Is Bidirectional")
+    ] = None
 
 
 UpdateDataT = TypeVar("UpdateDataT", FullUpdateData, PartialUpdateData)

maleo/identity/schemas/patient.py

@@ -2,7 +2,7 @@ from datetime import date
 from pydantic import BaseModel, Field
 from typing import Annotated, Generic, Literal, TypeVar, overload
 from uuid import UUID
-from maleo.enums.identity import (
+from nexo.enums.identity import (
     OptBloodType,
     BloodTypeMixin,
     OptListOfBloodTypes,
@@ -17,12 +17,12 @@ from maleo.enums.identity import (
     OptListOfGenders,
     GendersMixin,
 )
-from maleo.enums.status import (
+from nexo.enums.status import (
     ListOfDataStatuses,
     FULL_DATA_STATUSES,
 )
-from maleo.schemas.mixins.filter import convert as convert_filter
-from maleo.schemas.mixins.identity import (
+from nexo.schemas.mixins.filter import convert as convert_filter
+from nexo.schemas.mixins.identity import (
     IdentifierMixin,
     Ids,
     UUIDs,
@@ -33,19 +33,19 @@ from maleo.schemas.mixins.identity import (
     IntOrganizationId,
     IntOrganizationIds,
 )
-from maleo.schemas.mixins.sort import convert as convert_sort
-from maleo.schemas.operation.enums import ResourceOperationStatusUpdateType
-from maleo.schemas.parameter import (
+from nexo.schemas.mixins.sort import convert as convert_sort
+from nexo.schemas.operation.enums import ResourceOperationStatusUpdateType
+from nexo.schemas.parameter import (
     ReadSingleParameter as BaseReadSingleParameter,
     ReadPaginatedMultipleParameter,
     StatusUpdateParameter as BaseStatusUpdateParameter,
     DeleteSingleParameter as BaseDeleteSingleParameter,
 )
-from maleo.types.datetime import OptDate
-from maleo.types.dict import StrToAnyDict
-from maleo.types.integer import OptListOfInts
-from maleo.types.string import OptStr, OptListOfStrs
-from maleo.types.uuid import OptListOfUUIDs
+from nexo.types.datetime import OptDate
+from nexo.types.dict import StrToAnyDict
+from nexo.types.integer import OptListOfInts
+from nexo.types.string import OptStr, OptListOfStrs
+from nexo.types.uuid import OptListOfUUIDs
 from ..enums.patient import IdentifierType, OptListOfExpandableFields
 from ..mixins.common import IdCard, FullName, PlaceOfBirth
 from ..mixins.patient import PatientIdentity, PatientIdentifier, Expand

maleo/identity/schemas/user.py

@@ -1,37 +1,39 @@
-from pydantic import BaseModel, Field
-from typing import Annotated, Generic, Literal, TypeVar, overload
+from pydantic import BaseModel, Field, model_validator
+from typing import Annotated, Generic, Literal, Self, TypeVar, overload
 from uuid import UUID
-from maleo.enums.status import (
+from nexo.enums.status import (
     ListOfDataStatuses,
     FULL_DATA_STATUSES,
 )
-from maleo.enums.user import (
+from nexo.enums.user import (
     UserType,
     OptUserType,
     FullUserTypeMixin,
     OptListOfUserTypes,
     FullUserTypesMixin,
 )
-from maleo.schemas.mixins.filter import convert as convert_filter
-from maleo.schemas.mixins.identity import (
+from nexo.schemas.error.enums import ErrorCode
+from nexo.schemas.mixins.filter import convert as convert_filter
+from nexo.schemas.mixins.identity import (
     IdentifierMixin,
     Ids,
     UUIDs,
     IntOrganizationIds,
 )
-from maleo.schemas.mixins.sort import convert as convert_sort
-from maleo.schemas.operation.enums import ResourceOperationStatusUpdateType
-from maleo.schemas.parameter import (
+from nexo.schemas.mixins.parameter import IncludeURL
+from nexo.schemas.mixins.sort import convert as convert_sort
+from nexo.schemas.operation.enums import ResourceOperationStatusUpdateType
+from nexo.schemas.parameter import (
     ReadSingleParameter as BaseReadSingleParameter,
     ReadPaginatedMultipleParameter,
     StatusUpdateParameter as BaseStatusUpdateParameter,
     DeleteSingleParameter as BaseDeleteSingleParameter,
 )
-from maleo.types.dict import StrToAnyDict
-from maleo.types.integer import OptListOfInts
-from maleo.types.string import OptStr, OptListOfStrs
-from maleo.types.uuid import OptListOfUUIDs
-from ..enums.user import IdentifierType
+from nexo.types.dict import StrToAnyDict
+from nexo.types.integer import OptListOfInts
+from nexo.types.string import OptStr, OptListOfStrs
+from nexo.types.uuid import OptListOfUUIDs
+from ..enums.user import IdentifierType, OptListOfExpandableFields
 from ..mixins.user import (
     Username,
     Usernames,
@@ -39,18 +41,26 @@ from ..mixins.user import (
     Emails,
     Phone,
     Phones,
+    Password,
+    Expand,
     UserIdentifier,
 )
 from ..types.user import IdentifierValueType
 
 
-class CreateParameter(
-    Phone[str], Email[str], Username[str], FullUserTypeMixin[UserType]
+class CreateData(
+    Password, Phone[str], Email[str], Username[str], FullUserTypeMixin[UserType]
 ):
     pass
 
 
+class CreateParameter(Expand, CreateData):
+    pass
+
+
 class ReadMultipleParameter(
+    IncludeURL,
+    Expand,
     ReadPaginatedMultipleParameter,
     Phones[OptListOfStrs],
     Emails[OptListOfStrs],
@@ -89,6 +99,8 @@ class ReadMultipleParameter(
             "page",
             "limit",
             "use_cache",
+            "expand",
+            "include_url",
         }
 
     def to_query_params(self) -> StrToAnyDict:
@@ -101,15 +113,23 @@ class ReadMultipleParameter(
         return params
 
 
-class ReadSingleParameter(BaseReadSingleParameter[UserIdentifier]):
+class ReadSingleParameter(IncludeURL, Expand, BaseReadSingleParameter[UserIdentifier]):
     @classmethod
     def from_identifier(
         cls,
         identifier: UserIdentifier,
         statuses: ListOfDataStatuses = FULL_DATA_STATUSES,
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "ReadSingleParameter":
-        return cls(identifier=identifier, statuses=statuses, use_cache=use_cache)
+        return cls(
+            identifier=identifier,
+            statuses=statuses,
+            use_cache=use_cache,
+            expand=expand,
+            include_url=include_url,
+        )
 
     @overload
     @classmethod
@@ -119,6 +139,8 @@ class ReadSingleParameter(BaseReadSingleParameter[UserIdentifier]):
         identifier_value: int,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -128,6 +150,8 @@ class ReadSingleParameter(BaseReadSingleParameter[UserIdentifier]):
         identifier_value: UUID,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "ReadSingleParameter": ...
     @overload
     @classmethod
@@ -137,7 +161,10 @@ class ReadSingleParameter(BaseReadSingleParameter[UserIdentifier]):
         identifier_value: str,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "ReadSingleParameter": ...
+    @overload
     @classmethod
     def new(
         cls,
@@ -145,6 +172,18 @@ class ReadSingleParameter(BaseReadSingleParameter[UserIdentifier]):
         identifier_value: IdentifierValueType,
         statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
         use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
+    ) -> "ReadSingleParameter": ...
+    @classmethod
+    def new(
+        cls,
+        identifier_type: IdentifierType,
+        identifier_value: IdentifierValueType,
+        statuses: ListOfDataStatuses = list(FULL_DATA_STATUSES),
+        use_cache: bool = True,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "ReadSingleParameter":
         return cls(
             identifier=UserIdentifier(
@@ -153,20 +192,33 @@ class ReadSingleParameter(BaseReadSingleParameter[UserIdentifier]):
             ),
             statuses=statuses,
             use_cache=use_cache,
+            expand=expand,
+            include_url=include_url,
         )
 
     def to_query_params(self) -> StrToAnyDict:
         return self.model_dump(
-            mode="json", include={"statuses", "use_cache"}, exclude_none=True
+            mode="json",
+            include={"statuses", "use_cache", "expand", "include_url"},
+            exclude_none=True,
         )
 
 
 class PasswordUpdateData(BaseModel):
-    old: Annotated[str, Field(..., description="Old Password", max_length=255)]
+    old_password: Annotated[str, Field(..., description="Old Password", max_length=255)]
     old_confirmation: Annotated[
         str, Field(..., description="Old Password Confirmation", max_length=255)
     ]
-    new: Annotated[str, Field(..., description="New Password", max_length=255)]
+    new_password: Annotated[str, Field(..., description="New Password", max_length=255)]
+
+    @model_validator(mode="after")
+    def validate_old_and_confirmation(self) -> Self:
+        if self.old_password != self.old_confirmation:
+            raise ValueError(
+                ErrorCode.BAD_REQUEST,
+                "Old password must be the same with the confirmation",
+            )
+        return self
 
 
 class FullUpdateData(
@@ -181,7 +233,9 @@ class PartialUpdateData(
     pass
 
 
-UpdateDataT = TypeVar("UpdateDataT", FullUpdateData, PartialUpdateData)
+UpdateDataT = TypeVar(
+    "UpdateDataT", FullUpdateData, PartialUpdateData, PasswordUpdateData
+)
 
 
 class UpdateDataMixin(BaseModel, Generic[UpdateDataT]):
@@ -189,6 +243,8 @@ class UpdateDataMixin(BaseModel, Generic[UpdateDataT]):
 
 
 class UpdateParameter(
+    IncludeURL,
+    Expand,
     UpdateDataMixin[UpdateDataT],
     IdentifierMixin[UserIdentifier],
     Generic[UpdateDataT],
@@ -200,6 +256,8 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.ID],
         identifier_value: int,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -208,6 +266,8 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -216,6 +276,8 @@ class UpdateParameter(
         identifier_type: Literal[IdentifierType.USERNAME, IdentifierType.EMAIL],
         identifier_value: str,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "UpdateParameter": ...
     @overload
     @classmethod
@@ -224,6 +286,8 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "UpdateParameter": ...
     @classmethod
     def new(
@@ -231,14 +295,20 @@ class UpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         data: UpdateDataT,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "UpdateParameter":
         return cls(
             identifier=UserIdentifier(type=identifier_type, value=identifier_value),
             data=data,
+            expand=expand,
+            include_url=include_url,
         )
 
 
 class StatusUpdateParameter(
+    IncludeURL,
+    Expand,
     BaseStatusUpdateParameter[UserIdentifier],
 ):
     @overload
@@ -248,6 +318,8 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.ID],
         identifier_value: int,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -256,6 +328,8 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.UUID],
         identifier_value: UUID,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -264,6 +338,8 @@ class StatusUpdateParameter(
         identifier_type: Literal[IdentifierType.USERNAME, IdentifierType.EMAIL],
         identifier_value: str,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "StatusUpdateParameter": ...
     @overload
     @classmethod
@@ -272,6 +348,8 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "StatusUpdateParameter": ...
     @classmethod
     def new(
@@ -279,10 +357,14 @@ class StatusUpdateParameter(
         identifier_type: IdentifierType,
         identifier_value: IdentifierValueType,
         type: ResourceOperationStatusUpdateType,
+        expand: OptListOfExpandableFields = None,
+        include_url: bool = False,
     ) -> "StatusUpdateParameter":
         return cls(
             identifier=UserIdentifier(type=identifier_type, value=identifier_value),
             type=type,
+            expand=expand,
+            include_url=include_url,
         )