Update tests

ResonantGeoData · Nov 18, 2024 · 5dab197 · 5dab197
1 parent f389e94
commit 5dab197
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/rdwatch/core/tests/test_ingest.py b/rdwatch/core/tests/test_ingest.py
@@ -92,8 +92,11 @@ def test_site_model_ingest_malformed_geometry(
     assert res.json() == {
         'detail': [
             {
+                'ctx': {
+                    'error': 'Failed to parse geometry.',
+                },
                 'loc': ['body', 'site_model', 'features', 0, 'geometry'],
-                'msg': 'Failed to parse geometry.',
+                'msg': 'Value error, Failed to parse geometry.',
                 'type': 'value_error',
             }
         ]

diff --git a/rdwatch/core/tests/test_site.py b/rdwatch/core/tests/test_site.py
@@ -1,3 +1,5 @@
+import json
+
 import pytest
 from ninja.testing import TestClient
 
@@ -13,23 +15,25 @@ def test_site_details_rest(
     assert response.status_code == 200
 
     data = response.json()
-    assert data == SiteImageSiteDetailResponse(
-        **{
-            'configurationId': site_evaluation.configuration_id,
-            'title': site_evaluation.configuration.title,
-            'timemin': (
-                site_evaluation.start_date.timestamp()
-                if site_evaluation.start_date
-                else None
-            ),
-            'timemax': (
-                site_evaluation.end_date.timestamp()
-                if site_evaluation.end_date
-                else None
-            ),
-            'regionName': site_evaluation.configuration.region.name,
-            'performer': site_evaluation.configuration.performer.short_code,
-            'siteNumber': site_evaluation.number,
-            'version': site_evaluation.version,
-        }
+    assert data == json.loads(
+        SiteImageSiteDetailResponse(
+            **{
+                'configurationId': site_evaluation.configuration_id,
+                'title': site_evaluation.configuration.title,
+                'timemin': (
+                    site_evaluation.start_date.timestamp()
+                    if site_evaluation.start_date
+                    else None
+                ),
+                'timemax': (
+                    site_evaluation.end_date.timestamp()
+                    if site_evaluation.end_date
+                    else None
+                ),
+                'regionName': site_evaluation.configuration.region.name,
+                'performer': site_evaluation.configuration.performer.short_code,
+                'siteNumber': site_evaluation.number,
+                'version': site_evaluation.version,
+            }
+        ).model_dump_json()
     )
diff --git a/rdwatch/core/views/model_run.py b/rdwatch/core/views/model_run.py
@@ -102,7 +102,7 @@ class ModelRunWriteSchema(Schema):
     title: Annotated[str, StringConstraints(max_length=1000)]
     region: Annotated[str, StringConstraints(min_length=1, max_length=255)]
     parameters: dict
-    expiration_time: int | None = None
+    expiration_time: int | None = Field(default=None, validate_default=True)
     evaluation: int | None = None
     evaluation_run: int | None = None
     proposal: bool | None = None