Merge pull request #2741 from ministryofjustice/feature/aps-1753-add-…

…cas1-full-address

APS-1753 - Add CAS1 full address

src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/PremisesEntity.kt

@@ -203,6 +203,7 @@ interface ApprovedPremisesRepository : JpaRepository<ApprovedPremisesEntity, UUI
   fun findByQCode(qcode: String): ApprovedPremisesEntity?
 }
 
+@SuppressWarnings("LongParameterList")
 @Entity
 @Table(name = "premises")
 @DiscriminatorColumn(name = "service")
@@ -211,8 +212,17 @@ abstract class PremisesEntity(
   @Id
   val id: UUID,
   var name: String,
+  /**
+   * For CAS1 fullAddress should be used instead, where defined
+   */
   var addressLine1: String,
+  /**
+   * For CAS1 fullAddress should be used instead, where defined
+   */
   var addressLine2: String?,
+  /**
+   * For CAS1 fullAddress should be used instead, where defined
+   */
   var town: String?,
   var postcode: String,
   var longitude: Double?,
@@ -273,6 +283,12 @@ class ApprovedPremisesEntity(
   var gender: ApprovedPremisesGender,
   var supportsSpaceBookings: Boolean,
   var managerDetails: String?,
+  /**
+   * Full Address, excluding postcode. When defined this should be used instead of [addressLine1], [addressLine2] and [town]
+   *
+   * Whilst currently nullable, once all site surveys have been imported this can be made non-null
+   */
+  var fullAddress: String?,
 ) : PremisesEntity(
   id,
   name,

src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/cas1/Cas1PremisesSearchRepository.kt

@@ -54,6 +54,7 @@ FROM
       ELSE 'NORMAL'
     END AS ap_type,
     p.name AS name,
+    ap.full_address AS full_address,
     p.address_line1 AS address_line1,
     p.address_line2 AS address_line2,
     p.town AS town,
@@ -70,7 +71,7 @@ FROM
   WHERE 
     ap.supports_space_bookings = true AND
     ap.gender = #SPECIFIED_GENDER#
-  GROUP BY p.id, ap.point, p.name, p.address_line1, p.address_line2, p.town, p.postcode, aa.id, aa.name  
+  GROUP BY p.id, ap.point, p.name, ap.full_address, p.address_line1, p.address_line2, p.town, p.postcode, aa.id, aa.name  
 ) AS result
 WHERE
   1 = 1
@@ -110,6 +111,7 @@ class Cas1SpaceSearchRepository(
         rs.getFloat("distance_in_miles"),
         apType,
         rs.getString("name"),
+        rs.getString("full_address"),
         rs.getString("address_line1"),
         rs.getString("address_line2"),
         rs.getString("town"),
@@ -204,6 +206,7 @@ data class CandidatePremises(
   val distanceInMiles: Float,
   val apType: ApprovedPremisesType,
   val name: String,
+  val fullAddress: String?,
   val addressLine1: String,
   val addressLine2: String?,
   val town: String?,

src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/seed/cas1/Cas1SeedPremisesFromCsvJob.kt

@@ -62,6 +62,7 @@ class Cas1SeedPremisesFromCsvJob(
     "gender",
     "supportsSpaceBookings",
     "managerDetails",
+    "fullAddress",
   ),
 ) {
   private val log = LoggerFactory.getLogger(this::class.java)
@@ -109,6 +110,7 @@ class Cas1SeedPremisesFromCsvJob(
     gender = ApprovedPremisesGender.valueOf(columns["gender"]!!),
     supportsSpaceBookings = parseBooleanStringOrThrow(columns["supportsSpaceBookings"]!!, "supportsSpaceBookings"),
     managerDetails = columns["managerDetails"]!!,
+    fullAddress = columns["fullAddress"],
   )
 
   @SuppressWarnings("TooGenericExceptionThrown")
@@ -192,6 +194,7 @@ class Cas1SeedPremisesFromCsvJob(
         gender = row.gender,
         supportsSpaceBookings = castBooleanString(row.supportsSpaceBookings),
         managerDetails = row.managerDetails,
+        fullAddress = row.fullAddress,
       ),
     )
 
@@ -225,6 +228,7 @@ class Cas1SeedPremisesFromCsvJob(
       this.name = row.name
       this.apCode = row.apCode
       this.qCode = row.qCode
+      this.fullAddress = row.fullAddress
       this.addressLine1 = row.addressLine1
       this.addressLine2 = row.addressLine2
       this.town = row.town
@@ -294,4 +298,5 @@ data class ApprovedPremisesSeedCsvRow(
   val gender: ApprovedPremisesGender,
   val supportsSpaceBookings: String,
   val managerDetails: String,
+  val fullAddress: String?,
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/seed/cas1/Cas1SeedPremisesFromSiteSurveyXlsxJob.kt

@@ -131,6 +131,9 @@ class Cas1SeedPremisesFromSiteSurveyXlsxJob(
       ApprovedPremisesEntity(
         id = UUID.randomUUID(),
         name = siteSurvey.name,
+        fullAddress = premisesInfo.siteSurveyPremise.address,
+        // note that the site survey provides a full address in this field
+        // so callers should retrieve fullAddress instead
         addressLine1 = siteSurvey.address,
         addressLine2 = null,
         town = siteSurvey.townCity,
@@ -173,6 +176,7 @@ class Cas1SeedPremisesFromSiteSurveyXlsxJob(
     val siteSurvey = premisesInfo.siteSurveyPremise
     existingPremise.apply {
       name = siteSurvey.name
+      fullAddress = premisesInfo.siteSurveyPremise.address
       addressLine1 = siteSurvey.address
       addressLine2 = null
       town = siteSurvey.townCity

src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/transformer/cas1/Cas1SpaceSearchResultsTransformer.kt

@@ -27,6 +27,7 @@ class Cas1SpaceSearchResultsTransformer {
             id = candidatePremises.premisesId,
             apType = candidatePremises.apType.asApiType(),
             name = candidatePremises.name,
+            fullAddress = candidatePremises.resolveFullAddress(),
             addressLine1 = candidatePremises.addressLine1,
             addressLine2 = candidatePremises.addressLine2,
             town = candidatePremises.town,
@@ -50,4 +51,11 @@ class Cas1SpaceSearchResultsTransformer {
         )
       },
     )
+
+  fun CandidatePremises.resolveFullAddress(): String {
+    return fullAddress
+      ?: listOf(addressLine1, addressLine2, town)
+        .filter { !it.isNullOrBlank() }
+        .joinToString(separator = ", ")
+  }
 }

src/main/resources/db/migration/all/20241223095926__add_approved_premises_full_address.sql

@@ -0,0 +1 @@
+ALTER TABLE approved_premises ADD full_address text NULL;

src/main/resources/db/seed/local+dev+test/1__approved_premises.csv

@@ -1,19 +1,19 @@
-name,addressLine1,addressLine2,town,postcode,latitude,longitude,notes,emailAddress,probationRegion,localAuthorityArea,characteristics,isIAP,isPIPE,isESAP,isSemiSpecialistMentalHealth,isRecoveryFocussed,isSuitableForVulnerable,acceptsSexOffenders,acceptsChildSexOffenders,acceptsNonSexualChildOffenders,acceptsHateCrimeOffenders,isCatered,hasWideStepFreeAccess,hasWideAccessToCommunalAreas,hasStepFreeAccessToCommunalAreas,hasWheelChairAccessibleBathrooms,hasLift,hasTactileFlooring,hasBrailleSignage,hasHearingLoop,status,apCode,qCode,gender,supportsSpaceBookings,managerDetails
-LON Men Premise 1,454 Nader Port,,Quitzonview,OX26 2EQ,51.904735,-1.1635,No,[email protected],London,Hackney,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,NO,NO,NO,NO,YES,active,LONMEN1,Q714,MAN,NO,Manager for LON Men Premise 1
-LON Men Premise 2,7525 Alba Trail,,Theronborough,WA6 9BQ,53.266459,-2.768905,,[email protected],London,Westminster,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,YES,active,LONMEN2,Q703,MAN,NO,Manager for LON Men Premise 2
-MIDS Men Premise 1,8527 Bell Rapids,,South Myah,ML8 5EP,55.751711,-3.851103,restrictions on offences against sex workers due to location of the AP,[email protected],East Midlands,Leicester,,NO,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,active,MIDSMEN1,Q701,MAN,NO,Manager for MIDS Men Premise 1
-MIDS Men Premise 2,306 Destinee Union,,South Devinberg,KA4 8JG,55.599949,-4.376498,,[email protected],West Midlands,Birmingham,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,YES,YES,active,MIDSMEN2,Q702,MAN,NO,Manager for MIDS Men Premise 2
-NE Men Premise 1,4023 Green Wells,,Port Carleton,N14 6QW,51.631685,-0.125257,"As an independent AP, cannot take Arsonists who post an imminent risk of further Arson. This is a local decision, I confirmed that there was no insurance issues regarding Arson. The manager just said if there was an Arsonist whose risk was seen as imminent, she would have to check with the Charity who funds the AP",[email protected],North East,Newcastle upon Tyne,,YES,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,NO,active,NEMEN1,Q705,MAN,NO,Manager for NE Manager for Men Premise 1
-NE Men Premise 2,42716 Dickens Route,,Bayerstead,WA11 8GJ,53.50205,-2.790471,,[email protected],North East,Sunderland,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,YES,NO,NO,NO,YES,active,NEMEN2,Q706,MAN,NO,Manager for NE Men Premise 2
-NE Men Premise 3,704 Eleazar Rue,,Bergstromfort,SK11 6TG,53.254466,-2.124048,,[email protected],North East,Sunderland,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,YES,active,NEMEN3,Q707,MAN,NO,Manager for NE Men Premise 3
-NE Women Premise 1,069 Braun Flat,,Roobbury,SO15 8PN,50.913966,-1.442888,,[email protected],North East,Newcastle upon Tyne,,NO,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,NEWOMEN1,Q708,WOMAN,NO,Manager for NE Women Premise 1
-NW Men Premise 1,14063 Edyth Court,,North Hallie,LN13 9AT,53.254737,0.180603,No,[email protected],North West,Lancaster,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,active,NWMEN1,Q709,MAN,NO,Manager for NW Men Premise 1
-NW Men Premise 2,9317 Bauch Heights,,Mavisworth,TN33 9JN,50.886096,0.424608,No Child RSO's since 2006 - National instruction.,[email protected],North West,Carlisle,,YES,NO,NO,NO,NO,YES,YES,NO,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,NO,active,NWMEN2,Q710,MAN,NO,Manager for NW Men Premise 2
-SEE Men Premise 1,5510 Emmitt Street,,North Gregoryboro,SA13 1NN,51.593159,-3.781082,Rooms 9 to 16 are currently out of use - annexe that contains them is subsiding and is non accessible - for last 6 months or so.,[email protected],East of England,Norwich,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,YES,YES,active,SEEMEN1,Q711,MAN,NO,Manager for SEE Men Premise 1
-SEE Men Premise 2,307 Annabell Flats,,Zemlaktown,GU34 5EB,51.119205,-1.040455,,[email protected],East of England,Norwich,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,YES,NO,active,SEEMEN2,Q712,MAN,NO,Manager for SEE Men Premise 2
-SWSC Men Premise 1,110 Bailey Expressway,,Cordellburgh,GU3 3DZ,51.249544,-0.637553,,[email protected],South West,Southampton,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,YES,NO,active,SWSCMEN1,Q005,MAN,YES,Manager for SWSC Men Premise 1
-SWSC Men Premise 2,0300 Blick Camp,,North Moriahhaven,HU11 4XH,53.792705,-0.191504,Westgate notes,[email protected],South Central,"Bournemouth, Christchurch and Poole",,NO,NO,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCMEN2,Q095,MAN,YES,Manager for SWSC Men Premise 2
-SWSC Men Premise 3,4169 Joana Branch,,Alfredohaven,IV30 1XX,57.644221,-3.295377,TEST notes,[email protected],South West,"Bournemouth, Christchurch and Poole",,NO,NO,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCMEN3,Q713,MAN,YES,Manager for SWSC Men Premise 3
-SWSC Women Premise 1,12 Aardvark Branch,,Mavisworth,JJ30 YXX,57.144221,-3.195377,TEST notes,[email protected],South Central,Southampton,,NO,YES,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCWOMEN1,Q049,WOMAN,YES,Manager for SWSC Women Premise 1
-Wales Men Premise 1,3 Blackbird Heights,,South Myah,XX33 9AN,50.286096,0.524608,,[email protected],Wales,Newport,,YES,NO,NO,NO,NO,YES,YES,NO,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,NO,active,WALESMEN1,Q715,MAN,NO,Manager for Wales Men Premise 1
-Wales Men Premise 2,98 Crow Court,,Quitzonview,AB13 9AT,53.284737,0.190603,No,[email protected],Wales,Cardiff,,YES,NO,YES,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,active,WALESMEN2,Q716,MAN,NO,Manager for Wales Men Premise 2
+name,addressLine1,addressLine2,town,postcode,latitude,longitude,notes,emailAddress,probationRegion,localAuthorityArea,characteristics,isIAP,isPIPE,isESAP,isSemiSpecialistMentalHealth,isRecoveryFocussed,isSuitableForVulnerable,acceptsSexOffenders,acceptsChildSexOffenders,acceptsNonSexualChildOffenders,acceptsHateCrimeOffenders,isCatered,hasWideStepFreeAccess,hasWideAccessToCommunalAreas,hasStepFreeAccessToCommunalAreas,hasWheelChairAccessibleBathrooms,hasLift,hasTactileFlooring,hasBrailleSignage,hasHearingLoop,status,apCode,qCode,gender,supportsSpaceBookings,managerDetails,fullAddress
+LON Men Premise 1,454 Nader Port,,Quitzonview,OX26 2EQ,51.904735,-1.1635,No,[email protected],London,Hackney,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,NO,NO,NO,NO,YES,active,LONMEN1,Q714,MAN,NO,Manager for LON Men Premise 1,"454 Nader Port, Quitzonview"
+LON Men Premise 2,7525 Alba Trail,,Theronborough,WA6 9BQ,53.266459,-2.768905,,[email protected],London,Westminster,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,YES,active,LONMEN2,Q703,MAN,NO,Manager for LON Men Premise 2,7525 Alba Trail
+MIDS Men Premise 1,8527 Bell Rapids,,South Myah,ML8 5EP,55.751711,-3.851103,restrictions on offences against sex workers due to location of the AP,[email protected],East Midlands,Leicester,,NO,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,active,MIDSMEN1,Q701,MAN,NO,Manager for MIDS Men Premise 1,"8527 Bell Rapids, South Myah"
+MIDS Men Premise 2,306 Destinee Union,,South Devinberg,KA4 8JG,55.599949,-4.376498,,[email protected],West Midlands,Birmingham,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,YES,YES,active,MIDSMEN2,Q702,MAN,NO,Manager for MIDS Men Premise 2,"306 Destinee Union, South Devinberg"
+NE Men Premise 1,4023 Green Wells,,Port Carleton,N14 6QW,51.631685,-0.125257,"As an independent AP, cannot take Arsonists who post an imminent risk of further Arson. This is a local decision, I confirmed that there was no insurance issues regarding Arson. The manager just said if there was an Arsonist whose risk was seen as imminent, she would have to check with the Charity who funds the AP",[email protected],North East,Newcastle upon Tyne,,YES,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,NO,active,NEMEN1,Q705,MAN,NO,Manager for NE Manager for Men Premise 1,"4023 Green Wells, Port Carleton"
+NE Men Premise 2,42716 Dickens Route,,Bayerstead,WA11 8GJ,53.50205,-2.790471,,[email protected],North East,Sunderland,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,YES,NO,NO,NO,YES,active,NEMEN2,Q706,MAN,NO,Manager for NE Men Premise 2,"42716 Dickens Route, Bayerstead"
+NE Men Premise 3,704 Eleazar Rue,,Bergstromfort,SK11 6TG,53.254466,-2.124048,,[email protected],North East,Sunderland,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,YES,active,NEMEN3,Q707,MAN,NO,Manager for NE Men Premise 3,"704 Eleazar Rue, Bergstromfort"
+NE Women Premise 1,069 Braun Flat,,Roobbury,SO15 8PN,50.913966,-1.442888,,[email protected],North East,Newcastle upon Tyne,,NO,YES,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,NEWOMEN1,Q708,WOMAN,NO,Manager for NE Women Premise 1,"069 Braun Flat, Roobbury"
+NW Men Premise 1,14063 Edyth Court,,North Hallie,LN13 9AT,53.254737,0.180603,No,[email protected],North West,Lancaster,,YES,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,active,NWMEN1,Q709,MAN,NO,Manager for NW Men Premise 1,"14063 Edyth Court, North Hallie"
+NW Men Premise 2,9317 Bauch Heights,,Mavisworth,TN33 9JN,50.886096,0.424608,No Child RSO's since 2006 - National instruction.,[email protected],North West,Carlisle,,YES,NO,NO,NO,NO,YES,YES,NO,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,NO,active,NWMEN2,Q710,MAN,NO,Manager for NW Men Premise 2,"9317 Bauch Heights, Mavisworth"
+SEE Men Premise 1,5510 Emmitt Street,,North Gregoryboro,SA13 1NN,51.593159,-3.781082,Rooms 9 to 16 are currently out of use - annexe that contains them is subsiding and is non accessible - for last 6 months or so.,[email protected],East of England,Norwich,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,YES,YES,active,SEEMEN1,Q711,MAN,NO,Manager for SEE Men Premise 1,"5510 Emmitt Street, North Gregoryboro"
+SEE Men Premise 2,307 Annabell Flats,,Zemlaktown,GU34 5EB,51.119205,-1.040455,,[email protected],East of England,Norwich,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,NO,YES,YES,NO,NO,NO,YES,NO,active,SEEMEN2,Q712,MAN,NO,Manager for SEE Men Premise 2,"307 Annabell Flats, Zemlaktown"
+SWSC Men Premise 1,110 Bailey Expressway,,Cordellburgh,GU3 3DZ,51.249544,-0.637553,,[email protected],South West,Southampton,,NO,NO,NO,NO,NO,YES,YES,YES,YES,YES,YES,YES,YES,YES,YES,NO,NO,YES,NO,active,SWSCMEN1,Q005,MAN,YES,Manager for SWSC Men Premise 1,"110 Bailey Expressway, Cordellburgh"
+SWSC Men Premise 2,0300 Blick Camp,,North Moriahhaven,HU11 4XH,53.792705,-0.191504,Westgate notes,[email protected],South Central,"Bournemouth, Christchurch and Poole",,NO,NO,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCMEN2,Q095,MAN,YES,Manager for SWSC Men Premise 2,"0300 Blick Camp, North Moriahhaven"
+SWSC Men Premise 3,4169 Joana Branch,,Alfredohaven,IV30 1XX,57.644221,-3.295377,TEST notes,[email protected],South West,"Bournemouth, Christchurch and Poole",,NO,NO,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCMEN3,Q713,MAN,YES,Manager for SWSC Men Premise 3,"4169 Joana Branch, Alfredohaven"
+SWSC Women Premise 1,12 Aardvark Branch,,Mavisworth,JJ30 YXX,57.144221,-3.195377,TEST notes,[email protected],South Central,Southampton,,NO,YES,NO,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,NO,NO,YES,YES,active,SWSCWOMEN1,Q049,WOMAN,YES,Manager for SWSC Women Premise 1,"12 Aardvark Branch, Mavisworth"
+Wales Men Premise 1,3 Blackbird Heights,,South Myah,XX33 9AN,50.286096,0.524608,,[email protected],Wales,Newport,,YES,NO,NO,NO,NO,YES,YES,NO,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,NO,active,WALESMEN1,Q715,MAN,NO,Manager for Wales Men Premise 1,"3 Blackbird Heights, South Myah"
+Wales Men Premise 2,98 Crow Court,,Quitzonview,AB13 9AT,53.284737,0.190603,No,[email protected],Wales,Cardiff,,YES,NO,YES,NO,NO,YES,YES,YES,YES,YES,YES,NO,NO,NO,NO,NO,NO,NO,NO,active,WALESMEN2,Q716,MAN,NO,Manager for Wales Men Premise 2,"98 Crow Court, Quitzonview"

src/main/resources/static/cas1-schemas.yml

@@ -36,13 +36,22 @@ components:
         name:
           type: string
           example: Hope House
+        fullAddress:
+          description: Full address, excluding postcode
+          type: string
         addressLine1:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: 1 The Street
         addressLine2:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: Blackmore End
         town:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: Braintree
         postcode:
@@ -66,6 +75,7 @@ components:
         - name
         - apArea
         - characteristics
+        - fullAddress
     Cas1PremisesSummary:
       type: object
       properties:

src/main/resources/static/codegen/built-cas1-api-spec.yml

@@ -6086,13 +6086,22 @@ components:
         name:
           type: string
           example: Hope House
+        fullAddress:
+          description: Full address, excluding postcode
+          type: string
         addressLine1:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: 1 The Street
         addressLine2:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: Blackmore End
         town:
+          description: Deprecated, use fullAddress
+          deprecated: true
           type: string
           example: Braintree
         postcode:
@@ -6116,6 +6125,7 @@ components:
         - name
         - apArea
         - characteristics
+        - fullAddress
     Cas1PremisesSummary:
       type: object
       properties: