merge dev into release/2.81.0

minvws · Oct 6, 2023 · bbac0fc · bbac0fc
2 parents 118cdfc + e5e8d2c
commit bbac0fc
Show file tree

Hide file tree

Showing 156 changed files with 2,157 additions and 1,669 deletions.
diff --git a/packages/app/public/images/Najaarsronde-coronaprik-hero.svg b/packages/app/public/images/Najaarsronde-coronaprik-hero.svg
diff --git a/packages/app/schema/archived_gm/__difference.json b/packages/app/schema/archived_gm/__difference.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_difference",
+  "title": "archived_gm_difference",
   "type": "object",
   "required": [
     "tested_overall__infected_moving_average_archived_20230331",

diff --git a/packages/app/schema/archived_gm/__index.json b/packages/app/schema/archived_gm/__index.json
@@ -14,6 +14,7 @@
     "name",
     "vaccine_coverage_per_age_group_archived_20220622",
     "vaccine_coverage_per_age_group_archived_20220908",
+    "vaccine_coverage_per_age_group_archived_20231004",
     "tested_overall_archived_20230331"
   ],
   "properties": {
@@ -41,6 +42,9 @@
     "vaccine_coverage_per_age_group_archived_20220908": {
       "$ref": "vaccine_coverage_per_age_group_with_booster_shot.json"
     },
+    "vaccine_coverage_per_age_group_archived_20231004": {
+      "$ref": "vaccinaties/vaccine_campaign_coverage_per_age_group.json"
+    },
     "booster_coverage_archived_20220904": {
       "$ref": "booster_coverage.json"
     },

diff --git a/packages/app/schema/archived_gm/booster_coverage.json b/packages/app/schema/archived_gm/booster_coverage.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_booster_coverage",
+  "title": "archived_gm_booster_coverage",
   "type": "object",
   "properties": {
     "values": {
@@ -15,7 +15,7 @@
   "additionalProperties": false,
   "definitions": {
     "value": {
-      "title": "gm_booster_coverage_archived_20220904_value",
+      "title": "archived_gm_booster_coverage_value",
       "type": "object",
       "properties": {
         "age_group": {

diff --git a/packages/app/schema/archived_gm/deceased_rivm.json b/packages/app/schema/archived_gm/deceased_rivm.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_deceased_rivm",
+  "title": "archived_gm_deceased_rivm",
   "type": "object",
   "properties": {
     "values": {
@@ -17,7 +17,7 @@
   "additionalProperties": false,
   "definitions": {
     "value": {
-      "title": "gm_deceased_rivm_archived_20221231_value",
+      "title": "archived_gm_deceased_rivm_value",
       "type": "object",
       "properties": {
         "covid_daily": {

diff --git a/packages/app/schema/archived_gm/positive_tests/tested_overall.json b/packages/app/schema/archived_gm/positive_tests/tested_overall.json
@@ -1,7 +1,7 @@
 {
   "definitions": {
     "value": {
-      "title": "gm_tested_overall_value",
+      "title": "archived_gm_tested_overall_value",
       "type": "object",
       "additionalProperties": false,
       "required": [
@@ -40,7 +40,7 @@
   },
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "tested_overall.json",
-  "title": "gm_tested_overall",
+  "title": "archived_gm_tested_overall",
   "type": "object",
   "required": ["values", "last_value"],
   "additionalProperties": false,

diff --git a/packages/app/schema/archived_gm/sewer.json b/packages/app/schema/archived_gm/sewer.json
@@ -1,7 +1,7 @@
 {
   "definitions": {
     "value": {
-      "title": "gm_sewer_value",
+      "title": "archived_gm_sewer_value",
       "type": "object",
       "additionalProperties": false,
       "required": [
@@ -43,7 +43,7 @@
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_sewer",
+  "title": "archived_gm_sewer",
   "type": "object",
   "required": ["values", "last_value"],
   "additionalProperties": false,

diff --git a/...ma/gm/vaccine_coverage_per_age_group.json → ...cine_campaign_coverage_per_age_group.json b/...ma/gm/vaccine_coverage_per_age_group.json → ...cine_campaign_coverage_per_age_group.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_vaccine_coverage_per_age_group",
+  "title": "archived_gm_vaccine_campaign_coverage_per_age_group",
   "type": "object",
   "required": ["values"],
   "additionalProperties": false,
@@ -14,7 +14,7 @@
   },
   "definitions": {
     "value": {
-      "title": "gm_vaccine_coverage_per_age_group_value",
+      "title": "archived_gm_vaccine_campaign_coverage_per_age_group_value",
       "additionalProperties": false,
       "type": "object",
       "required": [

diff --git a/packages/app/schema/archived_gm/vaccine_coverage_per_age_group.json b/packages/app/schema/archived_gm/vaccine_coverage_per_age_group.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_vaccine_coverage_per_age_group_archived_20220622",
+  "title": "archived_gm_vaccine_coverage_per_age_group",
   "type": "object",
   "required": ["values"],
   "additionalProperties": false,
@@ -14,7 +14,7 @@
   },
   "definitions": {
     "value": {
-      "title": "gm_vaccine_coverage_per_age_group_archived_value",
+      "title": "archived_gm_vaccine_coverage_per_age_group_value",
       "additionalProperties": false,
       "type": "object",
       "required": [

diff --git a/packages/app/schema/archived_gm/vaccine_coverage_per_age_group_with_booster_shot.json b/packages/app/schema/archived_gm/vaccine_coverage_per_age_group_with_booster_shot.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_vaccine_coverage_per_age_group_with_booster_shot",
+  "title": "archived_gm_vaccine_coverage_per_age_group_with_booster_shot",
   "type": "object",
   "required": ["values"],
   "additionalProperties": false,
@@ -14,7 +14,7 @@
   },
   "definitions": {
     "value": {
-      "title": "gm_vaccine_coverage_per_age_group_archived_20220908_value",
+      "title": "archived_gm_vaccine_coverage_per_age_group_with_booster_shot_value",
       "additionalProperties": false,
       "type": "object",
       "required": [

diff --git a/packages/app/schema/archived_gm_collection/__index.json b/packages/app/schema/archived_gm_collection/__index.json
@@ -3,7 +3,16 @@
   "type": "object",
   "title": "archived_gm_collection",
   "additionalProperties": false,
-  "required": ["last_generated", "proto_name", "name", "code", "hospital_nice_choropleth_archived_20230830", "sewer_archived_20230623", "tested_overall_archived_20230331"],
+  "required": [
+    "last_generated",
+    "proto_name",
+    "name",
+    "code",
+    "hospital_nice_choropleth_archived_20230830",
+    "sewer_archived_20230623",
+    "tested_overall_archived_20230331",
+    "vaccine_coverage_per_age_group_choropleth_archived_20231004"
+  ],
   "properties": {
     "last_generated": {
       "type": "string"
@@ -40,6 +49,14 @@
       "items": {
         "$ref": "positive_tests/tested_overall.json"
       }
+    },
+    "vaccine_coverage_per_age_group_choropleth_archived_20231004": {
+      "type": "array",
+      "minItems": 684,
+      "maxItems": 684,
+      "items": {
+        "$ref": "vaccine_coverage_per_age_group_choropleth.json"
+      }
     }
   },
   "$defs": {

diff --git a/packages/app/schema/archived_gm_collection/positive_tests/tested_overall.json b/packages/app/schema/archived_gm_collection/positive_tests/tested_overall.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
-  "title": "gm_collection_tested_overall",
+  "title": "archived_gm_collection_tested_overall",
   "additionalProperties": false,
   "required": ["date_unix", "gmcode", "infected", "infected_per_100k", "date_of_insertion_unix"],
   "properties": {

diff --git a/packages/app/schema/archived_gm_collection/sewer.json b/packages/app/schema/archived_gm_collection/sewer.json
@@ -1,17 +1,9 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_collection_sewer",
+  "title": "archived_gm_collection_sewer",
   "type": "object",
   "additionalProperties": false,
-  "required": [
-    "date_start_unix",
-    "date_end_unix",
-    "gmcode",
-    "average",
-    "total_installation_count",
-    "date_of_insertion_unix",
-    "data_is_outdated"
-  ],
+  "required": ["date_start_unix", "date_end_unix", "gmcode", "average", "total_installation_count", "date_of_insertion_unix", "data_is_outdated"],
   "properties": {
     "date_start_unix": {
       "type": "integer"

diff --git a/...ction/vaccine_coverage_per_age_group.json → ...ction/vaccine_coverage_per_age_group.json b/...ction/vaccine_coverage_per_age_group.json → ...ction/vaccine_coverage_per_age_group.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_collection_vaccine_coverage_per_age_group",
+  "title": "archived_gm_collection_vaccine_coverage_per_age_group",
   "type": "object",
   "additionalProperties": false,
   "required": [

diff --git a/packages/app/schema/archived_gm_collection/vaccine_coverage_per_age_group_choropleth.json b/packages/app/schema/archived_gm_collection/vaccine_coverage_per_age_group_choropleth.json
@@ -0,0 +1,69 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "archived_gm_collection_vaccine_coverage_per_age_group_choropleth",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "gmcode",
+    "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": {
+    "gmcode": {
+      "type": "string",
+      "pattern": "^GM[0-9]+$"
+    },
+    "vaccination_type": {
+      "type": "string"
+    },
+    "birthyear_range_12_plus": {
+      "type": "string",
+      "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
+    },
+    "birthyear_range_18_plus": {
+      "type": "string",
+      "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
+    },
+    "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})$"
+    },
+    "vaccinated_percentage_18_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_18_plus_label": {
+      "type": ["string", "null"],
+      "pattern": "^([><][=][0-9]{1,2})$"
+    },
+    "vaccinated_percentage_60_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_60_plus_label": {
+      "type": ["string", "null"],
+      "pattern": "^([><][=][0-9]{1,2})$"
+    },
+    "date_unix": {
+      "type": "integer"
+    },
+    "date_of_insertion_unix": {
+      "type": "integer"
+    }
+  }
+}
diff --git a/packages/app/schema/archived_nl/__difference.json b/packages/app/schema/archived_nl/__difference.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "nl_difference",
+  "title": "archived_nl_difference",
   "type": "object",
   "properties": {
     "deceased_rivm__covid_daily_archived_20221231": {

diff --git a/packages/app/schema/archived_nl/__index.json b/packages/app/schema/archived_nl/__index.json
@@ -22,20 +22,31 @@
     "nursing_home_archived_20230126",
     "reproduction_archived_20230711",
     "sewer_archived_20230623",
-    "vaccine_campaigns_archived_20220908",
-    "vaccine_planned_archived_20220908",
+    "vaccine_administered_archived_20220914",
+    "vaccine_administered_doctors_archived_20220324",
+    "vaccine_administered_ggd_archived_20220324",
+    "vaccine_administered_ggd_ghor_archived_20220324",
+    "vaccine_administered_hospitals_and_care_institutions_archived_20220324",
+    "vaccine_administered_planned_archived_20220518",
+    "vaccine_administered_total_archived_20220324",
+    "vaccine_coverage_archived_20220518",
     "vaccine_coverage_per_age_group_archived_20220622",
     "vaccine_coverage_per_age_group_archived_20220908",
+    "vaccine_coverage_per_age_group_archived_20231004",
     "vaccine_coverage_per_age_group_estimated_archived_20220908",
+    "vaccine_coverage_per_age_group_estimated_autumn_2022_archived_20231004",
+    "vaccine_coverage_per_age_group_estimated_fully_vaccinated_archived_20231004",
+    "vaccine_campaigns_archived_20220908",
+    "vaccine_campaigns_archived_20231004",
+    "vaccine_planned_archived_20220908",
+    "vaccine_vaccinated_or_support_archived_20230411",
+    "vaccine_delivery_per_supplier_archived_20211101",
+    "vaccine_stock_archived_20211024",
     "tested_ggd_archived_20230321",
     "tested_overall_archived_20230331",
     "tested_per_age_group_archived_20230331",
     "vulnerable_hospital_admissions_archived_20230711",
     "vulnerable_nursing_home_archived_20230711",
-    "vaccine_vaccinated_or_support_archived_20230411",
-    "vaccine_coverage_archived_20220518",
-    "vaccine_delivery_per_supplier_archived_20211101",
-    "vaccine_stock_archived_20211024",
     "repeating_shot_administered_20220713",
     "corona_melder_app_warning_archived_20220421",
     "corona_melder_app_download_archived_20220421",
@@ -107,7 +118,10 @@
       "$ref": "sewer.json"
     },
     "vaccine_campaigns_archived_20220908": {
-      "$ref": "vaccine_campaigns.json"
+      "$ref": "vaccine_campaigns_2022.json"
+    },
+    "vaccine_campaigns_archived_20231004": {
+      "$ref": "vaccine_campaigns_2023.json"
     },
     "vaccine_planned_archived_20220908": {
       "$ref": "vaccine_planned.json"
@@ -133,9 +147,39 @@
     "vaccine_vaccinated_or_support_archived_20230411": {
       "$ref": "vaccine_vaccinated_or_support.json"
     },
+    "vaccine_administered_archived_20220914": {
+      "$ref": "vaccine_administered.json"
+    },
+    "vaccine_administered_doctors_archived_20220324": {
+      "$ref": "vaccine_administered_doctors.json"
+    },
+    "vaccine_administered_ggd_ghor_archived_20220324": {
+      "$ref": "vaccine_administered_ggd_ghor.json"
+    },
+    "vaccine_administered_ggd_archived_20220324": {
+      "$ref": "vaccine_administered_ggd.json"
+    },
+    "vaccine_administered_hospitals_and_care_institutions_archived_20220324": {
+      "$ref": "vaccine_administered_hospitals_and_care_institutions.json"
+    },
+    "vaccine_administered_total_archived_20220324": {
+      "$ref": "vaccine_administered_total.json"
+    },
+    "vaccine_administered_planned_archived_20220518": {
+      "$ref": "vaccine_administered_planned.json"
+    },
     "vaccine_coverage_archived_20220518": {
       "$ref": "vaccine_coverage.json"
     },
+    "vaccine_coverage_per_age_group_archived_20231004": {
+      "$ref": "vaccinaties/vaccine_coverage_per_age_group.json"
+    },
+    "vaccine_coverage_per_age_group_estimated_autumn_2022_archived_20231004": {
+      "$ref": "vaccine_coverage_per_age_group_estimated_autumn_2022.json"
+    },
+    "vaccine_coverage_per_age_group_estimated_fully_vaccinated_archived_20231004": {
+      "$ref": "vaccine_coverage_per_age_group_estimated_fully_vaccinated.json"
+    },
     "vaccine_delivery_per_supplier_archived_20211101": {
       "$ref": "vaccine_delivery_per_supplier.json"
     },