maleo-foundation 0.0.6__py3-none-any.whl → 0.0.8__py3-none-any.whl

maleo_foundation/models/schemas/general.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from datetime import date, datetime, timedelta, timezone
 from pydantic import BaseModel, Field, model_validator, field_serializer, FieldSerializationInfo
-from typing import Optional, Any
+from typing import Optional, Union, Any
 from uuid import UUID
 from maleo_foundation.models.enums import BaseEnums
 from maleo_foundation.constants import REFRESH_TOKEN_DURATION_DAYS, ACCESS_TOKEN_DURATION_MINUTES
@@ -48,6 +48,40 @@ class BaseGeneralSchemas:
 
     class KeyPair(PublicKey, PrivateKey): pass
 
+    class Identifiers(BaseModel):
+        id:int = Field(..., ge=1, description="Data's ID, must be >= 1.")
+        uuid:UUID = Field(..., description="Data's UUID.")
+
+        @field_serializer('uuid')
+        def serialize_uuid(self, value:UUID, info:FieldSerializationInfo) -> str:
+            """Serializes UUID to a hex string."""
+            return str(value)
+
+    class Timestamps(BaseModel):
+        created_at:datetime = Field(..., description="Data's created_at timestamp")
+        updated_at:datetime = Field(..., description="Data's updated_at timestamp")
+        deleted_at:Optional[datetime] = Field(..., description="Data's deleted_at timestamp")
+        restored_at:Optional[datetime] = Field(..., description="Data's restored_at timestamp")
+        deactivated_at:Optional[datetime] = Field(..., description="Data's deactivated_at timestamp")
+        activated_at:datetime = Field(..., description="Data's activated_at timestamp")
+
+        @field_serializer('created_at', 'updated_at', 'deleted_at', 'restored_at', 'deactivated_at', 'activated_at')
+        def serialize_timestamps(self, value:Union[datetime, date], info:FieldSerializationInfo) -> str:
+            """Serializes datetime/date fields to ISO format."""
+            return value.isoformat()
+
+    class Status(BaseModel):
+        status:BaseEnums.StatusType = Field(..., description="Data's status")
+
+    class Order(BaseModel):
+        order:Optional[int] = Field(..., description="Data's order")
+
+    class Key(BaseModel):
+        key:str = Field(..., description="Data's key")
+
+    class Name(BaseModel):
+        name:str = Field(..., description="Data's name")
+
     class TokenPayload(BaseModel):
         t:BaseEnums.TokenType = Field(..., description="Token Type")
         sr:UUID = Field(..., description="System role")

maleo_foundation/models/schemas/result.py

@@ -1,56 +1,8 @@
-from datetime import datetime, date
-from pydantic import BaseModel, FieldSerializationInfo, Field, field_serializer, field_validator
-from typing import Literal, Optional, Union, Any
-from uuid import UUID
-from maleo_foundation.models.enums import BaseEnums
+from pydantic import BaseModel, Field
+from typing import Literal, Optional, Any
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 
 class BaseResultSchemas:
-    class Identifiers(BaseModel):
-        id:int = Field(..., ge=1, description="Data's ID, must be >= 1.")
-        uuid:UUID = Field(..., description="Data's UUID.")
-
-        @field_serializer('uuid')
-        def serialize_uuid(self, value:UUID, info:FieldSerializationInfo) -> str:
-            """Serializes UUID to a hex string."""
-            return str(value)
-
-    class Timestamps(BaseModel):
-        created_at:datetime = Field(..., description="Data's created_at timestamp")
-        updated_at:datetime = Field(..., description="Data's updated_at timestamp")
-        deleted_at:Optional[datetime] = Field(..., description="Data's deleted_at timestamp")
-        restored_at:Optional[datetime] = Field(..., description="Data's restored_at timestamp")
-        deactivated_at:Optional[datetime] = Field(..., description="Data's deactivated_at timestamp")
-        activated_at:datetime = Field(..., description="Data's activated_at timestamp")
-
-        @field_serializer('created_at', 'updated_at', 'deleted_at', 'restored_at', 'deactivated_at', 'activated_at')
-        def serialize_timestamps(self, value:Union[datetime, date], info:FieldSerializationInfo) -> str:
-            """Serializes datetime/date fields to ISO format."""
-            return value.isoformat()
-
-    class Status(BaseModel):
-        status:BaseEnums.StatusType = Field(..., description="Data's status")
-
-    class Row(Status, Timestamps, Identifiers):
-        @field_validator('*', mode="before")
-        def set_none(cls, values):
-            if isinstance(values, str) and (values == "" or len(values) == 0):
-                return None
-            return values
-        
-        @field_serializer('*')
-        def serialize_fields(self, value, info:FieldSerializationInfo) -> Any:
-            """Serializes all unique-typed fields."""
-            if isinstance(value, UUID):
-                return str(value)
-            if isinstance(value, datetime) or isinstance(value, date):
-                return value.isoformat()
-            return value
-
-        class Config:
-            from_attributes=True
-
-    #* ----- ----- ----- Base ----- ----- ----- *#
     class Base(BaseModel):
         success:bool = Field(..., description="Success status")
         code:Optional[str] = Field(None, description="Optional result code")

