Merge branch '82-refactor-oneof-in-action-schema' into '67-mas-dt'

Resolve "Refactor oneOf in action schema"

See merge request !51

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
+- Refactor mission_plan schema autonomy_engine_plan_ID oneOf
 - Update all example messages with valid UUIDs
 - Refactor action schema to accept geojson.Points
 - Use geojson Point for platform_status

formats/mission_plan.py

@@ -110,22 +110,6 @@ mission_plan_schema = {
             "example": "mission_plan",
             "enum": ["mission_plan"],
         },
-        "autonomy_engine_plan_ID": {
-            "oneOf": [
-                {
-                    "type": "string",
-                    "format": "uuid",
-                    "description": "Unique identifier for this plan"
-                    + "generated by the Autonomy Engine",
-                },
-                {
-                    "type": "integer",
-                    "description": "Unique identifier for this plan"
-                    + "generated by the Autonomy Engine",
-                    "example": 3,
-                },
-            ]
-        },
         "platform_ID": {
             "type": "string",
             "description": "Unique identifier for this platform",
@@ -143,6 +127,29 @@ mission_plan_schema = {
             "items": action_schema,
         },
     },
+    "oneOf": [
+        {
+            "properties": {
+                "autonomy_engine_plan_ID": {
+                    "type": "string",
+                    "format": "uuid",
+                    "pattern": "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}",
+                    "description": "Unique identifier for this plan"
+                    + "generated by the Autonomy Engine",
+                },
+            },
+        },
+        {
+            "properties": {
+                "autonomy_engine_plan_ID": {
+                    "type": "integer",
+                    "description": "Unique identifier for this plan"
+                    + "generated by the Autonomy Engine",
+                    "example": 3,
+                },
+            },
+        },
+    ],
     "required": [
         "message_type",
         "autonomy_engine_plan_ID",

project/soar/swagger.json

@@ -1528,21 +1528,28 @@
         "type": "object"
       },
       "mission_plan": {
-        "properties": {
-          "autonomy_engine_plan_ID": {
-            "oneOf": [
-              {
+        "oneOf": [
+          {
+            "properties": {
+              "autonomy_engine_plan_ID": {
                 "description": "Unique identifier for this plangenerated by the Autonomy Engine",
                 "format": "uuid",
+                "pattern": "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}",
                 "type": "string"
-              },
-              {
+              }
+            }
+          },
+          {
+            "properties": {
+              "autonomy_engine_plan_ID": {
                 "description": "Unique identifier for this plangenerated by the Autonomy Engine",
                 "example": 3,
                 "type": "integer"
               }
-            ]
-          },
+            }
+          }
+        ],
+        "properties": {
           "emergency": {
             "default": false,
             "description": "To indicate if this is an emergency. true = emergency and false = no emergency",