Merge pull request #1786 from unicef/30737-allow-null-for-quantity-in…

…dicators Json Validator schema fix: allow NULL value for v,d,c in indicators
unicef · Jul 20, 2022 · 9542387 · 9542387
2 parents eb1dd93 + 5a5d56a
commit 9542387
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/django_api/etools_prp/apps/indicator/json_schemas.py b/django_api/etools_prp/apps/indicator/json_schemas.py
@@ -5,9 +5,9 @@
     "type": "object",
     "additionalProperties": False,
     "properties": {
-        "c": {"type": "number"},
-        "d": {"type": "number"},
-        "v": {"type": "number"}
+        "c": {"type": ["number", "null"]},
+        "d": {"type": ["number", "null"]},
+        "v": {"type": ["number", "null"]}
     },
     "required": ["d", "v"]
 }

diff --git a/django_api/etools_prp/apps/indicator/tests/test_views.py b/django_api/etools_prp/apps/indicator/tests/test_views.py
@@ -2500,3 +2500,15 @@ def test_valid_serializer_values(self):
         response = self.client.post(url, data=data, format='json')
         self.assertTrue(status.is_success(response.status_code))
         self.assertTrue(Reportable.objects.filter(id=response.data['id']).exists())
+
+        # Allow NULL for Target values
+        data['target'] = {'d': None, 'v': None, 'c': None}
+        response = self.client.post(url, data=data, format='json')
+        self.assertTrue(status.is_success(response.status_code))
+        self.assertTrue(Reportable.objects.filter(id=response.data['id']).exists())
+
+        # Allow NULL for Baseline values
+        data['baseline'] = {'d': None, 'v': None, 'c': None}
+        response = self.client.post(url, data=data, format='json')
+        self.assertTrue(status.is_success(response.status_code))
+        self.assertTrue(Reportable.objects.filter(id=response.data['id']).exists())