feat(COR-1664): Removed unused keys

packages/app/schema/nl/__difference.json

@@ -33,9 +33,6 @@
     "sewer__average": {
       "$ref": "#/definitions/diff_integer"
     },
-    "vulnerable_tested_per_age_group": {
-      "$ref": "#/definitions/diff_integer"
-    },
     "reproduction__index_average": {
       "$ref": "#/definitions/diff_decimal"
     },
@@ -57,7 +54,6 @@
     "intensive_care_nice__admissions_on_date_of_reporting_moving_average",
     "intensive_care_lcps__beds_occupied_covid",
     "sewer__average",
-    "vulnerable_tested_per_age_group",
     "deceased_rivm__covid_daily_archived_20221231"
   ],
   "additionalProperties": false,

packages/app/schema/nl/__index.json

@@ -26,19 +26,16 @@
     "intensive_care_nice_per_age_group",
     "last_generated",
     "name",
-    "vulnerable_tested_per_age_group",
     "proto_name",
     "self_test_overall",
     "sewer",
     "tested_ggd",
-    "tested_ggd_archived",
     "tested_overall",
     "tested_per_age_group",
     "vaccine_campaigns",
     "vaccine_campaigns_archived_20220908",
     "vaccine_planned_archived_20220908",
     "vaccine_vaccinated_or_support",
-    "vaccine_delivery_estimate",
     "vaccine_administered",
     "vaccine_administered_doctors",
     "vaccine_administered_ggd_ghor",
@@ -121,12 +118,6 @@
     "tested_ggd": {
       "$ref": "tested_ggd.json"
     },
-    "tested_ggd_archived": {
-      "$ref": "tested_ggd_archived.json"
-    },
-    "vulnerable_tested_per_age_group": {
-      "$ref": "vulnerable_tested_per_age_group.json"
-    },
     "disability_care_archived_20230126": {
       "$ref": "disability_care_archived_20230126.json"
     },
@@ -154,9 +145,6 @@
     "vaccine_coverage": {
       "$ref": "vaccine_coverage.json"
     },
-    "vaccine_delivery_estimate": {
-      "$ref": "vaccine_delivery_estimate.json"
-    },
     "vaccine_delivery_per_supplier": {
       "$ref": "vaccine_delivery_per_supplier.json"
     },

packages/cms/src/studio/constants.ts