maleo_foundation/models/transfers/results/service/query.py

@@ -1,21 +1,47 @@
 from __future__ import annotations
-from pydantic import model_validator
+from datetime import datetime, date
+from pydantic import FieldSerializationInfo, field_validator, field_serializer, model_validator
+from uuid import UUID
+from typing import Any
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_foundation.models.schemas.result import BaseResultSchemas
 
 class BaseServiceQueryResultsTransfers:
+    class Row(
+        BaseGeneralSchemas.Status,
+        BaseGeneralSchemas.Timestamps,
+        BaseGeneralSchemas.Identifiers
+    ):
+        @field_validator('*', mode="before")
+        def set_none(cls, values):
+            if isinstance(values, str) and (values == "" or len(values) == 0):
+                return None
+            return values
+        
+        @field_serializer('*')
+        def serialize_fields(self, value, info:FieldSerializationInfo) -> Any:
+            """Serializes all unique-typed fields."""
+            if isinstance(value, UUID):
+                return str(value)
+            if isinstance(value, datetime) or isinstance(value, date):
+                return value.isoformat()
+            return value
+
+        class Config:
+            from_attributes=True
+
     class Fail(BaseResultSchemas.Fail): pass
 
     class NoData(BaseResultSchemas.NoData): pass
 
     class SingleData(BaseResultSchemas.SingleData):
-        data:BaseResultSchemas.Row
+        data:BaseServiceQueryResultsTransfers.Row
 
     class UnpaginatedMultipleData(BaseResultSchemas.UnpaginatedMultipleData):
-        data:list[BaseResultSchemas.Row]
+        data:list[BaseServiceQueryResultsTransfers.Row]
 
     class PaginatedMultipleData(BaseResultSchemas.PaginatedMultipleData):
-        data:list[BaseResultSchemas.Row]
+        data:list[BaseServiceQueryResultsTransfers.Row]
 
         @model_validator(mode="before")
         @classmethod

{maleo_foundation-0.0.6.dist-info → maleo_foundation-0.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.0.6
+Version: 0.0.8
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.0.6.dist-info → maleo_foundation-0.0.8.dist-info}/RECORD

@@ -20,9 +20,9 @@ maleo_foundation/models/__init__.py,sha256=Wh92XAduE1Sg9qi2GMhptyXig0fKcTS5AbGo3
 maleo_foundation/models/enums.py,sha256=Ob2v312JxypHEq7hTKZKOV462FEeLkIjIhpx-YF6Jdw,2203
 maleo_foundation/models/responses.py,sha256=z2XEHwuxU05NDJSgrA7B7e2fzEQP6Kl3ZM2BO-lDw_A,3786
 maleo_foundation/models/schemas/__init__.py,sha256=Xj8Ahsqyra-fmEaVcGPok5GOOsPQlKcknHYMvbjvENA,277
