From 31a18e12f00a3c41ad70247bab824df10a202da9 Mon Sep 17 00:00:00 2001
From: "Jens W. Klein" <jk@kleinundpartner.at>
Date: Mon, 6 Mar 2023 10:08:10 +0100
Subject: [PATCH] Support Decimal fields while deserializing. (#903)

Support Decimal fields while de-serializing and add section to docs.

Co-authored-by: David Glick <david@glicksoftware.com>
---
 docs/source/usage/serialization.md             | 18 +++++++++++++++---
 news/903.bugfix                                |  2 ++
 src/plone/restapi/deserializer/configure.zcml  |  1 +
 src/plone/restapi/deserializer/dxfields.py     | 12 ++++++++++++
 src/plone/restapi/tests/dxtypes.py             |  3 ---
 .../restapi/tests/test_dxfield_deserializer.py | 10 ++++++++++
 .../restapi/tests/test_dxfield_serializer.py   |  8 ++++----
 7 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 news/903.bugfix

diff --git a/docs/source/usage/serialization.md b/docs/source/usage/serialization.md
index aebe2b0a3d..e77b7a5a0a 100644
--- a/docs/source/usage/serialization.md
+++ b/docs/source/usage/serialization.md
@@ -31,6 +31,16 @@ Since JSON does not have native support for dates and times, the Python and Zope
 | `DateTime("2015/11/23 19:45:55")`    | `"2015-11-23T19:45:55"` |
 
 
+## Decimal Type
+
+The [Python Decimal type](https://docs.python.org/3/library/decimal.html) supports correctly rounded decimal floating point arithmetic.
+To keep the precision, serializing the value to JSON results in a string.
+
+| Python                               | JSON                    |
+| ------------------------------------ | ----------------------- |
+| `Decimal("3.14159265359")`           | `"3.14159265359"`       |
+
+
 ## RichText fields
 
 RichText fields will be serialized as follows:
@@ -38,9 +48,11 @@ RichText fields will be serialized as follows:
 A `RichTextValue` such as the following:
 
 ```python
-RichTextValue(u'<p>Hallöchen</p>',
-              mimeType='text/html',
-              outputMimeType='text/html')
+RichTextValue(
+    "<p>Hallöchen</p>",
+    mimeType="text/html",
+    outputMimeType="text/html",
+)
 ```
 
 …will be serialized to:
diff --git a/news/903.bugfix b/news/903.bugfix
new file mode 100644
index 0000000000..3a0b13b664
--- /dev/null
+++ b/news/903.bugfix
@@ -0,0 +1,2 @@
+Fix missing `Decimal` field deserializer.
+[jensens]
diff --git a/src/plone/restapi/deserializer/configure.zcml b/src/plone/restapi/deserializer/configure.zcml
index e6a8bea9ae..f7b4d5c5ac 100644
--- a/src/plone/restapi/deserializer/configure.zcml
+++ b/src/plone/restapi/deserializer/configure.zcml
@@ -18,6 +18,7 @@
   <adapter factory=".dxfields.TimedeltaFieldDeserializer" />
   <adapter factory=".dxfields.NamedFieldDeserializer" />
   <adapter factory=".dxfields.RichTextFieldDeserializer" />
+  <adapter factory=".dxfields.DecimalFieldDeserializer" />
   <adapter factory=".blocks.BlocksJSONFieldDeserializer" />
 
   <subscriber
diff --git a/src/plone/restapi/deserializer/dxfields.py b/src/plone/restapi/deserializer/dxfields.py
index 8f75b3f20a..534291b872 100644
--- a/src/plone/restapi/deserializer/dxfields.py
+++ b/src/plone/restapi/deserializer/dxfields.py
@@ -1,4 +1,5 @@
 from datetime import timedelta
+from decimal import Decimal
 from plone.app.contenttypes.interfaces import ILink
 from plone.app.textfield.interfaces import IRichText
 from plone.app.textfield.value import RichTextValue
@@ -18,6 +19,7 @@
 from zope.schema.interfaces import IChoice
 from zope.schema.interfaces import ICollection
 from zope.schema.interfaces import IDatetime
+from zope.schema.interfaces import IDecimal
 from zope.schema.interfaces import IDict
 from zope.schema.interfaces import IField
 from zope.schema.interfaces import IFromUnicode
@@ -296,3 +298,13 @@ def __call__(self, value):
         )
         self.field.validate(value)
         return value
+
+
+@implementer(IFieldDeserializer)
+@adapter(IDecimal, IDexterityContent, IBrowserRequest)
+class DecimalFieldDeserializer(DefaultFieldDeserializer):
+    def __call__(self, value):
+        if not isinstance(value, Decimal):
+            value = Decimal(value)
+        self.field.validate(value)
+        return value
diff --git a/src/plone/restapi/tests/dxtypes.py b/src/plone/restapi/tests/dxtypes.py
index 493801524b..b3632d41d9 100644
--- a/src/plone/restapi/tests/dxtypes.py
+++ b/src/plone/restapi/tests/dxtypes.py
@@ -144,7 +144,6 @@ def vocabularyRequireingContextFactory(context):
 
 
 class IDXTestDocumentSchema(model.Schema):
-
     # zope.schema fields
     test_ascii_field = schema.ASCII(required=False)
     test_asciiline_field = schema.ASCIILine(required=False)
@@ -310,7 +309,6 @@ class DXTestDocument(Item):
 
 @provider(IFormFieldProvider)
 class ITestBehavior(model.Schema):
-
     test_behavior_field = schema.TextLine(required=False)
     # Add nav_title to test if it gets substituted in Navigation service
     nav_title = schema.TextLine(required=False)
@@ -318,5 +316,4 @@ class ITestBehavior(model.Schema):
 
 @provider(IFormFieldProvider)
 class ITestAnnotationsBehavior(model.Schema):
-
     test_annotations_behavior_field = schema.TextLine(required=False)
diff --git a/src/plone/restapi/tests/test_dxfield_deserializer.py b/src/plone/restapi/tests/test_dxfield_deserializer.py
index d40f88c00b..0410a1e049 100644
--- a/src/plone/restapi/tests/test_dxfield_deserializer.py
+++ b/src/plone/restapi/tests/test_dxfield_deserializer.py
@@ -184,6 +184,16 @@ def test_float_deserialization_returns_float(self):
         self.assertTrue(isinstance(value, float), "Not a <float>")
         self.assertEqual(1.0, value)
 
+    def test_float_deserialization_returns_decimal(self):
+        value = self.deserialize("test_decimal_field", 1.111)
+        self.assertTrue(isinstance(value, Decimal), "Not a <Decimal>")
+        # a float from JSON to decimal can not work properly, so you would get
+        # real floating point precision only
+        self.assertEqual(
+            Decimal("1.1109999999999999875655021241982467472553253173828125"),
+            value,
+        )
+
     def test_frozenset_deserialization_returns_frozenset(self):
         value = self.deserialize("test_frozenset_field", ["foo", "bar"])
         self.assertTrue(isinstance(value, frozenset), "Not a <frozenset>")
diff --git a/src/plone/restapi/tests/test_dxfield_serializer.py b/src/plone/restapi/tests/test_dxfield_serializer.py
index eb1e83c154..6c386ece68 100644
--- a/src/plone/restapi/tests/test_dxfield_serializer.py
+++ b/src/plone/restapi/tests/test_dxfield_serializer.py
@@ -104,10 +104,10 @@ def test_datetime_field_serialization_returns_unicode(self):
         self.assertTrue(isinstance(value, str), "Not an <unicode>")
         self.assertEqual("2015-06-20T13:22:04", value)
 
-    def test_decimal_field_serialization_returns_unicode(self):
-        value = self.serialize("test_decimal_field", Decimal("1.1"))
-        self.assertTrue(isinstance(value, str), "Not an <unicode>")
-        self.assertEqual("1.1", value)
+    def test_decimal_field_serialization_returns_str(self):
+        value = self.serialize("test_decimal_field", Decimal("1.111"))
+        self.assertTrue(isinstance(value, str), "Not an <str>")
+        self.assertEqual("1.111", value)
 
     def test_dict_field_serialization_returns_dict(self):
         value = self.serialize(