Fixed computedValues formatting

Author: tjoubert

arango/database.py

@@ -1012,9 +1012,9 @@ def create_collection(
             document schema validation.
         :type schema: dict
         :param computedValues: Array of computed values for the new collection
-            enabling default values to new documents or the maintenance of 
-            auxiliary attributes for search queries. Available in ArangoDB 
-            version 3.10 or greater. See ArangoDB documentation for more 
+            enabling default values to new documents or the maintenance of
+            auxiliary attributes for search queries. Available in ArangoDB
+            version 3.10 or greater. See ArangoDB documentation for more
             information on computed values.
         :type computedValues: list
         :return: Standard collection API wrapper.

arango/formatter.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from arango.typings import Headers, Json, Jsons
+from arango.typings import Headers, Json
 
 
 def verify_format(_: Any, res: Json) -> Json:
@@ -210,49 +210,17 @@ def format_collection(body: Json) -> Json:
 
     # New in 3.10
     if "computedValues" in body:
-        result["computedValues"] = format_collection_computed_values(body["computedValues"])
-
-    return verify_format(body, result)
-
-
-def format_collection_computed_values(body: Jsons) -> Jsons:
-    """Format collection computed values data.
-
-    :param body: Input body.
-    :type body: dict
-    :return: Formatted body.
-    :rtype: dict
-    """
-    result: Jsons = []
-
-    for item in body:
-        result.append(format_collection_computed_value_item(item))
-
-    return verify_format(body, result)
-
-
-def format_collection_computed_value_item(body: Json) -> Json:
-    """Format a computed value item for a collection.
-
-    :param body: Input body.
-    :type body: dict
-    :return: Formatted body.
-    :rtype: dict
-    """
-    result: Json = {}
-
-    if "name" in body:
-        result["name"] = body["name"]
-    if "expression" in body:
-        result["expression"] = body["expression"]
-    if "overwrite" in body:
-        result["overwrite"] = body["overwrite"]
-    if "computedOn" in body:
-        result["computedOn"] = body["computedOn"]
-    if "keepNull" in body:
-        result["keepNull"] = body["keepNull"]
-    if "failOnWarning" in body:
-        result["failOnWarning"] = body["failOnWarning"]
+        result["computedValues"] = [
+            {
+                "name": cv["name"],
+                "expression": cv["expression"],
+                "overwrite": cv["overwrite"],
+                "computedOn": cv["computedOn"],
+                "keepNull": cv["keepNull"],
+                "failOnWarning": cv["failOnWarning"],
+            }
+            for cv in body["computedValues"]
+        ]
 
     return verify_format(body, result)