vega-2431 - Remove 'town' as required field in address (#185)

* Remove 'town' as required field in address vega-2431#minor * Remove more tests that assert town as required
ministryofjustice · Apr 30, 2024 · 5f0abea · 5f0abea
1 parent 6c19017
commit 5f0abea
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 11 deletions.
diff --git a/docs/schemas/2024-04/donor-details.json b/docs/schemas/2024-04/donor-details.json
@@ -142,7 +142,7 @@
   "$defs": {
     "Address": {
       "type": "object",
-      "required": ["line1", "town", "country"],
+      "required": ["line1", "country"],
       "properties": {
         "line1": {
           "type": "string",

diff --git a/internal/shared/lpa_test.go b/internal/shared/lpa_test.go
@@ -10,9 +10,9 @@ import (
 func TestLpaInitMarshalJSON(t *testing.T) {
 	expected := `{
 "lpaType":"",
-"donor":{"uid":"","firstNames":"","lastName":"","address":{"line1":"","town":"","country":""},"dateOfBirth":"","email":"","contactLanguagePreference":""},
+"donor":{"uid":"","firstNames":"","lastName":"","address":{"line1":"","country":""},"dateOfBirth":"","email":"","contactLanguagePreference":""},
 "attorneys":null,
-"certificateProvider":{"uid":"","firstNames":"","lastName":"","address":{"line1":"","town":"","country":""},"email":"","phone":"","channel":""},
+"certificateProvider":{"uid":"","firstNames":"","lastName":"","address":{"line1":"","country":""},"email":"","phone":"","channel":""},
 "signedAt":"0001-01-01T00:00:00Z"
 }`
 

diff --git a/internal/shared/person.go b/internal/shared/person.go
@@ -6,7 +6,7 @@ type Address struct {
 	Line1    string `json:"line1"`
 	Line2    string `json:"line2,omitempty"`
 	Line3    string `json:"line3,omitempty"`
-	Town     string `json:"town"`
+	Town     string `json:"town,omitempty"`
 	Postcode string `json:"postcode,omitempty"`
 	Country  string `json:"country"`
 }

diff --git a/internal/validate/validate.go b/internal/validate/validate.go
@@ -82,7 +82,6 @@ func OptionalTime(source string, t *time.Time) []shared.FieldError {
 func Address(prefix string, address shared.Address) []shared.FieldError {
 	return All(
 		Required(fmt.Sprintf("%s/line1", prefix), address.Line1),
-		Required(fmt.Sprintf("%s/town", prefix), address.Town),
 		Required(fmt.Sprintf("%s/country", prefix), address.Country),
 		Country(fmt.Sprintf("%s/country", prefix), address.Country),
 	)

diff --git a/internal/validate/validate_test.go b/internal/validate/validate_test.go
@@ -10,7 +10,6 @@ import (
 
 var validAddress = shared.Address{
 	Line1:   "123 Main St",
-	Town:    "Homeland",
 	Country: "GB",
 }
 
@@ -86,7 +85,6 @@ func TestAddressEmpty(t *testing.T) {
 	errors := Address("/test", address)
 
 	assert.Contains(t, errors, shared.FieldError{Source: "/test/line1", Detail: "field is required"})
-	assert.Contains(t, errors, shared.FieldError{Source: "/test/town", Detail: "field is required"})
 	assert.Contains(t, errors, shared.FieldError{Source: "/test/country", Detail: "field is required"})
 }
 
@@ -99,7 +97,6 @@ func TestAddressValid(t *testing.T) {
 func TestAddressInvalidCountry(t *testing.T) {
 	invalidAddress := shared.Address{
 		Line1:   "123 Main St",
-		Town:    "Homeland",
 		Country: "United Kingdom",
 	}
 	errors := Address("/test", invalidAddress)

diff --git a/lambda/create/validate_test.go b/lambda/create/validate_test.go
@@ -10,7 +10,6 @@ import (
 
 var validAddress = shared.Address{
 	Line1:   "123 Main St",
-	Town:    "Homeland",
 	Country: "GB",
 }
 
@@ -46,7 +45,6 @@ func TestValidateAttorneyEmpty(t *testing.T) {
 	assert.Contains(t, errors, shared.FieldError{Source: "/test/status", Detail: "field is required"})
 	assert.Contains(t, errors, shared.FieldError{Source: "/test/dateOfBirth", Detail: "field is required"})
 	assert.Contains(t, errors, shared.FieldError{Source: "/test/address/line1", Detail: "field is required"})
-	assert.Contains(t, errors, shared.FieldError{Source: "/test/address/town", Detail: "field is required"})
 	assert.Contains(t, errors, shared.FieldError{Source: "/test/address/country", Detail: "field is required"})
 }
 
@@ -105,7 +103,6 @@ func TestValidateTrustCorporationEmpty(t *testing.T) {
 	assert.Contains(t, errors, shared.FieldError{Source: "/test/email", Detail: "field is required"})
 	assert.Contains(t, errors, shared.FieldError{Source: "/test/status", Detail: "field is required"})
 	assert.Contains(t, errors, shared.FieldError{Source: "/test/address/line1", Detail: "field is required"})
-	assert.Contains(t, errors, shared.FieldError{Source: "/test/address/town", Detail: "field is required"})
 	assert.Contains(t, errors, shared.FieldError{Source: "/test/address/country", Detail: "field is required"})
 }