Merge pull request #14004 from transcom/MAIN-B-21429-and-B-21431

MAIN B-21429 and B-21431

migrations/app/migrations_manifest.txt

@@ -1018,4 +1018,5 @@
 20241007184230_insertReOconusRateAreas.up.sql
 20241007184259_insertReIntlTransTime.up.sql
 20241007224427_update_addresses_us_post_region_cities_id.up.sql
+20241008212243_populate_market_code_on_shipments_table.up.sql
 20241009210749_create_view_v_locations.up.sql

migrations/app/schema/20241008212243_populate_market_code_on_shipments_table.up.sql

@@ -0,0 +1,18 @@
+-- Set temp timeout due to potentially large modification
+-- Time is 5 minutes in milliseconds
+SET statement_timeout = 300000;
+SET lock_timeout = 300000;
+SET idle_in_transaction_session_timeout = 300000;
+
+-- Populate the new market_code column for shipments
+-- since we do not support OCONUS moves yet, these should all be "d"
+UPDATE mto_shipments
+SET market_code = 'd'
+WHERE market_code IS NULL;
+
+-- Add a NOT NULL constraint to the market_code column after we populate with data
+ALTER TABLE mto_shipments
+ALTER COLUMN market_code SET NOT NULL;
+
+-- fixing typo from previous migration
+COMMENT ON COLUMN mto_shipments.market_code IS 'Market code indicator for the shipment. i for international and d for domestic.';

pkg/factory/mto_shipment_factory.go

@@ -41,6 +41,7 @@ func buildMTOShipmentWithBuildType(db *pop.Connection, customs []Customization,
 	// defaults change depending on mtoshipment build type
 	defaultShipmentType := models.MTOShipmentTypeHHG
 	defaultStatus := models.MTOShipmentStatusSubmitted
+	defaultMarketCode := models.MarketCodeDomestic
 	setupPickupAndDelivery := true
 	hasStorageFacilityCustom := findValidCustomization(customs, StorageFacility) != nil
 	buildStorageFacility :=
@@ -75,6 +76,7 @@ func buildMTOShipmentWithBuildType(db *pop.Connection, customs []Customization,
 		MoveTaskOrderID: move.ID,
 		ShipmentType:    defaultShipmentType,
 		Status:          defaultStatus,
+		MarketCode:      defaultMarketCode,
 	}
 
 	if cMtoShipment.Status == models.MTOShipmentStatusApproved {
@@ -377,6 +379,11 @@ func BuildMTOShipmentMinimal(db *pop.Connection, customs []Customization, traits
 		}
 	}
 
+	mtoShipment.MarketCode = models.MarketCodeDomestic
+	if db != nil {
+		mustSave(db, &mtoShipment)
+	}
+
 	return mtoShipment
 }