diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt index 9151f5ec112..0270c9e14cb 100644 --- a/migrations/app/migrations_manifest.txt +++ b/migrations/app/migrations_manifest.txt @@ -1053,6 +1053,7 @@ 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 diff --git a/migrations/app/schema/20241216170325_update_nts_enum_name.up.sql b/migrations/app/schema/20241216170325_update_nts_enum_name.up.sql new file mode 100644 index 00000000000..0a4a7a4400c --- /dev/null +++ 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)'; \ No newline at end of file diff --git a/pkg/factory/mto_shipment_factory.go b/pkg/factory/mto_shipment_factory.go index 2be575fb33b..1c7858d572f 100644 --- a/pkg/factory/mto_shipment_factory.go +++ b/pkg/factory/mto_shipment_factory.go @@ -47,13 +47,13 @@ func buildMTOShipmentWithBuildType(db *pop.Connection, customs []Customization, hasStorageFacilityCustom := findValidCustomization(customs, StorageFacility) != nil buildStorageFacility := cMtoShipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom || - cMtoShipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTSDom + cMtoShipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTS shipmentHasPickupDetails := cMtoShipment.ShipmentType != models.MTOShipmentTypeHHGOutOfNTSDom && cMtoShipment.ShipmentType != models.MTOShipmentTypePPM - shipmentHasDeliveryDetails := cMtoShipment.ShipmentType != models.MTOShipmentTypeHHGIntoNTSDom && cMtoShipment.ShipmentType != models.MTOShipmentTypePPM + shipmentHasDeliveryDetails := cMtoShipment.ShipmentType != models.MTOShipmentTypeHHGIntoNTS && cMtoShipment.ShipmentType != models.MTOShipmentTypePPM addPrimeActualWeight := true switch buildType { case mtoShipmentNTS: - defaultShipmentType = models.MTOShipmentTypeHHGIntoNTSDom + defaultShipmentType = models.MTOShipmentTypeHHGIntoNTS defaultStatus = models.MTOShipmentStatusDraft buildStorageFacility = hasStorageFacilityCustom shipmentHasPickupDetails = true diff --git a/pkg/factory/mto_shipment_factory_test.go b/pkg/factory/mto_shipment_factory_test.go index 943b63ee24a..ea43a0a0373 100644 --- a/pkg/factory/mto_shipment_factory_test.go +++ b/pkg/factory/mto_shipment_factory_test.go @@ -184,7 +184,7 @@ func (suite *FactorySuite) TestBuildMTOShipment() { ID: uuid.FromStringOrNil("acf7b357-5cad-40e2-baa7-dedc1d4cf04c"), PrimeEstimatedWeight: &estimatedWeight, PrimeActualWeight: &actualWeight, - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, ApprovedDate: models.TimePointer(time.Now()), Status: models.MTOShipmentStatusApproved, } @@ -421,7 +421,7 @@ func (suite *FactorySuite) TestBuildMTOShipment() { suite.Run("Successful creation of NTSShipment", func() { ntsShipment := BuildNTSShipment(suite.DB(), nil, nil) - suite.Equal(models.MTOShipmentTypeHHGIntoNTSDom, ntsShipment.ShipmentType) + suite.Equal(models.MTOShipmentTypeHHGIntoNTS, ntsShipment.ShipmentType) suite.False(ntsShipment.MoveTaskOrderID.IsNil()) suite.False(ntsShipment.MoveTaskOrder.ID.IsNil()) diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go index 4019c4f3ff9..d4e6b1f9ae4 100644 --- a/pkg/gen/ghcapi/embedded_spec.go +++ b/pkg/gen/ghcapi/embedded_spec.go @@ -9836,7 +9836,7 @@ func init() { "title": "Shipment Type", "enum": [ "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "PPM", "BOAT_HAUL_AWAY", @@ -9848,7 +9848,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat Haul-Away", "BOAT_TOW_AWAY": "Boat Tow-Away", "HHG": "HHG", - "HHG_INTO_NTS_DOMESTIC": "NTS", + "HHG_INTO_NTS": "NTS", "HHG_OUTOF_NTS_DOMESTIC": "NTS Release", "MOBILE_HOME": "Mobile Home", "PPM": "PPM", @@ -12721,7 +12721,7 @@ func init() { "BOAT_HAUL_AWAY", "BOAT_TOW_AWAY", "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "MOBILE_HOME", "PPM", @@ -26593,7 +26593,7 @@ func init() { "title": "Shipment Type", "enum": [ "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "PPM", "BOAT_HAUL_AWAY", @@ -26605,7 +26605,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat Haul-Away", "BOAT_TOW_AWAY": "Boat Tow-Away", "HHG": "HHG", - "HHG_INTO_NTS_DOMESTIC": "NTS", + "HHG_INTO_NTS": "NTS", "HHG_OUTOF_NTS_DOMESTIC": "NTS Release", "MOBILE_HOME": "Mobile Home", "PPM": "PPM", @@ -29554,7 +29554,7 @@ func init() { "BOAT_HAUL_AWAY", "BOAT_TOW_AWAY", "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "MOBILE_HOME", "PPM", diff --git a/pkg/gen/ghcmessages/m_t_o_shipment_type.go b/pkg/gen/ghcmessages/m_t_o_shipment_type.go index 60244fefed7..6e554e7d4d3 100644 --- a/pkg/gen/ghcmessages/m_t_o_shipment_type.go +++ b/pkg/gen/ghcmessages/m_t_o_shipment_type.go @@ -34,8 +34,8 @@ const ( // MTOShipmentTypeHHG captures enum value "HHG" MTOShipmentTypeHHG MTOShipmentType = "HHG" - // MTOShipmentTypeHHGINTONTSDOMESTIC captures enum value "HHG_INTO_NTS_DOMESTIC" - MTOShipmentTypeHHGINTONTSDOMESTIC MTOShipmentType = "HHG_INTO_NTS_DOMESTIC" + // MTOShipmentTypeHHGINTONTS captures enum value "HHG_INTO_NTS" + MTOShipmentTypeHHGINTONTS MTOShipmentType = "HHG_INTO_NTS" // MTOShipmentTypeHHGOUTOFNTSDOMESTIC captures enum value "HHG_OUTOF_NTS_DOMESTIC" MTOShipmentTypeHHGOUTOFNTSDOMESTIC MTOShipmentType = "HHG_OUTOF_NTS_DOMESTIC" @@ -61,7 +61,7 @@ var mTOShipmentTypeEnum []interface{} func init() { var res []MTOShipmentType - if err := json.Unmarshal([]byte(`["HHG","HHG_INTO_NTS_DOMESTIC","HHG_OUTOF_NTS_DOMESTIC","PPM","BOAT_HAUL_AWAY","BOAT_TOW_AWAY","MOBILE_HOME","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["HHG","HHG_INTO_NTS","HHG_OUTOF_NTS_DOMESTIC","PPM","BOAT_HAUL_AWAY","BOAT_TOW_AWAY","MOBILE_HOME","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/pkg/gen/ghcmessages/re_service_item.go b/pkg/gen/ghcmessages/re_service_item.go index b0cae65c087..f90165b8924 100644 --- a/pkg/gen/ghcmessages/re_service_item.go +++ b/pkg/gen/ghcmessages/re_service_item.go @@ -40,7 +40,7 @@ type ReServiceItem struct { // shipment type // Example: HHG, UNACCOMPANIED_BAGGAGE - // Enum: [BOAT_HAUL_AWAY BOAT_TOW_AWAY HHG HHG_INTO_NTS_DOMESTIC HHG_OUTOF_NTS_DOMESTIC MOBILE_HOME PPM UNACCOMPANIED_BAGGAGE] + // Enum: [BOAT_HAUL_AWAY BOAT_TOW_AWAY HHG HHG_INTO_NTS HHG_OUTOF_NTS_DOMESTIC MOBILE_HOME PPM UNACCOMPANIED_BAGGAGE] ShipmentType string `json:"shipmentType,omitempty"` } @@ -298,7 +298,7 @@ var reServiceItemTypeShipmentTypePropEnum []interface{} func init() { var res []string - if err := json.Unmarshal([]byte(`["BOAT_HAUL_AWAY","BOAT_TOW_AWAY","HHG","HHG_INTO_NTS_DOMESTIC","HHG_OUTOF_NTS_DOMESTIC","MOBILE_HOME","PPM","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["BOAT_HAUL_AWAY","BOAT_TOW_AWAY","HHG","HHG_INTO_NTS","HHG_OUTOF_NTS_DOMESTIC","MOBILE_HOME","PPM","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { panic(err) } for _, v := range res { @@ -317,8 +317,8 @@ const ( // ReServiceItemShipmentTypeHHG captures enum value "HHG" ReServiceItemShipmentTypeHHG string = "HHG" - // ReServiceItemShipmentTypeHHGINTONTSDOMESTIC captures enum value "HHG_INTO_NTS_DOMESTIC" - ReServiceItemShipmentTypeHHGINTONTSDOMESTIC string = "HHG_INTO_NTS_DOMESTIC" + // ReServiceItemShipmentTypeHHGINTONTS captures enum value "HHG_INTO_NTS" + ReServiceItemShipmentTypeHHGINTONTS string = "HHG_INTO_NTS" // ReServiceItemShipmentTypeHHGOUTOFNTSDOMESTIC captures enum value "HHG_OUTOF_NTS_DOMESTIC" ReServiceItemShipmentTypeHHGOUTOFNTSDOMESTIC string = "HHG_OUTOF_NTS_DOMESTIC" diff --git a/pkg/gen/internalapi/embedded_spec.go b/pkg/gen/internalapi/embedded_spec.go index 53aee4aa8cf..0e198c6c4e6 100644 --- a/pkg/gen/internalapi/embedded_spec.go +++ b/pkg/gen/internalapi/embedded_spec.go @@ -4945,7 +4945,7 @@ func init() { "title": "Shipment Type", "enum": [ "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "PPM", "BOAT_HAUL_AWAY", @@ -4957,7 +4957,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat Haul-Away", "BOAT_TOW_AWAY": "Boat Tow-Away", "HHG": "HHG", - "HHG_INTO_NTS_DOMESTIC": "NTS", + "HHG_INTO_NTS": "NTS", "HHG_OUTOF_NTS_DOMESTIC": "NTS Release", "MOBILE_HOME": "Mobile Home", "PPM": "PPM", @@ -14071,7 +14071,7 @@ func init() { "title": "Shipment Type", "enum": [ "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "PPM", "BOAT_HAUL_AWAY", @@ -14083,7 +14083,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat Haul-Away", "BOAT_TOW_AWAY": "Boat Tow-Away", "HHG": "HHG", - "HHG_INTO_NTS_DOMESTIC": "NTS", + "HHG_INTO_NTS": "NTS", "HHG_OUTOF_NTS_DOMESTIC": "NTS Release", "MOBILE_HOME": "Mobile Home", "PPM": "PPM", diff --git a/pkg/gen/internalmessages/m_t_o_shipment_type.go b/pkg/gen/internalmessages/m_t_o_shipment_type.go index 54de92340cb..a3853e1f64c 100644 --- a/pkg/gen/internalmessages/m_t_o_shipment_type.go +++ b/pkg/gen/internalmessages/m_t_o_shipment_type.go @@ -34,8 +34,8 @@ const ( // MTOShipmentTypeHHG captures enum value "HHG" MTOShipmentTypeHHG MTOShipmentType = "HHG" - // MTOShipmentTypeHHGINTONTSDOMESTIC captures enum value "HHG_INTO_NTS_DOMESTIC" - MTOShipmentTypeHHGINTONTSDOMESTIC MTOShipmentType = "HHG_INTO_NTS_DOMESTIC" + // MTOShipmentTypeHHGINTONTS captures enum value "HHG_INTO_NTS" + MTOShipmentTypeHHGINTONTS MTOShipmentType = "HHG_INTO_NTS" // MTOShipmentTypeHHGOUTOFNTSDOMESTIC captures enum value "HHG_OUTOF_NTS_DOMESTIC" MTOShipmentTypeHHGOUTOFNTSDOMESTIC MTOShipmentType = "HHG_OUTOF_NTS_DOMESTIC" @@ -61,7 +61,7 @@ var mTOShipmentTypeEnum []interface{} func init() { var res []MTOShipmentType - if err := json.Unmarshal([]byte(`["HHG","HHG_INTO_NTS_DOMESTIC","HHG_OUTOF_NTS_DOMESTIC","PPM","BOAT_HAUL_AWAY","BOAT_TOW_AWAY","MOBILE_HOME","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["HHG","HHG_INTO_NTS","HHG_OUTOF_NTS_DOMESTIC","PPM","BOAT_HAUL_AWAY","BOAT_TOW_AWAY","MOBILE_HOME","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/pkg/gen/primeapi/embedded_spec.go b/pkg/gen/primeapi/embedded_spec.go index 06bca786cd6..5ce22a16bfb 100644 --- a/pkg/gen/primeapi/embedded_spec.go +++ b/pkg/gen/primeapi/embedded_spec.go @@ -2539,14 +2539,14 @@ func init() { } }, "MTOShipmentType": { - "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS_DOMESTIC` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", + "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", "type": "string", "title": "Shipment Type", "enum": [ "BOAT_HAUL_AWAY", "BOAT_TOW_AWAY", "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "MOBILE_HOME", "PPM", @@ -2556,7 +2556,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat shipment that requires additional equipment to haul it to it's destination", "BOAT_TOW_AWAY": "Boat shipment that has a road-worthy trailer", "HHG": "Household goods move (HHG)", - "HHG_INTO_NTS_DOMESTIC": "HHG into Non-temporary storage (NTS)", + "HHG_INTO_NTS": "HHG into Non-temporary storage (NTS)", "HHG_OUTOF_NTS_DOMESTIC": "HHG out of Non-temporary storage (NTS Release)", "PPM": "Personally Procured Move also known as Do It Yourself (DITY)", "UNACCOMPANIED_BAGGAGE": "Unaccompanied Baggage" @@ -7458,14 +7458,14 @@ func init() { } }, "MTOShipmentType": { - "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS_DOMESTIC` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", + "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", "type": "string", "title": "Shipment Type", "enum": [ "BOAT_HAUL_AWAY", "BOAT_TOW_AWAY", "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "MOBILE_HOME", "PPM", @@ -7475,7 +7475,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat shipment that requires additional equipment to haul it to it's destination", "BOAT_TOW_AWAY": "Boat shipment that has a road-worthy trailer", "HHG": "Household goods move (HHG)", - "HHG_INTO_NTS_DOMESTIC": "HHG into Non-temporary storage (NTS)", + "HHG_INTO_NTS": "HHG into Non-temporary storage (NTS)", "HHG_OUTOF_NTS_DOMESTIC": "HHG out of Non-temporary storage (NTS Release)", "PPM": "Personally Procured Move also known as Do It Yourself (DITY)", "UNACCOMPANIED_BAGGAGE": "Unaccompanied Baggage" diff --git a/pkg/gen/primemessages/m_t_o_shipment_type.go b/pkg/gen/primemessages/m_t_o_shipment_type.go index 505bb86c35e..45ce8a14201 100644 --- a/pkg/gen/primemessages/m_t_o_shipment_type.go +++ b/pkg/gen/primemessages/m_t_o_shipment_type.go @@ -18,7 +18,7 @@ import ( // // The type of shipment. // - `HHG` = Household goods move -// - `HHG_INTO_NTS_DOMESTIC` = HHG into Non-temporary storage (NTS) +// - `HHG_INTO_NTS` = HHG into Non-temporary storage (NTS) // - `HHG_OUTOF_NTS_DOMESTIC` = HHG out of Non-temporary storage (NTS Release) // - `PPM` = Personally Procured Move also known as Do It Yourself (DITY) // - `BOAT_HAUL_AWAY` = Boat shipment that requires additional equipment to haul it to it's destination @@ -50,8 +50,8 @@ const ( // MTOShipmentTypeHHG captures enum value "HHG" MTOShipmentTypeHHG MTOShipmentType = "HHG" - // MTOShipmentTypeHHGINTONTSDOMESTIC captures enum value "HHG_INTO_NTS_DOMESTIC" - MTOShipmentTypeHHGINTONTSDOMESTIC MTOShipmentType = "HHG_INTO_NTS_DOMESTIC" + // MTOShipmentTypeHHGINTONTS captures enum value "HHG_INTO_NTS" + MTOShipmentTypeHHGINTONTS MTOShipmentType = "HHG_INTO_NTS" // MTOShipmentTypeHHGOUTOFNTSDOMESTIC captures enum value "HHG_OUTOF_NTS_DOMESTIC" MTOShipmentTypeHHGOUTOFNTSDOMESTIC MTOShipmentType = "HHG_OUTOF_NTS_DOMESTIC" @@ -71,7 +71,7 @@ var mTOShipmentTypeEnum []interface{} func init() { var res []MTOShipmentType - if err := json.Unmarshal([]byte(`["BOAT_HAUL_AWAY","BOAT_TOW_AWAY","HHG","HHG_INTO_NTS_DOMESTIC","HHG_OUTOF_NTS_DOMESTIC","MOBILE_HOME","PPM","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["BOAT_HAUL_AWAY","BOAT_TOW_AWAY","HHG","HHG_INTO_NTS","HHG_OUTOF_NTS_DOMESTIC","MOBILE_HOME","PPM","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/pkg/gen/primev2api/embedded_spec.go b/pkg/gen/primev2api/embedded_spec.go index 1c898ceef1c..f907813b53b 100644 --- a/pkg/gen/primev2api/embedded_spec.go +++ b/pkg/gen/primev2api/embedded_spec.go @@ -170,7 +170,7 @@ func init() { "streetAddress1": "204 South Prospect Lane" }, "requestedPickupDate": "2022-12-31", - "shipmentType": "HHG_INTO_NTS_DOMESTIC" + "shipmentType": "HHG_INTO_NTS" } }, "nts-r": { @@ -1635,14 +1635,14 @@ func init() { } }, "MTOShipmentType": { - "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS_DOMESTIC` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", + "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", "type": "string", "title": "Shipment Type", "enum": [ "BOAT_HAUL_AWAY", "BOAT_TOW_AWAY", "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "MOBILE_HOME", "PPM", @@ -1652,7 +1652,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat shipment that requires additional equipment to haul it to it's destination", "BOAT_TOW_AWAY": "Boat shipment that has a road-worthy trailer", "HHG": "Household goods move (HHG)", - "HHG_INTO_NTS_DOMESTIC": "HHG into Non-temporary storage (NTS)", + "HHG_INTO_NTS": "HHG into Non-temporary storage (NTS)", "HHG_OUTOF_NTS_DOMESTIC": "HHG out of Non-temporary storage (NTS Release)", "PPM": "Personally Procured Move also known as Do It Yourself (DITY)", "UNACCOMPANIED_BAGGAGE": "Unaccompanied Baggage" @@ -3755,7 +3755,7 @@ func init() { "streetAddress1": "204 South Prospect Lane" }, "requestedPickupDate": "2022-12-31", - "shipmentType": "HHG_INTO_NTS_DOMESTIC" + "shipmentType": "HHG_INTO_NTS" } }, "nts-r": { @@ -5257,14 +5257,14 @@ func init() { } }, "MTOShipmentType": { - "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS_DOMESTIC` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", + "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", "type": "string", "title": "Shipment Type", "enum": [ "BOAT_HAUL_AWAY", "BOAT_TOW_AWAY", "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "MOBILE_HOME", "PPM", @@ -5274,7 +5274,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat shipment that requires additional equipment to haul it to it's destination", "BOAT_TOW_AWAY": "Boat shipment that has a road-worthy trailer", "HHG": "Household goods move (HHG)", - "HHG_INTO_NTS_DOMESTIC": "HHG into Non-temporary storage (NTS)", + "HHG_INTO_NTS": "HHG into Non-temporary storage (NTS)", "HHG_OUTOF_NTS_DOMESTIC": "HHG out of Non-temporary storage (NTS Release)", "PPM": "Personally Procured Move also known as Do It Yourself (DITY)", "UNACCOMPANIED_BAGGAGE": "Unaccompanied Baggage" diff --git a/pkg/gen/primev2messages/m_t_o_shipment_type.go b/pkg/gen/primev2messages/m_t_o_shipment_type.go index 0cc17b7f291..79fe1f1ef90 100644 --- a/pkg/gen/primev2messages/m_t_o_shipment_type.go +++ b/pkg/gen/primev2messages/m_t_o_shipment_type.go @@ -18,7 +18,7 @@ import ( // // The type of shipment. // - `HHG` = Household goods move -// - `HHG_INTO_NTS_DOMESTIC` = HHG into Non-temporary storage (NTS) +// - `HHG_INTO_NTS` = HHG into Non-temporary storage (NTS) // - `HHG_OUTOF_NTS_DOMESTIC` = HHG out of Non-temporary storage (NTS Release) // - `PPM` = Personally Procured Move also known as Do It Yourself (DITY) // - `BOAT_HAUL_AWAY` = Boat shipment that requires additional equipment to haul it to it's destination @@ -50,8 +50,8 @@ const ( // MTOShipmentTypeHHG captures enum value "HHG" MTOShipmentTypeHHG MTOShipmentType = "HHG" - // MTOShipmentTypeHHGINTONTSDOMESTIC captures enum value "HHG_INTO_NTS_DOMESTIC" - MTOShipmentTypeHHGINTONTSDOMESTIC MTOShipmentType = "HHG_INTO_NTS_DOMESTIC" + // MTOShipmentTypeHHGINTONTS captures enum value "HHG_INTO_NTS" + MTOShipmentTypeHHGINTONTS MTOShipmentType = "HHG_INTO_NTS" // MTOShipmentTypeHHGOUTOFNTSDOMESTIC captures enum value "HHG_OUTOF_NTS_DOMESTIC" MTOShipmentTypeHHGOUTOFNTSDOMESTIC MTOShipmentType = "HHG_OUTOF_NTS_DOMESTIC" @@ -71,7 +71,7 @@ var mTOShipmentTypeEnum []interface{} func init() { var res []MTOShipmentType - if err := json.Unmarshal([]byte(`["BOAT_HAUL_AWAY","BOAT_TOW_AWAY","HHG","HHG_INTO_NTS_DOMESTIC","HHG_OUTOF_NTS_DOMESTIC","MOBILE_HOME","PPM","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["BOAT_HAUL_AWAY","BOAT_TOW_AWAY","HHG","HHG_INTO_NTS","HHG_OUTOF_NTS_DOMESTIC","MOBILE_HOME","PPM","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/pkg/gen/primev3api/embedded_spec.go b/pkg/gen/primev3api/embedded_spec.go index 5e92ba704ac..df6a51d3016 100644 --- a/pkg/gen/primev3api/embedded_spec.go +++ b/pkg/gen/primev3api/embedded_spec.go @@ -170,7 +170,7 @@ func init() { "streetAddress1": "204 South Prospect Lane" }, "requestedPickupDate": "2022-12-31", - "shipmentType": "HHG_INTO_NTS_DOMESTIC" + "shipmentType": "HHG_INTO_NTS" } }, "nts-r": { @@ -1797,14 +1797,14 @@ func init() { } }, "MTOShipmentType": { - "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS_DOMESTIC` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", + "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", "type": "string", "title": "Shipment Type", "enum": [ "BOAT_HAUL_AWAY", "BOAT_TOW_AWAY", "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "MOBILE_HOME", "PPM", @@ -1814,7 +1814,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat shipment that requires additional equipment to haul it to it's destination", "BOAT_TOW_AWAY": "Boat shipment that has a road-worthy trailer", "HHG": "Household goods move (HHG)", - "HHG_INTO_NTS_DOMESTIC": "HHG into Non-temporary storage (NTS)", + "HHG_INTO_NTS": "HHG into Non-temporary storage (NTS)", "HHG_OUTOF_NTS_DOMESTIC": "HHG out of Non-temporary storage (NTS Release)", "PPM": "Personally Procured Move also known as Do It Yourself (DITY)", "UNACCOMPANIED_BAGGAGE": "Unaccompanied Baggage" @@ -4440,7 +4440,7 @@ func init() { "streetAddress1": "204 South Prospect Lane" }, "requestedPickupDate": "2022-12-31", - "shipmentType": "HHG_INTO_NTS_DOMESTIC" + "shipmentType": "HHG_INTO_NTS" } }, "nts-r": { @@ -6104,14 +6104,14 @@ func init() { } }, "MTOShipmentType": { - "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS_DOMESTIC` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", + "description": "The type of shipment.\n * ` + "`" + `HHG` + "`" + ` = Household goods move\n * ` + "`" + `HHG_INTO_NTS` + "`" + ` = HHG into Non-temporary storage (NTS)\n * ` + "`" + `HHG_OUTOF_NTS_DOMESTIC` + "`" + ` = HHG out of Non-temporary storage (NTS Release)\n * ` + "`" + `PPM` + "`" + ` = Personally Procured Move also known as Do It Yourself (DITY)\n * ` + "`" + `BOAT_HAUL_AWAY` + "`" + ` = Boat shipment that requires additional equipment to haul it to it's destination\n * ` + "`" + `BOAT_TOW_AWAY` + "`" + ` = Boat shipment that has a road-worthy trailer\n * ` + "`" + `MOBILE_HOME` + "`" + ` = Mobile Home shipment that a customer may move.\n", "type": "string", "title": "Shipment Type", "enum": [ "BOAT_HAUL_AWAY", "BOAT_TOW_AWAY", "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "MOBILE_HOME", "PPM", @@ -6121,7 +6121,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat shipment that requires additional equipment to haul it to it's destination", "BOAT_TOW_AWAY": "Boat shipment that has a road-worthy trailer", "HHG": "Household goods move (HHG)", - "HHG_INTO_NTS_DOMESTIC": "HHG into Non-temporary storage (NTS)", + "HHG_INTO_NTS": "HHG into Non-temporary storage (NTS)", "HHG_OUTOF_NTS_DOMESTIC": "HHG out of Non-temporary storage (NTS Release)", "PPM": "Personally Procured Move also known as Do It Yourself (DITY)", "UNACCOMPANIED_BAGGAGE": "Unaccompanied Baggage" diff --git a/pkg/gen/primev3messages/m_t_o_shipment_type.go b/pkg/gen/primev3messages/m_t_o_shipment_type.go index edf27c6c57a..cbcda952606 100644 --- a/pkg/gen/primev3messages/m_t_o_shipment_type.go +++ b/pkg/gen/primev3messages/m_t_o_shipment_type.go @@ -18,7 +18,7 @@ import ( // // The type of shipment. // - `HHG` = Household goods move -// - `HHG_INTO_NTS_DOMESTIC` = HHG into Non-temporary storage (NTS) +// - `HHG_INTO_NTS` = HHG into Non-temporary storage (NTS) // - `HHG_OUTOF_NTS_DOMESTIC` = HHG out of Non-temporary storage (NTS Release) // - `PPM` = Personally Procured Move also known as Do It Yourself (DITY) // - `BOAT_HAUL_AWAY` = Boat shipment that requires additional equipment to haul it to it's destination @@ -50,8 +50,8 @@ const ( // MTOShipmentTypeHHG captures enum value "HHG" MTOShipmentTypeHHG MTOShipmentType = "HHG" - // MTOShipmentTypeHHGINTONTSDOMESTIC captures enum value "HHG_INTO_NTS_DOMESTIC" - MTOShipmentTypeHHGINTONTSDOMESTIC MTOShipmentType = "HHG_INTO_NTS_DOMESTIC" + // MTOShipmentTypeHHGINTONTS captures enum value "HHG_INTO_NTS" + MTOShipmentTypeHHGINTONTS MTOShipmentType = "HHG_INTO_NTS" // MTOShipmentTypeHHGOUTOFNTSDOMESTIC captures enum value "HHG_OUTOF_NTS_DOMESTIC" MTOShipmentTypeHHGOUTOFNTSDOMESTIC MTOShipmentType = "HHG_OUTOF_NTS_DOMESTIC" @@ -71,7 +71,7 @@ var mTOShipmentTypeEnum []interface{} func init() { var res []MTOShipmentType - if err := json.Unmarshal([]byte(`["BOAT_HAUL_AWAY","BOAT_TOW_AWAY","HHG","HHG_INTO_NTS_DOMESTIC","HHG_OUTOF_NTS_DOMESTIC","MOBILE_HOME","PPM","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["BOAT_HAUL_AWAY","BOAT_TOW_AWAY","HHG","HHG_INTO_NTS","HHG_OUTOF_NTS_DOMESTIC","MOBILE_HOME","PPM","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/pkg/gen/supportapi/embedded_spec.go b/pkg/gen/supportapi/embedded_spec.go index 31eea1917ec..65ee2ddea96 100644 --- a/pkg/gen/supportapi/embedded_spec.go +++ b/pkg/gen/supportapi/embedded_spec.go @@ -1792,7 +1792,7 @@ func init() { "title": "Shipment Type", "enum": [ "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "PPM", "BOAT_HAUL_AWAY", @@ -1804,7 +1804,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat Haul-Away", "BOAT_TOW_AWAY": "Boat Tow-Away", "HHG": "HHG", - "HHG_INTO_NTS_DOMESTIC": "NTS", + "HHG_INTO_NTS": "NTS", "HHG_OUTOF_NTS_DOMESTIC": "NTS Release", "MOBILE_HOME": "Mobile Home", "PPM": "PPM", @@ -4659,7 +4659,7 @@ func init() { "title": "Shipment Type", "enum": [ "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "PPM", "BOAT_HAUL_AWAY", @@ -4671,7 +4671,7 @@ func init() { "BOAT_HAUL_AWAY": "Boat Haul-Away", "BOAT_TOW_AWAY": "Boat Tow-Away", "HHG": "HHG", - "HHG_INTO_NTS_DOMESTIC": "NTS", + "HHG_INTO_NTS": "NTS", "HHG_OUTOF_NTS_DOMESTIC": "NTS Release", "MOBILE_HOME": "Mobile Home", "PPM": "PPM", diff --git a/pkg/gen/supportmessages/m_t_o_shipment_type.go b/pkg/gen/supportmessages/m_t_o_shipment_type.go index 39479c3c977..1fb19e022f8 100644 --- a/pkg/gen/supportmessages/m_t_o_shipment_type.go +++ b/pkg/gen/supportmessages/m_t_o_shipment_type.go @@ -34,8 +34,8 @@ const ( // MTOShipmentTypeHHG captures enum value "HHG" MTOShipmentTypeHHG MTOShipmentType = "HHG" - // MTOShipmentTypeHHGINTONTSDOMESTIC captures enum value "HHG_INTO_NTS_DOMESTIC" - MTOShipmentTypeHHGINTONTSDOMESTIC MTOShipmentType = "HHG_INTO_NTS_DOMESTIC" + // MTOShipmentTypeHHGINTONTS captures enum value "HHG_INTO_NTS" + MTOShipmentTypeHHGINTONTS MTOShipmentType = "HHG_INTO_NTS" // MTOShipmentTypeHHGOUTOFNTSDOMESTIC captures enum value "HHG_OUTOF_NTS_DOMESTIC" MTOShipmentTypeHHGOUTOFNTSDOMESTIC MTOShipmentType = "HHG_OUTOF_NTS_DOMESTIC" @@ -61,7 +61,7 @@ var mTOShipmentTypeEnum []interface{} func init() { var res []MTOShipmentType - if err := json.Unmarshal([]byte(`["HHG","HHG_INTO_NTS_DOMESTIC","HHG_OUTOF_NTS_DOMESTIC","PPM","BOAT_HAUL_AWAY","BOAT_TOW_AWAY","MOBILE_HOME","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["HHG","HHG_INTO_NTS","HHG_OUTOF_NTS_DOMESTIC","PPM","BOAT_HAUL_AWAY","BOAT_TOW_AWAY","MOBILE_HOME","UNACCOMPANIED_BAGGAGE"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/pkg/handlers/ghcapi/mto_shipment_test.go b/pkg/handlers/ghcapi/mto_shipment_test.go index 03096892d58..858c571ce0e 100644 --- a/pkg/handlers/ghcapi/mto_shipment_test.go +++ b/pkg/handlers/ghcapi/mto_shipment_test.go @@ -69,7 +69,7 @@ func (suite *HandlerSuite) makeListMTOShipmentsSubtestData() (subtestData *listM { Model: models.MTOShipment{ Status: models.MTOShipmentStatusApproved, - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, CounselorRemarks: handlers.FmtString("counselor remark"), SITDaysAllowance: &sitAllowance, }, diff --git a/pkg/handlers/ghcapi/queues_test.go b/pkg/handlers/ghcapi/queues_test.go index e2c0fcb00df..b635e3e0aa9 100644 --- a/pkg/handlers/ghcapi/queues_test.go +++ b/pkg/handlers/ghcapi/queues_test.go @@ -165,7 +165,7 @@ func (suite *HandlerSuite) TestGetMoveQueuesHandlerMoveInfo() { }, { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, }, }, }, nil) diff --git a/pkg/handlers/primeapi/mto_shipment_address.go b/pkg/handlers/primeapi/mto_shipment_address.go index b45999955a9..ff90e90ce9e 100644 --- a/pkg/handlers/primeapi/mto_shipment_address.go +++ b/pkg/handlers/primeapi/mto_shipment_address.go @@ -38,7 +38,7 @@ func (h UpdateMTOShipmentAddressHandler) Handle(params mtoshipmentops.UpdateMTOS payloads.ClientError(handlers.NotFoundMessage, err.Error(), h.GetTraceIDFromRequest(params.HTTPRequest))), err } - if dbShipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTSDom && + if dbShipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTS && (dbShipment.DestinationAddressID != nil && *dbShipment.DestinationAddressID == addressID) { return mtoshipmentops.NewUpdateMTOShipmentAddressUnprocessableEntity().WithPayload(payloads.ValidationError( "Cannot update the destination address of an NTS shipment directly, please update the storage facility address instead", h.GetTraceIDFromRequest(params.HTTPRequest), nil)), err diff --git a/pkg/models/mto_shipments.go b/pkg/models/mto_shipments.go index 633cc31e942..8348185bfca 100644 --- a/pkg/models/mto_shipments.go +++ b/pkg/models/mto_shipments.go @@ -20,7 +20,7 @@ type MTOShipmentType string // using these also in move.go selected move type const ( // NTSRaw is the raw string value of the NTS Shipment Type - NTSRaw = "HHG_INTO_NTS_DOMESTIC" + NTSRaw = "HHG_INTO_NTS" // NTSrRaw is the raw string value of the NTSr Shipment Type NTSrRaw = "HHG_OUTOF_NTS_DOMESTIC" ) @@ -36,8 +36,8 @@ const ( const ( // MTOShipmentTypeHHG is an HHG Shipment Type default MTOShipmentTypeHHG MTOShipmentType = "HHG" - // MTOShipmentTypeHHGIntoNTSDom is an HHG Shipment Type for going into NTS Domestic - MTOShipmentTypeHHGIntoNTSDom MTOShipmentType = NTSRaw + // MTOShipmentTypeHHGIntoNTS is an HHG Shipment Type for going into NTS + MTOShipmentTypeHHGIntoNTS MTOShipmentType = NTSRaw // MTOShipmentTypeHHGOutOfNTSDom is an HHG Shipment Type for going out of NTS Domestic MTOShipmentTypeHHGOutOfNTSDom MTOShipmentType = NTSrRaw // MTOShipmentTypeMobileHome is a Shipment Type for MobileHome @@ -325,7 +325,7 @@ func DetermineShipmentMarketCode(shipment *MTOShipment) *MTOShipment { // determine market code based on address and shipment type switch shipment.ShipmentType { - case MTOShipmentTypeHHGIntoNTSDom: + case MTOShipmentTypeHHGIntoNTS: if shipment.PickupAddress != nil && shipment.StorageFacility != nil && shipment.PickupAddress.IsOconus != nil && shipment.StorageFacility.Address.IsOconus != nil { // If both pickup and storage facility are present, check if both are domestic diff --git a/pkg/models/mto_shipments_test.go b/pkg/models/mto_shipments_test.go index 4014aa90d12..506c69e4d5e 100644 --- a/pkg/models/mto_shipments_test.go +++ b/pkg/models/mto_shipments_test.go @@ -104,7 +104,7 @@ func (suite *ModelSuite) TestMTOShipmentValidation() { } func (suite *ModelSuite) TestDetermineShipmentMarketCode() { - suite.Run("test MTOShipmentTypeHHGIntoNTSDom with domestic pickup and storage facility", func() { + suite.Run("test MTOShipmentTypeHHGIntoNTS with domestic pickup and storage facility", func() { pickupAddress := models.Address{ IsOconus: models.BoolPointer(false), } @@ -112,7 +112,7 @@ func (suite *ModelSuite) TestDetermineShipmentMarketCode() { IsOconus: models.BoolPointer(false), } shipment := &models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, PickupAddress: &pickupAddress, StorageFacility: &models.StorageFacility{ Address: storageAddress, @@ -123,12 +123,12 @@ func (suite *ModelSuite) TestDetermineShipmentMarketCode() { suite.Equal(models.MarketCodeDomestic, updatedShipment.MarketCode, "Expected MarketCode to be d") }) - suite.Run("test MTOShipmentTypeHHGIntoNTSDom with international pickup", func() { + suite.Run("test MTOShipmentTypeHHGIntoNTS with international pickup", func() { pickupAddress := models.Address{ IsOconus: models.BoolPointer(true), } shipment := &models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, PickupAddress: &pickupAddress, } diff --git a/pkg/models/order.go b/pkg/models/order.go index f5cc022e239..84d5c215349 100644 --- a/pkg/models/order.go +++ b/pkg/models/order.go @@ -490,7 +490,7 @@ func (o Order) GetDestinationPostalCodeForAssociatedMoves(db *pop.Connection) (m if o.Moves[i].MTOShipments[j].Status != MTOShipmentStatusRejected && o.Moves[i].MTOShipments[j].Status != MTOShipmentStatusCanceled && - o.Moves[i].MTOShipments[j].ShipmentType != MTOShipmentTypeHHGIntoNTSDom && + o.Moves[i].MTOShipments[j].ShipmentType != MTOShipmentTypeHHGIntoNTS && o.Moves[i].MTOShipments[j].DeletedAt == nil { shipments = append(shipments, o.Moves[i].MTOShipments[j]) } diff --git a/pkg/paperwork/evaluation_report.go b/pkg/paperwork/evaluation_report.go index badcd590670..bf38b056685 100644 --- a/pkg/paperwork/evaluation_report.go +++ b/pkg/paperwork/evaluation_report.go @@ -249,7 +249,7 @@ func PickShipmentCardLayout(shipmentType models.MTOShipmentType) []TableRow { return HHGShipmentCardLayout case models.MTOShipmentTypePPM: return PPMShipmentCardLayout - case models.MTOShipmentTypeHHGIntoNTSDom: + case models.MTOShipmentTypeHHGIntoNTS: return NTSShipmentCardLayout case models.MTOShipmentTypeHHGOutOfNTSDom: return NTSRShipmentCardLayout @@ -345,7 +345,7 @@ func FormatValuesShipment(shipment models.MTOShipment) ShipmentValues { if shipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom { vals.PickupAddress = formatSingleLineAddress(shipment.StorageFacility.Address) } - if shipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTSDom { + if shipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTS { vals.DeliveryAddress = formatSingleLineAddress(shipment.StorageFacility.Address) } vals.StorageFacilityName = strings.ToUpper(shipment.StorageFacility.FacilityName) diff --git a/pkg/paperwork/evaluation_report_form_creator.go b/pkg/paperwork/evaluation_report_form_creator.go index fcb04d0392e..bb7d879f06a 100644 --- a/pkg/paperwork/evaluation_report_form_creator.go +++ b/pkg/paperwork/evaluation_report_form_creator.go @@ -356,7 +356,7 @@ func (f *EvaluationReportFormFiller) shipmentCard(shipment models.MTOShipment) e if shipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom { leftAddressLabel = vals.StorageFacilityName rightAddressLabel = "DELIVERY ADDRESS" - } else if shipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTSDom { + } else if shipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTS { leftAddressLabel = "PICKUP ADDRESS" rightAddressLabel = vals.StorageFacilityName } @@ -608,7 +608,7 @@ func (f *EvaluationReportFormFiller) sideBySideAddress(gap float64, leftAddressX func (f *EvaluationReportFormFiller) formatShipmentType(shipmentType models.MTOShipmentType) string { if shipmentType == models.MTOShipmentTypePPM { return "PPM" - } else if shipmentType == models.MTOShipmentTypeHHGIntoNTSDom { + } else if shipmentType == models.MTOShipmentTypeHHGIntoNTS { return "NTS" } else if shipmentType == models.MTOShipmentTypeHHGOutOfNTSDom { return "NTS-R" diff --git a/pkg/paperwork/evaluation_report_test.go b/pkg/paperwork/evaluation_report_test.go index 716c9fd6d61..4b52e778970 100644 --- a/pkg/paperwork/evaluation_report_test.go +++ b/pkg/paperwork/evaluation_report_test.go @@ -128,7 +128,7 @@ func (suite *PaperworkSuite) TestPickShipmentCardLayout() { suite.ElementsMatch(PPMShipmentCardLayout, PickShipmentCardLayout(models.MTOShipmentTypePPM)) }) suite.Run("NTS", func() { - suite.ElementsMatch(NTSShipmentCardLayout, PickShipmentCardLayout(models.MTOShipmentTypeHHGIntoNTSDom)) + suite.ElementsMatch(NTSShipmentCardLayout, PickShipmentCardLayout(models.MTOShipmentTypeHHGIntoNTS)) }) suite.Run("NTS-R", func() { suite.ElementsMatch(NTSRShipmentCardLayout, PickShipmentCardLayout(models.MTOShipmentTypeHHGOutOfNTSDom)) diff --git a/pkg/payment_request/service_param_value_lookups/service_param_value_lookups.go b/pkg/payment_request/service_param_value_lookups/service_param_value_lookups.go index dd8040b95dd..6c5fc73c42a 100644 --- a/pkg/payment_request/service_param_value_lookups/service_param_value_lookups.go +++ b/pkg/payment_request/service_param_value_lookups/service_param_value_lookups.go @@ -566,7 +566,7 @@ func getDestinationAddressForService(appCtx appcontext.AppContext, serviceCode m var ptrDestinationAddress *models.Address var addressType string switch mtoShipment.ShipmentType { - case models.MTOShipmentTypeHHGIntoNTSDom: + case models.MTOShipmentTypeHHGIntoNTS: addressType = "storage facility" if mtoShipment.StorageFacility != nil { ptrDestinationAddress = &mtoShipment.StorageFacility.Address diff --git a/pkg/payment_request/service_param_value_lookups/service_param_value_lookups_test.go b/pkg/payment_request/service_param_value_lookups/service_param_value_lookups_test.go index 39096262c77..48ba8bb1c7b 100644 --- a/pkg/payment_request/service_param_value_lookups/service_param_value_lookups_test.go +++ b/pkg/payment_request/service_param_value_lookups/service_param_value_lookups_test.go @@ -776,7 +776,7 @@ func (suite *ServiceParamValueLookupsSuite) TestServiceParamValueLookup() { }, { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, }, }, }, nil) diff --git a/pkg/payment_request/service_param_value_lookups/weight_billed_lookup_test.go b/pkg/payment_request/service_param_value_lookups/weight_billed_lookup_test.go index dbf0030ccb6..78072940ae1 100644 --- a/pkg/payment_request/service_param_value_lookups/weight_billed_lookup_test.go +++ b/pkg/payment_request/service_param_value_lookups/weight_billed_lookup_test.go @@ -84,7 +84,7 @@ func (suite *ServiceParamValueLookupsSuite) TestWeightBilledLookup() { {models.ReServiceCodeDOP, unit.Pound(450), "500", models.MTOShipmentTypeHHG}, {models.ReServiceCodeDDP, unit.Pound(450), "500", models.MTOShipmentTypeHHG}, {models.ReServiceCodeDPK, unit.Pound(450), "500", models.MTOShipmentTypeHHG}, - {models.ReServiceCodeDNPK, unit.Pound(450), "500", models.MTOShipmentTypeHHGIntoNTSDom}, + {models.ReServiceCodeDNPK, unit.Pound(450), "500", models.MTOShipmentTypeHHGIntoNTS}, {models.ReServiceCodeDUPK, unit.Pound(450), "500", models.MTOShipmentTypeHHG}, // Domestic SIT {models.ReServiceCodeDOFSIT, unit.Pound(450), "500", models.MTOShipmentTypeHHG}, @@ -306,7 +306,7 @@ func (suite *ServiceParamValueLookupsSuite) TestWeightBilledLookupDivertedShipme childEstimatedWeight := unit.Pound(1600) childActualWeight := unit.Pound(2400) - _, _, _, _, _, childParamLookup := suite.setupTestDivertedShipmentChain(&parentEstimatedWeight, &childEstimatedWeight, &parentActualWeight, &childActualWeight, nil, nil, models.ReServiceCodeDLH, models.MTOShipmentTypeHHGIntoNTSDom) + _, _, _, _, _, childParamLookup := suite.setupTestDivertedShipmentChain(&parentEstimatedWeight, &childEstimatedWeight, &parentActualWeight, &childActualWeight, nil, nil, models.ReServiceCodeDLH, models.MTOShipmentTypeHHGIntoNTS) // Use the child shipment valueStr, err := childParamLookup.ServiceParamValue(suite.AppContextForTest(), key) @@ -324,7 +324,7 @@ func (suite *ServiceParamValueLookupsSuite) TestWeightBilledLookupDivertedShipme childEstimatedWeight := unit.Pound(1600) childActualWeight := unit.Pound(2400) - _, _, _, _, _, childParamLookup := suite.setupTestDivertedShipmentChain(&parentEstimatedWeight, &childEstimatedWeight, &parentActualWeight, &childActualWeight, &parentReweighWeight, nil, models.ReServiceCodeDLH, models.MTOShipmentTypeHHGIntoNTSDom) + _, _, _, _, _, childParamLookup := suite.setupTestDivertedShipmentChain(&parentEstimatedWeight, &childEstimatedWeight, &parentActualWeight, &childActualWeight, &parentReweighWeight, nil, models.ReServiceCodeDLH, models.MTOShipmentTypeHHGIntoNTS) // Use the child shipment valueStr, err := childParamLookup.ServiceParamValue(suite.AppContextForTest(), key) diff --git a/pkg/services/event/event_test.go b/pkg/services/event/event_test.go index 3de1e255036..2c858a30d40 100644 --- a/pkg/services/event/event_test.go +++ b/pkg/services/event/event_test.go @@ -313,7 +313,7 @@ func (suite *EventServiceSuite) Test_MTOShipmentEventTrigger() { }, { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, NTSRecordedWeight: &ntsRecordedWeight, }, }, @@ -370,7 +370,7 @@ func (suite *EventServiceSuite) Test_MTOShipmentEventTrigger() { }, { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, UsesExternalVendor: true, }, }, diff --git a/pkg/services/mto_shipment/mto_shipment_creator.go b/pkg/services/mto_shipment/mto_shipment_creator.go index 7b439cf99d4..6acb542b68b 100644 --- a/pkg/services/mto_shipment/mto_shipment_creator.go +++ b/pkg/services/mto_shipment/mto_shipment_creator.go @@ -242,7 +242,7 @@ func (f mtoShipmentCreator) CreateMTOShipment(appCtx appcontext.AppContext, ship shipment.TertiaryPickupAddress.County = county } - if shipment.DestinationAddress != nil && shipment.ShipmentType != models.MTOShipmentTypeHHGIntoNTSDom { + if shipment.DestinationAddress != nil && shipment.ShipmentType != models.MTOShipmentTypeHHGIntoNTS { destinationAddress, errAddress := f.addressCreator.CreateAddress(txnAppCtx, shipment.DestinationAddress) if errAddress != nil { return apperror.NewInvalidInputError(uuid.Nil, nil, nil, "failed to create destination address "+errAddress.Error()) @@ -309,7 +309,7 @@ func (f mtoShipmentCreator) CreateMTOShipment(appCtx appcontext.AppContext, ship shipment.PickupAddress = &shipment.StorageFacility.Address } // For NTS set the destination address to the storage facility - if shipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTSDom { + if shipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTS { shipment.DestinationAddressID = &shipment.StorageFacility.AddressID shipment.DestinationAddress = &shipment.StorageFacility.Address } diff --git a/pkg/services/mto_shipment/mto_shipment_creator_test.go b/pkg/services/mto_shipment/mto_shipment_creator_test.go index 82e057c61f6..6c31487f0fa 100644 --- a/pkg/services/mto_shipment/mto_shipment_creator_test.go +++ b/pkg/services/mto_shipment/mto_shipment_creator_test.go @@ -106,7 +106,7 @@ func (suite *MTOShipmentServiceSuite) TestCreateMTOShipment() { for _, testCase := range testCases { var err error - if testCase.shipmentType == models.MTOShipmentTypeHHGOutOfNTSDom || testCase.shipmentType == models.MTOShipmentTypeHHGIntoNTSDom { + if testCase.shipmentType == models.MTOShipmentTypeHHGOutOfNTSDom || testCase.shipmentType == models.MTOShipmentTypeHHGIntoNTS { storageFacility := factory.BuildStorageFacility(nil, nil, nil) storageFacility.ID = uuid.Must(uuid.NewV4()) @@ -377,7 +377,7 @@ func (suite *MTOShipmentServiceSuite) TestCreateMTOShipment() { expectDutyStation bool }{ {models.MTOShipmentTypeHHG, true}, - {models.MTOShipmentTypeHHGIntoNTSDom, false}, + {models.MTOShipmentTypeHHGIntoNTS, false}, {models.MTOShipmentTypeHHGOutOfNTSDom, false}, {models.MTOShipmentTypePPM, false}, } @@ -795,7 +795,7 @@ func (suite *MTOShipmentServiceSuite) TestCreateMTOShipment() { shipmentType models.MTOShipmentType }{ {"HHG", models.MTOShipmentTypeHHG}, - {"HHG_INTO_NTS_DOMESTIC", models.MTOShipmentTypeHHGIntoNTSDom}, + {"HHG_INTO_NTS", models.MTOShipmentTypeHHGIntoNTS}, {"HHG_OUTOF_NTS_DOMESTIC", models.MTOShipmentTypeHHGOutOfNTSDom}, {"MOBILE_HOME", models.MTOShipmentTypeMobileHome}, {"BOAT_HAUL_AWAY", models.MTOShipmentTypeBoatHaulAway}, @@ -837,7 +837,7 @@ func (suite *MTOShipmentServiceSuite) TestCreateMTOShipment() { shipmentType models.MTOShipmentType }{ {"HHG", models.MTOShipmentTypeHHG}, - {"HHG_INTO_NTS_DOMESTIC", models.MTOShipmentTypeHHGIntoNTSDom}, + {"HHG_INTO_NTS", models.MTOShipmentTypeHHGIntoNTS}, {"HHG_OUTOF_NTS_DOMESTIC", models.MTOShipmentTypeHHGOutOfNTSDom}, {"MOBILE_HOME", models.MTOShipmentTypeMobileHome}, {"BOAT_HAUL_AWAY", models.MTOShipmentTypeBoatHaulAway}, @@ -898,7 +898,7 @@ func (suite *MTOShipmentServiceSuite) TestCreateMTOShipment() { shipmentType models.MTOShipmentType }{ {"HHG", models.MTOShipmentTypeHHG}, - {"HHG_INTO_NTS_DOMESTIC", models.MTOShipmentTypeHHGIntoNTSDom}, + {"HHG_INTO_NTS", models.MTOShipmentTypeHHGIntoNTS}, {"HHG_OUTOF_NTS_DOMESTIC", models.MTOShipmentTypeHHGOutOfNTSDom}, {"MOBILE_HOME", models.MTOShipmentTypeMobileHome}, {"BOAT_HAUL_AWAY", models.MTOShipmentTypeBoatHaulAway}, @@ -979,7 +979,7 @@ func (suite *MTOShipmentServiceSuite) TestCreateMTOShipment() { shipmentType models.MTOShipmentType }{ {"HHG", models.MTOShipmentTypeHHG}, - {"HHG_INTO_NTS_DOMESTIC", models.MTOShipmentTypeHHGIntoNTSDom}, + {"HHG_INTO_NTS", models.MTOShipmentTypeHHGIntoNTS}, {"HHG_OUTOF_NTS_DOMESTIC", models.MTOShipmentTypeHHGOutOfNTSDom}, {"MOBILE_HOME", models.MTOShipmentTypeMobileHome}, {"BOAT_HAUL_AWAY", models.MTOShipmentTypeBoatHaulAway}, @@ -1021,7 +1021,7 @@ func (suite *MTOShipmentServiceSuite) TestCreateMTOShipment() { shipmentType models.MTOShipmentType }{ {"HHG", models.MTOShipmentTypeHHG}, - {"HHG_INTO_NTS_DOMESTIC", models.MTOShipmentTypeHHGIntoNTSDom}, + {"HHG_INTO_NTS", models.MTOShipmentTypeHHGIntoNTS}, {"HHG_OUTOF_NTS_DOMESTIC", models.MTOShipmentTypeHHGOutOfNTSDom}, {"MOBILE_HOME", models.MTOShipmentTypeMobileHome}, {"BOAT_HAUL_AWAY", models.MTOShipmentTypeBoatHaulAway}, @@ -1063,7 +1063,7 @@ func (suite *MTOShipmentServiceSuite) TestCreateMTOShipment() { shipmentType models.MTOShipmentType }{ {"HHG", models.MTOShipmentTypeHHG}, - {"HHG_INTO_NTS_DOMESTIC", models.MTOShipmentTypeHHGIntoNTSDom}, + {"HHG_INTO_NTS", models.MTOShipmentTypeHHGIntoNTS}, {"HHG_OUTOF_NTS_DOMESTIC", models.MTOShipmentTypeHHGOutOfNTSDom}, {"MOBILE_HOME", models.MTOShipmentTypeMobileHome}, {"BOAT_HAUL_AWAY", models.MTOShipmentTypeBoatHaulAway}, diff --git a/pkg/services/mto_shipment/mto_shipment_updater.go b/pkg/services/mto_shipment/mto_shipment_updater.go index b4b0d266e0a..3fa1f6ed832 100644 --- a/pkg/services/mto_shipment/mto_shipment_updater.go +++ b/pkg/services/mto_shipment/mto_shipment_updater.go @@ -162,7 +162,7 @@ func setNewShipmentFields(appCtx appcontext.AppContext, dbShipment *models.MTOSh dbShipment.PickupAddress = requestedUpdatedShipment.PickupAddress } - if requestedUpdatedShipment.DestinationAddress != nil && dbShipment.ShipmentType != models.MTOShipmentTypeHHGIntoNTSDom { + if requestedUpdatedShipment.DestinationAddress != nil && dbShipment.ShipmentType != models.MTOShipmentTypeHHGIntoNTS { dbShipment.DestinationAddress = requestedUpdatedShipment.DestinationAddress } @@ -445,7 +445,7 @@ func (f *mtoShipmentUpdater) updateShipmentRecord(appCtx appcontext.AppContext, // vs "don't touch" the field, so we can't safely reset a nil DestinationAddress to the duty // location address for an HHG like we do in the MTOShipmentCreator now. See MB-15718. - if newShipment.DestinationAddress != nil && newShipment.ShipmentType != models.MTOShipmentTypeHHGIntoNTSDom { + if newShipment.DestinationAddress != nil && newShipment.ShipmentType != models.MTOShipmentTypeHHGIntoNTS { // If there is an existing DestinationAddressID associated // with the shipment, grab it. if dbShipment.DestinationAddressID != nil { @@ -693,7 +693,7 @@ func (f *mtoShipmentUpdater) updateShipmentRecord(appCtx appcontext.AppContext, } // For NTS set the destination address to the storage facility - if newShipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTSDom { + if newShipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTS { newShipment.DestinationAddressID = &newShipment.StorageFacility.AddressID newShipment.DestinationAddress = &newShipment.StorageFacility.Address } @@ -1047,9 +1047,9 @@ func (o *mtoShipmentStatusUpdater) setRequiredDeliveryDate(appCtx appcontext.App weight := shipment.PrimeEstimatedWeight switch shipment.ShipmentType { - case models.MTOShipmentTypeHHGIntoNTSDom: + case models.MTOShipmentTypeHHGIntoNTS: if shipment.StorageFacility == nil || shipment.StorageFacility.AddressID == uuid.Nil { - return errors.Errorf("StorageFacility is required for %s shipments", models.MTOShipmentTypeHHGIntoNTSDom) + return errors.Errorf("StorageFacility is required for %s shipments", models.MTOShipmentTypeHHGIntoNTS) } err := appCtx.DB().Load(shipment.StorageFacility, "Address", "Address.Country") if err != nil { @@ -1137,7 +1137,7 @@ func reServiceCodesForShipment(shipment models.MTOShipment) []models.ReServiceCo models.ReServiceCodeDUPK, } } - case models.MTOShipmentTypeHHGIntoNTSDom: + case models.MTOShipmentTypeHHGIntoNTS: // Need to create: Dom Linehaul, Fuel Surcharge, Dom Origin Price, Dom Destination Price, Dom NTS Packing return []models.ReServiceCode{ models.ReServiceCodeDLH, diff --git a/pkg/services/mto_shipment/mto_shipment_updater_test.go b/pkg/services/mto_shipment/mto_shipment_updater_test.go index ba8cc3b7b89..ee3fde58147 100644 --- a/pkg/services/mto_shipment/mto_shipment_updater_test.go +++ b/pkg/services/mto_shipment/mto_shipment_updater_test.go @@ -2356,7 +2356,7 @@ func (suite *MTOShipmentServiceSuite) TestUpdateMTOShipmentStatus() { // 1. The shipment is moving to the APPROVED status // 2. The shipment must already have the following fields present: // MTOShipmentTypeHHG: ScheduledPickupDate, PrimeEstimatedWeight, PickupAddress, DestinationAddress - // MTOShipmentTypeHHGIntoNTSDom: ScheduledPickupDate, PrimeEstimatedWeight, PickupAddress, StorageFacility + // MTOShipmentTypeHHGIntoNTS: ScheduledPickupDate, PrimeEstimatedWeight, PickupAddress, StorageFacility // MTOShipmentTypeHHGOutOfNTSDom: ScheduledPickupDate, NTSRecordedWeight, StorageFacility, DestinationAddress // 3. The shipment must not already have a Required Delivery Date // Note that MakeMTOShipment will automatically add a Required Delivery Date if the ScheduledPickupDate @@ -2399,7 +2399,7 @@ func (suite *MTOShipmentServiceSuite) TestUpdateMTOShipmentStatus() { }, { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, ScheduledPickupDate: &testdatagen.DateInsidePeakRateCycle, PrimeEstimatedWeight: &estimatedWeight, Status: models.MTOShipmentStatusSubmitted, @@ -3213,7 +3213,7 @@ func (suite *MTOShipmentServiceSuite) TestUpdateShipmentNullableFields() { ntsMove := factory.BuildMoveWithShipment(suite.DB(), []factory.Customization{ { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, TACType: &ntsLOAType, SACType: &ntsLOAType, }, @@ -3254,7 +3254,7 @@ func (suite *MTOShipmentServiceSuite) TestUpdateShipmentNullableFields() { ntsMove := factory.BuildMoveWithShipment(suite.DB(), []factory.Customization{ { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, TACType: &ntsLOAType, SACType: &ntsLOAType, }, diff --git a/pkg/services/mto_shipment/rules.go b/pkg/services/mto_shipment/rules.go index 738db7f8d61..e9579b24aae 100644 --- a/pkg/services/mto_shipment/rules.go +++ b/pkg/services/mto_shipment/rules.go @@ -288,7 +288,7 @@ func checkPrimeValidationsOnModel(planner route.Planner) validator { var latestDestinationAddress *models.Address switch older.ShipmentType { - case models.MTOShipmentTypeHHGIntoNTSDom: + case models.MTOShipmentTypeHHGIntoNTS: if older.StorageFacility == nil { // latestDestinationAddress is only used for calculating RDD. // We don't want to block an update because we're missing info to calculate RDD diff --git a/pkg/services/mto_shipment/rules_test.go b/pkg/services/mto_shipment/rules_test.go index 22b7fdf1a26..cc3b8ba8ab1 100644 --- a/pkg/services/mto_shipment/rules_test.go +++ b/pkg/services/mto_shipment/rules_test.go @@ -437,7 +437,7 @@ func (suite *MTOShipmentServiceSuite) TestDeleteValidations() { suite.Run("checkPrimeDeleteAllowed for non-PPM shipments", func() { testCases := map[models.MTOShipmentType]bool{ models.MTOShipmentTypeHHG: false, - models.MTOShipmentTypeHHGIntoNTSDom: false, + models.MTOShipmentTypeHHGIntoNTS: false, models.MTOShipmentTypeHHGOutOfNTSDom: false, models.MTOShipmentTypeMobileHome: false, models.MTOShipmentTypeBoatHaulAway: false, diff --git a/pkg/services/mto_shipment/shipment_approver.go b/pkg/services/mto_shipment/shipment_approver.go index 34021fcb3e2..9c4245e9e15 100644 --- a/pkg/services/mto_shipment/shipment_approver.go +++ b/pkg/services/mto_shipment/shipment_approver.go @@ -192,9 +192,9 @@ func (f *shipmentApprover) setRequiredDeliveryDate(appCtx appcontext.AppContext, var weight int switch shipment.ShipmentType { - case models.MTOShipmentTypeHHGIntoNTSDom: + case models.MTOShipmentTypeHHGIntoNTS: if shipment.StorageFacility == nil { - return errors.Errorf("StorageFacility is required for %s shipments", models.MTOShipmentTypeHHGIntoNTSDom) + return errors.Errorf("StorageFacility is required for %s shipments", models.MTOShipmentTypeHHGIntoNTS) } pickupLocation = shipment.PickupAddress deliveryLocation = &shipment.StorageFacility.Address diff --git a/pkg/services/mto_shipment/shipment_approver_test.go b/pkg/services/mto_shipment/shipment_approver_test.go index 9444dd7cb2c..40079d020a7 100644 --- a/pkg/services/mto_shipment/shipment_approver_test.go +++ b/pkg/services/mto_shipment/shipment_approver_test.go @@ -651,7 +651,7 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() { // 1. The shipment is moving to the APPROVED status // 2. The shipment must already have the following fields present: // MTOShipmentTypeHHG: ScheduledPickupDate, PrimeEstimatedWeight, PickupAddress, DestinationAddress - // MTOShipmentTypeHHGIntoNTSDom: ScheduledPickupDate, PrimeEstimatedWeight, PickupAddress, StorageFacility + // MTOShipmentTypeHHGIntoNTS: ScheduledPickupDate, PrimeEstimatedWeight, PickupAddress, StorageFacility // MTOShipmentTypeHHGOutOfNTSDom: ScheduledPickupDate, NTSRecordedWeight, StorageFacility, DestinationAddress // 3. The shipment must not already have a Required Delivery Date // Note that MakeMTOShipment will automatically add a Required Delivery Date if the ScheduledPickupDate @@ -694,7 +694,7 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() { }, { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, ScheduledPickupDate: &testdatagen.DateInsidePeakRateCycle, PrimeEstimatedWeight: &estimatedWeight, Status: models.MTOShipmentStatusSubmitted, diff --git a/pkg/services/orchestrators/shipment/rules_test.go b/pkg/services/orchestrators/shipment/rules_test.go index aced74a36b9..857385e8170 100644 --- a/pkg/services/orchestrators/shipment/rules_test.go +++ b/pkg/services/orchestrators/shipment/rules_test.go @@ -21,7 +21,7 @@ func (suite *ShipmentSuite) TestCheckShipmentType() { validShipmentTypes := []models.MTOShipmentType{ models.MTOShipmentTypeHHG, - models.MTOShipmentTypeHHGIntoNTSDom, + models.MTOShipmentTypeHHGIntoNTS, models.MTOShipmentTypeHHGOutOfNTSDom, models.MTOShipmentTypePPM, } diff --git a/pkg/services/orchestrators/shipment/shipment_creator_test.go b/pkg/services/orchestrators/shipment/shipment_creator_test.go index 2503a6396ff..30873b04a44 100644 --- a/pkg/services/orchestrators/shipment/shipment_creator_test.go +++ b/pkg/services/orchestrators/shipment/shipment_creator_test.go @@ -156,7 +156,7 @@ func (suite *ShipmentSuite) TestCreateShipment() { }, "NTS is set to Submitted": { models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, }, models.MTOShipmentStatusSubmitted, }, @@ -192,7 +192,7 @@ func (suite *ShipmentSuite) TestCreateShipment() { ShipmentType: models.MTOShipmentTypeHHG, }, { - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, }, { ShipmentType: models.MTOShipmentTypeHHGOutOfNTSDom, diff --git a/pkg/services/orchestrators/shipment/shipment_updater_test.go b/pkg/services/orchestrators/shipment/shipment_updater_test.go index 74375ccec38..6489871a64e 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater_test.go +++ b/pkg/services/orchestrators/shipment/shipment_updater_test.go @@ -200,7 +200,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { shipmentTypeTestCases := []models.MTOShipmentType{ models.MTOShipmentTypeHHG, - models.MTOShipmentTypeHHGIntoNTSDom, + models.MTOShipmentTypeHHGIntoNTS, models.MTOShipmentTypeHHGOutOfNTSDom, models.MTOShipmentTypePPM, } diff --git a/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet.go b/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet.go index faa4bf6e3b3..a0d4ab3a421 100644 --- a/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet.go +++ b/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet.go @@ -460,7 +460,7 @@ func formatAdditionalShipments(ssfd models.ShipmentSummaryFormData) (map[string] page3Map[fmt.Sprintf("AddShipmentStatus%d", i)] = FormatCurrentPPMStatus(*shipment.PPMShipment) case shipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom: page3Map[fmt.Sprintf("AddShipmentNumberAndTypes%d", i)] = *shipment.ShipmentLocator + " NTS Release" - case shipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTSDom: + case shipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTS: page3Map[fmt.Sprintf("AddShipmentNumberAndTypes%d", i)] = *shipment.ShipmentLocator + " NTS" case shipment.ShipmentType == models.MTOShipmentTypeMobileHome: page3Map[fmt.Sprintf("AddShipmentNumberAndTypes%d", i)] = *shipment.ShipmentLocator + " Mobile Home" diff --git a/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go b/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go index 664c0765cc5..8f89327f6f2 100644 --- a/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go +++ b/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go @@ -1698,7 +1698,7 @@ func (suite *ShipmentSummaryWorksheetServiceSuite) TestFormatAdditionalShipments }, { PPMShipment: &ppm2, - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, ShipmentLocator: &locator, RequestedPickupDate: &now, Status: models.MTOShipmentStatusSubmitted, @@ -1811,7 +1811,7 @@ func (suite *ShipmentSummaryWorksheetServiceSuite) TestFormatAdditionalShipments suite.Equal(fmt.Sprintf("%s %s", locator, string(shipment.ShipmentType)), value) } else if shipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom { suite.Equal(fmt.Sprintf("%s %s", locator, "NTS Release"), value) - } else if shipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTSDom { + } else if shipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTS { suite.Equal(fmt.Sprintf("%s %s", locator, "NTS"), value) } else if shipment.ShipmentType == models.MTOShipmentTypeMobileHome { suite.Equal(fmt.Sprintf("%s %s", locator, "Mobile Home"), value) diff --git a/pkg/testdatagen/make_mto_shipment.go b/pkg/testdatagen/make_mto_shipment.go index 7dc20fb63e8..8c4fee37184 100644 --- a/pkg/testdatagen/make_mto_shipment.go +++ b/pkg/testdatagen/make_mto_shipment.go @@ -39,7 +39,7 @@ func makeMTOShipment(db *pop.Connection, assertions Assertions) models.MTOShipme } shipmentHasPickupDetails := mtoShipment.ShipmentType != models.MTOShipmentTypeHHGOutOfNTSDom && mtoShipment.ShipmentType != models.MTOShipmentTypePPM - shipmentHasDeliveryDetails := mtoShipment.ShipmentType != models.MTOShipmentTypeHHGIntoNTSDom && mtoShipment.ShipmentType != models.MTOShipmentTypePPM + shipmentHasDeliveryDetails := mtoShipment.ShipmentType != models.MTOShipmentTypeHHGIntoNTS && mtoShipment.ShipmentType != models.MTOShipmentTypePPM var pickupAddress, secondaryPickupAddress models.Address if shipmentHasPickupDetails { @@ -96,7 +96,7 @@ func makeMTOShipment(db *pop.Connection, assertions Assertions) models.MTOShipme var storageFacilityID *uuid.UUID var storageFacility models.StorageFacility if mtoShipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom || - mtoShipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTSDom { + mtoShipment.ShipmentType == models.MTOShipmentTypeHHGIntoNTS { if mtoShipment.StorageFacility != nil { if isZeroUUID(mtoShipment.StorageFacility.ID) { storageFacility = MakeStorageFacility(db, Assertions{ diff --git a/pkg/testdatagen/scenario/e2ebasic.go b/pkg/testdatagen/scenario/e2ebasic.go index 3f778ea4894..e615fdf931e 100644 --- a/pkg/testdatagen/scenario/e2ebasic.go +++ b/pkg/testdatagen/scenario/e2ebasic.go @@ -2655,7 +2655,7 @@ func createMoveWithSinceParamater(appCtx appcontext.AppContext, userUploader *up mtoShipment3 := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, }, }, { diff --git a/pkg/testdatagen/scenario/shared.go b/pkg/testdatagen/scenario/shared.go index 2b2990d46bc..9d83ef2f47e 100644 --- a/pkg/testdatagen/scenario/shared.go +++ b/pkg/testdatagen/scenario/shared.go @@ -4098,7 +4098,7 @@ func createNTSMove(appCtx appcontext.AppContext) { }, { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, }, }, }, nil) @@ -7261,7 +7261,7 @@ func createMoveWithHHGAndNTSMissingInfo(appCtx appcontext.AppContext, moveRouter Model: models.MTOShipment{ ID: uuid.Must(uuid.NewV4()), PrimeEstimatedWeight: &estimatedWeight, - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, ApprovedDate: models.TimePointer(time.Now()), Status: models.MTOShipmentStatusSubmitted, }, diff --git a/pkg/testdatagen/scenario/subscenarios.go b/pkg/testdatagen/scenario/subscenarios.go index e2e605d78e6..e40a6f5a602 100644 --- a/pkg/testdatagen/scenario/subscenarios.go +++ b/pkg/testdatagen/scenario/subscenarios.go @@ -203,7 +203,7 @@ func subScenarioHHGServicesCounseling(appCtx appcontext.AppContext, userUploader //Shipment Types -- HHG, NTS, NTSR hhg := models.MTOShipmentTypeHHG - nts := models.MTOShipmentTypeHHGIntoNTSDom + nts := models.MTOShipmentTypeHHGIntoNTS ntsR := models.MTOShipmentTypeHHGOutOfNTSDom //Destination Types -- PLEAD, HOR, HOS, OTHER @@ -593,7 +593,7 @@ func subScenarioTXOQueues(appCtx appcontext.AppContext, userUploader *uploader.U //shipment type hhg := models.MTOShipmentTypeHHG - nts := models.MTOShipmentTypeHHGIntoNTSDom + nts := models.MTOShipmentTypeHHGIntoNTS ntsR := models.MTOShipmentTypeHHGOutOfNTSDom //orders type diff --git a/src/components/Customer/Review/ShipmentCard/NTSShipmentCard/NTSShipmentCard.test.jsx b/src/components/Customer/Review/ShipmentCard/NTSShipmentCard/NTSShipmentCard.test.jsx index 92b065177bf..199afecfe9b 100644 --- a/src/components/Customer/Review/ShipmentCard/NTSShipmentCard/NTSShipmentCard.test.jsx +++ b/src/components/Customer/Review/ShipmentCard/NTSShipmentCard/NTSShipmentCard.test.jsx @@ -14,7 +14,7 @@ const defaultProps = { onDeleteClick: jest.fn(), shipmentId: '#ABC123K', shipmentLocator: '#ABC123K-01', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', showEditAndDeleteBtn: false, requestedPickupDate: new Date('01/01/2020').toISOString(), marketCode: 'i', @@ -42,7 +42,7 @@ const incompleteProps = { onIncompleteClick: mockedOnIncompleteClickFunction, shipmentId: 'ABC123K', shipmentLocator: 'ABC123K-01', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', showEditAndDeleteBtn: false, requestedPickupDate: new Date('01/01/2020').toISOString(), status: shipmentStatuses.DRAFT, @@ -55,7 +55,7 @@ const completeProps = { onDeleteClick: jest.fn(), shipmentId: 'ABC123K', shipmentLocator: 'ABC123K-01', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', showEditAndDeleteBtn: false, requestedPickupDate: new Date('01/01/2020').toISOString(), status: shipmentStatuses.SUBMITTED, diff --git a/src/components/Customer/Review/ShipmentCard/ShipmentCard.stories.jsx b/src/components/Customer/Review/ShipmentCard/ShipmentCard.stories.jsx index 09c8d6dd181..d077b115917 100644 --- a/src/components/Customer/Review/ShipmentCard/ShipmentCard.stories.jsx +++ b/src/components/Customer/Review/ShipmentCard/ShipmentCard.stories.jsx @@ -59,7 +59,7 @@ const hhgDefaultProps = { const ntsDefaultProps = { moveId: 'testMove123', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', shipmentId: 'ABC123K', showEditAndDeleteBtn: true, onEditClick: noop, diff --git a/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.stories.jsx b/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.stories.jsx index e1b454ee507..bb702de367c 100644 --- a/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.stories.jsx +++ b/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.stories.jsx @@ -50,7 +50,7 @@ export const Basic = () => ( onClose={() => {}} serviceOrderNumber="12345" storageFacility={storageFacility} - shipmentType="HHG_INTO_NTS_DOMESTIC" + shipmentType="HHG_INTO_NTS" /> @@ -64,7 +64,7 @@ export const WithInfoMissing = () => ( onClose={() => {}} serviceOrderNumber="12345" storageFacility={storageFacilityInfoMissing} - shipmentType="HHG_INTO_NTS_DOMESTIC" + shipmentType="HHG_INTO_NTS" /> diff --git a/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.test.jsx b/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.test.jsx index c68a8c059fa..3f12b288797 100644 --- a/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.test.jsx +++ b/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.test.jsx @@ -45,7 +45,7 @@ describe('EditFacilityInfoModal', () => { onSubmit={mockOnSubmit} storageFacility={storageFacility} serviceOrderNumber="12345" - shipmentType="HHG_INTO_NTS_DOMESTIC" + shipmentType="HHG_INTO_NTS" /> , ); @@ -68,7 +68,7 @@ describe('EditFacilityInfoModal', () => { onSubmit={mockOnSubmit} storageFacility={incompleteStorageFacility} serviceOrderNumber="12345" - shipmentType="HHG_INTO_NTS_DOMESTIC" + shipmentType="HHG_INTO_NTS" /> , ); @@ -92,7 +92,7 @@ describe('EditFacilityInfoModal', () => { onSubmit={() => {}} storageFacility={incompleteStorageFacility} serviceOrderNumber="12345" - shipmentType="HHG_INTO_NTS_DOMESTIC" + shipmentType="HHG_INTO_NTS" /> , ); @@ -112,7 +112,7 @@ describe('EditFacilityInfoModal', () => { onSubmit={() => {}} storageFacility={storageFacility} serviceOrderNumber="12345" - shipmentType="HHG_INTO_NTS_DOMESTIC" + shipmentType="HHG_INTO_NTS" /> , ); diff --git a/src/components/Office/EvaluationReportPreview/EvaluationReportPreview.test.jsx b/src/components/Office/EvaluationReportPreview/EvaluationReportPreview.test.jsx index e17bf11020d..c2fdc7afb7e 100644 --- a/src/components/Office/EvaluationReportPreview/EvaluationReportPreview.test.jsx +++ b/src/components/Office/EvaluationReportPreview/EvaluationReportPreview.test.jsx @@ -112,7 +112,7 @@ const mtoShipments = [ streetAddress2: 'P.O. Box 12345', streetAddress3: 'c/o Some Person', }, - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', status: 'DRAFT', storageFacility: { address: { diff --git a/src/components/Office/ExternalVendorWeightSummary/ExternalVendorWeightSummary.stories.jsx b/src/components/Office/ExternalVendorWeightSummary/ExternalVendorWeightSummary.stories.jsx index 0924ec0ccfd..714fd21cde5 100644 --- a/src/components/Office/ExternalVendorWeightSummary/ExternalVendorWeightSummary.stories.jsx +++ b/src/components/Office/ExternalVendorWeightSummary/ExternalVendorWeightSummary.stories.jsx @@ -40,13 +40,13 @@ export const WithMultipleNTSShipments = () => ( @@ -64,14 +64,14 @@ export const WithMultipleShipmentsOfBothTypes = () => ( shipmentType: 'HHG_OUTOF_NTS_DOMESTIC', }, { - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', }, { ntsRecordedWeight: 1500, shipmentType: 'HHG_OUTOF_NTS_DOMESTIC', }, { - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', }, ]} /> @@ -81,7 +81,7 @@ export const WithOneNTSShipment = () => ( diff --git a/src/components/Office/ExternalVendorWeightSummary/ExternalVendorWeightSummary.test.jsx b/src/components/Office/ExternalVendorWeightSummary/ExternalVendorWeightSummary.test.jsx index e89b65439e2..e6ea97829e9 100644 --- a/src/components/Office/ExternalVendorWeightSummary/ExternalVendorWeightSummary.test.jsx +++ b/src/components/Office/ExternalVendorWeightSummary/ExternalVendorWeightSummary.test.jsx @@ -9,7 +9,7 @@ describe('ExternalVendorWeightSummary component', () => { it('renders with one NTS shipment', () => { render( - + , ); @@ -17,7 +17,7 @@ describe('ExternalVendorWeightSummary component', () => { }); it('renders with many NTS shipments', () => { - const shipments = [{ shipmentType: 'HHG_INTO_NTS_DOMESTIC' }, { shipmentType: 'HHG_INTO_NTS_DOMESTIC' }]; + const shipments = [{ shipmentType: 'HHG_INTO_NTS' }, { shipmentType: 'HHG_INTO_NTS' }]; render( @@ -59,9 +59,9 @@ describe('ExternalVendorWeightSummary component', () => { it('renders with many NTSR and NTS shipments', () => { const shipments = [ { ntsRecordedWeight: 1000, shipmentType: 'HHG_OUTOF_NTS_DOMESTIC' }, - { shipmentType: 'HHG_INTO_NTS_DOMESTIC' }, + { shipmentType: 'HHG_INTO_NTS' }, { ntsRecordedWeight: 500, shipmentType: 'HHG_OUTOF_NTS_DOMESTIC' }, - { shipmentType: 'HHG_INTO_NTS_DOMESTIC' }, + { shipmentType: 'HHG_INTO_NTS' }, { ntsRecordedWeight: 1500, shipmentType: 'HHG_OUTOF_NTS_DOMESTIC' }, ]; render( diff --git a/src/components/Office/PPM/ReviewShipmentWeightsTable/helpers.test.jsx b/src/components/Office/PPM/ReviewShipmentWeightsTable/helpers.test.jsx index 9504e1c592b..d6feaca828c 100644 --- a/src/components/Office/PPM/ReviewShipmentWeightsTable/helpers.test.jsx +++ b/src/components/Office/PPM/ReviewShipmentWeightsTable/helpers.test.jsx @@ -31,7 +31,7 @@ describe('addShipmentNumbersToTableData', () => { describe('determineTableRowClassname', () => { it.each([ ['HHG_OUTOF_NTS_DOMESTIC', styles[`review-shipment-weights-table-row-NTS-release`]], - ['HHG_INTO_NTS_DOMESTIC', styles[`review-shipment-weights-table-row-NTS`]], + ['HHG_INTO_NTS', styles[`review-shipment-weights-table-row-NTS`]], ['PPM', styles[`review-shipment-weights-table-row-PPM`]], ['HHG', styles[`review-shipment-weights-table-row-HHG`]], ['NOT_AN_OPTION', ''], @@ -54,7 +54,7 @@ describe('shipmentTypeCellDisplayHelper', () => { describe('estimatedWeightDisplayHelper', () => { it.each([ [{ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC' }, 'N/A'], - [{ shipmentType: 'HHG_INTO_NTS_DOMESTIC', ntsRecordedWeight: 1234, primeEstimatedWeight: 9876 }, '1,234 lbs'], + [{ shipmentType: 'HHG_INTO_NTS', ntsRecordedWeight: 1234, primeEstimatedWeight: 9876 }, '1,234 lbs'], [{ shipmentType: 'HHG', ntsRecordedWeight: 1234, primeEstimatedWeight: 9876 }, '9,876 lbs'], [{ shipmentType: 'HHG', primeEstimatedWeight: 0 }, DASH], ])('renders the correct Shipment Type Cell', (row, expectedResult) => { diff --git a/src/components/Office/RequestedShipments/ApprovedRequestedShipments.jsx b/src/components/Office/RequestedShipments/ApprovedRequestedShipments.jsx index 1739daf26ac..d29fb37f0dd 100644 --- a/src/components/Office/RequestedShipments/ApprovedRequestedShipments.jsx +++ b/src/components/Office/RequestedShipments/ApprovedRequestedShipments.jsx @@ -24,12 +24,12 @@ import { isBooleanFlagEnabled } from 'utils/featureFlags'; // ntsr defaults shows preferred delivery date, storage facility address, delivery address, flagged items when collapsed // Different things show when collapsed depending on if the shipment is an external vendor or not. const showWhenCollapsedWithExternalVendor = { - HHG_INTO_NTS_DOMESTIC: ['serviceOrderNumber', 'requestedDeliveryDate'], + HHG_INTO_NTS: ['serviceOrderNumber', 'requestedDeliveryDate'], HHG_OUTOF_NTS_DOMESTIC: ['serviceOrderNumber', 'requestedPickupDate'], }; const showWhenCollapsedWithGHCPrime = { - HHG_INTO_NTS_DOMESTIC: ['tacType', 'requestedDeliveryDate'], + HHG_INTO_NTS: ['tacType', 'requestedDeliveryDate'], HHG_OUTOF_NTS_DOMESTIC: ['ntsRecordedWeight', 'serviceOrderNumber', 'tacType', 'requestedPickupDate'], }; diff --git a/src/components/Office/RequestedShipments/SubmittedRequestedShipments.jsx b/src/components/Office/RequestedShipments/SubmittedRequestedShipments.jsx index cb35c161286..b6299fd404f 100644 --- a/src/components/Office/RequestedShipments/SubmittedRequestedShipments.jsx +++ b/src/components/Office/RequestedShipments/SubmittedRequestedShipments.jsx @@ -34,12 +34,12 @@ import { updateMTOShipment } from 'services/ghcApi'; // ntsr defaults shows preferred delivery date, storage facility address, delivery address, flagged items when collapsed // Different things show when collapsed depending on if the shipment is an external vendor or not. const showWhenCollapsedWithExternalVendor = { - HHG_INTO_NTS_DOMESTIC: ['serviceOrderNumber', 'requestedDeliveryDate'], + HHG_INTO_NTS: ['serviceOrderNumber', 'requestedDeliveryDate'], HHG_OUTOF_NTS_DOMESTIC: ['serviceOrderNumber', 'requestedPickupDate'], }; const showWhenCollapsedWithGHCPrime = { - HHG_INTO_NTS_DOMESTIC: ['tacType', 'requestedDeliveryDate'], + HHG_INTO_NTS: ['tacType', 'requestedDeliveryDate'], HHG_OUTOF_NTS_DOMESTIC: ['ntsRecordedWeight', 'serviceOrderNumber', 'tacType', 'requestedPickupDate'], }; diff --git a/src/components/Office/ShipmentServiceItemsTable/ShipmentServiceItemsTable.jsx b/src/components/Office/ShipmentServiceItemsTable/ShipmentServiceItemsTable.jsx index 272d341a662..2f2410a2b6b 100644 --- a/src/components/Office/ShipmentServiceItemsTable/ShipmentServiceItemsTable.jsx +++ b/src/components/Office/ShipmentServiceItemsTable/ShipmentServiceItemsTable.jsx @@ -19,7 +19,7 @@ const shipmentTypes = { serviceItemCodes.DPK, serviceItemCodes.DUPK, ], - HHG_INTO_NTS_DOMESTIC: [ + HHG_INTO_NTS: [ serviceItemCodes.DLH, serviceItemCodes.DSH, serviceItemCodes.FSC, diff --git a/src/content/shipments.js b/src/content/shipments.js index 5a2e0ab840b..85c146b7750 100644 --- a/src/content/shipments.js +++ b/src/content/shipments.js @@ -28,7 +28,7 @@ export const shipmentSectionLabels = { BOAT_HAUL_AWAY: 'Boat Haul Away shipment', BOAT_TOW_AWAY: 'Boat Tow Away shipment', MOBILE_HOME: 'Mobile Home shipment', - HHG_INTO_NTS_DOMESTIC: 'NTS shipment', + HHG_INTO_NTS: 'NTS shipment', HHG_OUTOF_NTS_DOMESTIC: 'NTS-release shipment', UNACCOMPANIED_BAGGAGE: 'UB shipment', }; diff --git a/src/pages/Office/EditShipmentDetails/EditShipmentDetails.test.jsx b/src/pages/Office/EditShipmentDetails/EditShipmentDetails.test.jsx index ba53840249b..b67e6668a61 100644 --- a/src/pages/Office/EditShipmentDetails/EditShipmentDetails.test.jsx +++ b/src/pages/Office/EditShipmentDetails/EditShipmentDetails.test.jsx @@ -225,7 +225,7 @@ const useEditShipmentQueriesReturnValueNTS = { moveTaskOrderID: '9c7b255c-2981-4bf8-839f-61c7458e2b4d', requestedPickupDate: '2018-03-15', scheduledPickupDate: '2018-03-16', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', status: 'SUBMITTED', updatedAt: '2020-06-10T15:58:02.404031Z', }, diff --git a/src/pages/Office/MoveDetails/MoveDetails.jsx b/src/pages/Office/MoveDetails/MoveDetails.jsx index d47156e3dc0..848e937e2fa 100644 --- a/src/pages/Office/MoveDetails/MoveDetails.jsx +++ b/src/pages/Office/MoveDetails/MoveDetails.jsx @@ -72,11 +72,7 @@ const MoveDetails = ({ // RA Modified Severity: N/A // eslint-disable-next-line react-hooks/exhaustive-deps const errorIfMissing = { - HHG_INTO_NTS_DOMESTIC: [ - { fieldName: 'storageFacility' }, - { fieldName: 'serviceOrderNumber' }, - { fieldName: 'tacType' }, - ], + HHG_INTO_NTS: [{ fieldName: 'storageFacility' }, { fieldName: 'serviceOrderNumber' }, { fieldName: 'tacType' }], HHG_OUTOF_NTS_DOMESTIC: [ { fieldName: 'storageFacility' }, { fieldName: 'ntsRecordedWeight' }, diff --git a/src/pages/Office/MoveHistory/LabeledPaymentRequestDetails.test.jsx b/src/pages/Office/MoveHistory/LabeledPaymentRequestDetails.test.jsx index d8f5272ed1e..4499e78b678 100644 --- a/src/pages/Office/MoveHistory/LabeledPaymentRequestDetails.test.jsx +++ b/src/pages/Office/MoveHistory/LabeledPaymentRequestDetails.test.jsx @@ -12,7 +12,7 @@ describe('LabeledPaymentRequestDetails', () => { { serviceItems: 'Domestic uncrating', shipmentId: '456', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', shipmentIdAbbr: 'A1C2B', }, ], diff --git a/src/pages/Office/MoveTaskOrder/moveTaskOrderUnitTestData.js b/src/pages/Office/MoveTaskOrder/moveTaskOrderUnitTestData.js index c207dfd2ef0..64f68218109 100644 --- a/src/pages/Office/MoveTaskOrder/moveTaskOrderUnitTestData.js +++ b/src/pages/Office/MoveTaskOrder/moveTaskOrderUnitTestData.js @@ -2200,7 +2200,7 @@ export const reviewWeightsQuery = { streetAddress2: 'P.O. Box 12345', streetAddress3: 'c/o Some Person', }, - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', status: 'DRAFT', updatedAt: '2023-03-14T16:44:05.889Z', }, @@ -2650,7 +2650,7 @@ export const reviewWeightsNoProGearQuery = { streetAddress2: 'P.O. Box 12345', streetAddress3: 'c/o Some Person', }, - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', status: 'DRAFT', updatedAt: '2023-03-14T16:44:05.889Z', }, diff --git a/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx b/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx index 82e50380a2f..1a2507dd9cb 100644 --- a/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx +++ b/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx @@ -105,15 +105,15 @@ const ServicesCounselingMoveDetails = ({ // nts defaults show preferred pickup date and pickup address, flagged items when collapsed // ntsr defaults shows preferred delivery date, storage facility address, delivery address, flagged items when collapsed const showWhenCollapsed = { - HHG_INTO_NTS_DOMESTIC: ['counselorRemarks'], + HHG_INTO_NTS: ['counselorRemarks'], HHG_OUTOF_NTS_DOMESTIC: ['counselorRemarks'], }; // add any additional fields that we also want to always show const neverShow = { - HHG_INTO_NTS_DOMESTIC: ['usesExternalVendor', 'serviceOrderNumber', 'storageFacility', 'requestedDeliveryDate'], + HHG_INTO_NTS: ['usesExternalVendor', 'serviceOrderNumber', 'storageFacility', 'requestedDeliveryDate'], HHG_OUTOF_NTS_DOMESTIC: ['requestedPickupDate'], }; const warnIfMissing = { - HHG_INTO_NTS_DOMESTIC: [{ fieldName: 'tacType' }, { fieldName: 'sacType' }], + HHG_INTO_NTS: [{ fieldName: 'tacType' }, { fieldName: 'sacType' }], HHG_OUTOF_NTS_DOMESTIC: [ { fieldName: 'ntsRecordedWeight' }, { fieldName: 'serviceOrderNumber' }, diff --git a/src/pages/PrimeUI/CreatePaymentRequest/CreatePaymentRequest.test.jsx b/src/pages/PrimeUI/CreatePaymentRequest/CreatePaymentRequest.test.jsx index 1aab1ec27e4..c6dd2029f43 100644 --- a/src/pages/PrimeUI/CreatePaymentRequest/CreatePaymentRequest.test.jsx +++ b/src/pages/PrimeUI/CreatePaymentRequest/CreatePaymentRequest.test.jsx @@ -40,7 +40,7 @@ const moveTaskOrder = { }, { id: '3', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', requestedPickupDate: '2021-12-01', pickupAddress: { streetAddress1: '800 Madison Avenue', city: 'New York', state: 'NY', postalCode: '10002' }, destinationAddress: { streetAddress1: '200 2nd Avenue', city: 'Buffalo', state: 'NY', postalCode: '1001' }, diff --git a/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx b/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx index ee119e542ac..3467e38fe86 100644 --- a/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx +++ b/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx @@ -40,7 +40,7 @@ const moveTaskOrder = { }, { id: '3', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', requestedPickupDate: '2021-12-01', pickupAddress: { streetAddress1: '800 Madison Avenue', city: 'New York', state: 'NY', postalCode: '10002' }, destinationAddress: { diff --git a/src/pages/PrimeUI/Shipment/PrimeUIShipmentCreateForm.test.jsx b/src/pages/PrimeUI/Shipment/PrimeUIShipmentCreateForm.test.jsx index f9bc849d137..ae4b5973cd7 100644 --- a/src/pages/PrimeUI/Shipment/PrimeUIShipmentCreateForm.test.jsx +++ b/src/pages/PrimeUI/Shipment/PrimeUIShipmentCreateForm.test.jsx @@ -382,7 +382,7 @@ describe('PrimeUIShipmentCreateForm', () => { }, ); - it.each(['HHG', 'HHG_INTO_NTS_DOMESTIC', 'HHG_OUTOF_NTS_DOMESTIC'])( + it.each(['HHG', 'HHG_INTO_NTS', 'HHG_OUTOF_NTS_DOMESTIC'])( 'renders the initial form, selecting %s', async (shipmentType) => { isBooleanFlagEnabled.mockResolvedValue(false); diff --git a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateAddress.test.jsx b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateAddress.test.jsx index a0fc67898d4..0b3fc2f2fc0 100644 --- a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateAddress.test.jsx +++ b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateAddress.test.jsx @@ -41,7 +41,7 @@ const moveTaskOrder = { }, { id: '3', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', requestedPickupDate: '2021-12-01', pickupAddress: { streetAddress1: '800 Madison Avenue', city: 'New York', state: 'NY', postalCode: '10002' }, }, diff --git a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateDestinationAddress.test.jsx b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateDestinationAddress.test.jsx index 7c41a95769f..e40120c46ad 100644 --- a/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateDestinationAddress.test.jsx +++ b/src/pages/PrimeUI/Shipment/PrimeUIShipmentUpdateDestinationAddress.test.jsx @@ -40,7 +40,7 @@ const moveTaskOrder = { }, { id: '3', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', requestedPickupDate: '2021-12-01', pickupAddress: { streetAddress1: '800 Madison Avenue', city: 'New York', state: 'NY', postalCode: '10002' }, }, diff --git a/src/pages/PrimeUI/UploadPaymentRequestDocuments/UploadPaymentRequestDocuments.test.jsx b/src/pages/PrimeUI/UploadPaymentRequestDocuments/UploadPaymentRequestDocuments.test.jsx index bd186ea1885..8b5d4eec83f 100644 --- a/src/pages/PrimeUI/UploadPaymentRequestDocuments/UploadPaymentRequestDocuments.test.jsx +++ b/src/pages/PrimeUI/UploadPaymentRequestDocuments/UploadPaymentRequestDocuments.test.jsx @@ -36,7 +36,7 @@ const moveTaskOrder = { }, { id: '3', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', requestedPickupDate: '2021-12-01', pickupAddress: { streetAddress1: '800 Madison Avenue', city: 'New York', state: 'NY', postalCode: '10002' }, destinationAddress: { streetAddress1: '200 2nd Avenue', city: 'Buffalo', state: 'NY', postalCode: '1001' }, diff --git a/src/pages/PrimeUI/UploadServiceRequestDocuments/UploadServiceRequestDocuments.test.jsx b/src/pages/PrimeUI/UploadServiceRequestDocuments/UploadServiceRequestDocuments.test.jsx index 244fccb1e22..85187ef197f 100644 --- a/src/pages/PrimeUI/UploadServiceRequestDocuments/UploadServiceRequestDocuments.test.jsx +++ b/src/pages/PrimeUI/UploadServiceRequestDocuments/UploadServiceRequestDocuments.test.jsx @@ -36,7 +36,7 @@ const moveTaskOrder = { }, { id: '3', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', requestedPickupDate: '2021-12-01', pickupAddress: { streetAddress1: '800 Madison Avenue', city: 'New York', state: 'NY', postalCode: '10002' }, destinationAddress: { streetAddress1: '200 2nd Avenue', city: 'Buffalo', state: 'NY', postalCode: '1001' }, diff --git a/src/sagas/entities.test.js b/src/sagas/entities.test.js index 616af345a4a..31c442f075e 100644 --- a/src/sagas/entities.test.js +++ b/src/sagas/entities.test.js @@ -152,7 +152,7 @@ describe('updateMTOShipment', () => { streetAddress2: '#E306', }, requestedPickupDate: '2020-12-22', - shipmentType: 'HHG_INTO_NTS_DOMESTIC', + shipmentType: 'HHG_INTO_NTS', status: 'SUBMITTED', updatedAt: '2020-12-08T17:39:05.051Z', }, diff --git a/src/shared/constants.js b/src/shared/constants.js index 490244e8461..c08f9e80434 100644 --- a/src/shared/constants.js +++ b/src/shared/constants.js @@ -77,7 +77,7 @@ export const CONUS_STATUS = { export const SHIPMENT_OPTIONS = { HHG: 'HHG', PPM: 'PPM', - NTS: 'HHG_INTO_NTS_DOMESTIC', + NTS: 'HHG_INTO_NTS', NTSR: 'HHG_OUTOF_NTS_DOMESTIC', BOAT: 'BOAT', BOAT_HAUL_AWAY: 'BOAT', @@ -94,7 +94,7 @@ export const MARKET_CODES = { export const SHIPMENT_TYPES = { HHG: 'HHG', PPM: 'PPM', - NTS: 'HHG_INTO_NTS_DOMESTIC', + NTS: 'HHG_INTO_NTS', NTSR: 'HHG_OUTOF_NTS_DOMESTIC', BOAT_HAUL_AWAY: 'BOAT_HAUL_AWAY', BOAT_TOW_AWAY: 'BOAT_TOW_AWAY', diff --git a/swagger-def/definitions/MTOShipmentType.yaml b/swagger-def/definitions/MTOShipmentType.yaml index 2e815dd5499..c2eb4fce542 100644 --- a/swagger-def/definitions/MTOShipmentType.yaml +++ b/swagger-def/definitions/MTOShipmentType.yaml @@ -3,7 +3,7 @@ title: Shipment Type example: HHG enum: - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - PPM - BOAT_HAUL_AWAY @@ -12,7 +12,7 @@ enum: - UNACCOMPANIED_BAGGAGE x-display-value: HHG: HHG - HHG_INTO_NTS_DOMESTIC: NTS + HHG_INTO_NTS: NTS HHG_OUTOF_NTS_DOMESTIC: NTS Release PPM: PPM BOAT_HAUL_AWAY: Boat Haul-Away diff --git a/swagger-def/definitions/ReServiceItem.yaml b/swagger-def/definitions/ReServiceItem.yaml index f637ac9432b..e8c0b9ab0ed 100644 --- a/swagger-def/definitions/ReServiceItem.yaml +++ b/swagger-def/definitions/ReServiceItem.yaml @@ -71,7 +71,7 @@ properties: - BOAT_HAUL_AWAY - BOAT_TOW_AWAY - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - MOBILE_HOME - PPM diff --git a/swagger-def/definitions/prime/MTOShipmentType.yaml b/swagger-def/definitions/prime/MTOShipmentType.yaml index b7b03e37569..baa8b5ef839 100644 --- a/swagger-def/definitions/prime/MTOShipmentType.yaml +++ b/swagger-def/definitions/prime/MTOShipmentType.yaml @@ -2,7 +2,7 @@ title: Shipment Type description: | The type of shipment. * `HHG` = Household goods move - * `HHG_INTO_NTS_DOMESTIC` = HHG into Non-temporary storage (NTS) + * `HHG_INTO_NTS` = HHG into Non-temporary storage (NTS) * `HHG_OUTOF_NTS_DOMESTIC` = HHG out of Non-temporary storage (NTS Release) * `PPM` = Personally Procured Move also known as Do It Yourself (DITY) * `BOAT_HAUL_AWAY` = Boat shipment that requires additional equipment to haul it to it's destination @@ -14,14 +14,14 @@ enum: - BOAT_HAUL_AWAY - BOAT_TOW_AWAY - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - MOBILE_HOME - PPM - UNACCOMPANIED_BAGGAGE x-display-value: HHG: Household goods move (HHG) - HHG_INTO_NTS_DOMESTIC: HHG into Non-temporary storage (NTS) + HHG_INTO_NTS: HHG into Non-temporary storage (NTS) HHG_OUTOF_NTS_DOMESTIC: HHG out of Non-temporary storage (NTS Release) PPM: Personally Procured Move also known as Do It Yourself (DITY) BOAT_HAUL_AWAY: Boat shipment that requires additional equipment to haul it to it's destination diff --git a/swagger-def/definitions/prime/v2/MTOShipmentType.yaml b/swagger-def/definitions/prime/v2/MTOShipmentType.yaml index b7b03e37569..baa8b5ef839 100644 --- a/swagger-def/definitions/prime/v2/MTOShipmentType.yaml +++ b/swagger-def/definitions/prime/v2/MTOShipmentType.yaml @@ -2,7 +2,7 @@ title: Shipment Type description: | The type of shipment. * `HHG` = Household goods move - * `HHG_INTO_NTS_DOMESTIC` = HHG into Non-temporary storage (NTS) + * `HHG_INTO_NTS` = HHG into Non-temporary storage (NTS) * `HHG_OUTOF_NTS_DOMESTIC` = HHG out of Non-temporary storage (NTS Release) * `PPM` = Personally Procured Move also known as Do It Yourself (DITY) * `BOAT_HAUL_AWAY` = Boat shipment that requires additional equipment to haul it to it's destination @@ -14,14 +14,14 @@ enum: - BOAT_HAUL_AWAY - BOAT_TOW_AWAY - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - MOBILE_HOME - PPM - UNACCOMPANIED_BAGGAGE x-display-value: HHG: Household goods move (HHG) - HHG_INTO_NTS_DOMESTIC: HHG into Non-temporary storage (NTS) + HHG_INTO_NTS: HHG into Non-temporary storage (NTS) HHG_OUTOF_NTS_DOMESTIC: HHG out of Non-temporary storage (NTS Release) PPM: Personally Procured Move also known as Do It Yourself (DITY) BOAT_HAUL_AWAY: Boat shipment that requires additional equipment to haul it to it's destination diff --git a/swagger-def/definitions/prime/v3/MTOShipmentType.yaml b/swagger-def/definitions/prime/v3/MTOShipmentType.yaml index b7b03e37569..baa8b5ef839 100644 --- a/swagger-def/definitions/prime/v3/MTOShipmentType.yaml +++ b/swagger-def/definitions/prime/v3/MTOShipmentType.yaml @@ -2,7 +2,7 @@ title: Shipment Type description: | The type of shipment. * `HHG` = Household goods move - * `HHG_INTO_NTS_DOMESTIC` = HHG into Non-temporary storage (NTS) + * `HHG_INTO_NTS` = HHG into Non-temporary storage (NTS) * `HHG_OUTOF_NTS_DOMESTIC` = HHG out of Non-temporary storage (NTS Release) * `PPM` = Personally Procured Move also known as Do It Yourself (DITY) * `BOAT_HAUL_AWAY` = Boat shipment that requires additional equipment to haul it to it's destination @@ -14,14 +14,14 @@ enum: - BOAT_HAUL_AWAY - BOAT_TOW_AWAY - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - MOBILE_HOME - PPM - UNACCOMPANIED_BAGGAGE x-display-value: HHG: Household goods move (HHG) - HHG_INTO_NTS_DOMESTIC: HHG into Non-temporary storage (NTS) + HHG_INTO_NTS: HHG into Non-temporary storage (NTS) HHG_OUTOF_NTS_DOMESTIC: HHG out of Non-temporary storage (NTS Release) PPM: Personally Procured Move also known as Do It Yourself (DITY) BOAT_HAUL_AWAY: Boat shipment that requires additional equipment to haul it to it's destination diff --git a/swagger-def/internal.yaml b/swagger-def/internal.yaml index a8c8dfb732c..0a9486e0c83 100644 --- a/swagger-def/internal.yaml +++ b/swagger-def/internal.yaml @@ -1806,7 +1806,7 @@ definitions: example: HHG enum: - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - PPM - BOAT_HAUL_AWAY @@ -1815,7 +1815,7 @@ definitions: - UNACCOMPANIED_BAGGAGE x-display-value: HHG: HHG - HHG_INTO_NTS_DOMESTIC: NTS + HHG_INTO_NTS: NTS HHG_OUTOF_NTS_DOMESTIC: NTS Release PPM: PPM BOAT_HAUL_AWAY: Boat Haul-Away diff --git a/swagger-def/prime_v2.yaml b/swagger-def/prime_v2.yaml index 3ff714d6155..e0739b1151d 100644 --- a/swagger-def/prime_v2.yaml +++ b/swagger-def/prime_v2.yaml @@ -111,7 +111,7 @@ paths: value: { 'moveTaskOrderId': '5691c951-c35c-49a8-a1d5-a4b7ea7b7ad8', - 'shipmentType': 'HHG_INTO_NTS_DOMESTIC', + 'shipmentType': 'HHG_INTO_NTS', 'requestedPickupDate': '2022-12-31', 'pickupAddress': { diff --git a/swagger-def/prime_v3.yaml b/swagger-def/prime_v3.yaml index 344db2011d1..202fd7081ba 100644 --- a/swagger-def/prime_v3.yaml +++ b/swagger-def/prime_v3.yaml @@ -103,7 +103,7 @@ paths: value: { 'moveTaskOrderId': '5691c951-c35c-49a8-a1d5-a4b7ea7b7ad8', - 'shipmentType': 'HHG_INTO_NTS_DOMESTIC', + 'shipmentType': 'HHG_INTO_NTS', 'requestedPickupDate': '2022-12-31', 'pickupAddress': { diff --git a/swagger-def/support.yaml b/swagger-def/support.yaml index e3bf2dd4528..c11afc65054 100644 --- a/swagger-def/support.yaml +++ b/swagger-def/support.yaml @@ -1492,7 +1492,7 @@ definitions: example: HHG enum: - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - PPM - BOAT_HAUL_AWAY @@ -1501,7 +1501,7 @@ definitions: - UNACCOMPANIED_BAGGAGE x-display-value: HHG: HHG - HHG_INTO_NTS_DOMESTIC: NTS + HHG_INTO_NTS: NTS HHG_OUTOF_NTS_DOMESTIC: NTS Release PPM: PPM BOAT_HAUL_AWAY: Boat Haul-Away diff --git a/swagger/ghc.yaml b/swagger/ghc.yaml index 4a200885fae..2d773f88f42 100644 --- a/swagger/ghc.yaml +++ b/swagger/ghc.yaml @@ -8838,7 +8838,7 @@ definitions: example: HHG enum: - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - PPM - BOAT_HAUL_AWAY @@ -8847,7 +8847,7 @@ definitions: - UNACCOMPANIED_BAGGAGE x-display-value: HHG: HHG - HHG_INTO_NTS_DOMESTIC: NTS + HHG_INTO_NTS: NTS HHG_OUTOF_NTS_DOMESTIC: NTS Release PPM: PPM BOAT_HAUL_AWAY: Boat Haul-Away @@ -11675,7 +11675,7 @@ definitions: - BOAT_HAUL_AWAY - BOAT_TOW_AWAY - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - MOBILE_HOME - PPM diff --git a/swagger/internal.yaml b/swagger/internal.yaml index e6026ff442e..99da9030213 100644 --- a/swagger/internal.yaml +++ b/swagger/internal.yaml @@ -1849,7 +1849,7 @@ definitions: example: HHG enum: - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - PPM - BOAT_HAUL_AWAY @@ -1858,7 +1858,7 @@ definitions: - UNACCOMPANIED_BAGGAGE x-display-value: HHG: HHG - HHG_INTO_NTS_DOMESTIC: NTS + HHG_INTO_NTS: NTS HHG_OUTOF_NTS_DOMESTIC: NTS Release PPM: PPM BOAT_HAUL_AWAY: Boat Haul-Away diff --git a/swagger/prime.yaml b/swagger/prime.yaml index db3883e78e8..bcd51fed89d 100644 --- a/swagger/prime.yaml +++ b/swagger/prime.yaml @@ -3953,7 +3953,7 @@ definitions: description: | The type of shipment. * `HHG` = Household goods move - * `HHG_INTO_NTS_DOMESTIC` = HHG into Non-temporary storage (NTS) + * `HHG_INTO_NTS` = HHG into Non-temporary storage (NTS) * `HHG_OUTOF_NTS_DOMESTIC` = HHG out of Non-temporary storage (NTS Release) * `PPM` = Personally Procured Move also known as Do It Yourself (DITY) * `BOAT_HAUL_AWAY` = Boat shipment that requires additional equipment to haul it to it's destination @@ -3965,14 +3965,14 @@ definitions: - BOAT_HAUL_AWAY - BOAT_TOW_AWAY - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - MOBILE_HOME - PPM - UNACCOMPANIED_BAGGAGE x-display-value: HHG: Household goods move (HHG) - HHG_INTO_NTS_DOMESTIC: HHG into Non-temporary storage (NTS) + HHG_INTO_NTS: HHG into Non-temporary storage (NTS) HHG_OUTOF_NTS_DOMESTIC: HHG out of Non-temporary storage (NTS Release) PPM: Personally Procured Move also known as Do It Yourself (DITY) BOAT_HAUL_AWAY: >- diff --git a/swagger/prime_v2.yaml b/swagger/prime_v2.yaml index 93edac72104..53b2599b343 100644 --- a/swagger/prime_v2.yaml +++ b/swagger/prime_v2.yaml @@ -170,7 +170,7 @@ paths: summary: NTS value: moveTaskOrderId: 5691c951-c35c-49a8-a1d5-a4b7ea7b7ad8 - shipmentType: HHG_INTO_NTS_DOMESTIC + shipmentType: HHG_INTO_NTS requestedPickupDate: '2022-12-31' pickupAddress: streetAddress1: 204 South Prospect Lane @@ -2369,7 +2369,7 @@ definitions: description: | The type of shipment. * `HHG` = Household goods move - * `HHG_INTO_NTS_DOMESTIC` = HHG into Non-temporary storage (NTS) + * `HHG_INTO_NTS` = HHG into Non-temporary storage (NTS) * `HHG_OUTOF_NTS_DOMESTIC` = HHG out of Non-temporary storage (NTS Release) * `PPM` = Personally Procured Move also known as Do It Yourself (DITY) * `BOAT_HAUL_AWAY` = Boat shipment that requires additional equipment to haul it to it's destination @@ -2381,14 +2381,14 @@ definitions: - BOAT_HAUL_AWAY - BOAT_TOW_AWAY - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - MOBILE_HOME - PPM - UNACCOMPANIED_BAGGAGE x-display-value: HHG: Household goods move (HHG) - HHG_INTO_NTS_DOMESTIC: HHG into Non-temporary storage (NTS) + HHG_INTO_NTS: HHG into Non-temporary storage (NTS) HHG_OUTOF_NTS_DOMESTIC: HHG out of Non-temporary storage (NTS Release) PPM: Personally Procured Move also known as Do It Yourself (DITY) BOAT_HAUL_AWAY: >- diff --git a/swagger/prime_v3.yaml b/swagger/prime_v3.yaml index 0b39e9a9de7..21a25cbfa99 100644 --- a/swagger/prime_v3.yaml +++ b/swagger/prime_v3.yaml @@ -152,7 +152,7 @@ paths: summary: NTS value: moveTaskOrderId: 5691c951-c35c-49a8-a1d5-a4b7ea7b7ad8 - shipmentType: HHG_INTO_NTS_DOMESTIC + shipmentType: HHG_INTO_NTS requestedPickupDate: '2022-12-31' pickupAddress: streetAddress1: 204 South Prospect Lane @@ -2457,7 +2457,7 @@ definitions: description: | The type of shipment. * `HHG` = Household goods move - * `HHG_INTO_NTS_DOMESTIC` = HHG into Non-temporary storage (NTS) + * `HHG_INTO_NTS` = HHG into Non-temporary storage (NTS) * `HHG_OUTOF_NTS_DOMESTIC` = HHG out of Non-temporary storage (NTS Release) * `PPM` = Personally Procured Move also known as Do It Yourself (DITY) * `BOAT_HAUL_AWAY` = Boat shipment that requires additional equipment to haul it to it's destination @@ -2469,14 +2469,14 @@ definitions: - BOAT_HAUL_AWAY - BOAT_TOW_AWAY - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - MOBILE_HOME - PPM - UNACCOMPANIED_BAGGAGE x-display-value: HHG: Household goods move (HHG) - HHG_INTO_NTS_DOMESTIC: HHG into Non-temporary storage (NTS) + HHG_INTO_NTS: HHG into Non-temporary storage (NTS) HHG_OUTOF_NTS_DOMESTIC: HHG out of Non-temporary storage (NTS Release) PPM: Personally Procured Move also known as Do It Yourself (DITY) BOAT_HAUL_AWAY: >- diff --git a/swagger/support.yaml b/swagger/support.yaml index 8b0e87f4842..6895258916d 100644 --- a/swagger/support.yaml +++ b/swagger/support.yaml @@ -1607,7 +1607,7 @@ definitions: example: HHG enum: - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - PPM - BOAT_HAUL_AWAY @@ -1616,7 +1616,7 @@ definitions: - UNACCOMPANIED_BAGGAGE x-display-value: HHG: HHG - HHG_INTO_NTS_DOMESTIC: NTS + HHG_INTO_NTS: NTS HHG_OUTOF_NTS_DOMESTIC: NTS Release PPM: PPM BOAT_HAUL_AWAY: Boat Haul-Away