@planning-inspectorate/data-model 1.21.0 → 2.0.0

package/pins_data_model/models/model_appeal_has.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  appeal-has.schema.json
-#   timestamp: 2025-11-04T12:33:59+00:00
+#   timestamp: 2025-11-07T15:19:29+00:00
 
 from __future__ import annotations
 
@@ -232,6 +232,38 @@ class TypeOfPlanningApplication(Enum):
     NoneType_None = None
 
 
+class AdvertType(Enum):
+    field_4_6_Sheet_Non_Illuminated = "4-6 Sheet Non-Illuminated"
+    field_4_6_Sheet_Illuminated = "4-6 Sheet Illuminated"
+    field_12_16_32_Sheet_Non_Illuminated = "12/16/32 Sheet Non-Illuminated"
+    field_12_16_32_Sheet_Illuminated = "12/16/32 Sheet Illuminated"
+    field_48_64_96_Sheet_Non_Illuminated = "48/64/96 Sheet Non-Illuminated"
+    field_48_64_96_Sheet_Illuminated = "48/64/96 Sheet Illuminated"
+    Fascia_Projecting_Signs_Non_Illuminated = "Fascia Projecting Signs Non-Illuminated"
+    Fascia_Projecting_Signs_Illuminated = "Fascia Projecting Signs Illuminated"
+    Directional___Others_Non_Illuminated = "Directional & Others Non-Illuminated"
+    Directional___Others_Illuminated = "Directional & Others Illuminated"
+    Monolith_Totem_Signs_Non_Illuminated = "Monolith/Totem Signs Non-Illuminated"
+    Monolith_Totem_Signs_Illuminated = "Monolith/Totem Signs Illuminated"
+    Other = "Other"
+    NoneType_None = None
+
+
+class AdvertDetail(BaseModel):
+    model_config = ConfigDict(
+        extra="allow",
+    )
+    advertType: AdvertType
+    isAdvertInPosition: bool | None = None
+    """
+    Is the advertisement in position?
+    """
+    isSiteOnHighwayLand: bool | None = None
+    """
+    Is the site on highway land?
+    """
+
+
 class AppealHasCase1(BaseModel):
     """
     Group A - Schema defining the metadata for an appeal
@@ -684,33 +716,47 @@ class AppealHasCase1(BaseModel):
     Indicates if the appellant has applied for costs
     """
     typeOfPlanningApplication: TypeOfPlanningApplication | None = None