@@ -33,7 +33,6 @@ export const titleByMetricName: Partial<Record<MetricName, string>> = {
   sewer_per_installation: 'Virusdeeltjes in rioolwater',
   sewer: 'Rioolwater metingen',
   static_values: 'Statische waarden',
-  tested_ggd_archived: "Positief geteste mensen (GGD'en) (archief)",
   tested_ggd: "Positief geteste mensen (GGD'en)",
   tested_overall: 'Positief geteste mensen',
   tested_per_age_group: 'Positief getest (per leeftijd)',
@@ -53,15 +52,13 @@ export const titleByMetricName: Partial<Record<MetricName, string>> = {
   vaccine_coverage_per_age_group_estimated_fully_vaccinated: 'Vaccinatiegraad basisserie berekend (per leeftijd)',
   vaccine_coverage_per_age_group: 'Vaccinatiegraad (per leeftijd)',
   vaccine_coverage: 'Vaccinatiegraad',
-  vaccine_delivery_estimate: 'Vaccinleveringen berekend',
   vaccine_delivery_per_supplier: 'Vaccinleveringen per leverancier',
   vaccine_planned_archived_20220908: 'Geplande prikken (archief per 09-08-2022)',
   vaccine_stock: 'Vaccinvoorraad',
   vaccine_vaccinated_or_support: 'Vaccinatiebereidheid of reeds gevaccineerd',
   variants: 'Varianten van het virus',
   vulnerable_hospital_admissions_archived_20230711: 'Kwetsbare groepen - Ziekenhuisopnames',
   vulnerable_nursing_home_archived_20230711: 'Kwetsbare groepen - Verpleeg- en verzorgingshuizen',
-  vulnerable_tested_per_age_group: 'Kwetsbare groepen - Positieve testen (per leeftijd)',
 };
 
 // By mapping the element type to a title we can make the UI a little more user-friendly.

packages/cms/src/studio/data/data-structure.ts

@@ -208,7 +208,6 @@ export const dataStructure = {
       'tested_total_moving_average',
       'tested_total_moving_average_rounded',
     ],
-    tested_ggd_archived: ['infected_percentage', 'infected_percentage_moving_average'],
     disability_care_archived_20230126: [
       'newly_infected_people',
       'newly_infected_people_moving_average',
@@ -232,7 +231,6 @@ export const dataStructure = {
     corona_melder_app_download: ['count'],
     corona_melder_app_warning: ['count'],
     vaccine_coverage: ['booster_vaccinated', 'partially_vaccinated', 'fully_vaccinated', 'partially_or_fully_vaccinated'],
-    vaccine_delivery_estimate: ['total'],
     vaccine_delivery_per_supplier: ['total', 'bio_n_tech_pfizer', 'moderna', 'astra_zeneca', 'cure_vac', 'janssen', 'sanofi', 'is_estimate', 'week_number', 'date_of_report_unix'],
     vaccine_administered: ['pfizer', 'moderna', 'astra_zeneca', 'cure_vac', 'janssen', 'sanofi', 'novavax', 'total'],
     vaccine_administered_doctors: ['estimated'],

packages/common/src/types/data.ts

@@ -510,8 +510,6 @@ export interface Nl {
   hospital_lcps: NlHospitalLcps;
   intensive_care_lcps: NlIntensiveCareLcps;
   tested_ggd: NlTestedGgd;
-  tested_ggd_archived: NlTestedGgdArchived;
-  vulnerable_tested_per_age_group: NlVulnerableTestedPerAgeGroup;
   disability_care_archived_20230126: NlDisabilityCareArchived_20230126;
   deceased_rivm_archived_20221231: NlDeceasedRivmArchived_20221231;
   deceased_rivm_per_age_group_archived_20221231: NlDeceasedRivmPerAgeGroupArchived_20221231;
@@ -521,7 +519,6 @@ export interface Nl {
   corona_melder_app_download: NlCoronaMelderAppDownload;
   corona_melder_app_warning: NlCoronaMelderAppWarning;
   vaccine_coverage?: NlVaccineCoverage;
-  vaccine_delivery_estimate: NlVaccineDeliveryEstimate;
   vaccine_delivery_per_supplier: NlVaccineDeliveryPerSupplier;
   vaccine_administered: NlVaccineAdministered;
   vaccine_administered_doctors: NlVaccineAdministeredDoctors;
@@ -555,7 +552,6 @@ export interface NlDifference {
   intensive_care_nice__admissions_on_date_of_reporting_moving_average: DifferenceDecimal;
   intensive_care_lcps__beds_occupied_covid: DifferenceInteger;
   sewer__average: DifferenceInteger;
-  vulnerable_tested_per_age_group: DifferenceInteger;
   reproduction__index_average?: DifferenceDecimal;
   vulnerable_hospital_admissions?: DifferenceInteger;
   deceased_rivm__covid_daily_archived_20221231: DifferenceInteger;
@@ -772,21 +768,6 @@ export interface NlTestedGgdValue {
   date_unix: number;
   date_of_insertion_unix: number;
 }
-export interface NlTestedGgdArchived {
-  values: NlTestedGgdArchivedValue[];
-  last_value: NlTestedGgdArchivedValue;
-}
-export interface NlTestedGgdArchivedValue {
-  infected_percentage: number;
-  infected_percentage_moving_average: number | null;
-  date_unix: number;
-  date_of_insertion_unix: number;
-}
-export interface NlVulnerableTestedPerAgeGroup {
-  infected_age_70_plus: number;
-  date_unix: number;
-  date_of_insertion_unix: number;
-}
 export interface NlDisabilityCareArchived_20230126 {
   values: NlDisabilityCareArchived_20230126Value[];
   last_value: NlDisabilityCareArchived_20230126Value;
@@ -896,16 +877,6 @@ export interface NlVaccineCoverageValue {
   date_unix: number;
   date_of_insertion_unix: number;
 }
-export interface NlVaccineDeliveryEstimate {
-  values: NlVaccineDeliveryEstimateValue[];
-  last_value: NlVaccineDeliveryEstimateValue;
-}
-export interface NlVaccineDeliveryEstimateValue {
-  total: number;
-  date_of_insertion_unix: number;
-  date_start_unix: number;
-  date_end_unix: number;
-}
 export interface NlVaccineDeliveryPerSupplier {
   values: NlVaccineDeliveryPerSupplierValue[];
   last_value: NlVaccineDeliveryPerSupplierValue;