Skip to content

Commit

Permalink
Merge pull request #12975 from transcom/B-19888-estimate-price-MAIN
Browse files Browse the repository at this point in the history 
B 19888 estimate price main
  • Loading branch information
@deandreJones
deandreJones authored Jun 7, 2024
2 parents 5d7a516 + 8934b50 commit 9dad858
Show file tree
Hide file tree
Showing 32 changed files with 497 additions and 128 deletions.
3 changes: 2 additions & 1 deletion pkg/handlers/adminapi/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/transcom/mymove/pkg/services/clientcert"
electronicorder "github.com/transcom/mymove/pkg/services/electronic_order"
fetch "github.com/transcom/mymove/pkg/services/fetch"
"github.com/transcom/mymove/pkg/services/ghcrateengine"
move "github.com/transcom/mymove/pkg/services/move"
movetaskorder "github.com/transcom/mymove/pkg/services/move_task_order"
mtoserviceitem "github.com/transcom/mymove/pkg/services/mto_service_item"
Expand Down Expand Up @@ -196,7 +197,7 @@ func NewAdminAPI(handlerConfig handlers.HandlerConfig) *adminops.MymoveAPI {
handlerConfig,
movetaskorder.NewMoveTaskOrderUpdater(
queryBuilder,
mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), queryBuilder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveRouter,
),
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/handlers/adminapi/moves_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/transcom/mymove/pkg/models"
routemocks "github.com/transcom/mymove/pkg/route/mocks"
"github.com/transcom/mymove/pkg/services"
"github.com/transcom/mymove/pkg/services/ghcrateengine"
"github.com/transcom/mymove/pkg/services/mocks"
"github.com/transcom/mymove/pkg/services/move"
movetaskorder "github.com/transcom/mymove/pkg/services/move_task_order"
Expand Down Expand Up @@ -96,7 +97,7 @@ func (suite *HandlerSuite) TestUpdateMoveHandler() {
suite.HandlerConfig(),
movetaskorder.NewMoveTaskOrderUpdater(
builder,
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveRouter,
),
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/handlers/ghcapi/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI {
newRolesFetcher := roles.NewRolesFetcher()
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
queryBuilder,
mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), queryBuilder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveRouter,
)
SSWPPMComputer := shipmentsummaryworksheet.NewSSWPPMComputer()
Expand Down Expand Up @@ -364,7 +364,7 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI {
handlerConfig,
mtoshipment.NewShipmentApprover(
mtoshipment.NewShipmentRouter(),
mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), queryBuilder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
handlerConfig.HHGPlanner(),
move.NewMoveWeights(mtoshipment.NewShipmentReweighRequester()),
),
Expand Down
9 changes: 5 additions & 4 deletions pkg/handlers/ghcapi/move_task_order_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/transcom/mymove/pkg/models/roles"
"github.com/transcom/mymove/pkg/notifications"
routemocks "github.com/transcom/mymove/pkg/route/mocks"
"github.com/transcom/mymove/pkg/services/ghcrateengine"
"github.com/transcom/mymove/pkg/services/mocks"
moverouter "github.com/transcom/mymove/pkg/services/move"
movetaskorder "github.com/transcom/mymove/pkg/services/move_task_order"
Expand Down Expand Up @@ -120,7 +121,7 @@ func (suite *HandlerSuite) TestUpdateMoveTaskOrderHandlerIntegrationSuccess() {
mock.Anything,
mock.Anything,
).Return(400, nil)
siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter)
siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())

// setup the handler
handler := UpdateMoveTaskOrderStatusHandlerFunc{handlerConfig,
Expand Down Expand Up @@ -242,7 +243,7 @@ func (suite *HandlerSuite) TestUpdateMoveTaskOrderHandlerIntegrationWithIncomple
mock.Anything,
mock.Anything,
).Return(400, nil)
siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter)
siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())

