Merge branch 'integrationTesting' into B-22129-INT-Closeout-Data

migrations/app/migrations_manifest.txt

@@ -1071,4 +1071,5 @@
 20241230190647_add_missing_AK_zips_to_zip3_distances.up.sql
 20250103130619_revert_data_change_for_gbloc_for_ak.up.sql
 20250103180420_update_pricing_proc_to_use_local_price_variable.up.sql
+20250110001339_update_nts_release_enum_name.up.sql
 20250110153428_add_shipment_address_updates_to_move_history.up.sql

migrations/app/schema/20250110001339_update_nts_release_enum_name.up.sql

@@ -0,0 +1,25 @@
+-- Rename the existing enum value 'HHG_OUTOF_NTS_DOMESTIC' to 'HHG_OUTOF_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_OUTOF_NTS_DOMESTIC'
+    ) THEN
+        ALTER TYPE mto_shipment_type
+        RENAME VALUE 'HHG_OUTOF_NTS_DOMESTIC' TO 'HHG_OUTOF_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)
+5. Mobile home (MOBILE_HOME)
+6. Boat haul away (BOAT_HAUL_AWAY)
+7. Boat tow away (BOAT_TOW_AWAY)
+8. Unaccompanied baggage (UNACCOMPANIED_BAGGAGE)';

pkg/factory/mto_shipment_factory.go

@@ -46,9 +46,9 @@ func buildMTOShipmentWithBuildType(db *pop.Connection, customs []Customization,
 	setupPickupAndDelivery := true
 	hasStorageFacilityCustom := findValidCustomization(customs, StorageFacility) != nil
 	buildStorageFacility :=
-		cMtoShipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom ||
+		cMtoShipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTS ||
 			cMtoShipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTS
-	shipmentHasPickupDetails := cMtoShipment.ShipmentType != models.MTOShipmentTypeHHGOutOfNTSDom && cMtoShipment.ShipmentType != models.MTOShipmentTypePPM
+	shipmentHasPickupDetails := cMtoShipment.ShipmentType != models.MTOShipmentTypeHHGOutOfNTS && cMtoShipment.ShipmentType != models.MTOShipmentTypePPM
 	shipmentHasDeliveryDetails := cMtoShipment.ShipmentType != models.MTOShipmentTypeHHGIntoNTS && cMtoShipment.ShipmentType != models.MTOShipmentTypePPM
 	addPrimeActualWeight := true
 	switch buildType {
@@ -59,7 +59,7 @@ func buildMTOShipmentWithBuildType(db *pop.Connection, customs []Customization,
 		shipmentHasPickupDetails = true
 		shipmentHasDeliveryDetails = true
 	case mtoShipmentNTSR:
-		defaultShipmentType = models.MTOShipmentTypeHHGOutOfNTSDom
+		defaultShipmentType = models.MTOShipmentTypeHHGOutOfNTS
 		defaultStatus = models.MTOShipmentStatusDraft
 		buildStorageFacility = hasStorageFacilityCustom
 		addPrimeActualWeight = false
@@ -229,9 +229,9 @@ func BuildBaseMTOShipment(db *pop.Connection, customs []Customization, traits []
 
 // BuildMTOShipment creates a single MTOShipment and associated set relationships
 // It will make a move record, if one is not provided.
-// It will make pickup addresses if the shipment type is not one of (HHGOutOfNTSDom, PPM)
-// It will make delivery addresses if the shipment type is not one of (HHGIntoNTSDom, PPM)
-// It will make a storage facility if the shipment type is HHGOutOfNTSDom
+// It will make pickup addresses if the shipment type is not one of (HHGOutOfNTS, PPM)
+// It will make delivery addresses if the shipment type is not one of (HHGIntoNTS, PPM)
+// It will make a storage facility if the shipment type is HHGOutOfNTS
 func BuildMTOShipment(db *pop.Connection, customs []Customization, traits []Trait) models.MTOShipment {
 	return buildMTOShipmentWithBuildType(db, customs, traits, mtoShipmentBuild)
 }

pkg/factory/mto_shipment_factory_test.go

@@ -298,7 +298,7 @@ func (suite *FactorySuite) TestBuildMTOShipment() {
 			ID:                   uuid.FromStringOrNil("acf7b357-5cad-40e2-baa7-dedc1d4cf04c"),
 			PrimeEstimatedWeight: &estimatedWeight,
 			PrimeActualWeight:    &actualWeight,
-			ShipmentType:         models.MTOShipmentTypeHHGOutOfNTSDom,
+			ShipmentType:         models.MTOShipmentTypeHHGOutOfNTS,
 			ApprovedDate:         models.TimePointer(time.Now()),
 			Status:               models.MTOShipmentStatusApproved,
 		}
@@ -470,7 +470,7 @@ func (suite *FactorySuite) TestBuildMTOShipment() {
 	suite.Run("Successful creation of NTSRShipment", func() {
 		ntsrShipment := BuildNTSRShipment(suite.DB(), nil, nil)
 
-		suite.Equal(models.MTOShipmentTypeHHGOutOfNTSDom, ntsrShipment.ShipmentType)
+		suite.Equal(models.MTOShipmentTypeHHGOutOfNTS, ntsrShipment.ShipmentType)
 		suite.False(ntsrShipment.MoveTaskOrderID.IsNil())
 		suite.False(ntsrShipment.MoveTaskOrder.ID.IsNil())
 		suite.NotNil(ntsrShipment.DestinationAddressID)