Vega 2656 add appointment type and new status (#277)

* VEGA-2656 add appointment type and new status to Attorney struct * Update unit tests * make appointmentType optional * Revert counting attorneys by appointmentType
ministryofjustice · Nov 18, 2024 · ca27962 · ca27962
1 parent 8949811
commit ca27962
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 19 deletions.
diff --git a/docs/example-lpa.json b/docs/example-lpa.json
@@ -26,6 +26,7 @@
       },
       "dateOfBirth": "1982-07-24",
       "status": "active",
+      "appointmentType": "original",
       "channel": "paper"
     }
   ],

diff --git a/docs/schemas/2024-10/lpa.json b/docs/schemas/2024-10/lpa.json
@@ -43,6 +43,14 @@
           "signedAt": {
             "type": "string",
             "format": "date-time"
+          },
+          "status": {
+            "type": "string",
+            "enum": ["active", "inactive", "replacement", "removed"]
+          },
+          "appointmentType": {
+            "type": "string",
+            "enum": ["original", "replacement"]
           }
         }
       }

diff --git a/internal/shared/person.go b/internal/shared/person.go
@@ -57,24 +57,37 @@ type AttorneyStatus string
 
 const (
 	AttorneyStatusActive      = AttorneyStatus("active")
+	AttorneyStatusInactive    = AttorneyStatus("inactive")
 	AttorneyStatusReplacement = AttorneyStatus("replacement")
 	AttorneyStatusRemoved     = AttorneyStatus("removed")
 )
 
 func (a AttorneyStatus) IsValid() bool {
-	return a == AttorneyStatusActive || a == AttorneyStatusReplacement || a == AttorneyStatusRemoved
+	return a == AttorneyStatusActive || a == AttorneyStatusReplacement || a == AttorneyStatusRemoved || a == AttorneyStatusInactive
+}
+
+type AppointmentType string
+
+const (
+	AppointmentTypeOriginal    = AppointmentType("original")
+	AppointmentTypeReplacement = AppointmentType("replacement")
+)
+
+func (a AppointmentType) IsValid() bool {
+	return true
 }
 
 type Attorney struct {
 	Person
-	Address                   Address        `json:"address"`
-	DateOfBirth               Date           `json:"dateOfBirth"`
-	Email                     string         `json:"email,omitempty"`
-	Status                    AttorneyStatus `json:"status"`
-	Mobile                    string         `json:"mobile,omitempty"`
-	SignedAt                  *time.Time     `json:"signedAt,omitempty"`
-	ContactLanguagePreference Lang           `json:"contactLanguagePreference,omitempty"`
-	Channel                   Channel        `json:"channel"`
+	Address                   Address         `json:"address"`
+	DateOfBirth               Date            `json:"dateOfBirth"`
+	Email                     string          `json:"email,omitempty"`
+	Status                    AttorneyStatus  `json:"status"`
+	AppointmentType           AppointmentType `json:"appointmentType"`
+	Mobile                    string          `json:"mobile,omitempty"`
+	SignedAt                  *time.Time      `json:"signedAt,omitempty"`
+	ContactLanguagePreference Lang            `json:"contactLanguagePreference,omitempty"`
+	Channel                   Channel         `json:"channel"`
 }
 
 type TrustCorporation struct {

diff --git a/lambda/create/main_test.go b/lambda/create/main_test.go
@@ -47,6 +47,7 @@ var (
 				Line1:   "attorney-line1",
 				Country: "GB",
 			},
+			AppointmentType:           shared.AppointmentTypeOriginal,
 			DateOfBirth:               makeDate("2020-02-03"),
 			ContactLanguagePreference: shared.LangEn,
 			Status:                    shared.AttorneyStatusActive,

diff --git a/lambda/create/validate_test.go b/lambda/create/validate_test.go
@@ -26,11 +26,12 @@ func makeAttorney() shared.Attorney {
 			FirstNames: "Sharonda",
 			LastName:   "Graciani",
 		},
-		Address:     validAddress,
-		Email:       "[email protected]",
-		Channel:     shared.ChannelOnline,
-		DateOfBirth: newDate("1977-10-30"),
-		Status:      shared.AttorneyStatusActive,
+		Address:         validAddress,
+		AppointmentType: shared.AppointmentTypeOriginal,
+		Email:           "[email protected]",
+		Channel:         shared.ChannelOnline,
+		DateOfBirth:     newDate("1977-10-30"),
+		Status:          shared.AttorneyStatusActive,
 	}
 }
 
@@ -41,11 +42,12 @@ func makeReplacementAttorney() shared.Attorney {
 			FirstNames: "Sharonda",
 			LastName:   "Graciani",
 		},
-		Address:     validAddress,
-		Email:       "[email protected]",
-		Channel:     shared.ChannelOnline,
-		DateOfBirth: newDate("1977-10-30"),
-		Status:      shared.AttorneyStatusReplacement,
+		Address:         validAddress,
+		AppointmentType: shared.AppointmentTypeReplacement,
+		Email:           "[email protected]",
+		Channel:         shared.ChannelOnline,
+		DateOfBirth:     newDate("1977-10-30"),
+		Status:          shared.AttorneyStatusReplacement,
 	}
 }
 

diff --git a/mock-apigw/main.go b/mock-apigw/main.go
@@ -148,6 +148,7 @@ func handlePactState(r *http.Request) error {
 					"lastName": "Vallar",
 					"dateOfBirth": "2001-01-17",
 					"status": "active",
+					"appointmentType": "original",
 					"address": {
 						"line1": "71 South Western Terrace",
 						"town": "Milton",