Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

MAIN B-22267 #14846

Merged
merged 12 commits into from
Mar 6, 2025
Merged

MAIN B-22267 #14846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2014928
initial commit, changed up, test added
danieljordan-caci Feb 19, 2025
9446bb7
updating comments so people know I speak english good
danieljordan-caci Feb 19, 2025
1d96ccc
Merge branch 'main' into MAIN-B-22267
danieljordan-caci Feb 21, 2025
bcd5cdb
variables
danieljordan-caci Feb 21, 2025
aaec4ea
Merge branch 'main' into MAIN-B-22267
danieljordan-caci Feb 25, 2025
5915752
Merge branch 'main' into MAIN-B-22267
danieljordan-caci Feb 25, 2025
ce7bf83
removing isInternationalShipment since we don't need it any more
danieljordan-caci Feb 25, 2025
640b7a9
test fixes and cleanup
danieljordan-caci Feb 25, 2025
b2b4ece
Merge remote-tracking branch 'origin/main' into MAIN-B-22267
danieljordan-caci Mar 5, 2025
64c240a
INT specific commit to remove params in ZipTransitDistance not on main
danieljordan-caci Feb 27, 2025
2c4cb34
Merge branch 'main' into MAIN-B-22267
danieljordan-caci Mar 5, 2025
9f58be8
Merge branch 'main' into MAIN-B-22267
danieljordan-caci Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkg/handlers/adminapi/moves_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ func (suite *HandlerSuite) TestUpdateMoveHandler() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
return UpdateMoveHandler{
suite.HandlerConfig(),
Expand Down
4 changes: 0 additions & 4 deletions pkg/handlers/ghcapi/move_task_order_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ func (suite *HandlerSuite) TestUpdateMoveTaskOrderHandlerIntegrationSuccess() {
mock.AnythingOfType("*appcontext.appContext"),
mock.Anything,
mock.Anything,
false,
).Return(400, nil)
siCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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