From c81104d24939434aa93851bfb9440f0b7192114a Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Thu, 9 Jan 2025 14:37:23 +0000 Subject: [PATCH] Updating comments --- pkg/gen/primeapi/embedded_spec.go | 12 ++++++------ .../m_t_o_service_item_international_shuttle.go | 6 +++--- ...pdate_m_t_o_service_item_international_shuttle.go | 12 ++++++------ pkg/gen/primev2api/embedded_spec.go | 12 ++++++------ .../m_t_o_service_item_international_shuttle.go | 6 +++--- ...pdate_m_t_o_service_item_international_shuttle.go | 12 ++++++------ pkg/gen/primev3api/embedded_spec.go | 12 ++++++------ .../m_t_o_service_item_international_shuttle.go | 6 +++--- ...pdate_m_t_o_service_item_international_shuttle.go | 12 ++++++------ pkg/handlers/primeapi/mto_service_item_test.go | 2 +- pkg/handlers/primeapi/payloads/model_to_payload.go | 2 +- pkg/handlers/primeapiv2/payloads/model_to_payload.go | 2 +- pkg/handlers/primeapiv3/payloads/model_to_payload.go | 2 +- .../CreateShipmentServiceItemForm.test.jsx | 1 + .../prime/MTOServiceItemInternationalShuttle.yaml | 6 +++--- swagger-def/prime.yaml | 4 ++-- swagger-def/prime_v2.yaml | 4 ++-- swagger-def/prime_v3.yaml | 4 ++-- swagger/prime.yaml | 6 +++--- swagger/prime_v2.yaml | 6 +++--- swagger/prime_v3.yaml | 6 +++--- 21 files changed, 68 insertions(+), 67 deletions(-) diff --git a/pkg/gen/primeapi/embedded_spec.go b/pkg/gen/primeapi/embedded_spec.go index a40931b03dc..ec658743278 100644 --- a/pkg/gen/primeapi/embedded_spec.go +++ b/pkg/gen/primeapi/embedded_spec.go @@ -2405,7 +2405,7 @@ func init() { "example": "CONUS" }, "reServiceCode": { - "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `DDSHUT` + "`" + `).\n", + "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `IDSHUT` + "`" + `).\n", "type": "string", "enum": [ "IOSHUT", @@ -4024,14 +4024,14 @@ func init() { "type": "object", "properties": { "actualWeight": { - "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT \u0026 DOSHUT) service items.", + "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT \u0026 IOSHUT) service items.", "type": "integer", "x-nullable": true, "x-omitempty": false, "example": 4000 }, "estimatedWeight": { - "description": "An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT \u0026 DOSHUT) service item.", + "description": "An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT \u0026 IOSHUT) service item.", "type": "integer", "x-nullable": true, "x-omitempty": false, @@ -7399,7 +7399,7 @@ func init() { "example": "CONUS" }, "reServiceCode": { - "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `DDSHUT` + "`" + `).\n", + "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `IDSHUT` + "`" + `).\n", "type": "string", "enum": [ "IOSHUT", @@ -9023,14 +9023,14 @@ func init() { "type": "object", "properties": { "actualWeight": { - "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT \u0026 DOSHUT) service items.", + "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT \u0026 IOSHUT) service items.", "type": "integer", "x-nullable": true, "x-omitempty": false, "example": 4000 }, "estimatedWeight": { - "description": "An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT \u0026 DOSHUT) service item.", + "description": "An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT \u0026 IOSHUT) service item.", "type": "integer", "x-nullable": true, "x-omitempty": false, diff --git a/pkg/gen/primemessages/m_t_o_service_item_international_shuttle.go b/pkg/gen/primemessages/m_t_o_service_item_international_shuttle.go index 5bc0d7a426c..7b7dbdf29de 100644 --- a/pkg/gen/primemessages/m_t_o_service_item_international_shuttle.go +++ b/pkg/gen/primemessages/m_t_o_service_item_international_shuttle.go @@ -51,7 +51,7 @@ type MTOServiceItemInternationalShuttle struct { // Enum: [CONUS OCONUS] Market string `json:"market,omitempty"` - // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`DDSHUT`). + // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`IDSHUT`). // // Required: true // Enum: [IOSHUT IDSHUT] @@ -183,7 +183,7 @@ func (m *MTOServiceItemInternationalShuttle) UnmarshalJSON(raw []byte) error { // Enum: [CONUS OCONUS] Market string `json:"market,omitempty"` - // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`DDSHUT`). + // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`IDSHUT`). // // Required: true // Enum: [IOSHUT IDSHUT] @@ -292,7 +292,7 @@ func (m MTOServiceItemInternationalShuttle) MarshalJSON() ([]byte, error) { // Enum: [CONUS OCONUS] Market string `json:"market,omitempty"` - // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`DDSHUT`). + // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`IDSHUT`). // // Required: true // Enum: [IOSHUT IDSHUT] diff --git a/pkg/gen/primemessages/update_m_t_o_service_item_international_shuttle.go b/pkg/gen/primemessages/update_m_t_o_service_item_international_shuttle.go index d931a94e2ac..1d4a7b6a0bf 100644 --- a/pkg/gen/primemessages/update_m_t_o_service_item_international_shuttle.go +++ b/pkg/gen/primemessages/update_m_t_o_service_item_international_shuttle.go @@ -22,11 +22,11 @@ import ( type UpdateMTOServiceItemInternationalShuttle struct { idField strfmt.UUID - // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` @@ -61,11 +61,11 @@ func (m *UpdateMTOServiceItemInternationalShuttle) SetModelType(val UpdateMTOSer func (m *UpdateMTOServiceItemInternationalShuttle) UnmarshalJSON(raw []byte) error { var data struct { - // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` @@ -124,11 +124,11 @@ func (m UpdateMTOServiceItemInternationalShuttle) MarshalJSON() ([]byte, error) var err error b1, err = json.Marshal(struct { - // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` diff --git a/pkg/gen/primev2api/embedded_spec.go b/pkg/gen/primev2api/embedded_spec.go index 5fb277996d2..0f27e9bc6ce 100644 --- a/pkg/gen/primev2api/embedded_spec.go +++ b/pkg/gen/primev2api/embedded_spec.go @@ -1511,7 +1511,7 @@ func init() { "example": "CONUS" }, "reServiceCode": { - "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `DDSHUT` + "`" + `).\n", + "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `IDSHUT` + "`" + `).\n", "type": "string", "enum": [ "IOSHUT", @@ -3091,14 +3091,14 @@ func init() { "type": "object", "properties": { "actualWeight": { - "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT \u0026 DOSHUT) service items.", + "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT \u0026 IOSHUT) service items.", "type": "integer", "x-nullable": true, "x-omitempty": false, "example": 4000 }, "estimatedWeight": { - "description": "An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT \u0026 DOSHUT) service item.", + "description": "An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT \u0026 IOSHUT) service item.", "type": "integer", "x-nullable": true, "x-omitempty": false, @@ -5218,7 +5218,7 @@ func init() { "example": "CONUS" }, "reServiceCode": { - "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `DDSHUT` + "`" + `).\n", + "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `IDSHUT` + "`" + `).\n", "type": "string", "enum": [ "IOSHUT", @@ -6800,14 +6800,14 @@ func init() { "type": "object", "properties": { "actualWeight": { - "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT \u0026 DOSHUT) service items.", + "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT \u0026 IOSHUT) service items.", "type": "integer", "x-nullable": true, "x-omitempty": false, "example": 4000 }, "estimatedWeight": { - "description": "An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT \u0026 DOSHUT) service item.", + "description": "An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT \u0026 IOSHUT) service item.", "type": "integer", "x-nullable": true, "x-omitempty": false, diff --git a/pkg/gen/primev2messages/m_t_o_service_item_international_shuttle.go b/pkg/gen/primev2messages/m_t_o_service_item_international_shuttle.go index f3be739150a..3383f8839f2 100644 --- a/pkg/gen/primev2messages/m_t_o_service_item_international_shuttle.go +++ b/pkg/gen/primev2messages/m_t_o_service_item_international_shuttle.go @@ -51,7 +51,7 @@ type MTOServiceItemInternationalShuttle struct { // Enum: [CONUS OCONUS] Market string `json:"market,omitempty"` - // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`DDSHUT`). + // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`IDSHUT`). // // Required: true // Enum: [IOSHUT IDSHUT] @@ -183,7 +183,7 @@ func (m *MTOServiceItemInternationalShuttle) UnmarshalJSON(raw []byte) error { // Enum: [CONUS OCONUS] Market string `json:"market,omitempty"` - // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`DDSHUT`). + // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`IDSHUT`). // // Required: true // Enum: [IOSHUT IDSHUT] @@ -292,7 +292,7 @@ func (m MTOServiceItemInternationalShuttle) MarshalJSON() ([]byte, error) { // Enum: [CONUS OCONUS] Market string `json:"market,omitempty"` - // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`DDSHUT`). + // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`IDSHUT`). // // Required: true // Enum: [IOSHUT IDSHUT] diff --git a/pkg/gen/primev2messages/update_m_t_o_service_item_international_shuttle.go b/pkg/gen/primev2messages/update_m_t_o_service_item_international_shuttle.go index 24ded1acee1..081185c8d70 100644 --- a/pkg/gen/primev2messages/update_m_t_o_service_item_international_shuttle.go +++ b/pkg/gen/primev2messages/update_m_t_o_service_item_international_shuttle.go @@ -22,11 +22,11 @@ import ( type UpdateMTOServiceItemInternationalShuttle struct { idField strfmt.UUID - // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` @@ -61,11 +61,11 @@ func (m *UpdateMTOServiceItemInternationalShuttle) SetModelType(val UpdateMTOSer func (m *UpdateMTOServiceItemInternationalShuttle) UnmarshalJSON(raw []byte) error { var data struct { - // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` @@ -124,11 +124,11 @@ func (m UpdateMTOServiceItemInternationalShuttle) MarshalJSON() ([]byte, error) var err error b1, err = json.Marshal(struct { - // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` diff --git a/pkg/gen/primev3api/embedded_spec.go b/pkg/gen/primev3api/embedded_spec.go index fdb589120d4..4d5603e71e2 100644 --- a/pkg/gen/primev3api/embedded_spec.go +++ b/pkg/gen/primev3api/embedded_spec.go @@ -1673,7 +1673,7 @@ func init() { "example": "CONUS" }, "reServiceCode": { - "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `DDSHUT` + "`" + `).\n", + "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `IDSHUT` + "`" + `).\n", "type": "string", "enum": [ "IOSHUT", @@ -3684,14 +3684,14 @@ func init() { "type": "object", "properties": { "actualWeight": { - "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT \u0026 DOSHUT) service items.", + "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT \u0026 IOSHUT) service items.", "type": "integer", "x-nullable": true, "x-omitempty": false, "example": 4000 }, "estimatedWeight": { - "description": "An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT \u0026 DOSHUT) service item.", + "description": "An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT \u0026 IOSHUT) service item.", "type": "integer", "x-nullable": true, "x-omitempty": false, @@ -6065,7 +6065,7 @@ func init() { "example": "CONUS" }, "reServiceCode": { - "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `DDSHUT` + "`" + `).\n", + "description": "A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (` + "`" + `IOSHUT` + "`" + `) or destination (` + "`" + `IDSHUT` + "`" + `).\n", "type": "string", "enum": [ "IOSHUT", @@ -8078,14 +8078,14 @@ func init() { "type": "object", "properties": { "actualWeight": { - "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT \u0026 DOSHUT) service items.", + "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT \u0026 IOSHUT) service items.", "type": "integer", "x-nullable": true, "x-omitempty": false, "example": 4000 }, "estimatedWeight": { - "description": "An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT \u0026 DOSHUT) service item.", + "description": "An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT \u0026 IOSHUT) service item.", "type": "integer", "x-nullable": true, "x-omitempty": false, diff --git a/pkg/gen/primev3messages/m_t_o_service_item_international_shuttle.go b/pkg/gen/primev3messages/m_t_o_service_item_international_shuttle.go index 7d968ef67a6..6b03f772b77 100644 --- a/pkg/gen/primev3messages/m_t_o_service_item_international_shuttle.go +++ b/pkg/gen/primev3messages/m_t_o_service_item_international_shuttle.go @@ -51,7 +51,7 @@ type MTOServiceItemInternationalShuttle struct { // Enum: [CONUS OCONUS] Market string `json:"market,omitempty"` - // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`DDSHUT`). + // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`IDSHUT`). // // Required: true // Enum: [IOSHUT IDSHUT] @@ -183,7 +183,7 @@ func (m *MTOServiceItemInternationalShuttle) UnmarshalJSON(raw []byte) error { // Enum: [CONUS OCONUS] Market string `json:"market,omitempty"` - // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`DDSHUT`). + // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`IDSHUT`). // // Required: true // Enum: [IOSHUT IDSHUT] @@ -292,7 +292,7 @@ func (m MTOServiceItemInternationalShuttle) MarshalJSON() ([]byte, error) { // Enum: [CONUS OCONUS] Market string `json:"market,omitempty"` - // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`DDSHUT`). + // A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or destination (`IDSHUT`). // // Required: true // Enum: [IOSHUT IDSHUT] diff --git a/pkg/gen/primev3messages/update_m_t_o_service_item_international_shuttle.go b/pkg/gen/primev3messages/update_m_t_o_service_item_international_shuttle.go index e630a5fcf61..4686d0e8474 100644 --- a/pkg/gen/primev3messages/update_m_t_o_service_item_international_shuttle.go +++ b/pkg/gen/primev3messages/update_m_t_o_service_item_international_shuttle.go @@ -22,11 +22,11 @@ import ( type UpdateMTOServiceItemInternationalShuttle struct { idField strfmt.UUID - // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` @@ -61,11 +61,11 @@ func (m *UpdateMTOServiceItemInternationalShuttle) SetModelType(val UpdateMTOSer func (m *UpdateMTOServiceItemInternationalShuttle) UnmarshalJSON(raw []byte) error { var data struct { - // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` @@ -124,11 +124,11 @@ func (m UpdateMTOServiceItemInternationalShuttle) MarshalJSON() ([]byte, error) var err error b1, err = json.Marshal(struct { - // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` diff --git a/pkg/handlers/primeapi/mto_service_item_test.go b/pkg/handlers/primeapi/mto_service_item_test.go index 4ee65d9e8ff..3584b61214e 100644 --- a/pkg/handlers/primeapi/mto_service_item_test.go +++ b/pkg/handlers/primeapi/mto_service_item_test.go @@ -179,7 +179,7 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { }, }, nil) mtoShipment.PrimeEstimatedWeight = nil - factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDOSHUT) + factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeIOSHUT) req := httptest.NewRequest("POST", "/mto-service-items", nil) reason := "lorem ipsum" diff --git a/pkg/handlers/primeapi/payloads/model_to_payload.go b/pkg/handlers/primeapi/payloads/model_to_payload.go index 4073342c326..b9d01e29980 100644 --- a/pkg/handlers/primeapi/payloads/model_to_payload.go +++ b/pkg/handlers/primeapi/payloads/model_to_payload.go @@ -787,7 +787,7 @@ func MTOServiceItem(mtoServiceItem *models.MTOServiceItem) primemessages.MTOServ ActualWeight: handlers.FmtPoundPtr(mtoServiceItem.ActualWeight), } - if mtoServiceItem.ReService.Code == models.ReServiceCodeIOSHUT && mtoServiceItem.MTOShipment.DestinationAddress != nil { + if mtoServiceItem.ReService.Code == models.ReServiceCodeIOSHUT && mtoServiceItem.MTOShipment.PickupAddress != nil { if *mtoServiceItem.MTOShipment.PickupAddress.IsOconus { shuttleSI.Market = models.MarketOconus.FullString() } else { diff --git a/pkg/handlers/primeapiv2/payloads/model_to_payload.go b/pkg/handlers/primeapiv2/payloads/model_to_payload.go index 96da3a56e13..8a7f5a23983 100644 --- a/pkg/handlers/primeapiv2/payloads/model_to_payload.go +++ b/pkg/handlers/primeapiv2/payloads/model_to_payload.go @@ -694,7 +694,7 @@ func MTOServiceItem(mtoServiceItem *models.MTOServiceItem) primev2messages.MTOSe ActualWeight: handlers.FmtPoundPtr(mtoServiceItem.ActualWeight), } - if mtoServiceItem.ReService.Code == models.ReServiceCodeIOSHUT && mtoServiceItem.MTOShipment.DestinationAddress != nil { + if mtoServiceItem.ReService.Code == models.ReServiceCodeIOSHUT && mtoServiceItem.MTOShipment.PickupAddress != nil { if *mtoServiceItem.MTOShipment.PickupAddress.IsOconus { shuttleSI.Market = models.MarketOconus.FullString() } else { diff --git a/pkg/handlers/primeapiv3/payloads/model_to_payload.go b/pkg/handlers/primeapiv3/payloads/model_to_payload.go index 43d6b9347af..5a5038d0da1 100644 --- a/pkg/handlers/primeapiv3/payloads/model_to_payload.go +++ b/pkg/handlers/primeapiv3/payloads/model_to_payload.go @@ -838,7 +838,7 @@ func MTOServiceItem(mtoServiceItem *models.MTOServiceItem) primev3messages.MTOSe ActualWeight: handlers.FmtPoundPtr(mtoServiceItem.ActualWeight), } - if mtoServiceItem.ReService.Code == models.ReServiceCodeIOSHUT && mtoServiceItem.MTOShipment.DestinationAddress != nil { + if mtoServiceItem.ReService.Code == models.ReServiceCodeIOSHUT && mtoServiceItem.MTOShipment.PickupAddress != nil { if *mtoServiceItem.MTOShipment.PickupAddress.IsOconus { shuttleSI.Market = models.MarketOconus.FullString() } else { diff --git a/src/components/PrimeUI/CreateShipmentServiceItemForm/CreateShipmentServiceItemForm.test.jsx b/src/components/PrimeUI/CreateShipmentServiceItemForm/CreateShipmentServiceItemForm.test.jsx index 55da98f0b2f..b8c5b5fcd91 100644 --- a/src/components/PrimeUI/CreateShipmentServiceItemForm/CreateShipmentServiceItemForm.test.jsx +++ b/src/components/PrimeUI/CreateShipmentServiceItemForm/CreateShipmentServiceItemForm.test.jsx @@ -91,6 +91,7 @@ describe('CreateShipmentServiceItemForm component', () => { ['shuttleSITServiceItemForm', createServiceItemModelTypes.MTOServiceItemShuttle], ['DomesticCratingForm', createServiceItemModelTypes.MTOServiceItemDomesticCrating], ['InternationalCratingForm', createServiceItemModelTypes.MTOServiceItemInternationalCrating], + ['InternationalShuttleSitServiceItemForm', createServiceItemModelTypes.MTOServiceItemInternationalShuttle], ])('renders %s after selecting %s type', async (formName, serviceItemType) => { isBooleanFlagEnabled.mockResolvedValue(true); const shipment = approvedMoveTaskOrder.moveTaskOrder.mtoShipments[0]; diff --git a/swagger-def/definitions/prime/MTOServiceItemInternationalShuttle.yaml b/swagger-def/definitions/prime/MTOServiceItemInternationalShuttle.yaml index ca5e94259b5..137aed40a02 100644 --- a/swagger-def/definitions/prime/MTOServiceItemInternationalShuttle.yaml +++ b/swagger-def/definitions/prime/MTOServiceItemInternationalShuttle.yaml @@ -7,10 +7,10 @@ allOf: type: string description: > A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) - or destination (`DDSHUT`). + or destination (`IDSHUT`). enum: - - IOSHUT # Domestic Origin Shuttle Service - - IDSHUT # Domestic Destination Shuttle Service + - IOSHUT # International Origin Shuttle Service + - IDSHUT # International Destination Shuttle Service reason: type: string example: Storage items need to be picked up. diff --git a/swagger-def/prime.yaml b/swagger-def/prime.yaml index e2539f59c94..aafe204d5e8 100644 --- a/swagger-def/prime.yaml +++ b/swagger-def/prime.yaml @@ -1671,13 +1671,13 @@ definitions: actualWeight: type: integer example: 4000 - description: Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + description: Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. x-nullable: true x-omitempty: false estimatedWeight: type: integer example: 4200 - description: An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + description: An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. x-nullable: true x-omitempty: false requestApprovalsRequestedStatus: diff --git a/swagger-def/prime_v2.yaml b/swagger-def/prime_v2.yaml index 8cc07cc5dee..b8b989e6a18 100644 --- a/swagger-def/prime_v2.yaml +++ b/swagger-def/prime_v2.yaml @@ -671,13 +671,13 @@ definitions: actualWeight: type: integer example: 4000 - description: Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + description: Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. x-nullable: true x-omitempty: false estimatedWeight: type: integer example: 4200 - description: An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + description: An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. x-nullable: true x-omitempty: false requestApprovalsRequestedStatus: diff --git a/swagger-def/prime_v3.yaml b/swagger-def/prime_v3.yaml index 46253ad2106..eb0f780b3a0 100644 --- a/swagger-def/prime_v3.yaml +++ b/swagger-def/prime_v3.yaml @@ -696,13 +696,13 @@ definitions: actualWeight: type: integer example: 4000 - description: Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + description: Provided by the movers, based on weight tickets. Relevant for shuttling (IDSHUT & IOSHUT) service items. x-nullable: true x-omitempty: false estimatedWeight: type: integer example: 4200 - description: An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + description: An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. x-nullable: true x-omitempty: false requestApprovalsRequestedStatus: diff --git a/swagger/prime.yaml b/swagger/prime.yaml index dc67d4c3312..40493128cc4 100644 --- a/swagger/prime.yaml +++ b/swagger/prime.yaml @@ -2300,7 +2300,7 @@ definitions: description: > A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or - destination (`DDSHUT`). + destination (`IDSHUT`). enum: - IOSHUT - IDSHUT @@ -2494,7 +2494,7 @@ definitions: example: 4000 description: >- Provided by the movers, based on weight tickets. Relevant for - shuttling (DDSHUT & DOSHUT) service items. + shuttling (IDSHUT & IOSHUT) service items. x-nullable: true x-omitempty: false estimatedWeight: @@ -2502,7 +2502,7 @@ definitions: example: 4200 description: >- An estimate of how much weight from a shipment will be included in - a shuttling (DDSHUT & DOSHUT) service item. + a shuttling (IDSHUT & IOSHUT) service item. x-nullable: true x-omitempty: false requestApprovalsRequestedStatus: diff --git a/swagger/prime_v2.yaml b/swagger/prime_v2.yaml index 8b35f7e30a9..b3b1fcb4deb 100644 --- a/swagger/prime_v2.yaml +++ b/swagger/prime_v2.yaml @@ -697,7 +697,7 @@ definitions: description: > A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or - destination (`DDSHUT`). + destination (`IDSHUT`). enum: - IOSHUT - IDSHUT @@ -1092,7 +1092,7 @@ definitions: example: 4000 description: >- Provided by the movers, based on weight tickets. Relevant for - shuttling (DDSHUT & DOSHUT) service items. + shuttling (IDSHUT & IOSHUT) service items. x-nullable: true x-omitempty: false estimatedWeight: @@ -1100,7 +1100,7 @@ definitions: example: 4200 description: >- An estimate of how much weight from a shipment will be included in - a shuttling (DDSHUT & DOSHUT) service item. + a shuttling (IDSHUT & IOSHUT) service item. x-nullable: true x-omitempty: false requestApprovalsRequestedStatus: diff --git a/swagger/prime_v3.yaml b/swagger/prime_v3.yaml index 088ebcc90af..d1c68dbaef1 100644 --- a/swagger/prime_v3.yaml +++ b/swagger/prime_v3.yaml @@ -674,7 +674,7 @@ definitions: description: > A unique code for the service item. Indicates if shuttling is requested for the international shipment origin (`IOSHUT`) or - destination (`DDSHUT`). + destination (`IDSHUT`). enum: - IOSHUT - IDSHUT @@ -1111,7 +1111,7 @@ definitions: example: 4000 description: >- Provided by the movers, based on weight tickets. Relevant for - shuttling (DDSHUT & DOSHUT) service items. + shuttling (IDSHUT & IOSHUT) service items. x-nullable: true x-omitempty: false estimatedWeight: @@ -1119,7 +1119,7 @@ definitions: example: 4200 description: >- An estimate of how much weight from a shipment will be included in - a shuttling (DDSHUT & DOSHUT) service item. + a shuttling (IDSHUT & IOSHUT) service item. x-nullable: true x-omitempty: false requestApprovalsRequestedStatus: