Merge pull request #58 from NOAA-GSL/feat/idsse-609/support_proximal

Support Proximal in EventPorts
NOAA-GSL · Mar 15, 2024 · 5016214 · 5016214
2 parents e294188 + 43c4069
commit 5016214
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/python/idsse_common/idsse/common/schema/risk_results.json b/python/idsse_common/idsse/common/schema/risk_results.json
@@ -75,12 +75,7 @@
         "description": "Mechanism for storing the a contiguous state (when the criteria is met or not met",
         "type": "object",
         "properties": {
-            "criteriaMet": {         
-                "oneOf" : [
-                    {"type": "boolean"},
-                    {"type": "string", "enum": ["true", "false"]}
-                ]
-            },
+            "empirical": {"type": "string", "enum": ["HIT", "MISS", "PROXIMAL"]},
             "startDt": {"$ref": "timing.json#/TimeString"},
             "endDt": {"$ref": "timing.json#/TimeString"},
             "durationInMin": {"type": "integer"},
@@ -90,7 +85,7 @@
             "maxAt": {"$ref": "timing.json#/TimeString"}
         },
         "required": [
-            "criteriaMet",
+            "empirical",
             "startDt",
             "endDt",
             "durationInMin",

diff --git a/python/idsse_common/test/test_validate_event_port_schema.py b/python/idsse_common/test/test_validate_event_port_schema.py
@@ -159,7 +159,7 @@ def simple_event_port_message() -> dict:
                                 "startDt": "2022-11-12T00:00:00.000Z",
                                 "endDt": "2022-11-12T00:00:00.000Z",
                                 "maxAt": "2022-11-12T00:00:00.000Z",
-                                "criteriaMet": "true"
+                                "empirical": "HIT"
                             }
                         ]
                     },
@@ -175,7 +175,7 @@ def simple_event_port_message() -> dict:
                                 "startDt": "2022-11-12T00:00:00.000Z",
                                 "endDt": "2022-11-12T00:00:00.000Z",
                                 "maxAt": "2022-11-12T00:00:00.000Z",
-                                "criteriaMet": "true"
+                                "empirical": "HIT"
                             }
                         ]
                     }