update with main

transcom · Sep 19, 2024 · 4156774 · 4156774
2 parents 6ca3ba8 + a4710fa
commit 4156774
Show file tree

Hide file tree

Showing 117 changed files with 5,119 additions and 872 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -872,6 +872,7 @@ commands:
             export FEATURE_FLAG_MOVE_LOCK=false
             export FEATURE_FLAG_OKTA_DODID_INPUT=false
             export FEATURE_FLAG_HEADQUARTERS_ROLE=false
+            export FEATURE_FLAG_GSR_ROLE=false
             export FEATURE_FLAG_SAFETY_MOVE=false
             export FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
             export FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
@@ -911,6 +912,7 @@ commands:
             FEATURE_FLAG_MOVE_LOCK: 'false'
             FEATURE_FLAG_OKTA_DODID_INPUT: 'false'
             FEATURE_FLAG_HEADQUARTERS_ROLE: 'false'
+            FEATURE_FLAG_GSR_ROLE: 'false'
             FEATURE_FLAG_SAFETY_MOVE: 'false'
             FEATURE_FLAG_MANAGE_SUPPORTING_DOCS: 'false'
             FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE: 'false'

diff --git a/.envrc b/.envrc
@@ -142,6 +142,9 @@ export FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
 # Feature flag to disable/enable headquarters role
 export FEATURE_FLAG_HEADQUARTERS_ROLE=true
 
+# Feature flag to disable/enable GSR role
+export FEATURE_FLAG_GSR_ROLE=false
+
 # Feature flag to disable/enable supervisor queue management
 export FEATURE_FLAG_QUEUE_MANAGEMENT=true
 

