maleo-foundation 0.2.24__tar.gz → 0.2.26__tar.gz

{maleo_foundation-0.2.24 → maleo_foundation-0.2.26}/PKG-INFO

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

{maleo_foundation-0.2.24 → maleo_foundation-0.2.26}/maleo_foundation/enums.py

@@ -120,6 +120,7 @@ class BaseEnums:
         TTL_6HR = int(6*60*60)
         TTL_12HR = int(12*60*60)
         TTL_1DY = int(1*24*60*60)
-        TTL_7DY = int(7*24*60*60)
+        TTL_3DY = int(3*24*60*60)
         TTL_1WK = int(1*24*60*60)
-        TTL_7WK = int(7*24*60*60)
+        TTL_2WK = int(2*24*60*60)
+        TTL_1MO = int(1*30*24*60*60)

{maleo_foundation-0.2.24 → maleo_foundation-0.2.26}/maleo_foundation/expanded_types/__init__.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 from .general import BaseGeneralExpandedTypes
-from .query import ExpandedQueryTypes
+from .repository import ExpandedRepositoryTypes
 from .service import ExpandedServiceTypes
 from .client import ExpandedClientTypes
 
 class BaseExpandedTypes:
     General = BaseGeneralExpandedTypes
-    Query = ExpandedQueryTypes
+    Repository = ExpandedRepositoryTypes
     Service = ExpandedServiceTypes
     Client = ExpandedClientTypes

{maleo_foundation-0.2.24 → maleo_foundation-0.2.26}/maleo_foundation/expanded_types/query.py

@@ -3,16 +3,16 @@ from maleo_foundation.models.transfers.parameters.general \
     import BaseGeneralParametersTransfers
 from maleo_foundation.models.transfers.parameters.service \
     import BaseServiceParametersTransfers
-from maleo_foundation.models.transfers.results.service.query \
-    import BaseServiceQueryResultsTransfers
+from maleo_foundation.models.transfers.results.service.repository \
+    import BaseServiceRepositoryResultsTransfers
 
