Add External Source (and External Event) Attribute Validation

e2e-tests/data/Schema_Example_Derivation.json

@@ -0,0 +1,93 @@
+{
+  "event_types": {
+    "DerivationA": {
+      "type": "object",
+      "required": [
+        "rules",
+        "notes",
+        "should_present"
+      ],
+      "properties": {
+        "rules": {
+          "type": "string"
+        },
+        "notes": {
+          "type": "string"
+        },
+        "should_present": {
+          "type": "boolean"
+        }
+      }
+    },
+    "DerivationB": {
+      "type": "object",
+      "required": [
+        "rules",
+        "notes",
+        "should_present"
+      ],
+      "properties": {
+        "rules": {
+          "type": "string"
+        },
+        "notes": {
+          "type": "string"
+        },
+        "should_present": {
+          "type": "boolean"
+        }
+      }
+    },
+    "DerivationC": {
+      "type": "object",
+      "required": [
+        "rules",
+        "notes",
+        "should_present"
+      ],
+      "properties": {
+        "rules": {
+          "type": "string"
+        },
+        "notes": {
+          "type": "string"
+        },
+        "should_present": {
+          "type": "boolean"
+        }
+      }
+    },
+    "DerivationD": {
+      "type": "object",
+      "required": [
+        "rules",
+        "notes",
+        "should_present"
+      ],
+      "properties": {
+        "rules": {
+          "type": "string"
+        },
+        "notes": {
+          "type": "string"
+        },
+        "should_present": {
+          "type": "boolean"
+        }
+      }
+    }
+  },
+  "source_types": {
+    "DerivationTest": {
+      "type": "object",
+      "required": [
+        "exampleAttribute"
+      ],
+      "properties": {
+        "exampleAttribute": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}

e2e-tests/data/Schema_Example_Source.json

@@ -0,0 +1,46 @@
+{
+  "event_types": {
+    "ExampleEvent": {
+      "title": "ExampleEvent",
+      "description": "Schema for the attributes of the ExampleEvent External Event Type.",
+      "type": "object",
+      "properties": {
+        "example1": {
+          "type": "string"
+        },
+        "example2": {
+          "type": "number"
+        },
+        "optional": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "example1",
+        "example2"
+      ]
+    }
+  },
+  "source_types": {
+    "Example External Source": {
+      "title": "Example External Source",
+      "description": "Schema for the attributes of the Example External Source External Source Type.",
+      "type": "object",
+      "properties": {
+        "optional": {
+          "type": "string"
+        },
+        "version": {
+          "type": "number"
+        },
+        "spacecraft": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "version",
+        "spacecraft"
+      ]
+    }
+  }
+}

e2e-tests/data/example-external-source.json

@@ -7,12 +7,9 @@
             "start_time": "2022-001T00:00:00Z",
             "end_time": "2022-002T00:00:00Z"
         },
-        "metadata": {
+        "attributes": {
             "version": 1,
-            "spacecraft": [
-                "sc1",
-                "sc2"
-            ]
+            "spacecraft": "sc1"
         }
     },
     "events": [
@@ -21,10 +18,10 @@
             "event_type": "ExampleEvent",
             "start_time": "2022-001T12:00:00Z",
             "duration": "00:00:00",
-            "properties": {
+            "attributes": {
                 "example1": "value",
                 "example2": 1
             }
         }
     ]
-}
+}

e2e-tests/data/example-external-source_no-attr.json

@@ -0,0 +1,21 @@
+{
+    "source": {
+        "key": "ExampleExternalSource:example-external-source_no-attr.json",
+        "source_type": "Empty External Source",
+        "valid_at": "2024-001T00:00:00Z",
+        "period": {
+            "start_time": "2022-001T00:00:00Z",
+            "end_time": "2022-002T00:00:00Z"
+        },
+        "attributes": {}
+    },
+    "events": [
+        {
+            "key": "EmptyEvent:1/sc/sc1:1:X/1",
+            "event_type": "EmptyEvent",
+            "start_time": "2022-001T12:00:00Z",
+            "duration": "00:00:00",
+            "attributes": {}
+        }
+    ]
+}

e2e-tests/data/external-event-derivation-1.json

