Merge pull request #469 from The-Strategy-Unit/464-covid-schema

Remove covid from JSON schema

Author: matt-dray

params-schema.json

@@ -80,9 +80,6 @@
         "health_status_adjustment": {
             "type": "boolean"
         },
-        "covid_adjustment": {
-            "$ref": "#/$defs/covid_and_ndg"
-        },
         "expat": {
             "$ref": "#/$defs/expat"
         },
@@ -176,7 +173,7 @@
                     "type": "string"
                 },
                 "values": {
-                    "$ref": "#/$defs/covid_and_ndg"
+                    "$ref": "#/$defs/ndg"
                 }
             },
             "required": [
@@ -563,9 +560,6 @@
         "time_profile_mappings": {
             "type": "object",
             "properties": {
-                "covid_adjustment": {
-                    "$ref": "#/$defs/timeprofileMappings"
-                },
                 "baseline_adjustment": {
                     "$ref": "#/$defs/timeprofileMappings"
                 },
@@ -902,7 +896,6 @@
                 }
             },
             "required": [
-                "covid_adjustment",
                 "baseline_adjustment",
                 "expat",
                 "repat_local",
@@ -1209,7 +1202,7 @@
             },
             "additionalProperties": false
         },
-        "covid_and_ndg": {
+        "ndg": {
             "type": "object",
             "properties": {
                 "ip": {
@@ -1443,7 +1436,6 @@
         "app_version",
         "demographic_factors",
         "health_status_adjustment",
-        "covid_adjustment",
         "expat",
         "repat_local",
         "repat_nonlocal",
@@ -1455,4 +1447,4 @@
         "efficiencies",
         "time_profile_mappings"
     ]
-}
+}

queue/params-sample.json

@@ -40,45 +40,19 @@
       }
     }
   },
-  "covid_adjustment": {
-    "aae": {
-      "ambulance": [
-        1.014531,
-        1.014531
-      ],
-      "walk-in": [
-        1.031919,
-        1.031919
-      ]
-    },
-    "ip": {
-      "elective": [
-        1.023074,
-        1.023074
-      ],
-      "maternity": [
-        1.011324,
-        1.011324
-      ],
-      "non-elective": [
-        1.016637,
-        1.016637
-      ]
-    },
-    "op": {
-      "first": [
-        1.017960,
-        1.017960
-      ],
-      "followup": [
-        1.014095,
-        1.014095
-      ],
-      "procedure": [
-        1.026097,
-        1.026097
-      ]
-    }
+  "op": {
+    "first": [
+      1.017960,
+      1.017960
+    ],
+    "followup": [
+      1.014095,
+      1.014095
+    ],
+    "procedure": [
+      1.026097,
+      1.026097
+    ]
   },
   "expat": {
     "ip": {
@@ -1485,7 +1459,6 @@
     }
   },
   "time_profile_mappings": {
-    "covid_adjustment": "none",
     "baseline_adjustment": "none",
     "expat": "linear",
     "repat_local": "linear",
@@ -1600,4 +1573,4 @@
     },
     "waiting_list_adjustment": "linear"
   }
-}
+}