Resequence and rename to match updated prototype flow

app/internal/page/app.go

@@ -82,10 +82,10 @@ func App(
 		LpaType(tmpls.Get("lpa_type.gohtml"), dataStore))
 	handle(whoIsTheLpaForPath, RequireSession,
 		WhoIsTheLpaFor(tmpls.Get("who_is_the_lpa_for.gohtml"), dataStore))
-	handle(donorDetailsPath, RequireSession,
-		DonorDetails(tmpls.Get("donor_details.gohtml"), dataStore))
-	handle(donorAddressPath, RequireSession,
-		DonorAddress(logger, tmpls.Get("donor_address.gohtml"), addressClient, dataStore))
+	handle(yourDetailsPath, RequireSession,
+		YourDetails(tmpls.Get("your_details.gohtml"), dataStore))
+	handle(yourAddressPath, RequireSession,
+		YourAddress(logger, tmpls.Get("your_address.gohtml"), addressClient, dataStore))
 	handle(howWouldYouLikeToBeContactedPath, RequireSession,
 		HowWouldYouLikeToBeContacted(tmpls.Get("how_would_you_like_to_be_contacted.gohtml"), dataStore))
 	handle(taskListPath, RequireSession,

app/internal/page/auth_redirect.go

@@ -49,6 +49,6 @@ func AuthRedirect(logger Logger, c authRedirectClient, store sessions.Store) htt
 			return
 		}
 
-		http.Redirect(w, r, lpaTypePath, http.StatusFound)
+		http.Redirect(w, r, yourDetailsPath, http.StatusFound)
 	}
 }

app/internal/page/auth_redirect_test.go

@@ -49,7 +49,7 @@ func TestAuthRedirect(t *testing.T) {
 	resp := w.Result()
 
 	assert.Equal(t, http.StatusFound, resp.StatusCode)
-	assert.Equal(t, resp.Header.Get("Location"), lpaTypePath)
+	assert.Equal(t, yourDetailsPath, resp.Header.Get("Location"))
 	mock.AssertExpectationsForObjects(t, client, sessionsStore)
 }
 

app/internal/page/data.go

@@ -7,14 +7,14 @@ import (
 )
 
 type Lpa struct {
-	Donor    Donor
+	You      Person
 	Attorney Attorney
 	WhoFor   string
 	Contact  []string
 	Type     string
 }
 
