Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

B 21464 int v2 #14719

Merged
merged 11 commits into from
Feb 3, 2025
Merged

B 21464 int v2 #14719

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
40c8b9d
Updating pricing to use 110% weight
CoryKleinjanCACI Jan 31, 2025
44939bc
Merge branch 'B-21464-MAIN' into B-21464-INT-V2
CoryKleinjanCACI Jan 31, 2025
6acbac9
Merge branch 'integrationTesting' into B-21464-INT-V2
CoryKleinjanCACI Jan 31, 2025
a63e374
removing duplicate call
CoryKleinjanCACI Jan 31, 2025
b348217
Merge branch 'B-21464-MAIN' into B-21464-INT-V2
CoryKleinjanCACI Jan 31, 2025
5439bdc
Merge branch 'B-21464-INT-V2' of https://github.com/transcom/mymove i…
CoryKleinjanCACI Jan 31, 2025
ebbb612
Merge branch 'integrationTesting' into B-21464-INT-V2
CoryKleinjanCACI Jan 31, 2025
aa134f9
Merge branch 'integrationTesting' into B-21464-INT-V2
CoryKleinjanCACI Feb 3, 2025
c3127b5
Merge branch 'integrationTesting' into B-21464-INT-V2
CoryKleinjanCACI Feb 3, 2025
fd50c71
Merge branch 'integrationTesting' into B-21464-INT-V2
CoryKleinjanCACI Feb 3, 2025
0506297
Merge branch 'integrationTesting' into B-21464-INT-V2
CoryKleinjanCACI Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions pkg/services/mto_service_item/mto_service_item_updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext,
}
}

price, _, err = p.destinationPricer.Price(appCtx, contractCode, *pickupDate, shipmentWeight, domesticServiceArea.ServiceArea, isPPM)
adjustedWeight := GetAdjustedWeight(shipmentWeight, mtoShipment.ShipmentType == models.MTOShipmentTypeUnaccompaniedBaggage)
price, _, err = p.destinationPricer.Price(appCtx, contractCode, *pickupDate, *adjustedWeight, domesticServiceArea.ServiceArea, isPPM)
if err != nil {
return 0, err
}
Expand All @@ -198,7 +199,9 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext,
return 0, err
}
}
price, _, err = p.linehaulPricer.Price(appCtx, contractCode, *pickupDate, unit.Miles(distance), shipmentWeight, domesticServiceArea.ServiceArea, isPPM)

adjustedWeight := GetAdjustedWeight(shipmentWeight, mtoShipment.ShipmentType == models.MTOShipmentTypeUnaccompaniedBaggage)
price, _, err = p.linehaulPricer.Price(appCtx, contractCode, *pickupDate, unit.Miles(distance), *adjustedWeight, domesticServiceArea.ServiceArea, isPPM)
if err != nil {
return 0, err
}
Expand All @@ -209,7 +212,9 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext,
if err != nil {
return 0, err
}
price, _, err = p.unpackPricer.Price(appCtx, contractCode, *pickupDate, shipmentWeight, domesticServiceArea.ServicesSchedule, isPPM)

adjustedWeight := GetAdjustedWeight(shipmentWeight, mtoShipment.ShipmentType == models.MTOShipmentTypeUnaccompaniedBaggage)
price, _, err = p.unpackPricer.Price(appCtx, contractCode, *pickupDate, *adjustedWeight, domesticServiceArea.ServicesSchedule, isPPM)
if err != nil {
return 0, err
}
Expand All @@ -235,7 +240,9 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext,
if err != nil {
return 0, err
}
price, _, err = p.fuelSurchargePricer.Price(appCtx, *pickupDate, unit.Miles(distance), shipmentWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM)

adjustedWeight := GetAdjustedWeight(shipmentWeight, mtoShipment.ShipmentType == models.MTOShipmentTypeUnaccompaniedBaggage)
price, _, err = p.fuelSurchargePricer.Price(appCtx, *pickupDate, unit.Miles(distance), *adjustedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM)
if err != nil {
return 0, err
}
Expand Down