B 20756

.envrc

@@ -353,6 +353,13 @@ export GOTENBERG_PORT=2000
 # interactions
 export DTOD_USE_MOCK=false
 
+# Simulates the DTOD service being down
+#
+# This is enabled in local dev environments for playwright. It can be
+# set to false during local dev if needed to test/debug DTOD
+# interactions
+export DTOD_SIMULATE_OUTAGE=false
+
 # Client build flags
 #
 # Send error logs to the console for local development. Set to 'otel'

pkg/auth/session.go

@@ -283,29 +283,29 @@ func SessionFromContext(ctx context.Context) *Session {
 
 // IsServiceMember checks whether the authenticated user is a ServiceMember
 func (s *Session) IsServiceMember() bool {
-	return s.ServiceMemberID != uuid.Nil
+	return s != nil && s.ServiceMemberID != uuid.Nil
 }
 
 // IsOfficeUser checks whether the authenticated user is an OfficeUser
 func (s *Session) IsOfficeUser() bool {
-	return s.OfficeUserID != uuid.Nil
+	return s != nil && s.OfficeUserID != uuid.Nil
 }
 
 // IsAdminUser checks whether the authenticated user is an AdminUser
 func (s *Session) IsAdminUser() bool {
-	return s.AdminUserID != uuid.Nil
+	return s != nil && s.AdminUserID != uuid.Nil
 }
 
 // IsSystemAdmin checks whether the authenticated admin user is a system admin
 func (s *Session) IsSystemAdmin() bool {
 	role := "SYSTEM_ADMIN"
-	return s.IsAdminUser() && s.AdminUserRole == role
+	return s != nil && s.IsAdminUser() && s.AdminUserRole == role
 }
 
 // IsProgramAdmin checks whether the authenticated admin user is a program admin
 func (s *Session) IsProgramAdmin() bool {
 	role := "PROGRAM_ADMIN"
-	return s.IsAdminUser() && s.AdminUserRole == role
+	return s != nil && s.IsAdminUser() && s.AdminUserRole == role
 }
 
 func SessionIDMiddleware(appnames ApplicationServername, sessionManagers AppSessionManagers) func(next http.Handler) http.Handler {

pkg/cli/route.go

@@ -27,6 +27,9 @@ const (
 
 	// DTODUseMockFlag is the DTOD Use Mock Flag
 	DTODUseMockFlag string = "dtod-use-mock"
+
+	// DTODSimulateOutage is the DTOD Use Mock Flag
+	DTODSimulateOutageFlag string = "dtod-simulate-outage"
 )
 
 // InitRouteFlags initializes Route command line flags
@@ -42,6 +45,8 @@ func InitRouteFlags(flag *pflag.FlagSet) {
 	flag.String(DTODApiWSDLFlag, "", "WSDL for sending a SOAP request to DTOD")
 
 	flag.Bool(DTODUseMockFlag, false, "Whether to use a mocked version of DTOD")
+
+	flag.Bool(DTODSimulateOutageFlag, false, "Simulates the DTOD service being unnavailable")
 }
 
 // CheckRoute validates Route command line flags

pkg/handlers/ghcapi/mto_shipment.go

@@ -225,6 +225,11 @@ func (h CreateMTOShipmentHandler) Handle(params mtoshipmentops.CreateMTOShipment
 						Message: handlers.FmtString(err.Error()),
 					}
 					return mtoshipmentops.NewCreateMTOShipmentNotFound().WithPayload(&payload), err
+				case apperror.EventError:
+					payload := ghcmessages.Error{
+						Message: handlers.FmtString(err.Error()),
+					}
+					return mtoshipmentops.NewUpdateMTOShipmentBadRequest().WithPayload(&payload), err
 				case apperror.InvalidInputError:
 					payload := payloadForValidationError(
 						"Validation errors",
@@ -309,6 +314,11 @@ func (h UpdateShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipmentPar
 				switch err.(type) {
 				case apperror.NotFoundError:
 					return mtoshipmentops.NewUpdateMTOShipmentNotFound(), err
+				case apperror.EventError:
+					payload := ghcmessages.Error{
+						Message: handlers.FmtString(err.Error()),
+					}
+					return mtoshipmentops.NewUpdateMTOShipmentBadRequest().WithPayload(&payload), err
 				default:
 					msg := fmt.Sprintf("%v | Instance: %v", handlers.FmtString(err.Error()), h.GetTraceIDFromRequest(params.HTTPRequest))
 
@@ -338,6 +348,11 @@ func (h UpdateShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipmentPar
 				switch e := err.(type) {
 				case apperror.NotFoundError:
 					return mtoshipmentops.NewUpdateMTOShipmentNotFound(), err
+				case apperror.EventError:
+					payload := ghcmessages.Error{
+						Message: handlers.FmtString(err.Error()),
+					}
+					return mtoshipmentops.NewUpdateMTOShipmentBadRequest().WithPayload(&payload), err
 				case apperror.ForbiddenError:
 					msg := fmt.Sprintf("%v | Instance: %v", handlers.FmtString(err.Error()), h.GetTraceIDFromRequest(params.HTTPRequest))
 					return mtoshipmentops.NewUpdateMTOShipmentForbidden().WithPayload(
@@ -922,6 +937,11 @@ func (h RequestShipmentReweighHandler) Handle(params shipmentops.RequestShipment
 				switch err.(type) {
 				case apperror.NotFoundError:
 					return mtoshipmentops.NewUpdateMTOShipmentNotFound()
+				case apperror.EventError:
+					payload := ghcmessages.Error{
+						Message: handlers.FmtString(err.Error()),
+					}
+					return mtoshipmentops.NewUpdateMTOShipmentBadRequest().WithPayload(&payload)
 				default:
 					msg := fmt.Sprintf("%v | Instance: %v", handlers.FmtString(err.Error()), h.GetTraceIDFromRequest(params.HTTPRequest))
 

pkg/handlers/internalapi/mto_shipment.go

@@ -59,6 +59,13 @@ func (h CreateMTOShipmentHandler) Handle(params mtoshipmentops.CreateMTOShipment
 								h.GetTraceIDFromRequest(params.HTTPRequest),
 							),
 						), err
+				case apperror.EventError:
+					return mtoshipmentops.NewUpdateMTOShipmentBadRequest().WithPayload(
+						payloads.ClientError(handlers.InternalServerErrMessage,
+							err.Error(),
+							h.GetTraceIDFromRequest(params.HTTPRequest),
+						),
+					), err
 				case apperror.InvalidInputError:
 					return mtoshipmentops.
 						NewCreateMTOShipmentUnprocessableEntity().
@@ -167,6 +174,13 @@ func (h UpdateMTOShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipment
 							h.GetTraceIDFromRequest(params.HTTPRequest),
 						),
 					), err
+				case apperror.EventError:
+					return mtoshipmentops.NewUpdateMTOShipmentBadRequest().WithPayload(
+						payloads.ClientError(handlers.InternalServerErrMessage,
+							err.Error(),
+							h.GetTraceIDFromRequest(params.HTTPRequest),
+						),
+					), err
 				case apperror.InvalidInputError:
 					return mtoshipmentops.
 						NewUpdateMTOShipmentUnprocessableEntity().

pkg/models/ppm_shipment.go

@@ -274,9 +274,9 @@ func (p PPMShipment) Validate(_ *pop.Connection) (*validate.Errors, error) {
 		&OptionalPoundIsNonNegative{Name: "EstimatedWeight", Field: p.EstimatedWeight},
 		&OptionalPoundIsNonNegative{Name: "ProGearWeight", Field: p.ProGearWeight},
 		&OptionalPoundIsNonNegative{Name: "SpouseProGearWeight", Field: p.SpouseProGearWeight},
-		&OptionalCentIsPositive{Name: "EstimatedIncentive", Field: p.EstimatedIncentive},
+		&OptionalCentIsNotNegative{Name: "EstimatedIncentive", Field: p.EstimatedIncentive},
 		&OptionalCentIsPositive{Name: "FinalIncentive", Field: p.FinalIncentive},
-		&OptionalCentIsPositive{Name: "AdvanceAmountRequested", Field: p.AdvanceAmountRequested},
+		&OptionalCentIsNotNegative{Name: "AdvanceAmountRequested", Field: p.AdvanceAmountRequested},
 		&OptionalStringInclusion{Name: "AdvanceStatus", List: AllowedPPMAdvanceStatuses, Field: (*string)(p.AdvanceStatus)},
 		&OptionalCentIsPositive{Name: "AdvanceAmountReceived", Field: p.AdvanceAmountReceived},
 		&OptionalStringInclusion{Name: "SITLocation", List: AllowedSITLocationTypes, Field: (*string)(p.SITLocation)},

pkg/models/ppm_shipment_test.go

@@ -70,9 +70,9 @@ func (suite *ModelSuite) TestPPMShipmentValidation() {
 				EstimatedWeight:             models.PoundPointer(unit.Pound(-1)),
 				ProGearWeight:               models.PoundPointer(unit.Pound(-1)),
 				SpouseProGearWeight:         models.PoundPointer(unit.Pound(-1)),
-				EstimatedIncentive:          models.CentPointer(unit.Cents(0)),
+				EstimatedIncentive:          models.CentPointer(unit.Cents(-1)),
 				FinalIncentive:              models.CentPointer(unit.Cents(0)),
-				AdvanceAmountRequested:      models.CentPointer(unit.Cents(0)),
+				AdvanceAmountRequested:      models.CentPointer(unit.Cents(-1)),
 				AdvanceStatus:               &blankAdvanceStatus,
 				AdvanceAmountReceived:       models.CentPointer(unit.Cents(0)),
 				SITLocation:                 &blankSITLocation,
@@ -97,9 +97,9 @@ func (suite *ModelSuite) TestPPMShipmentValidation() {
 				"estimated_weight":               {"-1 is less than zero."},
 				"pro_gear_weight":                {"-1 is less than zero."},
 				"spouse_pro_gear_weight":         {"-1 is less than zero."},
-				"estimated_incentive":            {"EstimatedIncentive must be greater than zero, got: 0."},
+				"estimated_incentive":            {"EstimatedIncentive cannot be negative, got: -1."},
 				"final_incentive":                {"FinalIncentive must be greater than zero, got: 0."},
-				"advance_amount_requested":       {"AdvanceAmountRequested must be greater than zero, got: 0."},
+				"advance_amount_requested":       {"AdvanceAmountRequested cannot be negative, got: -1."},
 				"advance_status":                 {fmt.Sprintf("AdvanceStatus is not in the list [%s].", validPPMShipmentAdvanceStatuses)},
 				"advance_amount_received":        {"AdvanceAmountReceived must be greater than zero, got: 0."},
 				"sitlocation":                    {fmt.Sprintf("SITLocation is not in the list [%s].", validSITLocations)},

pkg/models/us_post_region_city.go

@@ -2,13 +2,14 @@ package models
 
 import (
 	"database/sql"
-	"fmt"
 	"time"
 
 	"github.com/gobuffalo/pop/v6"
 	"github.com/gobuffalo/validate/v3"
 	"github.com/gobuffalo/validate/v3/validators"
 	"github.com/gofrs/uuid"
+
+	"github.com/transcom/mymove/pkg/apperror"
 )
 
 // UsPostRegionCity represents postal region information retrieved from TRDM
@@ -49,7 +50,7 @@ func FindCountyByZipCode(db *pop.Connection, zipCode string) (string, error) {
 	if err != nil {
 		switch err {
 		case sql.ErrNoRows:
-			return "", fmt.Errorf("No county found for provided zip code %s", zipCode)
+			return "", apperror.NewEventError("No county found for provided zip code "+zipCode+".", err)
 		default:
 			return "", err
 		}

pkg/models/validators.go

@@ -109,6 +109,21 @@ func (v *OptionalCentIsPositive) IsValid(errors *validate.Errors) {
 	}
 }
 
+// OptionalCentIsNotNegative adds an error if the Field is less than or equal to zero
+type OptionalCentIsNotNegative struct {
+	Name  string
+	Field *unit.Cents
+}
+
+// IsValid adds an error if the Field is less than or equal to zero
+func (v *OptionalCentIsNotNegative) IsValid(errors *validate.Errors) {
+	if v.Field != nil {
+		if *v.Field < 0 {
+			errors.Add(validators.GenerateKey(v.Name), fmt.Sprintf("%s cannot be negative, got: %d.", v.Name, *v.Field))
+		}
+	}
+}
+
 // OptionalPoundIsNonNegative adds an error if the Field is less than zero
 type OptionalPoundIsNonNegative struct {
 	Name  string

pkg/notifications/constants.go

@@ -3,3 +3,5 @@ package notifications
 const OneSourceTransportationOfficeLink = "https://installations.militaryonesource.mil/search?program-service=2/view-by=ALL"
 const MyMoveLink = "https://my.move.mil/"
 const WashingtonHQServicesLink = "https://www.esd.whs.mil"
+
+const DtodErrorMessage = "We are unable to calculate your distance. It may be that you have entered an invalid ZIP Code, or the system that calculates distance (DTOD) may be down. Please check your ZIP Code to ensure it was entered correctly and is not a PO Box."

pkg/payment_request/service_param_value_lookups/service_param_value_lookups.go

@@ -510,6 +510,10 @@ func (s *ServiceItemParamKeyData) ServiceParamValue(appCtx appcontext.AppContext
 	if lookup, ok := s.lookups[key]; ok {
 		value, err := lookup.lookup(appCtx, s)
 		if err != nil {
+			switch err.(type) {
+			case apperror.EventError:
+				return "", err
+			}
 			return "", fmt.Errorf(" failed ServiceParamValue %sLookup with error %w", key, err)
 		}
 		// Save param value to cache

pkg/route/dtod_planner_test.go

@@ -109,7 +109,7 @@ func (suite *GHCTestSuite) TestDTODZipTransitDistance() {
 			},
 		})
 
-		plannerMileage := NewDTODZip5Distance(fakeUsername, fakePassword, testSoapClient)
+		plannerMileage := NewDTODZip5Distance(fakeUsername, fakePassword, testSoapClient, false)
 		planner := NewDTODPlanner(plannerMileage)
 		distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "30907", "30301")
 		suite.NoError(err)
@@ -123,7 +123,7 @@ func (suite *GHCTestSuite) TestDTODZipTransitDistance() {
 			mock.Anything,
 		).Return(soapResponseForDistance("150.33"), errors.New("some error"))
 
-		plannerMileage := NewDTODZip5Distance(fakeUsername, fakePassword, testSoapClient)
+		plannerMileage := NewDTODZip5Distance(fakeUsername, fakePassword, testSoapClient, false)
 		planner := NewDTODPlanner(plannerMileage)
 		distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "30907", "30901")
 		suite.Error(err)