-type Donor struct {
+type Person struct {
 	FirstNames  string
 	LastName    string
 	OtherNames  string

app/internal/page/lpa_type.go

@@ -33,7 +33,7 @@ func LpaType(tmpl template.Template, dataStore DataStore) Handler {
 				if err := dataStore.Put(r.Context(), appData.SessionID, lpa); err != nil {
 					return err
 				}
-				appData.Lang.Redirect(w, r, whoIsTheLpaForPath, http.StatusFound)
+				appData.Lang.Redirect(w, r, taskListPath, http.StatusFound)
 				return nil
 			}
 		}

app/internal/page/lpa_type_test.go

@@ -128,7 +128,7 @@ func TestPostLpaType(t *testing.T) {
 
 	assert.Nil(t, err)
 	assert.Equal(t, http.StatusFound, resp.StatusCode)
-	assert.Equal(t, whoIsTheLpaForPath, resp.Header.Get("Location"))
+	assert.Equal(t, taskListPath, resp.Header.Get("Location"))
 	mock.AssertExpectationsForObjects(t, dataStore)
 }
 

app/internal/page/paths.go

@@ -6,8 +6,8 @@ const (
 
 	startPath                        = "/start"
 	homePath                         = "/home"
-	donorDetailsPath                 = "/donor-details"
-	donorAddressPath                 = "/donor-address"
+	yourDetailsPath                  = "/your-details"
+	yourAddressPath                  = "/your-address"
 	whoIsTheLpaForPath               = "/who-is-the-lpa-for"
 	howWouldYouLikeToBeContactedPath = "/how-would-you-like-to-be-contacted"
 	lpaTypePath                      = "/lpa-type"

app/internal/page/task_list.go

@@ -36,8 +36,7 @@ func TaskList(tmpl template.Template, dataStore DataStore) Handler {
 				{
 					Heading: "fillInTheLpa",
 					Items: []taskListItem{
-						{Name: "provideDonorDetails", Path: donorDetailsPath, Completed: lpa.Donor.Address.Line1 != ""},
-						{Name: "chooseYourContactPreferences", Path: howWouldYouLikeToBeContactedPath, Completed: len(lpa.Contact) > 0},
+						{Name: "provideDonorDetails", Path: yourDetailsPath, Completed: lpa.You.Address.Line1 != ""},
 						{Name: "chooseYourAttorneys", Path: chooseAttorneysPath, Completed: lpa.Attorney.Address.Line1 != ""},
 						{Name: "chooseYourReplacementAttorneys"},
 						{Name: "chooseWhenTheLpaCanBeUsed"},

app/internal/page/task_list_test.go

@@ -25,8 +25,7 @@ func TestGetTaskList(t *testing.T) {
 				{
 					Heading: "fillInTheLpa",
 					Items: []taskListItem{
-						{Name: "provideDonorDetails", Path: donorDetailsPath},
-						{Name: "chooseYourContactPreferences", Path: howWouldYouLikeToBeContactedPath},
+						{Name: "provideDonorDetails", Path: yourDetailsPath},
 						{Name: "chooseYourAttorneys", Path: chooseAttorneysPath},
 						{Name: "chooseYourReplacementAttorneys"},
 						{Name: "chooseWhenTheLpaCanBeUsed"},
@@ -72,7 +71,7 @@ func TestGetTaskListWhenComplete(t *testing.T) {
 
 	dataStore := &mockDataStore{
 		data: Lpa{
-			Donor: Donor{
+			You: Person{
 				Address: Address{
 					Line1: "this",
 				},
@@ -97,8 +96,7 @@ func TestGetTaskListWhenComplete(t *testing.T) {
 				{
 					Heading: "fillInTheLpa",
 					Items: []taskListItem{
-						{Name: "provideDonorDetails", Path: donorDetailsPath, Completed: true},
-						{Name: "chooseYourContactPreferences", Path: howWouldYouLikeToBeContactedPath, Completed: true},
+						{Name: "provideDonorDetails", Path: yourDetailsPath, Completed: true},
 						{Name: "chooseYourAttorneys", Path: chooseAttorneysPath, Completed: true},
 						{Name: "chooseYourReplacementAttorneys"},
 						{Name: "chooseWhenTheLpaCanBeUsed"},

app/internal/page/who_is_the_lpa_for.go

@@ -33,7 +33,7 @@ func WhoIsTheLpaFor(tmpl template.Template, dataStore DataStore) Handler {
 				if err := dataStore.Put(r.Context(), appData.SessionID, lpa); err != nil {
 					return err
 				}
-				appData.Lang.Redirect(w, r, donorDetailsPath, http.StatusFound)
+				appData.Lang.Redirect(w, r, lpaTypePath, http.StatusFound)
 				return nil
 			}
 		}

app/internal/page/who_is_the_lpa_for_test.go

@@ -128,7 +128,7 @@ func TestPostWhoIsTheLpaFor(t *testing.T) {
 
 	assert.Nil(t, err)
 	assert.Equal(t, http.StatusFound, resp.StatusCode)
-	assert.Equal(t, donorDetailsPath, resp.Header.Get("Location"))
+	assert.Equal(t, lpaTypePath, resp.Header.Get("Location"))
 	mock.AssertExpectationsForObjects(t, dataStore)
 }
 

app/internal/page/donor_address.go → app/internal/page/your_address.go

@@ -6,40 +6,40 @@ import (
 	"github.com/ministryofjustice/opg-go-common/template"
 )
 
-type donorAddressData struct {
+type yourAddressData struct {
 	App       AppData
 	Errors    map[string]string
 	Addresses []Address
-	Form      *donorAddressForm
+	Form      *yourAddressForm
 }
 
-func DonorAddress(logger Logger, tmpl template.Template, addressClient AddressClient, dataStore DataStore) Handler {
+func YourAddress(logger Logger, tmpl template.Template, addressClient AddressClient, dataStore DataStore) Handler {
 	return func(appData AppData, w http.ResponseWriter, r *http.Request) error {
 		var lpa Lpa
 		if err := dataStore.Get(r.Context(), appData.SessionID, &lpa); err != nil {
 			return err
 		}
 
-		data := &donorAddressData{
+		data := &yourAddressData{
 			App:  appData,
-			Form: &donorAddressForm{},
+			Form: &yourAddressForm{},
 		}
 
-		if lpa.Donor.Address.Line1 != "" {
+		if lpa.You.Address.Line1 != "" {
 			data.Form.Action = "manual"
-			data.Form.Address = &lpa.Donor.Address
+			data.Form.Address = &lpa.You.Address
 		}
 
 		if r.Method == http.MethodPost {
-			data.Form = readDonorAddressForm(r)
+			data.Form = readYourAddressForm(r)
 			data.Errors = data.Form.Validate()
 
 			if (data.Form.Action == "manual" || data.Form.Action == "select") && len(data.Errors) == 0 {
-				lpa.Donor.Address = *data.Form.Address
+				lpa.You.Address = *data.Form.Address
 				if err := dataStore.Put(r.Context(), appData.SessionID, lpa); err != nil {
 					return err
 				}
-				appData.Lang.Redirect(w, r, howWouldYouLikeToBeContactedPath, http.StatusFound)
+				appData.Lang.Redirect(w, r, whoIsTheLpaForPath, http.StatusFound)
 				return nil
 			}
 
@@ -66,14 +66,14 @@ func DonorAddress(logger Logger, tmpl template.Template, addressClient AddressCl
 	}
 }
 
-type donorAddressForm struct {
+type yourAddressForm struct {
 	Action         string
 	LookupPostcode string
 	Address        *Address
 }
 
-func readDonorAddressForm(r *http.Request) *donorAddressForm {
-	d := &donorAddressForm{}
+func readYourAddressForm(r *http.Request) *yourAddressForm {
+	d := &yourAddressForm{}
 	d.Action = r.PostFormValue("action")
 
 	switch d.Action {
@@ -99,7 +99,7 @@ func readDonorAddressForm(r *http.Request) *donorAddressForm {
 	return d
 }
 
-func (d *donorAddressForm) Validate() map[string]string {
+func (d *yourAddressForm) Validate() map[string]string {
 	errors := map[string]string{}
 
 	switch d.Action {