Merge branch 'main' into branch MAIN-B-21507

transcom · Jan 14, 2025 · add3971 · add3971
2 parents 950e587 + 345a61e
commit add3971
Show file tree

Hide file tree

Showing 406 changed files with 17,887 additions and 1,806 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -900,6 +900,7 @@ commands:
             export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false
             export FEATURE_FLAG_ENABLE_ALASKA=false
             export FEATURE_FLAG_ENABLE_HAWAII=false
+            export FEATURE_FLAG_BULK_ASSIGNMENT=false
 
             # disable for speed, playwright tests can fail otherwise
             export DB_DEBUG=false
@@ -943,6 +944,7 @@ commands:
             FEATURE_FLAG_QUEUE_MANAGEMENT: 'false'
             FEATURE_FLAG_UNACCOMPANIED_BAGGAGE: 'false'
             FEATURE_FLAG_ENABLE_ALASKA: 'false'
+            FEATURE_FLAG_BULK_ASSIGNMENT: 'false'
           command: |
             SHARD=$((${CIRCLE_NODE_INDEX}+1))
             PLAYWRIGHT_JUNIT_OUTPUT_NAME=playwright-results.xml \

diff --git a/.envrc b/.envrc
@@ -156,6 +156,9 @@ export FEATURE_FLAG_BOAT=true
 export FEATURE_FLAG_MOBILE_HOME=true
 export FEATURE_FLAG_UNACCOMPANIED_BAGGAGE=false
 
+# Feature flag to allow Bulk Assigment options to be displayed
+export FEATURE_FLAG_BULK_ASSIGNMENT=true
+
 # Feature flag to allow AK to be entered as a state
 export FEATURE_FLAG_ENABLE_ALASKA=true
 

diff --git a/config/env/demo.app-client-tls.env b/config/env/demo.app-client-tls.env
@@ -49,4 +49,5 @@ FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
 FEATURE_FLAG_QUEUE_MANAGEMENT=false
 FEATURE_FLAG_DODID_UNIQUE=false
 FEATURE_FLAG_ENABLE_ALASKA=false
-FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_BULK_ASSIGNMENT=false
diff --git a/config/env/demo.app.env b/config/env/demo.app.env
@@ -54,4 +54,5 @@ FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
 FEATURE_FLAG_QUEUE_MANAGEMENT=false
 FEATURE_FLAG_DODID_UNIQUE=false
 FEATURE_FLAG_ENABLE_ALASKA=false
-FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_BULK_ASSIGNMENT=false
diff --git a/config/env/exp.app-client-tls.env b/config/env/exp.app-client-tls.env
@@ -49,4 +49,5 @@ FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
 FEATURE_FLAG_QUEUE_MANAGEMENT=false
 FEATURE_FLAG_DODID_UNIQUE=false
 FEATURE_FLAG_ENABLE_ALASKA=false
-FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_BULK_ASSIGNMENT=false
diff --git a/config/env/exp.app.env b/config/env/exp.app.env
@@ -54,4 +54,5 @@ FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
 FEATURE_FLAG_QUEUE_MANAGEMENT=false
 FEATURE_FLAG_DODID_UNIQUE=false
 FEATURE_FLAG_ENABLE_ALASKA=false
-FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_BULK_ASSIGNMENT=false
diff --git a/config/env/loadtest.app-client-tls.env b/config/env/loadtest.app-client-tls.env
@@ -47,4 +47,5 @@ FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
 FEATURE_FLAG_QUEUE_MANAGEMENT=false
 FEATURE_FLAG_DODID_UNIQUE=false
 FEATURE_FLAG_ENABLE_ALASKA=false
-FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_BULK_ASSIGNMENT=false
diff --git a/config/env/loadtest.app.env b/config/env/loadtest.app.env
@@ -52,4 +52,5 @@ FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
 FEATURE_FLAG_QUEUE_MANAGEMENT=false
 FEATURE_FLAG_DODID_UNIQUE=false
 FEATURE_FLAG_ENABLE_ALASKA=false
-FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_BULK_ASSIGNMENT=false
diff --git a/config/env/prd.app-client-tls.env b/config/env/prd.app-client-tls.env
@@ -46,4 +46,5 @@ FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
 FEATURE_FLAG_QUEUE_MANAGEMENT=false
 FEATURE_FLAG_DODID_UNIQUE=false
 FEATURE_FLAG_ENABLE_ALASKA=false
-FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_BULK_ASSIGNMENT=false
diff --git a/config/env/prd.app.env b/config/env/prd.app.env
@@ -53,4 +53,5 @@ FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
 FEATURE_FLAG_QUEUE_MANAGEMENT=false
 FEATURE_FLAG_DODID_UNIQUE=false
 FEATURE_FLAG_ENABLE_ALASKA=false
-FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_BULK_ASSIGNMENT=false
diff --git a/config/env/stg.app-client-tls.env b/config/env/stg.app-client-tls.env
@@ -48,4 +48,5 @@ FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
 FEATURE_FLAG_QUEUE_MANAGEMENT=false
 FEATURE_FLAG_DODID_UNIQUE=false
 FEATURE_FLAG_ENABLE_ALASKA=false
-FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_BULK_ASSIGNMENT=false
diff --git a/config/env/stg.app.env b/config/env/stg.app.env
@@ -54,4 +54,5 @@ FEATURE_FLAG_THIRD_ADDRESS_AVAILABLE=false
 FEATURE_FLAG_QUEUE_MANAGEMENT=false
 FEATURE_FLAG_DODID_UNIQUE=false
 FEATURE_FLAG_ENABLE_ALASKA=false
-FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_ENABLE_HAWAII=false
+FEATURE_FLAG_BULK_ASSIGNMENT=false
diff --git a/config/flipt/storage/development.features.yaml b/config/flipt/storage/development.features.yaml
@@ -137,6 +137,14 @@ flags:
       - segment:
           key: mil-app
           value: true
+  - key: bulk_assignment
+    name: bulk assignment feature flag
+    type: BOOLEAN_FLAG_TYPE
+    enabled: true
+    rollouts:
+      - segment:
+          key: mil-app
+          value: true
   - key: dodid_unique
     name: DODID validation feature flag that ensures unique DODIDs
     type: BOOLEAN_FLAG_TYPE

diff --git a/config/tls/milmove-cert-bundle.p7b b/config/tls/milmove-cert-bundle.p7b
diff --git a/go.mod b/go.mod
@@ -95,10 +95,10 @@ 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.27.0
+	golang.org/x/crypto v0.31.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/text v0.21.0
 	golang.org/x/tools v0.24.0
 	google.golang.org/grpc v1.68.0
 	gopkg.in/dnaeon/go-vcr.v3 v3.2.0
@@ -261,10 +261,10 @@ require (
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
 	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.25.0 // indirect
-	golang.org/x/term v0.24.0 // indirect
-	google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
+	google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda
 	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

diff --git a/go.sum b/go.sum
@@ -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.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 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=
@@ -790,8 +790,8 @@ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -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.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.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=
@@ -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.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
-golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 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=
@@ -863,8 +863,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.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 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
@@ -1052,10 +1052,19 @@
 20241203024453_add_ppm_max_incentive_column.up.sql
 20241204155919_update_ordering_proc.up.sql
 20241204210208_retroactive_update_of_ppm_max_and_estimated_incentives_prd.up.sql
+20241210143143_redefine_mto_shipment_audit_table.up.sql
+20241216170325_update_nts_enum_name.up.sql
+20241216190428_update_get_zip_code_function_and_update_pricing_proc.up.sql
 20241217163231_update_duty_locations_bad_zips.up.sql
 20241217180136_add_AK_zips_to_zip3_distances.up.sql
 20241218201833_add_PPPO_BASE_ELIZABETH.up.sql
 20241220171035_add_additional_AK_zips_to_zip3_distances.up.sql
+20241220213134_add_destination_gbloc_db_function.up.sql
+20241224172258_add_and_update_po_box_zip.up.sql
+20241226173330_add_intl_param_values_to_service_params_table.up.sql
 20241227153723_remove_empty_string_emplid_values.up.sql
+20241227202424_insert_transportation_offices_camp_pendelton.up.sql
 20241230190638_remove_AK_zips_from_zip3.up.sql
 20241230190647_add_missing_AK_zips_to_zip3_distances.up.sql
+20250103180420_update_pricing_proc_to_use_local_price_variable.up.sql
+20250110214012_homesafeconnect_cert.up.sql
diff --git a/migrations/app/schema/20241210143143_redefine_mto_shipment_audit_table.up.sql b/migrations/app/schema/20241210143143_redefine_mto_shipment_audit_table.up.sql
@@ -0,0 +1,13 @@
+DROP TRIGGER IF EXISTS audit_trigger_row ON "mto_shipments";
+
+SELECT add_audit_history_table(
+	target_table := 'mto_shipments',
+	audit_rows := BOOLEAN 't',
+	audit_query_text := BOOLEAN 't',
+	ignored_cols := ARRAY[
+		'created_at',
+		'updated_at',
+		'move_id',
+		'storage_facility_id'
+	]
+);
diff --git a/migrations/app/schema/20241216170325_update_nts_enum_name.up.sql b/migrations/app/schema/20241216170325_update_nts_enum_name.up.sql
@@ -0,0 +1,25 @@
+-- Rename the existing enum value 'HHG_INTO_NTS_DOMESTIC' to 'HHG_INTO_NTS'
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM pg_type t
+        JOIN pg_enum e ON t.oid = e.enumtypid
+        WHERE t.typname = 'mto_shipment_type'
+        AND e.enumlabel = 'HHG_INTO_NTS_DOMESTIC'
+    ) THEN
+        ALTER TYPE mto_shipment_type
+        RENAME VALUE 'HHG_INTO_NTS_DOMESTIC' TO 'HHG_INTO_NTS';
+    END IF;
+END $$;
+
+-- Update column comments to include all current shipment types
+COMMENT ON COLUMN mto_shipments.shipment_type IS 'The type of shipment. The list includes:
+1. Personally procured move (PPM)
+2. Household goods move (HHG)
+3. Non-temporary storage (HHG_INTO_NTS)
+4. Non-temporary storage-release (HHG_OUTOF_NTS_DOMESTIC)
+5. Mobile home (MOBILE_HOME)
+6. Boat haul away (BOAT_HAUL_AWAY)
+7. Boat tow away (BOAT_TOW_AWAY)
+8. Unaccompanied baggage (UNACCOMPANIED_BAGGAGE)';