-
Notifications
You must be signed in to change notification settings - Fork 105
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #384 from OliverCullimore/164-316-362-363
Add support for multiple councils using similar systems
- Loading branch information
Showing
14 changed files
with
737 additions
and
0 deletions.
There are no files selected for viewing
39 changes: 39 additions & 0 deletions
39
uk_bin_collection/tests/council_schemas/EastLindseyDistrictCouncil.schema
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-06/schema#", | ||
| "$ref": "#/definitions/Welcome3", | ||
| "definitions": { | ||
| "Welcome3": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "bins": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/Bin" | ||
| } | ||
| } | ||
| }, | ||
| "required": [ | ||
| "bins" | ||
| ], | ||
| "title": "Welcome3" | ||
| }, | ||
| "Bin": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "type": { | ||
| "type": "string" | ||
| }, | ||
| "collectionDate": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "collectionDate", | ||
| "type" | ||
| ], | ||
| "title": "Bin" | ||
| } | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
uk_bin_collection/tests/council_schemas/GatesheadCouncil.schema
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-06/schema#", | ||
| "$ref": "#/definitions/Welcome10", | ||
| "definitions": { | ||
| "Welcome10": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "bins": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/Bin" | ||
| } | ||
| } | ||
| }, | ||
| "required": [ | ||
| "bins" | ||
| ], | ||
| "title": "Welcome10" | ||
| }, | ||
| "Bin": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "type": { | ||
| "$ref": "#/definitions/Type" | ||
| }, | ||
| "collectionDate": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "collectionDate", | ||
| "type" | ||
| ], | ||
| "title": "Bin" | ||
| }, | ||
| "Type": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "Recycling", | ||
| "Household Waste" | ||
| ], | ||
| "title": "Type" | ||
| } | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
uk_bin_collection/tests/council_schemas/StaffordshireMoorlandsDistrictCouncil.schema
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-06/schema#", | ||
| "$ref": "#/definitions/Welcome4", | ||
| "definitions": { | ||
| "Welcome4": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "bins": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/Bin" | ||
| } | ||
| } | ||
| }, | ||
| "required": [ | ||
| "bins" | ||
| ], | ||
| "title": "Welcome4" | ||
| }, | ||
| "Bin": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "type": { | ||
| "$ref": "#/definitions/Type" | ||
| }, | ||
| "collectionDate": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "collectionDate", | ||
| "type" | ||
| ], | ||
| "title": "Bin" | ||
| }, | ||
| "Type": { | ||
| "type": "string", | ||
| "enum": [ | ||
| "Recycling with food and garden", | ||
| "Rubbish", | ||
| "Recycling" | ||
| ], | ||
| "title": "Type" | ||
| } | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
uk_bin_collection/tests/council_schemas/WestLothianCouncil.schema
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-06/schema#", | ||
| "$ref": "#/definitions/Welcome7", | ||
| "definitions": { | ||
| "Welcome7": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "bins": { | ||
| "type": "array", | ||
| "items": { | ||
| "$ref": "#/definitions/Bin" | ||
| } | ||
| } | ||
| }, | ||
| "required": [ | ||
| "bins" | ||
| ], | ||
| "title": "Welcome7" | ||
| }, | ||
| "Bin": { | ||
| "type": "object", | ||
| "additionalProperties": false, | ||
| "properties": { | ||
| "type": { | ||
| "type": "string" | ||
| }, | ||
| "collectionDate": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "collectionDate", | ||
| "type" | ||
| ], | ||
| "title": "Bin" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
uk_bin_collection/tests/outputs/EastLindseyDistrictCouncil.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "bins": [ | ||
| { | ||
| "type": "Paper (Purple-Lidded Bin)", | ||
| "collectionDate": "27/10/2023" | ||
| }, | ||
| { | ||
| "type": "Domestic Waste (Black Bin)", | ||
| "collectionDate": "03/11/2023" | ||
| }, | ||
| { | ||
| "type": "Recycling (Grey Bin)", | ||
| "collectionDate": "10/11/2023" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| { | ||
| "bins": [ | ||
| { | ||
| "type": "Recycling", | ||
| "collectionDate": "02/01/2023" | ||
| }, | ||
| { | ||
| "type": "Household Waste", | ||
| "collectionDate": "09/01/2023" | ||
| }, | ||
| { | ||
| "type": "Recycling", | ||
| "collectionDate": "16/01/2023" | ||
| }, | ||
| { | ||
| "type": "Household Waste", | ||
| "collectionDate": "23/01/2023" | ||
| }, | ||
| { | ||
| "type": "Recycling", | ||
| "collectionDate": "30/01/2023" | ||
| }, | ||
| { | ||
| "type": "Household Waste", | ||
| "collectionDate": "06/02/2023" | ||
| }, | ||
| { | ||
| "type": "Recycling", | ||
| "collectionDate": "24/10/2023" | ||
| }, | ||
| { | ||
| "type": "Household Waste", | ||
| "collectionDate": "31/10/2023" | ||
| }, | ||
| { | ||
| "type": "Recycling", | ||
| "collectionDate": "07/11/2023" | ||
| }, | ||
| { | ||
| "type": "Household Waste", | ||
| "collectionDate": "14/11/2023" | ||
| }, | ||
| { | ||
| "type": "Recycling", | ||
| "collectionDate": "21/11/2023" | ||
| }, | ||
| { | ||
| "type": "Household Waste", | ||
| "collectionDate": "28/11/2023" | ||
| }, | ||
| { | ||
| "type": "Recycling", | ||
| "collectionDate": "05/12/2023" | ||
| }, | ||
| { | ||
| "type": "Household Waste", | ||
| "collectionDate": "12/12/2023" | ||
| }, | ||
| { | ||
| "type": "Recycling", | ||
| "collectionDate": "19/12/2023" | ||
| }, | ||
| { | ||
| "type": "Household Waste", | ||
| "collectionDate": "27/12/2023" | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.