hotfix/mx-1709 dont double list wrap setValues (#379)

### Fixed - do not wrap field types in `setValues` in mapping rules in another list
robert-koch-institut · Jan 29, 2025 · e697ac3 · e697ac3
1 parent 1691cbe
commit e697ac3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- do not wrap field types in `setValues` in mapping rules in another list
+
 ### Security
 
 ## [0.49.1] - 2025-01-29

diff --git a/mex/common/models/base/mapping.py b/mex/common/models/base/mapping.py
@@ -9,7 +9,7 @@ class MappingRule(BaseModel, Generic[T], extra="forbid"):
     """Generic mapping rule model."""
 
     forValues: Annotated[list[str] | None, Field(title="forValues")] = None
-    setValues: Annotated[list[T] | None, Field(title="setValues")] = None
+    setValues: Annotated[T | None, Field(title="setValues")] = None
     rule: Annotated[str | None, Field(title="rule")] = None
 
 

diff --git a/tests/models/test_mapping.py b/tests/models/test_mapping.py
@@ -9,7 +9,6 @@
     MappingField,
     VariableGroupMapping,
 )
-from mex.common.testing import Joker
 
 
 def test_all_mapping_classes_are_defined() -> None:
@@ -205,12 +204,9 @@ def test_mapping_model_schema() -> None:
                     "setValues": {
                         "anyOf": [
                             {
-                                "items": {
-                                    "pattern": "^[a-zA-Z0-9]{14,22}$",
-                                    "title": "MergedPrimarySourceIdentifier",
-                                    "type": "string",
-                                },
-                                "type": "array",
+                                "pattern": "^[a-zA-Z0-9]{14,22}$",
+                                "title": "MergedPrimarySourceIdentifier",
+                                "type": "string",
                             },
                             {"type": "null"},
                         ],
@@ -241,12 +237,9 @@ def test_mapping_model_schema() -> None:
                         "anyOf": [
                             {
                                 "items": {
-                                    "items": {
-                                        "pattern": "^[a-zA-Z0-9]{14,22}$",
-                                        "title": "MergedResourceIdentifier",
-                                        "type": "string",
-                                    },
-                                    "type": "array",
+                                    "pattern": "^[a-zA-Z0-9]{14,22}$",
+                                    "title": "MergedResourceIdentifier",
+                                    "type": "string",
                                 },
                                 "type": "array",
                             },
@@ -277,13 +270,7 @@ def test_mapping_model_schema() -> None:
                     },
                     "setValues": {
                         "anyOf": [
-                            {
-                                "items": {
-                                    "items": {"$ref": "#/$defs/Text"},
-                                    "type": "array",
-                                },
-                                "type": "array",
-                            },
+                            {"items": {"$ref": "#/$defs/Text"}, "type": "array"},
                             {"type": "null"},
                         ],
                         "default": None,
@@ -310,10 +297,7 @@ def test_mapping_model_schema() -> None:
                         "title": "forValues",
                     },
                     "setValues": {
-                        "anyOf": [
-                            {"items": {"type": "string"}, "type": "array"},
-                            {"type": "null"},
-                        ],
+                        "anyOf": [{"type": "string"}, {"type": "null"}],
                         "default": None,
                         "title": "setValues",
                     },
@@ -327,7 +311,7 @@ def test_mapping_model_schema() -> None:
                 "type": "object",
             },
             "Text": {
-                "description": Joker(),
+                "description": 'Type class for text objects.\n\nTexts can be parsed from nested JSON objects or from raw strings.\n\nExample:\n    Text(value="foo") == Text.model_validate("foo")',
                 "properties": {
                     "value": {"minLength": 1, "title": "Value", "type": "string"},
                     "language": {