Adding more restrictions to learning objectives json schema

Author: AlexVelezLl

js/LearningObjectives.js

@@ -10,8 +10,13 @@ export const SCHEMA = {
   "description": "Schema for Learning Objectives mapping",
   "additionalProperties": false,
   "definitions": {
-    "learning_objective_id": {
+    "uuid": {
       "type": "string",
+      "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
+      "description": "A unique identifier in the form of a UUID v4"
+    },
+    "learning_objective_id": {
+      "$ref": "#/definitions/uuid",
       "description": "Unique identifier for the Learning Objective"
     }
   },
@@ -28,6 +33,8 @@ export const SCHEMA = {
           },
           "text": {
             "type": "string",
+            "minLength": 1,
+            "pattern": "^\\s*\\S[\\s\\S]*$",
             "description": "Human-readable text describing the Learning Objective"
           },
           "metadata": {
@@ -42,21 +49,27 @@ export const SCHEMA = {
       "type": "object",
       "description": "Mapping of assessment question IDs to Learning Objective IDs",
       "minProperties": 1,
+      "additionalProperties": false,
       "patternProperties": {
-        "^.*$": {
+        "^[0-9a-f]{32}:.+$": {
           "type": "array",
-          "items": { "$ref": "#/definitions/learning_objective_id" }
+          "items": {
+            "$ref": "#/definitions/learning_objective_id"
+          }
         }
       }
     },
     "lesson_objectives": {
       "type": "object",
-      "description": "Mapping of lesson content node IDs to Learning Objective IDs",
+      "description": "Mapping of lesson IDs to Learning Objective IDs",
       "minProperties": 1,
+      "additionalProperties": false,
       "patternProperties": {
-        "^.*$": {
+        "^[0-9a-f]{32}$": {
           "type": "array",
-          "items": { "$ref": "#/definitions/learning_objective_id" }
+          "items": {
+            "$ref": "#/definitions/learning_objective_id"
+          }
         }
       }
     }

le_utils/constants/learning_objectives.py

@@ -16,10 +16,15 @@
     "description": "Schema for Learning Objectives mapping",
     "additionalProperties": False,
     "definitions": {
-        "learning_objective_id": {
+        "uuid": {
             "type": "string",
+            "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
+            "description": "A unique identifier in the form of a UUID v4",
+        },
+        "learning_objective_id": {
+            "$ref": "#/definitions/uuid",
             "description": "Unique identifier for the Learning Objective",
-        }
+        },
     },
     "properties": {
         "learning_objectives": {
@@ -32,6 +37,8 @@
                     "id": {"$ref": "#/definitions/learning_objective_id"},
                     "text": {
                         "type": "string",
+                        "minLength": 1,
+                        "pattern": "^\\s*\\S[\\s\\S]*$",
                         "description": "Human-readable text describing the Learning Objective",
                     },
                     "metadata": {
@@ -46,19 +53,21 @@
             "type": "object",
             "description": "Mapping of assessment question IDs to Learning Objective IDs",
             "minProperties": 1,
+            "additionalProperties": False,
             "patternProperties": {
-                "^.*$": {
+                "^[0-9a-f]{32}:.+$": {
                     "type": "array",
                     "items": {"$ref": "#/definitions/learning_objective_id"},
                 }
             },
         },
         "lesson_objectives": {
             "type": "object",
-            "description": "Mapping of lesson content node IDs to Learning Objective IDs",
+            "description": "Mapping of lesson IDs to Learning Objective IDs",
             "minProperties": 1,
+            "additionalProperties": False,
             "patternProperties": {
-                "^.*$": {
+                "^[0-9a-f]{32}$": {
                     "type": "array",
                     "items": {"$ref": "#/definitions/learning_objective_id"},
                 }

spec/schema-learning_objectives.json

@@ -5,8 +5,13 @@
   "description": "Schema for Learning Objectives mapping",
   "additionalProperties": false,
   "definitions": {
-    "learning_objective_id": {
+    "uuid": {
       "type": "string",
+      "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
+      "description": "A unique identifier in the form of a UUID v4"
+    },
+    "learning_objective_id": {
+      "$ref": "#/definitions/uuid",
       "description": "Unique identifier for the Learning Objective"
     }
   },
@@ -23,6 +28,8 @@
           },
           "text": {
             "type": "string",
+            "minLength": 1,
+            "pattern": "^\\s*\\S[\\s\\S]*$",
             "description": "Human-readable text describing the Learning Objective"
           },
           "metadata": {
@@ -37,21 +44,27 @@
       "type": "object",
       "description": "Mapping of assessment question IDs to Learning Objective IDs",
       "minProperties": 1,
+      "additionalProperties": false,
       "patternProperties": {
-        "^.*$": {
+        "^[0-9a-f]{32}:.+$": {
           "type": "array",
-          "items": { "$ref": "#/definitions/learning_objective_id" }
+          "items": {
+            "$ref": "#/definitions/learning_objective_id"
+          }
         }
       }
     },
     "lesson_objectives": {
       "type": "object",
-      "description": "Mapping of lesson content node IDs to Learning Objective IDs",
+      "description": "Mapping of lesson IDs to Learning Objective IDs",
       "minProperties": 1,
+      "additionalProperties": false,
       "patternProperties": {
-        "^.*$": {
+        "^[0-9a-f]{32}$": {
           "type": "array",
-          "items": { "$ref": "#/definitions/learning_objective_id" }
+          "items": {
+            "$ref": "#/definitions/learning_objective_id"
+          }
         }
       }
     }