Feature/cor 1228 json changes (#4512)

* feat(booster): remove and remame booster data from existing schemas (#4499) * Feature/COR-1170-rioolwaterpagina-verbetering-choropletenkaart-nl (#4493) * feat(sewer-choropleth): Implement tooltip notification for outdated data * feat(sewer-choropleth): Implement yellow color on map when data for that area is outdated * feat(sewer-choropleth): Implements new legend item for outdated data, exports font-sizes. * feat(sewer-choropleth): Cleanup and finalize outdated data tooltip addition. * feat(sewer-choropleth): Adjust tooltip to account for different data in VR and GM datapoints. * feat(sewer-choropleth): Adds new outdated data property to schema for GM and VR collections. * feat(sewer-choropleth): New sanity keys and data types. * feat(sewer-choropleth): PR feedback round 1, and a few other fixes/refactoring. * feat(sewer-choropleth): PR feedback round 2 - Add content for assistive technologies (screenreaders). * feat(sewer-choropleth): PR feedback - Change condition for assigning outdated data variables. * feat(sewer-choropleth): Based on new info from backend, adding data_is_outdated property to sewer.json each GM and VR area * feat(sewer-choropleth): generate data types for new properties * feat(booster): remove and remame booster data from existing schemas (#4499) * Feature/COR-1170-rioolwaterpagina-verbetering-choropletenkaart-nl (#4493) * feat(sewer-choropleth): Implement tooltip notification for outdated data * feat(sewer-choropleth): Implement yellow color on map when data for that area is outdated * feat(sewer-choropleth): Implements new legend item for outdated data, exports font-sizes. * feat(sewer-choropleth): Cleanup and finalize outdated data tooltip addition. * feat(sewer-choropleth): Adjust tooltip to account for different data in VR and GM datapoints. * feat(sewer-choropleth): Adds new outdated data property to schema for GM and VR collections. * feat(sewer-choropleth): New sanity keys and data types. * feat(sewer-choropleth): PR feedback round 1, and a few other fixes/refactoring. * feat(sewer-choropleth): PR feedback round 2 - Add content for assistive technologies (screenreaders). * feat(sewer-choropleth): PR feedback - Change condition for assigning outdated data variables. * feat(sewer-choropleth): Based on new info from backend, adding data_is_outdated property to sewer.json each GM and VR area * feat(sewer-choropleth): generate data types for new properties * COR-1128 Restructure collection schemas (#4506) Co-authored-by: AP <[email protected]> Co-authored-by: VWSCoronaDashboard21 <[email protected]> Co-authored-by: VWSCoronaDashboard18 <[email protected]> Co-authored-by: AP <[email protected]> Co-authored-by: VWSCoronaDashboard21 <[email protected]> Co-authored-by: VWSCoronaDashboard18 <[email protected]>
minvws · Nov 24, 2022 · bf3bf11 · bf3bf11
1 parent 89cd749
commit bf3bf11
Show file tree

Hide file tree

Showing 54 changed files with 1,661 additions and 1,963 deletions.
diff --git a/packages/app/schema/gm/__index.json b/packages/app/schema/gm/__index.json
@@ -17,7 +17,7 @@
     "vaccine_coverage_per_age_group",
     "vaccine_coverage_per_age_group_archived",
     "vaccine_coverage_per_age_group_archived_20220908",
-    "booster_coverage"
+    "booster_coverage_archived_20220904"
   ],
   "properties": {
     "last_generated": {
@@ -62,8 +62,8 @@
     "vaccine_coverage_per_age_group_archived_20220908": {
       "$ref": "vaccine_coverage_per_age_group_archived_20220908.json"
     },
-    "booster_coverage": {
-      "$ref": "booster_coverage.json"
+    "booster_coverage_archived_20220904": {
+      "$ref": "booster_coverage_archived_20220904.json"
     }
   },
   "$defs": {

diff --git a/packages/app/schema/gm/booster_coverage.json → ...m/booster_coverage_archived_20220904.json b/packages/app/schema/gm/booster_coverage.json → ...m/booster_coverage_archived_20220904.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_booster_coverage",
+  "title": "gm_booster_coverage_archived_20220904",
   "type": "object",
   "properties": {
     "values": {
@@ -16,7 +16,7 @@
   "additionalProperties": false,
   "definitions": {
     "value": {
-      "title": "gm_booster_coverage_value",
+      "title": "gm_booster_coverage_archived_20220904_value",
       "type": "object",
       "properties": {
         "age_group": {

diff --git a/packages/app/schema/gm/sewer.json b/packages/app/schema/gm/sewer.json
@@ -11,7 +11,8 @@
         "total_number_of_samples",
         "sampled_installation_count",
         "total_installation_count",
-        "date_of_insertion_unix"
+        "date_of_insertion_unix",
+        "data_is_outdated"
       ],
       "properties": {
         "date_start_unix": {
@@ -34,6 +35,9 @@
         },
         "date_of_insertion_unix": {
           "type": "integer"
+        },
+        "data_is_outdated": {
+          "type": "boolean"
         }
       }
     }

diff --git a/packages/app/schema/gm/vaccine_coverage_per_age_group.json b/packages/app/schema/gm/vaccine_coverage_per_age_group.json
@@ -18,44 +18,53 @@
       "additionalProperties": false,
       "type": "object",
       "required": [
-        "age_group_range",
-        "autumn_2022_vaccinated_percentage",
-        "fully_vaccinated_percentage",
-        "booster_shot_percentage",
-        "autumn_2022_vaccinated_percentage_label",
-        "fully_vaccinated_percentage_label",
-        "booster_shot_percentage_label",
-        "birthyear_range",
+        "vaccination_type",
+        "birthyear_range_12_plus",
+        "birthyear_range_18_plus",
+        "birthyear_range_60_plus",
+        "vaccinated_percentage_12_plus",
+        "vaccinated_percentage_12_plus_label",
+        "vaccinated_percentage_18_plus",
+        "vaccinated_percentage_18_plus_label",
+        "vaccinated_percentage_60_plus",
+        "vaccinated_percentage_60_plus_label",
         "date_of_insertion_unix",
         "date_unix"
       ],
       "properties": {
-        "age_group_range": {
-          "type": "string",
-          "enum": ["12+", "18+", "60+"]
-        },
-        "autumn_2022_vaccinated_percentage": {
-          "type": ["integer", "null"]
-        },
-        "fully_vaccinated_percentage": {
-          "type": ["integer", "null"]
+        "vaccination_type": {
+          "type": "string"
         },
-        "booster_shot_percentage": {
-          "type": ["integer", "null"]
+        "birthyear_range_12_plus": {
+          "type": "string",
+          "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
         },
-        "birthyear_range": {
+        "birthyear_range_18_plus": {
           "type": "string",
           "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
         },
-        "autumn_2022_vaccinated_percentage_label": {
+        "birthyear_range_60_plus": {
+          "type": ["string", "null"],
+          "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
+        },
+        "vaccinated_percentage_12_plus": {
+          "type": ["number", "null"]
+        },
+        "vaccinated_percentage_12_plus_label": {
           "type": ["string", "null"],
           "pattern": "^([><][=][0-9]{1,2})$"
         },
-        "fully_vaccinated_percentage_label": {
+        "vaccinated_percentage_18_plus": {
+          "type": ["number", "null"]
+        },
+        "vaccinated_percentage_18_plus_label": {
           "type": ["string", "null"],
           "pattern": "^([><][=][0-9]{1,2})$"
         },
-        "booster_shot_percentage_label": {
+        "vaccinated_percentage_60_plus": {
+          "type": ["number", "null"]
+        },
+        "vaccinated_percentage_60_plus_label": {
           "type": ["string", "null"],
           "pattern": "^([><][=][0-9]{1,2})$"
         },

diff --git a/packages/app/schema/gm_collection/__index.json b/packages/app/schema/gm_collection/__index.json
@@ -57,8 +57,8 @@
     },
     "vaccine_coverage_per_age_group": {
       "type": "array",
-      "minItems": 1032,
-      "maxItems": 1032,
+      "minItems": 688,
+      "maxItems": 688,
       "items": {
         "$ref": "vaccine_coverage_per_age_group.json"
       }

diff --git a/packages/app/schema/gm_collection/sewer.json b/packages/app/schema/gm_collection/sewer.json
@@ -9,7 +9,8 @@
     "gmcode",
     "average",
     "total_installation_count",
-    "date_of_insertion_unix"
+    "date_of_insertion_unix",
+    "data_is_outdated"
   ],
   "properties": {
     "date_start_unix": {
@@ -30,6 +31,9 @@
     },
     "date_of_insertion_unix": {
       "type": "integer"
+    },
+    "data_is_outdated": {
+      "type": "boolean"
     }
   }
 }
diff --git a/packages/app/schema/gm_collection/vaccine_coverage_per_age_group.json b/packages/app/schema/gm_collection/vaccine_coverage_per_age_group.json
@@ -5,14 +5,16 @@
   "additionalProperties": false,
   "required": [
     "gmcode",
-    "age_group_range",
-    "birthyear_range",
-    "autumn_2022_vaccinated_percentage",
-    "autumn_2022_vaccinated_percentage_label",
-    "fully_vaccinated_percentage",
-    "fully_vaccinated_percentage_label",
-    "booster_shot_percentage",
-    "booster_shot_percentage_label",
+    "vaccination_type",
+    "birthyear_range_12_plus",
+    "birthyear_range_18_plus",
+    "birthyear_range_60_plus",
+    "vaccinated_percentage_12_plus",
+    "vaccinated_percentage_12_plus_label",
+    "vaccinated_percentage_18_plus",
+    "vaccinated_percentage_18_plus_label",
+    "vaccinated_percentage_60_plus",
+    "vaccinated_percentage_60_plus_label",
     "date_of_insertion_unix",
     "date_unix"
   ],
@@ -21,32 +23,39 @@
       "type": "string",
       "pattern": "^GM[0-9]+$"
     },
-    "age_group_range": {
-      "type": "string",
-      "enum": ["12+", "18+", "60+"]
-    },
-    "autumn_2022_vaccinated_percentage": {
-      "type": ["integer", "null"]
-    },
-    "fully_vaccinated_percentage": {
-      "type": ["integer", "null"]
+    "vaccination_type": {
+      "type": "string"
     },
-    "booster_shot_percentage": {
-      "type": ["integer", "null"]
+    "birthyear_range_12_plus": {
+      "type": "string",
+      "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
     },
-    "birthyear_range": {
+    "birthyear_range_18_plus": {
       "type": "string",
       "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
     },
-    "autumn_2022_vaccinated_percentage_label": {
+    "birthyear_range_60_plus": {
+      "type": ["string", "null"],
+      "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
+    },
+    "vaccinated_percentage_12_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_12_plus_label": {
       "type": ["string", "null"],
       "pattern": "^([><][=][0-9]{1,2})$"
     },
-    "fully_vaccinated_percentage_label": {
+    "vaccinated_percentage_18_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_18_plus_label": {
       "type": ["string", "null"],
       "pattern": "^([><][=][0-9]{1,2})$"
     },
-    "booster_shot_percentage_label": {
+    "vaccinated_percentage_60_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_60_plus_label": {
       "type": ["string", "null"],
       "pattern": "^([><][=][0-9]{1,2})$"
     },

diff --git a/packages/app/schema/nl/__index.json b/packages/app/schema/nl/__index.json
@@ -5,9 +5,9 @@
   "required": [
     "behavior",
     "behavior_annotations",
-    "booster_shot_administered",
+    "booster_shot_administered_archived_20220904",
     "repeating_shot_administered",
-    "booster_coverage",
+    "booster_coverage_archived_20220904",
     "code",
     "corona_melder_app_download",
     "corona_melder_app_warning",
@@ -80,14 +80,14 @@
     "named_difference": {
       "$ref": "__named_difference.json"
     },
-    "booster_shot_administered": {
-      "$ref": "booster_shot_administered.json"
+    "booster_shot_administered_archived_20220904": {
+      "$ref": "booster_shot_administered_archived_20220904.json"
     },
     "repeating_shot_administered": {
       "$ref": "repeating_shot_administered.json"
     },
-    "booster_coverage": {
-      "$ref": "booster_coverage.json"
+    "booster_coverage_archived_20220904": {
+      "$ref": "booster_coverage_archived_20220904.json"
     },
     "doctor": {
       "$ref": "doctor.json"

diff --git a/packages/app/schema/nl/booster_coverage.json → ...l/booster_coverage_archived_20220904.json b/packages/app/schema/nl/booster_coverage.json → ...l/booster_coverage_archived_20220904.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "nl_booster_coverage",
+  "title": "nl_booster_coverage_archived_20220904",
   "type": "object",
   "properties": {
     "values": {
@@ -16,7 +16,7 @@
   "additionalProperties": false,
   "definitions": {
     "value": {
-      "title": "nl_booster_coverage_value",
+      "title": "nl_booster_coverage_archived_20220904_value",
       "type": "object",
       "properties": {
         "age_group": {

diff --git a/.../schema/nl/booster_shot_administered.json → ..._shot_administered_archived_20220904.json b/.../schema/nl/booster_shot_administered.json → ..._shot_administered_archived_20220904.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "nl_booster_shot_administered",
+  "title": "nl_booster_shot_administered_archived_20220904",
   "type": "object",
   "properties": {
     "values": {
@@ -19,7 +19,7 @@
   "additionalProperties": false,
   "definitions": {
     "value": {
-      "title": "nl_booster_shot_administered_value",
+      "title": "nl_booster_shot_administered_archived_20220904_value",
       "type": "object",
       "properties": {
         "administered_total": {

diff --git a/packages/app/schema/nl/vaccine_coverage_per_age_group.json b/packages/app/schema/nl/vaccine_coverage_per_age_group.json
@@ -22,10 +22,8 @@
         "age_group_range",
         "age_group_total",
         "autumn_2022_vaccinated",
-        "booster_shot",
         "autumn_2022_vaccinated_percentage",
         "fully_vaccinated_percentage",
-        "booster_shot_percentage",
         "date_of_insertion_unix",
         "date_unix",
         "date_of_report_unix",
@@ -59,18 +57,12 @@
         "fully_vaccinated": {
           "type": "integer"
         },
-        "booster_shot": {
-          "type": ["integer", "null"]
-        },
         "autumn_2022_vaccinated_percentage": {
           "type": ["integer", "null"]
         },
         "fully_vaccinated_percentage": {
           "type": "number"
         },
-        "booster_shot_percentage": {
-          "type": ["number", "null"]
-        },
         "date_unix": {
           "type": "integer"
         },

diff --git a/packages/app/schema/vr/__index.json b/packages/app/schema/vr/__index.json
@@ -27,7 +27,7 @@
     "vaccine_coverage_per_age_group",
     "vaccine_coverage_per_age_group_archived",
     "vaccine_coverage_per_age_group_archived_20220908",
-    "booster_coverage"
+    "booster_coverage_archived_20220904"
   ],
   "additionalProperties": false,
   "properties": {
@@ -106,8 +106,8 @@
     "vaccine_coverage_per_age_group_archived_20220908": {
       "$ref": "vaccine_coverage_per_age_group_archived_20220908.json"
     },
-    "booster_coverage": {
-      "$ref": "booster_coverage.json"
+    "booster_coverage_archived_20220904": {
+      "$ref": "booster_coverage_archived_20220904.json"
     }
   },
   "$defs": {

diff --git a/packages/app/schema/vr/booster_coverage.json → ...r/booster_coverage_archived_20220904.json b/packages/app/schema/vr/booster_coverage.json → ...r/booster_coverage_archived_20220904.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "vr_booster_coverage",
+  "title": "vr_booster_coverage_archived_20220904",
   "type": "object",
   "properties": {
     "values": {
@@ -16,7 +16,7 @@
   "additionalProperties": false,
   "definitions": {
     "value": {
-      "title": "vr_booster_coverage_value",
+      "title": "vr_booster_coverage_archived_20220904_value",
       "type": "object",
       "properties": {
         "age_group": {

diff --git a/packages/app/schema/vr/sewer.json b/packages/app/schema/vr/sewer.json
@@ -4,7 +4,7 @@
       "title": "vr_sewer_value",
       "type": "object",
       "additionalProperties": false,
-      "required": ["date_unix", "average", "date_of_insertion_unix"],
+      "required": ["date_unix", "average", "date_of_insertion_unix", "data_is_outdated"],
       "properties": {
         "date_unix": {
           "type": "integer"
@@ -14,6 +14,9 @@
         },
         "date_of_insertion_unix": {
           "type": "integer"
+        },
+        "data_is_outdated": {
+          "type": "boolean"
         }
       }
     }