-    siteGridReferenceEasting: constr(pattern=r"^\d{6}$") | None = Field(
+    siteGridReferenceEasting: constr(pattern=r"^\d{6,7}$") = Field(
         ..., examples=["357144"]
     )
-    siteGridReferenceNorthing: constr(pattern=r"^\d{6}$") | None = Field(
+    siteGridReferenceNorthing: constr(pattern=r"^\d{6,7}$") = Field(
         ..., examples=["400534"]
     )
     hasLandownersPermission: bool | None = None
     """
-    Indicates if the appellant has land owners permission
+    Does the appellant have the landowners permission
     """
-    isAdvertInPosition: bool | None = None
+    wasApplicationRefusedDueToHighwayOrTraffic: bool | None = None
+    """
+    Did the LPA refuse the application because of highway or traffic public safety?
+    """
+    didAppellantSubmitCompletePhotosAndPlans: bool | None = None
     """
-    Indicates if the advert is already in position
+    Did the appellant submit complete photos and plans?
     """
     isSiteInAreaOfSpecialControlAdverts: bool | None = None
     """
-    Indicates if the site is in an area of special control for adverts
+    Is the site in an area of special control of advertisements?
     """
-    wasApplicationRefusedDueToHighwayOrTraffic: bool | None = None
+    advertDetails: list[AdvertDetail] | None = None
     """
-    Indicates if the application was refused because of highway or traffic public safety?
+    A list of advertisements for the appeal
     """
-    didAppellantSubmitCompletePhotosAndPlans: bool | None = None
+
+
+class AdvertDetail1(BaseModel):
+    model_config = ConfigDict(
+        extra="allow",
+    )
+    advertType: AdvertType
+    isAdvertInPosition: bool | None = None
+    """
+    Is the advertisement in position?
     """
-    Indicates if the appellant submitted complete and accurate photographs and plans
+    isSiteOnHighwayLand: bool | None = None
+    """
+    Is the site on highway land?
     """
-    advertType: str | None = None
 
 
 class AppealHasCase2(BaseModel):
@@ -947,7 +993,7 @@ class AppealHasCase2(BaseModel):
     """
     The statutory deadline for submitting an appeal from the original LPA decision date
     """
-    siteAddressLine1: str | None = Field(..., examples=["96 The Avenue"])
+    siteAddressLine1: str = Field(..., examples=["96 The Avenue"])
     """
     First line of address for the appeal site
     """
@@ -955,7 +1001,7 @@ class AppealHasCase2(BaseModel):
     """
     Second line of address for the appeal site
     """
-    siteAddressTown: str | None = Field(..., examples=["Maidstone"])
+    siteAddressTown: str = Field(..., examples=["Maidstone"])
     """
     Town / City of the site address
     """
@@ -963,7 +1009,7 @@ class AppealHasCase2(BaseModel):
     """
     County of the site address
     """
-    siteAddressPostcode: str | None = Field(..., examples=["MD21 5XY"])
+    siteAddressPostcode: str = Field(..., examples=["MD21 5XY"])
     """
     Postal code of the site address
     """
@@ -1165,33 +1211,32 @@ class AppealHasCase2(BaseModel):
     Indicates if the appellant has applied for costs
     """
     typeOfPlanningApplication: TypeOfPlanningApplication | None = None
-    siteGridReferenceEasting: constr(pattern=r"^\d{6}$") | None = Field(
+    siteGridReferenceEasting: constr(pattern=r"^\d{6,7}$") | None = Field(
         None, examples=["357144"]
     )
-    siteGridReferenceNorthing: constr(pattern=r"^\d{6}$") | None = Field(
+    siteGridReferenceNorthing: constr(pattern=r"^\d{6,7}$") | None = Field(
         None, examples=["400534"]
     )
     hasLandownersPermission: bool | None = None
     """
-    Indicates if the appellant has land owners permission
+    Does the appellant have the landowners permission
     """
-    isAdvertInPosition: bool | None = None
+    wasApplicationRefusedDueToHighwayOrTraffic: bool | None = None
     """
-    Indicates if the advert is already in position
+    Did the LPA refuse the application because of highway or traffic public safety?
     """
-    isSiteInAreaOfSpecialControlAdverts: bool | None = None
+    didAppellantSubmitCompletePhotosAndPlans: bool | None = None
     """
-    Indicates if the site is in an area of special control for adverts
+    Did the appellant submit complete photos and plans?
     """
-    wasApplicationRefusedDueToHighwayOrTraffic: bool | None = None
+    isSiteInAreaOfSpecialControlAdverts: bool | None = None
     """
-    Indicates if the application was refused because of highway or traffic public safety?
+    Is the site in an area of special control of advertisements?
     """
-    didAppellantSubmitCompletePhotosAndPlans: bool | None = None
+    advertDetails: list[AdvertDetail1] | None = None
     """
-    Indicates if the appellant submitted complete and accurate photographs and plans
+    A list of advertisements for the appeal
     """
-    advertType: str | None = None
 
 
 class AppealHasCase(RootModel[AppealHasCase1 | AppealHasCase2]):

package/pins_data_model/models/model_appeal_s78.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  appeal-s78.schema.json
-#   timestamp: 2025-11-04T12:34:00+00:00
+#   timestamp: 2025-11-07T15:19:29+00:00
 
 from __future__ import annotations
 
@@ -298,6 +298,38 @@ class DevelopmentType(Enum):
     NoneType_None = None
 
 
+class AdvertType(Enum):
+    field_4_6_Sheet_Non_Illuminated = "4-6 Sheet Non-Illuminated"
+    field_4_6_Sheet_Illuminated = "4-6 Sheet Illuminated"
+    field_12_16_32_Sheet_Non_Illuminated = "12/16/32 Sheet Non-Illuminated"
+    field_12_16_32_Sheet_Illuminated = "12/16/32 Sheet Illuminated"
+    field_48_64_96_Sheet_Non_Illuminated = "48/64/96 Sheet Non-Illuminated"
+    field_48_64_96_Sheet_Illuminated = "48/64/96 Sheet Illuminated"
+    Fascia_Projecting_Signs_Non_Illuminated = "Fascia Projecting Signs Non-Illuminated"
+    Fascia_Projecting_Signs_Illuminated = "Fascia Projecting Signs Illuminated"
+    Directional___Others_Non_Illuminated = "Directional & Others Non-Illuminated"
+    Directional___Others_Illuminated = "Directional & Others Illuminated"
+    Monolith_Totem_Signs_Non_Illuminated = "Monolith/Totem Signs Non-Illuminated"
+    Monolith_Totem_Signs_Illuminated = "Monolith/Totem Signs Illuminated"
+    Other = "Other"
+    NoneType_None = None
+
+
+class AdvertDetail(BaseModel):
+    model_config = ConfigDict(
+        extra="allow",
+    )
+    advertType: AdvertType
+    isAdvertInPosition: bool | None = None
+    """
+    Is the advertisement in position?
+    """
+    isSiteOnHighwayLand: bool | None = None
+    """
+    Is the site on highway land?
+    """
+
+
 class AppealS78Case1(BaseModel):
     """
     Group B - Schema defining the metadata for an appeal
@@ -848,10 +880,10 @@ class AppealS78Case1(BaseModel):
     """
     The net gain in residences of the proposed development
     """
-    siteGridReferenceEasting: constr(pattern=r"^\d{6}$") | None = Field(
+    siteGridReferenceEasting: constr(pattern=r"^\d{6,7}$") = Field(
         ..., examples=["357144"]
     )
-    siteGridReferenceNorthing: constr(pattern=r"^\d{6}$") | None = Field(
+    siteGridReferenceNorthing: constr(pattern=r"^\d{6,7}$") = Field(
         ..., examples=["400534"]
     )
     siteViewableFromRoad: bool | None = None
@@ -864,6 +896,41 @@ class AppealS78Case1(BaseModel):
     planningObligationDueDate: AwareDatetime | None = Field(
         None, examples=["2023-07-27T20:30:00.000Z"]
     )
+    hasLandownersPermission: bool | None = None
+    """
+    Does the appellant have the landowners permission
+    """
+    wasApplicationRefusedDueToHighwayOrTraffic: bool | None = None
+    """
+    Did the LPA refuse the application because of highway or traffic public safety?
+    """
+    didAppellantSubmitCompletePhotosAndPlans: bool | None = None
+    """
+    Did the appellant submit complete photos and plans?
+    """
+    isSiteInAreaOfSpecialControlAdverts: bool | None = None
+    """
+    Is the site in an area of special control of advertisements?
+    """
+    advertDetails: list[AdvertDetail] | None = None
+    """
+    A list of advertisements for the appeal
+    """
+
+
+class AdvertDetail1(BaseModel):
+    model_config = ConfigDict(
+        extra="allow",
+    )
+    advertType: AdvertType
+    isAdvertInPosition: bool | None = None
+    """
+    Is the advertisement in position?
+    """
+    isSiteOnHighwayLand: bool | None = None
+    """
+    Is the site on highway land?
+    """
 
 
 class AppealS78Case2(BaseModel):
@@ -1100,7 +1167,7 @@ class AppealS78Case2(BaseModel):
     """
     The statutory deadline for submitting an appeal from the original LPA decision date
     """
-    siteAddressLine1: str | None = Field(..., examples=["96 The Avenue"])
+    siteAddressLine1: str = Field(..., examples=["96 The Avenue"])
     """
     First line of address for the appeal site
     """
@@ -1108,7 +1175,7 @@ class AppealS78Case2(BaseModel):
     """
     Second line of address for the appeal site
     """
-    siteAddressTown: str | None = Field(..., examples=["Maidstone"])
+    siteAddressTown: str = Field(..., examples=["Maidstone"])
     """
     Town / City of the site address
     """
@@ -1116,7 +1183,7 @@ class AppealS78Case2(BaseModel):
     """
     County of the site address
     """
-    siteAddressPostcode: str | None = Field(..., examples=["MD21 5XY"])
+    siteAddressPostcode: str = Field(..., examples=["MD21 5XY"])
     """
     Postal code of the site address
     """
@@ -1416,10 +1483,10 @@ class AppealS78Case2(BaseModel):
     """
     The net gain in residences of the proposed development
     """
-    siteGridReferenceEasting: constr(pattern=r"^\d{6}$") | None = Field(
+    siteGridReferenceEasting: constr(pattern=r"^\d{6,7}$") | None = Field(
         None, examples=["357144"]
     )
-    siteGridReferenceNorthing: constr(pattern=r"^\d{6}$") | None = Field(
+    siteGridReferenceNorthing: constr(pattern=r"^\d{6,7}$") | None = Field(
         None, examples=["400534"]
     )
     siteViewableFromRoad: bool | None = None
@@ -1432,6 +1499,26 @@ class AppealS78Case2(BaseModel):
     planningObligationDueDate: AwareDatetime | None = Field(
         None, examples=["2023-07-27T20:30:00.000Z"]
     )
+    hasLandownersPermission: bool | None = None
+    """
+    Does the appellant have the landowners permission
+    """
+    wasApplicationRefusedDueToHighwayOrTraffic: bool | None = None
+    """
+    Did the LPA refuse the application because of highway or traffic public safety?
+    """
+    didAppellantSubmitCompletePhotosAndPlans: bool | None = None
+    """
+    Did the appellant submit complete photos and plans?
+    """
+    isSiteInAreaOfSpecialControlAdverts: bool | None = None
+    """
+    Is the site in an area of special control of advertisements?
+    """
+    advertDetails: list[AdvertDetail1] | None = None
+    """
+    A list of advertisements for the appeal
+    """
 
 
 class AppealS78Case(RootModel[AppealS78Case1 | AppealS78Case2]):

package/schemas/appeal-has.schema.json

@@ -78,16 +78,16 @@
     {
       "required": ["siteGridReferenceEasting", "siteGridReferenceNorthing"],
       "properties": {
-        "siteGridReferenceEasting": { "not": { "type": "null" } },
-        "siteGridReferenceNorthing": { "not": { "type": "null" } }
+        "siteGridReferenceEasting": { "type": "string" },
+        "siteGridReferenceNorthing": { "type": "string" }
       }
     },
     {
       "required": ["siteAddressLine1", "siteAddressTown", "siteAddressPostcode"],
       "properties": {
-        "siteAddressLine1": { "not": { "type": "null" } },
-        "siteAddressTown": { "not": { "type": "null" } },
-        "siteAddressPostcode": { "not": { "type": "null" } }
+        "siteAddressLine1": { "type": "string" },
+        "siteAddressTown": { "type": "string" },
+        "siteAddressPostcode": { "type": "string" }
       }
     }
   ],
@@ -701,37 +701,68 @@
     },
     "siteGridReferenceEasting": {
       "type": ["string", "null"],
-      "pattern": "^\\d{6}$",
+      "pattern": "^\\d{6,7}$",
       "examples": ["357144"]
     },
     "siteGridReferenceNorthing": {
       "type": ["string", "null"],
-      "pattern": "^\\d{6}$",
+      "pattern": "^\\d{6,7}$",
       "examples": ["400534"]
     },
     "hasLandownersPermission": {
       "type": ["boolean", "null"],
-      "description": "Indicates if the appellant has land owners permission"
-    },
-    "isAdvertInPosition": {
-      "type": ["boolean", "null"],
-      "description": "Indicates if the advert is already in position"
-    },
-    "isSiteInAreaOfSpecialControlAdverts": {
-      "type": ["boolean", "null"],
-      "description": "Indicates if the site is in an area of special control for adverts"
+      "description": "Does the appellant have the landowners permission"
     },
     "wasApplicationRefusedDueToHighwayOrTraffic": {
       "type": ["boolean", "null"],
-      "description": "Indicates if the application was refused because of highway or traffic public safety?"
+      "description": "Did the LPA refuse the application because of highway or traffic public safety?"
     },
     "didAppellantSubmitCompletePhotosAndPlans": {
       "type": ["boolean", "null"],
-      "description": "Indicates if the appellant submitted complete and accurate photographs and plans"
+      "description": "Did the appellant submit complete photos and plans?"
     },
-    "advertType": {
-      "type": ["string", "null"],
-      "$comment": "Pick from a TBD list of reference data for advert type"
+    "isSiteInAreaOfSpecialControlAdverts": {
+      "type": ["boolean", "null"],
+      "description": "Is the site in an area of special control of advertisements?"
+    },
+    "advertDetails": {
+      "type": ["array", "null"],
+      "items": {
+        "type": "object",
+        "additionalProperties": true,
+        "properties": {
+          "advertType": {
+            "type": ["string", "null"],
+            "enum": [
+              "4-6 Sheet Non-Illuminated",
+              "4-6 Sheet Illuminated",
+              "12/16/32 Sheet Non-Illuminated",
+              "12/16/32 Sheet Illuminated",
+              "48/64/96 Sheet Non-Illuminated",
+              "48/64/96 Sheet Illuminated",
+              "Fascia Projecting Signs Non-Illuminated",
+              "Fascia Projecting Signs Illuminated",
+              "Directional & Others Non-Illuminated",
+              "Directional & Others Illuminated",
+              "Monolith/Totem Signs Non-Illuminated",
+              "Monolith/Totem Signs Illuminated",
+              "Other",
+              null
+            ]
+          },
+          "isAdvertInPosition": {
+            "type": ["boolean", "null"],
+            "description": "Is the advertisement in position?"
+          },
+          "isSiteOnHighwayLand": {
+            "type": ["boolean", "null"],
+            "description": "Is the site on highway land?"
+          }
+        },
+        "required": ["advertType", "isAdvertInPosition", "isSiteOnHighwayLand"]
+      },
+      "description": "A list of advertisements for the appeal",
+      "$comment": "Also available on CAS Adverts (ZA) cases"
     }
   }
 }

package/schemas/appeal-s78.schema.json

@@ -136,16 +136,16 @@
     {
       "required": ["siteGridReferenceEasting", "siteGridReferenceNorthing"],
       "properties": {
-        "siteGridReferenceEasting": { "not": { "type": "null" } },
-        "siteGridReferenceNorthing": { "not": { "type": "null" } }
+        "siteGridReferenceEasting": { "type": "string" },
+        "siteGridReferenceNorthing": { "type": "string" }
       }
     },
     {
       "required": ["siteAddressLine1", "siteAddressTown", "siteAddressPostcode"],
       "properties": {
-        "siteAddressLine1": { "not": { "type": "null" } },
-        "siteAddressTown": { "not": { "type": "null" } },
-        "siteAddressPostcode": { "not": { "type": "null" } }
+        "siteAddressLine1": { "type": "string" },
+        "siteAddressTown": { "type": "string" },
+        "siteAddressPostcode": { "type": "string" }
       }
     }
   ],
@@ -973,12 +973,12 @@
     },
     "siteGridReferenceEasting": {
       "type": ["string", "null"],
-      "pattern": "^\\d{6}$",
+      "pattern": "^\\d{6,7}$",
       "examples": ["357144"]
     },
     "siteGridReferenceNorthing": {
       "type": ["string", "null"],
-      "pattern": "^\\d{6}$",
+      "pattern": "^\\d{6,7}$",
       "examples": ["400534"]
     },
     "siteViewableFromRoad": {
@@ -1032,6 +1032,61 @@
       "type": ["string", "null"],
       "format": "date-time",
       "examples": ["2023-07-27T20:30:00.000Z"]
+    },
+    "hasLandownersPermission": {
+      "type": ["boolean", "null"],
+      "description": "Does the appellant have the landowners permission"
+    },
+    "wasApplicationRefusedDueToHighwayOrTraffic": {
+      "type": ["boolean", "null"],
+      "description": "Did the LPA refuse the application because of highway or traffic public safety?"
+    },
+    "didAppellantSubmitCompletePhotosAndPlans": {
+      "type": ["boolean", "null"],
+      "description": "Did the appellant submit complete photos and plans?"
+    },
+    "isSiteInAreaOfSpecialControlAdverts": {
+      "type": ["boolean", "null"],
+      "description": "Is the site in an area of special control of advertisements?"
+    },
+    "advertDetails": {
+      "type": ["array", "null"],
+      "items": {
+        "type": "object",
+        "additionalProperties": true,
+        "properties": {
+          "advertType": {
+            "type": ["string", "null"],
+            "enum": [
+              "4-6 Sheet Non-Illuminated",
+              "4-6 Sheet Illuminated",
+              "12/16/32 Sheet Non-Illuminated",
+              "12/16/32 Sheet Illuminated",
+              "48/64/96 Sheet Non-Illuminated",
+              "48/64/96 Sheet Illuminated",
+              "Fascia Projecting Signs Non-Illuminated",
+              "Fascia Projecting Signs Illuminated",
+              "Directional & Others Non-Illuminated",
+              "Directional & Others Illuminated",
+              "Monolith/Totem Signs Non-Illuminated",
+              "Monolith/Totem Signs Illuminated",
+              "Other",
+              null
+            ]
+          },
+          "isAdvertInPosition": {
+            "type": ["boolean", "null"],
+            "description": "Is the advertisement in position?"
+          },
+          "isSiteOnHighwayLand": {
+            "type": ["boolean", "null"],
+            "description": "Is the site on highway land?"
+          }
+        },
+        "required": ["advertType", "isAdvertInPosition", "isSiteOnHighwayLand"]
+      },
+      "description": "A list of advertisements for the appeal",
+      "$comment": "Also available on CAS Adverts (ZA) cases"
     }
   }
 }

