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

Int b 21480 full ppm counseling #14572

Closed
wants to merge 48 commits into from
Closed

Int b 21480 full ppm counseling #14572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
a89fca0
estimated prices now calculates for NTS-R shipments
loganwc Oct 29, 2024
78efbd4
updated comment
loganwc Oct 30, 2024
0c62a14
now using 110% of estimated weight for NTS-R
loganwc Nov 12, 2024
fa2cd85
Merge branch 'main' into B-21551-NTSR-Estimated-Price
loganwc Nov 12, 2024
f419625
most of the tests but they don't work
loganwc Nov 13, 2024
6783ebc
tests now workgit add .
loganwc Nov 13, 2024
2811129
Merge branch 'main' into B-21551-NTSR-Estimated-Price
loganwc Nov 13, 2024
529b140
someone deleted a thing i wanted
loganwc Nov 13, 2024
ab2950c
Update mto_service_item_creator_test.go
loganwc Nov 14, 2024
406e7a4
Merge remote-tracking branch 'origin/main' into MAIN-B-21480-Full-PPM…
elizabeth-perkins Nov 26, 2024
1404941
Merge remote-tracking branch 'origin/main' into MAIN-B-21480-Full-PPM…
elizabeth-perkins Dec 2, 2024
2a5d7a1
Merge remote-tracking branch 'origin/main' into MAIN-B-21480-Full-PPM…
elizabeth-perkins Dec 2, 2024
4e7c5aa
Merge remote-tracking branch 'origin/main' into MAIN-B-21480-Full-PPM…
elizabeth-perkins Dec 11, 2024
7e9693a
Disables counseling checkbox
elizabeth-perkins Dec 16, 2024
7a4692d
Merge remote-tracking branch 'origin/main' into MAIN-B-21480-Full-PPM…
elizabeth-perkins Dec 16, 2024
22f8556
Merge branch 'main' into B-21551-NTSR-Estimated-Price
loganwc Dec 20, 2024
945cf21
Changes moveRouter struct to add transportationOfficesFetcher
elizabeth-perkins Dec 24, 2024
20d3169
Merge remote-tracking branch 'origin/main' into MAIN-B-21480-Full-PPM…
elizabeth-perkins Dec 24, 2024
e5a6ef0
fixed origindutylocation providesServicesCounseling nil issue
samaysofo Jan 6, 2025
fe1793e
code clean up
samaysofo Jan 6, 2025
56dec62
Merge branch 'main' into B-21551-NTSR-Estimated-Price
loganwc Jan 8, 2025
44caebe
Merge branch 'main' into B-21551-NTSR-Estimated-Price
danieljordan-caci Jan 8, 2025
0cb1e19
update tests so they work with Dan the Mans changes
loganwc Jan 8, 2025
ccacf68
Merge branch 'B-21551-NTSR-Estimated-Price' of github.com:transcom/my…
loganwc Jan 8, 2025
46fe8c2
Merge branch 'main' into B-21551-NTSR-Estimated-Price
loganwc Jan 8, 2025
7608779
more daniel madness
loganwc Jan 8, 2025
78581e2
Added function for finding the closeset counseling office with its as…
samaysofo Jan 9, 2025
faa41a8
Added test for CONUS/OCONUS for finding the closest counseling offices.
samaysofo Jan 10, 2025
deee183
Merge remote-tracking branch 'origin/main' into MAIN-B-21480-Full-PPM…
samaysofo Jan 10, 2025
805efd3
Merge remote-tracking branch 'origin/B-21551-NTSR-Estimated-Price' in…
samaysofo Jan 10, 2025
c70c798
merged main and refactored refactored failing tests
samaysofo Jan 10, 2025
01628a5
Merge remote-tracking branch 'origin/B-21464-MAIN' into MAIN-B-21480-…
samaysofo Jan 13, 2025
9b0fcb9
Merge branch 'MAIN-B-21480-Full-PPM-Counseling' into INT-B-21480-Full…
samaysofo Jan 13, 2025
2c201cf
fixed merge conflicts
samaysofo Jan 13, 2025
25a8c52
Merge branch 'integrationTesting' into INT-B-21480-Full-PPM-Counseling
samaysofo Jan 13, 2025
ec9946b
fixed failing tests for disabling the counseling checkbox
samaysofo Jan 13, 2025
63555bb
updated failing tests
samaysofo Jan 13, 2025
7a23811
Merge branch 'MAIN-B-21480-Full-PPM-Counseling' into INT-B-21480-Full…
samaysofo Jan 13, 2025
7fb9238
Merge branch 'integrationTesting' into INT-B-21480-Full-PPM-Counseling
samaysofo Jan 13, 2025
ee4d8d9
reverted changes
samaysofo Jan 13, 2025
ec139d6
Merge branch 'integrationTesting' into INT-B-21480-Full-PPM-Counseling
samaysofo Jan 14, 2025
7ffa9b4
fixed server tests
samaysofo Jan 14, 2025
adc1e72
Merge branch 'integrationTesting' into INT-B-21480-Full-PPM-Counseling
samaysofo Jan 14, 2025
37ef056
Merge branch 'integrationTesting' into INT-B-21480-Full-PPM-Counseling
samaysofo Jan 15, 2025
80f7650
Merge branch 'integrationTesting' into INT-B-21480-Full-PPM-Counseling
samaysofo Jan 15, 2025
8a0a5c8
Merge branch 'integrationTesting' into INT-B-21480-Full-PPM-Counseling
samaysofo Jan 16, 2025
4547870
Merge branch 'integrationTesting' into INT-B-21480-Full-PPM-Counseling
samaysofo Jan 17, 2025
70be164
Merge branch 'integrationTesting' into INT-B-21480-Full-PPM-Counseling
samaysofo Jan 20, 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
2 changes: 1 addition & 1 deletion pkg/handlers/adminapi/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ func NewAdminAPI(handlerConfig handlers.HandlerConfig) *adminops.MymoveAPI {
pagination.NewPagination,
}

