From 7a471904cf11aa5bc8bae63d66cc4bd458f67116 Mon Sep 17 00:00:00 2001 From: Tae Jung Date: Tue, 17 Dec 2024 18:49:37 +0000 Subject: [PATCH 1/3] rename nts shipment type --- migrations/app/migrations_manifest.txt | 1 + .../20241216170325_update_nts_enum_name.up.sql | 14 ++++++++++++++ pkg/factory/mto_shipment_factory.go | 6 +++--- pkg/factory/mto_shipment_factory_test.go | 4 ++-- pkg/gen/ghcapi/embedded_spec.go | 12 ++++++------ pkg/gen/ghcmessages/m_t_o_shipment_type.go | 6 +++--- pkg/gen/ghcmessages/re_service_item.go | 8 ++++---- pkg/gen/internalapi/embedded_spec.go | 8 ++++---- pkg/gen/internalmessages/m_t_o_shipment_type.go | 6 +++--- pkg/gen/primeapi/embedded_spec.go | 12 ++++++------ pkg/gen/primemessages/m_t_o_shipment_type.go | 8 ++++---- pkg/gen/primev2api/embedded_spec.go | 16 ++++++++-------- pkg/gen/primev2messages/m_t_o_shipment_type.go | 8 ++++---- pkg/gen/primev3api/embedded_spec.go | 16 ++++++++-------- pkg/gen/primev3messages/m_t_o_shipment_type.go | 8 ++++---- pkg/gen/supportapi/embedded_spec.go | 8 ++++---- pkg/gen/supportmessages/m_t_o_shipment_type.go | 6 +++--- pkg/handlers/ghcapi/mto_shipment_test.go | 2 +- pkg/handlers/ghcapi/queues_test.go | 2 +- pkg/handlers/primeapi/mto_shipment_address.go | 2 +- pkg/models/mto_shipments.go | 8 ++++---- pkg/models/mto_shipments_test.go | 8 ++++---- pkg/paperwork/evaluation_report.go | 4 ++-- pkg/paperwork/evaluation_report_form_creator.go | 4 ++-- pkg/paperwork/evaluation_report_test.go | 2 +- .../service_param_value_lookups.go | 2 +- .../service_param_value_lookups_test.go | 2 +- .../weight_billed_lookup_test.go | 6 +++--- pkg/services/event/event_test.go | 4 ++-- .../mto_shipment/mto_shipment_creator.go | 4 ++-- .../mto_shipment/mto_shipment_creator_test.go | 16 ++++++++-------- .../mto_shipment/mto_shipment_updater.go | 12 ++++++------ .../mto_shipment/mto_shipment_updater_test.go | 8 ++++---- pkg/services/mto_shipment/rules.go | 2 +- pkg/services/mto_shipment/rules_test.go | 2 +- pkg/services/mto_shipment/shipment_approver.go | 4 ++-- .../mto_shipment/shipment_approver_test.go | 4 ++-- .../orchestrators/shipment/rules_test.go | 2 +- .../shipment/shipment_creator_test.go | 4 ++-- .../shipment/shipment_updater_test.go | 2 +- .../shipment_summary_worksheet.go | 2 +- .../shipment_summary_worksheet_test.go | 4 ++-- pkg/testdatagen/make_mto_shipment.go | 4 ++-- pkg/testdatagen/scenario/e2ebasic.go | 2 +- pkg/testdatagen/scenario/shared.go | 4 ++-- pkg/testdatagen/scenario/subscenarios.go | 4 ++-- .../NTSShipmentCard/NTSShipmentCard.test.jsx | 6 +++--- .../Review/ShipmentCard/ShipmentCard.stories.jsx | 2 +- .../EditFacilityInfoModal.stories.jsx | 4 ++-- .../EditFacilityInfoModal.test.jsx | 8 ++++---- .../EvaluationReportPreview.test.jsx | 2 +- .../ExternalVendorWeightSummary.stories.jsx | 12 ++++++------ .../ExternalVendorWeightSummary.test.jsx | 8 ++++---- .../ReviewShipmentWeightsTable/helpers.test.jsx | 4 ++-- .../ApprovedRequestedShipments.jsx | 4 ++-- .../SubmittedRequestedShipments.jsx | 4 ++-- .../ShipmentServiceItemsTable.jsx | 2 +- src/content/shipments.js | 2 +- .../EditShipmentDetails.test.jsx | 2 +- src/pages/Office/MoveDetails/MoveDetails.jsx | 6 +----- .../LabeledPaymentRequestDetails.test.jsx | 2 +- .../MoveTaskOrder/moveTaskOrderUnitTestData.js | 4 ++-- .../ServicesCounselingMoveDetails.jsx | 6 +++--- .../CreatePaymentRequest.test.jsx | 2 +- .../PrimeUI/MoveTaskOrder/MoveDetails.test.jsx | 2 +- .../Shipment/PrimeUIShipmentCreateForm.test.jsx | 2 +- .../PrimeUIShipmentUpdateAddress.test.jsx | 2 +- ...meUIShipmentUpdateDestinationAddress.test.jsx | 2 +- .../UploadPaymentRequestDocuments.test.jsx | 2 +- .../UploadServiceRequestDocuments.test.jsx | 2 +- src/sagas/entities.test.js | 2 +- src/shared/constants.js | 4 ++-- swagger-def/definitions/MTOShipmentType.yaml | 4 ++-- swagger-def/definitions/ReServiceItem.yaml | 2 +- .../definitions/prime/MTOShipmentType.yaml | 6 +++--- .../definitions/prime/v2/MTOShipmentType.yaml | 6 +++--- .../definitions/prime/v3/MTOShipmentType.yaml | 6 +++--- swagger-def/internal.yaml | 4 ++-- swagger-def/prime_v2.yaml | 2 +- swagger-def/prime_v3.yaml | 2 +- swagger-def/support.yaml | 4 ++-- swagger/ghc.yaml | 6 +++--- swagger/internal.yaml | 4 ++-- swagger/prime.yaml | 6 +++--- swagger/prime_v2.yaml | 8 ++++---- swagger/prime_v3.yaml | 8 ++++---- swagger/support.yaml | 4 ++-- 87 files changed, 227 insertions(+), 216 deletions(-) create mode 100644 migrations/app/schema/20241216170325_update_nts_enum_name.up.sql diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt index ce1d2a281d2..3f453bf1226 100644 --- a/migrations/app/migrations_manifest.txt +++ b/migrations/app/migrations_manifest.txt @@ -1050,3 +1050,4 @@ 20241203024453_add_ppm_max_incentive_column.up.sql 20241204155919_update_ordering_proc.up.sql 20241204210208_retroactive_update_of_ppm_max_and_estimated_incentives_prd.up.sql +20241216170325_update_nts_enum_name.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..b8b51ac5175 --- /dev/null +++ b/migrations/app/schema/20241216170325_update_nts_enum_name.up.sql @@ -0,0 +1,14 @@ +-- 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 $$; \ 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 005d774877f..5268aa78f23 100644 --- a/pkg/gen/ghcapi/embedded_spec.go +++ b/pkg/gen/ghcapi/embedded_spec.go @@ -9780,7 +9780,7 @@ func init() { "title": "Shipment Type", "enum": [ "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "PPM", "BOAT_HAUL_AWAY", @@ -9792,7 +9792,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", @@ -12660,7 +12660,7 @@ func init() { "BOAT_HAUL_AWAY", "BOAT_TOW_AWAY", "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "MOBILE_HOME", "PPM", @@ -26316,7 +26316,7 @@ func init() { "title": "Shipment Type", "enum": [ "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "PPM", "BOAT_HAUL_AWAY", @@ -26328,7 +26328,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", @@ -29272,7 +29272,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 b5a4018df23..9771d7e6e66 100644 --- a/pkg/gen/internalapi/embedded_spec.go +++ b/pkg/gen/internalapi/embedded_spec.go @@ -4897,7 +4897,7 @@ func init() { "title": "Shipment Type", "enum": [ "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "PPM", "BOAT_HAUL_AWAY", @@ -4909,7 +4909,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", @@ -13820,7 +13820,7 @@ func init() { "title": "Shipment Type", "enum": [ "HHG", - "HHG_INTO_NTS_DOMESTIC", + "HHG_INTO_NTS", "HHG_OUTOF_NTS_DOMESTIC", "PPM", "BOAT_HAUL_AWAY", @@ -13832,7 +13832,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 8ab0a5d3db0..bba1b1d628e 100644 --- a/pkg/gen/primeapi/embedded_spec.go +++ b/pkg/gen/primeapi/embedded_spec.go @@ -2493,14 +2493,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", @@ -2510,7 +2510,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" @@ -7327,14 +7327,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", @@ -7344,7 +7344,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 8754654bb1f..cc81cce8c7b 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": { @@ -1624,14 +1624,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", @@ -1641,7 +1641,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" @@ -3734,7 +3734,7 @@ func init() { "streetAddress1": "204 South Prospect Lane" }, "requestedPickupDate": "2022-12-31", - "shipmentType": "HHG_INTO_NTS_DOMESTIC" + "shipmentType": "HHG_INTO_NTS" } }, "nts-r": { @@ -5225,14 +5225,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", @@ -5242,7 +5242,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 31428b78c29..f7cb95c0bb5 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": { @@ -1786,14 +1786,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", @@ -1803,7 +1803,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" @@ -4255,7 +4255,7 @@ func init() { "streetAddress1": "204 South Prospect Lane" }, "requestedPickupDate": "2022-12-31", - "shipmentType": "HHG_INTO_NTS_DOMESTIC" + "shipmentType": "HHG_INTO_NTS" } }, "nts-r": { @@ -5908,14 +5908,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", @@ -5925,7 +5925,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 1fb84918cc7..3061a3dbed8 100644 --- a/pkg/handlers/ghcapi/mto_shipment_test.go +++ b/pkg/handlers/ghcapi/mto_shipment_test.go @@ -68,7 +68,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 108c49b49b5..cbec7f736c7 100644 --- a/pkg/models/mto_shipments.go +++ b/pkg/models/mto_shipments.go @@ -18,7 +18,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" ) @@ -34,8 +34,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 @@ -292,7 +292,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 5f2a5f78864..338134690ec 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/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 0bb499be70b..b9e7c249e54 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 @@ -559,7 +559,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 bc5587b7941..1bc5fc5be1a 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 @@ -766,7 +766,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 9a98e962b57..d680636dba9 100644 --- a/pkg/services/mto_shipment/mto_shipment_creator.go +++ b/pkg/services/mto_shipment/mto_shipment_creator.go @@ -241,7 +241,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()) @@ -308,7 +308,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 92ca8ba58c8..21b54188170 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 } @@ -1001,9 +1001,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 { @@ -1091,7 +1091,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 dfabece3112..185319eb3d7 100644 --- a/pkg/services/mto_shipment/mto_shipment_updater_test.go +++ b/pkg/services/mto_shipment/mto_shipment_updater_test.go @@ -1953,7 +1953,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 @@ -1996,7 +1996,7 @@ func (suite *MTOShipmentServiceSuite) TestUpdateMTOShipmentStatus() { }, { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, ScheduledPickupDate: &testdatagen.DateInsidePeakRateCycle, PrimeEstimatedWeight: &estimatedWeight, Status: models.MTOShipmentStatusSubmitted, @@ -2810,7 +2810,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, }, @@ -2851,7 +2851,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 46663cc2c00..7bc4fa17f94 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 52e849e469b..d52d7388ec4 100644 --- a/pkg/services/mto_shipment/shipment_approver.go +++ b/pkg/services/mto_shipment/shipment_approver.go @@ -150,9 +150,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 943cd4edb72..3c1d36a4795 100644 --- a/pkg/services/mto_shipment/shipment_approver_test.go +++ b/pkg/services/mto_shipment/shipment_approver_test.go @@ -590,7 +590,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 @@ -633,7 +633,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 6363d60e470..8030e3023fc 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 137846bb46a..c5b057ab32d 100644 --- a/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go +++ b/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go @@ -1696,7 +1696,7 @@ func (suite *ShipmentSummaryWorksheetServiceSuite) TestFormatAdditionalShipments }, { PPMShipment: &ppm2, - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, ShipmentLocator: &locator, RequestedPickupDate: &now, Status: models.MTOShipmentStatusSubmitted, @@ -1809,7 +1809,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 d670d474239..b160ca02d94 100644 --- a/pkg/testdatagen/scenario/shared.go +++ b/pkg/testdatagen/scenario/shared.go @@ -4097,7 +4097,7 @@ func createNTSMove(appCtx appcontext.AppContext) { }, { Model: models.MTOShipment{ - ShipmentType: models.MTOShipmentTypeHHGIntoNTSDom, + ShipmentType: models.MTOShipmentTypeHHGIntoNTS, }, }, }, nil) @@ -7245,7 +7245,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 c61500e0db3..46ca5e87602 100644 --- a/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.stories.jsx +++ b/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.stories.jsx @@ -42,7 +42,7 @@ export const Basic = () => ( onClose={() => {}} serviceOrderNumber="12345" storageFacility={storageFacility} - shipmentType="HHG_INTO_NTS_DOMESTIC" + shipmentType="HHG_INTO_NTS" /> ); @@ -54,7 +54,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 b7f4ea16b17..cb25e319599 100644 --- a/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.test.jsx +++ b/src/components/Office/EditFacilityInfoModal/EditFacilityInfoModal.test.jsx @@ -40,7 +40,7 @@ describe('EditFacilityInfoModal', () => { onSubmit={mockOnSubmit} storageFacility={storageFacility} serviceOrderNumber="12345" - shipmentType="HHG_INTO_NTS_DOMESTIC" + shipmentType="HHG_INTO_NTS" />, ); const submitBtn = screen.getByRole('button', { name: 'Save' }); @@ -60,7 +60,7 @@ describe('EditFacilityInfoModal', () => { onSubmit={mockOnSubmit} storageFacility={incompleteStorageFacility} serviceOrderNumber="12345" - shipmentType="HHG_INTO_NTS_DOMESTIC" + shipmentType="HHG_INTO_NTS" />, ); const addressInput = screen.getByLabelText(/Address 1/); @@ -81,7 +81,7 @@ describe('EditFacilityInfoModal', () => { onSubmit={() => {}} storageFacility={incompleteStorageFacility} serviceOrderNumber="12345" - shipmentType="HHG_INTO_NTS_DOMESTIC" + shipmentType="HHG_INTO_NTS" />, ); const submitBtn = screen.getByRole('button', { name: 'Save' }); @@ -98,7 +98,7 @@ describe('EditFacilityInfoModal', () => { onSubmit={() => {}} storageFacility={storageFacility} serviceOrderNumber="12345" - shipmentType="HHG_INTO_NTS_DOMESTIC" + shipmentType="HHG_INTO_NTS" />, ); const closeBtn = screen.getByRole('button', { name: 'Cancel' }); 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 236f4821ea1..714cb056c83 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 93c119cf16e..06cea961857 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 7e31bc18e77..784fe172f71 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 fa89eda96fd..f6c438eac73 100644 --- a/src/pages/Office/MoveDetails/MoveDetails.jsx +++ b/src/pages/Office/MoveDetails/MoveDetails.jsx @@ -65,11 +65,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 2b39fc3aa53..31387fbf70d 100644 --- a/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx +++ b/src/pages/Office/ServicesCounselingMoveDetails/ServicesCounselingMoveDetails.jsx @@ -109,15 +109,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 80ea98a6f8a..a6d93561cd1 100644 --- a/src/pages/PrimeUI/Shipment/PrimeUIShipmentCreateForm.test.jsx +++ b/src/pages/PrimeUI/Shipment/PrimeUIShipmentCreateForm.test.jsx @@ -386,7 +386,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 ed9eee256f3..1bcff337261 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 9e0c7c7a417..ebf2b208cd7 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 0e2b29e45b8..1a50e593ad9 100644 --- a/swagger-def/internal.yaml +++ b/swagger-def/internal.yaml @@ -1808,7 +1808,7 @@ definitions: example: HHG enum: - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - PPM - BOAT_HAUL_AWAY @@ -1817,7 +1817,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 67cf77df908..2f4556eebd5 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 f37c686f7b8..64e70b75634 100644 --- a/swagger/ghc.yaml +++ b/swagger/ghc.yaml @@ -8789,7 +8789,7 @@ definitions: example: HHG enum: - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - PPM - BOAT_HAUL_AWAY @@ -8798,7 +8798,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 @@ -11492,7 +11492,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 71cb42e7a7c..a1ad9b3e2d7 100644 --- a/swagger/internal.yaml +++ b/swagger/internal.yaml @@ -1851,7 +1851,7 @@ definitions: example: HHG enum: - HHG - - HHG_INTO_NTS_DOMESTIC + - HHG_INTO_NTS - HHG_OUTOF_NTS_DOMESTIC - PPM - BOAT_HAUL_AWAY @@ -1860,7 +1860,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 a4b3bff07b7..37219b47181 100644 --- a/swagger/prime.yaml +++ b/swagger/prime.yaml @@ -3665,7 +3665,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 @@ -3677,14 +3677,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 7db22294d56..e7cd2cefd81 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 @@ -2359,7 +2359,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 @@ -2371,14 +2371,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 ba1eba02266..e32a420d158 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 @@ -2443,7 +2443,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 @@ -2455,14 +2455,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 From 66360d809bd97cabfef96b6ad748533e8af1158d Mon Sep 17 00:00:00 2001 From: Tae Jung Date: Tue, 17 Dec 2024 21:41:05 +0000 Subject: [PATCH 2/3] update shipment type comment --- .../20241216170325_update_nts_enum_name.up.sql | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/migrations/app/schema/20241216170325_update_nts_enum_name.up.sql b/migrations/app/schema/20241216170325_update_nts_enum_name.up.sql index b8b51ac5175..0a4a7a4400c 100644 --- a/migrations/app/schema/20241216170325_update_nts_enum_name.up.sql +++ b/migrations/app/schema/20241216170325_update_nts_enum_name.up.sql @@ -11,4 +11,15 @@ BEGIN ALTER TYPE mto_shipment_type RENAME VALUE 'HHG_INTO_NTS_DOMESTIC' TO 'HHG_INTO_NTS'; END IF; -END $$; \ No newline at end of file +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 From 8e3a7b7779212e605e9115d52687e83b007cdab1 Mon Sep 17 00:00:00 2001 From: Tae Jung Date: Mon, 6 Jan 2025 17:51:25 +0000 Subject: [PATCH 3/3] gen --- pkg/gen/ghcapi/embedded_spec.go | 404 +++++++++++++++++++++++++++ pkg/gen/internalapi/embedded_spec.go | 398 ++++++++++++++++++++++++++ pkg/gen/primeapi/embedded_spec.go | 140 +++++++++- pkg/gen/primev2api/embedded_spec.go | 20 +- pkg/gen/primev3api/embedded_spec.go | 272 +++++++++++++++++- swagger/ghc.yaml | 173 ++++++++++++ swagger/internal.yaml | 172 ++++++++++++ swagger/prime.yaml | 77 +++++ swagger/prime_v2.yaml | 6 + swagger/prime_v3.yaml | 114 ++++++++ 10 files changed, 1758 insertions(+), 18 deletions(-) diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go index 5268aa78f23..922ac889187 100644 --- a/pkg/gen/ghcapi/embedded_spec.go +++ b/pkg/gen/ghcapi/embedded_spec.go @@ -36,6 +36,44 @@ func init() { }, "basePath": "/ghc/v1", "paths": { + "/addresses/zip-city-lookup/{search}": { + "get": { + "description": "Find by API using full/partial postal code or city name that returns an us_post_region_cities json object containing city, state, county and postal code.", + "tags": [ + "addresses" + ], + "summary": "Returns city, state, postal code, and county associated with the specified full/partial postal code or city and state string", + "operationId": "getLocationByZipCityState", + "parameters": [ + { + "type": "string", + "name": "search", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "the requested list of city, state, county, and postal code matches", + "schema": { + "$ref": "#/definitions/VLocations" + } + }, + "400": { + "$ref": "#/responses/InvalidRequest" + }, + "403": { + "$ref": "#/responses/PermissionDenied" + }, + "404": { + "$ref": "#/responses/NotFound" + }, + "500": { + "$ref": "#/responses/ServerError" + } + } + } + }, "/application_parameters/{parameterName}": { "get": { "description": "Searches for an application parameter by name, returns nil if not found", @@ -6513,6 +6551,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -11351,6 +11394,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -14677,6 +14725,151 @@ func init() { } } }, + "VLocation": { + "description": "A postal code, city, and state lookup", + "type": "object", + "properties": { + "city": { + "type": "string", + "title": "City", + "example": "Anytown" + }, + "county": { + "type": "string", + "title": "County", + "x-nullable": true, + "example": "LOS ANGELES" + }, + "postalCode": { + "type": "string", + "format": "zip", + "title": "ZIP", + "pattern": "^(\\d{5}?)$", + "example": "90210" + }, + "state": { + "type": "string", + "title": "State", + "enum": [ + "AL", + "AK", + "AR", + "AZ", + "CA", + "CO", + "CT", + "DC", + "DE", + "FL", + "GA", + "HI", + "IA", + "ID", + "IL", + "IN", + "KS", + "KY", + "LA", + "MA", + "MD", + "ME", + "MI", + "MN", + "MO", + "MS", + "MT", + "NC", + "ND", + "NE", + "NH", + "NJ", + "NM", + "NV", + "NY", + "OH", + "OK", + "OR", + "PA", + "RI", + "SC", + "SD", + "TN", + "TX", + "UT", + "VA", + "VT", + "WA", + "WI", + "WV", + "WY" + ], + "x-display-value": { + "AK": "AK", + "AL": "AL", + "AR": "AR", + "AZ": "AZ", + "CA": "CA", + "CO": "CO", + "CT": "CT", + "DC": "DC", + "DE": "DE", + "FL": "FL", + "GA": "GA", + "HI": "HI", + "IA": "IA", + "ID": "ID", + "IL": "IL", + "IN": "IN", + "KS": "KS", + "KY": "KY", + "LA": "LA", + "MA": "MA", + "MD": "MD", + "ME": "ME", + "MI": "MI", + "MN": "MN", + "MO": "MO", + "MS": "MS", + "MT": "MT", + "NC": "NC", + "ND": "ND", + "NE": "NE", + "NH": "NH", + "NJ": "NJ", + "NM": "NM", + "NV": "NV", + "NY": "NY", + "OH": "OH", + "OK": "OK", + "OR": "OR", + "PA": "PA", + "RI": "RI", + "SC": "SC", + "SD": "SD", + "TN": "TN", + "TX": "TX", + "UT": "UT", + "VA": "VA", + "VT": "VT", + "WA": "WA", + "WI": "WI", + "WV": "WV", + "WY": "WY" + } + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" + } + } + }, + "VLocations": { + "type": "array", + "items": { + "$ref": "#/definitions/VLocation" + } + }, "ValidationError": { "required": [ "invalid_fields" @@ -15013,6 +15206,9 @@ func init() { { "name": "transportationOffice" }, + { + "name": "addresses" + }, { "name": "uploads" }, @@ -15043,6 +15239,56 @@ func init() { }, "basePath": "/ghc/v1", "paths": { + "/addresses/zip-city-lookup/{search}": { + "get": { + "description": "Find by API using full/partial postal code or city name that returns an us_post_region_cities json object containing city, state, county and postal code.", + "tags": [ + "addresses" + ], + "summary": "Returns city, state, postal code, and county associated with the specified full/partial postal code or city and state string", + "operationId": "getLocationByZipCityState", + "parameters": [ + { + "type": "string", + "name": "search", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "the requested list of city, state, county, and postal code matches", + "schema": { + "$ref": "#/definitions/VLocations" + } + }, + "400": { + "description": "The request payload is invalid", + "schema": { + "$ref": "#/definitions/Error" + } + }, + "403": { + "description": "The request was denied", + "schema": { + "$ref": "#/definitions/Error" + } + }, + "404": { + "description": "The requested resource wasn't found", + "schema": { + "$ref": "#/definitions/Error" + } + }, + "500": { + "description": "A server error occurred", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + }, "/application_parameters/{parameterName}": { "get": { "description": "Searches for an application parameter by name, returns nil if not found", @@ -23045,6 +23291,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -27888,6 +28139,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -31350,6 +31606,151 @@ func init() { } } }, + "VLocation": { + "description": "A postal code, city, and state lookup", + "type": "object", + "properties": { + "city": { + "type": "string", + "title": "City", + "example": "Anytown" + }, + "county": { + "type": "string", + "title": "County", + "x-nullable": true, + "example": "LOS ANGELES" + }, + "postalCode": { + "type": "string", + "format": "zip", + "title": "ZIP", + "pattern": "^(\\d{5}?)$", + "example": "90210" + }, + "state": { + "type": "string", + "title": "State", + "enum": [ + "AL", + "AK", + "AR", + "AZ", + "CA", + "CO", + "CT", + "DC", + "DE", + "FL", + "GA", + "HI", + "IA", + "ID", + "IL", + "IN", + "KS", + "KY", + "LA", + "MA", + "MD", + "ME", + "MI", + "MN", + "MO", + "MS", + "MT", + "NC", + "ND", + "NE", + "NH", + "NJ", + "NM", + "NV", + "NY", + "OH", + "OK", + "OR", + "PA", + "RI", + "SC", + "SD", + "TN", + "TX", + "UT", + "VA", + "VT", + "WA", + "WI", + "WV", + "WY" + ], + "x-display-value": { + "AK": "AK", + "AL": "AL", + "AR": "AR", + "AZ": "AZ", + "CA": "CA", + "CO": "CO", + "CT": "CT", + "DC": "DC", + "DE": "DE", + "FL": "FL", + "GA": "GA", + "HI": "HI", + "IA": "IA", + "ID": "ID", + "IL": "IL", + "IN": "IN", + "KS": "KS", + "KY": "KY", + "LA": "LA", + "MA": "MA", + "MD": "MD", + "ME": "ME", + "MI": "MI", + "MN": "MN", + "MO": "MO", + "MS": "MS", + "MT": "MT", + "NC": "NC", + "ND": "ND", + "NE": "NE", + "NH": "NH", + "NJ": "NJ", + "NM": "NM", + "NV": "NV", + "NY": "NY", + "OH": "OH", + "OK": "OK", + "OR": "OR", + "PA": "PA", + "RI": "RI", + "SC": "SC", + "SD": "SD", + "TN": "TN", + "TX": "TX", + "UT": "UT", + "VA": "VA", + "VT": "VT", + "WA": "WA", + "WI": "WI", + "WV": "WV", + "WY": "WY" + } + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" + } + } + }, + "VLocations": { + "type": "array", + "items": { + "$ref": "#/definitions/VLocation" + } + }, "ValidationError": { "required": [ "invalid_fields" @@ -31694,6 +32095,9 @@ func init() { { "name": "transportationOffice" }, + { + "name": "addresses" + }, { "name": "uploads" }, diff --git a/pkg/gen/internalapi/embedded_spec.go b/pkg/gen/internalapi/embedded_spec.go index bc3422344ae..9706d6c936b 100644 --- a/pkg/gen/internalapi/embedded_spec.go +++ b/pkg/gen/internalapi/embedded_spec.go @@ -39,6 +39,44 @@ func init() { }, "basePath": "/internal", "paths": { + "/addresses/zip-city-lookup/{search}": { + "get": { + "description": "Find by API using full/partial postal code or city name that returns an us_post_region_cities json object containing city, state, county and postal code.", + "tags": [ + "addresses" + ], + "summary": "Returns city, state, postal code, and county associated with the specified full/partial postal code or city state string", + "operationId": "getLocationByZipCityState", + "parameters": [ + { + "type": "string", + "name": "search", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "the requested list of city, state, county, and postal code matches", + "schema": { + "$ref": "#/definitions/VLocations" + } + }, + "400": { + "$ref": "#/responses/InvalidRequest" + }, + "403": { + "$ref": "#/responses/PermissionDenied" + }, + "404": { + "$ref": "#/responses/NotFound" + }, + "500": { + "$ref": "#/responses/ServerError" + } + } + } + }, "/addresses/{addressId}": { "get": { "description": "Find by API using address ID that returns an address json object containing address 1, address 2, address 3, city and postal code.", @@ -3473,6 +3511,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -6239,6 +6282,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -8066,6 +8114,151 @@ func init() { } } }, + "VLocation": { + "description": "A postal code, city, and state lookup", + "type": "object", + "properties": { + "city": { + "type": "string", + "title": "City", + "example": "Anytown" + }, + "county": { + "type": "string", + "title": "County", + "x-nullable": true, + "example": "LOS ANGELES" + }, + "postalCode": { + "type": "string", + "format": "zip", + "title": "ZIP", + "pattern": "^(\\d{5}?)$", + "example": "90210" + }, + "state": { + "type": "string", + "title": "State", + "enum": [ + "AL", + "AK", + "AR", + "AZ", + "CA", + "CO", + "CT", + "DC", + "DE", + "FL", + "GA", + "HI", + "IA", + "ID", + "IL", + "IN", + "KS", + "KY", + "LA", + "MA", + "MD", + "ME", + "MI", + "MN", + "MO", + "MS", + "MT", + "NC", + "ND", + "NE", + "NH", + "NJ", + "NM", + "NV", + "NY", + "OH", + "OK", + "OR", + "PA", + "RI", + "SC", + "SD", + "TN", + "TX", + "UT", + "VA", + "VT", + "WA", + "WI", + "WV", + "WY" + ], + "x-display-value": { + "AK": "AK", + "AL": "AL", + "AR": "AR", + "AZ": "AZ", + "CA": "CA", + "CO": "CO", + "CT": "CT", + "DC": "DC", + "DE": "DE", + "FL": "FL", + "GA": "GA", + "HI": "HI", + "IA": "IA", + "ID": "ID", + "IL": "IL", + "IN": "IN", + "KS": "KS", + "KY": "KY", + "LA": "LA", + "MA": "MA", + "MD": "MD", + "ME": "ME", + "MI": "MI", + "MN": "MN", + "MO": "MO", + "MS": "MS", + "MT": "MT", + "NC": "NC", + "ND": "ND", + "NE": "NE", + "NH": "NH", + "NJ": "NJ", + "NM": "NM", + "NV": "NV", + "NY": "NY", + "OH": "OH", + "OK": "OK", + "OR": "OR", + "PA": "PA", + "RI": "RI", + "SC": "SC", + "SD": "SD", + "TN": "TN", + "TX": "TX", + "UT": "UT", + "VA": "VA", + "VT": "VT", + "WA": "WA", + "WI": "WI", + "WV": "WV", + "WY": "WY" + } + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" + } + } + }, + "VLocations": { + "type": "array", + "items": { + "$ref": "#/definitions/VLocation" + } + }, "ValidationError": { "required": [ "invalidFields" @@ -8500,6 +8693,56 @@ func init() { }, "basePath": "/internal", "paths": { + "/addresses/zip-city-lookup/{search}": { + "get": { + "description": "Find by API using full/partial postal code or city name that returns an us_post_region_cities json object containing city, state, county and postal code.", + "tags": [ + "addresses" + ], + "summary": "Returns city, state, postal code, and county associated with the specified full/partial postal code or city state string", + "operationId": "getLocationByZipCityState", + "parameters": [ + { + "type": "string", + "name": "search", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "the requested list of city, state, county, and postal code matches", + "schema": { + "$ref": "#/definitions/VLocations" + } + }, + "400": { + "description": "The request payload is invalid.", + "schema": { + "$ref": "#/definitions/ClientError" + } + }, + "403": { + "description": "The request was denied.", + "schema": { + "$ref": "#/definitions/ClientError" + } + }, + "404": { + "description": "The requested resource wasn't found.", + "schema": { + "$ref": "#/definitions/ClientError" + } + }, + "500": { + "description": "A server error occurred.", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + }, "/addresses/{addressId}": { "get": { "description": "Find by API using address ID that returns an address json object containing address 1, address 2, address 3, city and postal code.", @@ -12387,6 +12630,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -15157,6 +15405,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -16991,6 +17244,151 @@ func init() { } } }, + "VLocation": { + "description": "A postal code, city, and state lookup", + "type": "object", + "properties": { + "city": { + "type": "string", + "title": "City", + "example": "Anytown" + }, + "county": { + "type": "string", + "title": "County", + "x-nullable": true, + "example": "LOS ANGELES" + }, + "postalCode": { + "type": "string", + "format": "zip", + "title": "ZIP", + "pattern": "^(\\d{5}?)$", + "example": "90210" + }, + "state": { + "type": "string", + "title": "State", + "enum": [ + "AL", + "AK", + "AR", + "AZ", + "CA", + "CO", + "CT", + "DC", + "DE", + "FL", + "GA", + "HI", + "IA", + "ID", + "IL", + "IN", + "KS", + "KY", + "LA", + "MA", + "MD", + "ME", + "MI", + "MN", + "MO", + "MS", + "MT", + "NC", + "ND", + "NE", + "NH", + "NJ", + "NM", + "NV", + "NY", + "OH", + "OK", + "OR", + "PA", + "RI", + "SC", + "SD", + "TN", + "TX", + "UT", + "VA", + "VT", + "WA", + "WI", + "WV", + "WY" + ], + "x-display-value": { + "AK": "AK", + "AL": "AL", + "AR": "AR", + "AZ": "AZ", + "CA": "CA", + "CO": "CO", + "CT": "CT", + "DC": "DC", + "DE": "DE", + "FL": "FL", + "GA": "GA", + "HI": "HI", + "IA": "IA", + "ID": "ID", + "IL": "IL", + "IN": "IN", + "KS": "KS", + "KY": "KY", + "LA": "LA", + "MA": "MA", + "MD": "MD", + "ME": "ME", + "MI": "MI", + "MN": "MN", + "MO": "MO", + "MS": "MS", + "MT": "MT", + "NC": "NC", + "ND": "ND", + "NE": "NE", + "NH": "NH", + "NJ": "NJ", + "NM": "NM", + "NV": "NV", + "NY": "NY", + "OH": "OH", + "OK": "OK", + "OR": "OR", + "PA": "PA", + "RI": "RI", + "SC": "SC", + "SD": "SD", + "TN": "TN", + "TX": "TX", + "UT": "UT", + "VA": "VA", + "VT": "VT", + "WA": "WA", + "WI": "WI", + "WV": "WV", + "WY": "WY" + } + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" + } + } + }, + "VLocations": { + "type": "array", + "items": { + "$ref": "#/definitions/VLocation" + } + }, "ValidationError": { "required": [ "invalidFields" diff --git a/pkg/gen/primeapi/embedded_spec.go b/pkg/gen/primeapi/embedded_spec.go index bba1b1d628e..88ddc2b1085 100644 --- a/pkg/gen/primeapi/embedded_spec.go +++ b/pkg/gen/primeapi/embedded_spec.go @@ -355,7 +355,7 @@ func init() { }, "/mto-service-items/{mtoServiceItemID}": { "patch": { - "description": "Updates MTOServiceItems after creation. Not all service items or fields may be updated, please see details below.\n\nThis endpoint supports different body definitions. In the modelType field below, select the modelType corresponding\n to the service item you wish to update and the documentation will update with the new definition.\n\n* Addresses: To update a destination service item's SIT destination final address, update the shipment delivery address.\nFor approved shipments, please use [updateShipmentDestinationAddress](#mtoShipment/updateShipmentDestinationAddress).\nFor shipments not yet approved, please use [updateMTOShipmentAddress](#mtoShipment/updateMTOShipmentAddress).\n\n* SIT Service Items: Take note that when updating ` + "`" + `sitCustomerContacted` + "`" + `, ` + "`" + `sitDepartureDate` + "`" + `, or ` + "`" + `sitRequestedDelivery` + "`" + `, we want\nthose to be updated on ` + "`" + `DOASIT` + "`" + ` (for origin SIT) and ` + "`" + `DDASIT` + "`" + ` (for destination SIT). If updating those values in other service\nitems, the office users will not have as much attention to those values.\n\nTo create a service item, please use [createMTOServiceItem](#mtoServiceItem/createMTOServiceItem)) endpoint.\n\n* Resubmitting rejected SIT service items: This endpoint will handle the logic of changing the status of rejected SIT service items from\nREJECTED to SUBMITTED. Please provide the ` + "`" + `requestedApprovalsRequestedStatus: true` + "`" + ` when resubmitting as this will give attention to the TOO to\nreview the resubmitted SIT service item. Another note, ` + "`" + `updateReason` + "`" + ` must have a different value than the current ` + "`" + `reason` + "`" + ` value on the service item.\nIf this value is not updated, then an error will be sent back.\n\nThe following SIT service items can be resubmitted following a rejection:\n- DDASIT\n- DDDSIT\n- DDFSIT\n- DOASIT\n- DOPSIT\n- DOFSIT\n- DDSFSC\n- DOSFSC\n\nAt a MINIMUM, the payload for resubmitting a rejected SIT service item must look like this:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"reServiceCode\": \"DDFSIT\",\n \"updateReason\": \"A reason that differs from the previous reason\",\n \"modelType\": \"UpdateMTOServiceItemSIT\",\n \"requestApprovalsRequestedStatus\": true\n}\n` + "`" + `` + "`" + `` + "`" + `\n", + "description": "Updates MTOServiceItems after creation. Not all service items or fields may be updated, please see details below.\n\nThis endpoint supports different body definitions. In the modelType field below, select the modelType corresponding\n to the service item you wish to update and the documentation will update with the new definition.\n\n* Addresses: To update a destination service item's SIT destination final address, update the shipment delivery address.\nFor approved shipments, please use [updateShipmentDestinationAddress](#mtoShipment/updateShipmentDestinationAddress).\nFor shipments not yet approved, please use [updateMTOShipmentAddress](#mtoShipment/updateMTOShipmentAddress).\n\n* SIT Service Items: Take note that when updating ` + "`" + `sitCustomerContacted` + "`" + `, ` + "`" + `sitDepartureDate` + "`" + `, or ` + "`" + `sitRequestedDelivery` + "`" + `, we want\nthose to be updated on ` + "`" + `DOASIT` + "`" + ` (for origin SIT) and ` + "`" + `DDASIT` + "`" + ` (for destination SIT). If updating those values in other service\nitems, the office users will not have as much attention to those values.\n\nTo create a service item, please use [createMTOServiceItem](#mtoServiceItem/createMTOServiceItem)) endpoint.\n\n* Resubmitting rejected SIT service items: This endpoint will handle the logic of changing the status of rejected SIT service items from\nREJECTED to SUBMITTED. Please provide the ` + "`" + `requestedApprovalsRequestedStatus: true` + "`" + ` when resubmitting as this will give attention to the TOO to\nreview the resubmitted SIT service item. Another note, ` + "`" + `updateReason` + "`" + ` must have a different value than the current ` + "`" + `reason` + "`" + ` value on the service item.\nIf this value is not updated, then an error will be sent back.\n\nThe following SIT service items can be resubmitted following a rejection:\n- DDASIT\n- DDDSIT\n- DDFSIT\n- DOASIT\n- DOPSIT\n- DOFSIT\n- DDSFSC\n- DOSFSC\n\nAt a MINIMUM, the payload for resubmitting a rejected SIT service item must look like this:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"reServiceCode\": \"DDFSIT\",\n \"updateReason\": \"A reason that differs from the previous reason\",\n \"modelType\": \"UpdateMTOServiceItemSIT\",\n \"requestApprovalsRequestedStatus\": true\n}\n` + "`" + `` + "`" + `` + "`" + `\n\nThe following service items allow you to update the Port that the shipment will use:\n- PODFSC (Port of Debarkation can be updated)\n- POEFSC (Port of Embarkation can be updated)\n\nAt a MINIMUM, the payload for updating the port should contain the reServiceCode (PODFSC or POEFSC), modelType (UpdateMTOServiceItemInternationalPortFSC), portCode, and id for the service item.\nPlease see the example payload below:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"id\": \"1ed224b6-c65e-4616-b88e-8304d26c9562\",\n \"modelType\": \"UpdateMTOServiceItemInternationalPortFSC\",\n \"portCode\": \"SEA\",\n \"reServiceCode\": \"POEFSC\"\n}\n` + "`" + `` + "`" + `` + "`" + `\n", "consumes": [ "application/json" ], @@ -1362,6 +1362,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -2338,8 +2343,33 @@ func init() { } ] }, + "MTOServiceItemInternationalFuelSurcharge": { + "description": "Describes a international Port of Embarkation/Debarkation fuel surcharge service item subtype of a MTOServiceItem.", + "allOf": [ + { + "$ref": "#/definitions/MTOServiceItem" + }, + { + "type": "object", + "properties": { + "portCode": { + "description": "A unique code for a Port", + "type": "string" + }, + "reServiceCode": { + "description": "A unique code for the service item. Indicates if the service is for Port of Embarkation (POEFSC) or Port of Debarkation (PODFSC).", + "type": "string", + "enum": [ + "PODFSC", + "POEFSC" + ] + } + } + } + ] + }, "MTOServiceItemModelType": { - "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", + "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n * PODFSC, POEFSC - MTOSerivceItemInternationalFuelSurcharge\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "MTOServiceItemBasic", @@ -2347,7 +2377,8 @@ func init() { "MTOServiceItemDestSIT", "MTOServiceItemShuttle", "MTOServiceItemDomesticCrating", - "MTOServiceItemInternationalCrating" + "MTOServiceItemInternationalCrating", + "MTOSerivceItemInternationalFuelSurcharge" ] }, "MTOServiceItemOriginSIT": { @@ -3896,12 +3927,41 @@ func init() { }, "discriminator": "modelType" }, + "UpdateMTOServiceItemInternationalPortFSC": { + "description": "Subtype used to provide the port for fuel surcharge. This is not creating a new service item but rather updating an existing service item.\n", + "allOf": [ + { + "$ref": "#/definitions/UpdateMTOServiceItem" + }, + { + "type": "object", + "properties": { + "portCode": { + "description": "Port used for the shipment. Relevant for moving (PODFSC \u0026 POEFSC) service items.", + "type": "string", + "x-nullable": true, + "x-omitempty": false, + "example": "PDX" + }, + "reServiceCode": { + "description": "Service code allowed for this model type.", + "type": "string", + "enum": [ + "PODFSC", + "POEFSC" + ] + } + } + } + ] + }, "UpdateMTOServiceItemModelType": { - "description": "Using this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DDDSIT - UpdateMTOServiceItemSIT\n * DDFSIT - UpdateMTOServiceItemSIT\n * DDASIT - UpdateMTOServiceItemSIT\n * DOPSIT - UpdateMTOServiceItemSIT\n * DOASIT - UpdateMTOServiceItemSIT\n * DOFSIT - UpdateMTOServiceItemSIT\n * DOSFSC - UpdateMTOServiceItemSIT\n * DDSFSC - UpdateMTOServiceItemSIT\n * DDSHUT - UpdateMTOServiceItemShuttle\n * DOSHUT - UpdateMTOServiceItemShuttle\n\nThe documentation will then update with the supported fields.\n", + "description": "Using this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DDDSIT - UpdateMTOServiceItemSIT\n * DDFSIT - UpdateMTOServiceItemSIT\n * DDASIT - UpdateMTOServiceItemSIT\n * DOPSIT - UpdateMTOServiceItemSIT\n * DOASIT - UpdateMTOServiceItemSIT\n * DOFSIT - UpdateMTOServiceItemSIT\n * DOSFSC - UpdateMTOServiceItemSIT\n * DDSFSC - UpdateMTOServiceItemSIT\n * DDSHUT - UpdateMTOServiceItemShuttle\n * DOSHUT - UpdateMTOServiceItemShuttle\n * PODFSC - UpdateMTOServiceItemInternationalPortFSC\n * POEFSC - UpdateMTOServiceItemInternationalPortFSC\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "UpdateMTOServiceItemSIT", - "UpdateMTOServiceItemShuttle" + "UpdateMTOServiceItemShuttle", + "UpdateMTOServiceItemInternationalPortFSC" ] }, "UpdateMTOServiceItemSIT": { @@ -4914,7 +4974,7 @@ func init() { }, "/mto-service-items/{mtoServiceItemID}": { "patch": { - "description": "Updates MTOServiceItems after creation. Not all service items or fields may be updated, please see details below.\n\nThis endpoint supports different body definitions. In the modelType field below, select the modelType corresponding\n to the service item you wish to update and the documentation will update with the new definition.\n\n* Addresses: To update a destination service item's SIT destination final address, update the shipment delivery address.\nFor approved shipments, please use [updateShipmentDestinationAddress](#mtoShipment/updateShipmentDestinationAddress).\nFor shipments not yet approved, please use [updateMTOShipmentAddress](#mtoShipment/updateMTOShipmentAddress).\n\n* SIT Service Items: Take note that when updating ` + "`" + `sitCustomerContacted` + "`" + `, ` + "`" + `sitDepartureDate` + "`" + `, or ` + "`" + `sitRequestedDelivery` + "`" + `, we want\nthose to be updated on ` + "`" + `DOASIT` + "`" + ` (for origin SIT) and ` + "`" + `DDASIT` + "`" + ` (for destination SIT). If updating those values in other service\nitems, the office users will not have as much attention to those values.\n\nTo create a service item, please use [createMTOServiceItem](#mtoServiceItem/createMTOServiceItem)) endpoint.\n\n* Resubmitting rejected SIT service items: This endpoint will handle the logic of changing the status of rejected SIT service items from\nREJECTED to SUBMITTED. Please provide the ` + "`" + `requestedApprovalsRequestedStatus: true` + "`" + ` when resubmitting as this will give attention to the TOO to\nreview the resubmitted SIT service item. Another note, ` + "`" + `updateReason` + "`" + ` must have a different value than the current ` + "`" + `reason` + "`" + ` value on the service item.\nIf this value is not updated, then an error will be sent back.\n\nThe following SIT service items can be resubmitted following a rejection:\n- DDASIT\n- DDDSIT\n- DDFSIT\n- DOASIT\n- DOPSIT\n- DOFSIT\n- DDSFSC\n- DOSFSC\n\nAt a MINIMUM, the payload for resubmitting a rejected SIT service item must look like this:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"reServiceCode\": \"DDFSIT\",\n \"updateReason\": \"A reason that differs from the previous reason\",\n \"modelType\": \"UpdateMTOServiceItemSIT\",\n \"requestApprovalsRequestedStatus\": true\n}\n` + "`" + `` + "`" + `` + "`" + `\n", + "description": "Updates MTOServiceItems after creation. Not all service items or fields may be updated, please see details below.\n\nThis endpoint supports different body definitions. In the modelType field below, select the modelType corresponding\n to the service item you wish to update and the documentation will update with the new definition.\n\n* Addresses: To update a destination service item's SIT destination final address, update the shipment delivery address.\nFor approved shipments, please use [updateShipmentDestinationAddress](#mtoShipment/updateShipmentDestinationAddress).\nFor shipments not yet approved, please use [updateMTOShipmentAddress](#mtoShipment/updateMTOShipmentAddress).\n\n* SIT Service Items: Take note that when updating ` + "`" + `sitCustomerContacted` + "`" + `, ` + "`" + `sitDepartureDate` + "`" + `, or ` + "`" + `sitRequestedDelivery` + "`" + `, we want\nthose to be updated on ` + "`" + `DOASIT` + "`" + ` (for origin SIT) and ` + "`" + `DDASIT` + "`" + ` (for destination SIT). If updating those values in other service\nitems, the office users will not have as much attention to those values.\n\nTo create a service item, please use [createMTOServiceItem](#mtoServiceItem/createMTOServiceItem)) endpoint.\n\n* Resubmitting rejected SIT service items: This endpoint will handle the logic of changing the status of rejected SIT service items from\nREJECTED to SUBMITTED. Please provide the ` + "`" + `requestedApprovalsRequestedStatus: true` + "`" + ` when resubmitting as this will give attention to the TOO to\nreview the resubmitted SIT service item. Another note, ` + "`" + `updateReason` + "`" + ` must have a different value than the current ` + "`" + `reason` + "`" + ` value on the service item.\nIf this value is not updated, then an error will be sent back.\n\nThe following SIT service items can be resubmitted following a rejection:\n- DDASIT\n- DDDSIT\n- DDFSIT\n- DOASIT\n- DOPSIT\n- DOFSIT\n- DDSFSC\n- DOSFSC\n\nAt a MINIMUM, the payload for resubmitting a rejected SIT service item must look like this:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"reServiceCode\": \"DDFSIT\",\n \"updateReason\": \"A reason that differs from the previous reason\",\n \"modelType\": \"UpdateMTOServiceItemSIT\",\n \"requestApprovalsRequestedStatus\": true\n}\n` + "`" + `` + "`" + `` + "`" + `\n\nThe following service items allow you to update the Port that the shipment will use:\n- PODFSC (Port of Debarkation can be updated)\n- POEFSC (Port of Embarkation can be updated)\n\nAt a MINIMUM, the payload for updating the port should contain the reServiceCode (PODFSC or POEFSC), modelType (UpdateMTOServiceItemInternationalPortFSC), portCode, and id for the service item.\nPlease see the example payload below:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"id\": \"1ed224b6-c65e-4616-b88e-8304d26c9562\",\n \"modelType\": \"UpdateMTOServiceItemInternationalPortFSC\",\n \"portCode\": \"SEA\",\n \"reServiceCode\": \"POEFSC\"\n}\n` + "`" + `` + "`" + `` + "`" + `\n", "consumes": [ "application/json" ], @@ -6196,6 +6256,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -7172,8 +7237,33 @@ func init() { } ] }, + "MTOServiceItemInternationalFuelSurcharge": { + "description": "Describes a international Port of Embarkation/Debarkation fuel surcharge service item subtype of a MTOServiceItem.", + "allOf": [ + { + "$ref": "#/definitions/MTOServiceItem" + }, + { + "type": "object", + "properties": { + "portCode": { + "description": "A unique code for a Port", + "type": "string" + }, + "reServiceCode": { + "description": "A unique code for the service item. Indicates if the service is for Port of Embarkation (POEFSC) or Port of Debarkation (PODFSC).", + "type": "string", + "enum": [ + "PODFSC", + "POEFSC" + ] + } + } + } + ] + }, "MTOServiceItemModelType": { - "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", + "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n * PODFSC, POEFSC - MTOSerivceItemInternationalFuelSurcharge\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "MTOServiceItemBasic", @@ -7181,7 +7271,8 @@ func init() { "MTOServiceItemDestSIT", "MTOServiceItemShuttle", "MTOServiceItemDomesticCrating", - "MTOServiceItemInternationalCrating" + "MTOServiceItemInternationalCrating", + "MTOSerivceItemInternationalFuelSurcharge" ] }, "MTOServiceItemOriginSIT": { @@ -8735,12 +8826,41 @@ func init() { }, "discriminator": "modelType" }, + "UpdateMTOServiceItemInternationalPortFSC": { + "description": "Subtype used to provide the port for fuel surcharge. This is not creating a new service item but rather updating an existing service item.\n", + "allOf": [ + { + "$ref": "#/definitions/UpdateMTOServiceItem" + }, + { + "type": "object", + "properties": { + "portCode": { + "description": "Port used for the shipment. Relevant for moving (PODFSC \u0026 POEFSC) service items.", + "type": "string", + "x-nullable": true, + "x-omitempty": false, + "example": "PDX" + }, + "reServiceCode": { + "description": "Service code allowed for this model type.", + "type": "string", + "enum": [ + "PODFSC", + "POEFSC" + ] + } + } + } + ] + }, "UpdateMTOServiceItemModelType": { - "description": "Using this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DDDSIT - UpdateMTOServiceItemSIT\n * DDFSIT - UpdateMTOServiceItemSIT\n * DDASIT - UpdateMTOServiceItemSIT\n * DOPSIT - UpdateMTOServiceItemSIT\n * DOASIT - UpdateMTOServiceItemSIT\n * DOFSIT - UpdateMTOServiceItemSIT\n * DOSFSC - UpdateMTOServiceItemSIT\n * DDSFSC - UpdateMTOServiceItemSIT\n * DDSHUT - UpdateMTOServiceItemShuttle\n * DOSHUT - UpdateMTOServiceItemShuttle\n\nThe documentation will then update with the supported fields.\n", + "description": "Using this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DDDSIT - UpdateMTOServiceItemSIT\n * DDFSIT - UpdateMTOServiceItemSIT\n * DDASIT - UpdateMTOServiceItemSIT\n * DOPSIT - UpdateMTOServiceItemSIT\n * DOASIT - UpdateMTOServiceItemSIT\n * DOFSIT - UpdateMTOServiceItemSIT\n * DOSFSC - UpdateMTOServiceItemSIT\n * DDSFSC - UpdateMTOServiceItemSIT\n * DDSHUT - UpdateMTOServiceItemShuttle\n * DOSHUT - UpdateMTOServiceItemShuttle\n * PODFSC - UpdateMTOServiceItemInternationalPortFSC\n * POEFSC - UpdateMTOServiceItemInternationalPortFSC\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "UpdateMTOServiceItemSIT", - "UpdateMTOServiceItemShuttle" + "UpdateMTOServiceItemShuttle", + "UpdateMTOServiceItemInternationalPortFSC" ] }, "UpdateMTOServiceItemSIT": { diff --git a/pkg/gen/primev2api/embedded_spec.go b/pkg/gen/primev2api/embedded_spec.go index cc81cce8c7b..2b05dd45610 100644 --- a/pkg/gen/primev2api/embedded_spec.go +++ b/pkg/gen/primev2api/embedded_spec.go @@ -547,6 +547,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -1470,7 +1475,7 @@ func init() { ] }, "MTOServiceItemModelType": { - "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", + "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n * PODFSC, POEFSC - MTOSerivceItemInternationalFuelSurcharge\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "MTOServiceItemBasic", @@ -1478,7 +1483,8 @@ func init() { "MTOServiceItemDestSIT", "MTOServiceItemShuttle", "MTOServiceItemDomesticCrating", - "MTOServiceItemInternationalCrating" + "MTOServiceItemInternationalCrating", + "MTOSerivceItemInternationalFuelSurcharge" ] }, "MTOServiceItemOriginSIT": { @@ -4148,6 +4154,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -5071,7 +5082,7 @@ func init() { ] }, "MTOServiceItemModelType": { - "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", + "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n * PODFSC, POEFSC - MTOSerivceItemInternationalFuelSurcharge\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "MTOServiceItemBasic", @@ -5079,7 +5090,8 @@ func init() { "MTOServiceItemDestSIT", "MTOServiceItemShuttle", "MTOServiceItemDomesticCrating", - "MTOServiceItemInternationalCrating" + "MTOServiceItemInternationalCrating", + "MTOSerivceItemInternationalFuelSurcharge" ] }, "MTOServiceItemOriginSIT": { diff --git a/pkg/gen/primev3api/embedded_spec.go b/pkg/gen/primev3api/embedded_spec.go index f7cb95c0bb5..2d36d552e13 100644 --- a/pkg/gen/primev3api/embedded_spec.go +++ b/pkg/gen/primev3api/embedded_spec.go @@ -553,6 +553,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -1632,7 +1637,7 @@ func init() { ] }, "MTOServiceItemModelType": { - "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", + "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n * PODFSC, POEFSC - MTOSerivceItemInternationalFuelSurcharge\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "MTOServiceItemBasic", @@ -1640,7 +1645,8 @@ func init() { "MTOServiceItemDestSIT", "MTOServiceItemShuttle", "MTOServiceItemDomesticCrating", - "MTOServiceItemInternationalCrating" + "MTOServiceItemInternationalCrating", + "MTOSerivceItemInternationalFuelSurcharge" ] }, "MTOServiceItemOriginSIT": { @@ -1965,6 +1971,12 @@ func init() { "description": "Email or ID of the person who will be contacted in the event of questions or concerns about this update. May be the person performing the update, or someone else working with the Prime contractor.\n", "type": "string" }, + "portOfDebarkation": { + "$ref": "#/definitions/Port" + }, + "portOfEmbarkation": { + "$ref": "#/definitions/Port" + }, "ppmShipment": { "$ref": "#/definitions/PPMShipment" }, @@ -2530,6 +2542,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -2980,6 +2997,115 @@ func init() { "$ref": "#/definitions/PaymentServiceItem" } }, + "Port": { + "description": "A port that is used to move an international shipment.", + "type": "object", + "properties": { + "city": { + "type": "string", + "example": "PORTLAND" + }, + "country": { + "description": "Two-letter country code", + "type": "string", + "pattern": "^[A-Z]{2}$", + "example": "US" + }, + "county": { + "type": "string", + "example": "MULTNOMAH" + }, + "id": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" + }, + "portCode": { + "description": "3 or 4 digit port code", + "type": "string", + "example": "0431" + }, + "portName": { + "description": "Name of the port", + "type": "string", + "example": "PORTLAND INTL" + }, + "portType": { + "description": "Port type A (Air), B (Border Crossing), S (Sea)", + "type": "string", + "enum": [ + "A", + "B", + "S" + ] + }, + "state": { + "description": "US state", + "type": "string", + "enum": [ + "AL", + "AK", + "AR", + "AZ", + "CA", + "CO", + "CT", + "DC", + "DE", + "FL", + "GA", + "HI", + "IA", + "ID", + "IL", + "IN", + "KS", + "KY", + "LA", + "MA", + "MD", + "ME", + "MI", + "MN", + "MO", + "MS", + "MT", + "NC", + "ND", + "NE", + "NH", + "NJ", + "NM", + "NV", + "NY", + "OH", + "OK", + "OR", + "PA", + "RI", + "SC", + "SD", + "TN", + "TX", + "UT", + "VA", + "VT", + "WA", + "WI", + "WV", + "WY" + ], + "example": "OR" + }, + "zip": { + "type": "string", + "format": "zip", + "title": "ZIP", + "pattern": "^(\\d{5}([\\-]\\d{4})?)$", + "example": "99501" + } + } + }, "ProofOfServiceDoc": { "type": "object", "properties": { @@ -3672,6 +3798,12 @@ func init() { "description": "Email or ID of the person who will be contacted in the event of questions or concerns about this update. May be the person performing the update, or someone else working with the Prime contractor.\n", "type": "string" }, + "portOfDebarkation": { + "$ref": "#/definitions/Port" + }, + "portOfEmbarkation": { + "$ref": "#/definitions/Port" + }, "ppmShipment": { "$ref": "#/definitions/UpdatePPMShipment" }, @@ -4675,6 +4807,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -5754,7 +5891,7 @@ func init() { ] }, "MTOServiceItemModelType": { - "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", + "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n * PODFSC, POEFSC - MTOSerivceItemInternationalFuelSurcharge\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "MTOServiceItemBasic", @@ -5762,7 +5899,8 @@ func init() { "MTOServiceItemDestSIT", "MTOServiceItemShuttle", "MTOServiceItemDomesticCrating", - "MTOServiceItemInternationalCrating" + "MTOServiceItemInternationalCrating", + "MTOSerivceItemInternationalFuelSurcharge" ] }, "MTOServiceItemOriginSIT": { @@ -6087,6 +6225,12 @@ func init() { "description": "Email or ID of the person who will be contacted in the event of questions or concerns about this update. May be the person performing the update, or someone else working with the Prime contractor.\n", "type": "string" }, + "portOfDebarkation": { + "$ref": "#/definitions/Port" + }, + "portOfEmbarkation": { + "$ref": "#/definitions/Port" + }, "ppmShipment": { "$ref": "#/definitions/PPMShipment" }, @@ -6652,6 +6796,11 @@ func init() { "title": "Address Line 3", "x-nullable": true, "example": "Montmârtre" + }, + "usPostRegionCitiesID": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" } } }, @@ -7102,6 +7251,115 @@ func init() { "$ref": "#/definitions/PaymentServiceItem" } }, + "Port": { + "description": "A port that is used to move an international shipment.", + "type": "object", + "properties": { + "city": { + "type": "string", + "example": "PORTLAND" + }, + "country": { + "description": "Two-letter country code", + "type": "string", + "pattern": "^[A-Z]{2}$", + "example": "US" + }, + "county": { + "type": "string", + "example": "MULTNOMAH" + }, + "id": { + "type": "string", + "format": "uuid", + "example": "c56a4180-65aa-42ec-a945-5fd21dec0538" + }, + "portCode": { + "description": "3 or 4 digit port code", + "type": "string", + "example": "0431" + }, + "portName": { + "description": "Name of the port", + "type": "string", + "example": "PORTLAND INTL" + }, + "portType": { + "description": "Port type A (Air), B (Border Crossing), S (Sea)", + "type": "string", + "enum": [ + "A", + "B", + "S" + ] + }, + "state": { + "description": "US state", + "type": "string", + "enum": [ + "AL", + "AK", + "AR", + "AZ", + "CA", + "CO", + "CT", + "DC", + "DE", + "FL", + "GA", + "HI", + "IA", + "ID", + "IL", + "IN", + "KS", + "KY", + "LA", + "MA", + "MD", + "ME", + "MI", + "MN", + "MO", + "MS", + "MT", + "NC", + "ND", + "NE", + "NH", + "NJ", + "NM", + "NV", + "NY", + "OH", + "OK", + "OR", + "PA", + "RI", + "SC", + "SD", + "TN", + "TX", + "UT", + "VA", + "VT", + "WA", + "WI", + "WV", + "WY" + ], + "example": "OR" + }, + "zip": { + "type": "string", + "format": "zip", + "title": "ZIP", + "pattern": "^(\\d{5}([\\-]\\d{4})?)$", + "example": "99501" + } + } + }, "ProofOfServiceDoc": { "type": "object", "properties": { @@ -7796,6 +8054,12 @@ func init() { "description": "Email or ID of the person who will be contacted in the event of questions or concerns about this update. May be the person performing the update, or someone else working with the Prime contractor.\n", "type": "string" }, + "portOfDebarkation": { + "$ref": "#/definitions/Port" + }, + "portOfEmbarkation": { + "$ref": "#/definitions/Port" + }, "ppmShipment": { "$ref": "#/definitions/UpdatePPMShipment" }, diff --git a/swagger/ghc.yaml b/swagger/ghc.yaml index 64e70b75634..9f6ff6750b2 100644 --- a/swagger/ghc.yaml +++ b/swagger/ghc.yaml @@ -38,6 +38,7 @@ tags: - name: ppm - name: tac - name: transportationOffice + - name: addresses - name: uploads - name: paymentRequests - name: reServiceItems @@ -4221,6 +4222,36 @@ paths: $ref: '#/responses/NotFound' '500': $ref: '#/responses/ServerError' + /addresses/zip-city-lookup/{search}: + get: + summary: >- + Returns city, state, postal code, and county associated with the + specified full/partial postal code or city and state string + description: >- + Find by API using full/partial postal code or city name that returns an + us_post_region_cities json object containing city, state, county and + postal code. + operationId: getLocationByZipCityState + tags: + - addresses + parameters: + - in: path + name: search + type: string + required: true + responses: + '200': + description: the requested list of city, state, county, and postal code matches + schema: + $ref: '#/definitions/VLocations' + '400': + $ref: '#/responses/InvalidRequest' + '403': + $ref: '#/responses/PermissionDenied' + '404': + $ref: '#/responses/NotFound' + '500': + $ref: '#/responses/ServerError' /uploads: post: summary: Create a new upload @@ -7974,6 +8005,10 @@ definitions: type: array items: $ref: '#/definitions/TransportationOffice' + VLocations: + type: array + items: + $ref: '#/definitions/VLocation' ReServiceItems: type: array items: @@ -8262,6 +8297,10 @@ definitions: title: isOconus x-nullable: true example: false + usPostRegionCitiesID: + type: string + format: uuid + example: c56a4180-65aa-42ec-a945-5fd21dec0538 required: - streetAddress1 - city @@ -8994,6 +9033,10 @@ definitions: title: County x-nullable: true example: LOS ANGELES + usPostRegionCitiesID: + type: string + format: uuid + example: c56a4180-65aa-42ec-a945-5fd21dec0538 required: - city - state @@ -11418,6 +11461,136 @@ definitions: validHhgProgramCodeForLoa: type: boolean x-nullable: true + VLocation: + description: A postal code, city, and state lookup + type: object + properties: + city: + type: string + example: Anytown + title: City + state: + title: State + type: string + x-display-value: + AL: AL + AK: AK + AR: AR + AZ: AZ + CA: CA + CO: CO + CT: CT + DC: DC + DE: DE + FL: FL + GA: GA + HI: HI + IA: IA + ID: ID + IL: IL + IN: IN + KS: KS + KY: KY + LA: LA + MA: MA + MD: MD + ME: ME + MI: MI + MN: MN + MO: MO + MS: MS + MT: MT + NC: NC + ND: ND + NE: NE + NH: NH + NJ: NJ + NM: NM + NV: NV + NY: NY + OH: OH + OK: OK + OR: OR + PA: PA + RI: RI + SC: SC + SD: SD + TN: TN + TX: TX + UT: UT + VA: VA + VT: VT + WA: WA + WI: WI + WV: WV + WY: WY + enum: + - AL + - AK + - AR + - AZ + - CA + - CO + - CT + - DC + - DE + - FL + - GA + - HI + - IA + - ID + - IL + - IN + - KS + - KY + - LA + - MA + - MD + - ME + - MI + - MN + - MO + - MS + - MT + - NC + - ND + - NE + - NH + - NJ + - NM + - NV + - NY + - OH + - OK + - OR + - PA + - RI + - SC + - SD + - TN + - TX + - UT + - VA + - VT + - WA + - WI + - WV + - WY + postalCode: + type: string + format: zip + title: ZIP + example: '90210' + pattern: ^(\d{5}?)$ + county: + type: string + title: County + x-nullable: true + example: LOS ANGELES + usPostRegionCitiesID: + type: string + format: uuid + example: c56a4180-65aa-42ec-a945-5fd21dec0538 ReServiceItem: description: A Service Item which ties an ReService, Market, and Shipment Type together type: object diff --git a/swagger/internal.yaml b/swagger/internal.yaml index a9695a64600..91bf98ecf28 100644 --- a/swagger/internal.yaml +++ b/swagger/internal.yaml @@ -608,6 +608,10 @@ definitions: type: array items: $ref: '#/definitions/TransportationOffice' + VLocations: + type: array + items: + $ref: '#/definitions/VLocation' OfficeUser: type: object properties: @@ -2750,6 +2754,10 @@ definitions: title: isOconus x-nullable: true example: false + usPostRegionCitiesID: + type: string + format: uuid + example: c56a4180-65aa-42ec-a945-5fd21dec0538 required: - streetAddress1 - city @@ -4048,6 +4056,136 @@ definitions: RENTAL_EQUIPMENT: Rental equipment TOLLS: Tolls WEIGHING_FEE: Weighing fee + VLocation: + description: A postal code, city, and state lookup + type: object + properties: + city: + type: string + example: Anytown + title: City + state: + title: State + type: string + x-display-value: + AL: AL + AK: AK + AR: AR + AZ: AZ + CA: CA + CO: CO + CT: CT + DC: DC + DE: DE + FL: FL + GA: GA + HI: HI + IA: IA + ID: ID + IL: IL + IN: IN + KS: KS + KY: KY + LA: LA + MA: MA + MD: MD + ME: ME + MI: MI + MN: MN + MO: MO + MS: MS + MT: MT + NC: NC + ND: ND + NE: NE + NH: NH + NJ: NJ + NM: NM + NV: NV + NY: NY + OH: OH + OK: OK + OR: OR + PA: PA + RI: RI + SC: SC + SD: SD + TN: TN + TX: TX + UT: UT + VA: VA + VT: VT + WA: WA + WI: WI + WV: WV + WY: WY + enum: + - AL + - AK + - AR + - AZ + - CA + - CO + - CT + - DC + - DE + - FL + - GA + - HI + - IA + - ID + - IL + - IN + - KS + - KY + - LA + - MA + - MD + - ME + - MI + - MN + - MO + - MS + - MT + - NC + - ND + - NE + - NH + - NJ + - NM + - NV + - NY + - OH + - OK + - OR + - PA + - RI + - SC + - SD + - TN + - TX + - UT + - VA + - VT + - WA + - WI + - WV + - WY + postalCode: + type: string + format: zip + title: ZIP + example: '90210' + pattern: ^(\d{5}?)$ + county: + type: string + title: County + x-nullable: true + example: LOS ANGELES + usPostRegionCitiesID: + type: string + format: uuid + example: c56a4180-65aa-42ec-a945-5fd21dec0538 PPMDestinationAddress: description: A postal address type: object @@ -4202,6 +4340,10 @@ definitions: title: County x-nullable: true example: LOS ANGELES + usPostRegionCitiesID: + type: string + format: uuid + example: c56a4180-65aa-42ec-a945-5fd21dec0538 required: - city - state @@ -6234,6 +6376,36 @@ paths: description: not found '500': description: server error + /addresses/zip-city-lookup/{search}: + get: + summary: >- + Returns city, state, postal code, and county associated with the + specified full/partial postal code or city state string + description: >- + Find by API using full/partial postal code or city name that returns an + us_post_region_cities json object containing city, state, county and + postal code. + operationId: getLocationByZipCityState + tags: + - addresses + parameters: + - in: path + name: search + type: string + required: true + responses: + '200': + description: the requested list of city, state, county, and postal code matches + schema: + $ref: '#/definitions/VLocations' + '400': + $ref: '#/responses/InvalidRequest' + '403': + $ref: '#/responses/PermissionDenied' + '404': + $ref: '#/responses/NotFound' + '500': + $ref: '#/responses/ServerError' /mto_shipments: post: summary: createMTOShipment diff --git a/swagger/prime.yaml b/swagger/prime.yaml index 37219b47181..f0de7643be3 100644 --- a/swagger/prime.yaml +++ b/swagger/prime.yaml @@ -1072,6 +1072,33 @@ paths: } ``` + + + The following service items allow you to update the Port that the + shipment will use: + + - PODFSC (Port of Debarkation can be updated) + + - POEFSC (Port of Embarkation can be updated) + + + At a MINIMUM, the payload for updating the port should contain the + reServiceCode (PODFSC or POEFSC), modelType + (UpdateMTOServiceItemInternationalPortFSC), portCode, and id for the + service item. + + Please see the example payload below: + + ```json + + { + "id": "1ed224b6-c65e-4616-b88e-8304d26c9562", + "modelType": "UpdateMTOServiceItemInternationalPortFSC", + "portCode": "SEA", + "reServiceCode": "POEFSC" + } + + ``` operationId: updateMTOServiceItem tags: - mtoServiceItem @@ -2234,6 +2261,25 @@ definitions: required: - reason - reServiceCode + MTOServiceItemInternationalFuelSurcharge: + description: >- + Describes a international Port of Embarkation/Debarkation fuel surcharge + service item subtype of a MTOServiceItem. + allOf: + - $ref: '#/definitions/MTOServiceItem' + - type: object + properties: + reServiceCode: + type: string + description: >- + A unique code for the service item. Indicates if the service is + for Port of Embarkation (POEFSC) or Port of Debarkation (PODFSC). + enum: + - PODFSC + - POEFSC + portCode: + description: A unique code for a Port + type: string MTOShipment: type: object properties: @@ -2326,12 +2372,15 @@ definitions: * DDSFSC - UpdateMTOServiceItemSIT * DDSHUT - UpdateMTOServiceItemShuttle * DOSHUT - UpdateMTOServiceItemShuttle + * PODFSC - UpdateMTOServiceItemInternationalPortFSC + * POEFSC - UpdateMTOServiceItemInternationalPortFSC The documentation will then update with the supported fields. type: string enum: - UpdateMTOServiceItemSIT - UpdateMTOServiceItemShuttle + - UpdateMTOServiceItemInternationalPortFSC UpdateMTOServiceItemShuttle: description: > Subtype used to provide the estimated weight and actual weight for @@ -2463,6 +2512,28 @@ definitions: description: Indicates if "Approvals Requested" status is being requested. type: boolean x-nullable: true + UpdateMTOServiceItemInternationalPortFSC: + description: > + Subtype used to provide the port for fuel surcharge. This is not creating + a new service item but rather updating an existing service item. + allOf: + - $ref: '#/definitions/UpdateMTOServiceItem' + - type: object + properties: + portCode: + type: string + example: PDX + description: >- + Port used for the shipment. Relevant for moving (PODFSC & POEFSC) + service items. + x-nullable: true + x-omitempty: false + reServiceCode: + type: string + description: Service code allowed for this model type. + enum: + - PODFSC + - POEFSC UpdateMTOShipment: properties: actualProGearWeight: @@ -2880,6 +2951,10 @@ definitions: title: isOconus x-nullable: true example: false + usPostRegionCitiesID: + type: string + format: uuid + example: c56a4180-65aa-42ec-a945-5fd21dec0538 required: - streetAddress1 - city @@ -3368,6 +3443,7 @@ definitions: * DOSHUT, DDSHUT - MTOServiceItemShuttle * DCRT, DUCRT - MTOServiceItemDomesticCrating * ICRT, IUCRT - MTOServiceItemInternationalCrating + * PODFSC, POEFSC - MTOSerivceItemInternationalFuelSurcharge The documentation will then update with the supported fields. type: string @@ -3378,6 +3454,7 @@ definitions: - MTOServiceItemShuttle - MTOServiceItemDomesticCrating - MTOServiceItemInternationalCrating + - MTOSerivceItemInternationalFuelSurcharge ServiceRequestDocument: properties: uploads: diff --git a/swagger/prime_v2.yaml b/swagger/prime_v2.yaml index e7cd2cefd81..20008a7dd7e 100644 --- a/swagger/prime_v2.yaml +++ b/swagger/prime_v2.yaml @@ -1562,6 +1562,10 @@ definitions: title: isOconus x-nullable: true example: false + usPostRegionCitiesID: + type: string + format: uuid + example: c56a4180-65aa-42ec-a945-5fd21dec0538 required: - streetAddress1 - city @@ -2062,6 +2066,7 @@ definitions: * DOSHUT, DDSHUT - MTOServiceItemShuttle * DCRT, DUCRT - MTOServiceItemDomesticCrating * ICRT, IUCRT - MTOServiceItemInternationalCrating + * PODFSC, POEFSC - MTOSerivceItemInternationalFuelSurcharge The documentation will then update with the supported fields. type: string @@ -2072,6 +2077,7 @@ definitions: - MTOServiceItemShuttle - MTOServiceItemDomesticCrating - MTOServiceItemInternationalCrating + - MTOSerivceItemInternationalFuelSurcharge ServiceRequestDocument: properties: uploads: diff --git a/swagger/prime_v3.yaml b/swagger/prime_v3.yaml index e32a420d158..7037ba6d735 100644 --- a/swagger/prime_v3.yaml +++ b/swagger/prime_v3.yaml @@ -1312,6 +1312,10 @@ definitions: x-nullable: true ppmShipment: $ref: '#/definitions/UpdatePPMShipment' + portOfEmbarkation: + $ref: '#/definitions/Port' + portOfDebarkation: + $ref: '#/definitions/Port' UpdateMTOShipmentStatus: description: >- Contains the statuses available to the Prime when updating the state of a @@ -1646,6 +1650,10 @@ definitions: title: isOconus x-nullable: true example: false + usPostRegionCitiesID: + type: string + format: uuid + example: c56a4180-65aa-42ec-a945-5fd21dec0538 required: - streetAddress1 - city @@ -2146,6 +2154,7 @@ definitions: * DOSHUT, DDSHUT - MTOServiceItemShuttle * DCRT, DUCRT - MTOServiceItemDomesticCrating * ICRT, IUCRT - MTOServiceItemInternationalCrating + * PODFSC, POEFSC - MTOSerivceItemInternationalFuelSurcharge The documentation will then update with the supported fields. type: string @@ -2156,6 +2165,7 @@ definitions: - MTOServiceItemShuttle - MTOServiceItemDomesticCrating - MTOServiceItemInternationalCrating + - MTOSerivceItemInternationalFuelSurcharge ServiceRequestDocument: properties: uploads: @@ -2643,6 +2653,10 @@ definitions: title: County x-nullable: true example: LOS ANGELES + usPostRegionCitiesID: + type: string + format: uuid + example: c56a4180-65aa-42ec-a945-5fd21dec0538 required: - city - state @@ -3101,6 +3115,102 @@ definitions: - originalAddress - newAddress - contractorRemarks + Port: + description: A port that is used to move an international shipment. + type: object + properties: + id: + type: string + format: uuid + example: c56a4180-65aa-42ec-a945-5fd21dec0538 + portType: + type: string + description: Port type A (Air), B (Border Crossing), S (Sea) + enum: + - A + - B + - S + portCode: + type: string + description: 3 or 4 digit port code + example: '0431' + portName: + type: string + description: Name of the port + example: PORTLAND INTL + city: + type: string + example: PORTLAND + county: + type: string + example: MULTNOMAH + state: + type: string + description: US state + example: OR + enum: + - AL + - AK + - AR + - AZ + - CA + - CO + - CT + - DC + - DE + - FL + - GA + - HI + - IA + - ID + - IL + - IN + - KS + - KY + - LA + - MA + - MD + - ME + - MI + - MN + - MO + - MS + - MT + - NC + - ND + - NE + - NH + - NJ + - NM + - NV + - NY + - OH + - OK + - OR + - PA + - RI + - SC + - SD + - TN + - TX + - UT + - VA + - VT + - WA + - WI + - WV + - WY + zip: + type: string + format: zip + title: ZIP + example: '99501' + pattern: ^(\d{5}([\-]\d{4})?)$ + country: + type: string + example: US + pattern: ^[A-Z]{2}$ + description: Two-letter country code MTOShipmentWithoutServiceItems: type: object properties: @@ -3387,6 +3497,10 @@ definitions: description: >- Single-letter designator for domestic (d) or international (i) shipments + portOfDebarkation: + $ref: '#/definitions/Port' + portOfEmbarkation: + $ref: '#/definitions/Port' MTOShipmentsWithoutServiceObjects: description: A list of shipments without their associated service items. items: