Merge pull request #1477 from ministryofjustice/MLPAB-2486-vouch-star…

…tpage-URL MLPAB-2486: Add voucher start URL to invite email, extend default timeout to 30 seconds
ministryofjustice · Sep 11, 2024 · 4440920 · 4440920
2 parents 54f60ea + 09235d2
commit 4440920
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/cmd/mlpa/main.go b/cmd/mlpa/main.go
@@ -132,7 +132,7 @@ func run(ctx context.Context, logger *slog.Logger) error {
 	}
 	staticHash = url.QueryEscape(staticHash[3:11])
 
-	httpClient := &http.Client{Timeout: 10 * time.Second}
+	httpClient := &http.Client{Timeout: 30 * time.Second}
 
 	if xrayEnabled {
 		resource, err := ecs.NewResourceDetector().Detect(ctx)

diff --git a/internal/notify/email.go b/internal/notify/email.go
@@ -249,6 +249,7 @@ type VoucherInviteEmail struct {
 	DonorFirstNamesPossessive string
 	DonorFirstNames           string
 	LpaType                   string
+	VoucherStartPageURL       string
 }
 
 func (s VoucherInviteEmail) emailID(isProduction bool) string {

diff --git a/internal/sharecode/sender.go b/internal/sharecode/sender.go
@@ -178,6 +178,7 @@ func (s *Sender) SendVoucherAccessCode(ctx context.Context, donor *donordata.Pro
 		DonorFirstNamesPossessive: appData.Localizer.Possessive(donor.Donor.FirstNames),
 		DonorFirstNames:           donor.Donor.FirstNames,
 		LpaType:                   appData.Localizer.T(donor.Type.String()),
+		VoucherStartPageURL:       s.appPublicURL + page.PathVoucherStart.Format(),
 	})
 }
 

diff --git a/internal/sharecode/sender_test.go b/internal/sharecode/sender_test.go
@@ -1161,6 +1161,7 @@ func TestSendVoucherAccessCode(t *testing.T) {
 							DonorFirstNamesPossessive: "Possessive first names",
 							DonorFirstNames:           "a",
 							LpaType:                   "translated type",
+							VoucherStartPageURL:       "http://app" + page.PathVoucherStart.Format(),
 						}).
 					Return(nil)
 				return nc
@@ -1207,6 +1208,7 @@ func TestSendVoucherAccessCode(t *testing.T) {
 							DonorFirstNamesPossessive: "Possessive first names",
 							DonorFirstNames:           "a",
 							LpaType:                   "translated type",
+							VoucherStartPageURL:       "http://app" + page.PathVoucherStart.Format(),
 						}).
 					Return(nil)
 				return nc