feat: Moved- archived-keys-with-the-suffix-to-the-archived-folder

minvws · Aug 7, 2023 · 1163bb5 · 1163bb5
1 parent 6913942
commit 1163bb5
Show file tree

Hide file tree

Showing 33 changed files with 475 additions and 404 deletions.
diff --git a/packages/app/schema/archived_gm/__difference.json b/packages/app/schema/archived_gm/__difference.json
@@ -0,0 +1,54 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "gm_difference",
+  "type": "object",
+  "properties": {
+    "deceased_rivm__covid_daily_archived_20221231": {
+      "$ref": "#/definitions/diff_integer"
+    }
+  },
+  "required": ["deceased_rivm__covid_daily_archived_20221231"],
+  "additionalProperties": false,
+  "definitions": {
+    "diff_integer": {
+      "title": "difference_integer",
+      "type": "object",
+      "properties": {
+        "old_value": {
+          "type": "integer"
+        },
+        "difference": {
+          "type": "integer"
+        },
+        "old_date_unix": {
+          "type": "integer"
+        },
+        "new_date_unix": {
+          "type": "integer"
+        }
+      },
+      "required": ["old_value", "difference", "old_date_unix", "new_date_unix"],
+      "additionalProperties": false
+    },
+    "diff_decimal": {
+      "title": "difference_decimal",
+      "type": "object",
+      "properties": {
+        "old_value": {
+          "type": "number"
+        },
+        "difference": {
+          "type": "number"
+        },
+        "old_date_unix": {
+          "type": "integer"
+        },
+        "new_date_unix": {
+          "type": "integer"
+        }
+      },
+      "required": ["old_value", "difference", "old_date_unix", "new_date_unix"],
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/packages/app/schema/archived_gm/__index.json b/packages/app/schema/archived_gm/__index.json
@@ -4,13 +4,24 @@
   "title": "archived_gm",
   "additionalProperties": false,
   "required": [
+    "booster_coverage_archived_20220904",
+    "code",
+    "sewer_archived_20230623",
+    "difference",
+    "deceased_rivm_archived_20221231",
     "last_generated",
     "proto_name",
     "name",
-    "code",
-    "sewer_archived_20230623"
+    "vaccine_coverage_per_age_group_archived_20220622",
+    "vaccine_coverage_per_age_group_archived_20220908"
   ],
   "properties": {
+    "difference": {
+      "$ref": "__difference.json"
+    },
+    "deceased_rivm_archived_20221231": {
+      "$ref": "deceased_rivm_archived_20221231.json"
+    },
     "last_generated": {
       "type": "string"
     },
@@ -23,6 +34,15 @@
     "code": {
       "$ref": "#/$defs/archived_gm_code"
     },
+    "vaccine_coverage_per_age_group_archived_20220622": {
+      "$ref": "vaccine_coverage_per_age_group_archived_20220622.json"
+    },
+    "vaccine_coverage_per_age_group_archived_20220908": {
+      "$ref": "vaccine_coverage_per_age_group_archived_20220908.json"
+    },
+    "booster_coverage_archived_20220904": {
+      "$ref": "booster_coverage_archived_20220904.json"
+    },
     "sewer_archived_20230623": {
       "$ref": "sewer.json"
     }

diff --git a/...m/booster_coverage_archived_20220904.json → ...m/booster_coverage_archived_20220904.json b/...m/booster_coverage_archived_20220904.json → ...m/booster_coverage_archived_20220904.json
diff --git a/...a/gm/deceased_rivm_archived_20221231.json → ...d_gm/deceased_rivm_archived_20221231.json b/...a/gm/deceased_rivm_archived_20221231.json → ...d_gm/deceased_rivm_archived_20221231.json
diff --git a/...cine_coverage_per_age_group_archived.json → ...rage_per_age_group_archived_20220622.json b/...cine_coverage_per_age_group_archived.json → ...rage_per_age_group_archived_20220622.json
diff --git a/...rage_per_age_group_archived_20220908.json → ...rage_per_age_group_archived_20220908.json b/...rage_per_age_group_archived_20220908.json → ...rage_per_age_group_archived_20220908.json
diff --git a/packages/app/schema/archived_nl/__difference.json b/packages/app/schema/archived_nl/__difference.json
@@ -3,6 +3,9 @@
   "title": "archived_nl_difference",
   "type": "object",
   "properties": {
+    "deceased_rivm__covid_daily_archived_20221231": {
+      "$ref": "#/definitions/diff_integer"
+    },
     "nursing_home__deceased_daily_archived_20230126": {
       "$ref": "#/definitions/diff_integer"
     },
@@ -20,6 +23,7 @@
     }
   },
   "required": [
+    "deceased_rivm__covid_daily_archived_20221231",
     "nursing_home__deceased_daily_archived_20230126",
     "vulnerable_nursing_home__infected_locations_total_archived_20230711",
     "nursing_home__newly_infected_people_archived_20230126",

diff --git a/packages/app/schema/archived_nl/__index.json b/packages/app/schema/archived_nl/__index.json
@@ -11,9 +11,20 @@
     "behavior_archived_20230411",
     "behavior_annotations_archived_20230412",
     "behavior_per_age_group_archived_20230411",
+    "booster_shot_administered_archived_20220904",
+    "booster_coverage_archived_20220904",
+    "deceased_rivm_archived_20221231",
+    "deceased_rivm_per_age_group_archived_20221231",
     "doctor_archived_20210903",
+    "disability_care_archived_20230126",
+    "elderly_at_home_archived_20230126",
     "nursing_home_archived_20230126",
     "sewer_archived_20230623",
+    "vaccine_campaigns_archived_20220908",
+    "vaccine_planned_archived_20220908",
+    "vaccine_coverage_per_age_group_archived_20220622",
+    "vaccine_coverage_per_age_group_archived_20220908",
+    "vaccine_coverage_per_age_group_estimated_archived_20220908",
     "vulnerable_hospital_admissions_archived_20230711",
     "vulnerable_nursing_home_archived_20230711",
     "reproduction_archived_20230711"
@@ -44,15 +55,48 @@
     "behavior_per_age_group_archived_20230411": {
       "$ref": "behavior/behavior_per_age_group.json"
     },
+    "deceased_rivm_archived_20221231": {
+      "$ref": "deceased_rivm_archived_20221231.json"
+    },
+    "booster_shot_administered_archived_20220904": {
+      "$ref": "booster_shot_administered_archived_20220904.json"
+    },
+    "booster_coverage_archived_20220904": {
+      "$ref": "booster_coverage_archived_20220904.json"
+    },
+    "deceased_rivm_per_age_group_archived_20221231": {
+      "$ref": "deceased_rivm_per_age_group_archived_20221231.json"
+    },
     "doctor_archived_20210903": {
       "$ref": "doctor.json"
     },
+    "disability_care_archived_20230126": {
+      "$ref": "disability_care_archived_20230126.json"
+    },
+    "elderly_at_home_archived_20230126": {
+      "$ref": "elderly_at_home_archived_20230126.json"
+    },
     "nursing_home_archived_20230126": {
       "$ref": "nursing_home.json"
     },
     "sewer_archived_20230623": {
       "$ref": "sewer.json"
     },
+    "vaccine_campaigns_archived_20220908": {
+      "$ref": "vaccine_campaigns_archived_20220908.json"
+    },
+    "vaccine_planned_archived_20220908": {
+      "$ref": "vaccine_planned_archived_20220908.json"
+    },
+    "vaccine_coverage_per_age_group_archived_20220622": {
+      "$ref": "vaccine_coverage_per_age_group_archived_20220622.json"
+    },
+    "vaccine_coverage_per_age_group_archived_20220908": {
+      "$ref": "vaccine_coverage_per_age_group_archived_20220908.json"
+    },
+    "vaccine_coverage_per_age_group_estimated_archived_20220908": {
+      "$ref": "vaccine_coverage_per_age_group_estimated_archived_20220908.json"
+    },
     "vulnerable_nursing_home_archived_20230711": {
       "$ref": "vulnerable_nursing_home.json"
     },

diff --git a/...l/booster_coverage_archived_20220904.json → ...l/booster_coverage_archived_20220904.json b/...l/booster_coverage_archived_20220904.json → ...l/booster_coverage_archived_20220904.json
diff --git a/..._shot_administered_archived_20220904.json → ..._shot_administered_archived_20220904.json b/..._shot_administered_archived_20220904.json → ..._shot_administered_archived_20220904.json
diff --git a/...a/nl/deceased_rivm_archived_20221231.json → ...d_nl/deceased_rivm_archived_20221231.json b/...a/nl/deceased_rivm_archived_20221231.json → ...d_nl/deceased_rivm_archived_20221231.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "nl_deceased_rivm_archived_20221231",
+  "title": "nl_deceased_rivm",
   "type": "object",
   "properties": {
     "values": {

diff --git a/...rivm_per_age_group_archived_20221231.json → ...rivm_per_age_group_archived_20221231.json b/...rivm_per_age_group_archived_20221231.json → ...rivm_per_age_group_archived_20221231.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "nl_deceased_rivm_per_age_group_archived_20221231",
+  "title": "nl_deceased_rivm_per_age_group",
   "type": "object",
   "required": ["values"],
   "additionalProperties": false,

diff --git a/...nl/disability_care_archived_20230126.json → ...nl/disability_care_archived_20230126.json b/...nl/disability_care_archived_20230126.json → ...nl/disability_care_archived_20230126.json
diff --git a/...nl/elderly_at_home_archived_20230126.json → ...nl/elderly_at_home_archived_20230126.json b/...nl/elderly_at_home_archived_20230126.json → ...nl/elderly_at_home_archived_20230126.json
diff --git a/.../vaccine_campaigns_archived_20220908.json → .../vaccine_campaigns_archived_20220908.json b/.../vaccine_campaigns_archived_20220908.json → .../vaccine_campaigns_archived_20220908.json
diff --git a/...cine_coverage_per_age_group_archived.json → ...rage_per_age_group_archived_20220622.json b/...cine_coverage_per_age_group_archived.json → ...rage_per_age_group_archived_20220622.json
diff --git a/...rage_per_age_group_archived_20220908.json → ...rage_per_age_group_archived_20220908.json b/...rage_per_age_group_archived_20220908.json → ...rage_per_age_group_archived_20220908.json
diff --git a/...ge_group_estimated_archived_20220908.json → ...ge_group_estimated_archived_20220908.json b/...ge_group_estimated_archived_20220908.json → ...ge_group_estimated_archived_20220908.json
diff --git a/...nl/vaccine_planned_archived_20220908.json → ...nl/vaccine_planned_archived_20220908.json b/...nl/vaccine_planned_archived_20220908.json → ...nl/vaccine_planned_archived_20220908.json
diff --git a/packages/app/schema/gm/__difference.json b/packages/app/schema/gm/__difference.json
@@ -14,17 +14,9 @@
     },
     "sewer__average": {
       "$ref": "#/definitions/diff_integer"
-    },
-    "deceased_rivm__covid_daily_archived_20221231": {
-      "$ref": "#/definitions/diff_integer"
     }
   },
-  "required": [
-    "tested_overall__infected_per_100k_moving_average",
-    "tested_overall__infected_moving_average",
-    "hospital_nice__admissions_on_date_of_reporting_moving_average",
-    "deceased_rivm__covid_daily_archived_20221231"
-  ],
+  "required": ["tested_overall__infected_per_100k_moving_average", "tested_overall__infected_moving_average", "hospital_nice__admissions_on_date_of_reporting_moving_average"],
   "additionalProperties": false,
   "definitions": {
     "diff_integer": {

diff --git a/packages/app/schema/gm/__index.json b/packages/app/schema/gm/__index.json
@@ -9,16 +9,12 @@
     "code",
     "difference",
     "static_values",
-    "booster_coverage_archived_20220904",
-    "deceased_rivm_archived_20221231",
     "hospital_nice",
     "sewer_installation_measurement",
     "sewer_per_installation",
     "sewer",
     "tested_overall",
     "vaccine_coverage_per_age_group",
-    "vaccine_coverage_per_age_group_archived",
-    "vaccine_coverage_per_age_group_archived_20220908",
     "last_generated"
   ],
   "properties": {
@@ -37,9 +33,6 @@
     "static_values": {
       "$ref": "__static_values.json"
     },
-    "deceased_rivm_archived_20221231": {
-      "$ref": "deceased_rivm_archived_20221231.json"
-    },
     "difference": {
       "$ref": "__difference.json"
     },
@@ -60,15 +53,6 @@
     },
     "vaccine_coverage_per_age_group": {
       "$ref": "vaccine_coverage_per_age_group.json"
-    },
-    "vaccine_coverage_per_age_group_archived": {
-      "$ref": "vaccine_coverage_per_age_group_archived.json"
-    },
-    "vaccine_coverage_per_age_group_archived_20220908": {
-      "$ref": "vaccine_coverage_per_age_group_archived_20220908.json"
-    },
-    "booster_coverage_archived_20220904": {
-      "$ref": "booster_coverage_archived_20220904.json"
     }
   },
   "$defs": {

diff --git a/packages/app/schema/nl/__difference.json b/packages/app/schema/nl/__difference.json
@@ -38,9 +38,6 @@
     },
     "vulnerable_hospital_admissions": {
       "$ref": "#/definitions/diff_integer"
-    },
-    "deceased_rivm__covid_daily_archived_20221231": {
-      "$ref": "#/definitions/diff_integer"
     }
   },
   "required": [
@@ -53,8 +50,7 @@
     "infectious_people__estimate",
     "intensive_care_nice__admissions_on_date_of_reporting_moving_average",
     "intensive_care_lcps__beds_occupied_covid",
-    "sewer__average",
-    "deceased_rivm__covid_daily_archived_20221231"
+    "sewer__average"
   ],
   "additionalProperties": false,
   "definitions": {

diff --git a/packages/app/schema/nl/__index.json b/packages/app/schema/nl/__index.json
@@ -3,19 +3,13 @@
   "type": "object",
   "title": "nl",
   "required": [
-    "booster_shot_administered_archived_20220904",
     "repeating_shot_administered",
-    "booster_coverage_archived_20220904",
     "code",
     "corona_melder_app_download",
     "corona_melder_app_warning",
     "deceased_cbs",
-    "deceased_rivm_archived_20221231",
-    "deceased_rivm_per_age_group_archived_20221231",
     "difference",
     "named_difference",
-    "disability_care_archived_20230126",
-    "elderly_at_home_archived_20230126",
     "g_number",
     "hospital_lcps",
     "hospital_nice",
@@ -33,8 +27,6 @@
     "tested_overall",
     "tested_per_age_group",
     "vaccine_campaigns",
-    "vaccine_campaigns_archived_20220908",
-    "vaccine_planned_archived_20220908",
     "vaccine_vaccinated_or_support",
     "vaccine_administered",
     "vaccine_administered_doctors",
@@ -47,9 +39,6 @@
     "vaccine_stock",
     "vaccine_delivery_per_supplier",
     "vaccine_coverage_per_age_group",
-    "vaccine_coverage_per_age_group_archived",
-    "vaccine_coverage_per_age_group_archived_20220908",
-    "vaccine_coverage_per_age_group_estimated_archived_20220908",
     "vaccine_coverage_per_age_group_estimated_autumn_2022",
     "vaccine_coverage_per_age_group_estimated_fully_vaccinated"
   ],
@@ -73,15 +62,9 @@
     "named_difference": {
       "$ref": "__named_difference.json"
     },
-    "booster_shot_administered_archived_20220904": {
-      "$ref": "booster_shot_administered_archived_20220904.json"
-    },
     "repeating_shot_administered": {
       "$ref": "repeating_shot_administered.json"
     },
-    "booster_coverage_archived_20220904": {
-      "$ref": "booster_coverage_archived_20220904.json"
-    },
     "g_number": {
       "$ref": "g_number.json"
     },
@@ -118,21 +101,9 @@
     "tested_ggd": {
       "$ref": "tested_ggd.json"
     },
-    "disability_care_archived_20230126": {
-      "$ref": "disability_care_archived_20230126.json"
-    },
-    "deceased_rivm_archived_20221231": {
-      "$ref": "deceased_rivm_archived_20221231.json"
-    },
-    "deceased_rivm_per_age_group_archived_20221231": {
-      "$ref": "deceased_rivm_per_age_group_archived_20221231.json"
-    },
     "deceased_cbs": {
       "$ref": "deceased_cbs.json"
     },
-    "elderly_at_home_archived_20230126": {
-      "$ref": "elderly_at_home_archived_20230126.json"
-    },
     "vaccine_vaccinated_or_support": {
       "$ref": "vaccine_vaccinated_or_support.json"
     },
@@ -175,29 +146,14 @@
     "vaccine_campaigns": {
       "$ref": "vaccine_campaigns.json"
     },
-    "vaccine_campaigns_archived_20220908": {
-      "$ref": "vaccine_campaigns_archived_20220908.json"
-    },
-    "vaccine_planned_archived_20220908": {
-      "$ref": "vaccine_planned_archived_20220908.json"
-    },
     "vaccine_coverage_per_age_group": {
       "$ref": "vaccine_coverage_per_age_group.json"
     },
-    "vaccine_coverage_per_age_group_archived": {
-      "$ref": "vaccine_coverage_per_age_group_archived.json"
-    },
-    "vaccine_coverage_per_age_group_archived_20220908": {
-      "$ref": "vaccine_coverage_per_age_group_archived_20220908.json"
-    },
-    "vaccine_coverage_per_age_group_estimated_fully_vaccinated": {
-      "$ref": "vaccine_coverage_per_age_group_estimated_fully_vaccinated.json"
-    },
     "vaccine_coverage_per_age_group_estimated_autumn_2022": {
       "$ref": "vaccine_coverage_per_age_group_estimated_autumn_2022.json"
     },
-    "vaccine_coverage_per_age_group_estimated_archived_20220908": {
-      "$ref": "vaccine_coverage_per_age_group_estimated_archived_20220908.json"
+    "vaccine_coverage_per_age_group_estimated_fully_vaccinated": {
+      "$ref": "vaccine_coverage_per_age_group_estimated_fully_vaccinated.json"
     },
     "vaccine_stock": {
       "$ref": "vaccine_stock.json"