-maleo_foundation/models/schemas/general.py,sha256=cMi3Onimzn3_wZdKMV-ufl25_xQVw3WaUaJOOZko9Z4,4813
+maleo_foundation/models/schemas/general.py,sha256=-SI19QtHvusbJnj5m5-Kua4jjHkYGoi3FWOJ9RUvobQ,6466
 maleo_foundation/models/schemas/parameter.py,sha256=1og_crWds6YLS-8Ha5EbAi3ZaNMzNFiIZ06v_HO3b9k,875
-maleo_foundation/models/schemas/result.py,sha256=KffY-qrCn2ES4AHtEaCE_eOQH-8DNrcZMM2FZtUNJKc,4180
+maleo_foundation/models/schemas/result.py,sha256=fzzq5mbJSwTXt6r-m9Yz9XNx36gGtroaj7dCCySKSFo,1870
 maleo_foundation/models/transfers/__init__.py,sha256=B8oCZHE3NTsrJ_rviSXaDsuc-gc25jpjuhJO40lpQiE,222
 maleo_foundation/models/transfers/parameters/__init__.py,sha256=oKW4RPIEISISRjsJzD8lsCGY1HhZRTzshPpWHcJu86k,353
 maleo_foundation/models/transfers/parameters/client.py,sha256=oi9LzEIFAg1WVbsnmVegsn8kLDt6tJJbOZLrhfQjs64,2248
@@ -35,7 +35,7 @@ maleo_foundation/models/transfers/results/client/controllers/__init__.py,sha256=
 maleo_foundation/models/transfers/results/client/controllers/http.py,sha256=vhjfjchvlTq347mLY2mcE84n_xYMpLkALi_ecQNOAGY,1499
 maleo_foundation/models/transfers/results/service/__init__.py,sha256=dTjHe1iGIpdulrzawQoOj003sxxObumF63YpUptKrDA,390
 maleo_foundation/models/transfers/results/service/general.py,sha256=G4x-MhQI7Km9UAcx2uJmrsqA6RBvxpH6VFAd_ynFFd4,1486
-maleo_foundation/models/transfers/results/service/query.py,sha256=ICU2589n4n5czxWd9yo9_Eh9TukUJyuUk_xRrRFNL5w,1592
+maleo_foundation/models/transfers/results/service/query.py,sha256=Wj9GCWk7FrKP0EoK55vJcr9YJ42Lo24mLXbRk9j0IJw,2566
 maleo_foundation/models/transfers/results/service/controllers/__init__.py,sha256=HZJWMy2dskzOCzLmp_UaL9rjbQ-sDMI7sd2bXb-4QOU,175
 maleo_foundation/models/transfers/results/service/controllers/rest.py,sha256=bZ4NibT58aim6p3epFJ9ipR8Z54FkOuFx2GniK4CUfM,1114
 maleo_foundation/models/types/__init__.py,sha256=0QYcK_1Ekj9W_o_ZVawkBS7Xc25A9j5KY2DRBKmljOI,247
@@ -47,7 +47,7 @@ maleo_foundation/utils/exceptions.py,sha256=mcvBwHm6uWpVQkPtO1T2j-GaTYEiyPOeGxiD
 maleo_foundation/utils/logger.py,sha256=ICrFi0MxuAjDy8KTRL7pex1miwzZqZX-HHArgN3niJM,2453
 maleo_foundation/utils/formatter/__init__.py,sha256=iKf5YCbEdg1qKnFHyKqqcQbqAqEeRUf8mhI3v3dQoj8,78
 maleo_foundation/utils/formatter/case.py,sha256=TmvvlfzGdC_omMTB5vAa40TZBxQ3hnr-SYeo0M52Rlg,1352
-maleo_foundation-0.0.6.dist-info/METADATA,sha256=QAqPC-VtoJTCIXBIiz70J0FnfCJX1ORwkRt9XYTWPXA,3159
-maleo_foundation-0.0.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-maleo_foundation-0.0.6.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.0.6.dist-info/RECORD,,
+maleo_foundation-0.0.8.dist-info/METADATA,sha256=dTfyf5-OfHvdgcFqkpXZs_kKmGRwOuec_myl18xQOa8,3159
+maleo_foundation-0.0.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+maleo_foundation-0.0.8.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.0.8.dist-info/RECORD,,