Skip to content

Commit

Permalink
Merge branch 'main' into branch B-21671
Browse files Browse the repository at this point in the history
  • Loading branch information
msaki-caci committed Dec 4, 2024
2 parents 5507d81 + d391092 commit 662352e
Show file tree
Hide file tree
Showing 362 changed files with 11,209 additions and 1,672 deletions.
3 changes: 3 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ export FEATURE_FLAG_VALIDATION_CODE_REQUIRED=false # We don't want this validati
# Feature flag to disable/enable DODID validation and enforce unique constraints in the backend
export FEATURE_FLAG_DODID_UNIQUE=false

# Maintenance Flag
require MAINTENANCE_FLAG "See 'DISABLE_AWS_VAULT_WRAPPER=1 AWS_REGION=us-gov-west-1 aws vault exec transcom-gov-dev -- chamber read app-devlocal maintenance_flag'"

# Okta.mil configuration

# Tenant
Expand Down
14 changes: 11 additions & 3 deletions cmd/milmove/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ func initServeFlags(flag *pflag.FlagSet) {
// Telemetry flag config
cli.InitTelemetryFlags(flag)

// Maintenance Flags
cli.InitMaintenanceFlags(flag)

// Sort command line flags
flag.SortFlags = true
}
Expand Down Expand Up @@ -224,6 +227,10 @@ func checkServeConfig(v *viper.Viper, logger *zap.Logger) error {
return err
}

if err := cli.CheckMaintenance(v); err != nil {
return err
}

return cli.CheckFeatureFlag(v)
}

Expand Down Expand Up @@ -728,14 +735,15 @@ func serveFunction(cmd *cobra.Command, args []string) error {
go startListener(healthServer, logger, false)
}