-class ExpandedQueryTypes:
+class ExpandedRepositoryTypes:
     #* Unpaginated multiple data
     GetUnpaginatedMultipleParameter = BaseServiceParametersTransfers.GetUnpaginatedMultiple
     GetUnpaginatedMultipleResult = Union[
-        BaseServiceQueryResultsTransfers.Fail,
-        BaseServiceQueryResultsTransfers.NoData,
-        BaseServiceQueryResultsTransfers.UnpaginatedMultipleData
+        BaseServiceRepositoryResultsTransfers.Fail,
+        BaseServiceRepositoryResultsTransfers.NoData,
+        BaseServiceRepositoryResultsTransfers.UnpaginatedMultipleData
     ]
     SyncGetUnpaginatedMultipleFunction = Callable[
         [GetUnpaginatedMultipleParameter],
@@ -26,9 +26,9 @@ class ExpandedQueryTypes:
     #* Paginated multiple data
     GetPaginatedMultipleParameter = BaseServiceParametersTransfers.GetPaginatedMultiple
     GetPaginatedMultipleResult = Union[
-        BaseServiceQueryResultsTransfers.Fail,
-        BaseServiceQueryResultsTransfers.NoData,
-        BaseServiceQueryResultsTransfers.PaginatedMultipleData
+        BaseServiceRepositoryResultsTransfers.Fail,
+        BaseServiceRepositoryResultsTransfers.NoData,
+        BaseServiceRepositoryResultsTransfers.PaginatedMultipleData
     ]
     SyncGetPaginatedMultipleFunction = Callable[
         [GetPaginatedMultipleParameter],
@@ -42,9 +42,9 @@ class ExpandedQueryTypes:
     #* Single data
     GetSingleParameter = BaseGeneralParametersTransfers.GetSingle
     GetSingleResult = Union[
-        BaseServiceQueryResultsTransfers.Fail,
-        BaseServiceQueryResultsTransfers.NoData,
-        BaseServiceQueryResultsTransfers.SingleData
+        BaseServiceRepositoryResultsTransfers.Fail,
+        BaseServiceRepositoryResultsTransfers.NoData,
+        BaseServiceRepositoryResultsTransfers.SingleData
     ]
     SyncGetSingleFunction = Callable[
         [GetSingleParameter],
@@ -57,12 +57,12 @@ class ExpandedQueryTypes:
 
     #* Create or Update
     CreateOrUpdateResult = Union[
-        BaseServiceQueryResultsTransfers.Fail,
-        BaseServiceQueryResultsTransfers.SingleData
+        BaseServiceRepositoryResultsTransfers.Fail,
+        BaseServiceRepositoryResultsTransfers.SingleData
     ]
 
     #* Status update
     StatusUpdateResult = Union[
-        BaseServiceQueryResultsTransfers.Fail,
-        BaseServiceQueryResultsTransfers.SingleData
+        BaseServiceRepositoryResultsTransfers.Fail,
+        BaseServiceRepositoryResultsTransfers.SingleData
     ]

{maleo_foundation-0.2.24 → maleo_foundation-0.2.26}/maleo_foundation/models/transfers/results/service/__init__.py

@@ -1,11 +1,9 @@
 from __future__ import annotations
 from .general import BaseServiceGeneralResultsTransfers
-from .query import BaseServiceQueryResultsTransfers
 from .repository import BaseServiceRepositoryResultsTransfers
 from .controllers import BaseServiceControllerResultsTransfers
 
 class BaseServiceResultsTransfers:
     General = BaseServiceGeneralResultsTransfers
-    Query = BaseServiceQueryResultsTransfers
     Repository = BaseServiceRepositoryResultsTransfers
     Controller = BaseServiceControllerResultsTransfers

{maleo_foundation-0.2.24 → maleo_foundation-0.2.26}/maleo_foundation/utils/exceptions.py

@@ -10,8 +10,6 @@ from typing import Optional
 from maleo_foundation.models.responses import BaseResponses
 from maleo_foundation.models.transfers.results.service.general \
     import BaseServiceGeneralResultsTransfers
-from maleo_foundation.models.transfers.results.service.query \
-    import BaseServiceQueryResultsTransfers
 from maleo_foundation.models.transfers.results.service.repository \
     import BaseServiceRepositoryResultsTransfers
 from maleo_foundation.utils.logging import BaseLogger
@@ -44,35 +42,6 @@ class BaseExceptions:
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR
         )
 
-    @staticmethod
-    def database_exception_handler(
-        operation:str,
-        logger:Optional[BaseLogger] = None,
-        fail_result_class:type[BaseServiceQueryResultsTransfers.Fail] = BaseServiceQueryResultsTransfers.Fail
-    ):
-        """Decorator to handle database-related exceptions consistently."""
-        def decorator(func):
-            @wraps(func)
-            def wrapper(*args, **kwargs):
-                try:
-                    return func(*args, **kwargs)
-                except SQLAlchemyError as e:
-                    logger.error("Database error occurred while %s: '%s'", operation, str(e), exc_info=True)
-                    return fail_result_class(
-                        message=f"Failed {operation}",
-                        description=f"A database error occurred while {operation}. Please try again later or contact administrator.",
-                        other="Database operation failed"
-                    )
-                except Exception as e:
-                    logger.error("Unexpected error occurred while %s: '%s'", operation, str(e), exc_info=True)
-                    return fail_result_class(
-                        message=f"Failed {operation}",
-                        description=f"An unexpected error occurred while {operation}. Please try again later or contact administrator.",
-                        other="Internal processing error"
-                    )
-            return wrapper
-        return decorator
-
     @staticmethod
     def repository_exception_handler(
         operation:str,

{maleo_foundation-0.2.24 → maleo_foundation-0.2.26}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.2.24 → maleo_foundation-0.2.26}/maleo_foundation.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ maleo_foundation/expanded_types/general.py
 maleo_foundation/expanded_types/hash.py
 maleo_foundation/expanded_types/key.py
 maleo_foundation/expanded_types/query.py
+maleo_foundation/expanded_types/repository.py
 maleo_foundation/expanded_types/service.py
 maleo_foundation/expanded_types/signature.py
 maleo_foundation/expanded_types/token.py
@@ -99,7 +100,6 @@ maleo_foundation/models/transfers/results/encryption/aes.py
 maleo_foundation/models/transfers/results/encryption/rsa.py
 maleo_foundation/models/transfers/results/service/__init__.py
 maleo_foundation/models/transfers/results/service/general.py
-maleo_foundation/models/transfers/results/service/query.py
 maleo_foundation/models/transfers/results/service/repository.py
 maleo_foundation/models/transfers/results/service/controllers/__init__.py
 maleo_foundation/models/transfers/results/service/controllers/rest.py

{maleo_foundation-0.2.24 → maleo_foundation-0.2.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo_foundation"
-version = "0.2.24"
+version = "0.2.26"
 description = "Foundation package for Maleo"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }

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

@@ -1,51 +0,0 @@
-from __future__ import annotations
-from pydantic import model_validator
-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,
-        BaseResultSchemas.BaseRow
-    ): pass
-
-    class Fail(BaseResultSchemas.Fail): pass
-
-    class NotFound(BaseResultSchemas.NotFound): pass
-
-    class NoData(BaseResultSchemas.NoData): pass
-
-    class SingleData(BaseResultSchemas.SingleData):
-        data:BaseServiceQueryResultsTransfers.Row
-
-    class UnpaginatedMultipleData(BaseResultSchemas.UnpaginatedMultipleData):
-        data:list[BaseServiceQueryResultsTransfers.Row]
-
-    class PaginatedMultipleData(BaseResultSchemas.PaginatedMultipleData):
-        data:list[BaseServiceQueryResultsTransfers.Row]
-
-        @model_validator(mode="before")
-        @classmethod
-        def calculate_pagination(cls, values: dict) -> dict:
-            """Calculates pagination metadata before validation."""
-            total_data = values.get("total_data", 0)
-            data = values.get("data", [])
-
-            #* Get pagination values from inherited SimplePagination
-            page = values.get("page", 1)
-            limit = values.get("limit", 10)
-
-            #* Calculate total pages
-            total_pages = (total_data // limit) + (1 if total_data % limit > 0 else 0)
-
-            #* Assign computed pagination object before validation
-            values["pagination"] = BaseGeneralSchemas.ExtendedPagination(
-                page=page,
-                limit=limit,
-                data_count=len(data),
-                total_data=total_data,
-                total_pages=total_pages
-            )
-            return values