maleo-identity 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

maleo/identity/dtos.py

@@ -26,8 +26,6 @@ from maleo.schemas.mixins.identity import (
     IntUserId,
     BirthDate,
     DateOfBirth,
-    IntSourceId,
-    IntTargetId,
 )
 from maleo.schemas.mixins.timestamp import DataTimestamp
 from maleo.types.datetime import OptDate
@@ -108,19 +106,34 @@ class SourceOrganizationDTOMixin(BaseModel):
     ]
 
 
+class SourceOrganizationRelationDTO(
+    Metadata,
+    IsBidirectional[bool],
+    SourceOrganizationDTOMixin,
+    SimpleDataStatusMixin[DataStatusEnum],
+    DataTimestamp,
+    DataIdentifier,
+):
+    pass
+
+
+class SourceOrganizationRelationsDTOMixin(BaseModel):
+    sources: Annotated[
+        list[SourceOrganizationRelationDTO],
+        Field(list[SourceOrganizationRelationDTO](), description="Sources"),
+    ] = list[SourceOrganizationRelationDTO]()
+
+
 class TargetOrganizationDTOMixin(BaseModel):
     target: Annotated[
         StandardOrganizationDTO, Field(..., description="Target organization")
     ]
 
 
-class OrganizationRelationDTO(
+class TargetOrganizationRelationDTO(
     Metadata,
     IsBidirectional[bool],
     TargetOrganizationDTOMixin,
-    IntTargetId[int],
-    SourceOrganizationDTOMixin,
-    IntSourceId[int],
     SimpleDataStatusMixin[DataStatusEnum],
     DataTimestamp,
     DataIdentifier,
@@ -128,15 +141,16 @@ class OrganizationRelationDTO(
     pass
 
 
-class OrganizationRelationsDTOMixin(BaseModel):
-    relations: Annotated[
-        list[OrganizationRelationDTO],
-        Field(list[OrganizationRelationDTO](), description="Relations"),
-    ] = list[OrganizationRelationDTO]()
+class TargetOrganizationRelationsDTOMixin(BaseModel):
+    targets: Annotated[
+        list[TargetOrganizationRelationDTO],
+        Field(list[TargetOrganizationRelationDTO](), description="Targets"),
+    ] = list[TargetOrganizationRelationDTO]()
 
 
 class FullOrganizationDTO(
-    OrganizationRelationsDTOMixin,
+    TargetOrganizationRelationsDTOMixin,
+    SourceOrganizationRelationsDTOMixin,
     OrganizationRegistrationCodeDTOMixin,
     StandardOrganizationDTO,
 ):

maleo/identity/models.py

@@ -94,6 +94,29 @@ class Patient(
     )
 
 
+class OrganizationRegistrationCode(
+    DataStatus,
+    DataTimestamp,
+    DataIdentifier,
+):
+    __tablename__ = "organization_registration_codes"
+    organization_id: Mapped[int] = mapped_column(
+        Integer,
+        ForeignKey("organizations.id", ondelete="CASCADE", onupdate="CASCADE"),
+        unique=True,
+        nullable=False,
+    )
+    code: Mapped[str] = mapped_column(
+        name="code", type_=String(36), unique=True, nullable=False
+    )
+    max_uses: Mapped[int] = mapped_column(
+        name="max_uses", type_=Integer, nullable=False, default=1
+    )
+    current_uses: Mapped[int] = mapped_column(
+        name="current_uses", type_=Integer, nullable=False, default=0
+    )
+
+
 class OrganizationRelation(
     DataStatus,
     DataTimestamp,
@@ -123,29 +146,6 @@ class OrganizationRelation(
     )
 
 
-class OrganizationRegistrationCode(
-    DataStatus,
-    DataTimestamp,
-    DataIdentifier,
-):
-    __tablename__ = "organization_registration_codes"
-    organization_id: Mapped[int] = mapped_column(
-        Integer,
-        ForeignKey("organizations.id", ondelete="CASCADE", onupdate="CASCADE"),
-        unique=True,
-        nullable=False,
-    )
-    code: Mapped[str] = mapped_column(
-        name="code", type_=String(36), unique=True, nullable=False
-    )
-    max_uses: Mapped[int] = mapped_column(
-        name="max_uses", type_=Integer, nullable=False, default=1
-    )
-    current_uses: Mapped[int] = mapped_column(
-        name="current_uses", type_=Integer, nullable=False, default=0
-    )
-
-
 class Organization(
     DataStatus,
     DataTimestamp,

maleo/identity/schemas/common.py

@@ -38,8 +38,6 @@ from maleo.schemas.mixins.identity import (
     IntUserId,
     BirthDate,
     DateOfBirth,
-    IntSourceId,
-    IntTargetId,
 )
 from maleo.schemas.mixins.timestamp import DataTimestamp
 from maleo.types.datetime import OptDate
@@ -133,19 +131,34 @@ class SourceOrganizationSchemaMixin(BaseModel):
     ]
 
 
+class SourceOrganizationRelationSchema(
+    Metadata,
+    IsBidirectional[bool],
+    SourceOrganizationSchemaMixin,
+    SimpleDataStatusMixin[DataStatusEnum],
+    DataTimestamp,
+    DataIdentifier,
+):
+    pass
+
+
+class SourceOrganizationRelationsSchemaMixin(BaseModel):
+    sources: Annotated[
+        list[SourceOrganizationRelationSchema],
+        Field(list[SourceOrganizationRelationSchema](), description="Sources"),
+    ] = list[SourceOrganizationRelationSchema]()
+
+
 class TargetOrganizationSchemaMixin(BaseModel):
     target: Annotated[
         StandardOrganizationSchema, Field(..., description="Target organization")
     ]
 
 
-class OrganizationRelationSchema(
+class TargetOrganizationRelationSchema(
     Metadata,
     IsBidirectional[bool],
     TargetOrganizationSchemaMixin,
-    IntTargetId[int],
-    SourceOrganizationSchemaMixin,
-    IntSourceId[int],
     SimpleDataStatusMixin[DataStatusEnum],
     DataTimestamp,
     DataIdentifier,
@@ -153,14 +166,16 @@ class OrganizationRelationSchema(
     pass
 
 
-class OrganizationRelationsSchemaMixin(BaseModel):
-    relations: Annotated[
-        list[OrganizationRelationSchema],
-        Field(list[OrganizationRelationSchema](), description="Relations"),
-    ] = list[OrganizationRelationSchema]()
+class TargetOrganizationRelationsSchemaMixin(BaseModel):
+    targets: Annotated[
+        list[TargetOrganizationRelationSchema],
+        Field(list[TargetOrganizationRelationSchema](), description="Targets"),
+    ] = list[TargetOrganizationRelationSchema]()
 
 
 class FullOrganizationSchema(
+    TargetOrganizationRelationsSchemaMixin,
+    SourceOrganizationRelationsSchemaMixin,
     OrganizationRegistrationCodeSchemaMixin,
     StandardOrganizationSchema,
 ):

{maleo_identity-0.1.1.dist-info → maleo_identity-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo-identity
-Version: 0.1.1
+Version: 0.1.2
 Summary: MaleoIdentity service package
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: Proprietary

{maleo_identity-0.1.1.dist-info → maleo_identity-0.1.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 maleo/identity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo/identity/dtos.py,sha256=Zc7ApGe5UgrlKUajHHNHS8i9B4_YSNL0sxG5bYA8obM,7459
-maleo/identity/models.py,sha256=uG_L670oLnWXfUWoq3bya62MoUtAh5M-Sdju4L33iVc,10223
+maleo/identity/dtos.py,sha256=XhfLat9emtRaVl-2McVDz8zunyoshAK7gm2OYmhZ_ZE,7876
+maleo/identity/models.py,sha256=aBYbkkd07BzH2zRq3q_D80xMR8DdhCiw1eQ2EYa9ZTQ,10223
 maleo/identity/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/constants/api_key.py,sha256=e7CsTodUBgyoX30SJUnYx457WBZeRFyyeaOFGsZ-7mY,264
 maleo/identity/constants/organization.py,sha256=Jeewz4VlaTmuHHDqNZUZyLD3bdndQjpx9K0EabhCFUM,259
@@ -34,7 +34,7 @@ maleo/identity/mixins/user.py,sha256=UHoMgFJXptE9x9QsR07KG2bgp5OlCNqvYjEtP9S3TIY
 maleo/identity/mixins/user_profile.py,sha256=LFHAzGD-3wli6YJGfl9-Sy0gtQHkhgvrZ5EzOfl1vXY,1174
 maleo/identity/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/schemas/api_key.py,sha256=UnQfnoEMkFgOfWDKai6wWNyD5QsovyoOov6jN52QPKI,3713
-maleo/identity/schemas/common.py,sha256=dnLQO321jEDqkzM8CC5sKrr6urlq2J0ZX94vPkP7xM0,8740
+maleo/identity/schemas/common.py,sha256=AxI4NKUM30Y4oS-jDjhdNnJGF-0-kOCA0wCnUl9ESlc,9213
 maleo/identity/schemas/organization.py,sha256=hcKYw-fObxvme2PUkU9jWk0dgj6XIQdU4gIs-Z3JY08,5391
 maleo/identity/schemas/organization_registration_code.py,sha256=jAP7MGb_28wh1WoBZDl2FSJBxKFRH56YSQvMFQ5_iyo,4731
 maleo/identity/schemas/organization_relation.py,sha256=ZQauGidff-cAFY1gS9i3XRwauyWLg1f8xFES7mL6B8M,5083
@@ -60,8 +60,8 @@ maleo/identity/utils/organization.py,sha256=jU-PLlxPbsRciid82p-ScdLSydspI-5ofJX7
 maleo/identity/utils/user.py,sha256=Mk1NTrViz1nBJxtPZRWdQmYHjTPxxc61a02eyikEBoU,1459
 maleo/identity/validators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo/identity/validators/patient.py,sha256=b4krKsXMuwUCXYuzCeUXtOXNTaEkKtQaAYmAmuVYIgo,221
-maleo_identity-0.1.1.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
-maleo_identity-0.1.1.dist-info/METADATA,sha256=CGrcEG56vdmk1T69LIT2n8FDjfa1nLSwts7VLwEMz_E,3583
-maleo_identity-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_identity-0.1.1.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
-maleo_identity-0.1.1.dist-info/RECORD,,
+maleo_identity-0.1.2.dist-info/licenses/LICENSE,sha256=aftGsecnk7TWVX-7KW94FqK4Syy6YSZ8PZEF7EcIp3M,2621
+maleo_identity-0.1.2.dist-info/METADATA,sha256=zabPBMKNTilRuDNdeqgQuVzuMtIybcdiD-7_u3PLfd0,3583
+maleo_identity-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_identity-0.1.2.dist-info/top_level.txt,sha256=3Tpd1siVsfYoeI9FEOJNYnffx_shzZ3wsPpTvz5bljc,6
+maleo_identity-0.1.2.dist-info/RECORD,,