Merge branch 'integrationTesting' into B-21393V2-Integration

config/env/loadtest.app-client-tls.env

@@ -8,7 +8,6 @@ DB_USER=crud
 DEVLOCAL_AUTH=false
 DOD_CA_PACKAGE=/config/tls/api.loadtest.dp3.us.chain.der.p7b
 DTOD_USE_MOCK=true
-DTOD_SIMULATE_OUTAGE=true
 EMAIL_BACKEND=ses
 FEATURE_FLAG_SERVER_URL=http://flipt.svc-loadtest.local:8080
 HEALTH_SERVER_ENABLED=true

config/env/loadtest.app.env

@@ -9,6 +9,7 @@ DEBUG_PPROF=false
 DEVLOCAL_AUTH=true
 DOD_CA_PACKAGE=/config/tls/api.loadtest.dp3.us.chain.der.p7b
 DTOD_USE_MOCK=false
+DTOD_SIMULATE_OUTAGE=true
 EMAIL_BACKEND=ses
 FEATURE_FLAG_SERVER_URL=http://flipt.svc-loadtest.local:8080
 HEALTH_SERVER_ENABLED=true

migrations/app/migrations_manifest.txt

@@ -1036,4 +1036,9 @@
 20241031163018_create_ub_allowances_table.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
+20241111221400_add_new_order_types.up.sql
 20241111223224_change_international_sit_services_to_accessorials.up.sql
+20241119163933_set_inactive_NSRA15_oconus_rate_areas.up.sql
+20241120221040_change_port_location_fk_to_correct_table.up.sql
+20241122155416_total_dependents_calculation.up.sql

migrations/app/schema/20241111203514_add_external_crate_and_remove_icrtsa.up.sql

@@ -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');

migrations/app/schema/20241111221400_add_new_order_types.up.sql

@@ -0,0 +1,5 @@
+-- adding order types to orders_type enum used in the orders table.
+ALTER TYPE public.orders_type ADD VALUE 'EARLY_RETURN_OF_DEPENDENTS';
+ALTER TYPE public.orders_type ADD VALUE 'STUDENT_TRAVEL';
+COMMENT ON COLUMN orders.orders_type IS 'MilMove supports 10 orders types: Permanent change of station (PCS), local move, retirement, separation, wounded warrior, bluebark, safety, temporary duty (TDY), early return of dependents, and student travel.
+In general, the moving process starts with the job/travel orders a customer receives from their service. In the orders, information describing rank, the duration of job/training, and their assigned location will determine if their entire dependent family can come, what the customer is allowed to bring, and how those items will arrive to their new location.'

migrations/app/schema/20241120221040_change_port_location_fk_to_correct_table.up.sql

@@ -0,0 +1,5 @@
+--POE Location columns should reference PORT_LOCATIONS table
+ALTER TABLE mto_service_items DROP CONSTRAINT fk_poe_location_id;
+ALTER TABLE mto_service_items DROP CONSTRAINT fk_pod_location_id;
+ALTER TABLE mto_service_items ADD CONSTRAINT fk_poe_location_id FOREIGN KEY (poe_location_id) REFERENCES port_locations (id);
+ALTER TABLE mto_service_items ADD CONSTRAINT fk_pod_location_id FOREIGN KEY (pod_location_id) REFERENCES port_locations (id);

migrations/app/schema/20241122155416_total_dependents_calculation.up.sql

@@ -0,0 +1,18 @@
+-- Set temp timeout due to large file modification
+-- Time is 5 minutes in milliseconds
+SET statement_timeout = 300000;
+SET lock_timeout = 300000;
+SET idle_in_transaction_session_timeout = 300000;
+-- Zero downtime not necessary, this is not used at this time
+ALTER TABLE entitlements
+DROP COLUMN IF EXISTS total_dependents; -- This column has never been used, this has been confirmed prior to the migration
+-- The calculation should only ever work if dependents 12 and under or 12 and over are present
+-- These fields are only present on OCONUS
+-- Since we don't know the number of dependents under 12 or 12 and over on CONUS moves, we don't want to default to 0 total dependents. That'd be confusing
+ALTER TABLE entitlements
+ADD COLUMN total_dependents integer GENERATED ALWAYS AS (
+    CASE
+        WHEN dependents_under_twelve IS NULL AND dependents_twelve_and_over IS NULL THEN NULL
+        ELSE COALESCE(dependents_under_twelve, 0) + COALESCE(dependents_twelve_and_over, 0)
+    END
+) STORED;

pkg/gen/ghcapi/configure_mymove.go

@@ -111,6 +111,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")