maintenanceFlag := v.GetBool(cli.MaintenanceFlag)
noTLSEnabled := v.GetBool(cli.NoTLSListenerFlag)
var noTLSServer *server.NamedServer
if noTLSEnabled {
serverName := "no-tls"
noTLSPort := v.GetInt(cli.NoTLSPortFlag)
// initialize the router
site, err := routing.InitRouting(serverName, appCtx, redisPool,
routingConfig, telemetryConfig)
routingConfig, telemetryConfig, maintenanceFlag)
if err != nil {
return err
}
Expand All @@ -760,7 +768,7 @@ func serveFunction(cmd *cobra.Command, args []string) error {
tlsPort := v.GetInt(cli.TLSPortFlag)
// initialize the router
site, err := routing.InitRouting(serverName, appCtx, redisPool,
routingConfig, telemetryConfig)
routingConfig, telemetryConfig, maintenanceFlag)
if err != nil {
return err
}
Expand All @@ -786,7 +794,7 @@ func serveFunction(cmd *cobra.Command, args []string) error {
mtlsPort := v.GetInt(cli.MutualTLSPortFlag)
// initialize the router
site, err := routing.InitRouting(serverName, appCtx, redisPool,
routingConfig, telemetryConfig)
routingConfig, telemetryConfig, maintenanceFlag)
if err != nil {
return err
}
Expand Down
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ require (
go.opentelemetry.io/otel/sdk/metric v1.28.0
go.opentelemetry.io/otel/trace v1.31.0
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.26.0
golang.org/x/net v0.28.0
golang.org/x/oauth2 v0.22.0
golang.org/x/crypto v0.27.0
golang.org/x/net v0.29.0
golang.org/x/oauth2 v0.23.0
golang.org/x/text v0.18.0
golang.org/x/tools v0.24.0
google.golang.org/grpc v1.65.0
google.golang.org/grpc v1.68.0
gopkg.in/dnaeon/go-vcr.v3 v3.2.0
gotest.tools/gotestsum v1.12.0
pault.ag/go/pksigner v1.0.2
Expand Down Expand Up @@ -262,11 +262,11 @@ require (
golang.org/x/image v0.18.0 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
Expand Down
32 changes: 16 additions & 16 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -723,8 +723,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
Expand Down Expand Up @@ -773,12 +773,12 @@ golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand Down Expand Up @@ -831,8 +831,8 @@ golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
Expand All @@ -849,8 +849,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
Expand Down Expand Up @@ -900,17 +900,17 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda h1:wu/KJm9KJwpfHWhkkZGohVC6KRrc1oJNr4jwtQMOQXw=
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda/go.mod h1:g2LLCvCeCSir/JJSWosk19BR4NVxGqHUC6rxIRsd7Aw=
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0=
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc=
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
Expand Down
3 changes: 3 additions & 0 deletions migrations/app/migrations_manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1030,5 +1030,8 @@
20241029144404_hdt-614-adjust-accomack-county.up.sql
20241107180705_add_alternative_AK_HI_duty_location_names.up.sql
20241109002854_add_gsr_table_to_move_history.up.sql
20241111203514_add_external_crate_and_remove_icrtsa.up.sql
20241111223224_change_international_sit_services_to_accessorials.up.sql
20241115214553_create_re_fsc_multipliers_table.up.sql
20241202163059_create_test_sequence_dev_env.up.sql
20241203024453_add_ppm_max_incentive_column.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
-- Add external_crate to mto_service_items
ALTER TABLE mto_service_items ADD COLUMN IF NOT EXISTS external_crate bool NULL;
COMMENT ON COLUMN mto_service_items.external_crate IS 'Boolean value indicating whether the international crate is externally crated.';

-- removing 'International crating - standalone' (ICRTSA) from the tables
delete from service_params sp
where service_id in (select id from re_services where code in ('ICRTSA'));

delete from re_intl_accessorial_prices reiap
where service_id in (select id from re_services where code in ('ICRTSA'));

delete from re_services rs
where code in ('ICRTSA');
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE ppm_shipments ADD COLUMN IF NOT EXISTS max_incentive int;
COMMENT ON COLUMN ppm_shipments.max_incentive IS 'The max incentive a PPM can have, based on the max entitlement allowed.';
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-- Local test migration.
-- This will be run on development environments.
-- It should mirror what you intend to apply on loadtest/demo/exp/stg/prd
-- DO NOT include any sensitive data.

-- Create test_sequence in migration, moved from sequencer_test.go
CREATE SEQUENCE IF NOT EXISTS test_sequence;
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@opentelemetry/core": "^1.15.1",
"@tanstack/react-query": "^4.29.12",
"@tanstack/react-query-devtools": "^5.17.12",
"@transcom/react-file-viewer": "git+https://github.com/transcom/react-file-viewer#v1.2.4",
"@transcom/react-file-viewer": "git+https://github.com/transcom/react-file-viewer#v1.2.5",
"@trussworks/react-uswds": "3.2.0",
"axe-playwright": "^1.2.3",
"bytes": "^3.1.2",
Expand Down
20 changes: 20 additions & 0 deletions pkg/assets/sql_scripts/move_history_fetcher.sql
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,16 @@ WITH move AS (
FROM audit_history
JOIN move_shipments ON move_shipments.secondary_delivery_address_id = audit_history.object_id AND audit_history."table_name" = 'addresses'
UNION
SELECT
audit_history.object_id,
'tertiaryDestinationAddress',
move_shipments.shipment_type,
move_shipments.id::TEXT,
NULL,
move_shipments.shipment_locator
FROM audit_history
JOIN move_shipments ON move_shipments.tertiary_delivery_address_id = audit_history.object_id AND audit_history."table_name" = 'addresses'
UNION
SELECT
audit_history.object_id,
'pickupAddress',
Expand All @@ -382,6 +392,16 @@ WITH move AS (
FROM audit_history
JOIN move_shipments ON move_shipments.secondary_pickup_address_id = audit_history.object_id AND audit_history."table_name" = 'addresses'
UNION
SELECT
audit_history.object_id,
'tertiaryPickupAddress',
move_shipments.shipment_type,
move_shipments.id::TEXT,
NULL,
move_shipments.shipment_locator
FROM audit_history
JOIN move_shipments ON move_shipments.tertiary_pickup_address_id = audit_history.object_id AND audit_history."table_name" = 'addresses'
UNION
SELECT
audit_history.object_id,
'residentialAddress',
Expand Down
19 changes: 19 additions & 0 deletions pkg/cli/maintenance.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package cli

import (
"github.com/spf13/pflag"
"github.com/spf13/viper"
)

const (
// Maintenance Flag
MaintenanceFlag string = "maintenance_flag"
)

func InitMaintenanceFlags(flag *pflag.FlagSet) {
flag.Bool(MaintenanceFlag, false, "Flag for tracking app maintenance.")
}

func CheckMaintenance(v *viper.Viper) error {
return nil
}
6 changes: 6 additions & 0 deletions pkg/cli/maintenance_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package cli

func (suite *cliTestSuite) TestMaintenance() {
suite.Setup(InitMaintenanceFlags, []string{})
suite.NoError(CheckMaintenance(suite.viper))
}
4 changes: 1 addition & 3 deletions pkg/db/sequence/sequencer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ type SequenceSuite struct {
}

func (suite *SequenceSuite) SetupTest() {
err := suite.DB().RawQuery("CREATE SEQUENCE IF NOT EXISTS test_sequence;").Exec()
suite.NoError(err, "Error creating test sequence")
err = suite.DB().RawQuery("SELECT setval($1, 1);", testSequence).Exec()
err := suite.DB().RawQuery("SELECT setval($1, 1);", testSequence).Exec()
suite.NoError(err, "Error resetting sequence")
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/factory/move_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func BuildMoveWithShipment(db *pop.Connection, customs []Customization, traits [
func BuildMoveWithPPMShipment(db *pop.Connection, customs []Customization, traits []Trait) models.Move {
move := BuildMove(db, customs, traits)

mtoShipment := buildMTOShipmentWithBuildType(db, customs, traits, mtoShipmentBuildBasic)
mtoShipment := buildMTOShipmentWithBuildType(db, customs, traits, mtoShipmentPPM)
mtoShipment.MoveTaskOrder = move
mtoShipment.MoveTaskOrderID = move.ID

Expand Down
4 changes: 4 additions & 0 deletions pkg/factory/mto_shipment_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const (
mtoShipmentBuildBasic mtoShipmentBuildType = iota
mtoShipmentBuild
mtoShipmentNTS
mtoShipmentPPM
mtoShipmentNTSR
)

Expand Down Expand Up @@ -66,6 +67,9 @@ func buildMTOShipmentWithBuildType(db *pop.Connection, customs []Customization,
shipmentHasDeliveryDetails = true
case mtoShipmentBuildBasic:
setupPickupAndDelivery = false
case mtoShipmentPPM:
defaultShipmentType = models.MTOShipmentTypePPM
setupPickupAndDelivery = false
default:
defaultShipmentType = models.MTOShipmentTypeHHG
setupPickupAndDelivery = true
Expand Down
5 changes: 5 additions & 0 deletions pkg/gen/ghcapi/configure_mymove.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ func configureAPI(api *ghcoperations.MymoveAPI) http.Handler {
return middleware.NotImplemented("operation payment_requests.BulkDownload has not yet been implemented")
})
}
if api.MoveCheckForLockedMovesAndUnlockHandler == nil {
api.MoveCheckForLockedMovesAndUnlockHandler = move.CheckForLockedMovesAndUnlockHandlerFunc(func(params move.CheckForLockedMovesAndUnlockParams) middleware.Responder {
return middleware.NotImplemented("operation move.CheckForLockedMovesAndUnlock has not yet been implemented")
})
}
if api.OrderCounselingUpdateAllowanceHandler == nil {
api.OrderCounselingUpdateAllowanceHandler = order.CounselingUpdateAllowanceHandlerFunc(func(params order.CounselingUpdateAllowanceParams) middleware.Responder {
return middleware.NotImplemented("operation order.CounselingUpdateAllowance has not yet been implemented")
Expand Down
Loading

0 comments on commit 662352e

Please sign in to comment.