csu 2.6.0__tar.gz → 2.6.2__tar.gz

{csu-2.6.0 → csu-2.6.2}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.6.0
+current_version = 2.6.2
 commit = True
 tag = True
 

{csu-2.6.0 → csu-2.6.2}/.cookiecutterrc

@@ -41,7 +41,7 @@ default_context:
     sphinx_theme: furo
     test_matrix_separate_coverage: false
     tests_inside_package: true
-    version: 2.6.0
+    version: 2.6.2
     version_manager: bump2version
     website: https://blog.ionelmc.ro
     year_from: '2024'

{csu-2.6.0 → csu-2.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.6.0
+Version: 2.6.2
 Summary: Clean Slate Utils - bunch of utility code, mostly Django/DRF specific.
 Author-email: Ionel Cristian Mărieș <contact@ionelmc.ro>
 License-Expression: BSD-2-Clause
@@ -69,9 +69,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.0.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.2.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.6.0...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.6.2...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.6.0 → csu-2.6.2}/README.rst

@@ -34,9 +34,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.0.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.2.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.6.0...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.6.2...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.6.0 → csu-2.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "csu"
-version = "2.6.0"
+version = "2.6.2"
 description = "Clean Slate Utils - bunch of utility code, mostly Django/DRF specific."
 requires-python = ">=3.14"
 license = "BSD-2-Clause"

{csu-2.6.0 → csu-2.6.2}/src/csu/__init__.py

@@ -2,4 +2,4 @@
 a.k.a Clean Slate Utils
 """
 
-__version__ = "2.6.0"
+__version__ = "2.6.2"

{csu-2.6.0 → csu-2.6.2}/src/csu/drf/serializers.py

@@ -88,10 +88,15 @@ class ConfirmSerializer(Serializer):
             raise ValidationError(_("Must have a true value."))
         return value
 
-    def validate(self, data):
-        if not self.instance.can_confirm():
-            raise ValidationError(_("Confirm time limit expired."))
-        return super().validate(data)
+    def validate(self, attrs):
+        instance = self.instance
+        if instance.is_pending:
+            if instance.can_confirm():
+                return super().validate(attrs)
+            else:
+                raise ValidationError({"confirm": _("Confirm time limit expired.")})
+        else:
+            raise ValidationError({"confirm": _("Cannot confirm when status is {status}.").format(status=type(instance).status_enum_class(instance.status))})
 
 
 class CancelSerializer(Serializer):
@@ -116,6 +121,6 @@ class CancelSerializer(Serializer):
 
     def validate(self, data):
         if not self.instance.can_cancel():
-            raise ValidationError(self.cancel_error)
+            raise ValidationError({"cancel": self.cancel_error})
 
         return super().validate(data)

{csu-2.6.0 → csu-2.6.2}/src/csu/models.py

@@ -92,17 +92,13 @@ class BaseStatusModel(BaseModel):
         return not self.is_confirmed
 
     def can_confirm(self):
-        if self.status == self.status_enum_class.expired:
-            return False
-        elif self.is_pending:
+        if self.is_pending:
             current_dt = now()
             created_at = cleanup_dt(self.created_at)
             if current_dt.day != created_at.day:
                 return False
             diff = (current_dt - created_at).total_seconds()
             return diff <= type(self).status_confirm_time_limit_seconds
-        else:
-            return True
 
 
 class BasePriceModel(models.Model):

{csu-2.6.0 → csu-2.6.2}/src/csu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.6.0
+Version: 2.6.2
 Summary: Clean Slate Utils - bunch of utility code, mostly Django/DRF specific.
 Author-email: Ionel Cristian Mărieș <contact@ionelmc.ro>
 License-Expression: BSD-2-Clause
@@ -69,9 +69,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.0.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.2.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.6.0...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.6.2...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/