maleo-foundation 0.0.11__tar.gz → 0.0.14__tar.gz

{maleo_foundation-0.0.11 → maleo_foundation-0.0.14}/PKG-INFO

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

{maleo_foundation-0.0.11 → maleo_foundation-0.0.14}/maleo_foundation/models/transfers/parameters/client.py

@@ -7,17 +7,18 @@ from maleo_foundation.models.schemas.parameter import BaseParameterSchemas
 
 class BaseClientParametersTransfers:
     class GetMultiple(
-        BaseParameterSchemas.DateFilters,
+        BaseGeneralSchemas.SimplePagination,
         BaseParameterSchemas.SortColumns,
         BaseGeneralSchemas.Search,
-        BaseGeneralSchemas.SimplePagination,
-        BaseGeneralSchemas.Statuses
+        BaseGeneralSchemas.Statuses,
+        BaseParameterSchemas.DateFilters,
+        BaseGeneralSchemas.IDs,
     ):
         pass
 
     class GetMultipleQuery(
-        BaseParameterSchemas.Filters,
         BaseParameterSchemas.Sorts,
+        BaseParameterSchemas.Filters,
         GetMultiple
     ):
         @model_validator(mode="after")
@@ -29,7 +30,7 @@ class BaseClientParametersTransfers:
 
             #* Only update if we have valid sort, otherwise keep the default
             if sort:
-                self.sort = sort
+                self.sorts = sort
 
             return self
 
@@ -48,7 +49,7 @@ class BaseClientParametersTransfers:
 
             #* Only update if we have valid filter, otherwise keep the default
             if filter:
-                self.filter = filter
+                self.filters = filter
 
             return self
             
@@ -57,8 +58,8 @@ class BaseClientParametersTransfers:
                 "page": self.page,
                 "limit": self.limit,
                 "search": self.search,
-                "sort": self.sort,
-                "filter": self.filter,
+                "sorts": self.sorts,
+                "filters": self.filters,
             }
             if hasattr(self, "statuses") and self.statuses is not None:
                 params["statuses"] = self.statuses

{maleo_foundation-0.0.11 → maleo_foundation-0.0.14}/maleo_foundation/models/transfers/parameters/service.py

@@ -11,15 +11,16 @@ from maleo_foundation.constants import SORT_COLUMN_PATTERN, DATE_FILTER_PATTERN
 
 class BaseServiceParametersTransfers:
     class GetMultipleQuery(
-        BaseParameterSchemas.Filters,
+        BaseGeneralSchemas.SimplePagination,
         BaseParameterSchemas.Sorts,
         BaseGeneralSchemas.Search,
-        BaseGeneralSchemas.SimplePagination,
-        BaseGeneralSchemas.Statuses
+        BaseGeneralSchemas.Statuses,
+        BaseParameterSchemas.Filters,
+        BaseGeneralSchemas.IDs
     ):
         @field_validator("sorts")
         @classmethod
-        def validate_sort_columns(cls, values):
+        def validate_sorts(cls, values):
             if not isinstance(values, list):
                 return ["id.asc"]
             return [value for value in values if SORT_COLUMN_PATTERN.match(value)]
@@ -39,8 +40,8 @@ class BaseServiceParametersTransfers:
                 return final_values
 
     class GetMultiple(
-        BaseParameterSchemas.DateFilters,
         BaseParameterSchemas.SortColumns,
+        BaseParameterSchemas.DateFilters,
         GetMultipleQuery
     ):
         @model_validator(mode="after")

{maleo_foundation-0.0.11 → maleo_foundation-0.0.14}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.0.11 → maleo_foundation-0.0.14}/pyproject.toml

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