Merge pull request #14283 from transcom/B-21464-INT

B 21464 int #2
transcom · Nov 26, 2024 · 712f409 · 712f409
2 parents 1fd1541 + b418714
commit 712f409
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/pkg/services/shipment_address_update/shipment_address_update_requester.go b/pkg/services/shipment_address_update/shipment_address_update_requester.go
@@ -500,32 +500,34 @@ func (f *shipmentAddressUpdateRequester) ReviewShipmentAddressChange(appCtx appc
 		shipmentHasApprovedDestSIT := f.doesShipmentContainApprovedDestinationSIT(shipmentDetails)
 
 		for i, serviceItem := range shipmentDetails.MTOServiceItems {
-			var updatedServiceItem *models.MTOServiceItem
-			if serviceItem.ReService.Code == models.ReServiceCodeDDP || serviceItem.ReService.Code == models.ReServiceCodeDUPK {
-				updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt))
-				if err != nil {
-					return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error())
-				}
-			}
-
-			if !shipmentHasApprovedDestSIT {
-				if serviceItem.ReService.Code == models.ReServiceCodeDLH || serviceItem.ReService.Code == models.ReServiceCodeFSC {
+			if serviceItem.MTOShipment.PrimeEstimatedWeight != nil || serviceItem.MTOShipment.PrimeActualWeight != nil {
+				var updatedServiceItem *models.MTOServiceItem
+				if serviceItem.ReService.Code == models.ReServiceCodeDDP || serviceItem.ReService.Code == models.ReServiceCodeDUPK {
 					updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt))
 					if err != nil {
 						return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error())
 					}
 				}
-			} else {
-				if serviceItem.ReService.Code == models.ReServiceCodeDDSFSC || serviceItem.ReService.Code == models.ReServiceCodeDDDSIT {
-					updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt))
-					if err != nil {
-						return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error())
+
+				if !shipmentHasApprovedDestSIT {
+					if serviceItem.ReService.Code == models.ReServiceCodeDLH || serviceItem.ReService.Code == models.ReServiceCodeFSC {
+						updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt))
+						if err != nil {
+							return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error())
+						}
+					}
+				} else {
+					if serviceItem.ReService.Code == models.ReServiceCodeDDSFSC || serviceItem.ReService.Code == models.ReServiceCodeDDDSIT {
+						updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt))
+						if err != nil {
+							return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error())
+						}
 					}
 				}
-			}
 
-			if updatedServiceItem != nil {
-				shipmentDetails.MTOServiceItems[i] = *updatedServiceItem
+				if updatedServiceItem != nil {
+					shipmentDetails.MTOServiceItems[i] = *updatedServiceItem
+				}
 			}
 		}