// make the request
handler := UpdateMoveTaskOrderStatusHandlerFunc{handlerConfig,
Expand Down Expand Up @@ -278,7 +279,7 @@ func (suite *HandlerSuite) TestUpdateMTOStatusServiceCounselingCompletedHandler(
mock.Anything,
mock.Anything,
).Return(400, nil)
siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter)
siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())
handler := UpdateMTOStatusServiceCounselingCompletedHandlerFunc{
handlerConfig,
movetaskorder.NewMoveTaskOrderUpdater(queryBuilder, siCreator, moveRouter),
Expand Down Expand Up @@ -496,7 +497,7 @@ func (suite *HandlerSuite) TestUpdateMoveTIORemarksHandler() {
mock.Anything,
mock.Anything,
).Return(400, nil)
siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter)
siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())
handler := UpdateMoveTIORemarksHandlerFunc{
handlerConfig,
movetaskorder.NewMoveTaskOrderUpdater(queryBuilder, siCreator, moveRouter),
Expand Down
18 changes: 9 additions & 9 deletions pkg/handlers/ghcapi/mto_shipment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ func (suite *HandlerSuite) TestApproveShipmentHandler() {
).Return(400, nil)
approver := mtoshipment.NewShipmentApprover(
mtoshipment.NewShipmentRouter(),
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
&routemocks.Planner{},
moveWeights,
)
Expand Down Expand Up @@ -3113,7 +3113,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() {
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveRouter,
)
shipmentCreator := shipmentorchestrator.NewShipmentCreator(creator, ppmCreator, shipmentRouter, moveTaskOrderUpdater)
Expand Down Expand Up @@ -3195,7 +3195,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() {
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveRouter,
)
shipmentCreator := shipmentorchestrator.NewShipmentCreator(creator, ppmCreator, shipmentRouter, moveTaskOrderUpdater)
Expand Down Expand Up @@ -3249,7 +3249,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() {
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveRouter,
)
shipmentCreator := shipmentorchestrator.NewShipmentCreator(creator, ppmCreator, shipmentRouter, moveTaskOrderUpdater)
Expand Down Expand Up @@ -3299,7 +3299,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() {
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveRouter,
)
shipmentCreator := shipmentorchestrator.NewShipmentCreator(creator, ppmCreator, shipmentRouter, moveTaskOrderUpdater)
Expand Down Expand Up @@ -3344,7 +3344,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() {
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveRouter,
)
shipmentCreator := shipmentorchestrator.NewShipmentCreator(creator, ppmCreator, shipmentRouter, moveTaskOrderUpdater)
Expand Down Expand Up @@ -3400,7 +3400,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandlerUsingPPM() {
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveservices.NewMoveRouter()),
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveservices.NewMoveRouter(), ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveservices.NewMoveRouter(),
)
shipmentCreator := shipmentorchestrator.NewShipmentCreator(creator, ppmCreator, shipmentRouter, moveTaskOrderUpdater)
Expand Down Expand Up @@ -3604,7 +3604,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandlerUsingPPM() {
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveservices.NewMoveRouter()),
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveservices.NewMoveRouter(), ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveservices.NewMoveRouter(),
)
shipmentCreator := shipmentorchestrator.NewShipmentCreator(creator, ppmshipment.NewPPMShipmentCreator(&ppmEstimator, addressCreator), shipmentRouter, moveTaskOrderUpdater)
Expand Down Expand Up @@ -3746,7 +3746,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandlerUsingPPM() {
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveservices.NewMoveRouter()),
mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveservices.NewMoveRouter(), ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveservices.NewMoveRouter(),
)
shipmentCreator := shipmentorchestrator.NewShipmentCreator(creator, ppmshipment.NewPPMShipmentCreator(&ppmEstimator, addressCreator), shipmentRouter, moveTaskOrderUpdater)
Expand Down
3 changes: 2 additions & 1 deletion pkg/handlers/ghcapi/orders_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/transcom/mymove/pkg/models"
"github.com/transcom/mymove/pkg/models/roles"
routemocks "github.com/transcom/mymove/pkg/route/mocks"
"github.com/transcom/mymove/pkg/services/ghcrateengine"
"github.com/transcom/mymove/pkg/services/mocks"
moverouter "github.com/transcom/mymove/pkg/services/move"
movetaskorder "github.com/transcom/mymove/pkg/services/move_task_order"
Expand Down Expand Up @@ -317,7 +318,7 @@ func (suite *HandlerSuite) TestUpdateOrderHandlerWithAmendedUploads() {
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
queryBuilder,
mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveRouter,
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/handlers/internalapi/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func NewInternalAPI(handlerConfig handlers.HandlerConfig) *internalops.MymoveAPI
shipmentRouter := mtoshipment.NewShipmentRouter()
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), builder, moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
moveRouter,
)
shipmentCreator := shipment.NewShipmentCreator(mtoShipmentCreator, ppmshipment.NewPPMShipmentCreator(ppmEstimator, addressCreator), shipmentRouter, moveTaskOrderUpdater)
Expand Down
2 changes: 1 addition & 1 deletion pkg/handlers/internalapi/mto_shipment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandlerV1() {
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
testMTOShipmentObjects.builder,
mtoserviceitem.NewMTOServiceItemCreator(planner, testMTOShipmentObjects.builder, testMTOShipmentObjects.moveRouter),
mtoserviceitem.NewMTOServiceItemCreator(planner, testMTOShipmentObjects.builder, testMTOShipmentObjects.moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()),
testMTOShipmentObjects.moveRouter,
)
shipmentCreator := shipmentorchestrator.NewShipmentCreator(mtoShipmentCreator, ppmShipmentCreator, shipmentRouter, moveTaskOrderUpdater)
Expand Down
Loading

0 comments on commit 9dad858

Please sign in to comment.