maleo-foundation 0.0.11__py3-none-any.whl → 0.0.14__py3-none-any.whl

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/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.dist-info → maleo_foundation-0.0.14.dist-info}/METADATA

@@ -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.dist-info → maleo_foundation-0.0.14.dist-info}/RECORD

@@ -25,9 +25,9 @@ maleo_foundation/models/schemas/parameter.py,sha256=1og_crWds6YLS-8Ha5EbAi3ZaNMz
 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
+maleo_foundation/models/transfers/parameters/client.py,sha256=Q43A-Z7JPXcxb_v7iUKoA1_WV8AMdEaeSl9Z39WSF_8,2287
 maleo_foundation/models/transfers/parameters/general.py,sha256=TDDUAc7GsKA9jhpan5BqoGVpOcwJPHpV34atXEd0D60,532
-maleo_foundation/models/transfers/parameters/service.py,sha256=ljlD4wLChp7nlzMLuYoo13YKhj9Q7yUmLxQ67oV5jYg,5333
+maleo_foundation/models/transfers/parameters/service.py,sha256=4_khFthR0JD5FklRYQNCG_8gMJmLTfAno7kQFEK1An4,5358
 maleo_foundation/models/transfers/results/__init__.py,sha256=0_8uJ1IQW87RZ4nIxzWkQVi3Fxb7B8myZTngXfoxgNc,241
 maleo_foundation/models/transfers/results/client/__init__.py,sha256=xBRuY0NUIPpQEGQ2qoBnqLZGX4W1YSrQ0VnDf5OYJBo,290
 maleo_foundation/models/transfers/results/client/service.py,sha256=TO_U53vmUEnFWiiyuu33ao3BUidt6KFxvk3GC9uo8JE,1108
@@ -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.11.dist-info/METADATA,sha256=rGh5U-DJ20FpgbL-wBENhlPWgf0ih_t3nnpqWeoE93c,3160
-maleo_foundation-0.0.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-maleo_foundation-0.0.11.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.0.11.dist-info/RECORD,,
+maleo_foundation-0.0.14.dist-info/METADATA,sha256=5r3eq9fPXjzt9IsHdQe2IIpyZMtywYgXH0QHJlZSmS0,3160
+maleo_foundation-0.0.14.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+maleo_foundation-0.0.14.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.0.14.dist-info/RECORD,,