package/schemas/commands/appeals-components/appeal-advert.submission.schema.json

@@ -0,0 +1,53 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "commands/appeals-components/appeal-advert.submission.schema.json",
+  "title": "Advert specific properties",
+  "description": "Schema defining any properties for advertisement appeals",
+  "type": "object",
+  "additionalProperties": true,
+  "required": ["hasLandownersPermission", "advertDetails"],
+  "properties": {
+    "hasLandownersPermission": {
+      "type": ["boolean", "null"],
+      "description": "Indicates if the appellant has land owners permission"
+    },
+    "advertDetails": {
+      "type": ["array", "null"],
+      "items": {
+        "type": "object",
+        "additionalProperties": true,
+        "required": ["advertType", "isAdvertInPosition", "isSiteOnHighwayLand"],
+        "properties": {
+          "advertType": {
+            "type": ["string", "null"],
+            "enum": [
+              "4-6 Sheet Non-Illuminated",
+              "4-6 Sheet Illuminated",
+              "12/16/32 Sheet Non-Illuminated",
+              "12/16/32 Sheet Illuminated",
+              "48/64/96 Sheet Non-Illuminated",
+              "48/64/96 Sheet Illuminated",
+              "Fascia Projecting Signs Non-Illuminated",
+              "Fascia Projecting Signs Illuminated",
+              "Directional & Others Non-Illuminated",
+              "Directional & Others Illuminated",
+              "Monolith/Totem Signs Non-Illuminated",
+              "Monolith/Totem Signs Illuminated",
+              "Other",
+              null
+            ]
+          },
+          "isAdvertInPosition": {
+            "type": ["boolean", "null"],
+            "description": "Is the advertisement in position?"
+          },
+          "isSiteOnHighwayLand": {
+            "type": ["boolean", "null"],
+            "description": "Is the site on highway land?"
+          }
+        }
+      },
+      "description": "A list of advertisements for the appeal"
+    }
+  }
+}

package/schemas/commands/{appeal-common-submission.schema.json → appeals-components/appeal-common-submission.schema.json}

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "commands/appeal-common-submission.schema.json",
+  "$id": "commands/appeals-components/appeal-common-submission.schema.json",
   "title": "Appellant common submission properties",
   "description": "Schema defining any properties common across all appeal types for appeal submissions",
   "type": "object",
@@ -25,16 +25,16 @@
     {
       "required": ["siteGridReferenceEasting", "siteGridReferenceNorthing"],
       "properties": {
-        "siteGridReferenceEasting": { "not": { "type": "null" } },
-        "siteGridReferenceNorthing": { "not": { "type": "null" } }
+        "siteGridReferenceEasting": { "type": "string" },
+        "siteGridReferenceNorthing": { "type": "string" }
       }
     },
     {
       "required": ["siteAddressLine1", "siteAddressTown", "siteAddressPostcode"],
       "properties": {
-        "siteAddressLine1": { "not": { "type": "null" } },
-        "siteAddressTown": { "not": { "type": "null" } },
-        "siteAddressPostcode": { "not": { "type": "null" } }
+        "siteAddressLine1": { "type": "string" },
+        "siteAddressTown": { "type": "string" },
+        "siteAddressPostcode": { "type": "string" }
       }
     }
   ],
@@ -121,12 +121,12 @@
     },
     "siteGridReferenceEasting": {
       "type": ["string", "null"],
-      "pattern": "^\\d{6}$",
+      "pattern": "^\\d{6,7}$",
       "examples": ["357144"]
     },
     "siteGridReferenceNorthing": {
       "type": ["string", "null"],
-      "pattern": "^\\d{6}$",
+      "pattern": "^\\d{6,7}$",
       "examples": ["400534"]
     },
     "siteAccessDetails": {

package/schemas/commands/{appeal-has-submission.schema.json → appeals-components/appeal-has-submission.schema.json}

@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "commands/appeal-has-submission.schema.json",
+  "$id": "commands/appeals-components/appeal-has-submission.schema.json",
   "title": "Appellant HAS submission properties",
-  "description": "Schema defining any HAS specific properties for submissions",
+  "description": "Schema defining any HAS specific properties for appeal submissions",
   "type": "object",
   "additionalProperties": true,
   "required": [