Merge pull request #13482 from transcom/B-20723

B-20723 / B-20726
transcom · Aug 16, 2024 · 10a42c5 · 10a42c5
2 parents 61690c1 + af33158
commit 10a42c5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/pkg/handlers/ghcapi/mto_shipment.go b/pkg/handlers/ghcapi/mto_shipment.go
@@ -215,6 +215,11 @@ func (h CreateMTOShipmentHandler) Handle(params mtoshipmentops.CreateMTOShipment
 
 			mtoShipment := payloads.MTOShipmentModelFromCreate(payload)
 
+			if mtoShipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom && mtoShipment.NTSRecordedWeight != nil {
+				previouslyRecordedWeight := *mtoShipment.NTSRecordedWeight
+				mtoShipment.PrimeEstimatedWeight = &previouslyRecordedWeight
+			}
+
 			var err error
 			mtoShipment, err = h.shipmentCreator.CreateShipment(appCtx, mtoShipment)
 
@@ -338,6 +343,12 @@ func (h UpdateShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipmentPar
 					), err
 				}
 			}
+
+			if mtoShipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom && mtoShipment.NTSRecordedWeight != nil {
+				previouslyRecordedWeight := *mtoShipment.NTSRecordedWeight
+				mtoShipment.PrimeEstimatedWeight = &previouslyRecordedWeight
+			}
+
 			updatedMtoShipment, err := h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "ghc")
 			if err != nil {
 				return handleError(err)

diff --git a/pkg/services/mto_shipment/shipment_billable_weight.go b/pkg/services/mto_shipment/shipment_billable_weight.go
@@ -65,7 +65,7 @@ func (f *shipmentBillableWeightCalculator) CalculateShipmentBillableWeight(shipm
 			if shipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom && shipment.NTSRecordedWeight != nil {
 				adjustedRecordedWeight := unit.Pound(shipment.NTSRecordedWeight.Float64() * float64(1.1))
 				if adjustedRecordedWeight < *shipment.PrimeActualWeight {
-					calculatedWeight = shipment.NTSRecordedWeight
+					calculatedWeight = &adjustedRecordedWeight
 				}
 			}
 		}