diff --git a/pkg/handlers/adminapi/moves_test.go b/pkg/handlers/adminapi/moves_test.go index 0534395fa67..222c396d434 100644 --- a/pkg/handlers/adminapi/moves_test.go +++ b/pkg/handlers/adminapi/moves_test.go @@ -118,7 +118,6 @@ func (suite *HandlerSuite) TestUpdateMoveHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) return UpdateMoveHandler{ suite.HandlerConfig(), diff --git a/pkg/handlers/ghcapi/move_task_order_test.go b/pkg/handlers/ghcapi/move_task_order_test.go index 8efd6c23115..736a0bd9bf4 100644 --- a/pkg/handlers/ghcapi/move_task_order_test.go +++ b/pkg/handlers/ghcapi/move_task_order_test.go @@ -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()) @@ -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 { @@ -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{ @@ -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 { diff --git a/pkg/handlers/ghcapi/mto_service_items_test.go b/pkg/handlers/ghcapi/mto_service_items_test.go index 175e643defa..a01b3f7b8fc 100644 --- a/pkg/handlers/ghcapi/mto_service_items_test.go +++ b/pkg/handlers/ghcapi/mto_service_items_test.go @@ -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) @@ -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()) @@ -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()) @@ -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) diff --git a/pkg/handlers/ghcapi/mto_shipment_test.go b/pkg/handlers/ghcapi/mto_shipment_test.go index f198b78ed88..353f4c655e0 100644 --- a/pkg/handlers/ghcapi/mto_shipment_test.go +++ b/pkg/handlers/ghcapi/mto_shipment_test.go @@ -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, @@ -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(), @@ -979,8 +975,6 @@ func (suite *HandlerSuite) TestApproveShipmentsHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, - false, ).Return(400, nil) ppmEstimator := mocks.PPMEstimator{} @@ -988,7 +982,6 @@ func (suite *HandlerSuite) TestApproveShipmentsHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( builder, @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -3678,7 +3662,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( builder, @@ -3763,7 +3746,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( builder, @@ -3820,7 +3802,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( builder, @@ -3873,7 +3854,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( builder, @@ -3921,7 +3901,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( builder, @@ -4006,7 +3985,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandlerUsingPPM() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( @@ -4218,7 +4196,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandlerUsingPPM() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( builder, @@ -4369,7 +4346,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandlerUsingPPM() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( builder, @@ -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) @@ -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) @@ -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) diff --git a/pkg/handlers/ghcapi/orders_test.go b/pkg/handlers/ghcapi/orders_test.go index 55181598151..9b653329fb3 100644 --- a/pkg/handlers/ghcapi/orders_test.go +++ b/pkg/handlers/ghcapi/orders_test.go @@ -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 { diff --git a/pkg/handlers/ghcapi/ppm_shipment_test.go b/pkg/handlers/ghcapi/ppm_shipment_test.go index c4a2bbc0834..a635a4f1a3b 100644 --- a/pkg/handlers/ghcapi/ppm_shipment_test.go +++ b/pkg/handlers/ghcapi/ppm_shipment_test.go @@ -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() diff --git a/pkg/handlers/internalapi/mto_shipment_test.go b/pkg/handlers/internalapi/mto_shipment_test.go index be712ea4d5c..e4d6f0cd3a1 100644 --- a/pkg/handlers/internalapi/mto_shipment_test.go +++ b/pkg/handlers/internalapi/mto_shipment_test.go @@ -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 { diff --git a/pkg/handlers/ordersapi/post_revision_test.go b/pkg/handlers/ordersapi/post_revision_test.go index a3cdc206db5..6b9fc9032d6 100644 --- a/pkg/handlers/ordersapi/post_revision_test.go +++ b/pkg/handlers/ordersapi/post_revision_test.go @@ -4,9 +4,6 @@ import ( "net/http" "net/http/httptest" "testing" - "time" - - "github.com/gofrs/uuid" "github.com/transcom/mymove/pkg/gen/ordersapi/ordersoperations" "github.com/transcom/mymove/pkg/gen/ordersmessages" @@ -14,151 +11,6 @@ import ( "github.com/transcom/mymove/pkg/models" ) -func (suite *HandlerSuite) TestPostRevision() { - req := httptest.NewRequest("POST", "/orders/v1/orders", nil) - clientCert := models.ClientCert{ - AllowOrdersAPI: true, - AllowAirForceOrdersWrite: true, - } - req = suite.AuthenticateClientCertRequest(req, &clientCert) - - seqNum := int64(0) - hasDependents := true - rev := ordersmessages.Revision{ - SeqNum: &seqNum, - Member: &ordersmessages.Member{ - GivenName: "First", - FamilyName: "Last", - Affiliation: ordersmessages.NewAffiliation(ordersmessages.AffiliationAIRFORCE), - Rank: ordersmessages.NewRank(ordersmessages.RankWDash1), - }, - Status: ordersmessages.NewStatus(ordersmessages.StatusAuthorized), - DateIssued: handlers.FmtDateTime(time.Now()), - NoCostMove: false, - TdyEnRoute: false, - TourType: ordersmessages.TourTypeAccompanied, - OrdersType: ordersmessages.NewOrdersType(ordersmessages.OrdersTypeSeparation), - HasDependents: &hasDependents, - LosingUnit: &ordersmessages.Unit{ - Uic: handlers.FmtString("FFFS00"), - Name: handlers.FmtString("SPC721 COMMUNICATIONS SQ"), - City: handlers.FmtString("CHEYENNE MTN"), - Locality: handlers.FmtString("CO"), - PostalCode: handlers.FmtString("80914"), - }, - PcsAccounting: &ordersmessages.Accounting{ - Tac: handlers.FmtString("F67C"), - }, - } - - params := ordersoperations.PostRevisionParams{ - HTTPRequest: req, - Issuer: string(ordersmessages.IssuerAirDashForce), - MemberID: "1234567890", - OrdersNum: "8675309", - Revision: &rev, - } - - handler := PostRevisionHandler{suite.HandlerConfig()} - suite.T().Run("NewSuccess", func(_ *testing.T) { - response := handler.Handle(params) - - suite.IsType(&ordersoperations.PostRevisionCreated{}, response) - createdResponse, ok := response.(*ordersoperations.PostRevisionCreated) - if !ok { - return - } - id, err := uuid.FromString(createdResponse.Payload.UUID.String()) - suite.NoError(err) - - // check that the order and its revision are actually in the DB - order, err := models.FetchElectronicOrderByID(suite.DB(), id) - suite.NoError(err) - suite.NotNil(order) - suite.Equal(params.Issuer, string(order.Issuer)) - suite.Equal(params.MemberID, order.Edipi) - suite.Equal(params.OrdersNum, order.OrdersNumber) - suite.Len(order.Revisions, 1) - storedRev := order.Revisions[0] - suite.EqualValues(*rev.SeqNum, storedRev.SeqNum) - suite.Equal(rev.Member.GivenName, storedRev.GivenName) - suite.Equal(rev.Member.FamilyName, storedRev.FamilyName) - suite.Equal(string(*rev.Member.Rank), string(storedRev.Paygrade)) - suite.Equal(rev.PcsAccounting.Tac, storedRev.HhgTAC) - suite.Equal(string(*rev.Status), string(storedRev.Status)) - suite.Equal(string(rev.TourType), string(storedRev.TourType)) - suite.Equal(string(*rev.OrdersType), string(storedRev.OrdersType)) - suite.Equal(*rev.HasDependents, storedRev.HasDependents) - suite.Equal(rev.NoCostMove, storedRev.NoCostMove) - suite.Equal(rev.LosingUnit.Uic, storedRev.LosingUIC) - suite.Equal(rev.LosingUnit.Name, storedRev.LosingUnitName) - suite.Equal(rev.LosingUnit.City, storedRev.LosingUnitCity) - suite.Equal(rev.LosingUnit.Locality, storedRev.LosingUnitLocality) - suite.Equal(rev.LosingUnit.PostalCode, storedRev.LosingUnitPostalCode) - }) - - suite.T().Run("AmendmentSuccess", func(_ *testing.T) { - seqNum = int64(1) - response := handler.Handle(params) - - suite.IsType(&ordersoperations.PostRevisionCreated{}, response) - createdResponse, ok := response.(*ordersoperations.PostRevisionCreated) - if !ok { - return - } - id, err := uuid.FromString(createdResponse.Payload.UUID.String()) - suite.NoError(err) - - // check that the order and its new revision are actually in the DB - order, err := models.FetchElectronicOrderByID(suite.DB(), id) - suite.NoError(err) - suite.NotNil(order) - suite.Equal(params.Issuer, string(order.Issuer)) - suite.Equal(params.MemberID, order.Edipi) - suite.Equal(params.OrdersNum, order.OrdersNumber) - suite.Len(order.Revisions, 2) - storedRev := order.Revisions[1] - suite.EqualValues(*rev.SeqNum, storedRev.SeqNum) - suite.Equal(rev.Member.GivenName, storedRev.GivenName) - suite.Equal(rev.Member.FamilyName, storedRev.FamilyName) - suite.Equal(string(*rev.Member.Rank), string(storedRev.Paygrade)) - suite.Equal(rev.PcsAccounting.Tac, storedRev.HhgTAC) - suite.Equal(string(*rev.Status), string(storedRev.Status)) - suite.Equal(string(rev.TourType), string(storedRev.TourType)) - suite.Equal(string(*rev.OrdersType), string(storedRev.OrdersType)) - suite.Equal(*rev.HasDependents, storedRev.HasDependents) - suite.Equal(rev.NoCostMove, storedRev.NoCostMove) - suite.Equal(rev.LosingUnit.Uic, storedRev.LosingUIC) - suite.Equal(rev.LosingUnit.Name, storedRev.LosingUnitName) - suite.Equal(rev.LosingUnit.City, storedRev.LosingUnitCity) - suite.Equal(rev.LosingUnit.Locality, storedRev.LosingUnitLocality) - suite.Equal(rev.LosingUnit.PostalCode, storedRev.LosingUnitPostalCode) - }) - - suite.T().Run("SeqNumConflict", func(_ *testing.T) { - // Sending the amendment again should result in a conflict because the SeqNum will be taken - response := handler.Handle(params) - suite.IsType(&handlers.ErrResponse{}, response) - errResponse, ok := response.(*handlers.ErrResponse) - if !ok { - return - } - suite.Equal(http.StatusConflict, errResponse.Code) - }) - - suite.T().Run("EdipiConflict", func(_ *testing.T) { - params.MemberID = "9999999999" - seqNum = int64(99999) - response := handler.Handle(params) - suite.IsType(&handlers.ErrResponse{}, response) - errResponse, ok := response.(*handlers.ErrResponse) - if !ok { - return - } - suite.Equal(http.StatusConflict, errResponse.Code) - }) -} - func (suite *HandlerSuite) TestPostRevisionNoApiPerm() { req := httptest.NewRequest("POST", "/orders/v1/orders", nil) clientCert := models.ClientCert{} diff --git a/pkg/handlers/ordersapi/post_revision_to_orders_test.go b/pkg/handlers/ordersapi/post_revision_to_orders_test.go index fbc5adf666c..c6f2a84cafe 100644 --- a/pkg/handlers/ordersapi/post_revision_to_orders_test.go +++ b/pkg/handlers/ordersapi/post_revision_to_orders_test.go @@ -5,111 +5,16 @@ import ( "net/http" "net/http/httptest" "testing" - "time" "github.com/go-openapi/strfmt" "github.com/gofrs/uuid" "github.com/transcom/mymove/pkg/gen/ordersapi/ordersoperations" - "github.com/transcom/mymove/pkg/gen/ordersmessages" "github.com/transcom/mymove/pkg/handlers" "github.com/transcom/mymove/pkg/models" "github.com/transcom/mymove/pkg/testdatagen" ) -func (suite *HandlerSuite) TestPostRevisionToOrders() { - // prime the DB with an order with 1 revision - origOrder := testdatagen.MakeDefaultElectronicOrder(suite.DB()) - - req := httptest.NewRequest("POST", fmt.Sprintf("/orders/v1/orders/%s", origOrder.ID), nil) - clientCert := models.ClientCert{ - AllowOrdersAPI: true, - AllowAirForceOrdersWrite: true, - } - req = suite.AuthenticateClientCertRequest(req, &clientCert) - - seqNum := int64(1) - hasDependents := true - rev := ordersmessages.Revision{ - SeqNum: &seqNum, - Member: &ordersmessages.Member{ - GivenName: "First", - FamilyName: "Last", - Affiliation: ordersmessages.NewAffiliation(ordersmessages.AffiliationAIRFORCE), - Rank: ordersmessages.NewRank(ordersmessages.RankWDash1), - }, - Status: ordersmessages.NewStatus(ordersmessages.StatusAuthorized), - DateIssued: handlers.FmtDateTime(time.Now()), - NoCostMove: false, - TdyEnRoute: false, - TourType: ordersmessages.TourTypeAccompanied, - OrdersType: ordersmessages.NewOrdersType(ordersmessages.OrdersTypeSeparation), - HasDependents: &hasDependents, - LosingUnit: &ordersmessages.Unit{ - Uic: handlers.FmtString("FFFS00"), - Name: handlers.FmtString("SPC721 COMMUNICATIONS SQ"), - City: handlers.FmtString("CHEYENNE MTN"), - Locality: handlers.FmtString("CO"), - PostalCode: handlers.FmtString("80914"), - }, - PcsAccounting: &ordersmessages.Accounting{ - Tac: handlers.FmtString("F67C"), - }, - } - - params := ordersoperations.PostRevisionToOrdersParams{ - HTTPRequest: req, - UUID: strfmt.UUID(origOrder.ID.String()), - Revision: &rev, - } - - handler := PostRevisionToOrdersHandler{suite.HandlerConfig()} - suite.T().Run("Success", func(_ *testing.T) { - response := handler.Handle(params) - - suite.IsType(&ordersoperations.PostRevisionToOrdersCreated{}, response) - createdResponse, ok := response.(*ordersoperations.PostRevisionToOrdersCreated) - if !ok { - return - } - id, err := uuid.FromString(createdResponse.Payload.UUID.String()) - suite.NoError(err) - - // check that the order and its new revision are actually in the DB - order, err := models.FetchElectronicOrderByID(suite.DB(), id) - suite.NoError(err) - suite.NotNil(order) - suite.Len(order.Revisions, 2) - storedRev := order.Revisions[1] - suite.EqualValues(*rev.SeqNum, storedRev.SeqNum) - suite.Equal(rev.Member.GivenName, storedRev.GivenName) - suite.Equal(rev.Member.FamilyName, storedRev.FamilyName) - suite.Equal(string(*rev.Member.Rank), string(storedRev.Paygrade)) - suite.Equal(rev.PcsAccounting.Tac, storedRev.HhgTAC) - suite.Equal(string(*rev.Status), string(storedRev.Status)) - suite.Equal(string(rev.TourType), string(storedRev.TourType)) - suite.Equal(string(*rev.OrdersType), string(storedRev.OrdersType)) - suite.Equal(*rev.HasDependents, storedRev.HasDependents) - suite.Equal(rev.NoCostMove, storedRev.NoCostMove) - suite.Equal(rev.LosingUnit.Uic, storedRev.LosingUIC) - suite.Equal(rev.LosingUnit.Name, storedRev.LosingUnitName) - suite.Equal(rev.LosingUnit.City, storedRev.LosingUnitCity) - suite.Equal(rev.LosingUnit.Locality, storedRev.LosingUnitLocality) - suite.Equal(rev.LosingUnit.PostalCode, storedRev.LosingUnitPostalCode) - }) - - suite.T().Run("SeqNumConflict", func(_ *testing.T) { - // Sending the amendment again should result in a conflict because the SeqNum will be taken - response := handler.Handle(params) - suite.IsType(&handlers.ErrResponse{}, response) - errResponse, ok := response.(*handlers.ErrResponse) - if !ok { - return - } - suite.Equal(http.StatusConflict, errResponse.Code) - }) -} - func (suite *HandlerSuite) TestPostRevisionToOrdersNoApiPerm() { id, _ := uuid.NewV4() req := httptest.NewRequest("POST", fmt.Sprintf("/orders/v1/orders/%s", id.String()), nil) diff --git a/pkg/handlers/primeapi/move_task_order_test.go b/pkg/handlers/primeapi/move_task_order_test.go index 58a58a2cb07..a25a898c963 100644 --- a/pkg/handlers/primeapi/move_task_order_test.go +++ b/pkg/handlers/primeapi/move_task_order_test.go @@ -1737,7 +1737,6 @@ func (suite *HandlerSuite) TestUpdateMTOPostCounselingInfo() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator { @@ -1822,7 +1821,6 @@ func (suite *HandlerSuite) TestUpdateMTOPostCounselingInfo() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator { diff --git a/pkg/handlers/primeapi/mto_service_item_test.go b/pkg/handlers/primeapi/mto_service_item_test.go index bce0b55264c..365e1e9d785 100644 --- a/pkg/handlers/primeapi/mto_service_item_test.go +++ b/pkg/handlers/primeapi/mto_service_item_test.go @@ -145,7 +145,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -181,8 +180,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -232,7 +229,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -425,7 +421,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -470,7 +465,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -684,7 +678,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDomesticCratingHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -722,7 +715,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDomesticCratingHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -846,7 +838,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -893,7 +884,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -963,7 +953,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1048,7 +1037,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandlerWithDOFSITNoA mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1159,7 +1147,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandlerWithDOFSITWit mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1333,7 +1320,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1408,7 +1394,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1442,7 +1427,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1499,7 +1483,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1554,7 +1537,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1753,7 +1735,6 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemDDDSIT() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) subtestData.handler = UpdateMTOServiceItemHandler{ suite.HandlerConfig(), @@ -2037,7 +2018,6 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemDOPSIT() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) subtestData.handler = UpdateMTOServiceItemHandler{ suite.HandlerConfig(), diff --git a/pkg/handlers/primeapi/mto_shipment_address_test.go b/pkg/handlers/primeapi/mto_shipment_address_test.go index cca597695c7..c85dbaac0c1 100644 --- a/pkg/handlers/primeapi/mto_shipment_address_test.go +++ b/pkg/handlers/primeapi/mto_shipment_address_test.go @@ -50,7 +50,6 @@ func (suite *HandlerSuite) TestUpdateMTOShipmentAddressHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) // Create handler diff --git a/pkg/handlers/primeapi/mto_shipment_test.go b/pkg/handlers/primeapi/mto_shipment_test.go index f33b6c755ca..7cf0064d991 100644 --- a/pkg/handlers/primeapi/mto_shipment_test.go +++ b/pkg/handlers/primeapi/mto_shipment_test.go @@ -329,7 +329,6 @@ func (suite *HandlerSuite) TestUpdateMTOShipmentStatusHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher()) addressUpdater := address.NewAddressUpdater() @@ -350,7 +349,6 @@ func (suite *HandlerSuite) TestUpdateMTOShipmentStatusHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) handler := UpdateMTOShipmentStatusHandler{ handlerConfig, @@ -542,7 +540,6 @@ func (suite *HandlerSuite) TestDeleteMTOShipmentHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator { diff --git a/pkg/handlers/primeapi/payment_request_test.go b/pkg/handlers/primeapi/payment_request_test.go index 1ca4f2965e7..d6001e7ccea 100644 --- a/pkg/handlers/primeapi/payment_request_test.go +++ b/pkg/handlers/primeapi/payment_request_test.go @@ -746,7 +746,6 @@ func (suite *HandlerSuite) TestCreatePaymentRequestHandlerNewPaymentRequestCreat mock.AnythingOfType("*appcontext.appContext"), "90210", "94535", - false, ).Return(defaultZipDistance, nil) paymentRequestCreator := paymentrequest.NewPaymentRequestCreator( @@ -906,7 +905,6 @@ func (suite *HandlerSuite) TestCreatePaymentRequestHandlerInvalidMTOReferenceID( mock.AnythingOfType("*appcontext.appContext"), "90210", "94535", - false, ).Return(defaultZipDistance, nil) paymentRequestCreator := paymentrequest.NewPaymentRequestCreator( @@ -965,7 +963,6 @@ func (suite *HandlerSuite) TestCreatePaymentRequestHandlerInvalidMTOReferenceID( mock.AnythingOfType("*appcontext.appContext"), "90210", "94535", - false, ).Return(defaultZipDistance, nil) paymentRequestCreator := paymentrequest.NewPaymentRequestCreator( diff --git a/pkg/handlers/primeapi/reweigh_test.go b/pkg/handlers/primeapi/reweigh_test.go index d97b7f78d22..baa363a5d8a 100644 --- a/pkg/handlers/primeapi/reweigh_test.go +++ b/pkg/handlers/primeapi/reweigh_test.go @@ -36,8 +36,6 @@ func (suite *HandlerSuite) TestUpdateReweighHandler() { mockPlanner.On("ZipTransitDistance", recalculateTestPickupZip, recalculateTestDestinationZip, - false, - false, ).Return(recalculateTestZip3Distance, nil) // Get shipment payment request recalculator service diff --git a/pkg/handlers/primeapiv2/move_task_order_test.go b/pkg/handlers/primeapiv2/move_task_order_test.go index f173af34bda..6d954c1bf80 100644 --- a/pkg/handlers/primeapiv2/move_task_order_test.go +++ b/pkg/handlers/primeapiv2/move_task_order_test.go @@ -824,14 +824,24 @@ func (suite *HandlerSuite) TestGetMoveTaskOrder() { suite.NoError(movePayload.Validate(strfmt.Default)) suite.Len(movePayload.PaymentRequests, 2) - paymentRequestPayload := movePayload.PaymentRequests[0] - suite.Equal(paymentRequest.ID.String(), paymentRequestPayload.ID.String()) - suite.Equal(successMove.ID.String(), paymentRequestPayload.MoveTaskOrderID.String()) - suite.Equal(paymentRequest.IsFinal, *paymentRequestPayload.IsFinal) - suite.Equal(*paymentRequest.RejectionReason, *paymentRequestPayload.RejectionReason) - suite.Equal(paymentRequest.Status.String(), string(paymentRequestPayload.Status)) - suite.Equal(paymentRequest.PaymentRequestNumber, paymentRequestPayload.PaymentRequestNumber) - suite.Equal(paymentRequest.RecalculationOfPaymentRequestID.String(), paymentRequestPayload.RecalculationOfPaymentRequestID.String()) + var matchingPR *primev2messages.PaymentRequest + for i := range movePayload.PaymentRequests { + pr := movePayload.PaymentRequests[i] + if pr.ID.String() == paymentRequest.ID.String() { + matchingPR = pr + break + } + } + paymentRequestPayload := matchingPR + + suite.NotNil(matchingPR, "expected to find a payment request payload matching paymentRequest.ID") + suite.Equal(paymentRequest.ID.String(), matchingPR.ID.String()) + suite.Equal(successMove.ID.String(), matchingPR.MoveTaskOrderID.String()) + suite.Equal(paymentRequest.IsFinal, *matchingPR.IsFinal) + suite.Equal(*paymentRequest.RejectionReason, *matchingPR.RejectionReason) + suite.Equal(paymentRequest.Status.String(), string(matchingPR.Status)) + suite.Equal(paymentRequest.PaymentRequestNumber, matchingPR.PaymentRequestNumber) + suite.Equal(paymentRequest.RecalculationOfPaymentRequestID.String(), matchingPR.RecalculationOfPaymentRequestID.String()) // verify paymentServiceItems suite.Len(paymentRequestPayload.PaymentServiceItems, 2) diff --git a/pkg/handlers/primeapiv2/mto_service_item_test.go b/pkg/handlers/primeapiv2/mto_service_item_test.go index 640da61a48d..82581f6d077 100644 --- a/pkg/handlers/primeapiv2/mto_service_item_test.go +++ b/pkg/handlers/primeapiv2/mto_service_item_test.go @@ -110,7 +110,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -169,7 +168,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -362,7 +360,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -407,7 +404,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -621,7 +617,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDomesticCratingHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -659,7 +654,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDomesticCratingHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -783,7 +777,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -830,7 +823,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -900,7 +892,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -985,7 +976,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandlerWithDOFSITNoA mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1094,7 +1084,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandlerWithDOFSITWit mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1262,7 +1251,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1337,7 +1325,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1371,7 +1358,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1428,7 +1414,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1493,7 +1478,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ diff --git a/pkg/handlers/primeapiv2/mto_shipment_test.go b/pkg/handlers/primeapiv2/mto_shipment_test.go index 5419582eca4..89a5fedde4c 100644 --- a/pkg/handlers/primeapiv2/mto_shipment_test.go +++ b/pkg/handlers/primeapiv2/mto_shipment_test.go @@ -53,7 +53,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) vLocationServices := address.NewVLocation() diff --git a/pkg/handlers/primeapiv3/move_task_order_test.go b/pkg/handlers/primeapiv3/move_task_order_test.go index 06880f84230..06454d1dd20 100644 --- a/pkg/handlers/primeapiv3/move_task_order_test.go +++ b/pkg/handlers/primeapiv3/move_task_order_test.go @@ -812,14 +812,24 @@ func (suite *HandlerSuite) TestGetMoveTaskOrder() { suite.NoError(movePayload.Validate(strfmt.Default)) suite.Len(movePayload.PaymentRequests, 2) - paymentRequestPayload := movePayload.PaymentRequests[0] - suite.Equal(paymentRequest.ID.String(), paymentRequestPayload.ID.String()) - suite.Equal(successMove.ID.String(), paymentRequestPayload.MoveTaskOrderID.String()) - suite.Equal(paymentRequest.IsFinal, *paymentRequestPayload.IsFinal) - suite.Equal(*paymentRequest.RejectionReason, *paymentRequestPayload.RejectionReason) - suite.Equal(paymentRequest.Status.String(), string(paymentRequestPayload.Status)) - suite.Equal(paymentRequest.PaymentRequestNumber, paymentRequestPayload.PaymentRequestNumber) - suite.Equal(paymentRequest.RecalculationOfPaymentRequestID.String(), paymentRequestPayload.RecalculationOfPaymentRequestID.String()) + var matchingPR *primev3messages.PaymentRequest + for i := range movePayload.PaymentRequests { + pr := movePayload.PaymentRequests[i] + if pr.ID.String() == paymentRequest.ID.String() { + matchingPR = pr + break + } + } + paymentRequestPayload := matchingPR + + suite.NotNil(matchingPR, "expected to find a payment request payload matching paymentRequest.ID") + suite.Equal(paymentRequest.ID.String(), matchingPR.ID.String()) + suite.Equal(successMove.ID.String(), matchingPR.MoveTaskOrderID.String()) + suite.Equal(paymentRequest.IsFinal, *matchingPR.IsFinal) + suite.Equal(*paymentRequest.RejectionReason, *matchingPR.RejectionReason) + suite.Equal(paymentRequest.Status.String(), string(matchingPR.Status)) + suite.Equal(paymentRequest.PaymentRequestNumber, matchingPR.PaymentRequestNumber) + suite.Equal(paymentRequest.RecalculationOfPaymentRequestID.String(), matchingPR.RecalculationOfPaymentRequestID.String()) // verify paymentServiceItems suite.Len(paymentRequestPayload.PaymentServiceItems, 2) diff --git a/pkg/handlers/primeapiv3/mto_service_item_test.go b/pkg/handlers/primeapiv3/mto_service_item_test.go index 4bee5291dc8..a56985cac60 100644 --- a/pkg/handlers/primeapiv3/mto_service_item_test.go +++ b/pkg/handlers/primeapiv3/mto_service_item_test.go @@ -109,7 +109,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) subtestData := makeSubtestData() moveRouter := moverouter.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher()) @@ -170,7 +169,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -363,7 +361,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -408,7 +405,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -622,7 +618,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDomesticCratingHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -660,7 +655,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDomesticCratingHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -784,7 +778,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -831,7 +824,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -901,7 +893,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -986,7 +977,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandlerWithDOFSITNoA mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1095,7 +1085,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemOriginSITHandlerWithDOFSITWit mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1263,7 +1252,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1338,7 +1326,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1372,7 +1359,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1429,7 +1415,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1494,7 +1479,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ @@ -1531,7 +1515,6 @@ func (suite *HandlerSuite) TestCreateMTOServiceItemDestSITHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := CreateMTOServiceItemHandler{ diff --git a/pkg/handlers/primeapiv3/mto_shipment_test.go b/pkg/handlers/primeapiv3/mto_shipment_test.go index 318b91df0ee..948f7667ead 100644 --- a/pkg/handlers/primeapiv3/mto_shipment_test.go +++ b/pkg/handlers/primeapiv3/mto_shipment_test.go @@ -60,7 +60,6 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) vLocationServices := address.NewVLocation() diff --git a/pkg/handlers/supportapi/move_task_order_test.go b/pkg/handlers/supportapi/move_task_order_test.go index 716c11a1404..d58c1d797cf 100644 --- a/pkg/handlers/supportapi/move_task_order_test.go +++ b/pkg/handlers/supportapi/move_task_order_test.go @@ -176,7 +176,6 @@ func (suite *HandlerSuite) TestMakeMoveAvailableHandlerIntegrationSuccess() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator { @@ -393,7 +392,6 @@ func (suite *HandlerSuite) TestCreateMoveTaskOrderRequestHandler() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator { diff --git a/pkg/handlers/supportapi/mto_service_item_test.go b/pkg/handlers/supportapi/mto_service_item_test.go index a03f7373bab..9c99213cefa 100644 --- a/pkg/handlers/supportapi/mto_service_item_test.go +++ b/pkg/handlers/supportapi/mto_service_item_test.go @@ -87,7 +87,6 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandlerApproveSuccess() mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) handler := UpdateMTOServiceItemStatusHandler{handlerConfig, mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), @@ -145,7 +144,6 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandlerRejectSuccess() mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) handler := UpdateMTOServiceItemStatusHandler{handlerConfig, mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), @@ -203,7 +201,6 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandlerRejectionFailedN mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) handler := UpdateMTOServiceItemStatusHandler{handlerConfig, mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), diff --git a/pkg/handlers/supportapi/mto_shipment_test.go b/pkg/handlers/supportapi/mto_shipment_test.go index ad61feb2b5d..c111449d875 100644 --- a/pkg/handlers/supportapi/mto_shipment_test.go +++ b/pkg/handlers/supportapi/mto_shipment_test.go @@ -98,7 +98,6 @@ func (suite *HandlerSuite) TestUpdateMTOShipmentStatusHandler() { 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()) planner.On("Zip5TransitDistanceLineHaul", diff --git a/pkg/payment_request/service_param_value_lookups/distance_zip_lookup.go b/pkg/payment_request/service_param_value_lookups/distance_zip_lookup.go index acc87eb2715..c50c105e9c4 100644 --- a/pkg/payment_request/service_param_value_lookups/distance_zip_lookup.go +++ b/pkg/payment_request/service_param_value_lookups/distance_zip_lookup.go @@ -135,17 +135,17 @@ func (r DistanceZipLookup) lookup(appCtx appcontext.AppContext, keyData *Service totalDistanceMiles = distanceMiles } else if hasApprovedDestinationSIT { // from pickup zip to delivery zip - totalDistanceMiles, err = planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode, isInternationalShipment) + totalDistanceMiles, err = planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) if err != nil { return "", err } // from pickup zip to Destination SIT zip - distanceMiles, err = planner.ZipTransitDistance(appCtx, pickupZip, destinationZip, isInternationalShipment) + distanceMiles, err = planner.ZipTransitDistance(appCtx, pickupZip, destinationZip) if err != nil { return "", err } } else { - distanceMiles, err = planner.ZipTransitDistance(appCtx, pickupZip, destinationZip, isInternationalShipment) + distanceMiles, err = planner.ZipTransitDistance(appCtx, pickupZip, destinationZip) if err != nil { return "", err } diff --git a/pkg/payment_request/service_param_value_lookups/distance_zip_lookup_test.go b/pkg/payment_request/service_param_value_lookups/distance_zip_lookup_test.go index 8b8d866b313..fd9f12ff1c8 100644 --- a/pkg/payment_request/service_param_value_lookups/distance_zip_lookup_test.go +++ b/pkg/payment_request/service_param_value_lookups/distance_zip_lookup_test.go @@ -115,14 +115,14 @@ func (suite *ServiceParamValueLookupsSuite) TestDistanceLookup() { distanceStr, err := paramLookup.ServiceParamValue(suite.AppContextForTest(), key) suite.FatalNoError(err) - expected := strconv.Itoa(defaultInternationalZipDistance) + expected := strconv.Itoa(defaultZipDistance) suite.Equal(expected, distanceStr) var mtoShipment models.MTOShipment err = suite.DB().Find(&mtoShipment, mtoServiceItem.MTOShipmentID) suite.NoError(err) - suite.Equal(unit.Miles(defaultInternationalZipDistance), *mtoShipment.Distance) + suite.Equal(unit.Miles(defaultZipDistance), *mtoShipment.Distance) }) suite.Run("Call ZipTransitDistance on international PPMs with CONUS -> Tacoma Port ZIP", func() { @@ -172,7 +172,7 @@ func (suite *ServiceParamValueLookupsSuite) TestDistanceLookup() { planner := suite.planner.(*mocks.Planner) // should be called with the 98421 ZIP of the Tacoma port and NOT 99505 - planner.AssertCalled(suite.T(), "ZipTransitDistance", appContext, ppmShipment.PickupAddress.PostalCode, "98421", true) + planner.AssertCalled(suite.T(), "ZipTransitDistance", appContext, ppmShipment.PickupAddress.PostalCode, "98421") }) suite.Run("Calculate transit zip distance with an approved Destination SIT service item", func() { @@ -273,7 +273,7 @@ func (suite *ServiceParamValueLookupsSuite) TestDistanceLookup() { suite.NoError(err) planner := suite.planner.(*mocks.Planner) - planner.AssertCalled(suite.T(), "ZipTransitDistance", appContext, ppmShipment.PickupAddress.PostalCode, ppmShipment.DestinationAddress.PostalCode, false) + planner.AssertCalled(suite.T(), "ZipTransitDistance", appContext, ppmShipment.PickupAddress.PostalCode, ppmShipment.DestinationAddress.PostalCode) err = suite.DB().Reload(&ppmShipment.Shipment) suite.NoError(err) @@ -304,7 +304,7 @@ func (suite *ServiceParamValueLookupsSuite) TestDistanceLookup() { suite.NoError(err) planner := suite.planner.(*mocks.Planner) - planner.AssertCalled(suite.T(), "ZipTransitDistance", appContext, ppmShipment.PickupAddress.PostalCode, ppmShipment.DestinationAddress.PostalCode, false) + planner.AssertCalled(suite.T(), "ZipTransitDistance", appContext, ppmShipment.PickupAddress.PostalCode, ppmShipment.DestinationAddress.PostalCode) err = suite.DB().Reload(&ppmShipment.Shipment) suite.NoError(err) diff --git a/pkg/payment_request/service_param_value_lookups/distance_zip_sit_dest_lookup.go b/pkg/payment_request/service_param_value_lookups/distance_zip_sit_dest_lookup.go index bc3e612c811..2136d7556bc 100644 --- a/pkg/payment_request/service_param_value_lookups/distance_zip_sit_dest_lookup.go +++ b/pkg/payment_request/service_param_value_lookups/distance_zip_sit_dest_lookup.go @@ -33,7 +33,7 @@ func (r DistanceZipSITDestLookup) lookup(appCtx appcontext.AppContext, keyData * if destZip == finalDestZip { distanceMiles = 1 } else { - distanceMiles, distanceErr = planner.ZipTransitDistance(appCtx, destZip, finalDestZip, false) + distanceMiles, distanceErr = planner.ZipTransitDistance(appCtx, destZip, finalDestZip) } if distanceErr != nil { diff --git a/pkg/payment_request/service_param_value_lookups/distance_zip_sit_dest_lookup_test.go b/pkg/payment_request/service_param_value_lookups/distance_zip_sit_dest_lookup_test.go index c0e29027758..8231238b831 100644 --- a/pkg/payment_request/service_param_value_lookups/distance_zip_sit_dest_lookup_test.go +++ b/pkg/payment_request/service_param_value_lookups/distance_zip_sit_dest_lookup_test.go @@ -211,7 +211,6 @@ func (suite *ServiceParamValueLookupsSuite) TestDistanceZipSITDestLookup() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(0, errors.New("error with ZipTransitDistance")) paramLookup, err := ServiceParamLookupInitialize(suite.AppContextForTest(), errorPlanner, mtoServiceItemSameZip3, paymentRequest.ID, paymentRequest.MoveTaskOrderID, nil) diff --git a/pkg/payment_request/service_param_value_lookups/distance_zip_sit_origin_lookup.go b/pkg/payment_request/service_param_value_lookups/distance_zip_sit_origin_lookup.go index 945462236dd..e452adbed10 100644 --- a/pkg/payment_request/service_param_value_lookups/distance_zip_sit_origin_lookup.go +++ b/pkg/payment_request/service_param_value_lookups/distance_zip_sit_origin_lookup.go @@ -39,7 +39,7 @@ func (r DistanceZipSITOriginLookup) lookup(appCtx appcontext.AppContext, keyData if originZip == actualOriginZip { distanceMiles = 1 } else { - distanceMiles, distanceErr = planner.ZipTransitDistance(appCtx, originZip, actualOriginZip, false) + distanceMiles, distanceErr = planner.ZipTransitDistance(appCtx, originZip, actualOriginZip) } if distanceErr != nil { return "", distanceErr diff --git a/pkg/payment_request/service_param_value_lookups/distance_zip_sit_origin_lookup_test.go b/pkg/payment_request/service_param_value_lookups/distance_zip_sit_origin_lookup_test.go index eabf098155f..31d766db385 100644 --- a/pkg/payment_request/service_param_value_lookups/distance_zip_sit_origin_lookup_test.go +++ b/pkg/payment_request/service_param_value_lookups/distance_zip_sit_origin_lookup_test.go @@ -184,7 +184,6 @@ func (suite *ServiceParamValueLookupsSuite) TestDistanceZipSITOriginLookup() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(0, errors.New("error with ZipTransitDistance")) paramLookup, err := ServiceParamLookupInitialize(suite.AppContextForTest(), errorPlanner, mtoServiceItemSameZip3, paymentRequest.ID, paymentRequest.MoveTaskOrderID, nil) diff --git a/pkg/payment_request/service_param_value_lookups/service_param_value_lookups_test.go b/pkg/payment_request/service_param_value_lookups/service_param_value_lookups_test.go index 34d4a025d2b..f71757a23f3 100644 --- a/pkg/payment_request/service_param_value_lookups/service_param_value_lookups_test.go +++ b/pkg/payment_request/service_param_value_lookups/service_param_value_lookups_test.go @@ -47,13 +47,11 @@ func TestServiceParamValueLookupsSuite(t *testing.T) { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(defaultZipDistance, nil) planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - true, ).Return(defaultInternationalZipDistance, nil) ts := &ServiceParamValueLookupsSuite{ diff --git a/pkg/route/dtod_planner.go b/pkg/route/dtod_planner.go index af426b41b69..383de1dd923 100644 --- a/pkg/route/dtod_planner.go +++ b/pkg/route/dtod_planner.go @@ -44,7 +44,7 @@ func (p *dtodPlanner) Zip3TransitDistance(_ appcontext.AppContext, _ string, _ s } // ZipTransitDistance calculates the distance between two valid Zips -func (p *dtodPlanner) ZipTransitDistance(appCtx appcontext.AppContext, source string, destination string, isInternationalShipment bool) (int, error) { +func (p *dtodPlanner) ZipTransitDistance(appCtx appcontext.AppContext, source string, destination string) (int, error) { if len(source) < 5 { source = fmt.Sprintf("%05s", source) } diff --git a/pkg/route/dtod_planner_test.go b/pkg/route/dtod_planner_test.go index 02e811e31d4..905981e6a17 100644 --- a/pkg/route/dtod_planner_test.go +++ b/pkg/route/dtod_planner_test.go @@ -100,7 +100,7 @@ func (suite *GHCTestSuite) TestDTODZipTransitDistance() { plannerMileage := NewDTODZip5Distance(fakeUsername, fakePassword, testSoapClient, false) planner := NewDTODPlanner(plannerMileage) - distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "30907", "30301", false) + distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "30907", "30301") suite.NoError(err) suite.Equal(150, distance) }) @@ -114,7 +114,7 @@ func (suite *GHCTestSuite) TestDTODZipTransitDistance() { plannerMileage := NewDTODZip5Distance(fakeUsername, fakePassword, testSoapClient, false) planner := NewDTODPlanner(plannerMileage) - distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "30907", "30901", false) + distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "30907", "30901") suite.Error(err) suite.Equal(0, distance) }) diff --git a/pkg/route/here_planner.go b/pkg/route/here_planner.go index aea2b861639..e8d40c85521 100644 --- a/pkg/route/here_planner.go +++ b/pkg/route/here_planner.go @@ -219,7 +219,7 @@ func (p *herePlanner) Zip5TransitDistance(appCtx appcontext.AppContext, source s } // ZipTransitDistance calculates the distance between two valid Zip5s; it is used by the PPM flow -func (p *herePlanner) ZipTransitDistance(_ appcontext.AppContext, _ string, _ string, _ bool) (int, error) { +func (p *herePlanner) ZipTransitDistance(_ appcontext.AppContext, _ string, _ string) (int, error) { // This might get retired after we transition over fully to GHC. panic("implement me") diff --git a/pkg/route/hhg_planner.go b/pkg/route/hhg_planner.go index f69cc2c0591..86f209dc546 100644 --- a/pkg/route/hhg_planner.go +++ b/pkg/route/hhg_planner.go @@ -46,7 +46,7 @@ func (p *hhgPlanner) Zip3TransitDistance(_ appcontext.AppContext, _ string, _ st } // ZipTransitDistance calculates the distance between two valid Zips -func (p *hhgPlanner) ZipTransitDistance(appCtx appcontext.AppContext, source string, destination string, isInternationalShipment bool) (int, error) { +func (p *hhgPlanner) ZipTransitDistance(appCtx appcontext.AppContext, source string, destination string) (int, error) { sourceZip5 := source if len(source) < 5 { sourceZip5 = fmt.Sprintf("%05s", source) @@ -58,7 +58,8 @@ func (p *hhgPlanner) ZipTransitDistance(appCtx appcontext.AppContext, source str sourceZip3 := sourceZip5[0:3] destZip3 := destZip5[0:3] - if sourceZip3 == destZip3 || isInternationalShipment { + // if the first 3 numbers of the ZIPs are the same then we need to get the exact distance between the full ZIP5s + if sourceZip3 == destZip3 { if sourceZip5 == destZip5 { return 1, nil } @@ -66,7 +67,6 @@ func (p *hhgPlanner) ZipTransitDistance(appCtx appcontext.AppContext, source str } else { // Get reZip3s for origin and destination to compare base point cities. // Dont throw/return errors from this. If we dont find them, we'll just use randMcNallyZip3Distance - // this only applies to domestic shipments sourceReZip3, sErr := models.FetchReZip3Item(appCtx.DB(), sourceZip3) if sErr != nil { appCtx.Logger().Error("Failed to fetch the reZip3 item for sourceZip3", zap.Error(sErr)) @@ -80,6 +80,7 @@ func (p *hhgPlanner) ZipTransitDistance(appCtx appcontext.AppContext, source str if sourceReZip3 != nil && destinationReZip3 != nil && sourceReZip3.BasePointCity == destinationReZip3.BasePointCity { return p.dtodPlannerMileage.DTODZip5Distance(appCtx, source, destination) } + } return randMcNallyZip3Distance(appCtx, sourceZip3, destZip3) diff --git a/pkg/route/hhg_planner_test.go b/pkg/route/hhg_planner_test.go index a2725ef1c3a..b79eb22389a 100644 --- a/pkg/route/hhg_planner_test.go +++ b/pkg/route/hhg_planner_test.go @@ -78,7 +78,7 @@ func (suite *GHCTestSuite) TestHHGZipTransitDistance() { plannerMileage := NewDTODZip5Distance(fakeUsername, fakePassword, testSoapClient, false) planner := NewHHGPlanner(plannerMileage) - distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "30907", "30301", false) + distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "30907", "30301") suite.NoError(err) suite.Equal(149, distance) }) @@ -88,7 +88,7 @@ func (suite *GHCTestSuite) TestHHGZipTransitDistance() { plannerMileage := NewDTODZip5Distance(fakeUsername, fakePassword, testSoapClient, false) planner := NewHHGPlanner(plannerMileage) - distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "11201", "11201", false) + distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "11201", "11201") suite.NoError(err) suite.Equal(1, distance) }) @@ -105,7 +105,7 @@ func (suite *GHCTestSuite) TestHHGZipTransitDistance() { planner := NewHHGPlanner(plannerMileage) // Get distance between two zips in the same base point city - distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "33169", "33040", false) + distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "33169", "33040") suite.NoError(err) // Ensure DTOD was used for distance @@ -121,8 +121,27 @@ func (suite *GHCTestSuite) TestHHGZipTransitDistance() { plannerMileage := NewDTODZip5Distance(fakeUsername, fakePassword, testSoapClient, false) planner := NewHHGPlanner(plannerMileage) - distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "30907", "30901", false) + distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "30907", "30901") suite.Error(err) suite.Equal(0, distance) }) + + suite.Run("ZipTransitDistance returns Rand McNally distance when isInternationalShipment is true", func() { + testSoapClient := &ghcmocks.SoapCaller{} + + plannerMileage := NewDTODZip5Distance(fakeUsername, fakePassword, testSoapClient, false) + planner := NewHHGPlanner(plannerMileage) + fromZip := "74133" + toZip := "99702" + + // get the result from the test db + var zip3Distance models.Zip3Distance + err := suite.DB().Where("from_zip3 = $1 AND to_zip3 = $2", fromZip[0:3], toZip[0:3]).First(&zip3Distance) + suite.NoError(err) + + // confirm we get the same + distance, err := planner.ZipTransitDistance(suite.AppContextForTest(), "74133", "99702") + suite.NoError(err) + suite.Equal(zip3Distance.DistanceMiles, distance) + }) } diff --git a/pkg/route/mocks/Planner.go b/pkg/route/mocks/Planner.go index ac16906e51c..2cf26622df2 100644 --- a/pkg/route/mocks/Planner.go +++ b/pkg/route/mocks/Planner.go @@ -156,9 +156,9 @@ func (_m *Planner) Zip5TransitDistanceLineHaul(appCtx appcontext.AppContext, sou return r0, r1 } -// ZipTransitDistance provides a mock function with given fields: appCtx, source, destination, isInternationalShipment -func (_m *Planner) ZipTransitDistance(appCtx appcontext.AppContext, source string, destination string, isInternationalShipment bool) (int, error) { - ret := _m.Called(appCtx, source, destination, isInternationalShipment) +// ZipTransitDistance provides a mock function with given fields: appCtx, source, destination +func (_m *Planner) ZipTransitDistance(appCtx appcontext.AppContext, source string, destination string) (int, error) { + ret := _m.Called(appCtx, source, destination) if len(ret) == 0 { panic("no return value specified for ZipTransitDistance") @@ -166,17 +166,17 @@ func (_m *Planner) ZipTransitDistance(appCtx appcontext.AppContext, source strin var r0 int var r1 error - if rf, ok := ret.Get(0).(func(appcontext.AppContext, string, string, bool) (int, error)); ok { - return rf(appCtx, source, destination, isInternationalShipment) + if rf, ok := ret.Get(0).(func(appcontext.AppContext, string, string) (int, error)); ok { + return rf(appCtx, source, destination) } - if rf, ok := ret.Get(0).(func(appcontext.AppContext, string, string, bool) int); ok { - r0 = rf(appCtx, source, destination, isInternationalShipment) + if rf, ok := ret.Get(0).(func(appcontext.AppContext, string, string) int); ok { + r0 = rf(appCtx, source, destination) } else { r0 = ret.Get(0).(int) } - if rf, ok := ret.Get(1).(func(appcontext.AppContext, string, string, bool) error); ok { - r1 = rf(appCtx, source, destination, isInternationalShipment) + if rf, ok := ret.Get(1).(func(appcontext.AppContext, string, string) error); ok { + r1 = rf(appCtx, source, destination) } else { r1 = ret.Error(1) } diff --git a/pkg/route/planner.go b/pkg/route/planner.go index 860be9caddf..ccc349be6d9 100644 --- a/pkg/route/planner.go +++ b/pkg/route/planner.go @@ -120,7 +120,7 @@ type Planner interface { // Zip5TransitDistanceLineHaul is used by PPM flow and checks for minimum distance restriction as PPM doesn't allow short hauls // New code should probably make the minimum checks after calling Zip5TransitDistance over using this method Zip5TransitDistanceLineHaul(appCtx appcontext.AppContext, source string, destination string) (int, error) - ZipTransitDistance(appCtx appcontext.AppContext, source string, destination string, isInternationalShipment bool) (int, error) + ZipTransitDistance(appCtx appcontext.AppContext, source string, destination string) (int, error) Zip3TransitDistance(appCtx appcontext.AppContext, source string, destination string) (int, error) Zip5TransitDistance(appCtx appcontext.AppContext, source string, destination string) (int, error) } diff --git a/pkg/route/planner_test.go b/pkg/route/planner_test.go index cfbd39dd69f..eb574873278 100644 --- a/pkg/route/planner_test.go +++ b/pkg/route/planner_test.go @@ -109,7 +109,7 @@ func (suite *PlannerFullSuite) TestZipDistance() { {zip1: "902101234", zip2: caZip, distanceMin: 30, distanceMax: 49}, } for _, ts := range tests { - distance, err := suite.planner.ZipTransitDistance(suite.AppContextForTest(), ts.zip1, ts.zip2, false) + distance, err := suite.planner.ZipTransitDistance(suite.AppContextForTest(), ts.zip1, ts.zip2) if len(ts.zip1) > 5 { suite.Error(err) suite.Equal(distance, 0) diff --git a/pkg/services/move_history/move_history_fetcher_test.go b/pkg/services/move_history/move_history_fetcher_test.go index b7576dfbc26..f29923745a1 100644 --- a/pkg/services/move_history/move_history_fetcher_test.go +++ b/pkg/services/move_history/move_history_fetcher_test.go @@ -378,7 +378,6 @@ func (suite *MoveHistoryServiceSuite) TestMoveHistoryFetcherScenarios() { 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()) move := factory.BuildApprovalsRequestedMove(suite.DB(), nil, nil) @@ -554,7 +553,6 @@ func (suite *MoveHistoryServiceSuite) TestMoveHistoryFetcherScenarios() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -628,7 +626,6 @@ func (suite *MoveHistoryServiceSuite) TestMoveHistoryFetcherScenarios() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) diff --git a/pkg/services/move_task_order/move_task_order_updater_test.go b/pkg/services/move_task_order/move_task_order_updater_test.go index 58d6793a859..27c8f80fafb 100644 --- a/pkg/services/move_task_order/move_task_order_updater_test.go +++ b/pkg/services/move_task_order/move_task_order_updater_test.go @@ -81,7 +81,6 @@ func (suite *MoveTaskOrderServiceSuite) TestMoveTaskOrderUpdater_UpdateStatusSer mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) mtoUpdater := mt.NewMoveTaskOrderUpdater( queryBuilder, @@ -395,7 +394,6 @@ func (suite *MoveTaskOrderServiceSuite) TestMoveTaskOrderUpdater_UpdatePostCouns mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator { @@ -563,7 +561,6 @@ func (suite *MoveTaskOrderServiceSuite) TestMoveTaskOrderUpdater_ShowHide() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator { @@ -825,7 +822,6 @@ func (suite *MoveTaskOrderServiceSuite) TestMoveTaskOrderUpdater_ApproveMoveAndC mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) serviceItemCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) mtoUpdater := mt.NewMoveTaskOrderUpdater(queryBuilder, serviceItemCreator, moveRouter, setUpSignedCertificationCreatorMock(nil, nil), setUpSignedCertificationUpdaterMock(nil, nil), ppmEstimator) @@ -887,7 +883,6 @@ func (suite *MoveTaskOrderServiceSuite) TestMoveTaskOrderUpdater_ApproveMoveAndC mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) serviceItemCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) mtoUpdater := mt.NewMoveTaskOrderUpdater(queryBuilder, serviceItemCreator, moveRouter, setUpSignedCertificationCreatorMock(nil, nil), setUpSignedCertificationUpdaterMock(nil, nil), ppmEstimator) @@ -1247,7 +1242,6 @@ func (suite *MoveTaskOrderServiceSuite) TestMoveTaskOrderUpdater_UpdatePPMType() mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator { diff --git a/pkg/services/mto_service_item/mto_service_item_creator.go b/pkg/services/mto_service_item/mto_service_item_creator.go index aaf8fb65b70..f7c2fd3730b 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator.go +++ b/pkg/services/mto_service_item/mto_service_item_creator.go @@ -131,7 +131,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, return 0, err } if mtoShipment.PickupAddress != nil && mtoShipment.DestinationAddress != nil { - distance, err = o.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode, false) + distance, err = o.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) if err != nil { return 0, err } @@ -147,7 +147,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, return 0, err } if mtoShipment.PickupAddress != nil && mtoShipment.DestinationAddress != nil { - distance, err = o.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode, false) + distance, err = o.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) if err != nil { return 0, err } @@ -170,7 +170,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, } if mtoShipment.PickupAddress != nil && mtoShipment.DestinationAddress != nil { - distance, err = o.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode, false) + distance, err = o.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) if err != nil { return 0, err } @@ -306,14 +306,14 @@ func (o *mtoServiceItemCreator) calculateSITDeliveryMiles(appCtx appcontext.AppC originalSITAddressZip = mtoShipment.PickupAddress.PostalCode } if mtoShipment.PickupAddress != nil && originalSITAddressZip != "" { - distance, err = o.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, originalSITAddressZip, false) + distance, err = o.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, originalSITAddressZip) } } if serviceItem.ReService.Code == models.ReServiceCodeDDFSIT || serviceItem.ReService.Code == models.ReServiceCodeDDASIT || serviceItem.ReService.Code == models.ReServiceCodeDDSFSC || serviceItem.ReService.Code == models.ReServiceCodeDDDSIT { // Creation: Destination SIT: distance between shipment destination address & service item destination address if mtoShipment.DestinationAddress != nil && serviceItem.SITDestinationFinalAddress != nil { - distance, err = o.planner.ZipTransitDistance(appCtx, mtoShipment.DestinationAddress.PostalCode, serviceItem.SITDestinationFinalAddress.PostalCode, false) + distance, err = o.planner.ZipTransitDistance(appCtx, mtoShipment.DestinationAddress.PostalCode, serviceItem.SITDestinationFinalAddress.PostalCode) } } if err != nil { diff --git a/pkg/services/mto_service_item/mto_service_item_creator_test.go b/pkg/services/mto_service_item/mto_service_item_creator_test.go index 2670cdb29cb..994cfa18d8a 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator_test.go +++ b/pkg/services/mto_service_item/mto_service_item_creator_test.go @@ -233,7 +233,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateMTOServiceItemWithInvalidMove mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) serviceItemForUnapprovedMove := suite.buildValidServiceItemWithInvalidMove() @@ -262,7 +261,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateMTOServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -1126,7 +1124,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateOriginSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -1176,7 +1173,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateOriginSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -1251,7 +1247,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateOriginSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -1387,7 +1382,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateOriginSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) _, _, err := creator.CreateMTOServiceItem(suite.AppContextForTest(), &serviceItemDOFSIT) @@ -1433,7 +1427,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateOriginSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) _, _, err := creator.CreateMTOServiceItem(suite.AppContextForTest(), &serviceItemDOFSIT) @@ -1469,7 +1462,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateOriginSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -1504,7 +1496,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateOriginSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -1538,7 +1529,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateOriginSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -1614,7 +1604,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateOriginSITServiceItemFailToCre mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -1649,7 +1638,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateDestSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -2006,7 +1994,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateDestSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) createdServiceItems, _, err := creator.CreateMTOServiceItem(suite.AppContextForTest(), &serviceItemDDASIT) @@ -2116,7 +2103,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateDestSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -2174,7 +2160,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateDestSITServiceItem() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -2460,7 +2445,6 @@ func (suite *MTOServiceItemServiceSuite) TestPriceEstimator() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -2759,7 +2743,6 @@ func (suite *MTOServiceItemServiceSuite) TestPriceEstimator() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(800, nil) creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) diff --git a/pkg/services/mto_service_item/mto_service_item_updater.go b/pkg/services/mto_service_item/mto_service_item_updater.go index 0a81d7ede20..be0c8900bf3 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -194,7 +194,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } if mtoShipment.PickupAddress != nil && mtoShipment.DestinationAddress != nil { - distance, err = p.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode, false) + distance, err = p.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) if err != nil { return 0, err } @@ -222,7 +222,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, // fuel surcharge if serviceItem.ReService.Code == models.ReServiceCodeFSC { if mtoShipment.PickupAddress != nil && mtoShipment.DestinationAddress != nil { - distance, err = p.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode, false) + distance, err = p.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) if err != nil { return 0, err } @@ -411,7 +411,7 @@ func (p *mtoServiceItemUpdater) updateServiceItem(appCtx appcontext.AppContext, serviceItem.ReService.Code == models.ReServiceCodeIDDSIT || serviceItem.ReService.Code == models.ReServiceCodeIDSFSC { // Destination SIT: distance between shipment destination address & service item ORIGINAL destination address - milesCalculated, err := p.planner.ZipTransitDistance(appCtx, mtoShipment.DestinationAddress.PostalCode, serviceItem.SITDestinationOriginalAddress.PostalCode, false) + milesCalculated, err := p.planner.ZipTransitDistance(appCtx, mtoShipment.DestinationAddress.PostalCode, serviceItem.SITDestinationOriginalAddress.PostalCode) if err != nil { return nil, err } @@ -425,7 +425,7 @@ func (p *mtoServiceItemUpdater) updateServiceItem(appCtx appcontext.AppContext, serviceItem.ReService.Code == models.ReServiceCodeIOPSIT || serviceItem.ReService.Code == models.ReServiceCodeIOSFSC { // Origin SIT: distance between shipment pickup address & service item ORIGINAL pickup address - milesCalculated, err := p.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, serviceItem.SITOriginHHGOriginalAddress.PostalCode, false) + milesCalculated, err := p.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, serviceItem.SITOriginHHGOriginalAddress.PostalCode) if err != nil { return nil, err } @@ -568,7 +568,7 @@ func (p *mtoServiceItemUpdater) UpdateMTOServiceItemPrime( func calculateOriginSITRequiredDeliveryDate(appCtx appcontext.AppContext, shipment models.MTOShipment, planner route.Planner, sitCustomerContacted *time.Time, sitDepartureDate *time.Time) (*time.Time, error) { // Get a distance calculation between pickup and destination addresses. - distance, err := planner.ZipTransitDistance(appCtx, shipment.PickupAddress.PostalCode, shipment.DestinationAddress.PostalCode, false) + distance, err := planner.ZipTransitDistance(appCtx, shipment.PickupAddress.PostalCode, shipment.DestinationAddress.PostalCode) if err != nil { return nil, apperror.NewUnprocessableEntityError("cannot calculate distance between pickup and destination addresses") @@ -814,8 +814,9 @@ func (p *mtoServiceItemUpdater) UpdateMTOServiceItem( pickupZip = mtoServiceItem.PODLocation.UsPostRegionCity.UsprZipID destZip = shipment.DestinationAddress.PostalCode } - // we need to get the mileage from DTOD first, the db proc will consume that - mileage, err := p.planner.ZipTransitDistance(appCtx, pickupZip, destZip, true) + // we need to get the mileage first, the db proc will consume that + // only international shipments will have POE/PODFSC service items + mileage, err := p.planner.ZipTransitDistance(appCtx, pickupZip, destZip) if err != nil { return err } diff --git a/pkg/services/mto_service_item/mto_service_item_updater_test.go b/pkg/services/mto_service_item/mto_service_item_updater_test.go index 0b95834f37f..7af20ed70d7 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater_test.go +++ b/pkg/services/mto_service_item/mto_service_item_updater_test.go @@ -52,7 +52,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -330,7 +329,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(1234, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -455,7 +453,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(1234, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -584,7 +581,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(1234, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -711,7 +707,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(1234, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -796,7 +791,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(1234, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -867,7 +861,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(1234, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -976,7 +969,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(1234, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -1092,7 +1084,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(1234, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -1253,7 +1244,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(1234, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -1364,7 +1354,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(1234, apperror.UnprocessableEntityError{}) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -1399,7 +1388,6 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.AnythingOfType("*appcontext.appContext"), "50314", "98158", - true, ).Return(1000, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -2177,7 +2165,6 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemStatus() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) diff --git a/pkg/services/mto_shipment/mto_shipment_address_updater.go b/pkg/services/mto_shipment/mto_shipment_address_updater.go index 4b6efc1d478..edab362940f 100644 --- a/pkg/services/mto_shipment/mto_shipment_address_updater.go +++ b/pkg/services/mto_shipment/mto_shipment_address_updater.go @@ -72,9 +72,9 @@ func UpdateOriginSITServiceItemSITDeliveryMiles(planner route.Planner, shipment // Origin SIT: distance between shipment pickup address & service item ORIGINAL pickup address if serviceItem.SITOriginHHGOriginalAddress != nil { - milesCalculated, err = planner.ZipTransitDistance(appCtx, newAddress.PostalCode, serviceItem.SITOriginHHGOriginalAddress.PostalCode, false) + milesCalculated, err = planner.ZipTransitDistance(appCtx, newAddress.PostalCode, serviceItem.SITOriginHHGOriginalAddress.PostalCode) } else { - milesCalculated, err = planner.ZipTransitDistance(appCtx, oldAddress.PostalCode, newAddress.PostalCode, false) + milesCalculated, err = planner.ZipTransitDistance(appCtx, oldAddress.PostalCode, newAddress.PostalCode) } if err != nil { return nil, err diff --git a/pkg/services/mto_shipment/mto_shipment_address_updater_test.go b/pkg/services/mto_shipment/mto_shipment_address_updater_test.go index 4eace1a7413..45bc30bd924 100644 --- a/pkg/services/mto_shipment/mto_shipment_address_updater_test.go +++ b/pkg/services/mto_shipment/mto_shipment_address_updater_test.go @@ -19,7 +19,6 @@ func (suite *MTOShipmentServiceSuite) TestUpdateMTOShipmentAddress() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) addressCreator := address.NewAddressCreator() addressUpdater := address.NewAddressUpdater() @@ -170,7 +169,6 @@ func (suite *MTOShipmentServiceSuite) TestUpdateMTOShipmentAddress() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(465, nil) mtoServiceItems, _ := UpdateOriginSITServiceItemSITDeliveryMiles(planner, &externalShipment, &newAddress, &oldAddress, suite.AppContextForTest()) suite.Equal(2, len(*mtoServiceItems)) diff --git a/pkg/services/mto_shipment/mto_shipment_updater.go b/pkg/services/mto_shipment/mto_shipment_updater.go index cb36634cec8..a2018f21ece 100644 --- a/pkg/services/mto_shipment/mto_shipment_updater.go +++ b/pkg/services/mto_shipment/mto_shipment_updater.go @@ -879,7 +879,7 @@ func (f *mtoShipmentUpdater) updateShipmentRecord(appCtx appcontext.AppContext, destZip = newShipment.DestinationAddress.PostalCode } // we need to get the mileage from DTOD first, the db proc will consume that - mileage, err := f.planner.ZipTransitDistance(appCtx, pickupZip, destZip, true) + mileage, err := f.planner.ZipTransitDistance(appCtx, pickupZip, destZip) if err != nil { return err } @@ -1193,9 +1193,7 @@ func reServiceCodesForShipment(shipment models.MTOShipment) []models.ReServiceCo // the value returned to make a fetch on the ghc_domestic_transit_times table and returns a required delivery date // based on the max_days_transit_time. func CalculateRequiredDeliveryDate(appCtx appcontext.AppContext, planner route.Planner, pickupAddress models.Address, destinationAddress models.Address, pickupDate time.Time, weight int, marketCode models.MarketCode, moveID uuid.UUID, shipmentType models.MTOShipmentType) (*time.Time, error) { - internationalShipment := marketCode == models.MarketCodeInternational - - distance, err := planner.ZipTransitDistance(appCtx, pickupAddress.PostalCode, destinationAddress.PostalCode, internationalShipment) + distance, err := planner.ZipTransitDistance(appCtx, pickupAddress.PostalCode, destinationAddress.PostalCode) if err != nil { return nil, err } @@ -1397,11 +1395,11 @@ func UpdateDestinationSITServiceItemsSITDeliveryMiles(planner route.Planner, app if TOOApprovalRequired { if serviceItem.SITDestinationOriginalAddress != nil { // if TOO approval was required, shipment destination address has been updated at this point - milesCalculated, err = planner.ZipTransitDistance(appCtx, shipment.DestinationAddress.PostalCode, serviceItem.SITDestinationOriginalAddress.PostalCode, false) + milesCalculated, err = planner.ZipTransitDistance(appCtx, shipment.DestinationAddress.PostalCode, serviceItem.SITDestinationOriginalAddress.PostalCode) } } else { // if TOO approval was not required, use the newAddress - milesCalculated, err = planner.ZipTransitDistance(appCtx, newAddress.PostalCode, serviceItem.SITDestinationOriginalAddress.PostalCode, false) + milesCalculated, err = planner.ZipTransitDistance(appCtx, newAddress.PostalCode, serviceItem.SITDestinationOriginalAddress.PostalCode) } if err != nil { return err diff --git a/pkg/services/mto_shipment/mto_shipment_updater_test.go b/pkg/services/mto_shipment/mto_shipment_updater_test.go index d828c679b61..3d022b18b7a 100644 --- a/pkg/services/mto_shipment/mto_shipment_updater_test.go +++ b/pkg/services/mto_shipment/mto_shipment_updater_test.go @@ -52,7 +52,6 @@ func (suite *MTOShipmentServiceSuite) TestMTOShipmentUpdater() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(1000, nil) moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher()) waf := entitlements.NewWeightAllotmentFetcher() @@ -467,13 +466,11 @@ func (suite *MTOShipmentServiceSuite) TestMTOShipmentUpdater() { mock.AnythingOfType("*appcontext.appContext"), "50314", "99505", - true, ).Return(1000, nil) planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "97220", "99505", - true, ).Return(1000, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -670,13 +667,11 @@ func (suite *MTOShipmentServiceSuite) TestMTOShipmentUpdater() { mock.AnythingOfType("*appcontext.appContext"), "50314", "99505", - true, ).Return(1000, nil) planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "50314", "97220", - true, ).Return(1000, nil) ghcDomesticTransitTime := models.GHCDomesticTransitTime{ @@ -2194,7 +2189,6 @@ func (suite *MTOShipmentServiceSuite) TestUpdateMTOShipmentStatus() { mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("string"), mock.AnythingOfType("string"), - false, ).Return(500, nil).Run(func(args mock.Arguments) { TransitDistancePickupArg = args.Get(1).(string) TransitDistanceDestinationArg = args.Get(2).(string) @@ -3568,7 +3562,6 @@ func (suite *MTOShipmentServiceSuite) TestUpdateStatusServiceItems() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) updater := NewMTOShipmentStatusUpdater(builder, siCreator, planner) diff --git a/pkg/services/mto_shipment/shipment_approver.go b/pkg/services/mto_shipment/shipment_approver.go index 801507ea7a6..1266e111382 100644 --- a/pkg/services/mto_shipment/shipment_approver.go +++ b/pkg/services/mto_shipment/shipment_approver.go @@ -111,8 +111,8 @@ func (f *shipmentApprover) ApproveShipment(appCtx appcontext.AppContext, shipmen pickupZip = *portZip destZip = shipment.DestinationAddress.PostalCode } - // we need to get the mileage from DTOD first, the db proc will consume that - mileage, err := f.planner.ZipTransitDistance(appCtx, pickupZip, destZip, true) + // we need to get the mileage first, the db proc will consume that + mileage, err := f.planner.ZipTransitDistance(appCtx, pickupZip, destZip) if err != nil { return err } diff --git a/pkg/services/mto_shipment/shipment_approver_test.go b/pkg/services/mto_shipment/shipment_approver_test.go index 418174b4a5f..85a8f8f3ac2 100644 --- a/pkg/services/mto_shipment/shipment_approver_test.go +++ b/pkg/services/mto_shipment/shipment_approver_test.go @@ -122,7 +122,6 @@ func (suite *MTOShipmentServiceSuite) createApproveShipmentSubtestData() (subtes mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) ppmEstimator := &servicesMocks.PPMEstimator{} queryBuilder := query.NewQueryBuilder() @@ -351,7 +350,6 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - true, ).Return(500, nil) // Approve international shipment @@ -731,7 +729,6 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(500, nil) preApprovalTime := time.Now() @@ -851,7 +848,6 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() { mock.AnythingOfType("*appcontext.appContext"), createdShipment.PickupAddress.PostalCode, createdShipment.DestinationAddress.PostalCode, - false, ).Return(500, nil) shipmentHeavyEtag := etag.GenerateEtag(shipmentHeavy.UpdatedAt) @@ -1127,7 +1123,6 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() { mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("string"), mock.AnythingOfType("string"), - false, ).Return(500, nil).Run(func(args mock.Arguments) { TransitDistancePickupArg = args.Get(1).(string) TransitDistanceDestinationArg = args.Get(2).(string) @@ -1182,7 +1177,6 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() { mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("string"), mock.AnythingOfType("string"), - false, ).Return(500, nil) suite.Equal(8000, *shipment.MoveTaskOrder.Orders.Entitlement.AuthorizedWeight()) @@ -1223,7 +1217,6 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() { mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("string"), mock.AnythingOfType("string"), - false, ).Return(500, nil) shipmentEtag := etag.GenerateEtag(shipment.UpdatedAt) diff --git a/pkg/services/mto_shipment/shipment_deleter_test.go b/pkg/services/mto_shipment/shipment_deleter_test.go index 150e1496ce0..204ff1d157c 100644 --- a/pkg/services/mto_shipment/shipment_deleter_test.go +++ b/pkg/services/mto_shipment/shipment_deleter_test.go @@ -30,7 +30,6 @@ func (suite *MTOShipmentServiceSuite) TestShipmentDeleter() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator { @@ -261,7 +260,6 @@ func (suite *MTOShipmentServiceSuite) TestPrimeShipmentDeleter() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) setUpSignedCertificationCreatorMock := func(returnValue ...interface{}) services.SignedCertificationCreator { diff --git a/pkg/services/orchestrators/shipment/shipment_updater_test.go b/pkg/services/orchestrators/shipment/shipment_updater_test.go index 6a49b251cde..50feaed241f 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater_test.go +++ b/pkg/services/orchestrators/shipment/shipment_updater_test.go @@ -581,8 +581,6 @@ func (suite *ShipmentSuite) TestUpdateShipment() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, - false, ).Return(800, nil) returnCents := unit.Cents(123) diff --git a/pkg/services/payment_request/payment_request_creator_test.go b/pkg/services/payment_request/payment_request_creator_test.go index 6c44677c2e8..ecff224d66a 100644 --- a/pkg/services/payment_request/payment_request_creator_test.go +++ b/pkg/services/payment_request/payment_request_creator_test.go @@ -327,7 +327,6 @@ func (suite *PaymentRequestServiceSuite) TestCreatePaymentRequest() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(0, nil) }) @@ -569,7 +568,6 @@ func (suite *PaymentRequestServiceSuite) TestCreatePaymentRequest() { mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(0, nil) failingCreator := NewPaymentRequestCreator(planner, failingServiceItemPricer) @@ -1461,7 +1459,6 @@ func (suite *PaymentRequestServiceSuite) TestCreatePaymentRequestCheckOnNTSRelea mock.AnythingOfType("*appcontext.appContext"), testStorageFacilityZip, testDestinationZip, - false, ).Return(testZip3Distance, nil) // Create an initial payment request. diff --git a/pkg/services/payment_request/payment_request_recalculator_test.go b/pkg/services/payment_request/payment_request_recalculator_test.go index 94b21d42e71..8e7e645d8ee 100644 --- a/pkg/services/payment_request/payment_request_recalculator_test.go +++ b/pkg/services/payment_request/payment_request_recalculator_test.go @@ -55,7 +55,6 @@ func (suite *PaymentRequestServiceSuite) TestRecalculatePaymentRequestSuccess() mock.AnythingOfType("*appcontext.appContext"), recalculateTestPickupZip, recalculateTestDestinationZip, - false, ).Return(recalculateTestZip3Distance, nil) // Create an initial payment request. @@ -296,7 +295,6 @@ func (suite *PaymentRequestServiceSuite) TestRecalculatePaymentRequestErrors() { mock.AnythingOfType("*appcontext.appContext"), recalculateTestPickupZip, recalculateTestDestinationZip, - false, ).Return(recalculateTestZip3Distance, nil) // Create an initial payment request. diff --git a/pkg/services/payment_request/payment_request_shipment_recalculate_test.go b/pkg/services/payment_request/payment_request_shipment_recalculate_test.go index d308e237efb..238a622bc90 100644 --- a/pkg/services/payment_request/payment_request_shipment_recalculate_test.go +++ b/pkg/services/payment_request/payment_request_shipment_recalculate_test.go @@ -27,7 +27,6 @@ func (suite *PaymentRequestServiceSuite) TestRecalculateShipmentPaymentRequestSu mock.AnythingOfType("*appcontext.appContext"), recalculateTestPickupZip, recalculateTestDestinationZip, - false, ).Return(recalculateTestZip3Distance, nil) // Create an initial payment request. @@ -137,7 +136,6 @@ func (suite *PaymentRequestServiceSuite) TestRecalculateShipmentPaymentRequestEr mock.AnythingOfType("*appcontext.appContext"), recalculateTestPickupZip, recalculateTestDestinationZip, - false, ).Return(recalculateTestZip3Distance, nil) creator := NewPaymentRequestCreator(mockPlanner, ghcrateengine.NewServiceItemPricer()) diff --git a/pkg/services/ppm_closeout/ppm_closeout_test.go b/pkg/services/ppm_closeout/ppm_closeout_test.go index cc0fff6a390..2de07717f92 100644 --- a/pkg/services/ppm_closeout/ppm_closeout_test.go +++ b/pkg/services/ppm_closeout/ppm_closeout_test.go @@ -337,7 +337,7 @@ func (suite *PPMCloseoutSuite) TestPPMShipmentCloseout() { appCtx := suite.AppContextForTest() mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) mockedPaymentRequestHelper.On( "FetchServiceParamsForServiceItems", @@ -393,7 +393,7 @@ func (suite *PPMCloseoutSuite) TestPPMShipmentCloseout() { appCtx := suite.AppContextForTest() mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) mockedPaymentRequestHelper.On( "FetchServiceParamsForServiceItems", diff --git a/pkg/services/ppmshipment/ppm_estimator.go b/pkg/services/ppmshipment/ppm_estimator.go index d162aa3a722..290397a0a09 100644 --- a/pkg/services/ppmshipment/ppm_estimator.go +++ b/pkg/services/ppmshipment/ppm_estimator.go @@ -798,13 +798,13 @@ func (f *estimatePPM) CalculateOCONUSIncentive(appCtx appcontext.AppContext, ppm mileage = 0 case isPickupOconus && !isDestinationOconus: // OCONUS -> CONUS (port ZIP -> address ZIP) - mileage, err = f.planner.ZipTransitDistance(appCtx, ppmPort.UsPostRegionCity.UsprZipID, destinationAddress.PostalCode, true) + mileage, err = f.planner.ZipTransitDistance(appCtx, ppmPort.UsPostRegionCity.UsprZipID, destinationAddress.PostalCode) if err != nil { return nil, fmt.Errorf("failed to calculate OCONUS to CONUS mileage: %w", err) } case !isPickupOconus && isDestinationOconus: // CONUS -> OCONUS (address ZIP -> port ZIP) - mileage, err = f.planner.ZipTransitDistance(appCtx, pickupAddress.PostalCode, ppmPort.UsPostRegionCity.UsprZipID, true) + mileage, err = f.planner.ZipTransitDistance(appCtx, pickupAddress.PostalCode, ppmPort.UsPostRegionCity.UsprZipID) if err != nil { return nil, fmt.Errorf("failed to calculate CONUS to OCONUS mileage: %w", err) } diff --git a/pkg/services/ppmshipment/ppm_estimator_test.go b/pkg/services/ppmshipment/ppm_estimator_test.go index f384223e3ba..30ac0f8315d 100644 --- a/pkg/services/ppmshipment/ppm_estimator_test.go +++ b/pkg/services/ppmshipment/ppm_estimator_test.go @@ -492,13 +492,13 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) linehaul, fuel, origin, dest, packing, unpacking, _, err := ppmEstimator.PriceBreakdown(suite.AppContextForTest(), &ppmShipment) suite.NilOrNoVerrs(err) mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false) + "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) suite.Equal(unit.Pound(4000), *ppmShipment.EstimatedWeight) @@ -537,13 +537,13 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) ppmEstimate, _, err := ppmEstimator.EstimateIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false) + "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) suite.Equal(oldPPMShipment.PickupAddress.PostalCode, newPPM.PickupAddress.PostalCode) @@ -574,13 +574,13 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) ppmEstimate, _, err := ppmEstimator.EstimateIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false) + "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) suite.Equal(oldPPMShipment.PickupAddress.PostalCode, newPPM.PickupAddress.PostalCode) @@ -608,13 +608,13 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) ppmEstimate, _, err := ppmEstimator.EstimateIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false) + "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) suite.Equal(oldPPMShipment.PickupAddress.PostalCode, newPPM.PickupAddress.PostalCode) @@ -642,13 +642,13 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) ppmEstimate, _, err := ppmEstimator.EstimateIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false) + "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) suite.Equal(oldPPMShipment.PickupAddress.PostalCode, newPPM.PickupAddress.PostalCode) @@ -678,7 +678,7 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil).Once() + "50309", "30813").Return(2294, nil).Once() ppmEstimate, _, err := ppmEstimator.EstimateIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) @@ -765,13 +765,13 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { mock.AnythingOfType("[]models.MTOServiceItem")).Return(serviceParams, nil) mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) maxIncentive, err := ppmEstimator.MaxIncentive(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false) + "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) suite.Equal(unit.Cents(128398858), *maxIncentive) @@ -826,13 +826,13 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) ppmFinal, err := ppmEstimator.FinalIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false) + "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) suite.Equal(oldPPMShipment.ActualPickupPostalCode, newPPM.ActualPickupPostalCode) @@ -877,12 +877,12 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { mock.AnythingOfType("[]models.MTOServiceItem")).Return(serviceParams, nil) // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles - mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "50309", "30813", false).Return(2294, nil) + mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "50309", "30813").Return(2294, nil) ppmFinal, err := ppmEstimator.FinalIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) - mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "50309", "30813", false) + mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) suite.Equal(oldPPMShipment.ActualPickupPostalCode, newPPM.ActualPickupPostalCode) @@ -928,12 +928,12 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) ppmFinalIncentiveLimitedByAllowableWeight, err := ppmEstimator.FinalIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) - mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "50309", "30813", false) + mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) suite.Equal(oldPPMShipment.ActualPickupPostalCode, newPPM.ActualPickupPostalCode) @@ -983,13 +983,13 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) ppmFinal, err := ppmEstimator.FinalIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false) + "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) suite.Equal(oldPPMShipment.ActualPickupPostalCode, newPPM.ActualPickupPostalCode) @@ -1040,13 +1040,13 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) ppmFinal, err := ppmEstimator.FinalIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false) + "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) originalWeight, newWeight := SumWeightTickets(oldPPMShipment, newPPM) @@ -1102,13 +1102,13 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) ppmFinal, err := ppmEstimator.FinalIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false) + "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) originalWeight, newWeight := SumWeightTickets(oldPPMShipment, newPPM) @@ -1172,13 +1172,13 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { // DTOD distance is going to be less than the HHG Rand McNally distance of 2361 miles mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) ppmFinal, err := ppmEstimator.FinalIncentiveWithDefaultChecks(suite.AppContextForTest(), oldPPMShipment, &newPPM) suite.NilOrNoVerrs(err) mockedPlanner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false) + "50309", "30813") mockedPaymentRequestHelper.AssertCalled(suite.T(), "FetchServiceParamsForServiceItems", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("[]models.MTOServiceItem")) originalWeight, newWeight := SumWeightTickets(oldPPMShipment, newPPM) @@ -1669,7 +1669,7 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { }, nil) mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) _, estimatedSITCost, err := ppmEstimator.EstimateIncentiveWithDefaultChecks(suite.AppContextForTest(), models.PPMShipment{}, &shipmentOriginSIT) @@ -1731,7 +1731,7 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { }, nil) mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) _, estimatedSITCost, err := ppmEstimator.EstimateIncentiveWithDefaultChecks(suite.AppContextForTest(), models.PPMShipment{}, &shipmentDestinationSIT) @@ -1769,7 +1769,7 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { }, }, nil) mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30813", false).Return(2294, nil) + "50309", "30813").Return(2294, nil) _, estimatedSITCost, err := ppmEstimator.EstimateIncentiveWithDefaultChecks(suite.AppContextForTest(), models.PPMShipment{}, &shipmentOriginSIT) @@ -1959,10 +1959,10 @@ func (suite *PPMShipmentSuite) TestPPMEstimator() { shipmentDifferentDeparture.ExpectedDepartureDate = originalShipment.ExpectedDepartureDate.Add(time.Hour * 24 * 70) mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "90211", "30813", false).Return(2294, nil) + "90211", "30813").Return(2294, nil) mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "30814", false).Return(2290, nil) + "50309", "30814").Return(2290, nil) // SIT specific field changes will likely cause the price to change, although adjusting dates may not change // the total number of days in SIT. @@ -2086,7 +2086,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { newPPM.EstimatedWeight = &estimatedWeight planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "74133", "98421", true).Return(3000, nil) + "74133", "98421").Return(3000, nil) ppmEstimate, _, err := ppmEstimator.EstimateIncentiveWithDefaultChecks(suite.AppContextForTest(), ppm, &newPPM) suite.NilOrNoVerrs(err) @@ -2094,7 +2094,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { // it should've called from the pickup -> port and NOT pickup -> dest planner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "74133", "98421", true) + "74133", "98421") suite.Equal(unit.Cents(459178), *ppmEstimate) }) @@ -2133,7 +2133,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { newPPM.EstimatedWeight = &estimatedWeight planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "98421", "74133", true).Return(3000, nil) + "98421", "74133").Return(3000, nil) ppmEstimate, _, err := ppmEstimator.EstimateIncentiveWithDefaultChecks(suite.AppContextForTest(), ppm, &newPPM) suite.NilOrNoVerrs(err) @@ -2141,7 +2141,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { // it should've called from the pickup -> port and NOT pickup -> dest planner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "98421", "74133", true) + "98421", "74133") suite.Equal(unit.Cents(423178), *ppmEstimate) }) }) @@ -2215,7 +2215,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { // DTOD will be called to get the distance between the origin duty location & the Tacoma Port ZIP planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "98421", true).Return(3000, nil) + "50309", "98421").Return(3000, nil) ppmMaxIncentive, err := ppmEstimator.MaxIncentive(suite.AppContextForTest(), ppm, &newPPM) suite.NilOrNoVerrs(err) @@ -2223,7 +2223,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { // it should've called from the pickup -> port and NOT pickup -> dest planner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "50309", "98421", true) + "50309", "98421") suite.Equal(unit.Cents(656532), *ppmMaxIncentive) }) @@ -2295,7 +2295,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { // DTOD will be called to get the distance between the origin duty location & the Tacoma Port ZIP planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "98421", "30813", true).Return(3000, nil) + "98421", "30813").Return(3000, nil) ppmMaxIncentive, err := ppmEstimator.MaxIncentive(suite.AppContextForTest(), ppm, &newPPM) suite.NilOrNoVerrs(err) @@ -2303,7 +2303,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { // it should've called from the pickup -> port and NOT pickup -> dest planner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "98421", "30813", true) + "98421", "30813") suite.Equal(unit.Cents(676692), *ppmMaxIncentive) }) }) @@ -2362,7 +2362,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { setupPricerData() planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "74133", "98421", true).Return(3000, nil) + "74133", "98421").Return(3000, nil) ppmFinalIncentive, err := ppmEstimator.FinalIncentiveWithDefaultChecks(suite.AppContextForTest(), ppm, &newPPM) suite.NilOrNoVerrs(err) @@ -2370,7 +2370,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { // it should've called from the pickup -> port and NOT pickup -> dest planner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "74133", "98421", true) + "74133", "98421") suite.Equal(unit.Cents(459178), *ppmFinalIncentive) }) @@ -2427,7 +2427,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { setupPricerData() planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "98421", "74133", true).Return(3000, nil) + "98421", "74133").Return(3000, nil) ppmFinalIncentive, err := ppmEstimator.FinalIncentiveWithDefaultChecks(suite.AppContextForTest(), ppm, &newPPM) suite.NilOrNoVerrs(err) @@ -2435,7 +2435,7 @@ func (suite *PPMShipmentSuite) TestInternationalPPMEstimator() { // it should've called from the pickup -> port and NOT pickup -> dest planner.AssertCalled(suite.T(), "ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "98421", "74133", true) + "98421", "74133") suite.Equal(unit.Cents(423178), *ppmFinalIncentive) }) }) diff --git a/pkg/services/ppmshipment/ppm_shipment_updater_test.go b/pkg/services/ppmshipment/ppm_shipment_updater_test.go index 3ee017878b4..33263dc2ade 100644 --- a/pkg/services/ppmshipment/ppm_shipment_updater_test.go +++ b/pkg/services/ppmshipment/ppm_shipment_updater_test.go @@ -1504,7 +1504,7 @@ func (suite *PPMShipmentSuite) TestUpdatePPMShipment() { originalPPM.DestinationAddress = destinationAddress mockedPlanner := &routemocks.Planner{} mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "90210", "30813", false).Return(2294, nil) + "90210", "30813").Return(2294, nil) updatedPPM, err := subtestData.ppmShipmentUpdater.UpdatePPMShipmentSITEstimatedCost(appCtx, &originalPPM) @@ -1520,6 +1520,8 @@ func (suite *PPMShipmentSuite) TestUpdatePPMShipment() { subtestData := setUpForTests(newFakeEstimatedIncentive, newFakeSITEstimatedCost, nil, nil) sitLocationDestination := models.SITLocationTypeDestination entryDate := time.Date(2020, time.March, 15, 0, 0, 0, 0, time.UTC) + // we do not have a contract for this date + invalidDate := time.Date(2017, time.March, 15, 0, 0, 0, 0, time.UTC) streetAddress1 := "10642 N Second Ave" streetAddress2 := "Apt. 308" city := "Atco" @@ -1542,7 +1544,7 @@ func (suite *PPMShipmentSuite) TestUpdatePPMShipment() { originalPPM := factory.BuildPPMShipment(suite.DB(), []factory.Customization{ { Model: models.PPMShipment{ - ExpectedDepartureDate: entryDate.Add(time.Hour * 24 * 30), + ExpectedDepartureDate: invalidDate, SITExpected: models.BoolPointer(true), SITLocation: &sitLocationDestination, SITEstimatedEntryDate: &entryDate, @@ -1560,7 +1562,7 @@ func (suite *PPMShipmentSuite) TestUpdatePPMShipment() { originalPPM.DestinationAddress = destinationAddress mockedPlanner := &routemocks.Planner{} mockedPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "90210", "30813", false).Return(2294, nil) + "90210", "30813").Return(2294, nil) updatedPPM, err := subtestData.ppmShipmentUpdater.UpdatePPMShipmentSITEstimatedCost(appCtx, &originalPPM) diff --git a/pkg/services/reweigh/reweigh_updater_test.go b/pkg/services/reweigh/reweigh_updater_test.go index c1501906a98..ad2ab0da981 100644 --- a/pkg/services/reweigh/reweigh_updater_test.go +++ b/pkg/services/reweigh/reweigh_updater_test.go @@ -31,7 +31,6 @@ func (suite *ReweighSuite) TestReweighUpdater() { mockPlanner.On("ZipTransitDistance", recalculateTestPickupZip, recalculateTestDestinationZip, - false, ).Return(recalculateTestZip3Distance, nil) // Get shipment payment request recalculator service diff --git a/pkg/services/shipment_address_update/shipment_address_update_requester.go b/pkg/services/shipment_address_update/shipment_address_update_requester.go index 3acd31b33fb..8fdb3b5c1e0 100644 --- a/pkg/services/shipment_address_update/shipment_address_update_requester.go +++ b/pkg/services/shipment_address_update/shipment_address_update_requester.go @@ -38,10 +38,10 @@ func NewShipmentAddressUpdateRequester(planner route.Planner, addressCreator ser } } -func (f *shipmentAddressUpdateRequester) isAddressChangeDistanceOver50(appCtx appcontext.AppContext, addressUpdate models.ShipmentAddressUpdate, isInternationalShipment bool) (bool, error) { +func (f *shipmentAddressUpdateRequester) isAddressChangeDistanceOver50(appCtx appcontext.AppContext, addressUpdate models.ShipmentAddressUpdate) (bool, error) { // We calculate and set the distance between the old and new address - distance, err := f.planner.ZipTransitDistance(appCtx, addressUpdate.OriginalAddress.PostalCode, addressUpdate.NewAddress.PostalCode, isInternationalShipment) + distance, err := f.planner.ZipTransitDistance(appCtx, addressUpdate.OriginalAddress.PostalCode, addressUpdate.NewAddress.PostalCode) if err != nil { return false, err } @@ -122,11 +122,12 @@ func (f *shipmentAddressUpdateRequester) doesDeliveryAddressUpdateChangeMileageB return false, nil } - previousDistance, err := f.planner.ZipTransitDistance(appCtx, originalPickupAddress.PostalCode, originalDeliveryAddress.PostalCode, false) + // this only runs for domestic shipments so putting false for the isInternationalShipment value here + previousDistance, err := f.planner.ZipTransitDistance(appCtx, originalPickupAddress.PostalCode, originalDeliveryAddress.PostalCode) if err != nil { return false, err } - newDistance, err := f.planner.ZipTransitDistance(appCtx, originalPickupAddress.PostalCode, newDeliveryAddress.PostalCode, false) + newDistance, err := f.planner.ZipTransitDistance(appCtx, originalPickupAddress.PostalCode, newDeliveryAddress.PostalCode) if err != nil { return false, err } @@ -354,14 +355,14 @@ func (f *shipmentAddressUpdateRequester) RequestShipmentDeliveryAddressUpdate(ap if addressUpdate.NewSitDistanceBetween != nil { distanceBetweenOld = *addressUpdate.NewSitDistanceBetween } else { - distanceBetweenOld, err = f.planner.ZipTransitDistance(appCtx, addressUpdate.SitOriginalAddress.PostalCode, addressUpdate.OriginalAddress.PostalCode, false) + distanceBetweenOld, err = f.planner.ZipTransitDistance(appCtx, addressUpdate.SitOriginalAddress.PostalCode, addressUpdate.OriginalAddress.PostalCode) } if err != nil { return nil, err } // calculating distance between the new address update & the SIT - distanceBetweenNew, err = f.planner.ZipTransitDistance(appCtx, addressUpdate.SitOriginalAddress.PostalCode, addressUpdate.NewAddress.PostalCode, false) + distanceBetweenNew, err = f.planner.ZipTransitDistance(appCtx, addressUpdate.SitOriginalAddress.PostalCode, addressUpdate.NewAddress.PostalCode) if err != nil { return nil, err } @@ -418,7 +419,7 @@ func (f *shipmentAddressUpdateRequester) RequestShipmentDeliveryAddressUpdate(ap } if !updateNeedsTOOReview { - updateNeedsTOOReview, err = f.isAddressChangeDistanceOver50(appCtx, addressUpdate, isInternationalShipment) + updateNeedsTOOReview, err = f.isAddressChangeDistanceOver50(appCtx, addressUpdate) if err != nil { return nil, err } @@ -698,8 +699,8 @@ func (f *shipmentAddressUpdateRequester) ReviewShipmentAddressChange(appCtx appc pickupZip = *portZip destZip = shipment.DestinationAddress.PostalCode } - // we need to get the mileage from DTOD first, the db proc will consume that - mileage, err := f.planner.ZipTransitDistance(appCtx, pickupZip, destZip, true) + // we need to get the mileage first, the db proc will consume that + mileage, err := f.planner.ZipTransitDistance(appCtx, pickupZip, destZip) if err != nil { return err } diff --git a/pkg/services/shipment_address_update/shipment_address_update_requester_test.go b/pkg/services/shipment_address_update/shipment_address_update_requester_test.go index c955d604541..84e1c17b28b 100644 --- a/pkg/services/shipment_address_update/shipment_address_update_requester_test.go +++ b/pkg/services/shipment_address_update/shipment_address_update_requester_test.go @@ -108,13 +108,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddres mock.AnythingOfType("*appcontext.appContext"), "90210", "94535", - false, ).Return(2500, nil).Twice() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94535", "94535", - false, ).Return(2500, nil).Once() move := setupTestData() shipment := factory.BuildMTOShipmentWithMove(&move, suite.DB(), nil, nil) @@ -148,13 +146,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddres mock.AnythingOfType("*appcontext.appContext"), "90210", "94535", - false, ).Return(2500, nil).Twice() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94535", "94535", - false, ).Return(2500, nil).Once() move := setupTestData() @@ -217,7 +213,6 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddres mock.AnythingOfType("*appcontext.appContext"), "99505", "99506", - true, ).Return(49, nil) move := setupTestData() @@ -298,7 +293,6 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddres mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("string"), mock.AnythingOfType("string"), - false, ).Return(0, fmt.Errorf("error calculating distance 2")).Once() testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ @@ -438,13 +432,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddres mock.AnythingOfType("*appcontext.appContext"), "90210", "94535", - false, ).Return(2500, nil).Times(4) mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94535", "94535", - false, ).Return(2500, nil).Twice() update, err := addressUpdateRequester.RequestShipmentDeliveryAddressUpdate(suite.AppContextForTest(), shipment.ID, newAddress, "we really need to change the address", etag.GenerateEtag(shipment.UpdatedAt)) @@ -470,13 +462,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddres mock.AnythingOfType("*appcontext.appContext"), "89523", "89503", - false, ).Return(2500, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "89523", "90210", - false, ).Return(2500, nil).Once() newAddress := models.Address{ StreetAddress1: "123 Any St", @@ -517,13 +507,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddres mock.AnythingOfType("*appcontext.appContext"), "89523", "89503", - false, ).Return(2500, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "89523", "90210", - false, ).Return(2500, nil).Once() move := setupTestData() shipment := factory.BuildMTOShipmentWithMove(&move, suite.DB(), []factory.Customization{ @@ -564,13 +552,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddres mock.AnythingOfType("*appcontext.appContext"), "90210", "94535", - false, ).Return(0, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "90210", "89503", - false, ).Return(200, nil).Once() testdatagen.MakeReContractYear(suite.DB(), testdatagen.Assertions{ ReContractYear: models.ReContractYear{ @@ -693,13 +679,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddres mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("string"), "87108", - false, ).Return(500, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.AnythingOfType("string"), "87053", - false, ).Return(501, nil).Once() suite.NotEmpty(move.MTOShipments) update, err := addressUpdateRequester.RequestShipmentDeliveryAddressUpdate(suite.AppContextForTest(), shipment.ID, newAddress, "we really need to change the address", etag.GenerateEtag(shipment.UpdatedAt)) @@ -753,19 +737,16 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddres mock.AnythingOfType("*appcontext.appContext"), "94535", "94535", - false, ).Return(0, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94523", "90210", - false, ).Return(500, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94535", "90210", - false, ).Return(501, nil).Once() // request the update @@ -836,19 +817,16 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddres mock.AnythingOfType("*appcontext.appContext"), "94535", "94535", - false, ).Return(0, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94523", "99695", - false, ).Return(500, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94535", "99695", - false, ).Return(1000, nil).Once() // request the update @@ -875,7 +853,6 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) addressUpdateRequester := NewShipmentAddressUpdateRequester(mockPlanner, addressCreator, moveRouter) @@ -1252,14 +1229,12 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(300, nil) mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - true, ).Return(300, nil) newDestUSPRC, err := models.FindByZipCode(suite.AppContextForTest().DB(), "99703") @@ -1470,7 +1445,6 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(300, nil) newDestUSPRC, err := models.FindByZipCode(suite.AppContextForTest().DB(), "99703") @@ -1574,13 +1548,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp mock.AnythingOfType("*appcontext.appContext"), "89523", "89503", - false, ).Return(2500, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "89523", "90210", - false, ).Return(2500, nil).Once() move := setupTestData() @@ -1645,13 +1617,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp mock.AnythingOfType("*appcontext.appContext"), "89523", "89503", - false, ).Return(2500, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "89523", "90210", - false, ).Return(2500, nil).Once() move := setupTestData() @@ -1731,13 +1701,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp mock.AnythingOfType("*appcontext.appContext"), "90210", "94535", - false, ).Return(2500, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94535", "94535", - false, ).Return(2500, nil).Once() addressChange, _ := addressUpdateRequester.RequestShipmentDeliveryAddressUpdate(suite.AppContextForTest(), shipment.ID, newAddress, "we really need to change the address", etag.GenerateEtag(shipment.UpdatedAt)) @@ -1759,13 +1727,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp mock.AnythingOfType("*appcontext.appContext"), "89523", "89503", - false, ).Return(2500, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "89523", "90210", - false, ).Return(2500, nil).Once() move := setupTestData() @@ -1825,13 +1791,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp mock.AnythingOfType("*appcontext.appContext"), "89523", "89503", - false, ).Return(2500, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "89523", "90210", - false, ).Return(2500, nil).Once() newAddress := models.Address{ StreetAddress1: "123 Any St", @@ -1890,7 +1854,6 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp mock.AnythingOfType("*appcontext.appContext"), "94535", "94535", - false, ).Return(30, nil) move := setupTestData() shipment := factory.BuildMTOShipmentWithMove(&move, suite.DB(), nil, nil) diff --git a/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go b/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go index 8365e8cdb29..b99c2842336 100644 --- a/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go +++ b/pkg/services/shipment_summary_worksheet/shipment_summary_worksheet_test.go @@ -1968,7 +1968,7 @@ func (suite *ShipmentSummaryWorksheetServiceSuite) TestFormatDisbursement() { // Test case 1: GTCC calculation B is less than GTCC calculation A // Additionally, Member should not be less than 0 - expectedResult := "GTCC: " + FormatDollars(100.00) + "\nMember: " + FormatDollars(100.00) + expectedResult := "GTCC: " + FormatDollars(100.00) + "\nMember: " + FormatDollars(0.00) expensesMap["TotalGTCCPaid"] = 200.00 expensesMap["StorageGTCCPaid"] = 300.00 ppmRemainingEntitlement := 60.00 @@ -1977,7 +1977,7 @@ func (suite *ShipmentSummaryWorksheetServiceSuite) TestFormatDisbursement() { suite.Equal(expectedResult, result) // Test case 2: GTCC calculation A is less than GTCC calculation B - expectedResult = "GTCC: " + FormatDollars(100.00) + "\nMember: " + FormatDollars(500.00) + expectedResult = "GTCC: " + FormatDollars(100.00) + "\nMember: " + FormatDollars(400.00) expensesMap = make(map[string]float64) expensesMap["TotalGTCCPaid"] = 60.00 expensesMap["StorageGTCCPaid"] = 40.00 diff --git a/pkg/services/sit_extension/sit_extension_denier.go b/pkg/services/sit_extension/sit_extension_denier.go index 9f019a0c47c..a9f213ea251 100644 --- a/pkg/services/sit_extension/sit_extension_denier.go +++ b/pkg/services/sit_extension/sit_extension_denier.go @@ -34,7 +34,6 @@ func NewSITExtensionDenier(moveRouter services.MoveRouter) services.SITExtension mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) return &sitExtensionDenier{moveRouter, mtoserviceitem.NewMTOServiceItemUpdater(planner, query.NewQueryBuilder(), moveRouter, mtoshipment.NewMTOShipmentFetcher(), address.NewAddressCreator(), portlocation.NewPortLocationFetcher(), ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())} } diff --git a/pkg/testdatagen/scenario/shared.go b/pkg/testdatagen/scenario/shared.go index 52a325f3c8d..c1c5e55e237 100644 --- a/pkg/testdatagen/scenario/shared.go +++ b/pkg/testdatagen/scenario/shared.go @@ -4211,7 +4211,6 @@ func createHHGWithOriginSITServiceItems( mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) queryBuilder := query.NewQueryBuilder() @@ -4243,7 +4242,7 @@ func createHHGWithOriginSITServiceItems( // called for zip 3 domestic linehaul service item planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "90210", "30813", false).Return(2361, nil) + "90210", "30813").Return(2361, nil) shipmentUpdater := mtoshipment.NewMTOShipmentStatusUpdater(queryBuilder, serviceItemCreator, planner) _, updateErr := shipmentUpdater.UpdateMTOShipmentStatus(appCtx, shipment.ID, models.MTOShipmentStatusApproved, nil, nil, etag.GenerateEtag(shipment.UpdatedAt)) @@ -4294,7 +4293,6 @@ func createHHGWithOriginSITServiceItems( mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) serviceItemUpdator := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -4486,7 +4484,6 @@ func createHHGWithDestinationSITServiceItems(appCtx appcontext.AppContext, prime mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) serviceItemCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -4518,7 +4515,7 @@ func createHHGWithDestinationSITServiceItems(appCtx appcontext.AppContext, prime // called for zip 3 domestic linehaul service item planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "90210", "30813", false).Return(2361, nil) + "90210", "30813").Return(2361, nil) shipmentUpdater := mtoshipment.NewMTOShipmentStatusUpdater(queryBuilder, serviceItemCreator, planner) _, updateErr := shipmentUpdater.UpdateMTOShipmentStatus(appCtx, shipment.ID, models.MTOShipmentStatusApproved, nil, nil, etag.GenerateEtag(shipment.UpdatedAt)) @@ -4564,7 +4561,6 @@ func createHHGWithDestinationSITServiceItems(appCtx appcontext.AppContext, prime mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) serviceItemUpdator := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -4901,7 +4897,7 @@ func createHHGWithPaymentServiceItems( queryBuilder := query.NewQueryBuilder() planner := &routemocks.Planner{} - planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, false).Return(123, nil).Once() + planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything).Return(123, nil).Once() serviceItemCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -4930,33 +4926,33 @@ func createHHGWithPaymentServiceItems( logger.Fatal("Error approving move") } // called using the addresses with origin zip of 90210 and destination zip of 94535 - planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, false).Return(348, nil).Times(2) + planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything).Return(348, nil).Times(2) // called using the addresses with origin zip of 90210 and destination zip of 90211 - planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, false).Return(3, nil).Times(5) + planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything).Return(3, nil).Times(5) // called for zip 3 domestic linehaul service item planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), - "94535", "94535", false).Return(348, nil).Times(2) + "94535", "94535").Return(348, nil).Times(2) // called for zip 5 domestic linehaul service item - planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94535", "94535", false).Return(348, nil).Times(2) + planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94535", "94535").Return(348, nil).Times(2) // called for domestic shorthaul service item planner.On("Zip5TransitDistance", mock.AnythingOfType("*appcontext.appContext"), "90210", "90211").Return(3, nil).Times(7) // called for domestic shorthaul service item - planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "90210", "90211", false).Return(348, nil).Times(10) + planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "90210", "90211").Return(348, nil).Times(10) // called for domestic origin SIT pickup service item - planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "90210", "94535", false).Return(348, nil).Once() + planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "90210", "94535").Return(348, nil).Once() // called for domestic destination SIT delivery service item - planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94535", "90210", false).Return(348, nil).Times(2) + planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94535", "90210").Return(348, nil).Times(2) // called for DLH, DSH, FSC service item estimated price calculations - planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, false).Return(400, nil).Times(3) + planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything).Return(400, nil).Times(3) for _, shipment := range []models.MTOShipment{longhaulShipment, shorthaulShipment, shipmentWithOriginalWeight, shipmentWithOriginalAndReweighWeight, shipmentWithOriginalAndReweighWeightReweihBolded, shipmentWithOriginalReweighAndAdjustedWeight, shipmentWithOriginalAndAdjustedWeight} { shipmentUpdater := mtoshipment.NewMTOShipmentStatusUpdater(queryBuilder, serviceItemCreator, planner) @@ -5051,7 +5047,6 @@ func createHHGWithPaymentServiceItems( mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(400, nil) serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, portLocationFetcher, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -5539,7 +5534,6 @@ func createHHGMoveWithPaymentRequest(appCtx appcontext.AppContext, userUploader mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, - false, ).Return(910, nil) paymentRequestCreator := paymentrequest.NewPaymentRequestCreator( diff --git a/pkg/testdatagen/testharness/make_move.go b/pkg/testdatagen/testharness/make_move.go index f6cadea3627..5b55389b101 100644 --- a/pkg/testdatagen/testharness/make_move.go +++ b/pkg/testdatagen/testharness/make_move.go @@ -4015,7 +4015,7 @@ func MakeHHGMoveWithApprovedNTSShipmentsForTOO(appCtx appcontext.AppContext) mod planner := &routemocks.Planner{} // mock any and all planner calls - planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, false).Return(2361, nil) + planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything).Return(2361, nil) queryBuilder := query.NewQueryBuilder() serviceItemCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) @@ -4119,7 +4119,7 @@ func MakeHHGMoveWithApprovedNTSRShipmentsForTOO(appCtx appcontext.AppContext) mo planner := &routemocks.Planner{} // mock any and all planner calls - planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything, false).Return(2361, nil) + planner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), mock.Anything, mock.Anything).Return(2361, nil) queryBuilder := query.NewQueryBuilder() serviceItemCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())