moveRouter := move.NewMoveRouter()
moveRouter := move.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
signedCertificationCreator := signedcertification.NewSignedCertificationCreator()
signedCertificationUpdater := signedcertification.NewSignedCertificationUpdater()
adminAPI.MovesUpdateMoveHandler = UpdateMoveHandler{
Expand Down
3 changes: 2 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 @@ -22,6 +22,7 @@ import (
mtoserviceitem "github.com/transcom/mymove/pkg/services/mto_service_item"
"github.com/transcom/mymove/pkg/services/pagination"
"github.com/transcom/mymove/pkg/services/query"
transportationoffice "github.com/transcom/mymove/pkg/services/transportation_office"
)

func (suite *HandlerSuite) TestIndexMovesHandler() {
Expand Down Expand Up @@ -111,7 +112,7 @@ func (suite *HandlerSuite) TestUpdateMoveHandler() {
ppmEstimator := &mocks.PPMEstimator{}
setupHandler := func() UpdateMoveHandler {
builder := query.NewQueryBuilder()
moveRouter := move.NewMoveRouter()
moveRouter := move.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
planner := &routemocks.Planner{}
planner.On("ZipTransitDistance",
mock.AnythingOfType("*appcontext.appContext"),
Expand Down
2 changes: 1 addition & 1 deletion pkg/handlers/ghcapi/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI {
}
ghcAPI := ghcops.NewMymoveAPI(ghcSpec)
queryBuilder := query.NewQueryBuilder()
moveRouter := move.NewMoveRouter()
moveRouter := move.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
moveLocker := movelocker.NewMoveLocker()
addressCreator := address.NewAddressCreator()
portLocationFetcher := portlocation.NewPortLocationFetcher()
Expand Down
9 changes: 5 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 @@ -36,6 +36,7 @@ import (
movetaskorder "github.com/transcom/mymove/pkg/services/move_task_order"
mtoserviceitem "github.com/transcom/mymove/pkg/services/mto_service_item"
"github.com/transcom/mymove/pkg/services/query"
transportationoffice "github.com/transcom/mymove/pkg/services/transportation_office"
"github.com/transcom/mymove/pkg/testdatagen"
"github.com/transcom/mymove/pkg/trace"
)
Expand Down Expand Up @@ -183,7 +184,7 @@ func (suite *HandlerSuite) TestUpdateMoveTaskOrderHandlerIntegrationSuccess() {
handlerConfig := suite.HandlerConfig()
handlerConfig.SetNotificationSender(notifications.NewStubNotificationSender("milmovelocal"))
queryBuilder := query.NewQueryBuilder()
moveRouter := moverouter.NewMoveRouter()
moveRouter := moverouter.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
planner := &routemocks.Planner{}
planner.On("ZipTransitDistance",
mock.AnythingOfType("*appcontext.appContext"),
Expand Down Expand Up @@ -308,7 +309,7 @@ func (suite *HandlerSuite) TestUpdateMoveTaskOrderHandlerIntegrationWithIncomple
}
handlerConfig := suite.HandlerConfig()
queryBuilder := query.NewQueryBuilder()
moveRouter := moverouter.NewMoveRouter()
moveRouter := moverouter.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
ppmEstimator := &mocks.PPMEstimator{}
planner := &routemocks.Planner{}
planner.On("ZipTransitDistance",
Expand Down Expand Up @@ -399,7 +400,7 @@ func (suite *HandlerSuite) TestUpdateMTOStatusServiceCounselingCompletedHandler(
setupTestData := func() UpdateMTOStatusServiceCounselingCompletedHandlerFunc {
handlerConfig := suite.HandlerConfig()
queryBuilder := query.NewQueryBuilder()
moveRouter := moverouter.NewMoveRouter()
moveRouter := moverouter.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
planner := &routemocks.Planner{}
planner.On("ZipTransitDistance",
mock.AnythingOfType("*appcontext.appContext"),
Expand Down Expand Up @@ -620,7 +621,7 @@ func (suite *HandlerSuite) TestUpdateMoveTIORemarksHandler() {
requestUser := factory.BuildUser(nil, nil, nil)
handlerConfig := suite.HandlerConfig()
queryBuilder := query.NewQueryBuilder()
moveRouter := moverouter.NewMoveRouter()
moveRouter := moverouter.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
planner := &routemocks.Planner{}
planner.On("ZipTransitDistance",
mock.AnythingOfType("*appcontext.appContext"),
Expand Down
9 changes: 5 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 @@ -33,6 +33,7 @@ import (
ppmshipment "github.com/transcom/mymove/pkg/services/ppmshipment"
"github.com/transcom/mymove/pkg/services/query"
sitstatus "github.com/transcom/mymove/pkg/services/sit_status"
transportationoffice "github.com/transcom/mymove/pkg/services/transportation_office"
"github.com/transcom/mymove/pkg/testdatagen"
"github.com/transcom/mymove/pkg/trace"
)
Expand Down Expand Up @@ -325,7 +326,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandler() {
mockSender := suite.TestNotificationSender()
addressUpdater := address.NewAddressUpdater()
addressCreator := address.NewAddressCreator()
moveRouter := moveservices.NewMoveRouter()
moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())

noCheckUpdater := mtoshipment.NewMTOShipmentUpdater(builder, fetcher, planner, moveRouter, moveWeights, mockSender, paymentRequestShipmentRecalculator, addressUpdater, addressCreator)
ppmEstimator := mocks.PPMEstimator{}
Expand Down Expand Up @@ -557,7 +558,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandler() {
}

fetcher := fetch.NewFetcher(queryBuilder)
moveRouter := moveservices.NewMoveRouter()
moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
shipmentFetcher := mtoshipment.NewMTOShipmentFetcher()
addressCreator := address.NewAddressCreator()
portLocationFetcher := portlocation.NewPortLocationFetcher()
Expand Down Expand Up @@ -599,7 +600,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandler() {
// by the handler is working as expected.
suite.Run("Successful status update of MTO service item and event trigger", func() {
queryBuilder := query.NewQueryBuilder()
moveRouter := moveservices.NewMoveRouter()
moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())
shipmentFetcher := mtoshipment.NewMTOShipmentFetcher()
mtoServiceItem, availableMove := suite.createServiceItem()
requestUser := factory.BuildUser(nil, nil, nil)
Expand Down Expand Up @@ -778,7 +779,7 @@ func (suite *HandlerSuite) TestUpdateServiceItemSitEntryDateHandler() {
mockSender := suite.TestNotificationSender()
addressUpdater := address.NewAddressUpdater()
addressCreator := address.NewAddressCreator()
moveRouter := moveservices.NewMoveRouter()
moveRouter := moveservices.NewMoveRouter(transportationoffice.NewTransportationOfficesFetcher())

noCheckUpdater := mtoshipment.NewMTOShipmentUpdater(builder, fetcher, planner, moveRouter, moveWeights, mockSender, paymentRequestShipmentRecalculator, addressUpdater, addressCreator)
ppmEstimator := mocks.PPMEstimator{}
Expand Down
Loading
Loading