Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: more granular Applicant, Proposal & Property types #40

Merged
merged 12 commits into from
Sep 29, 2023
Merged

fix: more granular Applicant, Proposal & Property types #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c990a82
more granular projectTypes
jessicamcinchak Sep 25, 2023
c8a3c77
more granular projectTypes
jessicamcinchak Sep 25, 2023
7c80095
add applicant.interest too
jessicamcinchak Sep 27, 2023
f909595
lots of tweaks
jessicamcinchak Sep 28, 2023
993e66f
more tweaks based on passport mapping
jessicamcinchak Sep 28, 2023
1fd0757
siteContact required across all app types
jessicamcinchak Sep 28, 2023
6556e35
lots of type updates
jessicamcinchak Sep 29, 2023
6a89a87
ensure @id matches type exactly
jessicamcinchak Sep 29, 2023
db68901
tidy ups
jessicamcinchak Sep 29, 2023
5bfde47
realish geojson type
jessicamcinchak Sep 29, 2023
099836b
add shared Area and VehicleParkingCount types
jessicamcinchak Sep 29, 2023
45ce5dd
clean up utils
jessicamcinchak Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion examples/data/Applicant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,27 @@ export const validApplicant: Schema['data']['applicant'] = {
siteContact: {
role: 'applicant',
},
interest: 'owner.co',
ownership: {
certificate: 'a',
owners: [
{
name: 'Owner 1',
address: {
line1: '123 Main Street',
town: 'Anywhere',
postcode: 'SE5 0HU',
},
noticeGiven: true,
noticeDate: '2023-10-01',
},
{
name: 'Owner 2',
address: 'Same as Owner 1',
noticeGiven: false,
},
],
},
};

export const validAgent: Schema['data']['applicant'] = {
Expand Down Expand Up @@ -53,7 +74,6 @@ export const validAgent: Schema['data']['applicant'] = {
},
},
address: {
sameAsSiteAddress: false,
line1: '456 Test',
town: 'Test',
postcode: 'TES T34',
Expand Down
35 changes: 29 additions & 6 deletions examples/data/Property.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,33 @@ export const validProperty: Schema['data']['property'] = {
x: 533683,
y: 178083,
title: '47, COBOURG ROAD, LONDON',
region: 'London',
localAuthorityDistrict: ['Southwark'],
source: 'Ordnance Survey',
},
region: 'London',
localAuthorityDistrict: ['Southwark'],
type: {
value: 'residential.HMO.parent',
description: 'HMO Parent',
},
boundary: {
site: 'GeoJSON TBD',
site: {
type: 'Feature',
geometry: {
type: 'Polygon',
coordinates: [
[
[-0.1186569035053321, 51.465703531871384],
[-0.1185938715934822, 51.465724418998775],
[-0.1184195280075143, 51.46552473766957],
[-0.11848390102387167, 51.4655038504508],
[-0.1186569035053321, 51.465703531871384],
],
],
},
properties: null,
},
area: {
squareMeters: 10000,
squareMetres: 10000,
hectares: 1,
},
},
Expand All @@ -33,13 +48,21 @@ export const validProperty: Schema['data']['property'] = {
{
value: 'listed',
description: 'Listed Building',
intersects: false,
overlaps: false,
},
{
value: 'designated.conservationArea',
description: 'Conservation Area',
intersects: true,
overlaps: true,
entities: ['Cobourg Road Nature Preserve'],
},
],
},
titleNumber: {
known: 'Yes',
number: '123',
},
EPC: {
known: 'The property does not have one',
},
};
22 changes: 22 additions & 0 deletions examples/data/Proposal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,26 @@ export const validProposal: Schema['data']['proposal'] = {
},
],
description: 'This is a test application',
boundary: {
site: {
type: 'Feature',
geometry: {
type: 'Polygon',
coordinates: [
[
[-0.1186569035053321, 51.465703531871384],
[-0.1185938715934822, 51.465724418998775],
[-0.1184195280075143, 51.46552473766957],
[-0.11848390102387167, 51.4655038504508],
[-0.1186569035053321, 51.465703531871384],
],
],
},
properties: null,
},
area: {
squareMetres: 10000,
hectares: 1,
},
},
};
96 changes: 86 additions & 10 deletions examples/validExampleAgent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
}
},
"address": {
"sameAsSiteAddress": false,
"line1": "456 Test",
"town": "Test",
"postcode": "TES T34"
Expand Down Expand Up @@ -88,20 +87,50 @@
"x": 533683,
"y": 178083,
"title": "47, COBOURG ROAD, LONDON",
"region": "London",
"localAuthorityDistrict": [
"Southwark"
],
"source": "Ordnance Survey"
},
"region": "London",
"localAuthorityDistrict": [
"Southwark"
],
"type": {
"value": "residential.HMO.parent",
"description": "HMO Parent"
},
"boundary": {
"site": "GeoJSON TBD",
"site": {
"type": "Feature",
"geometry": {
"type": "Polygon",
"coordinates": [
[
[
-0.1186569035053321,
51.465703531871384
],
[
-0.1185938715934822,
51.465724418998775
],
[
-0.1184195280075143,
51.46552473766957
],
[
-0.11848390102387167,
51.4655038504508
],
[
-0.1186569035053321,
51.465703531871384
]
]
]
},
"properties": null
},
"area": {
"squareMeters": 10000,
"squareMetres": 10000,
"hectares": 1
}
},
Expand All @@ -110,14 +139,24 @@
{
"value": "listed",
"description": "Listed Building",
"intersects": false
"overlaps": false
},
{
"value": "designated.conservationArea",
"description": "Conservation Area",
"intersects": true
"overlaps": true,
"entities": [
"Cobourg Road Nature Preserve"
]
}
]
},
"titleNumber": {
"known": "Yes",
"number": "123"
},
"EPC": {
"known": "The property does not have one"
}
},
"proposal": {
Expand All @@ -131,7 +170,44 @@
"description": "Leisure premises"
}
],
"description": "This is a test application"
"description": "This is a test application",
"boundary": {
"site": {
"type": "Feature",
"geometry": {
"type": "Polygon",
"coordinates": [
[
[
-0.1186569035053321,
51.465703531871384
],
[
-0.1185938715934822,
51.465724418998775
],
[
-0.1184195280075143,
51.46552473766957
],
[
-0.11848390102387167,
51.4655038504508
],
[
-0.1186569035053321,
51.465703531871384
]
]
]
},
"properties": null
},
"area": {
"squareMetres": 10000,
"hectares": 1
}
}
}
},
"result": [
Expand Down
Loading