maleo-foundation 0.2.12__py3-none-any.whl → 0.2.14__py3-none-any.whl

maleo_foundation/models/transfers/parameters/client.py

@@ -10,8 +10,7 @@ class BaseClientParametersTransfers:
         BaseParameterSchemas.SortColumns,
         BaseGeneralSchemas.Search,
         BaseGeneralSchemas.Statuses,
-        BaseParameterSchemas.DateFilters,
-        BaseGeneralSchemas.Ids,
+        BaseParameterSchemas.DateFilters
     ):
         pass
 
@@ -51,15 +50,16 @@ class BaseClientParametersTransfers:
                 self.filters = filter
 
             return self
-            
-        def to_query_params(self) -> dict[str, Any]:
-            params = {
+
+        @property
+        def query_params(self) -> dict[str, Any]:
+            raw_params = {
+                "filters": self.filters,
+                "statuses": self.statuses,
                 "search": self.search,
                 "sorts": self.sorts,
-                "filters": self.filters,
             }
-            if hasattr(self, "statuses") and self.statuses is not None:
-                params["statuses"] = self.statuses
+            params = {k: v for k, v in raw_params.items() if v not in (None, [], "")}
             return params
 
     class GetPaginatedMultiple(
@@ -104,15 +104,16 @@ class BaseClientParametersTransfers:
                 self.filters = filter
 
             return self
-            
-        def to_query_params(self) -> dict[str, Any]:
-            params = {
-                "page": self.page,
-                "limit": self.limit,
+
+        @property
+        def query_params(self) -> dict[str, Any]:
+            raw_params = {
+                "filters": self.filters,
+                "statuses": self.statuses,
                 "search": self.search,
                 "sorts": self.sorts,
-                "filters": self.filters,
+                "page": self.page,
+                "limit": self.limit
             }
-            if hasattr(self, "statuses") and self.statuses is not None:
-                params["statuses"] = self.statuses
+            params = {k: v for k, v in raw_params.items() if v not in (None, [], "")}
             return params

maleo_foundation/models/transfers/parameters/service.py

@@ -1,19 +1,17 @@
 from __future__ import annotations
 from datetime import datetime
-from pydantic import BaseModel, Field, model_validator
-from typing import Optional, Self
+from pydantic import model_validator
+from typing import Self
 from maleo_foundation.enums import BaseEnums
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
 from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
-from maleo_foundation.types import BaseTypes
 
 class BaseServiceParametersTransfers:
     class GetUnpaginatedMultipleQuery(
         BaseParameterSchemas.Sorts,
         BaseGeneralSchemas.Search,
         BaseGeneralSchemas.Statuses,
-        BaseParameterSchemas.Filters,
-        BaseGeneralSchemas.Ids
+        BaseParameterSchemas.Filters
     ): pass
 
     class GetUnpaginatedMultiple(
@@ -131,30 +129,4 @@ class BaseServiceParametersTransfers:
 
             #* Update date_filters
             self.date_filters = date_filters
-            return self
-
-    class UniqueFieldCheck(BaseModel):
-        operation:BaseEnums.OperationType = Field(..., description="Operation to be conducted")
-        field:BaseEnums.IdentifierTypes = Field(..., description="Field to be checked")
-        new_value:BaseTypes.OptionalAny = Field(..., description="New field's value")
-        old_value:BaseTypes.OptionalAny = Field(None, description="Old field's value")
-        nullable:bool = Field(False, description="Whether to allow null field's value")
-        suggestion:BaseTypes.OptionalString = Field(None, description="Suggestion on discrepancy")
-
-    UniqueFieldChecks = list[UniqueFieldCheck]
-
-    status_update_criterias:dict[
-        BaseEnums.StatusUpdateAction,
-        Optional[list[BaseEnums.StatusType]]
-    ] = {
-        BaseEnums.StatusUpdateAction.DELETE: None,
-        BaseEnums.StatusUpdateAction.RESTORE: None,
-        BaseEnums.StatusUpdateAction.DEACTIVATE: [
-            BaseEnums.StatusType.INACTIVE,
-            BaseEnums.StatusType.ACTIVE,
-        ],
-        BaseEnums.StatusUpdateAction.ACTIVATE: [
-            BaseEnums.StatusType.INACTIVE,
-            BaseEnums.StatusType.ACTIVE,
-        ]
-    }
+            return self

maleo_foundation/utils/controller.py

@@ -1,58 +1,13 @@
 from fastapi import status
 from functools import wraps
-from typing import Awaitable, Callable, Dict, List, Type, Any
+from typing import Awaitable, Callable, Dict, List
 from maleo_foundation.types import BaseTypes
-from maleo_foundation.enums import BaseEnums
 from maleo_foundation.models.responses import BaseResponses
 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.controllers.rest import BaseServiceRESTControllerResults
 from maleo_foundation.expanded_types.general import BaseGeneralExpandedTypes
-from maleo_foundation.expanded_types.service import ExpandedServiceTypes
 
 class BaseControllerUtils:
-    @staticmethod
-    def check_unique_existence(
-        check:BaseServiceParametersTransfers.UniqueFieldCheck,
-        get_single_parameters_class:Type[ExpandedServiceTypes.GetSingleParameter],
-        get_single_service_function:ExpandedServiceTypes.SyncGetSingleFunction,
-        create_failed_response_class:Type[BaseResponses.Fail],
-        update_failed_response_class:Type[BaseResponses.Fail],
-        **additional_get_parameters:Any
-    ) -> BaseServiceRESTControllerResults:
-        """Generic helper function to check if a unique value exists in the database."""
-
-        #* Return early if nullable and no new value
-        if check.nullable and check.new_value is None:
-            return BaseServiceRESTControllerResults(success=True, content=None)
-
-        #* Return early if values are unchanged on update
-        if check.operation == BaseEnums.OperationType.UPDATE and check.old_value == check.new_value:
-            return BaseServiceRESTControllerResults(success=True, content=None)
-
-        #* Prepare parameters to query for existing data
-        get_single_parameters = get_single_parameters_class(identifier=check.field, value=check.new_value)
-
-        #* Query the existing data using provided function
-        service_result:ExpandedServiceTypes.GetSingleResult = get_single_service_function(parameters=get_single_parameters, **additional_get_parameters)
-        if not service_result.success:
-            content = BaseResponses.ServerError.model_validate(service_result.model_dump(exclude_unset=True)).model_dump()
-            return BaseServiceRESTControllerResults(success=False, content=content, status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
-        #* Handle case if duplicate is found
-        if service_result.data:
-            description = f"External error: {check.field} of '{check.new_value}' already exists in the database"
-            other = check.suggestion or f"Select another {check.field} value"
-            if check.operation == BaseEnums.OperationType.CREATE:
-                content = create_failed_response_class(description=description, other=other).model_dump()
-            elif check.operation == BaseEnums.OperationType.UPDATE:
-                content = update_failed_response_class(description=description, other=other).model_dump()
-
-            return BaseServiceRESTControllerResults(success=False, content=content, status_code=status.HTTP_400_BAD_REQUEST)
-
-        #* No duplicates found
-        return BaseServiceRESTControllerResults(success=True, content=None)
-
     @staticmethod
     def field_expansion_handler(
         expandable_fields_dependencies_map:BaseTypes.OptionalStringToListOfStringDict = None,

{maleo_foundation-0.2.12.dist-info → maleo_foundation-0.2.14.dist-info}/METADATA

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

{maleo_foundation-0.2.12.dist-info → maleo_foundation-0.2.14.dist-info}/RECORD

@@ -62,10 +62,10 @@ maleo_foundation/models/transfers/general/key.py,sha256=tLKkXbwNu7Oc1MdKa8-Y7TlB
 maleo_foundation/models/transfers/general/signature.py,sha256=J9xQy2HjpCQOnES7RJqsUnDgjFPuakQ1mxyfdTdstSE,297
 maleo_foundation/models/transfers/general/token.py,sha256=QckgF39hRAFU9GNXZsQ20kfaGom5Ppw5ShYaqDbeje8,2698
 maleo_foundation/models/transfers/parameters/__init__.py,sha256=oKW4RPIEISISRjsJzD8lsCGY1HhZRTzshPpWHcJu86k,353
-maleo_foundation/models/transfers/parameters/client.py,sha256=tn_Hwa-k-Utp5rODe7GylqZB8djIKKupgkUFscYCyLc,4059
+maleo_foundation/models/transfers/parameters/client.py,sha256=3X1iCThKr72_vds4gdldB0YxTlXoLTF1rGbsXyjyBpg,4051
 maleo_foundation/models/transfers/parameters/general.py,sha256=WoekZJCIoAllhXdRIJkNRdNq0QEIn0bteiHJLtzkCxU,579
 maleo_foundation/models/transfers/parameters/key.py,sha256=ZhWcbPJZvl8AF_qlecG-4-9_Ym6EbU7nngRo3AtbScY,432
-maleo_foundation/models/transfers/parameters/service.py,sha256=d7Xy_R-DtLBRozyD6r8YnTiuKlE3sb9HMDCCq9WmUbY,6757
+maleo_foundation/models/transfers/parameters/service.py,sha256=kG9C0it_pvX0kg2tYQeKl645IrosBkxSjr5vpQbIkx4,5494
 maleo_foundation/models/transfers/parameters/signature.py,sha256=ysYkALwqNXn13HP8xUOnPlboL9pgFLmQ9f7OpZe9dDw,483
 maleo_foundation/models/transfers/parameters/token.py,sha256=kIUhz86-9qEiWxZXIva33-iIdHDS9ca-_7SDvgOxitw,623
 maleo_foundation/models/transfers/parameters/encryption/__init__.py,sha256=w1-J_cVp8vPUVaAkTEpTTZ5S6R2wKxpqKj1Eu2cj-w0,322
@@ -93,7 +93,7 @@ maleo_foundation/models/transfers/results/service/query.py,sha256=xHHPWCYx6NrKK9
 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=wCuFyOTQkuBs2cqjPsWnPy0XIsCfMqGByhrSy57qp7Y,1107
 maleo_foundation/utils/__init__.py,sha256=SRPEVoqjZoO6W8rtF_Ti8VIangg6Auwm6eHbZMdOthY,520
-maleo_foundation/utils/controller.py,sha256=ECzPzpw36zBAjKcWcDbUAhIJGbc6UpeypdUUX6ipXBg,6396
+maleo_foundation/utils/controller.py,sha256=rzuWJVbR0eNxKpzrIGbglFAUjqBHrQ8eNCqGq-oLXr0,3643
 maleo_foundation/utils/exceptions.py,sha256=YKQ2hwVHUFlLAeup9FmCGptGIgdAuxTmTrD8A3gqURA,4078
 maleo_foundation/utils/extractor.py,sha256=SZXVYDHWGaA-Dd1BUydwF2HHdZqexEielS4CjL0Ceng,814
 maleo_foundation/utils/logging.py,sha256=W5Fhk_xAXVqSujaY8mv3hRH4wlQSpUn4ReuMoiKcQa4,7759
@@ -110,7 +110,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=deksZXT5wPhEsSMHbZ3x05WHXxCjLDt76Ns-1Tmhp7g,948
 maleo_foundation/utils/loaders/key/__init__.py,sha256=hVygcC2ImHc_aVrSrOmyedR8tMUZokWUKCKOSh5ctbo,106
 maleo_foundation/utils/loaders/key/rsa.py,sha256=gDhyX6iTFtHiluuhFCozaZ3pOLKU2Y9TlrNMK_GVyGU,3796
-maleo_foundation-0.2.12.dist-info/METADATA,sha256=R6VQSWtH1CEeeIq8ViRo1DqW6Qpc2PNtOcwFo6b1728,3419
-maleo_foundation-0.2.12.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-maleo_foundation-0.2.12.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.12.dist-info/RECORD,,
+maleo_foundation-0.2.14.dist-info/METADATA,sha256=aN9I-T0Pwf5zqS7iIZrH55r8bJYM4BB4aFDvLU7SbjQ,3419
+maleo_foundation-0.2.14.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+maleo_foundation-0.2.14.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.14.dist-info/RECORD,,