From 7ac10b60789cbaea45f1a3dcc17aaeb201350e2e Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Fri, 20 Oct 2023 10:29:03 +0200 Subject: [PATCH 1/2] fix missing or incorrect enum values --- examples/data/ldcE.ts | 2 +- examples/data/ldcP.ts | 4 +- examples/data/planningPermission.ts | 4 +- ...dLawfulDevelopmentCertificateExisting.json | 2 +- ...dLawfulDevelopmentCertificateProposed.json | 4 +- examples/validPlanningPermission.json | 4 +- schema/schema.json | 54 +++++++++++-------- types/enums/FileTypes.ts | 11 ++-- types/schema/data/Applicant.ts | 2 +- types/schema/data/Property.ts | 4 +- types/schema/data/Proposal.ts | 4 +- 11 files changed, 52 insertions(+), 43 deletions(-) diff --git a/examples/data/ldcE.ts b/examples/data/ldcE.ts index 707bf7db..ecfedb0c 100644 --- a/examples/data/ldcE.ts +++ b/examples/data/ldcE.ts @@ -1567,7 +1567,7 @@ export const validLDCE: Schema = { type: [ { value: 'proposal.drawing.elevation', - description: 'Elevation plan - proposed', + description: 'Elevations - proposed', }, ], }, diff --git a/examples/data/ldcP.ts b/examples/data/ldcP.ts index ec630c35..fbb9151c 100644 --- a/examples/data/ldcP.ts +++ b/examples/data/ldcP.ts @@ -1082,7 +1082,7 @@ export const validLDCP: Schema = { type: [ { value: 'property.drawing.elevation', - description: 'Elevation plan - existing', + description: 'Elevations - existing', }, ], }, @@ -1100,7 +1100,7 @@ export const validLDCP: Schema = { type: [ { value: 'proposal.drawing.elevation', - description: 'Elevation plan - proposed', + description: 'Elevations - proposed', }, ], }, diff --git a/examples/data/planningPermission.ts b/examples/data/planningPermission.ts index 5c27532b..38ac1e11 100644 --- a/examples/data/planningPermission.ts +++ b/examples/data/planningPermission.ts @@ -1673,11 +1673,11 @@ export const validPlanningPermission: Schema = { type: [ { value: 'property.drawing.elevation', - description: 'Elevation plan - existing', + description: 'Elevations - existing', }, { value: 'proposal.drawing.elevation', - description: 'Elevation plan - proposed', + description: 'Elevations - proposed', }, ], }, diff --git a/examples/validLawfulDevelopmentCertificateExisting.json b/examples/validLawfulDevelopmentCertificateExisting.json index 30691ebc..00a67b28 100644 --- a/examples/validLawfulDevelopmentCertificateExisting.json +++ b/examples/validLawfulDevelopmentCertificateExisting.json @@ -1762,7 +1762,7 @@ "type": [ { "value": "proposal.drawing.elevation", - "description": "Elevation plan - proposed" + "description": "Elevations - proposed" } ] }, diff --git a/examples/validLawfulDevelopmentCertificateProposed.json b/examples/validLawfulDevelopmentCertificateProposed.json index b00ac85f..c3c628ef 100644 --- a/examples/validLawfulDevelopmentCertificateProposed.json +++ b/examples/validLawfulDevelopmentCertificateProposed.json @@ -1144,7 +1144,7 @@ "type": [ { "value": "property.drawing.elevation", - "description": "Elevation plan - existing" + "description": "Elevations - existing" } ] }, @@ -1162,7 +1162,7 @@ "type": [ { "value": "proposal.drawing.elevation", - "description": "Elevation plan - proposed" + "description": "Elevations - proposed" } ] }, diff --git a/examples/validPlanningPermission.json b/examples/validPlanningPermission.json index 3656f8cb..eb45a541 100644 --- a/examples/validPlanningPermission.json +++ b/examples/validPlanningPermission.json @@ -1694,11 +1694,11 @@ "type": [ { "value": "property.drawing.elevation", - "description": "Elevation plan - existing" + "description": "Elevations - existing" }, { "value": "proposal.drawing.elevation", - "description": "Elevation plan - proposed" + "description": "Elevations - proposed" } ] }, diff --git a/schema/schema.json b/schema/schema.json index 2a2fbed6..554cd9e9 100644 --- a/schema/schema.json +++ b/schema/schema.json @@ -66,7 +66,8 @@ "owner.sole", "owner.co", "tenant", - "occupier" + "occupier", + "other" ], "type": "string" }, @@ -912,7 +913,8 @@ "owner.sole", "owner.co", "tenant", - "occupier" + "occupier", + "other" ], "type": "string" }, @@ -1076,7 +1078,7 @@ "additionalProperties": false, "properties": { "description": { - "const": "Elevation plan - existing", + "const": "Elevations - existing", "type": "string" }, "value": { @@ -1130,7 +1132,7 @@ "additionalProperties": false, "properties": { "description": { - "const": "Section - existing", + "const": "Sections - existing", "type": "string" }, "value": { @@ -1202,11 +1204,11 @@ "additionalProperties": false, "properties": { "description": { - "const": "Location plan", + "const": "Elevations - proposed", "type": "string" }, "value": { - "const": "property.site.locationPlan", + "const": "proposal.drawing.elevation", "type": "string" } }, @@ -1220,11 +1222,11 @@ "additionalProperties": false, "properties": { "description": { - "const": "Elevation plan - proposed", + "const": "Floor plan - proposed", "type": "string" }, "value": { - "const": "proposal.drawing.elevation", + "const": "proposal.drawing.floorPlan", "type": "string" } }, @@ -1238,11 +1240,11 @@ "additionalProperties": false, "properties": { "description": { - "const": "Floor plan - proposed", + "const": "Location plan", "type": "string" }, "value": { - "const": "proposal.drawing.floorPlan", + "const": "proposal.drawing.locationPlan", "type": "string" } }, @@ -1292,7 +1294,7 @@ "additionalProperties": false, "properties": { "description": { - "const": "Section - proposed", + "const": "Sections - proposed", "type": "string" }, "value": { @@ -1702,6 +1704,24 @@ ], "type": "object" }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Photographs - evidence", + "type": "string" + }, + "value": { + "const": "proposal.photograph.evidence", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, { "additionalProperties": false, "properties": { @@ -2411,10 +2431,6 @@ "$ref": "#/definitions/GeoJSON" } }, - "required": [ - "site", - "area" - ], "type": "object" }, "constraints": { @@ -16749,10 +16765,6 @@ "$ref": "#/definitions/GeoJSON" } }, - "required": [ - "site", - "area" - ], "type": "object" }, "date": { @@ -17572,10 +17584,6 @@ "$ref": "#/definitions/GeoJSON" } }, - "required": [ - "site", - "area" - ], "type": "object" }, "constraints": { diff --git a/types/enums/FileTypes.ts b/types/enums/FileTypes.ts index f53fc433..647a995f 100644 --- a/types/enums/FileTypes.ts +++ b/types/enums/FileTypes.ts @@ -2,19 +2,19 @@ * Values of `file.type` */ export const FileTypes = { - 'property.drawing.elevation': 'Elevation plan - existing', + 'property.drawing.elevation': 'Elevations - existing', 'property.drawing.floorPlan': 'Floor plan - existing', 'property.drawing.roofPlan': 'Roof plan - existing', - 'property.drawing.section': 'Section - existing', + 'property.drawing.section': 'Sections - existing', 'property.drawing.sitePlan': 'Site plan - existing', 'property.drawing.usePlan': 'Use plan - existing', 'property.photograph': 'Photographs', - 'property.site.locationPlan': 'Location plan', - 'proposal.drawing.elevation': 'Elevation plan - proposed', + 'proposal.drawing.elevation': 'Elevations - proposed', 'proposal.drawing.floorPlan': 'Floor plan - proposed', + 'proposal.drawing.locationPlan': 'Location plan', 'proposal.drawing.other': 'Other - drawing', 'proposal.drawing.roofPlan': 'Roof plan - proposed', - 'proposal.drawing.section': 'Section - proposed', + 'proposal.drawing.section': 'Sections - proposed', 'proposal.drawing.sitePlan': 'Site plan - proposed', 'proposal.drawing.unitPlan': 'Unit plan - proposed', 'proposal.drawing.usePlan': 'Use plan - proposed', @@ -38,5 +38,6 @@ export const FileTypes = { 'proposal.document.transport': 'Transport assessment', 'proposal.document.utility.bill': 'Utility bill', 'proposal.photograph': 'Photographs', + 'proposal.photograph.evidence': 'Photographs - evidence', 'proposal.visualisation': 'Visualisations', }; diff --git a/types/schema/data/Applicant.ts b/types/schema/data/Applicant.ts index 3ffa769b..bbb81d0c 100644 --- a/types/schema/data/Applicant.ts +++ b/types/schema/data/Applicant.ts @@ -13,7 +13,7 @@ export type Applicant = BaseApplicant | Agent; */ export interface BaseApplicant { type: 'individual' | 'company' | 'charity' | 'public' | 'parishCouncil'; - interest?: 'owner.sole' | 'owner.co' | 'tenant' | 'occupier'; + interest?: 'owner.sole' | 'owner.co' | 'tenant' | 'occupier' | 'other'; ownership?: { certificate: 'a' | 'b' | 'c' | 'd'; noticeGiven?: boolean; diff --git a/types/schema/data/Property.ts b/types/schema/data/Property.ts index 8460631f..a3f26f70 100644 --- a/types/schema/data/Property.ts +++ b/types/schema/data/Property.ts @@ -18,8 +18,8 @@ export interface UKProperty { localAuthorityDistrict: string[]; type: PropertyType; boundary?: { - site: GeoJSON; - area: Area; + site?: GeoJSON; + area?: Area; }; constraints?: { planning: PlanningConstraint[]; diff --git a/types/schema/data/Proposal.ts b/types/schema/data/Proposal.ts index b1e6ae82..effe3fc7 100644 --- a/types/schema/data/Proposal.ts +++ b/types/schema/data/Proposal.ts @@ -10,8 +10,8 @@ export interface Proposal { projectType: ProjectType[]; description: string; boundary?: { - site: GeoJSON; - area: Area; + site?: GeoJSON; + area?: Area; }; date?: { start?: Date; From 9495ec56ae81c20b75e5cdc329a71955da63bb21 Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Fri, 20 Oct 2023 11:59:24 +0200 Subject: [PATCH 2/2] revert site and area change --- schema/schema.json | 12 ++++++++++++ types/schema/data/Property.ts | 4 ++-- types/schema/data/Proposal.ts | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/schema/schema.json b/schema/schema.json index 554cd9e9..c253321d 100644 --- a/schema/schema.json +++ b/schema/schema.json @@ -2431,6 +2431,10 @@ "$ref": "#/definitions/GeoJSON" } }, + "required": [ + "site", + "area" + ], "type": "object" }, "constraints": { @@ -16765,6 +16769,10 @@ "$ref": "#/definitions/GeoJSON" } }, + "required": [ + "site", + "area" + ], "type": "object" }, "date": { @@ -17584,6 +17592,10 @@ "$ref": "#/definitions/GeoJSON" } }, + "required": [ + "site", + "area" + ], "type": "object" }, "constraints": { diff --git a/types/schema/data/Property.ts b/types/schema/data/Property.ts index a3f26f70..8460631f 100644 --- a/types/schema/data/Property.ts +++ b/types/schema/data/Property.ts @@ -18,8 +18,8 @@ export interface UKProperty { localAuthorityDistrict: string[]; type: PropertyType; boundary?: { - site?: GeoJSON; - area?: Area; + site: GeoJSON; + area: Area; }; constraints?: { planning: PlanningConstraint[]; diff --git a/types/schema/data/Proposal.ts b/types/schema/data/Proposal.ts index effe3fc7..b1e6ae82 100644 --- a/types/schema/data/Proposal.ts +++ b/types/schema/data/Proposal.ts @@ -10,8 +10,8 @@ export interface Proposal { projectType: ProjectType[]; description: string; boundary?: { - site?: GeoJSON; - area?: Area; + site: GeoJSON; + area: Area; }; date?: { start?: Date;