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

Commit

Permalink
Merge pull request #4799 from minvws/release/2.77.0
Browse files Browse the repository at this point in the history
Release/2.77.0
  • Loading branch information
Jorrik-Klijnsma-Work authored Jun 27, 2023
2 parents 5ed5698 + b5c6bce commit c86e6f5
Show file tree
Hide file tree
Showing 20 changed files with 382 additions and 52 deletions.
36 changes: 36 additions & 0 deletions packages/app/schema/archived_gm/__index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"title": "archived_gm",
"additionalProperties": false,
"required": [
"last_generated",
"proto_name",
"name",
"code",
"sewer_archived_20230623"
],
"properties": {
"last_generated": {
"type": "string"
},
"proto_name": {
"$ref": "#/$defs/archived_gm_code"
},
"name": {
"$ref": "#/$defs/archived_gm_code"
},
"code": {
"$ref": "#/$defs/archived_gm_code"
},
"sewer_archived_20230623": {
"$ref": "sewer.json"
}
},
"$defs": {
"archived_gm_code": {
"type": "string",
"pattern": "^GM[0-9]+$"
}
}
}
61 changes: 61 additions & 0 deletions packages/app/schema/archived_gm/sewer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"definitions": {
"value": {
"title": "gm_sewer_value",
"type": "object",
"additionalProperties": false,
"required": [
"date_start_unix",
"date_end_unix",
"average",
"total_number_of_samples",
"sampled_installation_count",
"total_installation_count",
"date_of_insertion_unix",
"data_is_outdated"
],
"properties": {
"date_start_unix": {
"type": "integer"
},
"date_end_unix": {
"type": "integer"
},
"average": {
"type": "integer"
},
"total_number_of_samples": {
"type": "integer"
},
"sampled_installation_count": {
"type": "integer"
},
"total_installation_count": {
"type": "integer"
},
"date_of_insertion_unix": {
"type": "integer"
},
"data_is_outdated": {
"type": "boolean"
}
}
}
},
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "gm_sewer",
"type": "object",
"required": ["values", "last_value"],
"additionalProperties": false,
"properties": {
"values": {
"type": "array",
"items": {
"$ref": "#/definitions/value"
}
},
"last_value": {
"$ref": "#/definitions/value"
}
}
}
41 changes: 41 additions & 0 deletions packages/app/schema/archived_gm_collection/__index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"title": "archived_gm_collection",
"additionalProperties": false,
"required": [
"last_generated",
"proto_name",
"name",
"code",
"sewer_archived_20230623"
],
"properties": {
"last_generated": {
"type": "string"
},
"proto_name": {
"$ref": "#/$defs/archived_gm_collection_id"
},
"name": {
"$ref": "#/$defs/archived_gm_collection_id"
},
"code": {
"$ref": "#/$defs/archived_gm_collection_id"
},
"sewer_archived_20230623": {
"type": "array",
"minItems": 342,
"maxItems": 342,
"items": {
"$ref": "sewer.json"
}
}
},
"$defs": {
"archived_gm_collection_id": {
"type": "string",
"enum": ["GM_COLLECTION"]
}
}
}
39 changes: 39 additions & 0 deletions packages/app/schema/archived_gm_collection/sewer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "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"
],
"properties": {
"date_start_unix": {
"type": "integer"
},
"date_end_unix": {
"type": "integer"
},
"gmcode": {
"type": "string",
"pattern": "^GM[0-9]+$"
},
"average": {
"type": "integer"
},
"total_installation_count": {
"type": "number"
},
"date_of_insertion_unix": {
"type": "integer"
},
"data_is_outdated": {
"type": "boolean"
}
}
}
12 changes: 8 additions & 4 deletions packages/app/schema/archived_nl/__index.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
"type": "object",
"title": "archived_nl",
"required": [
"last_generated",
"proto_name",
"name",
"code",
"behavior_archived_20230411",
"behavior_annotations_archived_20230412",
"behavior_per_age_group_archived_20230411",
"code",
"doctor_archived_20210903",
"last_generated",
"name",
"proto_name"
"sewer_archived_20230623"
],
"additionalProperties": false,
"properties": {
Expand All @@ -37,6 +38,9 @@
},
"doctor_archived_20210903": {
"$ref": "doctor.json"
},
"sewer_archived_20230623": {
"$ref": "sewer.json"
}
},
"$defs": {
Expand Down
37 changes: 37 additions & 0 deletions packages/app/schema/archived_nl/sewer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"definitions": {
"value": {
"title": "nl_sewer_value",
"type": "object",
"required": ["average", "date_of_insertion_unix", "date_unix"],
"additionalProperties": false,
"properties": {
"average": {
"type": ["integer", "null"]
},
"date_of_insertion_unix": {
"type": "integer"
},
"date_unix": {
"type": "integer"
}
}
}
},
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "nl_sewer",
"type": "object",
"required": ["values", "last_value"],
"additionalProperties": false,
"properties": {
"values": {
"type": "array",
"items": {
"$ref": "#/definitions/value"
}
},
"last_value": {
"$ref": "#/definitions/value"
}
}
}
17 changes: 11 additions & 6 deletions packages/app/schema/gm/__index.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,22 @@
"title": "gm",
"additionalProperties": false,
"required": [
"last_generated",
"proto_name",
"name",
"proto_name",
"code",
"tested_overall",
"hospital_nice",
"deceased_rivm_archived_20221231",
"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",
"booster_coverage_archived_20220904"
"last_generated"
],
"properties": {
"last_generated": {
Expand Down Expand Up @@ -53,6 +55,9 @@
"sewer_per_installation": {
"$ref": "sewer_per_installation.json"
},
"sewer_installation_measurement": {
"$ref": "sewer_installation_measurement.json"
},
"vaccine_coverage_per_age_group": {
"$ref": "vaccine_coverage_per_age_group.json"
},
Expand Down
5 changes: 4 additions & 1 deletion packages/app/schema/gm/__static_values.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
"properties": {
"population_count": {
"type": "integer"
},
"population_count_connected_to_rwzis": {
"type": "integer"
}
},
"required": ["population_count"],
"required": ["population_count", "population_count_connected_to_rwzis"],
"additionalProperties": false
}
12 changes: 0 additions & 12 deletions packages/app/schema/gm/sewer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
"date_start_unix",
"date_end_unix",
"average",
"total_number_of_samples",
"sampled_installation_count",
"total_installation_count",
"date_of_insertion_unix",
"data_is_outdated"
],
Expand All @@ -24,15 +21,6 @@
"average": {
"type": "integer"
},
"total_number_of_samples": {
"type": "integer"
},
"sampled_installation_count": {
"type": "integer"
},
"total_installation_count": {
"type": "integer"
},
"date_of_insertion_unix": {
"type": "integer"
},
Expand Down
33 changes: 33 additions & 0 deletions packages/app/schema/gm/sewer_installation_measurement.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "gm_sewer_installation_measurement",
"type": "object",
"required": [
"date_start_unix",
"date_end_unix",
"total_number_of_samples",
"sampled_installation_count",
"total_installation_count",
"date_of_insertion_unix"],
"additionalProperties": false,
"properties": {
"date_start_unix": {
"type": "integer"
},
"date_end_unix": {
"type": "integer"
},
"total_number_of_samples": {
"type": "integer"
},
"sampled_installation_count": {
"type": "integer"
},
"total_installation_count": {
"type": "integer"
},
"date_of_insertion_unix": {
"type": "integer"
}
}
}
4 changes: 0 additions & 4 deletions packages/app/schema/gm_collection/sewer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"date_end_unix",
"gmcode",
"average",
"total_installation_count",
"date_of_insertion_unix",
"data_is_outdated"
],
Expand All @@ -26,9 +25,6 @@
"average": {
"type": "integer"
},
"total_installation_count": {
"type": "number"
},
"date_of_insertion_unix": {
"type": "integer"
},
Expand Down
Loading

0 comments on commit c86e6f5

Please sign in to comment.