Skip to content

Commit

Permalink
Merge pull request #14846 from transcom/MAIN-B-22267
Browse files Browse the repository at this point in the history 
MAIN B-22267
  • Loading branch information
@cameroncaci
cameroncaci authored Mar 6, 2025
2 parents 5ac04ce + 9f58be8 commit 5566dce
Show file tree
Hide file tree
Showing 67 changed files with 188 additions and 614 deletions.
1 change: 0 additions & 1 deletion pkg/handlers/adminapi/moves_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ func (suite *HandlerSuite) TestUpdateMoveHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
return UpdateMoveHandler{
suite.HandlerConfig(),
Expand Down
4 changes: 0 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 @@ -191,7 +191,6 @@ func (suite *HandlerSuite) TestUpdateMoveTaskOrderHandlerIntegrationSuccess() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())

Expand Down Expand Up @@ -314,7 +313,6 @@ func (suite *HandlerSuite) TestUpdateMoveTaskOrderHandlerIntegrationWithIncomple
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)

setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator {
Expand Down Expand Up @@ -403,7 +401,6 @@ func (suite *HandlerSuite) TestUpdateMTOStatusServiceCounselingCompletedHandler(
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())
handler := UpdateMTOStatusServiceCounselingCompletedHandlerFunc{
Expand Down Expand Up @@ -623,7 +620,6 @@ func (suite *HandlerSuite) TestUpdateMoveTIORemarksHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)

setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator {
Expand Down
4 changes: 0 additions & 4 deletions pkg/handlers/ghcapi/mto_service_items_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,6 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)

Expand Down Expand Up @@ -660,7 +659,6 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
mtoServiceItemStatusUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())

Expand Down Expand Up @@ -722,7 +720,6 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
mtoServiceItemStatusUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())

Expand Down Expand Up @@ -859,7 +856,6 @@ func (suite *HandlerSuite) TestUpdateServiceItemSitEntryDateHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)

Expand Down
27 changes: 0 additions & 27 deletions pkg/handlers/ghcapi/mto_shipment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -615,15 +615,12 @@ func (suite *HandlerSuite) TestApproveShipmentHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
false,
).Return(400, nil)
ppmEstimator := mocks.PPMEstimator{}
planner.On("ZipTransitDistance",
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
Expand Down Expand Up @@ -661,7 +658,6 @@ func (suite *HandlerSuite) TestApproveShipmentHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
approver := mtoshipment.NewShipmentApprover(
mtoshipment.NewShipmentRouter(),
Expand Down Expand Up @@ -979,16 +975,13 @@ func (suite *HandlerSuite) TestApproveShipmentsHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
false,
).Return(400, nil)

ppmEstimator := mocks.PPMEstimator{}
planner.On("ZipTransitDistance",
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
Expand Down Expand Up @@ -2649,7 +2642,6 @@ func (suite *HandlerSuite) TestRequestShipmentReweighHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)
Expand Down Expand Up @@ -2708,7 +2700,6 @@ func (suite *HandlerSuite) TestRequestShipmentReweighHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)
Expand Down Expand Up @@ -2764,7 +2755,6 @@ func (suite *HandlerSuite) TestRequestShipmentReweighHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)
Expand Down Expand Up @@ -2821,7 +2811,6 @@ func (suite *HandlerSuite) TestRequestShipmentReweighHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)
Expand Down Expand Up @@ -2879,7 +2868,6 @@ func (suite *HandlerSuite) TestRequestShipmentReweighHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)
Expand Down Expand Up @@ -2936,7 +2924,6 @@ func (suite *HandlerSuite) TestRequestShipmentReweighHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)
Expand Down Expand Up @@ -3277,7 +3264,6 @@ func (suite *HandlerSuite) TestApproveSITExtensionHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)

Expand Down Expand Up @@ -3420,7 +3406,6 @@ func (suite *HandlerSuite) CreateApprovedSITDurationUpdate() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)

Expand Down Expand Up @@ -3504,7 +3489,6 @@ func (suite *HandlerSuite) CreateApprovedSITDurationUpdate() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)

Expand Down Expand Up @@ -3678,7 +3662,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
Expand Down Expand Up @@ -3763,7 +3746,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
Expand Down Expand Up @@ -3820,7 +3802,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
Expand Down Expand Up @@ -3873,7 +3854,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
Expand Down Expand Up @@ -3921,7 +3901,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
Expand Down Expand Up @@ -4006,7 +3985,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandlerUsingPPM() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)

moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
Expand Down Expand Up @@ -4218,7 +4196,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandlerUsingPPM() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
Expand Down Expand Up @@ -4369,7 +4346,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandlerUsingPPM() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater(
builder,
Expand Down Expand Up @@ -4576,7 +4552,6 @@ func (suite *HandlerSuite) TestUpdateShipmentHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
moveWeights := moveservices.NewMoveWeights(mtoshipment.NewShipmentReweighRequester(), waf)
Expand Down Expand Up @@ -5245,7 +5220,6 @@ func (suite *HandlerSuite) TestUpdateSITServiceItemCustomerExpenseHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())
req := httptest.NewRequest("PATCH", fmt.Sprintf("/shipments/%s/sit-service-item/convert-to-customer-expense", approvedShipment.ID.String()), nil)
Expand Down Expand Up @@ -5322,7 +5296,6 @@ func (suite *HandlerSuite) TestUpdateSITServiceItemCustomerExpenseHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())
req := httptest.NewRequest("PATCH", fmt.Sprintf("/shipments/%s/sit-service-item/convert-to-customer-expense", approvedShipment.ID.String()), nil)
Expand Down
1 change: 0 additions & 1 deletion pkg/handlers/ghcapi/orders_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,6 @@ func (suite *HandlerSuite) TestUpdateOrderHandlerWithAmendedUploads() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)

setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator {
Expand Down
2 changes: 1 addition & 1 deletion pkg/handlers/ghcapi/ppm_shipment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ func (suite *HandlerSuite) TestGetPPMSITEstimatedCostHandler() {

ppmShipment.DestinationAddress = destinationAddress
mockedPlanner := &routemocks.Planner{}
mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "90210", "30813", false).Return(2294, nil)
mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "90210", "30813").Return(2294, nil)
}
setupData()

Expand Down
1 change: 0 additions & 1 deletion pkg/handlers/internalapi/mto_shipment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandlerV1() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)

setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator {
Expand Down
Loading

0 comments on commit 5566dce

Please sign in to comment.