Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Feature/cor 1228 json changes #4512

Merged
merged 7 commits into from
Nov 24, 2022
6 changes: 3 additions & 3 deletions packages/app/schema/gm/__index.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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": {
Expand Down
6 changes: 5 additions & 1 deletion packages/app/schema/gm/sewer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -34,6 +35,9 @@
},
"date_of_insertion_unix": {
"type": "integer"
},
"data_is_outdated": {
"type": "boolean"
}
}
}
Expand Down
55 changes: 32 additions & 23 deletions packages/app/schema/gm/vaccine_coverage_per_age_group.json
Original file line number Diff line number Diff line change
Expand Up @@ -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})$"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/app/schema/gm_collection/__index.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
6 changes: 5 additions & 1 deletion packages/app/schema/gm_collection/sewer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"gmcode",
"average",
"total_installation_count",
"date_of_insertion_unix"
"date_of_insertion_unix",
"data_is_outdated"
],
"properties": {
"date_start_unix": {
Expand All @@ -30,6 +31,9 @@
},
"date_of_insertion_unix": {
"type": "integer"
},
"data_is_outdated": {
"type": "boolean"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
Expand All @@ -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})$"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/app/schema/nl/__index.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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": {
Expand Down
8 changes: 0 additions & 8 deletions packages/app/schema/nl/vaccine_coverage_per_age_group.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/app/schema/vr/__index.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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": {
Expand Down
5 changes: 4 additions & 1 deletion packages/app/schema/vr/sewer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -14,6 +14,9 @@
},
"date_of_insertion_unix": {
"type": "integer"
},
"data_is_outdated": {
"type": "boolean"
}
}
}
Expand Down
Loading