-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into adh-MB-16500-chi-routing
- Loading branch information
Showing
23 changed files
with
686 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| golang 1.20.5 | ||
| nodejs 18.13.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
pkg/services/ghcrateengine/domestic_destination_sit_fuel_surcharge_pricer.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| package ghcrateengine | ||
|
|
||
| import ( | ||
| "database/sql" | ||
| "fmt" | ||
| "math" | ||
| "time" | ||
|
|
||
| "github.com/gofrs/uuid" | ||
| "github.com/pkg/errors" | ||
|
|
||
| "github.com/transcom/mymove/pkg/appcontext" | ||
| "github.com/transcom/mymove/pkg/apperror" | ||
| "github.com/transcom/mymove/pkg/models" | ||
| "github.com/transcom/mymove/pkg/services" | ||
| "github.com/transcom/mymove/pkg/unit" | ||
| ) | ||
|
|
||
| type domesticDestinationSITFuelSurchargePricer struct { | ||
| } | ||
|
|
||
| func NewDomesticDestinationSITFuelSurchargePricer() services.DomesticDestinationSITFuelSurchargePricer { | ||
| return &domesticDestinationSITFuelSurchargePricer{} | ||
| } | ||
|
|
||
| func (p domesticDestinationSITFuelSurchargePricer) Price(_ appcontext.AppContext, actualPickupDate time.Time, distance unit.Miles, weight unit.Pound, fscWeightBasedDistanceMultiplier float64, eiaFuelPrice unit.Millicents, isPPM bool) (unit.Cents, services.PricingDisplayParams, error) { | ||
| // Validate parameters | ||
| if actualPickupDate.IsZero() { | ||
| return 0, nil, errors.New("ActualPickupDate is required") | ||
| } | ||
| if distance <= 0 { | ||
| return 0, nil, errors.New("Distance must be greater than 0") | ||
| } | ||
| if !isPPM && weight < minDomesticWeight { | ||
| return 0, nil, fmt.Errorf("Weight must be a minimum of %d", minDomesticWeight) | ||
| } | ||
| if fscWeightBasedDistanceMultiplier == 0 { | ||
| return 0, nil, errors.New("WeightBasedDistanceMultiplier is required") | ||
| } | ||
| if eiaFuelPrice == 0 { | ||
| return 0, nil, errors.New("EIAFuelPrice is required") | ||
| } | ||
|
|
||
| fscPriceDifferenceInCents := (eiaFuelPrice - baseGHCDieselFuelPrice).Float64() / 1000.0 | ||
| fscMultiplier := fscWeightBasedDistanceMultiplier * distance.Float64() | ||
| fscPrice := fscMultiplier * fscPriceDifferenceInCents * 100 | ||
| totalCost := unit.Cents(math.Round(fscPrice)) | ||
|
|
||
| displayParams := services.PricingDisplayParams{ | ||
| {Key: models.ServiceItemParamNameFSCPriceDifferenceInCents, Value: FormatFloat(fscPriceDifferenceInCents, 1)}, | ||
| {Key: models.ServiceItemParamNameFSCMultiplier, Value: FormatFloat(fscMultiplier, 7)}, | ||
| } | ||
|
|
||
| return totalCost, displayParams, nil | ||
| } | ||
|
|
||
| func (p domesticDestinationSITFuelSurchargePricer) PriceUsingParams(appCtx appcontext.AppContext, params models.PaymentServiceItemParams) (unit.Cents, services.PricingDisplayParams, error) { | ||
| actualPickupDate, err := getParamTime(params, models.ServiceItemParamNameActualPickupDate) | ||
| if err != nil { | ||
| return unit.Cents(0), nil, err | ||
| } | ||
|
|
||
| var paymentServiceItem models.PaymentServiceItem | ||
| mtoShipment := params[0].PaymentServiceItem.MTOServiceItem.MTOShipment | ||
|
|
||
| if mtoShipment.ID == uuid.Nil { | ||
| err = appCtx.DB().Eager("MTOServiceItem", "MTOServiceItem.MTOShipment").Find(&paymentServiceItem, params[0].PaymentServiceItemID) | ||
| if err != nil { | ||
| switch err { | ||
| case sql.ErrNoRows: | ||
| return unit.Cents(0), nil, apperror.NewNotFoundError(params[0].PaymentServiceItemID, "looking for PaymentServiceItem") | ||
| default: | ||
| return unit.Cents(0), nil, apperror.NewQueryError("PaymentServiceItem", err, "") | ||
| } | ||
| } | ||
| mtoShipment = paymentServiceItem.MTOServiceItem.MTOShipment | ||
| } | ||
|
|
||
| distance, err := getParamInt(params, models.ServiceItemParamNameDistanceZipSITDest) | ||
| if err != nil { | ||
| return unit.Cents(0), nil, err | ||
| } | ||
|
|
||
| weightBilled, err := getParamInt(params, models.ServiceItemParamNameWeightBilled) | ||
| if err != nil { | ||
| return unit.Cents(0), nil, err | ||
| } | ||
|
|
||
| fscWeightBasedDistanceMultiplier, err := getParamFloat(params, models.ServiceItemParamNameFSCWeightBasedDistanceMultiplier) | ||
| if err != nil { | ||
| return unit.Cents(0), nil, err | ||
| } | ||
|
|
||
| eiaFuelPrice, err := getParamInt(params, models.ServiceItemParamNameEIAFuelPrice) | ||
| if err != nil { | ||
| return unit.Cents(0), nil, err | ||
| } | ||
|
|
||
| var isPPM = false | ||
| if params[0].PaymentServiceItem.MTOServiceItem.MTOShipment.ShipmentType == models.MTOShipmentTypePPM { | ||
| // PPMs do not require minimums for a shipment's weight | ||
| // this flag is passed into the Price function to ensure the weight min | ||
| // are not enforced for PPMs | ||
| isPPM = true | ||
| } | ||
|
|
||
| return p.Price(appCtx, actualPickupDate, unit.Miles(distance), unit.Pound(weightBilled), fscWeightBasedDistanceMultiplier, unit.Millicents(eiaFuelPrice), isPPM) | ||
| } |
Oops, something went wrong.