diff --git a/cmd/generate-shipment-summary/main.go b/cmd/generate-shipment-summary/main.go
@@ -19,7 +19,10 @@ import (
 	"github.com/transcom/mymove/pkg/cli"
 	"github.com/transcom/mymove/pkg/logging"
 	"github.com/transcom/mymove/pkg/paperwork"
+	paymentrequesthelper "github.com/transcom/mymove/pkg/payment_request"
 	"github.com/transcom/mymove/pkg/route"
+	ppmcloseout "github.com/transcom/mymove/pkg/services/ppm_closeout"
+	"github.com/transcom/mymove/pkg/services/ppmshipment"
 	shipmentsummaryworksheet "github.com/transcom/mymove/pkg/services/shipment_summary_worksheet"
 	"github.com/transcom/mymove/pkg/storage"
 	"github.com/transcom/mymove/pkg/uploader"
@@ -148,7 +151,11 @@ func main() {
 
 	// TODO: Future cleanup will need to remap to a different planner, but this command should remain for testing purposes
 	planner := route.NewHEREPlanner(hereClient, geocodeEndpoint, routingEndpoint, testAppID, testAppCode)
-	ppmComputer := shipmentsummaryworksheet.NewSSWPPMComputer()
+	ppmEstimator := ppmshipment.NewEstimatePPM(planner, &paymentrequesthelper.RequestPaymentHelper{})
+
+	ppmCloseoutFetcher := ppmcloseout.NewPPMCloseoutFetcher(planner, &paymentrequesthelper.RequestPaymentHelper{}, ppmEstimator)
+
+	ppmComputer := shipmentsummaryworksheet.NewSSWPPMComputer(ppmCloseoutFetcher)
 
 	ssfd, err := ppmComputer.FetchDataShipmentSummaryWorksheetFormData(appCtx, &auth.Session{}, parsedID)
 	if err != nil {
@@ -169,11 +176,11 @@ func main() {
 		log.Fatal(err.Error())
 	}
 
-	page1Data, page2Data, err := ppmComputer.FormatValuesShipmentSummaryWorksheet(*ssfd, false)
+	page1Data, page2Data, page3Data, err := ppmComputer.FormatValuesShipmentSummaryWorksheet(*ssfd, false)
 	noErr(err)
 	ppmGenerator, err := shipmentsummaryworksheet.NewSSWPPMGenerator(generator)
 	noErr(err)
-	ssw, info, err := ppmGenerator.FillSSWPDFForm(page1Data, page2Data)
+	ssw, info, err := ppmGenerator.FillSSWPDFForm(page1Data, page2Data, page3Data)
 	noErr(err)
 	fmt.Println(ssw.Name())     // Should always return
 	fmt.Println(info.PageCount) // Page count should always be 2

diff --git a/config/env/demo.app-client-tls.env b/config/env/demo.app-client-tls.env
@@ -41,6 +41,7 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
 FEATURE_FLAG_HEADQUARTERS_ROLE=false
+FEATURE_FLAG_GSR_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false
 FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
 FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false

diff --git a/config/env/demo.app.env b/config/env/demo.app.env
@@ -46,6 +46,7 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
 FEATURE_FLAG_HEADQUARTERS_ROLE=false
+FEATURE_FLAG_GSR_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false
 FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
 FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false

diff --git a/config/env/exp.app-client-tls.env b/config/env/exp.app-client-tls.env
@@ -41,6 +41,7 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
 FEATURE_FLAG_HEADQUARTERS_ROLE=false
+FEATURE_FLAG_GSR_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false
 FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
 FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false

diff --git a/config/env/exp.app.env b/config/env/exp.app.env
@@ -46,6 +46,7 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
 FEATURE_FLAG_HEADQUARTERS_ROLE=false
+FEATURE_FLAG_GSR_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false
 FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
 FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false

diff --git a/config/env/loadtest.app-client-tls.env b/config/env/loadtest.app-client-tls.env
@@ -39,6 +39,7 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
 FEATURE_FLAG_HEADQUARTERS_ROLE=false
+FEATURE_FLAG_GSR_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false
 FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
 FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false

diff --git a/config/env/loadtest.app.env b/config/env/loadtest.app.env
@@ -44,6 +44,7 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
 FEATURE_FLAG_HEADQUARTERS_ROLE=false
+FEATURE_FLAG_GSR_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false
 FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
 FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false

diff --git a/config/env/prd.app-client-tls.env b/config/env/prd.app-client-tls.env
@@ -38,6 +38,7 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
 FEATURE_FLAG_HEADQUARTERS_ROLE=false
+FEATURE_FLAG_GSR_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false
 FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
 FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false

diff --git a/config/env/prd.app.env b/config/env/prd.app.env
@@ -45,6 +45,7 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
 FEATURE_FLAG_HEADQUARTERS_ROLE=false
+FEATURE_FLAG_GSR_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false
 FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
 FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false

diff --git a/config/env/stg.app-client-tls.env b/config/env/stg.app-client-tls.env
@@ -40,6 +40,7 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
 FEATURE_FLAG_HEADQUARTERS_ROLE=false
+FEATURE_FLAG_GSR_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false
 FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
 FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false

diff --git a/config/env/stg.app.env b/config/env/stg.app.env
@@ -46,6 +46,7 @@ FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false
 FEATURE_FLAG_MOVE_LOCK=false
 FEATURE_FLAG_OKTA_DODID_INPUT=false
 FEATURE_FLAG_HEADQUARTERS_ROLE=false
+FEATURE_FLAG_GSR_ROLE=false
 FEATURE_FLAG_SAFETY_MOVE=false
 FEATURE_FLAG_MANAGE_SUPPORTING_DOCS=false
 FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false

diff --git a/config/flipt/storage/development.features.yaml b/config/flipt/storage/development.features.yaml
@@ -9,6 +9,14 @@ flags:
   - segment:
       key: mil-app
       value: true
+- key: gsr_role
+  name: Government Surveillance Representative Role feature flag
+  type: BOOLEAN_FLAG_TYPE
+  enabled: false
+  rollouts:
+  - segment:
+      key: mil-app
+      value: false
 - key: safety_move
   name: Safety Move feature flag
   type: BOOLEAN_FLAG_TYPE

diff --git a/go.mod b/go.mod
@@ -9,16 +9,16 @@ require (
 	github.com/alexedwards/scs/v2 v2.8.0
 	github.com/aws/aws-sdk-go-v2 v1.30.5
 	github.com/aws/aws-sdk-go-v2/config v1.27.28
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.28
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.32
 	github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.4.17
 	github.com/aws/aws-sdk-go-v2/service/cloudwatchevents v1.23.6
-	github.com/aws/aws-sdk-go-v2/service/ecr v1.32.1
+	github.com/aws/aws-sdk-go-v2/service/ecr v1.32.4
 	github.com/aws/aws-sdk-go-v2/service/ecs v1.44.3
 	github.com/aws/aws-sdk-go-v2/service/rds v1.78.2
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0
 	github.com/aws/aws-sdk-go-v2/service/ses v1.25.3
-	github.com/aws/aws-sdk-go-v2/service/ssm v1.52.3
-	github.com/aws/aws-sdk-go-v2/service/sts v1.30.4
+	github.com/aws/aws-sdk-go-v2/service/ssm v1.52.8
+	github.com/aws/aws-sdk-go-v2/service/sts v1.30.7
 	github.com/aws/smithy-go v1.20.4
 	github.com/benbjohnson/clock v1.3.5
 	github.com/codegangsta/gin v0.0.0-20211113050330-71f90109db02
@@ -94,7 +94,7 @@ require (
 	golang.org/x/crypto v0.26.0
 	golang.org/x/net v0.28.0
 	golang.org/x/oauth2 v0.22.0
-	golang.org/x/text v0.17.0
+	golang.org/x/text v0.18.0
 	golang.org/x/tools v0.24.0
 	google.golang.org/grpc v1.65.0
 	gopkg.in/dnaeon/go-vcr.v3 v3.2.0
@@ -135,17 +135,17 @@ require (
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.22.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/brunoscheufler/aws-ecs-metadata-go v0.0.0-20221221133751-67e37ae746cd // indirect
 	github.com/chigopher/pathlib v1.0.0 // indirect

diff --git a/go.sum b/go.sum
@@ -48,32 +48,32 @@ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5L
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw=
 github.com/aws/aws-sdk-go-v2/config v1.27.28 h1:OTxWGW/91C61QlneCtnD62NLb4W616/NM1jA8LhJqbg=
 github.com/aws/aws-sdk-go-v2/config v1.27.28/go.mod h1:uzVRVtJSU5EFv6Fu82AoVFKozJi2ZCY6WRCXj06rbvs=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.28 h1:m8+AHY/ND8CMHJnPoH7PJIRakWGa4gbfbxuY9TGTUXM=
-github.com/aws/aws-sdk-go-v2/credentials v1.17.28/go.mod h1:6TF7dSc78ehD1SL6KpRIPKMA1GyyWflIkjqg+qmf4+c=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 h1:yjwoSyDZF8Jth+mUk5lSPJCkMC0lMy6FaCD51jm6ayE=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12/go.mod h1:fuR57fAgMk7ot3WcNQfb6rSEn+SUffl7ri+aa8uKysI=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.32 h1:7Cxhp/BnT2RcGy4VisJ9miUPecY+lyE9I8JvcZofn9I=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.32/go.mod h1:P5/QMF3/DCHbXGEGkdbilXHsyTBX5D3HSwcrSc9p20I=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 h1:pfQ2sqNpMVK6xz2RbqLEL0GH87JOwSxPV2rzm8Zsb74=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13/go.mod h1:NG7RXPUlqfsCLLFfi0+IpKN4sCB9D9fw/qTaSB+xRoU=
 github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.4.17 h1:MQYm6459SmYeb9FBKnHvKX6HF3AjHjZZg0FPn0ytr7M=
 github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.4.17/go.mod h1:YLZH6FBahf70zVnLihloM8XJgaXg6+f1ZFNNGfBYnRI=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 h1:TNyt/+X43KJ9IJJMjKfa3bNTiZbUP7DeCxfbTROESwY=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16/go.mod h1:2DwJF39FlNAUiX5pAc0UNeiz16lK2t7IaFcm0LFHEgc=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 h1:jYfy8UPmd+6kJW5YhY0L1/KftReOGxI/4NtVSTh9O/I=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16/go.mod h1:7ZfEPZxkW42Afq4uQB8H2E2e6ebh6mXTueEpYzjCzcs=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 h1:pI7Bzt0BJtYA0N/JEC6B8fJ4RBrEMi1LBrkMdFYNSnQ=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17/go.mod h1:Dh5zzJYMtxfIjYW+/evjQ8uj2OyR/ve2KROHGHlSFqE=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 h1:Mqr/V5gvrhA2gvgnF42Zh5iMiQNcOYthFYwCyrnuWlc=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17/go.mod h1:aLJpZlCmjE+V+KtN1q1uyZkfnUWpQGpbsn89XPKyzfU=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 h1:mimdLQkIX1zr8GIPY1ZtALdBQGxcASiBd2MOp8m/dMc=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16/go.mod h1:YHk6owoSwrIsok+cAH9PENCOGoH5PU2EllX4vLtSrsY=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchevents v1.23.6 h1:s9TaIFJJ1zVLiKoxvclHNXjcZ+9+JnHvVgWfQgN9srQ=
 github.com/aws/aws-sdk-go-v2/service/cloudwatchevents v1.23.6/go.mod h1:9h+vJwhl865wjyC7AQOBX4LVQxgntBYrf3p5WtzOSi0=
-github.com/aws/aws-sdk-go-v2/service/ecr v1.32.1 h1:PxM8EHsv1sd9eWGamMQCvqBEjxytK5kAwjrxlfG3tac=
-github.com/aws/aws-sdk-go-v2/service/ecr v1.32.1/go.mod h1:kdk+WJbHcGVbIlRQfSrKyuKkbWDdD8I9NScyS5vZ8eQ=
+github.com/aws/aws-sdk-go-v2/service/ecr v1.32.4 h1:nQAU2Yr+afkAvIV39mg7LrNYFNQP7ShwbmiJqx2fUKA=
+github.com/aws/aws-sdk-go-v2/service/ecr v1.32.4/go.mod h1:keOS9j4fv5ASh7dV29lIpGw2QgoJwGFAyMU0uPvfax4=
 github.com/aws/aws-sdk-go-v2/service/ecs v1.44.3 h1:JkVDQ9mfUSwMOGWIEmyB74mIznjKnHykJSq3uwusBBs=
 github.com/aws/aws-sdk-go-v2/service/ecs v1.44.3/go.mod h1:MsQWy/90Xwn3cy5u+eiiXqC521xIm21wOODIweLo4hs=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 h1:KypMCbLPPHEmf9DgMGw51jMj77VfGPAN2Kv4cfhlfgI=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4/go.mod h1:Vz1JQXliGcQktFTN/LN6uGppAIRoLBR2bMvIMP0gOjc=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 h1:GckUnpm4EJOAio1c8o25a+b3lVfwVzC9gnSBqiiNmZM=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18/go.mod h1:Br6+bxfG33Dk3ynmkhsW2Z/t9D4+lRqdLDNCKi85w0U=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 h1:tJ5RnkHCiSH0jyd6gROjlJtNwov0eGYNz8s8nFcR0jQ=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18/go.mod h1:++NHzT+nAF7ZPrHPsA+ENvsXkOO8wEu+C6RXltAG4/c=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 h1:rfprUlsdzgl7ZL2KlXiUAoJnI/VxfHCvDFr2QDFj6u4=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19/go.mod h1:SCWkEdRq8/7EK60NcvvQ6NXKuTcchAD4ROAsC37VEZE=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 h1:jg16PhLPUiHIj8zYIW6bqzeQSuHVEiWnGA0Brz5Xv2I=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16/go.mod h1:Uyk1zE1VVdsHSU7096h/rwnXDzOzYQVl+FNPhPw7ShY=
 github.com/aws/aws-sdk-go-v2/service/rds v1.78.2 h1:xrRLjWcGzeayJT66aP9qnMrn1iKXYaK/+efukoitIXs=
@@ -82,14 +82,14 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 h1:Cso4Ev/XauMVsbwdhYEoxg8rxZWw4
 github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI=
 github.com/aws/aws-sdk-go-v2/service/ses v1.25.3 h1:wcfUsE2nqsXhEj68gxr7MnGXNPcBPKx0RW2DzBVgVlM=
 github.com/aws/aws-sdk-go-v2/service/ses v1.25.3/go.mod h1:6Ul/Ir8oOCsI3dFN0prULK9fvpxP+WTYmlHDkFzaAVA=
-github.com/aws/aws-sdk-go-v2/service/ssm v1.52.3 h1:iu53lwRKbZOGCVUH09g3J0xU8A+bAGVo09VR9K4d0Yg=
-github.com/aws/aws-sdk-go-v2/service/ssm v1.52.3/go.mod h1:v7NIzEFIHBiicOMaMTuEmbnzGnqW0d+6ulNALul6fYE=
-github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 h1:zCsFCKvbj25i7p1u94imVoO447I/sFv8qq+lGJhRN0c=
-github.com/aws/aws-sdk-go-v2/service/sso v1.22.5/go.mod h1:ZeDX1SnKsVlejeuz41GiajjZpRSWR7/42q/EyA/QEiM=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 h1:SKvPgvdvmiTWoi0GAJ7AsJfOz3ngVkD/ERbs5pUnHNI=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5/go.mod h1:20sz31hv/WsPa3HhU3hfrIet2kxM4Pe0r20eBZ20Tac=
-github.com/aws/aws-sdk-go-v2/service/sts v1.30.4 h1:iAckBT2OeEK/kBDyN/jDtpEExhjeeA/Im2q4X0rJZT8=
-github.com/aws/aws-sdk-go-v2/service/sts v1.30.4/go.mod h1:vmSqFK+BVIwVpDAGZB3CoCXHzurt4qBE8lf+I/kRTh0=
+github.com/aws/aws-sdk-go-v2/service/ssm v1.52.8 h1:7cjN4Wp3U3cud17TsnUxSomTwKzKQGUWdq/N1aWqgMk=
+github.com/aws/aws-sdk-go-v2/service/ssm v1.52.8/go.mod h1:nUSNPaG8mv5rIu7EclHnFqZOjhreEUwRKENtKTtJ9aw=
+github.com/aws/aws-sdk-go-v2/service/sso v1.22.7 h1:pIaGg+08llrP7Q5aiz9ICWbY8cqhTkyy+0SHvfzQpTc=
+github.com/aws/aws-sdk-go-v2/service/sso v1.22.7/go.mod h1:eEygMHnTKH/3kNp9Jr1n3PdejuSNcgwLe1dWgQtO0VQ=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7 h1:/Cfdu0XV3mONYKaOt1Gr0k1KvQzkzPyiKUdlWJqy+J4=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7/go.mod h1:bCbAxKDqNvkHxRaIMnyVPXPo+OaPRwvmgzMxbz1VKSA=
+github.com/aws/aws-sdk-go-v2/service/sts v1.30.7 h1:NKTa1eqZYw8tiHSRGpP0VtTdub/8KNk8sDkNPFaOKDE=
+github.com/aws/aws-sdk-go-v2/service/sts v1.30.7/go.mod h1:NXi1dIAGteSaRLqYgarlhP/Ij0cFT+qmCwiJqWh/U5o=
 github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4=
 github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
@@ -859,8 +859,8 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt
@@ -992,3 +992,4 @@
 20240816200315_update_pws_violations_pt2.up.sql
 20240819164156_update_pws_violations_pt3.up.sql
 20240820125856_allow_pptas_migration.up.sql
+20240820151043_add_gsr_role.up.sql
diff --git a/migrations/app/schema/20240820151043_add_gsr_role.up.sql b/migrations/app/schema/20240820151043_add_gsr_role.up.sql
@@ -0,0 +1,2 @@
+INSERT INTO roles(id, role_type, role_name, created_at, updated_at)
+VALUES ('20d7deea-4010-424e-9f64-714a46e18c3c', 'gsr', 'Government Surveillance Representative', now(), now());
diff --git a/...aperwork/formtemplates/SSWPDFTemplate.pdf → ...ormtemplates/ShipmentSummaryWorksheet.pdf b/...aperwork/formtemplates/SSWPDFTemplate.pdf → ...ormtemplates/ShipmentSummaryWorksheet.pdf
diff --git a/pkg/factory/office_user_factory.go b/pkg/factory/office_user_factory.go
@@ -215,7 +215,7 @@ func GetTraitActiveOfficeUser() []Customization {
 
 // GetTraitApprovedOfficeUser sets the OfficeUser in an APPROVED status
 func GetTraitApprovedOfficeUser() []Customization {
-	approvedStatus := "APPROVED"
+	approvedStatus := models.OfficeUserStatusAPPROVED
 	return []Customization{
 		{
 			Model: models.OfficeUser{
@@ -227,7 +227,7 @@ func GetTraitApprovedOfficeUser() []Customization {
 
 // GetTraitRequestedOfficeUser sets the OfficeUser in an REQUESTED status
 func GetTraitRequestedOfficeUser() []Customization {
-	requestedStatus := "REQUESTED"
+	requestedStatus := models.OfficeUserStatusREQUESTED
 	return []Customization{
 		{
 			Model: models.OfficeUser{

diff --git a/pkg/factory/role_factory.go b/pkg/factory/role_factory.go
@@ -152,6 +152,17 @@ func GetTraitHQRole() []Customization {
 	}
 }
 
+func GetTraitGSRRole() []Customization {
+	return []Customization{
+		{
+			Model: roles.Role{
+				RoleType: roles.RoleTypeGSR,
+				RoleName: "Government Surveillance Representative",
+			},
+		},
+	}
+}
+
 // lookup a role by role type, if it doesn't exist make it
 func FetchOrBuildRoleByRoleType(db *pop.Connection, roleType roles.RoleType) roles.Role {
 	roleName := roles.RoleName(cases.Title(language.Und).String(string(roleType)))

diff --git a/pkg/factory/role_factory_test.go b/pkg/factory/role_factory_test.go
@@ -158,6 +158,19 @@ func (suite *FactorySuite) TestBuildRoleTraits() {
 		suite.Equal(roles.RoleName("Contracting Officer"), role.RoleName)
 		suite.Equal(roles.RoleTypeContractingOfficer, role.RoleType)
 	})
+
+	suite.Run("Successful creation of role with GSR trait", func() {
+		// Under test:      BuildRole
+		// Set up:          Create a Role with a trait (GetTraitGSRRole)
+		// Expected outcome:Role should be created with GSR RoleType and RoleName
+
+		role := BuildRole(suite.DB(), nil,
+			[]Trait{
+				GetTraitGSRRole,
+			})
+		suite.Equal(roles.RoleName("Government Surveillance Representative"), role.RoleName)
+		suite.Equal(roles.RoleTypeGSR, role.RoleType)
+	})
 }
 
 func (suite *FactorySuite) TestBuildRoleHelpers() {