@@ -1,53 +1,48 @@
 {
     "source": {
         "key": "external-event-derivation-1.json",
-        "source_type": "Derivation Test",
+        "source_type": "DerivationTest",
         "valid_at": "2022-018T00:00:00Z",
         "period": {
             "start_time": "2022-005T00:00:00Z",
             "end_time": "2022-011T00:00:00Z"
         },
-        "metadata": {}
+        "attributes": {
+          "exampleAttribute": "TestString"
+        }
     },
     "events": [
         {
             "key": "2",
             "event_type": "DerivationD",
             "start_time": "2022-005T23:00:00Z",
             "duration": "01:10:00",
-            "properties": {
-                "rules": [
-                    3,
-                    4
-                ],
-                "notes": "subsumed by test 01, even though end lies outside of 01, also replaced by test 01 by key",
-                "should_present": false
+            "attributes": {
+              "rules": "3, 4",
+              "notes": "subsumed by test 01, even though end lies outside of 01, also replaced by test 01 by key",
+              "should_present": false
             }
         },
         {
             "key": "7",
             "event_type": "DerivationC",
             "start_time": "2022-009T23:00:00Z",
             "duration": "02:00:00",
-            "properties": {
-                "rules": [
-                    3
-                ],
-                "notes": "subsumed by test 02, even though end lies outside of 01, because start time during 01",
-                "should_present": false
+            "attributes": {
+              "rules": "3",
+              "notes": "subsumed by test 02, even though end lies outside of 01, because start time during 01",
+              "should_present": false
             }
         },
         {
             "key": "8",
             "event_type": "DerivationB",
             "start_time": "2022-010T11:00:00Z",
             "duration": "01:05:00",
-            "properties": {
-                "rules": [
-                    1
-                ],
-                "notes": "after everything, subsumed by nothing despite being from oldest file",
-                "should_present": true
+            "attributes": {
+              "rules": "1",
+              "notes": "after everything, subsumed by nothing despite being from oldest file",
+              "should_present": true
             }
         }
     ]

e2e-tests/data/external-event-derivation-2.json

@@ -1,65 +1,59 @@
 {
     "source": {
         "key": "external-event-derivation-2.json",
-        "source_type": "Derivation Test",
+        "source_type": "DerivationTest",
         "valid_at": "2022-019T00:00:00Z",
         "period": {
             "start_time": "2022-001T00:00:00Z",
             "end_time": "2022-007T00:00:00Z"
         },
-        "metadata": {}
+        "attributes": {
+          "exampleAttribute": "TestString"
+        }
     },
     "events": [
         {
             "key": "1",
             "event_type": "DerivationA",
             "start_time": "2022-001T00:00:00Z",
             "duration": "02:10:00",
-            "properties": {
-                "rules": [
-                    1
-                ],
-                "notes": "before everything, subsumed by nothing",
-                "should_present": true
+            "attributes": {
+              "rules": "1",
+              "notes": "before everything, subsumed by nothing",
+              "should_present": true
             }
         },
         {
             "key": "2",
             "event_type": "DerivationA",
             "start_time": "2022-001T12:00:00Z",
             "duration": "02:10:00",
-            "properties": {
-                "rules": [
-                    4
-                ],
-                "notes": "overwritten by key in later file, even with type change",
-                "should_present": false
+            "attributes": {
+              "rules": "4",
+              "notes": "overwritten by key in later file, even with type change",
+              "should_present": false
             }
         },
         {
             "key": "3",
             "event_type": "DerivationB",
             "start_time": "2022-002T23:00:00Z",
             "duration": "03:00:00",
-            "properties": {
-                "rules": [
-                    2
-                ],
-                "notes": "starts before next file though occurs during next file, still included",
-                "should_present": true
+            "attributes": {
+              "rules": "2",
+              "notes": "starts before next file though occurs during next file, still included",
+              "should_present": true
             }
         },
         {
             "key": "4",
             "event_type": "DerivationB",
             "start_time": "2022-005T21:00:00Z",
             "duration": "03:00:00",
-            "properties": {
-                "rules": [
-                    3
-                ],
-                "notes": "start subsumed by 02, not included in final result",
-                "should_present": false
+            "attributes": {
+              "rules": "3",
+              "notes": "start subsumed by 02, not included in final result",
+              "should_present": false
             }
         }
     ]