From a89fca014da7183dbe35b8522a58721165a56750 Mon Sep 17 00:00:00 2001 From: loganwc Date: Tue, 29 Oct 2024 16:07:30 +0000 Subject: [PATCH 001/260] estimated prices now calculates for NTS-R shipments --- pkg/services/mto_service_item/mto_service_item_creator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 647cd2d641c..c14ebc4a573 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator.go +++ b/pkg/services/mto_service_item/mto_service_item_creator.go @@ -580,7 +580,7 @@ func (o *mtoServiceItemCreator) CreateMTOServiceItem(appCtx appcontext.AppContex // DLH, DPK, DOP, DDP, DUPK // NTS-release requested pickup dates are for handle out, their pricing is handled differently as their locations are based on storage facilities, not pickup locations - if mtoShipment.PrimeEstimatedWeight != nil && mtoShipment.RequestedPickupDate != nil && mtoShipment.ShipmentType != models.MTOShipmentTypeHHGOutOfNTSDom { + if mtoShipment.PrimeEstimatedWeight != nil && mtoShipment.RequestedPickupDate != nil { serviceItemEstimatedPrice, err := o.findEstimatedPrice(appCtx, serviceItem, mtoShipment) if serviceItemEstimatedPrice != 0 && err == nil { serviceItem.PricingEstimate = &serviceItemEstimatedPrice From 78efbd4f686964b15c293662ef19c8a143c1a375 Mon Sep 17 00:00:00 2001 From: loganwc Date: Wed, 30 Oct 2024 22:00:53 +0000 Subject: [PATCH 002/260] updated comment --- pkg/services/mto_service_item/mto_service_item_creator.go | 2 -- 1 file changed, 2 deletions(-) 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 c14ebc4a573..11433cb8378 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator.go +++ b/pkg/services/mto_service_item/mto_service_item_creator.go @@ -578,8 +578,6 @@ func (o *mtoServiceItemCreator) CreateMTOServiceItem(appCtx appcontext.AppContex // if estimated weight for shipment provided by the prime, calculate the estimated prices for // DLH, DPK, DOP, DDP, DUPK - - // NTS-release requested pickup dates are for handle out, their pricing is handled differently as their locations are based on storage facilities, not pickup locations if mtoShipment.PrimeEstimatedWeight != nil && mtoShipment.RequestedPickupDate != nil { serviceItemEstimatedPrice, err := o.findEstimatedPrice(appCtx, serviceItem, mtoShipment) if serviceItemEstimatedPrice != 0 && err == nil { From 0c62a1460ddf6316d350dfd57eda4f4308e52600 Mon Sep 17 00:00:00 2001 From: loganwc Date: Tue, 12 Nov 2024 16:44:49 +0000 Subject: [PATCH 003/260] now using 110% of estimated weight for NTS-R --- .../mto_service_item_creator.go | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) 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 11433cb8378..b50a46eb615 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator.go +++ b/pkg/services/mto_service_item/mto_service_item_creator.go @@ -54,7 +54,12 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, requestedPickupDate := *mtoShipment.RequestedPickupDate currTime := time.Now() var distance int - primeEstimatedWeight := *mtoShipment.PrimeEstimatedWeight + primeEstimatedWeightForFSC := *mtoShipment.PrimeEstimatedWeight + primeEstimatedWeight := mtoShipment.PrimeEstimatedWeight + if mtoShipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom { + newWeight := int(primeEstimatedWeight.Float64() * 1.1) + primeEstimatedWeight = (*unit.Pound)(&newWeight) + } contractCode, err := FetchContractCode(appCtx, currTime) if err != nil { @@ -73,7 +78,7 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } - price, _, err = o.originPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) + price, _, err = o.originPricer.Price(appCtx, contractCode, requestedPickupDate, *primeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -86,7 +91,7 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, servicesScheduleOrigin := domesticServiceArea.ServicesSchedule - price, _, err = o.packPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, servicesScheduleOrigin, isPPM) + price, _, err = o.packPricer.Price(appCtx, contractCode, requestedPickupDate, *primeEstimatedWeight, servicesScheduleOrigin, isPPM) if err != nil { return 0, err } @@ -101,7 +106,7 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, } } - price, _, err = o.destinationPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) + price, _, err = o.destinationPricer.Price(appCtx, contractCode, requestedPickupDate, *primeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -114,7 +119,7 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, serviceScheduleDestination := domesticServiceArea.ServicesSchedule - price, _, err = o.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, serviceScheduleDestination, isPPM) + price, _, err = o.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, *primeEstimatedWeight, serviceScheduleDestination, isPPM) if err != nil { return 0, err } @@ -132,7 +137,7 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - price, _, err = o.linehaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) + price, _, err = o.linehaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), *primeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -148,7 +153,7 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - price, _, err = o.shorthaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea) + price, _, err = o.shorthaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), *primeEstimatedWeight, domesticServiceArea.ServiceArea) if err != nil { return 0, err } @@ -172,7 +177,7 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, } } - fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, primeEstimatedWeight) + fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, primeEstimatedWeightForFSC) if err != nil { return 0, err } @@ -184,7 +189,7 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - price, _, err = o.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), primeEstimatedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) + price, _, err = o.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), primeEstimatedWeightForFSC, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) if err != nil { return 0, err } From f27f3ebe907501aed7806a90f0b4cc1ccc8f64b7 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Tue, 12 Nov 2024 14:20:55 -0600 Subject: [PATCH 004/260] Approving destination address change will update service item pricing --- pkg/handlers/ghcapi/api.go | 4 +- pkg/handlers/ghcapi/mto_service_items_test.go | 4 +- pkg/handlers/ghcapi/mto_shipment_test.go | 4 +- pkg/handlers/primeapi/api.go | 2 +- .../primeapi/mto_service_item_test.go | 4 +- pkg/handlers/supportapi/api.go | 2 +- .../supportapi/mto_service_item_test.go | 7 +- pkg/services/mocks/MTOServiceItemUpdater.go | 30 ++++ .../move_history/move_history_fetcher_test.go | 2 +- pkg/services/mto_service_item.go | 1 + .../mto_service_item_updater.go | 154 +++++++++++++++++- .../mto_service_item_updater_test.go | 5 +- .../mto_service_item_validators.go | 3 + .../shipment_address_update_requester.go | 36 +++- .../sit_extension/sit_extension_denier.go | 3 +- pkg/testdatagen/scenario/shared.go | 6 +- 16 files changed, 236 insertions(+), 31 deletions(-) diff --git a/pkg/handlers/ghcapi/api.go b/pkg/handlers/ghcapi/api.go index 5d20500500e..47fd3176180 100644 --- a/pkg/handlers/ghcapi/api.go +++ b/pkg/handlers/ghcapi/api.go @@ -231,7 +231,7 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI { ghcAPI.MtoServiceItemUpdateMTOServiceItemStatusHandler = UpdateMTOServiceItemStatusHandler{ HandlerConfig: handlerConfig, - MTOServiceItemUpdater: mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator), + MTOServiceItemUpdater: mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), Fetcher: fetch.NewFetcher(queryBuilder), ShipmentSITStatus: sitstatus.NewShipmentSITStatus(), MTOShipmentFetcher: mtoshipment.NewMTOShipmentFetcher(), @@ -501,7 +501,7 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI { ghcAPI.ShipmentUpdateSITServiceItemCustomerExpenseHandler = UpdateSITServiceItemCustomerExpenseHandler{ handlerConfig, - mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator), + mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), mtoshipment.NewMTOShipmentFetcher(), shipmentSITStatus, } diff --git a/pkg/handlers/ghcapi/mto_service_items_test.go b/pkg/handlers/ghcapi/mto_service_items_test.go index 3b0b3e74d1b..8ba2ab744bd 100644 --- a/pkg/handlers/ghcapi/mto_service_items_test.go +++ b/pkg/handlers/ghcapi/mto_service_items_test.go @@ -563,7 +563,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandler() { mock.Anything, mock.Anything, ).Return(400, nil) - mtoServiceItemStatusUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator) + mtoServiceItemStatusUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) handler := UpdateMTOServiceItemStatusHandler{ HandlerConfig: suite.HandlerConfig(), @@ -623,7 +623,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandler() { mock.Anything, mock.Anything, ).Return(400, nil) - mtoServiceItemStatusUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator) + mtoServiceItemStatusUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) handler := UpdateMTOServiceItemStatusHandler{ HandlerConfig: suite.HandlerConfig(), diff --git a/pkg/handlers/ghcapi/mto_shipment_test.go b/pkg/handlers/ghcapi/mto_shipment_test.go index aa96acd49f0..5cc9d43ebe8 100644 --- a/pkg/handlers/ghcapi/mto_shipment_test.go +++ b/pkg/handlers/ghcapi/mto_shipment_test.go @@ -4674,7 +4674,7 @@ func (suite *HandlerSuite) TestUpdateSITServiceItemCustomerExpenseHandler() { mock.Anything, mock.Anything, ).Return(400, nil) - updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator) + updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) req := httptest.NewRequest("PATCH", fmt.Sprintf("/shipments/%s/sit-service-item/convert-to-customer-expense", approvedShipment.ID.String()), nil) req = suite.AuthenticateOfficeRequest(req, officeUser) handlerConfig := suite.HandlerConfig() @@ -4750,7 +4750,7 @@ func (suite *HandlerSuite) TestUpdateSITServiceItemCustomerExpenseHandler() { mock.Anything, mock.Anything, ).Return(400, nil) - updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator) + updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) req := httptest.NewRequest("PATCH", fmt.Sprintf("/shipments/%s/sit-service-item/convert-to-customer-expense", approvedShipment.ID.String()), nil) req = suite.AuthenticateOfficeRequest(req, officeUser) handlerConfig := suite.HandlerConfig() diff --git a/pkg/handlers/primeapi/api.go b/pkg/handlers/primeapi/api.go index b614fb13d60..25afdb43b77 100644 --- a/pkg/handlers/primeapi/api.go +++ b/pkg/handlers/primeapi/api.go @@ -45,7 +45,7 @@ func NewPrimeAPI(handlerConfig handlers.HandlerConfig) *primeoperations.MymoveAP shipmentFetcher := mtoshipment.NewMTOShipmentFetcher() moveWeights := move.NewMoveWeights(mtoshipment.NewShipmentReweighRequester()) uploadCreator := upload.NewUploadCreator(handlerConfig.FileStorer()) - serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator) + serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) userUploader, err := uploader.NewUserUploader(handlerConfig.FileStorer(), uploader.MaxCustomerUserUploadFileSizeLimit) if err != nil { diff --git a/pkg/handlers/primeapi/mto_service_item_test.go b/pkg/handlers/primeapi/mto_service_item_test.go index b635bb4d124..cf2e636495e 100644 --- a/pkg/handlers/primeapi/mto_service_item_test.go +++ b/pkg/handlers/primeapi/mto_service_item_test.go @@ -1543,7 +1543,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemDDDSIT() { ).Return(400, nil) subtestData.handler = UpdateMTOServiceItemHandler{ suite.HandlerConfig(), - mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator), + mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), } // create the params struct @@ -1825,7 +1825,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemDOPSIT() { ).Return(400, nil) subtestData.handler = UpdateMTOServiceItemHandler{ suite.HandlerConfig(), - mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator), + mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), } // create the params struct diff --git a/pkg/handlers/supportapi/api.go b/pkg/handlers/supportapi/api.go index dd2a5df8b8f..1aba70b9c72 100644 --- a/pkg/handlers/supportapi/api.go +++ b/pkg/handlers/supportapi/api.go @@ -88,7 +88,7 @@ func NewSupportAPIHandler(handlerConfig handlers.HandlerConfig) http.Handler { mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), handlerConfig.HHGPlanner()), } - supportAPI.MtoServiceItemUpdateMTOServiceItemStatusHandler = UpdateMTOServiceItemStatusHandler{handlerConfig, mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator)} + supportAPI.MtoServiceItemUpdateMTOServiceItemStatusHandler = UpdateMTOServiceItemStatusHandler{handlerConfig, mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer())} supportAPI.WebhookReceiveWebhookNotificationHandler = ReceiveWebhookNotificationHandler{handlerConfig} // Create TAC and LOA services diff --git a/pkg/handlers/supportapi/mto_service_item_test.go b/pkg/handlers/supportapi/mto_service_item_test.go index 44a56716688..5db466e8d52 100644 --- a/pkg/handlers/supportapi/mto_service_item_test.go +++ b/pkg/handlers/supportapi/mto_service_item_test.go @@ -22,6 +22,7 @@ import ( "github.com/transcom/mymove/pkg/models" routemocks "github.com/transcom/mymove/pkg/route/mocks" "github.com/transcom/mymove/pkg/services/address" + "github.com/transcom/mymove/pkg/services/ghcrateengine" moverouter "github.com/transcom/mymove/pkg/services/move" mtoserviceitem "github.com/transcom/mymove/pkg/services/mto_service_item" mtoshipment "github.com/transcom/mymove/pkg/services/mto_shipment" @@ -85,7 +86,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandlerApproveSuccess() mock.Anything, ).Return(400, nil) handler := UpdateMTOServiceItemStatusHandler{handlerConfig, - mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator), + mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), } // CALL FUNCTION UNDER TEST @@ -141,7 +142,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandlerRejectSuccess() mock.Anything, ).Return(400, nil) handler := UpdateMTOServiceItemStatusHandler{handlerConfig, - mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator), + mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), } // CALL FUNCTION UNDER TEST @@ -197,7 +198,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandlerRejectionFailedN mock.Anything, ).Return(400, nil) handler := UpdateMTOServiceItemStatusHandler{handlerConfig, - mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator), + mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), } // CALL FUNCTION UNDER TEST diff --git a/pkg/services/mocks/MTOServiceItemUpdater.go b/pkg/services/mocks/MTOServiceItemUpdater.go index ed356fd7699..bbb6bd86828 100644 --- a/pkg/services/mocks/MTOServiceItemUpdater.go +++ b/pkg/services/mocks/MTOServiceItemUpdater.go @@ -138,6 +138,36 @@ func (_m *MTOServiceItemUpdater) UpdateMTOServiceItemBasic(appCtx appcontext.App return r0, r1 } +// UpdateMTOServiceItemPricingEstimate provides a mock function with given fields: appCtx, serviceItem, shipment, eTag +func (_m *MTOServiceItemUpdater) UpdateMTOServiceItemPricingEstimate(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, shipment models.MTOShipment, eTag string) (*models.MTOServiceItem, error) { + ret := _m.Called(appCtx, serviceItem, shipment, eTag) + + if len(ret) == 0 { + panic("no return value specified for UpdateMTOServiceItemPricingEstimate") + } + + var r0 *models.MTOServiceItem + var r1 error + if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOServiceItem, models.MTOShipment, string) (*models.MTOServiceItem, error)); ok { + return rf(appCtx, serviceItem, shipment, eTag) + } + if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOServiceItem, models.MTOShipment, string) *models.MTOServiceItem); ok { + r0 = rf(appCtx, serviceItem, shipment, eTag) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*models.MTOServiceItem) + } + } + + if rf, ok := ret.Get(1).(func(appcontext.AppContext, *models.MTOServiceItem, models.MTOShipment, string) error); ok { + r1 = rf(appCtx, serviceItem, shipment, eTag) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // UpdateMTOServiceItemPrime provides a mock function with given fields: appCtx, serviceItem, planner, shipment, eTag func (_m *MTOServiceItemUpdater) UpdateMTOServiceItemPrime(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, planner route.Planner, shipment models.MTOShipment, eTag string) (*models.MTOServiceItem, error) { ret := _m.Called(appCtx, serviceItem, planner, shipment, eTag) diff --git a/pkg/services/move_history/move_history_fetcher_test.go b/pkg/services/move_history/move_history_fetcher_test.go index 13b85471c12..fef04459564 100644 --- a/pkg/services/move_history/move_history_fetcher_test.go +++ b/pkg/services/move_history/move_history_fetcher_test.go @@ -374,7 +374,7 @@ func (suite *MoveHistoryServiceSuite) TestMoveHistoryFetcherScenarios() { mock.Anything, mock.Anything, ).Return(400, nil) - updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator) + updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) move := factory.BuildApprovalsRequestedMove(suite.DB(), nil, nil) serviceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ { diff --git a/pkg/services/mto_service_item.go b/pkg/services/mto_service_item.go index 25926ae3fca..914823809c3 100644 --- a/pkg/services/mto_service_item.go +++ b/pkg/services/mto_service_item.go @@ -32,6 +32,7 @@ type MTOServiceItemUpdater interface { ApproveOrRejectServiceItem(appCtx appcontext.AppContext, mtoServiceItemID uuid.UUID, status models.MTOServiceItemStatus, rejectionReason *string, eTag string) (*models.MTOServiceItem, error) UpdateMTOServiceItem(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, eTag string, validator string) (*models.MTOServiceItem, error) UpdateMTOServiceItemBasic(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, eTag string) (*models.MTOServiceItem, error) + UpdateMTOServiceItemPricingEstimate(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, shipment models.MTOShipment, eTag string) (*models.MTOServiceItem, error) UpdateMTOServiceItemPrime(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, planner route.Planner, shipment models.MTOShipment, eTag string) (*models.MTOServiceItem, error) ConvertItemToCustomerExpense(appCtx appcontext.AppContext, shipment *models.MTOShipment, customerExpenseReason *string, convertToCustomerExpense bool) (*models.MTOServiceItem, error) } 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 b2ac848273f..1bbbb60afac 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -3,6 +3,7 @@ package mtoserviceitem import ( "database/sql" "fmt" + "strconv" "time" "github.com/gobuffalo/validate/v3" @@ -19,6 +20,7 @@ import ( movetaskorder "github.com/transcom/mymove/pkg/services/move_task_order" "github.com/transcom/mymove/pkg/services/query" sitstatus "github.com/transcom/mymove/pkg/services/sit_status" + "github.com/transcom/mymove/pkg/unit" ) // OriginSITLocation is the constant representing when the shipment in storage occurs at the origin @@ -37,22 +39,28 @@ type mtoServiceItemQueryBuilder interface { } type mtoServiceItemUpdater struct { - planner route.Planner - builder mtoServiceItemQueryBuilder - createNewBuilder func() mtoServiceItemQueryBuilder - moveRouter services.MoveRouter - shipmentFetcher services.MTOShipmentFetcher - addressCreator services.AddressCreator + planner route.Planner + builder mtoServiceItemQueryBuilder + createNewBuilder func() mtoServiceItemQueryBuilder + moveRouter services.MoveRouter + shipmentFetcher services.MTOShipmentFetcher + addressCreator services.AddressCreator + unpackPricer services.DomesticUnpackPricer + linehaulPricer services.DomesticLinehaulPricer + destinationPricer services.DomesticDestinationPricer + fuelSurchargePricer services.FuelSurchargePricer + sitFuelSurchargePricer services.DomesticDestinationSITFuelSurchargePricer + sitDeliverPricer services.DomesticDestinationSITDeliveryPricer } // NewMTOServiceItemUpdater returns a new mto service item updater -func NewMTOServiceItemUpdater(planner route.Planner, builder mtoServiceItemQueryBuilder, moveRouter services.MoveRouter, shipmentFetcher services.MTOShipmentFetcher, addressCreator services.AddressCreator) services.MTOServiceItemUpdater { +func NewMTOServiceItemUpdater(planner route.Planner, builder mtoServiceItemQueryBuilder, moveRouter services.MoveRouter, shipmentFetcher services.MTOShipmentFetcher, addressCreator services.AddressCreator, unpackPricer services.DomesticUnpackPricer, linehaulPricer services.DomesticLinehaulPricer, destinationPricer services.DomesticDestinationPricer, fuelSurchargePricer services.FuelSurchargePricer, domesticDestinationSITDeliveryPricer services.DomesticDestinationSITDeliveryPricer, domesticDestinationSITFuelSurchargePricer services.DomesticDestinationSITFuelSurchargePricer) services.MTOServiceItemUpdater { // used inside a transaction and mocking return &mtoServiceItemUpdater{builder: builder} createNewBuilder := func() mtoServiceItemQueryBuilder { return query.NewQueryBuilder() } - return &mtoServiceItemUpdater{planner, builder, createNewBuilder, moveRouter, shipmentFetcher, addressCreator} + return &mtoServiceItemUpdater{planner, builder, createNewBuilder, moveRouter, shipmentFetcher, addressCreator, unpackPricer, linehaulPricer, destinationPricer, fuelSurchargePricer, domesticDestinationSITFuelSurchargePricer, domesticDestinationSITDeliveryPricer} } func (p *mtoServiceItemUpdater) ApproveOrRejectServiceItem( @@ -118,6 +126,121 @@ func (p *mtoServiceItemUpdater) ConvertItemToCustomerExpense( return p.convertItemToCustomerExpense(appCtx, *mtoServiceItem, customerExpenseReason, convertToCustomerExpense, eTag, checkETag()) } +func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, mtoShipment models.MTOShipment) (unit.Cents, error) { + if serviceItem.ReService.Code == models.ReServiceCodeDDP || + serviceItem.ReService.Code == models.ReServiceCodeDUPK || + serviceItem.ReService.Code == models.ReServiceCodeDLH || + serviceItem.ReService.Code == models.ReServiceCodeFSC || + serviceItem.ReService.Code == models.ReServiceCodeDDDSIT || + serviceItem.ReService.Code == models.ReServiceCodeDDSFSC { + + isPPM := false + if mtoShipment.ShipmentType == models.MTOShipmentTypePPM { + isPPM = true + } + requestedPickupDate := *mtoShipment.RequestedPickupDate + currTime := time.Now() + var distance int + primeEstimatedWeight := *mtoShipment.PrimeEstimatedWeight + + contractCode, err := FetchContractCode(appCtx, currTime) + if err != nil { + contractCode, err = FetchContractCode(appCtx, requestedPickupDate) + if err != nil { + return 0, err + } + } + + var price unit.Cents + + // destination + if serviceItem.ReService.Code == models.ReServiceCodeDDP { + var domesticServiceArea models.ReDomesticServiceArea + if mtoShipment.DestinationAddress != nil { + domesticServiceArea, err = fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.DestinationAddress.PostalCode) + if err != nil { + return 0, err + } + } + + price, _, err = p.destinationPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) + if err != nil { + return 0, err + } + } + if serviceItem.ReService.Code == models.ReServiceCodeDUPK { + domesticServiceArea, err := fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.DestinationAddress.PostalCode) + if err != nil { + return 0, err + } + + serviceScheduleDestination := domesticServiceArea.ServicesSchedule + + price, _, err = p.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, serviceScheduleDestination, isPPM) + if err != nil { + return 0, err + } + } + + // linehaul + if serviceItem.ReService.Code == models.ReServiceCodeDLH { + domesticServiceArea, err := fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.PickupAddress.PostalCode) + if err != nil { + return 0, err + } + if mtoShipment.PickupAddress != nil && mtoShipment.DestinationAddress != nil { + distance, err = p.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) + if err != nil { + return 0, err + } + } + price, _, err = p.linehaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) + if err != nil { + return 0, err + } + } + // fuel surcharge + if serviceItem.ReService.Code == models.ReServiceCodeFSC { + var pickupDateForFSC time.Time + + // actual pickup date likely won't exist at the time of service item creation, but it could + // use requested pickup date if no actual date exists + if mtoShipment.ActualPickupDate != nil { + pickupDateForFSC = *mtoShipment.ActualPickupDate + } else { + pickupDateForFSC = requestedPickupDate + } + + if mtoShipment.PickupAddress != nil && mtoShipment.DestinationAddress != nil { + distance, err = p.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) + if err != nil { + return 0, err + } + } + + fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, primeEstimatedWeight) + if err != nil { + return 0, err + } + fscWeightBasedDistanceMultiplierFloat, err := strconv.ParseFloat(fscWeightBasedDistanceMultiplier, 64) + if err != nil { + return 0, err + } + eiaFuelPrice, err := LookupEIAFuelPrice(appCtx, pickupDateForFSC) + if err != nil { + return 0, err + } + price, _, err = p.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), primeEstimatedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) + if err != nil { + return 0, err + } + + } + return price, nil + } + return 0, nil +} + func (p *mtoServiceItemUpdater) findServiceItem(appCtx appcontext.AppContext, serviceItemID uuid.UUID) (*models.MTOServiceItem, error) { var serviceItem models.MTOServiceItem err := appCtx.DB().Q().EagerPreload( @@ -299,6 +422,21 @@ func (p *mtoServiceItemUpdater) convertItemToCustomerExpense( return &serviceItem, nil } +// UpdateMTOServiceItemPricingEstimate updates the MTO Service Item pricing estimate +func (p *mtoServiceItemUpdater) UpdateMTOServiceItemPricingEstimate( + appCtx appcontext.AppContext, + mtoServiceItem *models.MTOServiceItem, + shipment models.MTOShipment, + eTag string, +) (*models.MTOServiceItem, error) { + estimatedPrice, err := p.findEstimatedPrice(appCtx, mtoServiceItem, shipment) + if estimatedPrice != 0 && err != nil { + mtoServiceItem.PricingEstimate = &estimatedPrice + return p.UpdateMTOServiceItem(appCtx, mtoServiceItem, eTag, UpdateMTOServiceItemBasicValidator) + } + return mtoServiceItem, err +} + // UpdateMTOServiceItemBasic updates the MTO Service Item using base validators func (p *mtoServiceItemUpdater) UpdateMTOServiceItemBasic( appCtx appcontext.AppContext, 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 47c55beda43..22259ed6aad 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 @@ -23,6 +23,7 @@ import ( "github.com/transcom/mymove/pkg/models" mocks "github.com/transcom/mymove/pkg/route/mocks" "github.com/transcom/mymove/pkg/services/address" + "github.com/transcom/mymove/pkg/services/ghcrateengine" moverouter "github.com/transcom/mymove/pkg/services/move" movetaskorder "github.com/transcom/mymove/pkg/services/move_task_order" mtoshipment "github.com/transcom/mymove/pkg/services/mto_shipment" @@ -48,7 +49,7 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.Anything, mock.Anything, ).Return(400, nil) - updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator) + updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) setupServiceItem := func() (models.MTOServiceItem, string) { serviceItem := testdatagen.MakeDefaultMTOServiceItem(suite.DB()) @@ -1757,7 +1758,7 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemStatus() { mock.Anything, mock.Anything, ).Return(400, nil) - updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator) + updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) rejectionReason := models.StringPointer("") diff --git a/pkg/services/mto_service_item/mto_service_item_validators.go b/pkg/services/mto_service_item/mto_service_item_validators.go index 09d9c1b09ee..f3423517301 100644 --- a/pkg/services/mto_service_item/mto_service_item_validators.go +++ b/pkg/services/mto_service_item/mto_service_item_validators.go @@ -616,6 +616,9 @@ func (v *updateMTOServiceItemData) setNewMTOServiceItem() *models.MTOServiceItem newMTOServiceItem.ActualWeight = services.SetOptionalPoundField( v.updatedServiceItem.ActualWeight, newMTOServiceItem.ActualWeight) + newMTOServiceItem.PricingEstimate = services.SetNoNilOptionalCentField( + v.updatedServiceItem.PricingEstimate, newMTOServiceItem.PricingEstimate) + return &newMTOServiceItem } 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 1b75b668336..18f0ffda5a4 100644 --- a/pkg/services/shipment_address_update/shipment_address_update_requester.go +++ b/pkg/services/shipment_address_update/shipment_address_update_requester.go @@ -465,7 +465,7 @@ func (f *shipmentAddressUpdateRequester) ReviewShipmentAddressChange(appCtx appc if tooApprovalStatus == models.ShipmentAddressUpdateStatusApproved { queryBuilder := query.NewQueryBuilder() - serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(f.planner, queryBuilder, f.moveRouter, f.shipmentFetcher, f.addressCreator) + serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(f.planner, queryBuilder, f.moveRouter, f.shipmentFetcher, f.addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) serviceItemCreator := mtoserviceitem.NewMTOServiceItemCreator(f.planner, queryBuilder, f.moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) addressUpdate.Status = models.ShipmentAddressUpdateStatusApproved @@ -497,6 +497,38 @@ func (f *shipmentAddressUpdateRequester) ReviewShipmentAddressChange(appCtx appc return nil, apperror.NewQueryError("MTOShipment", err, "") } + shipmentHasApprovedDestSIT := f.doesShipmentContainApprovedDestinationSIT(shipmentDetails) + + for i, serviceItem := range shipmentDetails.MTOServiceItems { + var updatedServiceItem *models.MTOServiceItem + if serviceItem.ReService.Code == models.ReServiceCodeDDP || serviceItem.ReService.Code == models.ReServiceCodeDUPK { + updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt)) + if err != nil { + return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error()) + } + } + + if !shipmentHasApprovedDestSIT { + if serviceItem.ReService.Code == models.ReServiceCodeDLH || serviceItem.ReService.Code == models.ReServiceCodeFSC { + updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt)) + if err != nil { + return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error()) + } + } + } else { + if serviceItem.ReService.Code == models.ReServiceCodeDDSFSC || serviceItem.ReService.Code == models.ReServiceCodeDDDSIT { + updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt)) + if err != nil { + return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error()) + } + } + } + + if updatedServiceItem != nil { + shipmentDetails.MTOServiceItems[i] = *updatedServiceItem + } + } + // If the pricing type has changed then we automatically reject the DLH or DSH service item on the shipment since it is now inaccurate var approvedPaymentRequestsExistsForServiceItem bool if haulPricingTypeHasChanged && len(shipment.MTOServiceItems) > 0 { @@ -512,8 +544,6 @@ func (f *shipmentAddressUpdateRequester) ReviewShipmentAddressChange(appCtx appc return nil, apperror.NewQueryError("ServiceItemPaymentRequests", err, "") } - shipmentHasApprovedDestSIT := f.doesShipmentContainApprovedDestinationSIT(shipmentDetails) - // do NOT regenerate any service items if the following conditions exist: // payment has already been approved for DLH or DSH service item // destination SIT is on shipment and any of the service items have an appproved status diff --git a/pkg/services/sit_extension/sit_extension_denier.go b/pkg/services/sit_extension/sit_extension_denier.go index 5d677c353b4..bc0ddf8c100 100644 --- a/pkg/services/sit_extension/sit_extension_denier.go +++ b/pkg/services/sit_extension/sit_extension_denier.go @@ -15,6 +15,7 @@ import ( routemocks "github.com/transcom/mymove/pkg/route/mocks" "github.com/transcom/mymove/pkg/services" "github.com/transcom/mymove/pkg/services/address" + "github.com/transcom/mymove/pkg/services/ghcrateengine" mtoserviceitem "github.com/transcom/mymove/pkg/services/mto_service_item" mtoshipment "github.com/transcom/mymove/pkg/services/mto_shipment" "github.com/transcom/mymove/pkg/services/query" @@ -33,7 +34,7 @@ func NewSITExtensionDenier(moveRouter services.MoveRouter) services.SITExtension mock.Anything, mock.Anything, ).Return(400, nil) - return &sitExtensionDenier{moveRouter, mtoserviceitem.NewMTOServiceItemUpdater(planner, query.NewQueryBuilder(), moveRouter, mtoshipment.NewMTOShipmentFetcher(), address.NewAddressCreator())} + return &sitExtensionDenier{moveRouter, mtoserviceitem.NewMTOServiceItemUpdater(planner, query.NewQueryBuilder(), moveRouter, mtoshipment.NewMTOShipmentFetcher(), address.NewAddressCreator(), ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer())} } // DenySITExtension denies the SIT Extension diff --git a/pkg/testdatagen/scenario/shared.go b/pkg/testdatagen/scenario/shared.go index 44f2bce1b66..e39b3b3a564 100644 --- a/pkg/testdatagen/scenario/shared.go +++ b/pkg/testdatagen/scenario/shared.go @@ -4274,7 +4274,7 @@ func createHHGWithOriginSITServiceItems( mock.Anything, mock.Anything, ).Return(400, nil) - serviceItemUpdator := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator) + serviceItemUpdator := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) var originFirstDaySIT models.MTOServiceItem var originAdditionalDaySIT models.MTOServiceItem @@ -4535,7 +4535,7 @@ func createHHGWithDestinationSITServiceItems(appCtx appcontext.AppContext, prime mock.Anything, mock.Anything, ).Return(400, nil) - serviceItemUpdator := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator) + serviceItemUpdator := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) var destinationFirstDaySIT models.MTOServiceItem var destinationAdditionalDaySIT models.MTOServiceItem @@ -5014,7 +5014,7 @@ func createHHGWithPaymentServiceItems( mock.Anything, mock.Anything, ).Return(400, nil) - serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator) + serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) var originFirstDaySIT models.MTOServiceItem var originAdditionalDaySIT models.MTOServiceItem From f41962515f9bb573a9b847b21e9016068a30d83c Mon Sep 17 00:00:00 2001 From: loganwc Date: Wed, 13 Nov 2024 15:14:37 +0000 Subject: [PATCH 005/260] most of the tests but they don't work --- pkg/db/sequence/random_sequencer_test.go | 70 ++--- pkg/db/sequence/sequencer_test.go | 42 +-- .../ghcrateengine/pricer_query_helpers.go | 1 + pkg/services/mocks/MTOServiceItemCreator.go | 30 ++ pkg/services/mto_service_item.go | 2 + .../mto_service_item_creator.go | 15 +- .../mto_service_item_creator_test.go | 269 ++++++++++++++++++ 7 files changed, 368 insertions(+), 61 deletions(-) diff --git a/pkg/db/sequence/random_sequencer_test.go b/pkg/db/sequence/random_sequencer_test.go index 053060ce54e..b5c31481c0e 100644 --- a/pkg/db/sequence/random_sequencer_test.go +++ b/pkg/db/sequence/random_sequencer_test.go @@ -1,37 +1,37 @@ package sequence -const testMin int64 = 10 -const testMax int64 = 99 - -func (suite *SequenceSuite) TestRandomNextVal() { - sequencer, err := NewRandomSequencer(testMin, testMax) - suite.FatalNoError(err) - - // Try 100 random numbers and make sure they're all between min and max, inclusive. - for i := 0; i < 100; i++ { - nextVal, err := sequencer.NextVal(suite.AppContextForTest()) - suite.NoError(err, "Error getting next value of sequence") - - suite.True(nextVal >= testMin && nextVal <= testMax, - "NextVal returned %d, but range was %d to %d inclusive", nextVal, testMin, testMax) - } -} - -func (suite *SequenceSuite) TestRandomSetVal() { - sequencer, err := NewRandomSequencer(testMin, testMax) - suite.FatalNoError(err) - - // This should be a no-op; just make sure it doesn't throw any errors. - err = sequencer.SetVal(suite.AppContextForTest(), 30) - suite.NoError(err, "Error setting value of sequence") -} - -func (suite *SequenceSuite) TestRandomConstructorErrors() { - sequencer, err := NewRandomSequencer(-3, 10) - suite.Nil(sequencer) - suite.Error(err) - - sequencer, err = NewRandomSequencer(20, 10) - suite.Nil(sequencer) - suite.Error(err) -} +// const testMin int64 = 10 +// const testMax int64 = 99 + +// func (suite *SequenceSuite) TestRandomNextVal() { +// sequencer, err := NewRandomSequencer(testMin, testMax) +// suite.FatalNoError(err) + +// // Try 100 random numbers and make sure they're all between min and max, inclusive. +// for i := 0; i < 100; i++ { +// nextVal, err := sequencer.NextVal(suite.AppContextForTest()) +// suite.NoError(err, "Error getting next value of sequence") + +// suite.True(nextVal >= testMin && nextVal <= testMax, +// "NextVal returned %d, but range was %d to %d inclusive", nextVal, testMin, testMax) +// } +// } + +// func (suite *SequenceSuite) TestRandomSetVal() { +// sequencer, err := NewRandomSequencer(testMin, testMax) +// suite.FatalNoError(err) + +// // This should be a no-op; just make sure it doesn't throw any errors. +// err = sequencer.SetVal(suite.AppContextForTest(), 30) +// suite.NoError(err, "Error setting value of sequence") +// } + +// func (suite *SequenceSuite) TestRandomConstructorErrors() { +// sequencer, err := NewRandomSequencer(-3, 10) +// suite.Nil(sequencer) +// suite.Error(err) + +// sequencer, err = NewRandomSequencer(20, 10) +// suite.Nil(sequencer) +// suite.Error(err) +// } diff --git a/pkg/db/sequence/sequencer_test.go b/pkg/db/sequence/sequencer_test.go index 5dd06751e01..c3976d5ba0e 100644 --- a/pkg/db/sequence/sequencer_test.go +++ b/pkg/db/sequence/sequencer_test.go @@ -1,29 +1,29 @@ package sequence -import ( - "testing" +// import ( +// "testing" - "github.com/stretchr/testify/suite" +// "github.com/stretchr/testify/suite" - "github.com/transcom/mymove/pkg/testingsuite" -) +// "github.com/transcom/mymove/pkg/testingsuite" +// ) -type SequenceSuite struct { - *testingsuite.PopTestSuite -} +// type SequenceSuite struct { +// *testingsuite.PopTestSuite +// } -func (suite *SequenceSuite) SetupTest() { - err := suite.DB().RawQuery("CREATE SEQUENCE IF NOT EXISTS test_sequence;").Exec() - suite.NoError(err, "Error creating test sequence") - err = suite.DB().RawQuery("SELECT setval($1, 1);", testSequence).Exec() - suite.NoError(err, "Error resetting sequence") -} +// func (suite *SequenceSuite) SetupTest() { +// err := suite.DB().RawQuery("CREATE SEQUENCE IF NOT EXISTS test_sequence;").Exec() +// suite.NoError(err, "Error creating test sequence") +// err = suite.DB().RawQuery("SELECT setval($1, 1);", testSequence).Exec() +// suite.NoError(err, "Error resetting sequence") +// } -func TestSequenceSuite(t *testing.T) { +// func TestSequenceSuite(t *testing.T) { - hs := &SequenceSuite{ - PopTestSuite: testingsuite.NewPopTestSuite(testingsuite.CurrentPackage(), testingsuite.WithPerTestTransaction()), - } - suite.Run(t, hs) - hs.PopTestSuite.TearDown() -} +// hs := &SequenceSuite{ +// PopTestSuite: testingsuite.NewPopTestSuite(testingsuite.CurrentPackage(), testingsuite.WithPerTestTransaction()), +// } +// suite.Run(t, hs) +// hs.PopTestSuite.TearDown() +// } diff --git a/pkg/services/ghcrateengine/pricer_query_helpers.go b/pkg/services/ghcrateengine/pricer_query_helpers.go index e2b6f91810a..400e25b0feb 100644 --- a/pkg/services/ghcrateengine/pricer_query_helpers.go +++ b/pkg/services/ghcrateengine/pricer_query_helpers.go @@ -47,6 +47,7 @@ func fetchDomOtherPrice(appCtx appcontext.AppContext, contractCode string, servi func fetchDomServiceAreaPrice(appCtx appcontext.AppContext, contractCode string, serviceCode models.ReServiceCode, serviceArea string, isPeakPeriod bool) (models.ReDomesticServiceAreaPrice, error) { var domServiceAreaPrice models.ReDomesticServiceAreaPrice + print("\n\n\n6. ", contractCode, " ", serviceCode, " ", serviceArea, "\n\n\n") err := appCtx.DB().Q(). Join("re_domestic_service_areas sa", "domestic_service_area_id = sa.id"). Join("re_services", "service_id = re_services.id"). diff --git a/pkg/services/mocks/MTOServiceItemCreator.go b/pkg/services/mocks/MTOServiceItemCreator.go index ae6e7d230e7..ab7cd5f1deb 100644 --- a/pkg/services/mocks/MTOServiceItemCreator.go +++ b/pkg/services/mocks/MTOServiceItemCreator.go @@ -8,6 +8,8 @@ import ( models "github.com/transcom/mymove/pkg/models" + unit "github.com/transcom/mymove/pkg/unit" + validate "github.com/gobuffalo/validate/v3" ) @@ -55,6 +57,34 @@ func (_m *MTOServiceItemCreator) CreateMTOServiceItem(appCtx appcontext.AppConte return r0, r1, r2 } +// FindEstimatedPrice provides a mock function with given fields: appCtx, serviceItem, mtoShipment +func (_m *MTOServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, mtoShipment models.MTOShipment) (unit.Cents, error) { + ret := _m.Called(appCtx, serviceItem, mtoShipment) + + if len(ret) == 0 { + panic("no return value specified for FindEstimatedPrice") + } + + var r0 unit.Cents + var r1 error + if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOServiceItem, models.MTOShipment) (unit.Cents, error)); ok { + return rf(appCtx, serviceItem, mtoShipment) + } + if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOServiceItem, models.MTOShipment) unit.Cents); ok { + r0 = rf(appCtx, serviceItem, mtoShipment) + } else { + r0 = ret.Get(0).(unit.Cents) + } + + if rf, ok := ret.Get(1).(func(appcontext.AppContext, *models.MTOServiceItem, models.MTOShipment) error); ok { + r1 = rf(appCtx, serviceItem, mtoShipment) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // NewMTOServiceItemCreator creates a new instance of MTOServiceItemCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. func NewMTOServiceItemCreator(t interface { diff --git a/pkg/services/mto_service_item.go b/pkg/services/mto_service_item.go index 25926ae3fca..fd403b7875c 100644 --- a/pkg/services/mto_service_item.go +++ b/pkg/services/mto_service_item.go @@ -9,6 +9,7 @@ import ( "github.com/transcom/mymove/pkg/appcontext" "github.com/transcom/mymove/pkg/models" "github.com/transcom/mymove/pkg/route" + "github.com/transcom/mymove/pkg/unit" ) // MTOServiceItemFetcher is the exported interface for fetching a mto service item @@ -23,6 +24,7 @@ type MTOServiceItemFetcher interface { //go:generate mockery --name MTOServiceItemCreator type MTOServiceItemCreator interface { CreateMTOServiceItem(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem) (*models.MTOServiceItems, *validate.Errors, error) + FindEstimatedPrice(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, mtoShipment models.MTOShipment) (unit.Cents, error) } // MTOServiceItemUpdater is the exported interface for updating an mto service item 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 095a186da1d..460df8e19c0 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator.go +++ b/pkg/services/mto_service_item/mto_service_item_creator.go @@ -39,7 +39,9 @@ type mtoServiceItemCreator struct { fuelSurchargePricer services.FuelSurchargePricer } -func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, mtoShipment models.MTOShipment) (unit.Cents, error) { +func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, mtoShipment models.MTOShipment) (unit.Cents, error) { + print("\n\n\nStart: ", serviceItem.ReService.Code, " 1. \n") + if serviceItem.ReService.Code == models.ReServiceCodeDOP || serviceItem.ReService.Code == models.ReServiceCodeDPK || serviceItem.ReService.Code == models.ReServiceCodeDDP || @@ -55,7 +57,6 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, requestedPickupDate := *mtoShipment.RequestedPickupDate currTime := time.Now() var distance int - primeEstimatedWeightForFSC := *mtoShipment.PrimeEstimatedWeight primeEstimatedWeight := mtoShipment.PrimeEstimatedWeight if mtoShipment.ShipmentType == models.MTOShipmentTypeHHGOutOfNTSDom { newWeight := int(primeEstimatedWeight.Float64() * 1.1) @@ -64,8 +65,10 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, contractCode, err := FetchContractCode(appCtx, currTime) if err != nil { + print(err.Error(), " 2. \n\n\n") contractCode, err = FetchContractCode(appCtx, requestedPickupDate) if err != nil { + print(err.Error(), " 3. \n\n\n") return 0, err } } @@ -76,11 +79,13 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, if serviceItem.ReService.Code == models.ReServiceCodeDOP { domesticServiceArea, err := fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.PickupAddress.PostalCode) if err != nil { + print(err.Error(), " 4. \n\n\n") return 0, err } price, _, err = o.originPricer.Price(appCtx, contractCode, requestedPickupDate, *primeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { + print(err.Error(), " 5. \n\n\n") return 0, err } } @@ -178,7 +183,7 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, } } - fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, primeEstimatedWeightForFSC) + fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, *primeEstimatedWeight) if err != nil { return 0, err } @@ -190,7 +195,7 @@ func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - price, _, err = o.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), primeEstimatedWeightForFSC, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) + price, _, err = o.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), *primeEstimatedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) if err != nil { return 0, err } @@ -609,7 +614,7 @@ func (o *mtoServiceItemCreator) CreateMTOServiceItem(appCtx appcontext.AppContex // if estimated weight for shipment provided by the prime, calculate the estimated prices for // DLH, DPK, DOP, DDP, DUPK if mtoShipment.PrimeEstimatedWeight != nil && mtoShipment.RequestedPickupDate != nil { - serviceItemEstimatedPrice, err := o.findEstimatedPrice(appCtx, serviceItem, mtoShipment) + serviceItemEstimatedPrice, err := o.FindEstimatedPrice(appCtx, serviceItem, mtoShipment) if serviceItemEstimatedPrice != 0 && err == nil { serviceItem.PricingEstimate = &serviceItemEstimatedPrice } 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 458e98f87c2..f2a8b3eec4e 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 @@ -1041,6 +1041,275 @@ func (suite *MTOServiceItemServiceSuite) TestCreateOriginSITServiceItem() { }) + suite.Run("Calcuating price estimated on creation for ReServiceCodeDOP ", func() { + + var reServiceCodeDOP models.ReService + var reServiceCodeDPK models.ReService + var reServiceCodeDDP models.ReService + var reServiceCodeDUPK models.ReService + + setupTestData := func() models.MTOShipment { + // Set up data to use for all Origin SIT Service Item tests + + move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) + estimatedPrimeWeight := unit.Pound(6000) + pickupDate := time.Date(2024, time.July, 31, 12, 0, 0, 0, time.UTC) + pickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + deliveryAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress3}) + + mtoShipment := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + { + Model: pickupAddress, + LinkOnly: true, + Type: &factory.Addresses.PickupAddress, + }, + { + Model: deliveryAddress, + LinkOnly: true, + Type: &factory.Addresses.DeliveryAddress, + }, + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: &estimatedPrimeWeight, + RequestedPickupDate: &pickupDate, + }, + }, + }, nil) + + return mtoShipment + } + + reServiceCodeDOP = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDOP) + reServiceCodeDPK = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDPK) + reServiceCodeDDP = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDDP) + reServiceCodeDUPK = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDUPK) + + startDate := time.Now().AddDate(-1, 0, 0) + endDate := startDate.AddDate(1, 1, 1) + + contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}) + testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ + ReContractYear: models.ReContractYear{ + Contract: contract, + ContractID: contract.ID, + StartDate: startDate, + EndDate: endDate, + Escalation: 1.0, + EscalationCompounded: 1.0, + }, + }) + + serviceArea := testdatagen.FetchOrMakeReDomesticServiceArea(suite.DB(), testdatagen.Assertions{ + ReDomesticServiceArea: models.ReDomesticServiceArea{ + ContractID: contract.ID, + ServiceArea: "945", + ServicesSchedule: 2, + CreatedAt: time.Now(), + UpdatedAt: time.Now(), + }, + }) + + testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ + ReZip3: models.ReZip3{ + Contract: contract, + ContractID: contract.ID, + DomesticServiceArea: serviceArea, + Zip3: "945", + }, + }) + + shipment := setupTestData() + actualPickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + serviceItemDOP := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDOP, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDPK := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDPK, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDDP := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDDP, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDUPK := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDUPK, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + builder := query.NewQueryBuilder() + moveRouter := moverouter.NewMoveRouter() + planner := &mocks.Planner{} + planner.On("ZipTransitDistance", + mock.AnythingOfType("*appcontext.appContext"), + mock.Anything, + mock.Anything, + ).Return(400, nil) + creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) + + dopEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDOP, shipment) + suite.Equal(unit.Cents(47760), dopEstimatedPriceInCents) + + dpkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDPK, shipment) + suite.Equal(unit.Cents(47760), dpkEstimatedPriceInCents) + + ddpEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDDP, shipment) + suite.Equal(unit.Cents(47760), ddpEstimatedPriceInCents) + + dupkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDUPK, shipment) + suite.Equal(unit.Cents(47760), dupkEstimatedPriceInCents) + }) + + suite.Run("Calcuating price estimated on creation for NTS shipment ", func() { + + var reServiceCodeDOP models.ReService + + setupTestData := func() models.MTOShipment { + // Set up data to use for all Origin SIT Service Item tests + + move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) + estimatedPrimeWeight := unit.Pound(6000) + pickupDate := time.Date(2024, time.July, 31, 12, 0, 0, 0, time.UTC) + pickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + deliveryAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress3}) + + customMTOShipmentTypeHHGOutOfNTSDom := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + { + Model: pickupAddress, + LinkOnly: true, + Type: &factory.Addresses.PickupAddress, + }, + { + Model: deliveryAddress, + LinkOnly: true, + Type: &factory.Addresses.DeliveryAddress, + }, + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: &estimatedPrimeWeight, + RequestedPickupDate: &pickupDate, + ShipmentType: models.MTOShipmentTypeHHGOutOfNTSDom, + }, + }, + }, nil) + + reServiceCodeDOP = factory.BuildReService(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: "DOP", + }, + }, + }, nil) + + startDate := time.Now().AddDate(-1, 0, 0) + endDate := startDate.AddDate(1, 1, 1) + contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}) + testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ + ReContractYear: models.ReContractYear{ + Contract: contract, + ContractID: contract.ID, + StartDate: startDate, + EndDate: endDate, + Escalation: 1.0, + EscalationCompounded: 1.0, + }, + }) + testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ + ReZip3: models.ReZip3{ + Contract: contract, + ContractID: contract.ID, + DomesticServiceArea: testdatagen.FetchOrMakeReDomesticServiceArea(suite.DB(), testdatagen.Assertions{ + ReDomesticServiceArea: models.ReDomesticServiceArea{ + ContractID: contract.ID, + ServiceArea: "674", + ServicesSchedule: 2, + CreatedAt: time.Now(), + UpdatedAt: time.Now(), + }, + }), + Zip3: "674", + }, + }) + testdatagen.MakeReDomesticServiceAreaPrice(suite.DB(), testdatagen.Assertions{ReService: models.ReService{Code: "DOP"}}) + + return customMTOShipmentTypeHHGOutOfNTSDom + } + + shipment := setupTestData() + actualPickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + actualPickupAddress.PostalCode = "67449" + + serviceItemDOP := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDOP, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + builder := query.NewQueryBuilder() + moveRouter := moverouter.NewMoveRouter() + planner := &mocks.Planner{} + planner.On("ZipTransitDistance", + mock.AnythingOfType("*appcontext.appContext"), + mock.Anything, + mock.Anything, + ).Return(400, nil) + creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) + + estimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDOP, shipment) + estimatedPriceForMTOShipmentTypeHHGOutOfNTSDom := estimatedPriceInCents.Float64() * 1.1 + suite.Equal(estimatedPriceInCents, unit.Cents(estimatedPriceForMTOShipmentTypeHHGOutOfNTSDom)) + }) + suite.Run("Create DOFSIT service item and auto-create DOASIT, DOPSIT, DOSFSC", func() { // TESTCASE SCENARIO // Under test: CreateMTOServiceItem function From a84a0b16e65f2514f8489b140256528511ebc2f5 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Wed, 13 Nov 2024 11:16:59 -0600 Subject: [PATCH 006/260] Adding in addtional service items to be repriced --- .../mto_service_item_updater.go | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) 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 1bbbb60afac..880c235bddf 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -199,6 +199,72 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } + // unpacking + if serviceItem.ReService.Code == models.ReServiceCodeDUPK { + domesticServiceArea, err := fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.DestinationAddress.PostalCode) + if err != nil { + return 0, err + } + price, _, err = p.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServicesSchedule, isPPM) + if err != nil { + return 0, err + } + } + // destination sit delivery + if serviceItem.ReService.Code == models.ReServiceCodeDDDSIT { + var pickupDate time.Time + if mtoShipment.ActualPickupDate != nil { + pickupDate = *mtoShipment.ActualPickupDate + } else { + pickupDate = requestedPickupDate + } + domesticServiceArea, err := fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.DestinationAddress.PostalCode) + if err != nil { + return 0, err + } + if mtoShipment.DestinationAddress != nil { + distance, err = p.planner.ZipTransitDistance(appCtx, serviceItem.SITDestinationFinalAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) + if err != nil { + return 0, err + } + } + price, _, err = p.sitDeliverPricer.Price(appCtx, contractCode, pickupDate, *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, domesticServiceArea.SITPDSchedule, mtoShipment.DestinationAddress.PostalCode, serviceItem.SITDestinationFinalAddress.PostalCode, unit.Miles(distance)) + if err != nil { + return 0, err + } + } + // destination sit fuel surcharge + if serviceItem.ReService.Code == models.ReServiceCodeDDSFSC { + var pickupDateForFSC time.Time + if mtoShipment.ActualPickupDate != nil { + pickupDateForFSC = *mtoShipment.ActualPickupDate + } else { + pickupDateForFSC = requestedPickupDate + } + + if mtoShipment.DestinationAddress != nil { + distance, err = p.planner.ZipTransitDistance(appCtx, serviceItem.SITDestinationFinalAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) + if err != nil { + return 0, err + } + } + fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, primeEstimatedWeight) + if err != nil { + return 0, err + } + fscWeightBasedDistanceMultiplierFloat, err := strconv.ParseFloat(fscWeightBasedDistanceMultiplier, 64) + if err != nil { + return 0, err + } + eiaFuelPrice, err := LookupEIAFuelPrice(appCtx, pickupDateForFSC) + if err != nil { + return 0, err + } + price, _, err = p.sitFuelSurchargePricer.Price(appCtx, *mtoShipment.ActualPickupDate, unit.Miles(distance), *mtoShipment.PrimeEstimatedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) + if err != nil { + return 0, err + } + } // fuel surcharge if serviceItem.ReService.Code == models.ReServiceCodeFSC { var pickupDateForFSC time.Time From 6783ebc522f7edd6d96e28e1662936674bf8a7b4 Mon Sep 17 00:00:00 2001 From: loganwc Date: Wed, 13 Nov 2024 18:26:55 +0000 Subject: [PATCH 007/260] tests now workgit add . --- pkg/db/sequence/random_sequencer_test.go | 70 +- pkg/db/sequence/sequencer_test.go | 42 +- .../ghcrateengine/pricer_query_helpers.go | 1 - .../mto_service_item_creator.go | 6 - .../mto_service_item_creator_test.go | 1202 +++++++++++++---- 5 files changed, 989 insertions(+), 332 deletions(-) diff --git a/pkg/db/sequence/random_sequencer_test.go b/pkg/db/sequence/random_sequencer_test.go index b5c31481c0e..053060ce54e 100644 --- a/pkg/db/sequence/random_sequencer_test.go +++ b/pkg/db/sequence/random_sequencer_test.go @@ -1,37 +1,37 @@ package sequence -// const testMin int64 = 10 -// const testMax int64 = 99 - -// func (suite *SequenceSuite) TestRandomNextVal() { -// sequencer, err := NewRandomSequencer(testMin, testMax) -// suite.FatalNoError(err) - -// // Try 100 random numbers and make sure they're all between min and max, inclusive. -// for i := 0; i < 100; i++ { -// nextVal, err := sequencer.NextVal(suite.AppContextForTest()) -// suite.NoError(err, "Error getting next value of sequence") - -// suite.True(nextVal >= testMin && nextVal <= testMax, -// "NextVal returned %d, but range was %d to %d inclusive", nextVal, testMin, testMax) -// } -// } - -// func (suite *SequenceSuite) TestRandomSetVal() { -// sequencer, err := NewRandomSequencer(testMin, testMax) -// suite.FatalNoError(err) - -// // This should be a no-op; just make sure it doesn't throw any errors. -// err = sequencer.SetVal(suite.AppContextForTest(), 30) -// suite.NoError(err, "Error setting value of sequence") -// } - -// func (suite *SequenceSuite) TestRandomConstructorErrors() { -// sequencer, err := NewRandomSequencer(-3, 10) -// suite.Nil(sequencer) -// suite.Error(err) - -// sequencer, err = NewRandomSequencer(20, 10) -// suite.Nil(sequencer) -// suite.Error(err) -// } +const testMin int64 = 10 +const testMax int64 = 99 + +func (suite *SequenceSuite) TestRandomNextVal() { + sequencer, err := NewRandomSequencer(testMin, testMax) + suite.FatalNoError(err) + + // Try 100 random numbers and make sure they're all between min and max, inclusive. + for i := 0; i < 100; i++ { + nextVal, err := sequencer.NextVal(suite.AppContextForTest()) + suite.NoError(err, "Error getting next value of sequence") + + suite.True(nextVal >= testMin && nextVal <= testMax, + "NextVal returned %d, but range was %d to %d inclusive", nextVal, testMin, testMax) + } +} + +func (suite *SequenceSuite) TestRandomSetVal() { + sequencer, err := NewRandomSequencer(testMin, testMax) + suite.FatalNoError(err) + + // This should be a no-op; just make sure it doesn't throw any errors. + err = sequencer.SetVal(suite.AppContextForTest(), 30) + suite.NoError(err, "Error setting value of sequence") +} + +func (suite *SequenceSuite) TestRandomConstructorErrors() { + sequencer, err := NewRandomSequencer(-3, 10) + suite.Nil(sequencer) + suite.Error(err) + + sequencer, err = NewRandomSequencer(20, 10) + suite.Nil(sequencer) + suite.Error(err) +} diff --git a/pkg/db/sequence/sequencer_test.go b/pkg/db/sequence/sequencer_test.go index c3976d5ba0e..5dd06751e01 100644 --- a/pkg/db/sequence/sequencer_test.go +++ b/pkg/db/sequence/sequencer_test.go @@ -1,29 +1,29 @@ package sequence -// import ( -// "testing" +import ( + "testing" -// "github.com/stretchr/testify/suite" + "github.com/stretchr/testify/suite" -// "github.com/transcom/mymove/pkg/testingsuite" -// ) + "github.com/transcom/mymove/pkg/testingsuite" +) -// type SequenceSuite struct { -// *testingsuite.PopTestSuite -// } +type SequenceSuite struct { + *testingsuite.PopTestSuite +} -// func (suite *SequenceSuite) SetupTest() { -// err := suite.DB().RawQuery("CREATE SEQUENCE IF NOT EXISTS test_sequence;").Exec() -// suite.NoError(err, "Error creating test sequence") -// err = suite.DB().RawQuery("SELECT setval($1, 1);", testSequence).Exec() -// suite.NoError(err, "Error resetting sequence") -// } +func (suite *SequenceSuite) SetupTest() { + err := suite.DB().RawQuery("CREATE SEQUENCE IF NOT EXISTS test_sequence;").Exec() + suite.NoError(err, "Error creating test sequence") + err = suite.DB().RawQuery("SELECT setval($1, 1);", testSequence).Exec() + suite.NoError(err, "Error resetting sequence") +} -// func TestSequenceSuite(t *testing.T) { +func TestSequenceSuite(t *testing.T) { -// hs := &SequenceSuite{ -// PopTestSuite: testingsuite.NewPopTestSuite(testingsuite.CurrentPackage(), testingsuite.WithPerTestTransaction()), -// } -// suite.Run(t, hs) -// hs.PopTestSuite.TearDown() -// } + hs := &SequenceSuite{ + PopTestSuite: testingsuite.NewPopTestSuite(testingsuite.CurrentPackage(), testingsuite.WithPerTestTransaction()), + } + suite.Run(t, hs) + hs.PopTestSuite.TearDown() +} diff --git a/pkg/services/ghcrateengine/pricer_query_helpers.go b/pkg/services/ghcrateengine/pricer_query_helpers.go index 400e25b0feb..e2b6f91810a 100644 --- a/pkg/services/ghcrateengine/pricer_query_helpers.go +++ b/pkg/services/ghcrateengine/pricer_query_helpers.go @@ -47,7 +47,6 @@ func fetchDomOtherPrice(appCtx appcontext.AppContext, contractCode string, servi func fetchDomServiceAreaPrice(appCtx appcontext.AppContext, contractCode string, serviceCode models.ReServiceCode, serviceArea string, isPeakPeriod bool) (models.ReDomesticServiceAreaPrice, error) { var domServiceAreaPrice models.ReDomesticServiceAreaPrice - print("\n\n\n6. ", contractCode, " ", serviceCode, " ", serviceArea, "\n\n\n") err := appCtx.DB().Q(). Join("re_domestic_service_areas sa", "domestic_service_area_id = sa.id"). Join("re_services", "service_id = re_services.id"). 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 460df8e19c0..40f78600fec 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator.go +++ b/pkg/services/mto_service_item/mto_service_item_creator.go @@ -40,8 +40,6 @@ type mtoServiceItemCreator struct { } func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, mtoShipment models.MTOShipment) (unit.Cents, error) { - print("\n\n\nStart: ", serviceItem.ReService.Code, " 1. \n") - if serviceItem.ReService.Code == models.ReServiceCodeDOP || serviceItem.ReService.Code == models.ReServiceCodeDPK || serviceItem.ReService.Code == models.ReServiceCodeDDP || @@ -65,10 +63,8 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, contractCode, err := FetchContractCode(appCtx, currTime) if err != nil { - print(err.Error(), " 2. \n\n\n") contractCode, err = FetchContractCode(appCtx, requestedPickupDate) if err != nil { - print(err.Error(), " 3. \n\n\n") return 0, err } } @@ -79,13 +75,11 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, if serviceItem.ReService.Code == models.ReServiceCodeDOP { domesticServiceArea, err := fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.PickupAddress.PostalCode) if err != nil { - print(err.Error(), " 4. \n\n\n") return 0, err } price, _, err = o.originPricer.Price(appCtx, contractCode, requestedPickupDate, *primeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { - print(err.Error(), " 5. \n\n\n") return 0, err } } 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 f2a8b3eec4e..e6084a7f8d1 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 @@ -1041,275 +1041,6 @@ func (suite *MTOServiceItemServiceSuite) TestCreateOriginSITServiceItem() { }) - suite.Run("Calcuating price estimated on creation for ReServiceCodeDOP ", func() { - - var reServiceCodeDOP models.ReService - var reServiceCodeDPK models.ReService - var reServiceCodeDDP models.ReService - var reServiceCodeDUPK models.ReService - - setupTestData := func() models.MTOShipment { - // Set up data to use for all Origin SIT Service Item tests - - move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) - estimatedPrimeWeight := unit.Pound(6000) - pickupDate := time.Date(2024, time.July, 31, 12, 0, 0, 0, time.UTC) - pickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) - deliveryAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress3}) - - mtoShipment := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{ - { - Model: move, - LinkOnly: true, - }, - { - Model: pickupAddress, - LinkOnly: true, - Type: &factory.Addresses.PickupAddress, - }, - { - Model: deliveryAddress, - LinkOnly: true, - Type: &factory.Addresses.DeliveryAddress, - }, - { - Model: models.MTOShipment{ - PrimeEstimatedWeight: &estimatedPrimeWeight, - RequestedPickupDate: &pickupDate, - }, - }, - }, nil) - - return mtoShipment - } - - reServiceCodeDOP = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDOP) - reServiceCodeDPK = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDPK) - reServiceCodeDDP = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDDP) - reServiceCodeDUPK = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDUPK) - - startDate := time.Now().AddDate(-1, 0, 0) - endDate := startDate.AddDate(1, 1, 1) - - contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}) - testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ - ReContractYear: models.ReContractYear{ - Contract: contract, - ContractID: contract.ID, - StartDate: startDate, - EndDate: endDate, - Escalation: 1.0, - EscalationCompounded: 1.0, - }, - }) - - serviceArea := testdatagen.FetchOrMakeReDomesticServiceArea(suite.DB(), testdatagen.Assertions{ - ReDomesticServiceArea: models.ReDomesticServiceArea{ - ContractID: contract.ID, - ServiceArea: "945", - ServicesSchedule: 2, - CreatedAt: time.Now(), - UpdatedAt: time.Now(), - }, - }) - - testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ - ReZip3: models.ReZip3{ - Contract: contract, - ContractID: contract.ID, - DomesticServiceArea: serviceArea, - Zip3: "945", - }, - }) - - shipment := setupTestData() - actualPickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) - serviceItemDOP := models.MTOServiceItem{ - MoveTaskOrder: shipment.MoveTaskOrder, - MoveTaskOrderID: shipment.MoveTaskOrderID, - MTOShipment: shipment, - MTOShipmentID: &shipment.ID, - ReService: reServiceCodeDOP, - SITEntryDate: &sitEntryDate, - SITPostalCode: &sitPostalCode, - Reason: &reason, - SITOriginHHGActualAddress: &actualPickupAddress, - Status: models.MTOServiceItemStatusSubmitted, - } - - serviceItemDPK := models.MTOServiceItem{ - MoveTaskOrder: shipment.MoveTaskOrder, - MoveTaskOrderID: shipment.MoveTaskOrderID, - MTOShipment: shipment, - MTOShipmentID: &shipment.ID, - ReService: reServiceCodeDPK, - SITEntryDate: &sitEntryDate, - SITPostalCode: &sitPostalCode, - Reason: &reason, - SITOriginHHGActualAddress: &actualPickupAddress, - Status: models.MTOServiceItemStatusSubmitted, - } - - serviceItemDDP := models.MTOServiceItem{ - MoveTaskOrder: shipment.MoveTaskOrder, - MoveTaskOrderID: shipment.MoveTaskOrderID, - MTOShipment: shipment, - MTOShipmentID: &shipment.ID, - ReService: reServiceCodeDDP, - SITEntryDate: &sitEntryDate, - SITPostalCode: &sitPostalCode, - Reason: &reason, - SITOriginHHGActualAddress: &actualPickupAddress, - Status: models.MTOServiceItemStatusSubmitted, - } - - serviceItemDUPK := models.MTOServiceItem{ - MoveTaskOrder: shipment.MoveTaskOrder, - MoveTaskOrderID: shipment.MoveTaskOrderID, - MTOShipment: shipment, - MTOShipmentID: &shipment.ID, - ReService: reServiceCodeDUPK, - SITEntryDate: &sitEntryDate, - SITPostalCode: &sitPostalCode, - Reason: &reason, - SITOriginHHGActualAddress: &actualPickupAddress, - Status: models.MTOServiceItemStatusSubmitted, - } - - builder := query.NewQueryBuilder() - moveRouter := moverouter.NewMoveRouter() - planner := &mocks.Planner{} - planner.On("ZipTransitDistance", - mock.AnythingOfType("*appcontext.appContext"), - mock.Anything, - mock.Anything, - ).Return(400, nil) - creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) - - dopEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDOP, shipment) - suite.Equal(unit.Cents(47760), dopEstimatedPriceInCents) - - dpkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDPK, shipment) - suite.Equal(unit.Cents(47760), dpkEstimatedPriceInCents) - - ddpEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDDP, shipment) - suite.Equal(unit.Cents(47760), ddpEstimatedPriceInCents) - - dupkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDUPK, shipment) - suite.Equal(unit.Cents(47760), dupkEstimatedPriceInCents) - }) - - suite.Run("Calcuating price estimated on creation for NTS shipment ", func() { - - var reServiceCodeDOP models.ReService - - setupTestData := func() models.MTOShipment { - // Set up data to use for all Origin SIT Service Item tests - - move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) - estimatedPrimeWeight := unit.Pound(6000) - pickupDate := time.Date(2024, time.July, 31, 12, 0, 0, 0, time.UTC) - pickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) - deliveryAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress3}) - - customMTOShipmentTypeHHGOutOfNTSDom := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{ - { - Model: move, - LinkOnly: true, - }, - { - Model: pickupAddress, - LinkOnly: true, - Type: &factory.Addresses.PickupAddress, - }, - { - Model: deliveryAddress, - LinkOnly: true, - Type: &factory.Addresses.DeliveryAddress, - }, - { - Model: models.MTOShipment{ - PrimeEstimatedWeight: &estimatedPrimeWeight, - RequestedPickupDate: &pickupDate, - ShipmentType: models.MTOShipmentTypeHHGOutOfNTSDom, - }, - }, - }, nil) - - reServiceCodeDOP = factory.BuildReService(suite.DB(), []factory.Customization{ - { - Model: models.ReService{ - Code: "DOP", - }, - }, - }, nil) - - startDate := time.Now().AddDate(-1, 0, 0) - endDate := startDate.AddDate(1, 1, 1) - contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}) - testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ - ReContractYear: models.ReContractYear{ - Contract: contract, - ContractID: contract.ID, - StartDate: startDate, - EndDate: endDate, - Escalation: 1.0, - EscalationCompounded: 1.0, - }, - }) - testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ - ReZip3: models.ReZip3{ - Contract: contract, - ContractID: contract.ID, - DomesticServiceArea: testdatagen.FetchOrMakeReDomesticServiceArea(suite.DB(), testdatagen.Assertions{ - ReDomesticServiceArea: models.ReDomesticServiceArea{ - ContractID: contract.ID, - ServiceArea: "674", - ServicesSchedule: 2, - CreatedAt: time.Now(), - UpdatedAt: time.Now(), - }, - }), - Zip3: "674", - }, - }) - testdatagen.MakeReDomesticServiceAreaPrice(suite.DB(), testdatagen.Assertions{ReService: models.ReService{Code: "DOP"}}) - - return customMTOShipmentTypeHHGOutOfNTSDom - } - - shipment := setupTestData() - actualPickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) - actualPickupAddress.PostalCode = "67449" - - serviceItemDOP := models.MTOServiceItem{ - MoveTaskOrder: shipment.MoveTaskOrder, - MoveTaskOrderID: shipment.MoveTaskOrderID, - MTOShipment: shipment, - MTOShipmentID: &shipment.ID, - ReService: reServiceCodeDOP, - SITEntryDate: &sitEntryDate, - SITPostalCode: &sitPostalCode, - Reason: &reason, - SITOriginHHGActualAddress: &actualPickupAddress, - Status: models.MTOServiceItemStatusSubmitted, - } - - builder := query.NewQueryBuilder() - moveRouter := moverouter.NewMoveRouter() - planner := &mocks.Planner{} - planner.On("ZipTransitDistance", - mock.AnythingOfType("*appcontext.appContext"), - mock.Anything, - mock.Anything, - ).Return(400, nil) - creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) - - estimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDOP, shipment) - estimatedPriceForMTOShipmentTypeHHGOutOfNTSDom := estimatedPriceInCents.Float64() * 1.1 - suite.Equal(estimatedPriceInCents, unit.Cents(estimatedPriceForMTOShipmentTypeHHGOutOfNTSDom)) - }) - suite.Run("Create DOFSIT service item and auto-create DOASIT, DOPSIT, DOSFSC", func() { // TESTCASE SCENARIO // Under test: CreateMTOServiceItem function @@ -2090,3 +1821,936 @@ func (suite *MTOServiceItemServiceSuite) TestCreateDestSITServiceItem() { suite.Contains(invalidInputError.ValidationErrors.Keys(), "reServiceCode") }) } + +func (suite *MTOServiceItemServiceSuite) TestPriceEstimator() { + suite.Run("Calcuating price estimated on creation for HHG ", func() { + setupTestData := func() models.MTOShipment { + // Set up data to use for all Origin SIT Service Item tests + + move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) + estimatedPrimeWeight := unit.Pound(6000) + pickupDate := time.Date(2024, time.July, 31, 12, 0, 0, 0, time.UTC) + pickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + deliveryAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress3}) + + mtoShipment := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + { + Model: pickupAddress, + LinkOnly: true, + Type: &factory.Addresses.PickupAddress, + }, + { + Model: deliveryAddress, + LinkOnly: true, + Type: &factory.Addresses.DeliveryAddress, + }, + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: &estimatedPrimeWeight, + RequestedPickupDate: &pickupDate, + }, + }, + }, nil) + + return mtoShipment + } + + reServiceCodeDOP := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDOP) + reServiceCodeDPK := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDPK) + reServiceCodeDDP := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDDP) + reServiceCodeDUPK := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDUPK) + reServiceCodeDLH := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDLH) + reServiceCodeDSH := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDSH) + reServiceCodeFSC := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeFSC) + + startDate := time.Now().AddDate(-1, 0, 0) + endDate := startDate.AddDate(1, 1, 1) + sitEntryDate := time.Date(2020, time.October, 24, 0, 0, 0, 0, time.UTC) + sitPostalCode := "99999" + reason := "lorem ipsum" + + contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}) + contractYear := testdatagen.MakeReContractYear(suite.DB(), + testdatagen.Assertions{ + ReContractYear: models.ReContractYear{ + Name: "Test Contract Year", + EscalationCompounded: 1.125, + StartDate: startDate, + EndDate: endDate, + }, + }) + + serviceArea := testdatagen.MakeReDomesticServiceArea(suite.DB(), + testdatagen.Assertions{ + ReDomesticServiceArea: models.ReDomesticServiceArea{ + Contract: contractYear.Contract, + ServiceArea: "945", + ServicesSchedule: 1, + }, + }) + + serviceAreaDest := testdatagen.MakeReDomesticServiceArea(suite.DB(), + testdatagen.Assertions{ + ReDomesticServiceArea: models.ReDomesticServiceArea{ + Contract: contractYear.Contract, + ServiceArea: "503", + ServicesSchedule: 1, + }, + }) + + serviceAreaPriceDOP := models.ReDomesticServiceAreaPrice{ + ContractID: contractYear.Contract.ID, + ServiceID: reServiceCodeDOP.ID, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceArea.ID, + PriceCents: unit.Cents(1234), + } + + serviceAreaPriceDPK := models.ReDomesticOtherPrice{ + ContractID: contractYear.Contract.ID, + ServiceID: reServiceCodeDPK.ID, + IsPeakPeriod: true, + Schedule: 1, + PriceCents: unit.Cents(121), + } + + serviceAreaPriceDDP := models.ReDomesticServiceAreaPrice{ + ContractID: contractYear.Contract.ID, + ServiceID: reServiceCodeDDP.ID, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceAreaDest.ID, + PriceCents: unit.Cents(482), + } + + serviceAreaPriceDUPK := models.ReDomesticOtherPrice{ + ContractID: contractYear.Contract.ID, + ServiceID: reServiceCodeDUPK.ID, + IsPeakPeriod: true, + Schedule: 1, + PriceCents: unit.Cents(945), + } + + serviceAreaPriceDLH := models.ReDomesticLinehaulPrice{ + ContractID: contractYear.Contract.ID, + WeightLower: 500, + WeightUpper: 10000, + MilesLower: 1, + MilesUpper: 10000, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceArea.ID, + PriceMillicents: unit.Millicents(482), + } + + serviceAreaPriceDSH := models.ReDomesticServiceAreaPrice{ + ContractID: contractYear.Contract.ID, + ServiceID: reServiceCodeDSH.ID, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceArea.ID, + PriceCents: unit.Cents(999), + } + + testdatagen.MakeGHCDieselFuelPrice(suite.DB(), testdatagen.Assertions{ + GHCDieselFuelPrice: models.GHCDieselFuelPrice{ + FuelPriceInMillicents: unit.Millicents(281400), + PublicationDate: time.Date(2020, time.March, 9, 0, 0, 0, 0, time.UTC), + EffectiveDate: time.Date(2020, time.March, 10, 0, 0, 0, 0, time.UTC), + EndDate: time.Date(2025, time.March, 17, 0, 0, 0, 0, time.UTC), + }, + }) + + suite.MustSave(&serviceAreaPriceDOP) + suite.MustSave(&serviceAreaPriceDPK) + suite.MustSave(&serviceAreaPriceDDP) + suite.MustSave(&serviceAreaPriceDUPK) + suite.MustSave(&serviceAreaPriceDLH) + suite.MustSave(&serviceAreaPriceDSH) + + testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ + ReZip3: models.ReZip3{ + Contract: contract, + ContractID: contract.ID, + DomesticServiceArea: serviceArea, + Zip3: "945", + }, + }) + + testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ + ReZip3: models.ReZip3{ + Contract: contract, + ContractID: contract.ID, + DomesticServiceArea: serviceAreaDest, + Zip3: "503", + }, + }) + + shipment := setupTestData() + actualPickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + serviceItemDOP := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDOP, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDPK := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDPK, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDDP := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDDP, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDUPK := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDUPK, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDLH := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDLH, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDSH := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDSH, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemFSC := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeFSC, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + builder := query.NewQueryBuilder() + moveRouter := moverouter.NewMoveRouter() + planner := &mocks.Planner{} + planner.On("ZipTransitDistance", + mock.AnythingOfType("*appcontext.appContext"), + mock.Anything, + mock.Anything, + ).Return(400, nil) + creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) + + dopEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDOP, shipment) + suite.Equal(unit.Cents(83280), dopEstimatedPriceInCents) + + dpkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDPK, shipment) + suite.Equal(unit.Cents(8160), dpkEstimatedPriceInCents) + + ddpEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDDP, shipment) + suite.Equal(unit.Cents(32520), ddpEstimatedPriceInCents) + + dupkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDUPK, shipment) + suite.Equal(unit.Cents(63780), dupkEstimatedPriceInCents) + + dlhEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDLH, shipment) + suite.Equal(unit.Cents(14400), dlhEstimatedPriceInCents) + + dshEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDSH, shipment) + suite.Equal(unit.Cents(26976000), dshEstimatedPriceInCents) + + fscEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemFSC, shipment) + suite.Equal(unit.Cents(786), fscEstimatedPriceInCents) + }) + + suite.Run("Calcuating price estimated on creation for NTS shipment ", func() { + setupTestData := func() models.MTOShipment { + // Set up data to use for all Origin SIT Service Item tests + + move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) + estimatedPrimeWeight := unit.Pound(6000) + pickupDate := time.Date(2024, time.July, 31, 12, 0, 0, 0, time.UTC) + pickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + deliveryAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress3}) + + mtoShipment := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + { + Model: pickupAddress, + LinkOnly: true, + Type: &factory.Addresses.PickupAddress, + }, + { + Model: deliveryAddress, + LinkOnly: true, + Type: &factory.Addresses.DeliveryAddress, + }, + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: &estimatedPrimeWeight, + RequestedPickupDate: &pickupDate, + ShipmentType: models.MTOShipmentTypeHHGOutOfNTSDom, + }, + }, + }, nil) + + return mtoShipment + } + + reServiceCodeDOP := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDOP) + reServiceCodeDPK := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDPK) + reServiceCodeDDP := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDDP) + reServiceCodeDUPK := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDUPK) + reServiceCodeDLH := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDLH) + reServiceCodeDSH := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDSH) + reServiceCodeFSC := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeFSC) + + startDate := time.Now().AddDate(-1, 0, 0) + endDate := startDate.AddDate(1, 1, 1) + sitEntryDate := time.Date(2020, time.October, 24, 0, 0, 0, 0, time.UTC) + sitPostalCode := "99999" + reason := "lorem ipsum" + + contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}) + contractYear := testdatagen.MakeReContractYear(suite.DB(), + testdatagen.Assertions{ + ReContractYear: models.ReContractYear{ + Name: "Test Contract Year", + EscalationCompounded: 1.125, + StartDate: startDate, + EndDate: endDate, + }, + }) + + serviceArea := testdatagen.MakeReDomesticServiceArea(suite.DB(), + testdatagen.Assertions{ + ReDomesticServiceArea: models.ReDomesticServiceArea{ + Contract: contractYear.Contract, + ServiceArea: "945", + ServicesSchedule: 1, + }, + }) + + serviceAreaDest := testdatagen.MakeReDomesticServiceArea(suite.DB(), + testdatagen.Assertions{ + ReDomesticServiceArea: models.ReDomesticServiceArea{ + Contract: contractYear.Contract, + ServiceArea: "503", + ServicesSchedule: 1, + }, + }) + + serviceAreaPriceDOP := models.ReDomesticServiceAreaPrice{ + ContractID: contractYear.Contract.ID, + ServiceID: reServiceCodeDOP.ID, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceArea.ID, + PriceCents: unit.Cents(1234), + } + + serviceAreaPriceDPK := models.ReDomesticOtherPrice{ + ContractID: contractYear.Contract.ID, + ServiceID: reServiceCodeDPK.ID, + IsPeakPeriod: true, + Schedule: 1, + PriceCents: unit.Cents(121), + } + + serviceAreaPriceDDP := models.ReDomesticServiceAreaPrice{ + ContractID: contractYear.Contract.ID, + ServiceID: reServiceCodeDDP.ID, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceAreaDest.ID, + PriceCents: unit.Cents(482), + } + + serviceAreaPriceDUPK := models.ReDomesticOtherPrice{ + ContractID: contractYear.Contract.ID, + ServiceID: reServiceCodeDUPK.ID, + IsPeakPeriod: true, + Schedule: 1, + PriceCents: unit.Cents(945), + } + + serviceAreaPriceDLH := models.ReDomesticLinehaulPrice{ + ContractID: contractYear.Contract.ID, + WeightLower: 500, + WeightUpper: 10000, + MilesLower: 1, + MilesUpper: 10000, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceArea.ID, + PriceMillicents: unit.Millicents(482), + } + + serviceAreaPriceDSH := models.ReDomesticServiceAreaPrice{ + ContractID: contractYear.Contract.ID, + ServiceID: reServiceCodeDSH.ID, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceArea.ID, + PriceCents: unit.Cents(999), + } + + testdatagen.MakeGHCDieselFuelPrice(suite.DB(), testdatagen.Assertions{ + GHCDieselFuelPrice: models.GHCDieselFuelPrice{ + FuelPriceInMillicents: unit.Millicents(281400), + PublicationDate: time.Date(2020, time.March, 9, 0, 0, 0, 0, time.UTC), + EffectiveDate: time.Date(2020, time.March, 10, 0, 0, 0, 0, time.UTC), + EndDate: time.Date(2025, time.March, 17, 0, 0, 0, 0, time.UTC), + }, + }) + + suite.MustSave(&serviceAreaPriceDOP) + suite.MustSave(&serviceAreaPriceDPK) + suite.MustSave(&serviceAreaPriceDDP) + suite.MustSave(&serviceAreaPriceDUPK) + suite.MustSave(&serviceAreaPriceDLH) + suite.MustSave(&serviceAreaPriceDSH) + + testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ + ReZip3: models.ReZip3{ + Contract: contract, + ContractID: contract.ID, + DomesticServiceArea: serviceArea, + Zip3: "945", + }, + }) + + testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ + ReZip3: models.ReZip3{ + Contract: contract, + ContractID: contract.ID, + DomesticServiceArea: serviceAreaDest, + Zip3: "503", + }, + }) + + shipment := setupTestData() + actualPickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + serviceItemDOP := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDOP, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDPK := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDPK, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDDP := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDDP, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDUPK := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDUPK, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDLH := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDLH, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDSH := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDSH, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemFSC := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeFSC, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + builder := query.NewQueryBuilder() + moveRouter := moverouter.NewMoveRouter() + planner := &mocks.Planner{} + planner.On("ZipTransitDistance", + mock.AnythingOfType("*appcontext.appContext"), + mock.Anything, + mock.Anything, + ).Return(400, nil) + creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) + + dopEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDOP, shipment) + suite.Equal(unit.Cents(91608), dopEstimatedPriceInCents) + + dpkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDPK, shipment) + suite.Equal(unit.Cents(8976), dpkEstimatedPriceInCents) + + ddpEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDDP, shipment) + suite.Equal(unit.Cents(35772), ddpEstimatedPriceInCents) + + dupkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDUPK, shipment) + suite.Equal(unit.Cents(70158), dupkEstimatedPriceInCents) + + dlhEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDLH, shipment) + suite.Equal(unit.Cents(15840), dlhEstimatedPriceInCents) + + dshEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDSH, shipment) + suite.Equal(unit.Cents(29673600), dshEstimatedPriceInCents) + + fscEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemFSC, shipment) + suite.Equal(unit.Cents(786), fscEstimatedPriceInCents) + }) + +} + +/**** + + +func (suite *MTOServiceItemServiceSuite) TestPriceEstimator() { + setupTestData := func() models.MTOShipment { + // Set up data to use for all Origin SIT Service Item tests + + move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) + estimatedPrimeWeight := unit.Pound(6000) + pickupDate := time.Date(2024, time.July, 31, 12, 0, 0, 0, time.UTC) + pickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + deliveryAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress3}) + + mtoShipment := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + { + Model: pickupAddress, + LinkOnly: true, + Type: &factory.Addresses.PickupAddress, + }, + { + Model: deliveryAddress, + LinkOnly: true, + Type: &factory.Addresses.DeliveryAddress, + }, + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: &estimatedPrimeWeight, + RequestedPickupDate: &pickupDate, + }, + }, + }, nil) + + return mtoShipment + } + + shipment := setupTestData() + actualPickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + sitEntryDate := time.Date(2020, time.October, 24, 0, 0, 0, 0, time.UTC) + sitPostalCode := "99999" + reason := "lorem ipsum" + + var reServiceCodeDOP models.ReService + var reServiceCodeDPK models.ReService + var reServiceCodeDDP models.ReService + var reServiceCodeDUPK models.ReService + + startDate := time.Now().AddDate(-1, 0, 0) + endDate := startDate.AddDate(1, 1, 1) + + contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}) + contractYear := testdatagen.MakeReContractYear(suite.DB(), + testdatagen.Assertions{ + ReContractYear: models.ReContractYear{ + Name: "Test Contract Year", + EscalationCompounded: 1.125, + StartDate: startDate, + EndDate: endDate, + }, + }) + + serviceArea := testdatagen.MakeReDomesticServiceArea(suite.DB(), + testdatagen.Assertions{ + ReDomesticServiceArea: models.ReDomesticServiceArea{ + Contract: contractYear.Contract, + ServiceArea: "945", + }, + }) + + testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ + ReZip3: models.ReZip3{ + Contract: contract, + ContractID: contract.ID, + DomesticServiceArea: serviceArea, + Zip3: "945", + }, + }) + + serviceAreaPriceDOP := models.ReDomesticServiceAreaPrice{ + ContractID: contract.ID, + ServiceID: reServiceCodeDOP.ID, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceArea.ID, + PriceCents: unit.Cents(1234), + } + + serviceAreaPriceDPK := models.ReDomesticServiceAreaPrice{ + ContractID: contract.ID, + ServiceID: reServiceCodeDPK.ID, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceArea.ID, + PriceCents: unit.Cents(121), + } + + serviceAreaPriceDDP := models.ReDomesticServiceAreaPrice{ + ContractID: contract.ID, + ServiceID: reServiceCodeDDP.ID, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceArea.ID, + PriceCents: unit.Cents(482), + } + + serviceAreaPriceDUPK := models.ReDomesticServiceAreaPrice{ + ContractID: contract.ID, + ServiceID: reServiceCodeDUPK.ID, + IsPeakPeriod: true, + DomesticServiceAreaID: serviceArea.ID, + PriceCents: unit.Cents(945), + } + + reServiceCodeDOP = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDOP) + reServiceCodeDPK = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDPK) + reServiceCodeDDP = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDDP) + reServiceCodeDUPK = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDUPK) + + serviceItemDOP := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDOP, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDPK := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDPK, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDDP := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDDP, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + serviceItemDUPK := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeDUPK, + SITEntryDate: &sitEntryDate, + SITPostalCode: &sitPostalCode, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + suite.Run("Calcuating price estimated on creation for DOP", func() { + builder := query.NewQueryBuilder() + moveRouter := moverouter.NewMoveRouter() + planner := &mocks.Planner{} + planner.On("ZipTransitDistance", + mock.AnythingOfType("*appcontext.appContext"), + mock.Anything, + mock.Anything, + ).Return(400, nil) + creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) + + suite.MustSave(&serviceAreaPriceDOP) + + dopEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDOP, shipment) + suite.Equal(unit.Cents(83280), dopEstimatedPriceInCents) + }) + + suite.Run("Calcuating price estimated on creation for DPK", func() { + builder := query.NewQueryBuilder() + moveRouter := moverouter.NewMoveRouter() + planner := &mocks.Planner{} + planner.On("ZipTransitDistance", + mock.AnythingOfType("*appcontext.appContext"), + mock.Anything, + mock.Anything, + ).Return(400, nil) + creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) + + suite.MustSave(&serviceAreaPriceDPK) + + dpkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDPK, shipment) + suite.Equal(unit.Cents(47760), dpkEstimatedPriceInCents) + }) + + suite.Run("Calcuating price estimated on creation for DDP", func() { + builder := query.NewQueryBuilder() + moveRouter := moverouter.NewMoveRouter() + planner := &mocks.Planner{} + planner.On("ZipTransitDistance", + mock.AnythingOfType("*appcontext.appContext"), + mock.Anything, + mock.Anything, + ).Return(400, nil) + creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) + + suite.MustSave(&serviceAreaPriceDDP) + + ddpEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDDP, shipment) + suite.Equal(unit.Cents(47760), ddpEstimatedPriceInCents) + }) + + suite.Run("Calcuating price estimated on creation for DUPK", func() { + builder := query.NewQueryBuilder() + moveRouter := moverouter.NewMoveRouter() + planner := &mocks.Planner{} + planner.On("ZipTransitDistance", + mock.AnythingOfType("*appcontext.appContext"), + mock.Anything, + mock.Anything, + ).Return(400, nil) + creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) + + suite.MustSave(&serviceAreaPriceDUPK) + + dupkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDUPK, shipment) + suite.Equal(unit.Cents(47760), dupkEstimatedPriceInCents) + }) + + /** + // suite.Run("Calcuating price estimated on creation for NTS shipment ", func() { + // var reServiceCodeDOP models.ReService + + // setupTestData := func() models.MTOShipment { + // // Set up data to use for all Origin SIT Service Item tests + + // move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) + // estimatedPrimeWeight := unit.Pound(6000) + // pickupDate := time.Date(2024, time.July, 31, 12, 0, 0, 0, time.UTC) + // pickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + // deliveryAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress3}) + + // customMTOShipmentTypeHHGOutOfNTSDom := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{ + // { + // Model: move, + // LinkOnly: true, + // }, + // { + // Model: pickupAddress, + // LinkOnly: true, + // Type: &factory.Addresses.PickupAddress, + // }, + // { + // Model: deliveryAddress, + // LinkOnly: true, + // Type: &factory.Addresses.DeliveryAddress, + // }, + // { + // Model: models.MTOShipment{ + // PrimeEstimatedWeight: &estimatedPrimeWeight, + // RequestedPickupDate: &pickupDate, + // ShipmentType: models.MTOShipmentTypeHHGOutOfNTSDom, + // }, + // }, + // }, nil) + + // reServiceCodeDOP = factory.BuildReService(suite.DB(), []factory.Customization{ + // { + // Model: models.ReService{ + // Code: "DOP", + // }, + // }, + // }, nil) + + // startDate := time.Now().AddDate(-1, 0, 0) + // endDate := startDate.AddDate(1, 1, 1) + // contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}) + // testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ + // ReContractYear: models.ReContractYear{ + // Contract: contract, + // ContractID: contract.ID, + // StartDate: startDate, + // EndDate: endDate, + // Escalation: 1.0, + // EscalationCompounded: 1.0, + // }, + // }) + // testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ + // ReZip3: models.ReZip3{ + // Contract: contract, + // ContractID: contract.ID, + // DomesticServiceArea: testdatagen.FetchOrMakeReDomesticServiceArea(suite.DB(), testdatagen.Assertions{ + // ReDomesticServiceArea: models.ReDomesticServiceArea{ + // ContractID: contract.ID, + // ServiceArea: "674", + // ServicesSchedule: 2, + // CreatedAt: time.Now(), + // UpdatedAt: time.Now(), + // }, + // }), + // Zip3: "674", + // }, + // }) + // testdatagen.MakeReDomesticServiceAreaPrice(suite.DB(), testdatagen.Assertions{ReService: models.ReService{Code: "DOP"}}) + + // return customMTOShipmentTypeHHGOutOfNTSDom + // } + + // shipment := setupTestData() + // actualPickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + // actualPickupAddress.PostalCode = "67449" + + // serviceItemDOP := models.MTOServiceItem{ + // MoveTaskOrder: shipment.MoveTaskOrder, + // MoveTaskOrderID: shipment.MoveTaskOrderID, + // MTOShipment: shipment, + // MTOShipmentID: &shipment.ID, + // ReService: reServiceCodeDOP, + // SITEntryDate: &sitEntryDate, + // SITPostalCode: &sitPostalCode, + // Reason: &reason, + // SITOriginHHGActualAddress: &actualPickupAddress, + // Status: models.MTOServiceItemStatusSubmitted, + // } + + // builder := query.NewQueryBuilder() + // moveRouter := moverouter.NewMoveRouter() + // planner := &mocks.Planner{} + // planner.On("ZipTransitDistance", + // mock.AnythingOfType("*appcontext.appContext"), + // mock.Anything, + // mock.Anything, + // ).Return(400, nil) + // creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) + + // estimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDOP, shipment) + // estimatedPriceForMTOShipmentTypeHHGOutOfNTSDom := estimatedPriceInCents.Float64() * 1.1 + // suite.Equal(estimatedPriceInCents, unit.Cents(estimatedPriceForMTOShipmentTypeHHGOutOfNTSDom)) + // }) + **/ +//} From 529b1403b72f05a4d98de07044bf523ad17eded1 Mon Sep 17 00:00:00 2001 From: loganwc Date: Wed, 13 Nov 2024 18:52:51 +0000 Subject: [PATCH 008/260] someone deleted a thing i wanted --- .../mto_service_item_creator_test.go | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) 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 aa9c691fe76..97b9e7407d0 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 @@ -1856,13 +1856,13 @@ func (suite *MTOServiceItemServiceSuite) TestPriceEstimator() { return mtoShipment } - reServiceCodeDOP := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDOP) - reServiceCodeDPK := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDPK) - reServiceCodeDDP := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDDP) - reServiceCodeDUPK := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDUPK) - reServiceCodeDLH := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDLH) - reServiceCodeDSH := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDSH) - reServiceCodeFSC := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeFSC) + reServiceCodeDOP := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDOP) + reServiceCodeDPK := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDPK) + reServiceCodeDDP := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDDP) + reServiceCodeDUPK := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDUPK) + reServiceCodeDLH := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDLH) + reServiceCodeDSH := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDSH) + reServiceCodeFSC := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeFSC) startDate := time.Now().AddDate(-1, 0, 0) endDate := startDate.AddDate(1, 1, 1) @@ -2146,13 +2146,13 @@ func (suite *MTOServiceItemServiceSuite) TestPriceEstimator() { return mtoShipment } - reServiceCodeDOP := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDOP) - reServiceCodeDPK := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDPK) - reServiceCodeDDP := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDDP) - reServiceCodeDUPK := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDUPK) - reServiceCodeDLH := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDLH) - reServiceCodeDSH := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDSH) - reServiceCodeFSC := factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeFSC) + reServiceCodeDOP := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDOP) + reServiceCodeDPK := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDPK) + reServiceCodeDDP := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDDP) + reServiceCodeDUPK := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDUPK) + reServiceCodeDLH := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDLH) + reServiceCodeDSH := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeDSH) + reServiceCodeFSC := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeFSC) startDate := time.Now().AddDate(-1, 0, 0) endDate := startDate.AddDate(1, 1, 1) From 5afa0f2380abb24d36d8e8acbf6c848e347a4f99 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Wed, 13 Nov 2024 13:16:33 -0600 Subject: [PATCH 009/260] Handling weight changes --- .../mto_service_item_updater.go | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) 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 880c235bddf..35b549159b2 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -141,7 +141,17 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, requestedPickupDate := *mtoShipment.RequestedPickupDate currTime := time.Now() var distance int - primeEstimatedWeight := *mtoShipment.PrimeEstimatedWeight + + var shipmentWeight unit.Pound + if mtoShipment.PrimeActualWeight != nil { + shipmentWeight = *mtoShipment.PrimeActualWeight + } else { + if mtoShipment.PrimeEstimatedWeight != nil { + shipmentWeight = *mtoShipment.PrimeEstimatedWeight + } else { + shipmentWeight = 0 + } + } contractCode, err := FetchContractCode(appCtx, currTime) if err != nil { @@ -163,7 +173,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, } } - price, _, err = p.destinationPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) + price, _, err = p.destinationPricer.Price(appCtx, contractCode, requestedPickupDate, shipmentWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -176,7 +186,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, serviceScheduleDestination := domesticServiceArea.ServicesSchedule - price, _, err = p.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, serviceScheduleDestination, isPPM) + price, _, err = p.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, shipmentWeight, serviceScheduleDestination, isPPM) if err != nil { return 0, err } @@ -194,7 +204,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - price, _, err = p.linehaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) + price, _, err = p.linehaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), shipmentWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -205,7 +215,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - price, _, err = p.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServicesSchedule, isPPM) + price, _, err = p.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, shipmentWeight, domesticServiceArea.ServicesSchedule, isPPM) if err != nil { return 0, err } @@ -228,7 +238,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - price, _, err = p.sitDeliverPricer.Price(appCtx, contractCode, pickupDate, *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, domesticServiceArea.SITPDSchedule, mtoShipment.DestinationAddress.PostalCode, serviceItem.SITDestinationFinalAddress.PostalCode, unit.Miles(distance)) + price, _, err = p.sitDeliverPricer.Price(appCtx, contractCode, pickupDate, shipmentWeight, domesticServiceArea.ServiceArea, domesticServiceArea.SITPDSchedule, mtoShipment.DestinationAddress.PostalCode, serviceItem.SITDestinationFinalAddress.PostalCode, unit.Miles(distance)) if err != nil { return 0, err } @@ -248,7 +258,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, primeEstimatedWeight) + fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, shipmentWeight) if err != nil { return 0, err } @@ -260,7 +270,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - price, _, err = p.sitFuelSurchargePricer.Price(appCtx, *mtoShipment.ActualPickupDate, unit.Miles(distance), *mtoShipment.PrimeEstimatedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) + price, _, err = p.sitFuelSurchargePricer.Price(appCtx, *mtoShipment.ActualPickupDate, unit.Miles(distance), shipmentWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) if err != nil { return 0, err } @@ -284,7 +294,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, } } - fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, primeEstimatedWeight) + fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, shipmentWeight) if err != nil { return 0, err } @@ -296,7 +306,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - price, _, err = p.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), primeEstimatedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) + price, _, err = p.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), shipmentWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) if err != nil { return 0, err } From 0439356be42855148c2641fa1fd574dfe2e4d657 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Thu, 14 Nov 2024 04:37:37 +0000 Subject: [PATCH 010/260] updating shipment address update tests --- .../shipment_address_update_requester_test.go | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) 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 863e1851d21..2e67fd6ce34 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 @@ -14,8 +14,34 @@ import ( "github.com/transcom/mymove/pkg/services/address" moveservices "github.com/transcom/mymove/pkg/services/move" "github.com/transcom/mymove/pkg/testdatagen" + "github.com/transcom/mymove/pkg/unit" ) +func (suite *ShipmentAddressUpdateServiceSuite) setupServiceItemData() { + originalDomesticServiceArea := testdatagen.FetchOrMakeReDomesticServiceArea(suite.AppContextForTest().DB(), testdatagen.Assertions{ + ReDomesticServiceArea: models.ReDomesticServiceArea{ + ServiceArea: "004", + ServicesSchedule: 2, + }, + ReContract: testdatagen.FetchOrMakeReContract(suite.AppContextForTest().DB(), testdatagen.Assertions{}), + }) + + testdatagen.FetchOrMakeReDomesticLinehaulPrice(suite.DB(), testdatagen.Assertions{ + ReDomesticLinehaulPrice: models.ReDomesticLinehaulPrice{ + Contract: originalDomesticServiceArea.Contract, + ContractID: originalDomesticServiceArea.ContractID, + DomesticServiceArea: originalDomesticServiceArea, + DomesticServiceAreaID: originalDomesticServiceArea.ID, + WeightLower: unit.Pound(500), + WeightUpper: unit.Pound(9999), + MilesLower: 500, + MilesUpper: 9999, + PriceMillicents: unit.Millicents(606800), + IsPeakPeriod: false, + }, + }) +} + func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddressUpdate() { setupTestData := func() models.Move { testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ @@ -587,6 +613,8 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp suite.Run("TOO approves address change", func() { + suite.setupServiceItemData() + addressChange := factory.BuildShipmentAddressUpdate(suite.DB(), nil, []factory.Trait{ factory.GetTraitAvailableToPrimeMove, }) @@ -849,6 +877,9 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp "90210", ).Return(2500, nil).Once() move := setupTestData() + + suite.setupServiceItemData() + shipment := factory.BuildMTOShipmentWithMove(&move, suite.DB(), []factory.Customization{ { Model: models.Address{ @@ -915,6 +946,9 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp "90210", ).Return(2500, nil).Once() move := setupTestData() + + suite.setupServiceItemData() + shipment := factory.BuildMTOShipmentWithMove(&move, suite.DB(), []factory.Customization{ { Model: models.Address{ @@ -970,6 +1004,9 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp suite.Run("Service items are not rejected when pricing type does not change post TOO approval", func() { move := setupTestData() + + suite.setupServiceItemData() + shipment := factory.BuildMTOShipmentWithMove(&move, suite.DB(), nil, nil) //Generate service items to test their statuses upon approval @@ -1014,6 +1051,9 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp "90210", ).Return(2500, nil).Once() move := setupTestData() + + suite.setupServiceItemData() + shipment := factory.BuildMTOShipmentWithMove(&move, suite.DB(), []factory.Customization{ { Model: models.Address{ @@ -1081,6 +1121,9 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp PostalCode: "90210", } move := setupTestData() + + suite.setupServiceItemData() + shipment := factory.BuildMTOShipmentWithMove(&move, suite.DB(), []factory.Customization{ { Model: models.Address{ From 12eb8377a54f5b73f4cd2f055c66873dd7886ffd Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Thu, 14 Nov 2024 14:29:22 +0000 Subject: [PATCH 011/260] Adding ReContractYear data generation to shipment address tests --- .../shipment_address_update_requester_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 2e67fd6ce34..034b1420152 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 @@ -40,6 +40,17 @@ func (suite *ShipmentAddressUpdateServiceSuite) setupServiceItemData() { IsPeakPeriod: false, }, }) + + testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ + ReContractYear: models.ReContractYear{ + Contract: originalDomesticServiceArea.Contract, + ContractID: originalDomesticServiceArea.ContractID, + StartDate: time.Date(2019, time.June, 1, 0, 0, 0, 0, time.UTC), + EndDate: time.Date(2030, time.May, 31, 0, 0, 0, 0, time.UTC), + Escalation: 1.0, + EscalationCompounded: 1.0, + }, + }) } func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddressUpdate() { From 484018aa6af4878ff9a51ce1e7aad0fabb639684 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Thu, 14 Nov 2024 15:24:31 +0000 Subject: [PATCH 012/260] Updating shipment address request tests --- .../shipment_address_update_requester_test.go | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) 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 034b1420152..b2edfc521dd 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 @@ -18,6 +18,16 @@ import ( ) func (suite *ShipmentAddressUpdateServiceSuite) setupServiceItemData() { + startDate := time.Date(2020, time.January, 1, 12, 0, 0, 0, time.UTC) + endDate := time.Date(2020, time.December, 31, 12, 0, 0, 0, time.UTC) + + testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ + ReContractYear: models.ReContractYear{ + StartDate: startDate, + EndDate: endDate, + }, + }) + originalDomesticServiceArea := testdatagen.FetchOrMakeReDomesticServiceArea(suite.AppContextForTest().DB(), testdatagen.Assertions{ ReDomesticServiceArea: models.ReDomesticServiceArea{ ServiceArea: "004", @@ -40,17 +50,6 @@ func (suite *ShipmentAddressUpdateServiceSuite) setupServiceItemData() { IsPeakPeriod: false, }, }) - - testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ - ReContractYear: models.ReContractYear{ - Contract: originalDomesticServiceArea.Contract, - ContractID: originalDomesticServiceArea.ContractID, - StartDate: time.Date(2019, time.June, 1, 0, 0, 0, 0, time.UTC), - EndDate: time.Date(2030, time.May, 31, 0, 0, 0, 0, time.UTC), - Escalation: 1.0, - EscalationCompounded: 1.0, - }, - }) } func (suite *ShipmentAddressUpdateServiceSuite) TestCreateApprovedShipmentAddressUpdate() { @@ -1030,6 +1029,11 @@ func (suite *ShipmentAddressUpdateServiceSuite) TestTOOApprovedShipmentAddressUp State: "CA", PostalCode: shipment.DestinationAddress.PostalCode, } + mockPlanner.On("ZipTransitDistance", + mock.AnythingOfType("*appcontext.appContext"), + "90210", + "94535", + ).Return(2500, nil).Once() mockPlanner.On("ZipTransitDistance", mock.AnythingOfType("*appcontext.appContext"), "94535", From ab2950c41f0af646b3aa1f4028f9ac6e07b6c23b Mon Sep 17 00:00:00 2001 From: Logan Cunningham <148146808+loganwc@users.noreply.github.com> Date: Thu, 14 Nov 2024 12:30:25 -0600 Subject: [PATCH 013/260] Update mto_service_item_creator_test.go --- .../mto_service_item_creator_test.go | 350 ------------------ 1 file changed, 350 deletions(-) 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 97b9e7407d0..b3cf305f3f3 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 @@ -2401,353 +2401,3 @@ func (suite *MTOServiceItemServiceSuite) TestPriceEstimator() { } -/**** - - -func (suite *MTOServiceItemServiceSuite) TestPriceEstimator() { - setupTestData := func() models.MTOShipment { - // Set up data to use for all Origin SIT Service Item tests - - move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) - estimatedPrimeWeight := unit.Pound(6000) - pickupDate := time.Date(2024, time.July, 31, 12, 0, 0, 0, time.UTC) - pickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) - deliveryAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress3}) - - mtoShipment := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{ - { - Model: move, - LinkOnly: true, - }, - { - Model: pickupAddress, - LinkOnly: true, - Type: &factory.Addresses.PickupAddress, - }, - { - Model: deliveryAddress, - LinkOnly: true, - Type: &factory.Addresses.DeliveryAddress, - }, - { - Model: models.MTOShipment{ - PrimeEstimatedWeight: &estimatedPrimeWeight, - RequestedPickupDate: &pickupDate, - }, - }, - }, nil) - - return mtoShipment - } - - shipment := setupTestData() - actualPickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) - sitEntryDate := time.Date(2020, time.October, 24, 0, 0, 0, 0, time.UTC) - sitPostalCode := "99999" - reason := "lorem ipsum" - - var reServiceCodeDOP models.ReService - var reServiceCodeDPK models.ReService - var reServiceCodeDDP models.ReService - var reServiceCodeDUPK models.ReService - - startDate := time.Now().AddDate(-1, 0, 0) - endDate := startDate.AddDate(1, 1, 1) - - contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}) - contractYear := testdatagen.MakeReContractYear(suite.DB(), - testdatagen.Assertions{ - ReContractYear: models.ReContractYear{ - Name: "Test Contract Year", - EscalationCompounded: 1.125, - StartDate: startDate, - EndDate: endDate, - }, - }) - - serviceArea := testdatagen.MakeReDomesticServiceArea(suite.DB(), - testdatagen.Assertions{ - ReDomesticServiceArea: models.ReDomesticServiceArea{ - Contract: contractYear.Contract, - ServiceArea: "945", - }, - }) - - testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ - ReZip3: models.ReZip3{ - Contract: contract, - ContractID: contract.ID, - DomesticServiceArea: serviceArea, - Zip3: "945", - }, - }) - - serviceAreaPriceDOP := models.ReDomesticServiceAreaPrice{ - ContractID: contract.ID, - ServiceID: reServiceCodeDOP.ID, - IsPeakPeriod: true, - DomesticServiceAreaID: serviceArea.ID, - PriceCents: unit.Cents(1234), - } - - serviceAreaPriceDPK := models.ReDomesticServiceAreaPrice{ - ContractID: contract.ID, - ServiceID: reServiceCodeDPK.ID, - IsPeakPeriod: true, - DomesticServiceAreaID: serviceArea.ID, - PriceCents: unit.Cents(121), - } - - serviceAreaPriceDDP := models.ReDomesticServiceAreaPrice{ - ContractID: contract.ID, - ServiceID: reServiceCodeDDP.ID, - IsPeakPeriod: true, - DomesticServiceAreaID: serviceArea.ID, - PriceCents: unit.Cents(482), - } - - serviceAreaPriceDUPK := models.ReDomesticServiceAreaPrice{ - ContractID: contract.ID, - ServiceID: reServiceCodeDUPK.ID, - IsPeakPeriod: true, - DomesticServiceAreaID: serviceArea.ID, - PriceCents: unit.Cents(945), - } - - reServiceCodeDOP = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDOP) - reServiceCodeDPK = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDPK) - reServiceCodeDDP = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDDP) - reServiceCodeDUPK = factory.BuildReServiceByCode(suite.DB(), models.ReServiceCodeDUPK) - - serviceItemDOP := models.MTOServiceItem{ - MoveTaskOrder: shipment.MoveTaskOrder, - MoveTaskOrderID: shipment.MoveTaskOrderID, - MTOShipment: shipment, - MTOShipmentID: &shipment.ID, - ReService: reServiceCodeDOP, - SITEntryDate: &sitEntryDate, - SITPostalCode: &sitPostalCode, - Reason: &reason, - SITOriginHHGActualAddress: &actualPickupAddress, - Status: models.MTOServiceItemStatusSubmitted, - } - - serviceItemDPK := models.MTOServiceItem{ - MoveTaskOrder: shipment.MoveTaskOrder, - MoveTaskOrderID: shipment.MoveTaskOrderID, - MTOShipment: shipment, - MTOShipmentID: &shipment.ID, - ReService: reServiceCodeDPK, - SITEntryDate: &sitEntryDate, - SITPostalCode: &sitPostalCode, - Reason: &reason, - SITOriginHHGActualAddress: &actualPickupAddress, - Status: models.MTOServiceItemStatusSubmitted, - } - - serviceItemDDP := models.MTOServiceItem{ - MoveTaskOrder: shipment.MoveTaskOrder, - MoveTaskOrderID: shipment.MoveTaskOrderID, - MTOShipment: shipment, - MTOShipmentID: &shipment.ID, - ReService: reServiceCodeDDP, - SITEntryDate: &sitEntryDate, - SITPostalCode: &sitPostalCode, - Reason: &reason, - SITOriginHHGActualAddress: &actualPickupAddress, - Status: models.MTOServiceItemStatusSubmitted, - } - - serviceItemDUPK := models.MTOServiceItem{ - MoveTaskOrder: shipment.MoveTaskOrder, - MoveTaskOrderID: shipment.MoveTaskOrderID, - MTOShipment: shipment, - MTOShipmentID: &shipment.ID, - ReService: reServiceCodeDUPK, - SITEntryDate: &sitEntryDate, - SITPostalCode: &sitPostalCode, - Reason: &reason, - SITOriginHHGActualAddress: &actualPickupAddress, - Status: models.MTOServiceItemStatusSubmitted, - } - - suite.Run("Calcuating price estimated on creation for DOP", func() { - builder := query.NewQueryBuilder() - moveRouter := moverouter.NewMoveRouter() - planner := &mocks.Planner{} - planner.On("ZipTransitDistance", - mock.AnythingOfType("*appcontext.appContext"), - mock.Anything, - mock.Anything, - ).Return(400, nil) - creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) - - suite.MustSave(&serviceAreaPriceDOP) - - dopEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDOP, shipment) - suite.Equal(unit.Cents(83280), dopEstimatedPriceInCents) - }) - - suite.Run("Calcuating price estimated on creation for DPK", func() { - builder := query.NewQueryBuilder() - moveRouter := moverouter.NewMoveRouter() - planner := &mocks.Planner{} - planner.On("ZipTransitDistance", - mock.AnythingOfType("*appcontext.appContext"), - mock.Anything, - mock.Anything, - ).Return(400, nil) - creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) - - suite.MustSave(&serviceAreaPriceDPK) - - dpkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDPK, shipment) - suite.Equal(unit.Cents(47760), dpkEstimatedPriceInCents) - }) - - suite.Run("Calcuating price estimated on creation for DDP", func() { - builder := query.NewQueryBuilder() - moveRouter := moverouter.NewMoveRouter() - planner := &mocks.Planner{} - planner.On("ZipTransitDistance", - mock.AnythingOfType("*appcontext.appContext"), - mock.Anything, - mock.Anything, - ).Return(400, nil) - creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) - - suite.MustSave(&serviceAreaPriceDDP) - - ddpEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDDP, shipment) - suite.Equal(unit.Cents(47760), ddpEstimatedPriceInCents) - }) - - suite.Run("Calcuating price estimated on creation for DUPK", func() { - builder := query.NewQueryBuilder() - moveRouter := moverouter.NewMoveRouter() - planner := &mocks.Planner{} - planner.On("ZipTransitDistance", - mock.AnythingOfType("*appcontext.appContext"), - mock.Anything, - mock.Anything, - ).Return(400, nil) - creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) - - suite.MustSave(&serviceAreaPriceDUPK) - - dupkEstimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDUPK, shipment) - suite.Equal(unit.Cents(47760), dupkEstimatedPriceInCents) - }) - - /** - // suite.Run("Calcuating price estimated on creation for NTS shipment ", func() { - // var reServiceCodeDOP models.ReService - - // setupTestData := func() models.MTOShipment { - // // Set up data to use for all Origin SIT Service Item tests - - // move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) - // estimatedPrimeWeight := unit.Pound(6000) - // pickupDate := time.Date(2024, time.July, 31, 12, 0, 0, 0, time.UTC) - // pickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) - // deliveryAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress3}) - - // customMTOShipmentTypeHHGOutOfNTSDom := factory.BuildMTOShipmentMinimal(suite.DB(), []factory.Customization{ - // { - // Model: move, - // LinkOnly: true, - // }, - // { - // Model: pickupAddress, - // LinkOnly: true, - // Type: &factory.Addresses.PickupAddress, - // }, - // { - // Model: deliveryAddress, - // LinkOnly: true, - // Type: &factory.Addresses.DeliveryAddress, - // }, - // { - // Model: models.MTOShipment{ - // PrimeEstimatedWeight: &estimatedPrimeWeight, - // RequestedPickupDate: &pickupDate, - // ShipmentType: models.MTOShipmentTypeHHGOutOfNTSDom, - // }, - // }, - // }, nil) - - // reServiceCodeDOP = factory.BuildReService(suite.DB(), []factory.Customization{ - // { - // Model: models.ReService{ - // Code: "DOP", - // }, - // }, - // }, nil) - - // startDate := time.Now().AddDate(-1, 0, 0) - // endDate := startDate.AddDate(1, 1, 1) - // contract := testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}) - // testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ - // ReContractYear: models.ReContractYear{ - // Contract: contract, - // ContractID: contract.ID, - // StartDate: startDate, - // EndDate: endDate, - // Escalation: 1.0, - // EscalationCompounded: 1.0, - // }, - // }) - // testdatagen.MakeReZip3(suite.DB(), testdatagen.Assertions{ - // ReZip3: models.ReZip3{ - // Contract: contract, - // ContractID: contract.ID, - // DomesticServiceArea: testdatagen.FetchOrMakeReDomesticServiceArea(suite.DB(), testdatagen.Assertions{ - // ReDomesticServiceArea: models.ReDomesticServiceArea{ - // ContractID: contract.ID, - // ServiceArea: "674", - // ServicesSchedule: 2, - // CreatedAt: time.Now(), - // UpdatedAt: time.Now(), - // }, - // }), - // Zip3: "674", - // }, - // }) - // testdatagen.MakeReDomesticServiceAreaPrice(suite.DB(), testdatagen.Assertions{ReService: models.ReService{Code: "DOP"}}) - - // return customMTOShipmentTypeHHGOutOfNTSDom - // } - - // shipment := setupTestData() - // actualPickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) - // actualPickupAddress.PostalCode = "67449" - - // serviceItemDOP := models.MTOServiceItem{ - // MoveTaskOrder: shipment.MoveTaskOrder, - // MoveTaskOrderID: shipment.MoveTaskOrderID, - // MTOShipment: shipment, - // MTOShipmentID: &shipment.ID, - // ReService: reServiceCodeDOP, - // SITEntryDate: &sitEntryDate, - // SITPostalCode: &sitPostalCode, - // Reason: &reason, - // SITOriginHHGActualAddress: &actualPickupAddress, - // Status: models.MTOServiceItemStatusSubmitted, - // } - - // builder := query.NewQueryBuilder() - // moveRouter := moverouter.NewMoveRouter() - // planner := &mocks.Planner{} - // planner.On("ZipTransitDistance", - // mock.AnythingOfType("*appcontext.appContext"), - // mock.Anything, - // mock.Anything, - // ).Return(400, nil) - // creator := NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) - - // estimatedPriceInCents, _ := creator.FindEstimatedPrice(suite.AppContextForTest(), &serviceItemDOP, shipment) - // estimatedPriceForMTOShipmentTypeHHGOutOfNTSDom := estimatedPriceInCents.Float64() * 1.1 - // suite.Equal(estimatedPriceInCents, unit.Cents(estimatedPriceForMTOShipmentTypeHHGOutOfNTSDom)) - // }) - **/ -//} From d14adc4c4a5bb84405040e4c968ea5dc9028d953 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Thu, 14 Nov 2024 18:31:30 +0000 Subject: [PATCH 014/260] Adding tests for UpdateMTOSeriveItemPricingEstimate --- .../mto_service_item_updater_test.go | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+) 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 11fdf619b79..39d40caead6 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 @@ -2346,6 +2346,110 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemStatus() { }) } +func (suite *MTOServiceItemServiceSuite) setupServiceItemData() { + startDate := time.Date(2020, time.January, 1, 12, 0, 0, 0, time.UTC) + endDate := time.Date(2020, time.December, 31, 12, 0, 0, 0, time.UTC) + + testdatagen.FetchOrMakeReContractYear(suite.DB(), testdatagen.Assertions{ + ReContractYear: models.ReContractYear{ + StartDate: startDate, + EndDate: endDate, + }, + }) + + originalDomesticServiceArea := testdatagen.FetchOrMakeReDomesticServiceArea(suite.AppContextForTest().DB(), testdatagen.Assertions{ + ReDomesticServiceArea: models.ReDomesticServiceArea{ + ServiceArea: "004", + ServicesSchedule: 2, + }, + ReContract: testdatagen.FetchOrMakeReContract(suite.AppContextForTest().DB(), testdatagen.Assertions{}), + }) + + testdatagen.FetchOrMakeReDomesticLinehaulPrice(suite.DB(), testdatagen.Assertions{ + ReDomesticLinehaulPrice: models.ReDomesticLinehaulPrice{ + Contract: originalDomesticServiceArea.Contract, + ContractID: originalDomesticServiceArea.ContractID, + DomesticServiceArea: originalDomesticServiceArea, + DomesticServiceAreaID: originalDomesticServiceArea.ID, + WeightLower: unit.Pound(500), + WeightUpper: unit.Pound(9999), + MilesLower: 500, + MilesUpper: 9999, + PriceMillicents: unit.Millicents(606800), + IsPeakPeriod: false, + }, + }) +} + +func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemPricingEstimate() { + suite.setupServiceItemData() + builder := query.NewQueryBuilder() + moveRouter := moverouter.NewMoveRouter() + shipmentFetcher := mtoshipment.NewMTOShipmentFetcher() + addressCreator := address.NewAddressCreator() + planner := &mocks.Planner{} + planner.On("ZipTransitDistance", + mock.AnythingOfType("*appcontext.appContext"), + mock.Anything, + mock.Anything, + ).Return(400, nil) + updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + + setupServiceItem := func() (models.MTOServiceItem, string) { + serviceItem := testdatagen.MakeDefaultMTOServiceItem(suite.DB()) + eTag := etag.GenerateEtag(serviceItem.UpdatedAt) + return serviceItem, eTag + } + + now := time.Now() + year, month, day := now.Add(time.Hour * 24 * -30).Date() + aMonthAgo := time.Date(year, month, day, 0, 0, 0, 0, time.UTC) + move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) + shipmentSITAllowance := int(90) + estimatedWeight := unit.Pound(1400) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + Status: models.MTOShipmentStatusApproved, + SITDaysAllowance: &shipmentSITAllowance, + PrimeEstimatedWeight: &estimatedWeight, + RequiredDeliveryDate: &aMonthAgo, + UpdatedAt: aMonthAgo, + }, + }, + { + Model: move, + LinkOnly: true, + }, + }, nil) + + suite.Run("Validation Error", func() { + serviceItem, eTag := setupServiceItem() + invalidServiceItem := serviceItem + invalidServiceItem.MoveTaskOrderID = serviceItem.ID // invalid Move ID + + updatedServiceItem, err := updater.UpdateMTOServiceItemPricingEstimate(suite.AppContextForTest(), &invalidServiceItem, shipment, eTag) + + suite.Nil(updatedServiceItem) + suite.Error(err) + suite.IsType(apperror.InvalidInputError{}, err) + + invalidInputError := err.(apperror.InvalidInputError) + suite.True(invalidInputError.ValidationErrors.HasAny()) + suite.Contains(invalidInputError.ValidationErrors.Keys(), "moveTaskOrderID") + }) + + suite.Run("Returns updated service item on success", func() { + serviceItem, eTag := setupServiceItem() + + updatedServiceItem, err := updater.UpdateMTOServiceItemPricingEstimate(suite.AppContextForTest(), &serviceItem, shipment, eTag) + + suite.NotNil(updatedServiceItem) + suite.Nil(err) + }) +} + // Helper function to create a rejected service item func buildRejectedServiceItem(suite *MTOServiceItemServiceSuite, reServiceCode models.ReServiceCode, reason string, contactDatePlusGracePeriod, aMonthAgo, now, sitRequestedDelivery time.Time, requestApprovalsRequestedStatus bool) models.MTOServiceItem { return factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ From daa6151c9d413129bbdacd8d997a2672e110a58d Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Fri, 15 Nov 2024 12:17:44 +0000 Subject: [PATCH 015/260] Updating service item updater tests --- .../mto_service_item_updater.go | 2 +- .../mto_service_item_updater_test.go | 45 +++++++------------ 2 files changed, 17 insertions(+), 30 deletions(-) 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 35b549159b2..3d1b16b6ec5 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -506,7 +506,7 @@ func (p *mtoServiceItemUpdater) UpdateMTOServiceItemPricingEstimate( eTag string, ) (*models.MTOServiceItem, error) { estimatedPrice, err := p.findEstimatedPrice(appCtx, mtoServiceItem, shipment) - if estimatedPrice != 0 && err != nil { + if estimatedPrice != 0 && err == nil { mtoServiceItem.PricingEstimate = &estimatedPrice return p.UpdateMTOServiceItem(appCtx, mtoServiceItem, eTag, UpdateMTOServiceItemBasicValidator) } 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 39d40caead6..aaf18b3beef 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 @@ -2357,12 +2357,21 @@ func (suite *MTOServiceItemServiceSuite) setupServiceItemData() { }, }) - originalDomesticServiceArea := testdatagen.FetchOrMakeReDomesticServiceArea(suite.AppContextForTest().DB(), testdatagen.Assertions{ + originalDomesticServiceArea := testdatagen.FetchOrMakeReDomesticServiceArea(suite.DB(), testdatagen.Assertions{ ReDomesticServiceArea: models.ReDomesticServiceArea{ ServiceArea: "004", ServicesSchedule: 2, }, - ReContract: testdatagen.FetchOrMakeReContract(suite.AppContextForTest().DB(), testdatagen.Assertions{}), + ReContract: testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}), + }) + + testdatagen.FetchOrMakeReZip3(suite.DB(), testdatagen.Assertions{ + ReZip3: models.ReZip3{ + Contract: originalDomesticServiceArea.Contract, + ContractID: originalDomesticServiceArea.ContractID, + DomesticServiceArea: originalDomesticServiceArea, + Zip3: "902", + }, }) testdatagen.FetchOrMakeReDomesticLinehaulPrice(suite.DB(), testdatagen.Assertions{ @@ -2373,7 +2382,7 @@ func (suite *MTOServiceItemServiceSuite) setupServiceItemData() { DomesticServiceAreaID: originalDomesticServiceArea.ID, WeightLower: unit.Pound(500), WeightUpper: unit.Pound(9999), - MilesLower: 500, + MilesLower: 250, MilesUpper: 9999, PriceMillicents: unit.Millicents(606800), IsPeakPeriod: false, @@ -2382,7 +2391,6 @@ func (suite *MTOServiceItemServiceSuite) setupServiceItemData() { } func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemPricingEstimate() { - suite.setupServiceItemData() builder := query.NewQueryBuilder() moveRouter := moverouter.NewMoveRouter() shipmentFetcher := mtoshipment.NewMTOShipmentFetcher() @@ -2401,35 +2409,13 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemPricingEstimate return serviceItem, eTag } - now := time.Now() - year, month, day := now.Add(time.Hour * 24 * -30).Date() - aMonthAgo := time.Date(year, month, day, 0, 0, 0, 0, time.UTC) - move := factory.BuildAvailableToPrimeMove(suite.DB(), nil, nil) - shipmentSITAllowance := int(90) - estimatedWeight := unit.Pound(1400) - - shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ - { - Model: models.MTOShipment{ - Status: models.MTOShipmentStatusApproved, - SITDaysAllowance: &shipmentSITAllowance, - PrimeEstimatedWeight: &estimatedWeight, - RequiredDeliveryDate: &aMonthAgo, - UpdatedAt: aMonthAgo, - }, - }, - { - Model: move, - LinkOnly: true, - }, - }, nil) - suite.Run("Validation Error", func() { + suite.setupServiceItemData() serviceItem, eTag := setupServiceItem() invalidServiceItem := serviceItem invalidServiceItem.MoveTaskOrderID = serviceItem.ID // invalid Move ID - updatedServiceItem, err := updater.UpdateMTOServiceItemPricingEstimate(suite.AppContextForTest(), &invalidServiceItem, shipment, eTag) + updatedServiceItem, err := updater.UpdateMTOServiceItemPricingEstimate(suite.AppContextForTest(), &invalidServiceItem, serviceItem.MTOShipment, eTag) suite.Nil(updatedServiceItem) suite.Error(err) @@ -2441,9 +2427,10 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemPricingEstimate }) suite.Run("Returns updated service item on success", func() { + suite.setupServiceItemData() serviceItem, eTag := setupServiceItem() - updatedServiceItem, err := updater.UpdateMTOServiceItemPricingEstimate(suite.AppContextForTest(), &serviceItem, shipment, eTag) + updatedServiceItem, err := updater.UpdateMTOServiceItemPricingEstimate(suite.AppContextForTest(), &serviceItem, serviceItem.MTOShipment, eTag) suite.NotNil(updatedServiceItem) suite.Nil(err) From 5216f158e4243791843cadeefa22ab8ae6ff2f8d Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Fri, 15 Nov 2024 14:23:44 +0000 Subject: [PATCH 016/260] Updating mto_service_item_updater tests --- .../mto_service_item_updater.go | 2 +- .../mto_service_item_updater_test.go | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) 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 3d1b16b6ec5..13ff315337b 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -149,7 +149,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, if mtoShipment.PrimeEstimatedWeight != nil { shipmentWeight = *mtoShipment.PrimeEstimatedWeight } else { - shipmentWeight = 0 + return 0, apperror.NewInvalidInputError(serviceItem.ID, nil, nil, "No estimated or actual weight exists for this service item.") } } 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 aaf18b3beef..1baffb834e4 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 @@ -2409,6 +2409,11 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemPricingEstimate return serviceItem, eTag } + setupServiceItems := func() models.MTOServiceItems { + serviceItems := testdatagen.MakeMTOServiceItems(suite.DB()) + return serviceItems + } + suite.Run("Validation Error", func() { suite.setupServiceItemData() serviceItem, eTag := setupServiceItem() @@ -2426,14 +2431,17 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemPricingEstimate suite.Contains(invalidInputError.ValidationErrors.Keys(), "moveTaskOrderID") }) - suite.Run("Returns updated service item on success", func() { + suite.Run("Returns updated service item on success wihtout error", func() { suite.setupServiceItemData() - serviceItem, eTag := setupServiceItem() + serviceItems := setupServiceItems() - updatedServiceItem, err := updater.UpdateMTOServiceItemPricingEstimate(suite.AppContextForTest(), &serviceItem, serviceItem.MTOShipment, eTag) + for _, serviceItem := range serviceItems { + eTag := etag.GenerateEtag(serviceItem.UpdatedAt) + updatedServiceItem, err := updater.UpdateMTOServiceItemPricingEstimate(suite.AppContextForTest(), &serviceItem, serviceItem.MTOShipment, eTag) - suite.NotNil(updatedServiceItem) - suite.Nil(err) + suite.NotNil(updatedServiceItem) + suite.Nil(err) + } }) } From e64002145fed84b053e009fbbbff275e5b9ee8aa Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Fri, 15 Nov 2024 15:28:44 +0000 Subject: [PATCH 017/260] Updating pickupdate for estimated incentive calculations --- .../mto_service_item_updater.go | 54 +++++++------------ 1 file changed, 20 insertions(+), 34 deletions(-) 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 13ff315337b..6491b32e757 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -138,7 +138,16 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, if mtoShipment.ShipmentType == models.MTOShipmentTypePPM { isPPM = true } - requestedPickupDate := *mtoShipment.RequestedPickupDate + + var pickupDate *time.Time + if mtoShipment.ActualPickupDate != nil { + pickupDate = mtoShipment.ActualPickupDate + } else { + if mtoShipment.RequestedPickupDate != nil { + pickupDate = mtoShipment.RequestedPickupDate + } + } + currTime := time.Now() var distance int @@ -154,8 +163,8 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, } contractCode, err := FetchContractCode(appCtx, currTime) - if err != nil { - contractCode, err = FetchContractCode(appCtx, requestedPickupDate) + if err != nil && pickupDate != nil { + contractCode, err = FetchContractCode(appCtx, *pickupDate) if err != nil { return 0, err } @@ -173,7 +182,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, } } - price, _, err = p.destinationPricer.Price(appCtx, contractCode, requestedPickupDate, shipmentWeight, domesticServiceArea.ServiceArea, isPPM) + price, _, err = p.destinationPricer.Price(appCtx, contractCode, *pickupDate, shipmentWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -186,7 +195,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, serviceScheduleDestination := domesticServiceArea.ServicesSchedule - price, _, err = p.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, shipmentWeight, serviceScheduleDestination, isPPM) + price, _, err = p.unpackPricer.Price(appCtx, contractCode, *pickupDate, shipmentWeight, serviceScheduleDestination, isPPM) if err != nil { return 0, err } @@ -204,7 +213,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - price, _, err = p.linehaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), shipmentWeight, domesticServiceArea.ServiceArea, isPPM) + price, _, err = p.linehaulPricer.Price(appCtx, contractCode, *pickupDate, unit.Miles(distance), shipmentWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -215,19 +224,13 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - price, _, err = p.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, shipmentWeight, domesticServiceArea.ServicesSchedule, isPPM) + price, _, err = p.unpackPricer.Price(appCtx, contractCode, *pickupDate, shipmentWeight, domesticServiceArea.ServicesSchedule, isPPM) if err != nil { return 0, err } } // destination sit delivery if serviceItem.ReService.Code == models.ReServiceCodeDDDSIT { - var pickupDate time.Time - if mtoShipment.ActualPickupDate != nil { - pickupDate = *mtoShipment.ActualPickupDate - } else { - pickupDate = requestedPickupDate - } domesticServiceArea, err := fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.DestinationAddress.PostalCode) if err != nil { return 0, err @@ -238,20 +241,13 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - price, _, err = p.sitDeliverPricer.Price(appCtx, contractCode, pickupDate, shipmentWeight, domesticServiceArea.ServiceArea, domesticServiceArea.SITPDSchedule, mtoShipment.DestinationAddress.PostalCode, serviceItem.SITDestinationFinalAddress.PostalCode, unit.Miles(distance)) + price, _, err = p.sitDeliverPricer.Price(appCtx, contractCode, *pickupDate, shipmentWeight, domesticServiceArea.ServiceArea, domesticServiceArea.SITPDSchedule, mtoShipment.DestinationAddress.PostalCode, serviceItem.SITDestinationFinalAddress.PostalCode, unit.Miles(distance)) if err != nil { return 0, err } } // destination sit fuel surcharge if serviceItem.ReService.Code == models.ReServiceCodeDDSFSC { - var pickupDateForFSC time.Time - if mtoShipment.ActualPickupDate != nil { - pickupDateForFSC = *mtoShipment.ActualPickupDate - } else { - pickupDateForFSC = requestedPickupDate - } - if mtoShipment.DestinationAddress != nil { distance, err = p.planner.ZipTransitDistance(appCtx, serviceItem.SITDestinationFinalAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) if err != nil { @@ -266,7 +262,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - eiaFuelPrice, err := LookupEIAFuelPrice(appCtx, pickupDateForFSC) + eiaFuelPrice, err := LookupEIAFuelPrice(appCtx, *pickupDate) if err != nil { return 0, err } @@ -277,16 +273,6 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, } // fuel surcharge if serviceItem.ReService.Code == models.ReServiceCodeFSC { - var pickupDateForFSC time.Time - - // actual pickup date likely won't exist at the time of service item creation, but it could - // use requested pickup date if no actual date exists - if mtoShipment.ActualPickupDate != nil { - pickupDateForFSC = *mtoShipment.ActualPickupDate - } else { - pickupDateForFSC = requestedPickupDate - } - if mtoShipment.PickupAddress != nil && mtoShipment.DestinationAddress != nil { distance, err = p.planner.ZipTransitDistance(appCtx, mtoShipment.PickupAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) if err != nil { @@ -302,11 +288,11 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - eiaFuelPrice, err := LookupEIAFuelPrice(appCtx, pickupDateForFSC) + eiaFuelPrice, err := LookupEIAFuelPrice(appCtx, *pickupDate) if err != nil { return 0, err } - price, _, err = p.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), shipmentWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) + price, _, err = p.fuelSurchargePricer.Price(appCtx, *pickupDate, unit.Miles(distance), shipmentWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) if err != nil { return 0, err } From 5647df2e6bafd7ff817c5dcd9cf61225e5ce4f88 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Tue, 26 Nov 2024 18:41:46 +0000 Subject: [PATCH 018/260] Adding nil check for prime weights --- .../shipment_address_update_requester.go | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) 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 18f0ffda5a4..10477183eb0 100644 --- a/pkg/services/shipment_address_update/shipment_address_update_requester.go +++ b/pkg/services/shipment_address_update/shipment_address_update_requester.go @@ -500,32 +500,34 @@ func (f *shipmentAddressUpdateRequester) ReviewShipmentAddressChange(appCtx appc shipmentHasApprovedDestSIT := f.doesShipmentContainApprovedDestinationSIT(shipmentDetails) for i, serviceItem := range shipmentDetails.MTOServiceItems { - var updatedServiceItem *models.MTOServiceItem - if serviceItem.ReService.Code == models.ReServiceCodeDDP || serviceItem.ReService.Code == models.ReServiceCodeDUPK { - updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt)) - if err != nil { - return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error()) - } - } - - if !shipmentHasApprovedDestSIT { - if serviceItem.ReService.Code == models.ReServiceCodeDLH || serviceItem.ReService.Code == models.ReServiceCodeFSC { + if serviceItem.MTOShipment.PrimeEstimatedWeight != nil || serviceItem.MTOShipment.PrimeActualWeight != nil { + var updatedServiceItem *models.MTOServiceItem + if serviceItem.ReService.Code == models.ReServiceCodeDDP || serviceItem.ReService.Code == models.ReServiceCodeDUPK { updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt)) if err != nil { return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error()) } } - } else { - if serviceItem.ReService.Code == models.ReServiceCodeDDSFSC || serviceItem.ReService.Code == models.ReServiceCodeDDDSIT { - updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt)) - if err != nil { - return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error()) + + if !shipmentHasApprovedDestSIT { + if serviceItem.ReService.Code == models.ReServiceCodeDLH || serviceItem.ReService.Code == models.ReServiceCodeFSC { + updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt)) + if err != nil { + return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error()) + } + } + } else { + if serviceItem.ReService.Code == models.ReServiceCodeDDSFSC || serviceItem.ReService.Code == models.ReServiceCodeDDDSIT { + updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt)) + if err != nil { + return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error()) + } } } - } - if updatedServiceItem != nil { - shipmentDetails.MTOServiceItems[i] = *updatedServiceItem + if updatedServiceItem != nil { + shipmentDetails.MTOServiceItems[i] = *updatedServiceItem + } } } From b3b2842423a440280594be1bb5223a093d3c7cff Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Tue, 3 Dec 2024 04:53:30 +0000 Subject: [PATCH 019/260] using shipment instead of serviceItem.Shipment --- .../shipment_address_update_requester.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 10477183eb0..b67239a40ab 100644 --- a/pkg/services/shipment_address_update/shipment_address_update_requester.go +++ b/pkg/services/shipment_address_update/shipment_address_update_requester.go @@ -500,7 +500,7 @@ func (f *shipmentAddressUpdateRequester) ReviewShipmentAddressChange(appCtx appc shipmentHasApprovedDestSIT := f.doesShipmentContainApprovedDestinationSIT(shipmentDetails) for i, serviceItem := range shipmentDetails.MTOServiceItems { - if serviceItem.MTOShipment.PrimeEstimatedWeight != nil || serviceItem.MTOShipment.PrimeActualWeight != nil { + if shipment.PrimeEstimatedWeight != nil || shipment.PrimeActualWeight != nil { var updatedServiceItem *models.MTOServiceItem if serviceItem.ReService.Code == models.ReServiceCodeDDP || serviceItem.ReService.Code == models.ReServiceCodeDUPK { updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt)) From 657724ee620642a1a2b233df98ffdc089da8122d Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Wed, 4 Dec 2024 20:03:50 +0000 Subject: [PATCH 020/260] Updating MTOShipments query --- pkg/models/mto_service_items.go | 2 ++ pkg/services/mto_service_item/mto_service_item_updater.go | 4 ++-- .../shipment_address_update_requester.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/models/mto_service_items.go b/pkg/models/mto_service_items.go index 862a25fce32..d5cb39daeb3 100644 --- a/pkg/models/mto_service_items.go +++ b/pkg/models/mto_service_items.go @@ -89,7 +89,9 @@ type MTOServiceItemSingle struct { SITEntryDate *time.Time `db:"sit_entry_date"` SITDepartureDate *time.Time `db:"sit_departure_date"` SITDestinationFinalAddressID *uuid.UUID `db:"sit_destination_final_address_id"` + SITDestinationFinalAddress *Address `belongs_to:"addresses" fk_id:"sit_destination_final_address_id"` SITOriginHHGOriginalAddressID *uuid.UUID `db:"sit_origin_hhg_original_address_id"` + SITDestinationOriginalAddress *Address `belongs_to:"addresses" fk_id:"sit_destination_original_address_id"` SITOriginHHGActualAddressID *uuid.UUID `db:"sit_origin_hhg_actual_address_id"` EstimatedWeight *unit.Pound `db:"estimated_weight"` ActualWeight *unit.Pound `db:"actual_weight"` 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 6491b32e757..037c53c1da3 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -230,7 +230,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, } } // destination sit delivery - if serviceItem.ReService.Code == models.ReServiceCodeDDDSIT { + if serviceItem.ReService.Code == models.ReServiceCodeDDDSIT && serviceItem.SITDestinationFinalAddress != nil { domesticServiceArea, err := fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.DestinationAddress.PostalCode) if err != nil { return 0, err @@ -247,7 +247,7 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, } } // destination sit fuel surcharge - if serviceItem.ReService.Code == models.ReServiceCodeDDSFSC { + if serviceItem.ReService.Code == models.ReServiceCodeDDSFSC && serviceItem.SITDestinationFinalAddress != nil { if mtoShipment.DestinationAddress != nil { distance, err = p.planner.ZipTransitDistance(appCtx, serviceItem.SITDestinationFinalAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) if err != nil { 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 b67239a40ab..ae2ef7ceb03 100644 --- a/pkg/services/shipment_address_update/shipment_address_update_requester.go +++ b/pkg/services/shipment_address_update/shipment_address_update_requester.go @@ -489,7 +489,7 @@ func (f *shipmentAddressUpdateRequester) ReviewShipmentAddressChange(appCtx appc } var shipmentDetails models.MTOShipment - err = appCtx.DB().EagerPreload("MoveTaskOrder", "MTOServiceItems.ReService").Find(&shipmentDetails, shipmentID) + err = appCtx.DB().EagerPreload("MoveTaskOrder", "MTOServiceItems.ReService", "MTOServiceItems.SITDestinationOriginalAddress", "MTOServiceItems.SITDestinationFinalAddress").Find(&shipmentDetails, shipmentID) if err != nil { if err == sql.ErrNoRows { return nil, apperror.NewNotFoundError(shipmentID, "looking for shipment") From a912f6e0fb15e6bacf34381681af3871d1caad26 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Thu, 5 Dec 2024 15:30:54 +0000 Subject: [PATCH 021/260] Adding test to increase server_coverage after merge --- pkg/iws/rbs_error_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 pkg/iws/rbs_error_test.go diff --git a/pkg/iws/rbs_error_test.go b/pkg/iws/rbs_error_test.go new file mode 100644 index 00000000000..022ab8400b7 --- /dev/null +++ b/pkg/iws/rbs_error_test.go @@ -0,0 +1,15 @@ +package iws + +func (suite *iwsSuite) TestRbsError() { + data := ` + + 14030 + Problem with this argument: EMA_TX + ` + _, _, _, err := parseWkEmaResponse([]byte(data)) + suite.NotNil(err) + rbsError, ok := err.(*RbsError) + suite.True(ok) + suite.Equal(uint64(14030), rbsError.FaultCode) + suite.NotEmpty(rbsError.FaultMessage) +} From 74b5e7d0177f80e5708c03063b75021aa7f5cb1e Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Tue, 10 Dec 2024 18:13:29 +0000 Subject: [PATCH 022/260] Removing ability to recalculate SIT on address change approval --- pkg/handlers/ghcapi/api.go | 4 +- pkg/handlers/ghcapi/mto_service_items_test.go | 4 +- pkg/handlers/ghcapi/mto_shipment_test.go | 4 +- pkg/handlers/primeapi/api.go | 2 +- .../primeapi/mto_service_item_test.go | 4 +- pkg/handlers/supportapi/api.go | 2 +- .../supportapi/mto_service_item_test.go | 6 +- .../move_history/move_history_fetcher_test.go | 2 +- .../mto_service_item_updater.go | 68 ++++--------------- .../mto_service_item_updater_test.go | 6 +- .../shipment_address_update_requester.go | 9 +-- .../sit_extension/sit_extension_denier.go | 2 +- pkg/testdatagen/scenario/shared.go | 6 +- 13 files changed, 34 insertions(+), 85 deletions(-) diff --git a/pkg/handlers/ghcapi/api.go b/pkg/handlers/ghcapi/api.go index e16f557c890..fb928a203a3 100644 --- a/pkg/handlers/ghcapi/api.go +++ b/pkg/handlers/ghcapi/api.go @@ -236,7 +236,7 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI { ghcAPI.MtoServiceItemUpdateMTOServiceItemStatusHandler = UpdateMTOServiceItemStatusHandler{ HandlerConfig: handlerConfig, - MTOServiceItemUpdater: mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), + MTOServiceItemUpdater: mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), Fetcher: fetch.NewFetcher(queryBuilder), ShipmentSITStatus: sitstatus.NewShipmentSITStatus(), MTOShipmentFetcher: mtoshipment.NewMTOShipmentFetcher(), @@ -506,7 +506,7 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI { ghcAPI.ShipmentUpdateSITServiceItemCustomerExpenseHandler = UpdateSITServiceItemCustomerExpenseHandler{ handlerConfig, - mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), + mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), mtoshipment.NewMTOShipmentFetcher(), shipmentSITStatus, } diff --git a/pkg/handlers/ghcapi/mto_service_items_test.go b/pkg/handlers/ghcapi/mto_service_items_test.go index 551cd316c28..26c513d24a7 100644 --- a/pkg/handlers/ghcapi/mto_service_items_test.go +++ b/pkg/handlers/ghcapi/mto_service_items_test.go @@ -563,7 +563,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandler() { mock.Anything, mock.Anything, ).Return(400, nil) - mtoServiceItemStatusUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + mtoServiceItemStatusUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := UpdateMTOServiceItemStatusHandler{ HandlerConfig: suite.HandlerConfig(), @@ -623,7 +623,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandler() { mock.Anything, mock.Anything, ).Return(400, nil) - mtoServiceItemStatusUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + mtoServiceItemStatusUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) handler := UpdateMTOServiceItemStatusHandler{ HandlerConfig: suite.HandlerConfig(), diff --git a/pkg/handlers/ghcapi/mto_shipment_test.go b/pkg/handlers/ghcapi/mto_shipment_test.go index 10da9753524..4baa9af8e63 100644 --- a/pkg/handlers/ghcapi/mto_shipment_test.go +++ b/pkg/handlers/ghcapi/mto_shipment_test.go @@ -4661,7 +4661,7 @@ func (suite *HandlerSuite) TestUpdateSITServiceItemCustomerExpenseHandler() { mock.Anything, mock.Anything, ).Return(400, nil) - updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, 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) req = suite.AuthenticateOfficeRequest(req, officeUser) handlerConfig := suite.HandlerConfig() @@ -4737,7 +4737,7 @@ func (suite *HandlerSuite) TestUpdateSITServiceItemCustomerExpenseHandler() { mock.Anything, mock.Anything, ).Return(400, nil) - updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, 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) req = suite.AuthenticateOfficeRequest(req, officeUser) handlerConfig := suite.HandlerConfig() diff --git a/pkg/handlers/primeapi/api.go b/pkg/handlers/primeapi/api.go index 25afdb43b77..8c9492369b7 100644 --- a/pkg/handlers/primeapi/api.go +++ b/pkg/handlers/primeapi/api.go @@ -45,7 +45,7 @@ func NewPrimeAPI(handlerConfig handlers.HandlerConfig) *primeoperations.MymoveAP shipmentFetcher := mtoshipment.NewMTOShipmentFetcher() moveWeights := move.NewMoveWeights(mtoshipment.NewShipmentReweighRequester()) uploadCreator := upload.NewUploadCreator(handlerConfig.FileStorer()) - serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) userUploader, err := uploader.NewUserUploader(handlerConfig.FileStorer(), uploader.MaxCustomerUserUploadFileSizeLimit) if err != nil { diff --git a/pkg/handlers/primeapi/mto_service_item_test.go b/pkg/handlers/primeapi/mto_service_item_test.go index 83b894bbab4..783efd3563f 100644 --- a/pkg/handlers/primeapi/mto_service_item_test.go +++ b/pkg/handlers/primeapi/mto_service_item_test.go @@ -1543,7 +1543,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemDDDSIT() { ).Return(400, nil) subtestData.handler = UpdateMTOServiceItemHandler{ suite.HandlerConfig(), - mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), + mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), } // create the params struct @@ -1825,7 +1825,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemDOPSIT() { ).Return(400, nil) subtestData.handler = UpdateMTOServiceItemHandler{ suite.HandlerConfig(), - mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), + mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), } // create the params struct diff --git a/pkg/handlers/supportapi/api.go b/pkg/handlers/supportapi/api.go index 1aba70b9c72..58c16043d0b 100644 --- a/pkg/handlers/supportapi/api.go +++ b/pkg/handlers/supportapi/api.go @@ -88,7 +88,7 @@ func NewSupportAPIHandler(handlerConfig handlers.HandlerConfig) http.Handler { mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), handlerConfig.HHGPlanner()), } - supportAPI.MtoServiceItemUpdateMTOServiceItemStatusHandler = UpdateMTOServiceItemStatusHandler{handlerConfig, mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer())} + supportAPI.MtoServiceItemUpdateMTOServiceItemStatusHandler = UpdateMTOServiceItemStatusHandler{handlerConfig, mtoserviceitem.NewMTOServiceItemUpdater(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())} supportAPI.WebhookReceiveWebhookNotificationHandler = ReceiveWebhookNotificationHandler{handlerConfig} // Create TAC and LOA services diff --git a/pkg/handlers/supportapi/mto_service_item_test.go b/pkg/handlers/supportapi/mto_service_item_test.go index 5db466e8d52..873d8ac0494 100644 --- a/pkg/handlers/supportapi/mto_service_item_test.go +++ b/pkg/handlers/supportapi/mto_service_item_test.go @@ -86,7 +86,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandlerApproveSuccess() mock.Anything, ).Return(400, nil) handler := UpdateMTOServiceItemStatusHandler{handlerConfig, - mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), + mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), } // CALL FUNCTION UNDER TEST @@ -142,7 +142,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandlerRejectSuccess() mock.Anything, ).Return(400, nil) handler := UpdateMTOServiceItemStatusHandler{handlerConfig, - mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), + mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), } // CALL FUNCTION UNDER TEST @@ -198,7 +198,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandlerRejectionFailedN mock.Anything, ).Return(400, nil) handler := UpdateMTOServiceItemStatusHandler{handlerConfig, - mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()), + mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), } // CALL FUNCTION UNDER TEST diff --git a/pkg/services/move_history/move_history_fetcher_test.go b/pkg/services/move_history/move_history_fetcher_test.go index 3706ec214eb..f90d2ebc7f4 100644 --- a/pkg/services/move_history/move_history_fetcher_test.go +++ b/pkg/services/move_history/move_history_fetcher_test.go @@ -374,7 +374,7 @@ func (suite *MoveHistoryServiceSuite) TestMoveHistoryFetcherScenarios() { mock.Anything, mock.Anything, ).Return(400, nil) - updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + updater := mtoserviceitem.NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) move := factory.BuildApprovalsRequestedMove(suite.DB(), nil, nil) serviceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ { 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 037c53c1da3..19adf509c64 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -39,28 +39,26 @@ type mtoServiceItemQueryBuilder interface { } type mtoServiceItemUpdater struct { - planner route.Planner - builder mtoServiceItemQueryBuilder - createNewBuilder func() mtoServiceItemQueryBuilder - moveRouter services.MoveRouter - shipmentFetcher services.MTOShipmentFetcher - addressCreator services.AddressCreator - unpackPricer services.DomesticUnpackPricer - linehaulPricer services.DomesticLinehaulPricer - destinationPricer services.DomesticDestinationPricer - fuelSurchargePricer services.FuelSurchargePricer - sitFuelSurchargePricer services.DomesticDestinationSITFuelSurchargePricer - sitDeliverPricer services.DomesticDestinationSITDeliveryPricer + planner route.Planner + builder mtoServiceItemQueryBuilder + createNewBuilder func() mtoServiceItemQueryBuilder + moveRouter services.MoveRouter + shipmentFetcher services.MTOShipmentFetcher + addressCreator services.AddressCreator + unpackPricer services.DomesticUnpackPricer + linehaulPricer services.DomesticLinehaulPricer + destinationPricer services.DomesticDestinationPricer + fuelSurchargePricer services.FuelSurchargePricer } // NewMTOServiceItemUpdater returns a new mto service item updater -func NewMTOServiceItemUpdater(planner route.Planner, builder mtoServiceItemQueryBuilder, moveRouter services.MoveRouter, shipmentFetcher services.MTOShipmentFetcher, addressCreator services.AddressCreator, unpackPricer services.DomesticUnpackPricer, linehaulPricer services.DomesticLinehaulPricer, destinationPricer services.DomesticDestinationPricer, fuelSurchargePricer services.FuelSurchargePricer, domesticDestinationSITDeliveryPricer services.DomesticDestinationSITDeliveryPricer, domesticDestinationSITFuelSurchargePricer services.DomesticDestinationSITFuelSurchargePricer) services.MTOServiceItemUpdater { +func NewMTOServiceItemUpdater(planner route.Planner, builder mtoServiceItemQueryBuilder, moveRouter services.MoveRouter, shipmentFetcher services.MTOShipmentFetcher, addressCreator services.AddressCreator, unpackPricer services.DomesticUnpackPricer, linehaulPricer services.DomesticLinehaulPricer, destinationPricer services.DomesticDestinationPricer, fuelSurchargePricer services.FuelSurchargePricer) services.MTOServiceItemUpdater { // used inside a transaction and mocking return &mtoServiceItemUpdater{builder: builder} createNewBuilder := func() mtoServiceItemQueryBuilder { return query.NewQueryBuilder() } - return &mtoServiceItemUpdater{planner, builder, createNewBuilder, moveRouter, shipmentFetcher, addressCreator, unpackPricer, linehaulPricer, destinationPricer, fuelSurchargePricer, domesticDestinationSITFuelSurchargePricer, domesticDestinationSITDeliveryPricer} + return &mtoServiceItemUpdater{planner, builder, createNewBuilder, moveRouter, shipmentFetcher, addressCreator, unpackPricer, linehaulPricer, destinationPricer, fuelSurchargePricer} } func (p *mtoServiceItemUpdater) ApproveOrRejectServiceItem( @@ -229,48 +227,6 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - // destination sit delivery - if serviceItem.ReService.Code == models.ReServiceCodeDDDSIT && serviceItem.SITDestinationFinalAddress != nil { - domesticServiceArea, err := fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.DestinationAddress.PostalCode) - if err != nil { - return 0, err - } - if mtoShipment.DestinationAddress != nil { - distance, err = p.planner.ZipTransitDistance(appCtx, serviceItem.SITDestinationFinalAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) - if err != nil { - return 0, err - } - } - price, _, err = p.sitDeliverPricer.Price(appCtx, contractCode, *pickupDate, shipmentWeight, domesticServiceArea.ServiceArea, domesticServiceArea.SITPDSchedule, mtoShipment.DestinationAddress.PostalCode, serviceItem.SITDestinationFinalAddress.PostalCode, unit.Miles(distance)) - if err != nil { - return 0, err - } - } - // destination sit fuel surcharge - if serviceItem.ReService.Code == models.ReServiceCodeDDSFSC && serviceItem.SITDestinationFinalAddress != nil { - if mtoShipment.DestinationAddress != nil { - distance, err = p.planner.ZipTransitDistance(appCtx, serviceItem.SITDestinationFinalAddress.PostalCode, mtoShipment.DestinationAddress.PostalCode) - if err != nil { - return 0, err - } - } - fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, shipmentWeight) - if err != nil { - return 0, err - } - fscWeightBasedDistanceMultiplierFloat, err := strconv.ParseFloat(fscWeightBasedDistanceMultiplier, 64) - if err != nil { - return 0, err - } - eiaFuelPrice, err := LookupEIAFuelPrice(appCtx, *pickupDate) - if err != nil { - return 0, err - } - price, _, err = p.sitFuelSurchargePricer.Price(appCtx, *mtoShipment.ActualPickupDate, unit.Miles(distance), shipmentWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) - if err != nil { - return 0, err - } - } // fuel surcharge if serviceItem.ReService.Code == models.ReServiceCodeFSC { if mtoShipment.PickupAddress != nil && mtoShipment.DestinationAddress != nil { 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 1baffb834e4..3d32c88c5df 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 @@ -49,7 +49,7 @@ func (suite *MTOServiceItemServiceSuite) TestMTOServiceItemUpdater() { mock.Anything, mock.Anything, ).Return(400, nil) - updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) setupServiceItem := func() (models.MTOServiceItem, string) { serviceItem := testdatagen.MakeDefaultMTOServiceItem(suite.DB()) @@ -1758,7 +1758,7 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemStatus() { mock.Anything, mock.Anything, ).Return(400, nil) - updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) rejectionReason := models.StringPointer("") @@ -2401,7 +2401,7 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemPricingEstimate mock.Anything, mock.Anything, ).Return(400, nil) - updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + updater := NewMTOServiceItemUpdater(planner, builder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) setupServiceItem := func() (models.MTOServiceItem, string) { serviceItem := testdatagen.MakeDefaultMTOServiceItem(suite.DB()) 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 ae2ef7ceb03..56a5e176e4f 100644 --- a/pkg/services/shipment_address_update/shipment_address_update_requester.go +++ b/pkg/services/shipment_address_update/shipment_address_update_requester.go @@ -465,7 +465,7 @@ func (f *shipmentAddressUpdateRequester) ReviewShipmentAddressChange(appCtx appc if tooApprovalStatus == models.ShipmentAddressUpdateStatusApproved { queryBuilder := query.NewQueryBuilder() - serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(f.planner, queryBuilder, f.moveRouter, f.shipmentFetcher, f.addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(f.planner, queryBuilder, f.moveRouter, f.shipmentFetcher, f.addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) serviceItemCreator := mtoserviceitem.NewMTOServiceItemCreator(f.planner, queryBuilder, f.moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) addressUpdate.Status = models.ShipmentAddressUpdateStatusApproved @@ -516,13 +516,6 @@ func (f *shipmentAddressUpdateRequester) ReviewShipmentAddressChange(appCtx appc return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error()) } } - } else { - if serviceItem.ReService.Code == models.ReServiceCodeDDSFSC || serviceItem.ReService.Code == models.ReServiceCodeDDDSIT { - updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt)) - if err != nil { - return nil, apperror.NewUpdateError(serviceItem.ReServiceID, err.Error()) - } - } } if updatedServiceItem != nil { diff --git a/pkg/services/sit_extension/sit_extension_denier.go b/pkg/services/sit_extension/sit_extension_denier.go index bc0ddf8c100..735bc619db3 100644 --- a/pkg/services/sit_extension/sit_extension_denier.go +++ b/pkg/services/sit_extension/sit_extension_denier.go @@ -34,7 +34,7 @@ func NewSITExtensionDenier(moveRouter services.MoveRouter) services.SITExtension mock.Anything, mock.Anything, ).Return(400, nil) - return &sitExtensionDenier{moveRouter, mtoserviceitem.NewMTOServiceItemUpdater(planner, query.NewQueryBuilder(), moveRouter, mtoshipment.NewMTOShipmentFetcher(), address.NewAddressCreator(), ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer())} + return &sitExtensionDenier{moveRouter, mtoserviceitem.NewMTOServiceItemUpdater(planner, query.NewQueryBuilder(), moveRouter, mtoshipment.NewMTOShipmentFetcher(), address.NewAddressCreator(), ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer())} } // DenySITExtension denies the SIT Extension diff --git a/pkg/testdatagen/scenario/shared.go b/pkg/testdatagen/scenario/shared.go index e39b3b3a564..9890dbd126b 100644 --- a/pkg/testdatagen/scenario/shared.go +++ b/pkg/testdatagen/scenario/shared.go @@ -4274,7 +4274,7 @@ func createHHGWithOriginSITServiceItems( mock.Anything, mock.Anything, ).Return(400, nil) - serviceItemUpdator := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + serviceItemUpdator := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) var originFirstDaySIT models.MTOServiceItem var originAdditionalDaySIT models.MTOServiceItem @@ -4535,7 +4535,7 @@ func createHHGWithDestinationSITServiceItems(appCtx appcontext.AppContext, prime mock.Anything, mock.Anything, ).Return(400, nil) - serviceItemUpdator := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + serviceItemUpdator := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) var destinationFirstDaySIT models.MTOServiceItem var destinationAdditionalDaySIT models.MTOServiceItem @@ -5014,7 +5014,7 @@ func createHHGWithPaymentServiceItems( mock.Anything, mock.Anything, ).Return(400, nil) - serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer(), ghcrateengine.NewDomesticDestinationSITDeliveryPricer(), ghcrateengine.NewDomesticOriginSITFuelSurchargePricer()) + serviceItemUpdater := mtoserviceitem.NewMTOServiceItemUpdater(planner, queryBuilder, moveRouter, shipmentFetcher, addressCreator, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) var originFirstDaySIT models.MTOServiceItem var originAdditionalDaySIT models.MTOServiceItem From a8bb8848f73a4c758dcb92ceaa1e7f8203922e47 Mon Sep 17 00:00:00 2001 From: loganwc Date: Thu, 19 Dec 2024 18:57:13 +0000 Subject: [PATCH 023/260] prime update shipment now populates estimated price --- pkg/handlers/ghcapi/api.go | 21 +++++++++--- pkg/handlers/ghcapi/mto_service_items.go | 4 +-- pkg/handlers/ghcapi/mto_service_items_test.go | 4 +-- pkg/handlers/ghcapi/mto_shipment.go | 6 ++-- pkg/handlers/ghcapi/mto_shipment_test.go | 23 ++++++------- pkg/handlers/internalapi/api.go | 15 ++++++++- pkg/handlers/internalapi/mto_shipment.go | 2 +- pkg/handlers/internalapi/mto_shipment_test.go | 2 +- pkg/handlers/primeapiv2/api.go | 17 ++++++++-- pkg/handlers/primeapiv2/mto_shipment.go | 4 ++- pkg/handlers/primeapiv3/api.go | 15 ++++++++- pkg/handlers/primeapiv3/mto_shipment.go | 4 ++- pkg/handlers/primeapiv3/mto_shipment_test.go | 17 ++++++---- pkg/services/mocks/MTOServiceItemCreator.go | 30 +++++++++++++++++ pkg/services/mocks/ShipmentUpdater.go | 20 ++++++----- pkg/services/mto_service_item.go | 2 ++ .../mto_service_item_creator.go | 4 +-- .../shipment/shipment_updater.go | 33 +++++++++++++++++-- .../shipment/shipment_updater_test.go | 27 ++++++++++----- pkg/services/shipment_orchestrator.go | 3 +- 20 files changed, 194 insertions(+), 59 deletions(-) diff --git a/pkg/handlers/ghcapi/api.go b/pkg/handlers/ghcapi/api.go index 5edc3f7e3ee..2d3e814b527 100644 --- a/pkg/handlers/ghcapi/api.go +++ b/pkg/handlers/ghcapi/api.go @@ -79,9 +79,22 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI { signedCertificationCreator := signedcertification.NewSignedCertificationCreator() signedCertificationUpdater := signedcertification.NewSignedCertificationUpdater() ppmEstimator := ppmshipment.NewEstimatePPM(handlerConfig.DTODPlanner(), &paymentrequesthelper.RequestPaymentHelper{}) + + mtoServiceItemCreator := mtoserviceitem.NewMTOServiceItemCreator( + handlerConfig.HHGPlanner(), + queryBuilder, + moveRouter, + ghcrateengine.NewDomesticUnpackPricer(), + ghcrateengine.NewDomesticPackPricer(), + ghcrateengine.NewDomesticLinehaulPricer(), + ghcrateengine.NewDomesticShorthaulPricer(), + ghcrateengine.NewDomesticOriginPricer(), + ghcrateengine.NewDomesticDestinationPricer(), + ghcrateengine.NewFuelSurchargePricer()) + moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( queryBuilder, - mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), + mtoServiceItemCreator, moveRouter, signedCertificationCreator, signedCertificationUpdater, ppmEstimator, ) @@ -229,7 +242,7 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI { paymentRequestShipmentRecalculator, addressUpdater, addressCreator) - sitExtensionShipmentUpdater := shipment.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + sitExtensionShipmentUpdater := shipment.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, mtoServiceItemCreator) ghcAPI.MtoServiceItemUpdateServiceItemSitEntryDateHandler = UpdateServiceItemSitEntryDateHandler{ HandlerConfig: handlerConfig, @@ -403,7 +416,7 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI { handlerConfig, mtoshipment.NewShipmentApprover( mtoshipment.NewShipmentRouter(), - mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), + mtoServiceItemCreator, handlerConfig.HHGPlanner(), move.NewMoveWeights(mtoshipment.NewShipmentReweighRequester()), ), @@ -471,7 +484,7 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI { addressCreator, ) - shipmentUpdater := shipment.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipment.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, mtoServiceItemCreator) ghcAPI.MoveSearchMovesHandler = SearchMovesHandler{ HandlerConfig: handlerConfig, diff --git a/pkg/handlers/ghcapi/mto_service_items.go b/pkg/handlers/ghcapi/mto_service_items.go index 60b8db84c04..35b390c3eec 100644 --- a/pkg/handlers/ghcapi/mto_service_items.go +++ b/pkg/handlers/ghcapi/mto_service_items.go @@ -153,7 +153,7 @@ func (h UpdateServiceItemSitEntryDateHandler) Handle(params mtoserviceitemop.Upd existingETag := etag.GenerateEtag(shipment.UpdatedAt) - shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc") + shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc", nil) if err != nil { appCtx.Logger().Error(fmt.Sprintf("Could not update the shipment SIT auth end date for shipment ID: %s: %s", shipment.ID, err)) } @@ -266,7 +266,7 @@ func (h UpdateMTOServiceItemStatusHandler) Handle(params mtoserviceitemop.Update existingETag := etag.GenerateEtag(shipment.UpdatedAt) - shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc") + shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc", nil) if err != nil { appCtx.Logger().Error(fmt.Sprintf("Could not update the shipment SIT auth end date for shipment ID: %s: %s", shipment.ID, err)) } diff --git a/pkg/handlers/ghcapi/mto_service_items_test.go b/pkg/handlers/ghcapi/mto_service_items_test.go index 16bd37da126..dc9719edcf8 100644 --- a/pkg/handlers/ghcapi/mto_service_items_test.go +++ b/pkg/handlers/ghcapi/mto_service_items_test.go @@ -329,7 +329,7 @@ func (suite *HandlerSuite) TestUpdateMTOServiceItemStatusHandler() { ppmShipmentUpdater := ppmshipment.NewPPMShipmentUpdater(&ppmEstimator, addressCreator, addressUpdater) boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) shipmentFetcher := mtoshipment.NewMTOShipmentFetcher() moveTaskOrderID, _ := uuid.NewV4() @@ -774,7 +774,7 @@ func (suite *HandlerSuite) TestUpdateServiceItemSitEntryDateHandler() { ppmShipmentUpdater := ppmshipment.NewPPMShipmentUpdater(&ppmEstimator, addressCreator, addressUpdater) boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) shipmentFetcher := mtoshipment.NewMTOShipmentFetcher() suite.Run("200 - success response", func() { diff --git a/pkg/handlers/ghcapi/mto_shipment.go b/pkg/handlers/ghcapi/mto_shipment.go index 9a49401e612..598ab7f95e9 100644 --- a/pkg/handlers/ghcapi/mto_shipment.go +++ b/pkg/handlers/ghcapi/mto_shipment.go @@ -397,7 +397,7 @@ func (h UpdateShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipmentPar mtoShipment.PrimeEstimatedWeight = &previouslyRecordedWeight } - updatedMtoShipment, err := h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "ghc") + updatedMtoShipment, err := h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "ghc", nil) if err != nil { return handleError(err) } @@ -1112,7 +1112,7 @@ func (h ApproveSITExtensionHandler) Handle(params shipmentops.ApproveSITExtensio existingETag := etag.GenerateEtag(updatedShipment.UpdatedAt) - updatedShipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc") + updatedShipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc", nil) if err != nil { return handleError(err) } @@ -1359,7 +1359,7 @@ func (h CreateApprovedSITDurationUpdateHandler) Handle(params shipmentops.Create existingETag := etag.GenerateEtag(shipment.UpdatedAt) - shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc") + shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc", nil) if err != nil { return handleError(err) } diff --git a/pkg/handlers/ghcapi/mto_shipment_test.go b/pkg/handlers/ghcapi/mto_shipment_test.go index 1fb84918cc7..1358cca9c1c 100644 --- a/pkg/handlers/ghcapi/mto_shipment_test.go +++ b/pkg/handlers/ghcapi/mto_shipment_test.go @@ -2761,7 +2761,7 @@ func (suite *HandlerSuite) TestApproveSITExtensionHandler() { boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - sitExtensionShipmentUpdater := shipmentorchestrator.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + sitExtensionShipmentUpdater := shipmentorchestrator.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) handler := ApproveSITExtensionHandler{ handlerConfig, @@ -2902,7 +2902,7 @@ func (suite *HandlerSuite) CreateApprovedSITDurationUpdate() { boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - sitExtensionShipmentUpdater := shipmentorchestrator.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + sitExtensionShipmentUpdater := shipmentorchestrator.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) handler := CreateApprovedSITDurationUpdateHandler{ handlerConfig, @@ -2987,7 +2987,7 @@ func (suite *HandlerSuite) CreateApprovedSITDurationUpdate() { mobilehomeshipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - sitExtensionShipmentUpdater := shipmentorchestrator.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobilehomeshipmentUpdater) + sitExtensionShipmentUpdater := shipmentorchestrator.NewShipmentUpdater(noCheckUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobilehomeshipmentUpdater, nil) handler := CreateApprovedSITDurationUpdateHandler{ handlerConfig, @@ -4047,7 +4047,7 @@ func (suite *HandlerSuite) TestUpdateShipmentHandler() { ppmShipmentUpdater := ppmshipment.NewPPMShipmentUpdater(&ppmEstimator, addressCreator, addressUpdater) boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) handler := UpdateShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, @@ -4115,7 +4115,7 @@ func (suite *HandlerSuite) TestUpdateShipmentHandler() { boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) handler := UpdateShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, @@ -4303,7 +4303,7 @@ func (suite *HandlerSuite) TestUpdateShipmentHandler() { boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) handler := UpdateShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, @@ -4383,7 +4383,7 @@ func (suite *HandlerSuite) TestUpdateShipmentHandler() { boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) handler := UpdateShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, @@ -4463,7 +4463,7 @@ func (suite *HandlerSuite) TestUpdateShipmentHandler() { boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) handler := UpdateShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, @@ -4501,7 +4501,7 @@ func (suite *HandlerSuite) TestUpdateShipmentHandler() { boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) handler := UpdateShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, @@ -4541,7 +4541,7 @@ func (suite *HandlerSuite) TestUpdateShipmentHandler() { boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) handler := UpdateShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, @@ -4582,7 +4582,7 @@ func (suite *HandlerSuite) TestUpdateShipmentHandler() { boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) handler := UpdateShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, @@ -4626,6 +4626,7 @@ func (suite *HandlerSuite) TestUpdateShipmentHandler() { mock.Anything, mock.Anything, mock.Anything, + nil, ).Return(nil, err) oldShipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ diff --git a/pkg/handlers/internalapi/api.go b/pkg/handlers/internalapi/api.go index eb5386c4356..966d3c3a881 100644 --- a/pkg/handlers/internalapi/api.go +++ b/pkg/handlers/internalapi/api.go @@ -191,11 +191,23 @@ func NewInternalAPI(handlerConfig handlers.HandlerConfig) *internalops.MymoveAPI postalcodeservice.NewPostalCodeValidator(clock.New()), } + mtoServiceItemCreator := mtoserviceitem.NewMTOServiceItemCreator( + handlerConfig.HHGPlanner(), + builder, + moveRouter, + ghcrateengine.NewDomesticUnpackPricer(), + ghcrateengine.NewDomesticPackPricer(), + ghcrateengine.NewDomesticLinehaulPricer(), + ghcrateengine.NewDomesticShorthaulPricer(), + ghcrateengine.NewDomesticOriginPricer(), + ghcrateengine.NewDomesticDestinationPricer(), + ghcrateengine.NewFuelSurchargePricer()) + mtoShipmentCreator := mtoshipment.NewMTOShipmentCreatorV1(builder, fetcher, moveRouter, addressCreator) shipmentRouter := mtoshipment.NewShipmentRouter() moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( builder, - mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), + mtoServiceItemCreator, moveRouter, signedCertificationCreator, signedCertificationUpdater, ppmEstimator, ) boatShipmentCreator := boatshipment.NewBoatShipmentCreator() @@ -231,6 +243,7 @@ func NewInternalAPI(handlerConfig handlers.HandlerConfig) *internalops.MymoveAPI ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, + mtoServiceItemCreator, ) internalAPI.MtoShipmentUpdateMTOShipmentHandler = UpdateMTOShipmentHandler{ diff --git a/pkg/handlers/internalapi/mto_shipment.go b/pkg/handlers/internalapi/mto_shipment.go index dc23374a6af..5b401190232 100644 --- a/pkg/handlers/internalapi/mto_shipment.go +++ b/pkg/handlers/internalapi/mto_shipment.go @@ -169,7 +169,7 @@ func (h UpdateMTOShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipment h.GetTraceIDFromRequest(params.HTTPRequest))), invalidShipmentStatusErr } - updatedMTOShipment, err := h.shipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "internal") + updatedMTOShipment, err := h.shipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "internal", nil) if err != nil { appCtx.Logger().Error("internalapi.UpdateMTOShipmentHandler", zap.Error(err)) diff --git a/pkg/handlers/internalapi/mto_shipment_test.go b/pkg/handlers/internalapi/mto_shipment_test.go index 4d2b557286f..6cca6d10819 100644 --- a/pkg/handlers/internalapi/mto_shipment_test.go +++ b/pkg/handlers/internalapi/mto_shipment_test.go @@ -760,7 +760,7 @@ func (suite *HandlerSuite) TestUpdateMTOShipmentHandler() { boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, nil) authRequestAndSetUpHandlerAndParams := func(originalShipment models.MTOShipment, mockShipmentUpdater *mocks.ShipmentUpdater) (UpdateMTOShipmentHandler, mtoshipmentops.UpdateMTOShipmentParams) { endpoint := fmt.Sprintf("/mto-shipments/%s", originalShipment.ID.String()) diff --git a/pkg/handlers/primeapiv2/api.go b/pkg/handlers/primeapiv2/api.go index dedf3e218ac..72468b5a5f4 100644 --- a/pkg/handlers/primeapiv2/api.go +++ b/pkg/handlers/primeapiv2/api.go @@ -51,9 +51,21 @@ func NewPrimeAPI(handlerConfig handlers.HandlerConfig) *primev2operations.Mymove signedCertificationUpdater := signedcertification.NewSignedCertificationUpdater() ppmEstimator := ppmshipment.NewEstimatePPM(handlerConfig.DTODPlanner(), &paymentrequesthelper.RequestPaymentHelper{}) + mtoServiceItemCreator := mtoserviceitem.NewMTOServiceItemCreator( + handlerConfig.HHGPlanner(), + queryBuilder, + moveRouter, + ghcrateengine.NewDomesticUnpackPricer(), + ghcrateengine.NewDomesticPackPricer(), + ghcrateengine.NewDomesticLinehaulPricer(), + ghcrateengine.NewDomesticShorthaulPricer(), + ghcrateengine.NewDomesticOriginPricer(), + ghcrateengine.NewDomesticDestinationPricer(), + ghcrateengine.NewFuelSurchargePricer()) + moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( queryBuilder, - mtoserviceitem.NewMTOServiceItemCreator(handlerConfig.HHGPlanner(), queryBuilder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), + mtoServiceItemCreator, moveRouter, signedCertificationCreator, signedCertificationUpdater, ppmEstimator, ) @@ -95,10 +107,11 @@ func NewPrimeAPI(handlerConfig handlers.HandlerConfig) *primev2operations.Mymove ppmShipmentUpdater := ppmshipment.NewPPMShipmentUpdater(ppmEstimator, addressCreator, addressUpdater) boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipment.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipment.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, mtoServiceItemCreator) primeAPIV2.MtoShipmentUpdateMTOShipmentHandler = UpdateMTOShipmentHandler{ handlerConfig, shipmentUpdater, + handlerConfig.DTODPlanner(), } return primeAPIV2 diff --git a/pkg/handlers/primeapiv2/mto_shipment.go b/pkg/handlers/primeapiv2/mto_shipment.go index 35672bbc02e..e4f2c41748a 100644 --- a/pkg/handlers/primeapiv2/mto_shipment.go +++ b/pkg/handlers/primeapiv2/mto_shipment.go @@ -17,6 +17,7 @@ import ( "github.com/transcom/mymove/pkg/handlers/primeapi" "github.com/transcom/mymove/pkg/handlers/primeapiv2/payloads" "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/route" "github.com/transcom/mymove/pkg/services" mtoshipment "github.com/transcom/mymove/pkg/services/mto_shipment" ) @@ -169,6 +170,7 @@ func (h CreateMTOShipmentHandler) Handle(params mtoshipmentops.CreateMTOShipment type UpdateMTOShipmentHandler struct { handlers.HandlerConfig services.ShipmentUpdater + planner route.Planner } // Handle handler that updates a mto shipment @@ -202,7 +204,7 @@ func (h UpdateMTOShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipment mtoShipment.ShipmentType = dbShipment.ShipmentType appCtx.Logger().Info("primeapi.UpdateMTOShipmentHandler info", zap.String("pointOfContact", params.Body.PointOfContact)) - mtoShipment, err = h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "prime-v2") + mtoShipment, err = h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "prime-v2", h.planner) if err != nil { appCtx.Logger().Error("primeapi.UpdateMTOShipmentHandler error", zap.Error(err)) switch e := err.(type) { diff --git a/pkg/handlers/primeapiv3/api.go b/pkg/handlers/primeapiv3/api.go index e9c522f8d42..3b47e67fc94 100644 --- a/pkg/handlers/primeapiv3/api.go +++ b/pkg/handlers/primeapiv3/api.go @@ -92,13 +92,26 @@ func NewPrimeAPI(handlerConfig handlers.HandlerConfig) *primev3operations.Mymove addressCreator, ) + mtoServiceItemCreator := mtoserviceitem.NewMTOServiceItemCreator( + handlerConfig.HHGPlanner(), + queryBuilder, + moveRouter, + ghcrateengine.NewDomesticUnpackPricer(), + ghcrateengine.NewDomesticPackPricer(), + ghcrateengine.NewDomesticLinehaulPricer(), + ghcrateengine.NewDomesticShorthaulPricer(), + ghcrateengine.NewDomesticOriginPricer(), + ghcrateengine.NewDomesticDestinationPricer(), + ghcrateengine.NewFuelSurchargePricer()) + ppmShipmentUpdater := ppmshipment.NewPPMShipmentUpdater(ppmEstimator, addressCreator, addressUpdater) boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() - shipmentUpdater := shipment.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipment.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, mtoServiceItemCreator) primeAPIV3.MtoShipmentUpdateMTOShipmentHandler = UpdateMTOShipmentHandler{ handlerConfig, shipmentUpdater, + handlerConfig.DTODPlanner(), } return primeAPIV3 diff --git a/pkg/handlers/primeapiv3/mto_shipment.go b/pkg/handlers/primeapiv3/mto_shipment.go index 00130a14323..3667c29dad4 100644 --- a/pkg/handlers/primeapiv3/mto_shipment.go +++ b/pkg/handlers/primeapiv3/mto_shipment.go @@ -17,6 +17,7 @@ import ( "github.com/transcom/mymove/pkg/handlers/primeapi" "github.com/transcom/mymove/pkg/handlers/primeapiv3/payloads" "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/route" "github.com/transcom/mymove/pkg/services" mtoshipment "github.com/transcom/mymove/pkg/services/mto_shipment" ) @@ -169,6 +170,7 @@ func (h CreateMTOShipmentHandler) Handle(params mtoshipmentops.CreateMTOShipment type UpdateMTOShipmentHandler struct { handlers.HandlerConfig services.ShipmentUpdater + planner route.Planner } // Handle handler that updates a mto shipment @@ -202,7 +204,7 @@ func (h UpdateMTOShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipment mtoShipment.ShipmentType = dbShipment.ShipmentType appCtx.Logger().Info("primeapi.UpdateMTOShipmentHandler info", zap.String("pointOfContact", params.Body.PointOfContact)) - mtoShipment, err = h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "prime-v3") + mtoShipment, err = h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "prime-v3", h.planner) if err != nil { appCtx.Logger().Error("primeapi.UpdateMTOShipmentHandler error", zap.Error(err)) switch e := err.(type) { diff --git a/pkg/handlers/primeapiv3/mto_shipment_test.go b/pkg/handlers/primeapiv3/mto_shipment_test.go index c0443c77eb2..810f483d5ce 100644 --- a/pkg/handlers/primeapiv3/mto_shipment_test.go +++ b/pkg/handlers/primeapiv3/mto_shipment_test.go @@ -84,10 +84,10 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { return mockUpdater } - + mtoServiceItemCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) moveTaskOrderUpdater := movetaskorder.NewMoveTaskOrderUpdater( builder, - mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()), + mtoServiceItemCreator, moveRouter, setUpSignedCertificationCreatorMock(nil, nil), setUpSignedCertificationUpdaterMock(nil, nil), &ppmEstimator, ) shipmentCreator := shipmentorchestrator.NewShipmentCreator(mtoShipmentCreator, ppmShipmentCreator, boatShipmentCreator, mobileHomeShipmentCreator, shipmentRouter, moveTaskOrderUpdater) @@ -109,7 +109,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { boatShipmentUpdater := boatshipment.NewBoatShipmentUpdater() mobileHomeShipmentUpdater := mobilehomeshipment.NewMobileHomeShipmentUpdater() mtoShipmentUpdater := mtoshipment.NewPrimeMTOShipmentUpdater(builder, fetcher, planner, moveRouter, moveWeights, suite.TestNotificationSender(), paymentRequestShipmentRecalculator, addressUpdater, addressCreator) - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, mtoServiceItemCreator) setupTestData := func(boatFeatureFlag bool, ubFeatureFlag bool) (CreateMTOShipmentHandler, models.Move) { @@ -548,6 +548,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { patchHandler := UpdateMTOShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, + planner, } patchReq := httptest.NewRequest("PATCH", fmt.Sprintf("/mto-shipments/%s", createdPPM.ShipmentID.String()), nil) @@ -829,6 +830,7 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { patchHandler := UpdateMTOShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, + planner, } patchReq := httptest.NewRequest("PATCH", fmt.Sprintf("/mto-shipments/%s", createdPPM.ShipmentID.String()), nil) @@ -1546,10 +1548,11 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { // Setup: If underlying CreateMTOShipment returns error, handler should return 422 response // Expected: 422 Response returned - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, mtoServiceItemCreator) patchHandler := UpdateMTOShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, + planner, } now := time.Now() @@ -1621,10 +1624,11 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { // Setup: If underlying UpdateMTOShipment returns error, handler should return 422 response // Expected: 422 Response returned - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, mtoServiceItemCreator) patchHandler := UpdateMTOShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, + planner, } move := factory.BuildAvailableToPrimeMove(suite.DB(), []factory.Customization{}, nil) @@ -1669,10 +1673,11 @@ func (suite *HandlerSuite) TestCreateMTOShipmentHandler() { // Setup: If underlying CreateMTOShipment returns error, handler should return 422 response // Expected: 422 Response returned - shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater) + shipmentUpdater := shipmentorchestrator.NewShipmentUpdater(mtoShipmentUpdater, ppmShipmentUpdater, boatShipmentUpdater, mobileHomeShipmentUpdater, mtoServiceItemCreator) patchHandler := UpdateMTOShipmentHandler{ suite.HandlerConfig(), shipmentUpdater, + planner, } now := time.Now() diff --git a/pkg/services/mocks/MTOServiceItemCreator.go b/pkg/services/mocks/MTOServiceItemCreator.go index ae6e7d230e7..ab7cd5f1deb 100644 --- a/pkg/services/mocks/MTOServiceItemCreator.go +++ b/pkg/services/mocks/MTOServiceItemCreator.go @@ -8,6 +8,8 @@ import ( models "github.com/transcom/mymove/pkg/models" + unit "github.com/transcom/mymove/pkg/unit" + validate "github.com/gobuffalo/validate/v3" ) @@ -55,6 +57,34 @@ func (_m *MTOServiceItemCreator) CreateMTOServiceItem(appCtx appcontext.AppConte return r0, r1, r2 } +// FindEstimatedPrice provides a mock function with given fields: appCtx, serviceItem, mtoShipment +func (_m *MTOServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, mtoShipment models.MTOShipment) (unit.Cents, error) { + ret := _m.Called(appCtx, serviceItem, mtoShipment) + + if len(ret) == 0 { + panic("no return value specified for FindEstimatedPrice") + } + + var r0 unit.Cents + var r1 error + if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOServiceItem, models.MTOShipment) (unit.Cents, error)); ok { + return rf(appCtx, serviceItem, mtoShipment) + } + if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOServiceItem, models.MTOShipment) unit.Cents); ok { + r0 = rf(appCtx, serviceItem, mtoShipment) + } else { + r0 = ret.Get(0).(unit.Cents) + } + + if rf, ok := ret.Get(1).(func(appcontext.AppContext, *models.MTOServiceItem, models.MTOShipment) error); ok { + r1 = rf(appCtx, serviceItem, mtoShipment) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // NewMTOServiceItemCreator creates a new instance of MTOServiceItemCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. // The first argument is typically a *testing.T value. func NewMTOServiceItemCreator(t interface { diff --git a/pkg/services/mocks/ShipmentUpdater.go b/pkg/services/mocks/ShipmentUpdater.go index 94bc241b543..83e0f17d197 100644 --- a/pkg/services/mocks/ShipmentUpdater.go +++ b/pkg/services/mocks/ShipmentUpdater.go @@ -7,6 +7,8 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" + + route "github.com/transcom/mymove/pkg/route" ) // ShipmentUpdater is an autogenerated mock type for the ShipmentUpdater type @@ -14,9 +16,9 @@ type ShipmentUpdater struct { mock.Mock } -// UpdateShipment provides a mock function with given fields: appCtx, shipment, eTag, api -func (_m *ShipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string) (*models.MTOShipment, error) { - ret := _m.Called(appCtx, shipment, eTag, api) +// UpdateShipment provides a mock function with given fields: appCtx, shipment, eTag, api, planner +func (_m *ShipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string, planner route.Planner) (*models.MTOShipment, error) { + ret := _m.Called(appCtx, shipment, eTag, api, planner) if len(ret) == 0 { panic("no return value specified for UpdateShipment") @@ -24,19 +26,19 @@ func (_m *ShipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment var r0 *models.MTOShipment var r1 error - if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOShipment, string, string) (*models.MTOShipment, error)); ok { - return rf(appCtx, shipment, eTag, api) + if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOShipment, string, string, route.Planner) (*models.MTOShipment, error)); ok { + return rf(appCtx, shipment, eTag, api, planner) } - if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOShipment, string, string) *models.MTOShipment); ok { - r0 = rf(appCtx, shipment, eTag, api) + if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOShipment, string, string, route.Planner) *models.MTOShipment); ok { + r0 = rf(appCtx, shipment, eTag, api, planner) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*models.MTOShipment) } } - if rf, ok := ret.Get(1).(func(appcontext.AppContext, *models.MTOShipment, string, string) error); ok { - r1 = rf(appCtx, shipment, eTag, api) + if rf, ok := ret.Get(1).(func(appcontext.AppContext, *models.MTOShipment, string, string, route.Planner) error); ok { + r1 = rf(appCtx, shipment, eTag, api, planner) } else { r1 = ret.Error(1) } diff --git a/pkg/services/mto_service_item.go b/pkg/services/mto_service_item.go index 25926ae3fca..fd403b7875c 100644 --- a/pkg/services/mto_service_item.go +++ b/pkg/services/mto_service_item.go @@ -9,6 +9,7 @@ import ( "github.com/transcom/mymove/pkg/appcontext" "github.com/transcom/mymove/pkg/models" "github.com/transcom/mymove/pkg/route" + "github.com/transcom/mymove/pkg/unit" ) // MTOServiceItemFetcher is the exported interface for fetching a mto service item @@ -23,6 +24,7 @@ type MTOServiceItemFetcher interface { //go:generate mockery --name MTOServiceItemCreator type MTOServiceItemCreator interface { CreateMTOServiceItem(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem) (*models.MTOServiceItems, *validate.Errors, error) + FindEstimatedPrice(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, mtoShipment models.MTOShipment) (unit.Cents, error) } // MTOServiceItemUpdater is the exported interface for updating an mto service item 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 2ab0802badd..acd79abf669 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator.go +++ b/pkg/services/mto_service_item/mto_service_item_creator.go @@ -39,7 +39,7 @@ type mtoServiceItemCreator struct { fuelSurchargePricer services.FuelSurchargePricer } -func (o *mtoServiceItemCreator) findEstimatedPrice(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, mtoShipment models.MTOShipment) (unit.Cents, error) { +func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, serviceItem *models.MTOServiceItem, mtoShipment models.MTOShipment) (unit.Cents, error) { if serviceItem.ReService.Code == models.ReServiceCodeDOP || serviceItem.ReService.Code == models.ReServiceCodeDPK || serviceItem.ReService.Code == models.ReServiceCodeDDP || @@ -606,7 +606,7 @@ func (o *mtoServiceItemCreator) CreateMTOServiceItem(appCtx appcontext.AppContex // NTS-release requested pickup dates are for handle out, their pricing is handled differently as their locations are based on storage facilities, not pickup locations if mtoShipment.PrimeEstimatedWeight != nil && mtoShipment.RequestedPickupDate != nil && mtoShipment.ShipmentType != models.MTOShipmentTypeHHGOutOfNTSDom { - serviceItemEstimatedPrice, err := o.findEstimatedPrice(appCtx, serviceItem, mtoShipment) + serviceItemEstimatedPrice, err := o.FindEstimatedPrice(appCtx, serviceItem, mtoShipment) if serviceItemEstimatedPrice != 0 && err == nil { serviceItem.PricingEstimate = &serviceItemEstimatedPrice } diff --git a/pkg/services/orchestrators/shipment/shipment_updater.go b/pkg/services/orchestrators/shipment/shipment_updater.go index 70b0406a842..b9e29cc8425 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater.go +++ b/pkg/services/orchestrators/shipment/shipment_updater.go @@ -5,7 +5,9 @@ import ( "github.com/transcom/mymove/pkg/appcontext" "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/route" "github.com/transcom/mymove/pkg/services" + "github.com/transcom/mymove/pkg/unit" ) // shipmentUpdater is the concrete struct implementing the services.ShipmentUpdater interface @@ -15,21 +17,23 @@ type shipmentUpdater struct { ppmShipmentUpdater services.PPMShipmentUpdater boatShipmentUpdater services.BoatShipmentUpdater mobileHomeShipmentUpdater services.MobileHomeShipmentUpdater + mtoServiceItemCreator services.MTOServiceItemCreator } // NewShipmentUpdater creates a new shipmentUpdater struct with the basic checks and service dependencies. -func NewShipmentUpdater(mtoShipmentUpdater services.MTOShipmentUpdater, ppmShipmentUpdater services.PPMShipmentUpdater, boatShipmentUpdater services.BoatShipmentUpdater, mobileHomeShipmentUpdater services.MobileHomeShipmentUpdater) services.ShipmentUpdater { +func NewShipmentUpdater(mtoShipmentUpdater services.MTOShipmentUpdater, ppmShipmentUpdater services.PPMShipmentUpdater, boatShipmentUpdater services.BoatShipmentUpdater, mobileHomeShipmentUpdater services.MobileHomeShipmentUpdater, mtoServiceItemCreator services.MTOServiceItemCreator) services.ShipmentUpdater { return &shipmentUpdater{ checks: basicShipmentChecks(), mtoShipmentUpdater: mtoShipmentUpdater, ppmShipmentUpdater: ppmShipmentUpdater, boatShipmentUpdater: boatShipmentUpdater, mobileHomeShipmentUpdater: mobileHomeShipmentUpdater, + mtoServiceItemCreator: mtoServiceItemCreator, } } // UpdateShipment updates a shipment, taking into account different shipment types and their needs. -func (s *shipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string) (*models.MTOShipment, error) { +func (s *shipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string, planner route.Planner) (*models.MTOShipment, error) { if err := validateShipment(appCtx, *shipment, s.checks...); err != nil { return nil, err } @@ -43,6 +47,31 @@ func (s *shipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment return err } + if mtoShipment != nil && planner != nil { + if mtoShipment.ShipmentType != models.MTOShipmentTypePPM && (shipment.PrimeEstimatedWeight != nil || mtoShipment.PrimeEstimatedWeight != nil) && mtoShipment.Status == models.MTOShipmentStatusApproved { + for index, serviceItem := range mtoShipment.MTOServiceItems { + var estimatedWeightToUse unit.Pound + if shipment.PrimeEstimatedWeight != nil { + estimatedWeightToUse = *shipment.PrimeEstimatedWeight + } else { + estimatedWeightToUse = *mtoShipment.PrimeEstimatedWeight + } + mtoShipment.MTOServiceItems[index].EstimatedWeight = &estimatedWeightToUse + serviceItemEstimatedPrice, err := s.mtoServiceItemCreator.FindEstimatedPrice(appCtx, &serviceItem, *mtoShipment) + if serviceItemEstimatedPrice != 0 && err == nil { + mtoShipment.MTOServiceItems[index].PricingEstimate = &serviceItemEstimatedPrice + } + } + } + } + + if mtoShipment.MTOServiceItems != nil { + _, mtoErr := appCtx.DB().ValidateAndUpdate(&mtoShipment.MTOServiceItems) + if mtoErr != nil { + return mtoErr + } + } + isBoatShipment := shipment.ShipmentType == models.MTOShipmentTypeBoatHaulAway || shipment.ShipmentType == models.MTOShipmentTypeBoatTowAway if shipment.ShipmentType == models.MTOShipmentTypePPM { diff --git a/pkg/services/orchestrators/shipment/shipment_updater_test.go b/pkg/services/orchestrators/shipment/shipment_updater_test.go index 74375ccec38..3f46ef72c97 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater_test.go +++ b/pkg/services/orchestrators/shipment/shipment_updater_test.go @@ -11,8 +11,13 @@ import ( "github.com/transcom/mymove/pkg/etag" "github.com/transcom/mymove/pkg/factory" "github.com/transcom/mymove/pkg/models" + routemocks "github.com/transcom/mymove/pkg/route/mocks" "github.com/transcom/mymove/pkg/services" + "github.com/transcom/mymove/pkg/services/ghcrateengine" "github.com/transcom/mymove/pkg/services/mocks" + moveservices "github.com/transcom/mymove/pkg/services/move" + mtoserviceitem "github.com/transcom/mymove/pkg/services/mto_service_item" + "github.com/transcom/mymove/pkg/services/query" "github.com/transcom/mymove/pkg/unit" ) @@ -36,6 +41,11 @@ func (suite *ShipmentSuite) TestUpdateShipment() { fakeError error } + planner := &routemocks.Planner{} + moveRouter := moveservices.NewMoveRouter() + builder := query.NewQueryBuilder() + mtoServiceItemCreator := mtoserviceitem.NewMTOServiceItemCreator(planner, builder, moveRouter, ghcrateengine.NewDomesticUnpackPricer(), ghcrateengine.NewDomesticPackPricer(), ghcrateengine.NewDomesticLinehaulPricer(), ghcrateengine.NewDomesticShorthaulPricer(), ghcrateengine.NewDomesticOriginPricer(), ghcrateengine.NewDomesticDestinationPricer(), ghcrateengine.NewFuelSurchargePricer()) + makeSubtestData := func(returnErrorForMTOShipment bool, returnErrorForPPMShipment bool, returnErrorForBoatShipment bool, returnErrorForMobileHomeShipment bool) (subtestData subtestDataObjects) { mockMTOShipmentUpdater := mocks.MTOShipmentUpdater{} subtestData.mockMTOShipmentUpdater = &mockMTOShipmentUpdater @@ -49,9 +59,8 @@ func (suite *ShipmentSuite) TestUpdateShipment() { mockMobileHomeShipmentUpdater := mocks.MobileHomeShipmentUpdater{} subtestData.mockMobileHomeShipmentUpdater = &mockMobileHomeShipmentUpdater - subtestData.shipmentUpdaterOrchestrator = NewShipmentUpdater(subtestData.mockMTOShipmentUpdater, subtestData.mockPPMShipmentUpdater, subtestData.mockBoatShipmentUpdater, subtestData.mockMobileHomeShipmentUpdater) - - subtestData.shipmentUpdaterOrchestrator = NewShipmentUpdater(subtestData.mockMTOShipmentUpdater, subtestData.mockPPMShipmentUpdater, subtestData.mockBoatShipmentUpdater, subtestData.mockMobileHomeShipmentUpdater) + subtestData.shipmentUpdaterOrchestrator = NewShipmentUpdater(subtestData.mockMTOShipmentUpdater, subtestData.mockPPMShipmentUpdater, subtestData.mockBoatShipmentUpdater, subtestData.mockMobileHomeShipmentUpdater, mtoServiceItemCreator) + subtestData.shipmentUpdaterOrchestrator = NewShipmentUpdater(subtestData.mockMTOShipmentUpdater, subtestData.mockPPMShipmentUpdater, subtestData.mockBoatShipmentUpdater, subtestData.mockMobileHomeShipmentUpdater, mtoServiceItemCreator) if returnErrorForMTOShipment { subtestData.fakeError = apperror.NewInvalidInputError(uuid.Nil, nil, nil, "Pickup date missing") @@ -188,7 +197,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { // Set invalid data, can't pass in blank to the generator above (it'll default to HHG if blank) so we're setting it afterward. shipment.ShipmentType = "" - updatedShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test") + updatedShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test", nil) suite.Nil(updatedShipment) @@ -236,7 +245,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { // Need to start a transaction so we can assert the call with the correct appCtx err := appCtx.NewTransaction(func(txAppCtx appcontext.AppContext) error { - mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(txAppCtx, &shipment, eTag, "test") + mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(txAppCtx, &shipment, eTag, "test", nil) suite.NoError(err) suite.NotNil(mtoShipment) @@ -299,7 +308,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { shipment.PPMShipment.AdvanceAmountReceived = models.CentPointer(unit.Cents(55000)) shipment.PPMShipment.HasReceivedAdvance = models.BoolPointer(true) - mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test") + mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test", nil) suite.NoError(err) suite.NotNil(mtoShipment) @@ -338,7 +347,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { shipment.BoatShipment.LengthInInches = models.IntPointer(20) shipment.BoatShipment.HasTrailer = models.BoolPointer(false) - mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test") + mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test", nil) suite.NoError(err) @@ -417,7 +426,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { }, nil) } - mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test") + mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test", nil) suite.Nil(mtoShipment) @@ -441,7 +450,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { eTag := etag.GenerateEtag(shipment.UpdatedAt) - mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, eTag, "test") + mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, eTag, "test", nil) suite.Nil(mtoShipment) diff --git a/pkg/services/shipment_orchestrator.go b/pkg/services/shipment_orchestrator.go index 69168e8f997..cef3a0c405a 100644 --- a/pkg/services/shipment_orchestrator.go +++ b/pkg/services/shipment_orchestrator.go @@ -3,6 +3,7 @@ package services import ( "github.com/transcom/mymove/pkg/appcontext" "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/route" ) // ShipmentCreator creates a shipment, taking into account different shipment types and their needs. @@ -16,5 +17,5 @@ type ShipmentCreator interface { // //go:generate mockery --name ShipmentUpdater type ShipmentUpdater interface { - UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string) (*models.MTOShipment, error) + UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string, planner route.Planner) (*models.MTOShipment, error) } From 04be5cd6e207f39dc5f6778983b4e3db8034852f Mon Sep 17 00:00:00 2001 From: loganwc Date: Thu, 19 Dec 2024 19:38:30 +0000 Subject: [PATCH 024/260] fixed test --- pkg/handlers/internalapi/mto_shipment_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/handlers/internalapi/mto_shipment_test.go b/pkg/handlers/internalapi/mto_shipment_test.go index 6cca6d10819..bcd287d054a 100644 --- a/pkg/handlers/internalapi/mto_shipment_test.go +++ b/pkg/handlers/internalapi/mto_shipment_test.go @@ -1484,6 +1484,7 @@ func (suite *HandlerSuite) TestUpdateMTOShipmentHandler() { mock.AnythingOfType("*models.MTOShipment"), mock.AnythingOfType("string"), mock.AnythingOfType("string"), + nil, ).Return(nil, err) subtestData := getDefaultMTOShipmentAndParams(&mockUpdater) From 28444832a086a8e16d1e0602d688c953a4ca4a95 Mon Sep 17 00:00:00 2001 From: joeydoyecaci Date: Thu, 26 Dec 2024 15:43:20 +0000 Subject: [PATCH 025/260] removed NTSR release requirement per 21551 --- pkg/services/mto_service_item/mto_service_item_creator.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 acd79abf669..2dd381de9b7 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator.go +++ b/pkg/services/mto_service_item/mto_service_item_creator.go @@ -604,8 +604,7 @@ func (o *mtoServiceItemCreator) CreateMTOServiceItem(appCtx appcontext.AppContex // if estimated weight for shipment provided by the prime, calculate the estimated prices for // DLH, DPK, DOP, DDP, DUPK - // NTS-release requested pickup dates are for handle out, their pricing is handled differently as their locations are based on storage facilities, not pickup locations - if mtoShipment.PrimeEstimatedWeight != nil && mtoShipment.RequestedPickupDate != nil && mtoShipment.ShipmentType != models.MTOShipmentTypeHHGOutOfNTSDom { + if mtoShipment.PrimeEstimatedWeight != nil && mtoShipment.RequestedPickupDate != nil { serviceItemEstimatedPrice, err := o.FindEstimatedPrice(appCtx, serviceItem, mtoShipment) if serviceItemEstimatedPrice != 0 && err == nil { serviceItem.PricingEstimate = &serviceItemEstimatedPrice From 10e289365d220b44696bf5b0d9d044c8ecc1dbdb Mon Sep 17 00:00:00 2001 From: joeydoyecaci Date: Fri, 27 Dec 2024 17:05:00 +0000 Subject: [PATCH 026/260] added missing else statement --- pkg/services/orchestrators/shipment/shipment_updater.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/services/orchestrators/shipment/shipment_updater.go b/pkg/services/orchestrators/shipment/shipment_updater.go index b9e29cc8425..53a20840e5e 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater.go +++ b/pkg/services/orchestrators/shipment/shipment_updater.go @@ -61,6 +61,9 @@ func (s *shipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment if serviceItemEstimatedPrice != 0 && err == nil { mtoShipment.MTOServiceItems[index].PricingEstimate = &serviceItemEstimatedPrice } + if err != nil { + return err + } } } } From d252638f94bddc9214801341f36c1ea5c5a56e87 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Tue, 31 Dec 2024 17:38:05 +0000 Subject: [PATCH 027/260] B-22056 - work files copied over for backend api call. --- cmd/milmove/serve.go | 7 + go.mod | 4 +- go.sum | 4 + pkg/gen/internalapi/configure_mymove.go | 9 + pkg/gen/internalapi/doc.go | 1 + pkg/gen/internalapi/embedded_spec.go | 104 ++++++++++ .../internaloperations/mymove_api.go | 24 +++ .../uploads/get_upload_status.go | 58 ++++++ .../uploads/get_upload_status_parameters.go | 91 +++++++++ .../uploads/get_upload_status_responses.go | 177 ++++++++++++++++ .../uploads/get_upload_status_urlbuilder.go | 101 +++++++++ pkg/handlers/authentication/auth.go | 1 + pkg/handlers/config.go | 14 ++ pkg/handlers/config_test.go | 2 +- pkg/handlers/internalapi/api.go | 2 + .../internal/payloads/model_to_payload.go | 15 +- pkg/handlers/internalapi/uploads.go | 124 +++++++++++ pkg/handlers/internalapi/uploads_test.go | 44 ++++ pkg/models/upload.go | 35 +++- pkg/notifications/notification_receiver.go | 192 ++++++++++++++++++ swagger-def/internal.yaml | 37 ++++ swagger/internal.yaml | 36 ++++ 22 files changed, 1065 insertions(+), 17 deletions(-) create mode 100644 pkg/gen/internalapi/internaloperations/uploads/get_upload_status.go create mode 100644 pkg/gen/internalapi/internaloperations/uploads/get_upload_status_parameters.go create mode 100644 pkg/gen/internalapi/internaloperations/uploads/get_upload_status_responses.go create mode 100644 pkg/gen/internalapi/internaloperations/uploads/get_upload_status_urlbuilder.go create mode 100644 pkg/notifications/notification_receiver.go diff --git a/cmd/milmove/serve.go b/cmd/milmove/serve.go index 505936d3868..7168bf87acd 100644 --- a/cmd/milmove/serve.go +++ b/cmd/milmove/serve.go @@ -478,6 +478,12 @@ func buildRoutingConfig(appCtx appcontext.AppContext, v *viper.Viper, redisPool appCtx.Logger().Fatal("notification sender sending not enabled", zap.Error(err)) } + // Event Receiver + notificationReceiver, err := notifications.InitReceiver(v, appCtx.Logger()) + if err != nil { + appCtx.Logger().Fatal("notification receiver listening not enabled") + } + routingConfig.BuildRoot = v.GetString(cli.BuildRootFlag) sendProductionInvoice := v.GetBool(cli.GEXSendProdInvoiceFlag) @@ -567,6 +573,7 @@ func buildRoutingConfig(appCtx appcontext.AppContext, v *viper.Viper, redisPool dtodRoutePlanner, fileStorer, notificationSender, + notificationReceiver, iwsPersonLookup, sendProductionInvoice, gexSender, diff --git a/go.mod b/go.mod index e528f684f9d..74bbb9f4e0c 100644 --- a/go.mod +++ b/go.mod @@ -21,6 +21,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/rds v1.78.2 github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 github.com/aws/aws-sdk-go-v2/service/ses v1.25.3 + github.com/aws/aws-sdk-go-v2/service/sns v1.31.8 + github.com/aws/aws-sdk-go-v2/service/sqs v1.34.6 github.com/aws/aws-sdk-go-v2/service/ssm v1.52.8 github.com/aws/aws-sdk-go-v2/service/sts v1.30.7 github.com/aws/smithy-go v1.20.4 @@ -264,7 +266,7 @@ require ( golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.25.0 // indirect golang.org/x/term v0.24.0 // indirect - google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect + google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/go.sum b/go.sum index edfdd1c49f0..c272e10eca1 100644 --- a/go.sum +++ b/go.sum @@ -82,6 +82,10 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0 h1:Cso4Ev/XauMVsbwdhYEoxg8rxZWw4 github.com/aws/aws-sdk-go-v2/service/s3 v1.59.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= github.com/aws/aws-sdk-go-v2/service/ses v1.25.3 h1:wcfUsE2nqsXhEj68gxr7MnGXNPcBPKx0RW2DzBVgVlM= github.com/aws/aws-sdk-go-v2/service/ses v1.25.3/go.mod h1:6Ul/Ir8oOCsI3dFN0prULK9fvpxP+WTYmlHDkFzaAVA= +github.com/aws/aws-sdk-go-v2/service/sns v1.31.8 h1:vRSk062d1SmaEVbiqFePkvYuhCTnW2JnPkUdt19nqeY= +github.com/aws/aws-sdk-go-v2/service/sns v1.31.8/go.mod h1:wjhxA9hlVu75dCL/5Wcx8Cwmszvu6t0i8WEDypcB4+s= +github.com/aws/aws-sdk-go-v2/service/sqs v1.34.6 h1:DbjODDHumQBdJ3T+EO7AXVoFUeUhAsJYOdjStH5Ws4A= +github.com/aws/aws-sdk-go-v2/service/sqs v1.34.6/go.mod h1:7idt3XszF6sE9WPS1GqZRiDJOxw4oPtlRBXodWnCGjU= github.com/aws/aws-sdk-go-v2/service/ssm v1.52.8 h1:7cjN4Wp3U3cud17TsnUxSomTwKzKQGUWdq/N1aWqgMk= github.com/aws/aws-sdk-go-v2/service/ssm v1.52.8/go.mod h1:nUSNPaG8mv5rIu7EclHnFqZOjhreEUwRKENtKTtJ9aw= github.com/aws/aws-sdk-go-v2/service/sso v1.22.7 h1:pIaGg+08llrP7Q5aiz9ICWbY8cqhTkyy+0SHvfzQpTc= diff --git a/pkg/gen/internalapi/configure_mymove.go b/pkg/gen/internalapi/configure_mymove.go index 3b277e0037c..d1fa1bc3756 100644 --- a/pkg/gen/internalapi/configure_mymove.go +++ b/pkg/gen/internalapi/configure_mymove.go @@ -4,6 +4,7 @@ package internalapi import ( "crypto/tls" + "io" "net/http" "github.com/go-openapi/errors" @@ -60,6 +61,9 @@ func configureAPI(api *internaloperations.MymoveAPI) http.Handler { api.BinProducer = runtime.ByteStreamProducer() api.JSONProducer = runtime.JSONProducer() + api.TextEventStreamProducer = runtime.ProducerFunc(func(w io.Writer, data interface{}) error { + return errors.NotImplemented("textEventStream producer has not yet been implemented") + }) // You may change here the memory limit for this multipart form parser. Below is the default (32 MB). // ppm.CreatePPMUploadMaxParseMemory = 32 << 20 @@ -205,6 +209,11 @@ func configureAPI(api *internaloperations.MymoveAPI) http.Handler { return middleware.NotImplemented("operation transportation_offices.GetTransportationOffices has not yet been implemented") }) } + if api.UploadsGetUploadStatusHandler == nil { + api.UploadsGetUploadStatusHandler = uploads.GetUploadStatusHandlerFunc(func(params uploads.GetUploadStatusParams) middleware.Responder { + return middleware.NotImplemented("operation uploads.GetUploadStatus has not yet been implemented") + }) + } if api.EntitlementsIndexEntitlementsHandler == nil { api.EntitlementsIndexEntitlementsHandler = entitlements.IndexEntitlementsHandlerFunc(func(params entitlements.IndexEntitlementsParams) middleware.Responder { return middleware.NotImplemented("operation entitlements.IndexEntitlements has not yet been implemented") diff --git a/pkg/gen/internalapi/doc.go b/pkg/gen/internalapi/doc.go index 463e7be3e81..f8040028e22 100644 --- a/pkg/gen/internalapi/doc.go +++ b/pkg/gen/internalapi/doc.go @@ -22,6 +22,7 @@ // Produces: // - application/pdf // - application/json +// - text/event-stream // // swagger:meta package internalapi diff --git a/pkg/gen/internalapi/embedded_spec.go b/pkg/gen/internalapi/embedded_spec.go index c1351734062..f30aca3b049 100644 --- a/pkg/gen/internalapi/embedded_spec.go +++ b/pkg/gen/internalapi/embedded_spec.go @@ -3272,6 +3272,58 @@ func init() { } } }, + "/uploads/{uploadId}/status": { + "get": { + "description": "Returns status of an upload based on antivirus run", + "produces": [ + "text/event-stream" + ], + "tags": [ + "uploads" + ], + "summary": "Returns status of an upload", + "operationId": "getUploadStatus", + "parameters": [ + { + "type": "string", + "format": "uuid", + "description": "UUID of the upload to return status of", + "name": "uploadId", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "the requested upload status", + "schema": { + "type": "string", + "enum": [ + "INFECTED", + "CLEAN", + "PROCESSING" + ], + "readOnly": true + } + }, + "400": { + "description": "invalid request", + "schema": { + "$ref": "#/definitions/InvalidRequestResponsePayload" + } + }, + "403": { + "description": "not authorized" + }, + "404": { + "description": "not found" + }, + "500": { + "description": "server error" + } + } + } + }, "/users/is_logged_in": { "get": { "description": "Returns boolean as to whether the user is logged in", @@ -12391,6 +12443,58 @@ func init() { } } }, + "/uploads/{uploadId}/status": { + "get": { + "description": "Returns status of an upload based on antivirus run", + "produces": [ + "text/event-stream" + ], + "tags": [ + "uploads" + ], + "summary": "Returns status of an upload", + "operationId": "getUploadStatus", + "parameters": [ + { + "type": "string", + "format": "uuid", + "description": "UUID of the upload to return status of", + "name": "uploadId", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "the requested upload status", + "schema": { + "type": "string", + "enum": [ + "INFECTED", + "CLEAN", + "PROCESSING" + ], + "readOnly": true + } + }, + "400": { + "description": "invalid request", + "schema": { + "$ref": "#/definitions/InvalidRequestResponsePayload" + } + }, + "403": { + "description": "not authorized" + }, + "404": { + "description": "not found" + }, + "500": { + "description": "server error" + } + } + } + }, "/users/is_logged_in": { "get": { "description": "Returns boolean as to whether the user is logged in", diff --git a/pkg/gen/internalapi/internaloperations/mymove_api.go b/pkg/gen/internalapi/internaloperations/mymove_api.go index b1ba4e1ac47..f061964c6f5 100644 --- a/pkg/gen/internalapi/internaloperations/mymove_api.go +++ b/pkg/gen/internalapi/internaloperations/mymove_api.go @@ -7,6 +7,7 @@ package internaloperations import ( "fmt" + "io" "net/http" "strings" @@ -66,6 +67,9 @@ func NewMymoveAPI(spec *loads.Document) *MymoveAPI { BinProducer: runtime.ByteStreamProducer(), JSONProducer: runtime.JSONProducer(), + TextEventStreamProducer: runtime.ProducerFunc(func(w io.Writer, data interface{}) error { + return errors.NotImplemented("textEventStream producer has not yet been implemented") + }), OfficeApproveMoveHandler: office.ApproveMoveHandlerFunc(func(params office.ApproveMoveParams) middleware.Responder { return middleware.NotImplemented("operation office.ApproveMove has not yet been implemented") @@ -148,6 +152,9 @@ func NewMymoveAPI(spec *loads.Document) *MymoveAPI { TransportationOfficesGetTransportationOfficesHandler: transportation_offices.GetTransportationOfficesHandlerFunc(func(params transportation_offices.GetTransportationOfficesParams) middleware.Responder { return middleware.NotImplemented("operation transportation_offices.GetTransportationOffices has not yet been implemented") }), + UploadsGetUploadStatusHandler: uploads.GetUploadStatusHandlerFunc(func(params uploads.GetUploadStatusParams) middleware.Responder { + return middleware.NotImplemented("operation uploads.GetUploadStatus has not yet been implemented") + }), EntitlementsIndexEntitlementsHandler: entitlements.IndexEntitlementsHandlerFunc(func(params entitlements.IndexEntitlementsParams) middleware.Responder { return middleware.NotImplemented("operation entitlements.IndexEntitlements has not yet been implemented") }), @@ -323,6 +330,9 @@ type MymoveAPI struct { // JSONProducer registers a producer for the following mime types: // - application/json JSONProducer runtime.Producer + // TextEventStreamProducer registers a producer for the following mime types: + // - text/event-stream + TextEventStreamProducer runtime.Producer // OfficeApproveMoveHandler sets the operation handler for the approve move operation OfficeApproveMoveHandler office.ApproveMoveHandler @@ -378,6 +388,8 @@ type MymoveAPI struct { AddressesGetLocationByZipCityStateHandler addresses.GetLocationByZipCityStateHandler // TransportationOfficesGetTransportationOfficesHandler sets the operation handler for the get transportation offices operation TransportationOfficesGetTransportationOfficesHandler transportation_offices.GetTransportationOfficesHandler + // UploadsGetUploadStatusHandler sets the operation handler for the get upload status operation + UploadsGetUploadStatusHandler uploads.GetUploadStatusHandler // EntitlementsIndexEntitlementsHandler sets the operation handler for the index entitlements operation EntitlementsIndexEntitlementsHandler entitlements.IndexEntitlementsHandler // MoveDocsIndexMoveDocumentsHandler sets the operation handler for the index move documents operation @@ -546,6 +558,9 @@ func (o *MymoveAPI) Validate() error { if o.JSONProducer == nil { unregistered = append(unregistered, "JSONProducer") } + if o.TextEventStreamProducer == nil { + unregistered = append(unregistered, "TextEventStreamProducer") + } if o.OfficeApproveMoveHandler == nil { unregistered = append(unregistered, "office.ApproveMoveHandler") @@ -628,6 +643,9 @@ func (o *MymoveAPI) Validate() error { if o.TransportationOfficesGetTransportationOfficesHandler == nil { unregistered = append(unregistered, "transportation_offices.GetTransportationOfficesHandler") } + if o.UploadsGetUploadStatusHandler == nil { + unregistered = append(unregistered, "uploads.GetUploadStatusHandler") + } if o.EntitlementsIndexEntitlementsHandler == nil { unregistered = append(unregistered, "entitlements.IndexEntitlementsHandler") } @@ -809,6 +827,8 @@ func (o *MymoveAPI) ProducersFor(mediaTypes []string) map[string]runtime.Produce result["application/pdf"] = o.BinProducer case "application/json": result["application/json"] = o.JSONProducer + case "text/event-stream": + result["text/event-stream"] = o.TextEventStreamProducer } if p, ok := o.customProducers[mt]; ok { @@ -960,6 +980,10 @@ func (o *MymoveAPI) initHandlerCache() { if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } + o.handlers["GET"]["/uploads/{uploadId}/status"] = uploads.NewGetUploadStatus(o.context, o.UploadsGetUploadStatusHandler) + if o.handlers["GET"] == nil { + o.handlers["GET"] = make(map[string]http.Handler) + } o.handlers["GET"]["/entitlements"] = entitlements.NewIndexEntitlements(o.context, o.EntitlementsIndexEntitlementsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) diff --git a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status.go b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status.go new file mode 100644 index 00000000000..dc2c021f021 --- /dev/null +++ b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status.go @@ -0,0 +1,58 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package uploads + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the generate command + +import ( + "net/http" + + "github.com/go-openapi/runtime/middleware" +) + +// GetUploadStatusHandlerFunc turns a function with the right signature into a get upload status handler +type GetUploadStatusHandlerFunc func(GetUploadStatusParams) middleware.Responder + +// Handle executing the request and returning a response +func (fn GetUploadStatusHandlerFunc) Handle(params GetUploadStatusParams) middleware.Responder { + return fn(params) +} + +// GetUploadStatusHandler interface for that can handle valid get upload status params +type GetUploadStatusHandler interface { + Handle(GetUploadStatusParams) middleware.Responder +} + +// NewGetUploadStatus creates a new http.Handler for the get upload status operation +func NewGetUploadStatus(ctx *middleware.Context, handler GetUploadStatusHandler) *GetUploadStatus { + return &GetUploadStatus{Context: ctx, Handler: handler} +} + +/* + GetUploadStatus swagger:route GET /uploads/{uploadId}/status uploads getUploadStatus + +# Returns status of an upload + +Returns status of an upload based on antivirus run +*/ +type GetUploadStatus struct { + Context *middleware.Context + Handler GetUploadStatusHandler +} + +func (o *GetUploadStatus) ServeHTTP(rw http.ResponseWriter, r *http.Request) { + route, rCtx, _ := o.Context.RouteInfo(r) + if rCtx != nil { + *r = *rCtx + } + var Params = NewGetUploadStatusParams() + if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params + o.Context.Respond(rw, r, route.Produces, route, err) + return + } + + res := o.Handler.Handle(Params) // actually handle the request + o.Context.Respond(rw, r, route.Produces, route, res) + +} diff --git a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_parameters.go b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_parameters.go new file mode 100644 index 00000000000..1770aa8ca6b --- /dev/null +++ b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_parameters.go @@ -0,0 +1,91 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package uploads + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +import ( + "net/http" + + "github.com/go-openapi/errors" + "github.com/go-openapi/runtime/middleware" + "github.com/go-openapi/strfmt" + "github.com/go-openapi/validate" +) + +// NewGetUploadStatusParams creates a new GetUploadStatusParams object +// +// There are no default values defined in the spec. +func NewGetUploadStatusParams() GetUploadStatusParams { + + return GetUploadStatusParams{} +} + +// GetUploadStatusParams contains all the bound params for the get upload status operation +// typically these are obtained from a http.Request +// +// swagger:parameters getUploadStatus +type GetUploadStatusParams struct { + + // HTTP Request Object + HTTPRequest *http.Request `json:"-"` + + /*UUID of the upload to return status of + Required: true + In: path + */ + UploadID strfmt.UUID +} + +// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface +// for simple values it will use straight method calls. +// +// To ensure default values, the struct must have been initialized with NewGetUploadStatusParams() beforehand. +func (o *GetUploadStatusParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error { + var res []error + + o.HTTPRequest = r + + rUploadID, rhkUploadID, _ := route.Params.GetOK("uploadId") + if err := o.bindUploadID(rUploadID, rhkUploadID, route.Formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +// bindUploadID binds and validates parameter UploadID from path. +func (o *GetUploadStatusParams) bindUploadID(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: true + // Parameter is provided by construction from the route + + // Format: uuid + value, err := formats.Parse("uuid", raw) + if err != nil { + return errors.InvalidType("uploadId", "path", "strfmt.UUID", raw) + } + o.UploadID = *(value.(*strfmt.UUID)) + + if err := o.validateUploadID(formats); err != nil { + return err + } + + return nil +} + +// validateUploadID carries on validations for parameter UploadID +func (o *GetUploadStatusParams) validateUploadID(formats strfmt.Registry) error { + + if err := validate.FormatOf("uploadId", "path", "uuid", o.UploadID.String(), formats); err != nil { + return err + } + return nil +} diff --git a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_responses.go b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_responses.go new file mode 100644 index 00000000000..7b6b4b15b7d --- /dev/null +++ b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_responses.go @@ -0,0 +1,177 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package uploads + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +import ( + "net/http" + + "github.com/go-openapi/runtime" + + "github.com/transcom/mymove/pkg/gen/internalmessages" +) + +// GetUploadStatusOKCode is the HTTP code returned for type GetUploadStatusOK +const GetUploadStatusOKCode int = 200 + +/* +GetUploadStatusOK the requested upload status + +swagger:response getUploadStatusOK +*/ +type GetUploadStatusOK struct { + + /* + In: Body + */ + Payload string `json:"body,omitempty"` +} + +// NewGetUploadStatusOK creates GetUploadStatusOK with default headers values +func NewGetUploadStatusOK() *GetUploadStatusOK { + + return &GetUploadStatusOK{} +} + +// WithPayload adds the payload to the get upload status o k response +func (o *GetUploadStatusOK) WithPayload(payload string) *GetUploadStatusOK { + o.Payload = payload + return o +} + +// SetPayload sets the payload to the get upload status o k response +func (o *GetUploadStatusOK) SetPayload(payload string) { + o.Payload = payload +} + +// WriteResponse to the client +func (o *GetUploadStatusOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.WriteHeader(200) + payload := o.Payload + if err := producer.Produce(rw, payload); err != nil { + panic(err) // let the recovery middleware deal with this + } +} + +// GetUploadStatusBadRequestCode is the HTTP code returned for type GetUploadStatusBadRequest +const GetUploadStatusBadRequestCode int = 400 + +/* +GetUploadStatusBadRequest invalid request + +swagger:response getUploadStatusBadRequest +*/ +type GetUploadStatusBadRequest struct { + + /* + In: Body + */ + Payload *internalmessages.InvalidRequestResponsePayload `json:"body,omitempty"` +} + +// NewGetUploadStatusBadRequest creates GetUploadStatusBadRequest with default headers values +func NewGetUploadStatusBadRequest() *GetUploadStatusBadRequest { + + return &GetUploadStatusBadRequest{} +} + +// WithPayload adds the payload to the get upload status bad request response +func (o *GetUploadStatusBadRequest) WithPayload(payload *internalmessages.InvalidRequestResponsePayload) *GetUploadStatusBadRequest { + o.Payload = payload + return o +} + +// SetPayload sets the payload to the get upload status bad request response +func (o *GetUploadStatusBadRequest) SetPayload(payload *internalmessages.InvalidRequestResponsePayload) { + o.Payload = payload +} + +// WriteResponse to the client +func (o *GetUploadStatusBadRequest) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.WriteHeader(400) + if o.Payload != nil { + payload := o.Payload + if err := producer.Produce(rw, payload); err != nil { + panic(err) // let the recovery middleware deal with this + } + } +} + +// GetUploadStatusForbiddenCode is the HTTP code returned for type GetUploadStatusForbidden +const GetUploadStatusForbiddenCode int = 403 + +/* +GetUploadStatusForbidden not authorized + +swagger:response getUploadStatusForbidden +*/ +type GetUploadStatusForbidden struct { +} + +// NewGetUploadStatusForbidden creates GetUploadStatusForbidden with default headers values +func NewGetUploadStatusForbidden() *GetUploadStatusForbidden { + + return &GetUploadStatusForbidden{} +} + +// WriteResponse to the client +func (o *GetUploadStatusForbidden) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses + + rw.WriteHeader(403) +} + +// GetUploadStatusNotFoundCode is the HTTP code returned for type GetUploadStatusNotFound +const GetUploadStatusNotFoundCode int = 404 + +/* +GetUploadStatusNotFound not found + +swagger:response getUploadStatusNotFound +*/ +type GetUploadStatusNotFound struct { +} + +// NewGetUploadStatusNotFound creates GetUploadStatusNotFound with default headers values +func NewGetUploadStatusNotFound() *GetUploadStatusNotFound { + + return &GetUploadStatusNotFound{} +} + +// WriteResponse to the client +func (o *GetUploadStatusNotFound) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses + + rw.WriteHeader(404) +} + +// GetUploadStatusInternalServerErrorCode is the HTTP code returned for type GetUploadStatusInternalServerError +const GetUploadStatusInternalServerErrorCode int = 500 + +/* +GetUploadStatusInternalServerError server error + +swagger:response getUploadStatusInternalServerError +*/ +type GetUploadStatusInternalServerError struct { +} + +// NewGetUploadStatusInternalServerError creates GetUploadStatusInternalServerError with default headers values +func NewGetUploadStatusInternalServerError() *GetUploadStatusInternalServerError { + + return &GetUploadStatusInternalServerError{} +} + +// WriteResponse to the client +func (o *GetUploadStatusInternalServerError) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses + + rw.WriteHeader(500) +} diff --git a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_urlbuilder.go b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_urlbuilder.go new file mode 100644 index 00000000000..276a011d780 --- /dev/null +++ b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_urlbuilder.go @@ -0,0 +1,101 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package uploads + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the generate command + +import ( + "errors" + "net/url" + golangswaggerpaths "path" + "strings" + + "github.com/go-openapi/strfmt" +) + +// GetUploadStatusURL generates an URL for the get upload status operation +type GetUploadStatusURL struct { + UploadID strfmt.UUID + + _basePath string + // avoid unkeyed usage + _ struct{} +} + +// WithBasePath sets the base path for this url builder, only required when it's different from the +// base path specified in the swagger spec. +// When the value of the base path is an empty string +func (o *GetUploadStatusURL) WithBasePath(bp string) *GetUploadStatusURL { + o.SetBasePath(bp) + return o +} + +// SetBasePath sets the base path for this url builder, only required when it's different from the +// base path specified in the swagger spec. +// When the value of the base path is an empty string +func (o *GetUploadStatusURL) SetBasePath(bp string) { + o._basePath = bp +} + +// Build a url path and query string +func (o *GetUploadStatusURL) Build() (*url.URL, error) { + var _result url.URL + + var _path = "/uploads/{uploadId}/status" + + uploadID := o.UploadID.String() + if uploadID != "" { + _path = strings.Replace(_path, "{uploadId}", uploadID, -1) + } else { + return nil, errors.New("uploadId is required on GetUploadStatusURL") + } + + _basePath := o._basePath + if _basePath == "" { + _basePath = "/internal" + } + _result.Path = golangswaggerpaths.Join(_basePath, _path) + + return &_result, nil +} + +// Must is a helper function to panic when the url builder returns an error +func (o *GetUploadStatusURL) Must(u *url.URL, err error) *url.URL { + if err != nil { + panic(err) + } + if u == nil { + panic("url can't be nil") + } + return u +} + +// String returns the string representation of the path with query string +func (o *GetUploadStatusURL) String() string { + return o.Must(o.Build()).String() +} + +// BuildFull builds a full url with scheme, host, path and query string +func (o *GetUploadStatusURL) BuildFull(scheme, host string) (*url.URL, error) { + if scheme == "" { + return nil, errors.New("scheme is required for a full url on GetUploadStatusURL") + } + if host == "" { + return nil, errors.New("host is required for a full url on GetUploadStatusURL") + } + + base, err := o.Build() + if err != nil { + return nil, err + } + + base.Scheme = scheme + base.Host = host + return base, nil +} + +// StringFull returns the string representation of a complete url +func (o *GetUploadStatusURL) StringFull(scheme, host string) string { + return o.Must(o.BuildFull(scheme, host)).String() +} diff --git a/pkg/handlers/authentication/auth.go b/pkg/handlers/authentication/auth.go index a01f499de5e..8e59132c750 100644 --- a/pkg/handlers/authentication/auth.go +++ b/pkg/handlers/authentication/auth.go @@ -221,6 +221,7 @@ var allowedRoutes = map[string]bool{ "uploads.deleteUpload": true, "users.showLoggedInUser": true, "okta_profile.showOktaInfo": true, + "uploads.getUploadStatus": true, } // checkIfRouteIsAllowed checks to see if the route is one of the ones that should be allowed through without stricter diff --git a/pkg/handlers/config.go b/pkg/handlers/config.go index b4bb2026915..50d45ee1978 100644 --- a/pkg/handlers/config.go +++ b/pkg/handlers/config.go @@ -39,6 +39,7 @@ type HandlerConfig interface { ) http.Handler FileStorer() storage.FileStorer NotificationSender() notifications.NotificationSender + NotificationReceiver() notifications.NotificationReceiver HHGPlanner() route.Planner DTODPlanner() route.Planner CookieSecret() string @@ -66,6 +67,7 @@ type Config struct { dtodPlanner route.Planner storage storage.FileStorer notificationSender notifications.NotificationSender + notificationReceiver notifications.NotificationReceiver iwsPersonLookup iws.PersonLookup sendProductionInvoice bool senderToGex services.GexSender @@ -86,6 +88,7 @@ func NewHandlerConfig( dtodPlanner route.Planner, storage storage.FileStorer, notificationSender notifications.NotificationSender, + notificationReceiver notifications.NotificationReceiver, iwsPersonLookup iws.PersonLookup, sendProductionInvoice bool, senderToGex services.GexSender, @@ -103,6 +106,7 @@ func NewHandlerConfig( dtodPlanner: dtodPlanner, storage: storage, notificationSender: notificationSender, + notificationReceiver: notificationReceiver, iwsPersonLookup: iwsPersonLookup, sendProductionInvoice: sendProductionInvoice, senderToGex: senderToGex, @@ -247,6 +251,16 @@ func (c *Config) SetNotificationSender(sender notifications.NotificationSender) c.notificationSender = sender } +// NotificationReceiver returns the sender to use in the current context +func (c *Config) NotificationReceiver() notifications.NotificationReceiver { + return c.notificationReceiver +} + +// SetNotificationSender is a simple setter for AWS SQS private field +func (c *Config) SetNotificationReceiver(receiver notifications.NotificationReceiver) { + c.notificationReceiver = receiver +} + // SetPlanner is a simple setter for the route.Planner private field func (c *Config) SetPlanner(planner route.Planner) { c.planner = planner diff --git a/pkg/handlers/config_test.go b/pkg/handlers/config_test.go index 26595daea29..85c9ccbff7c 100644 --- a/pkg/handlers/config_test.go +++ b/pkg/handlers/config_test.go @@ -30,7 +30,7 @@ func (suite *ConfigSuite) TestConfigHandler() { appCtx := suite.AppContextForTest() sessionManagers := auth.SetupSessionManagers(nil, false, time.Duration(180*time.Second), time.Duration(180*time.Second)) - handler := NewHandlerConfig(appCtx.DB(), nil, "", nil, nil, nil, nil, nil, false, nil, nil, false, ApplicationTestServername(), sessionManagers, nil) + handler := NewHandlerConfig(appCtx.DB(), nil, "", nil, nil, nil, nil, nil, nil, false, nil, nil, false, ApplicationTestServername(), sessionManagers, nil) req, err := http.NewRequest("GET", "/", nil) suite.NoError(err) myMethodCalled := false diff --git a/pkg/handlers/internalapi/api.go b/pkg/handlers/internalapi/api.go index 8aff3ee28e4..2d3c3c38f35 100644 --- a/pkg/handlers/internalapi/api.go +++ b/pkg/handlers/internalapi/api.go @@ -173,6 +173,7 @@ func NewInternalAPI(handlerConfig handlers.HandlerConfig) *internalops.MymoveAPI internalAPI.UploadsCreateUploadHandler = CreateUploadHandler{handlerConfig} internalAPI.UploadsDeleteUploadHandler = DeleteUploadHandler{handlerConfig, upload.NewUploadInformationFetcher()} internalAPI.UploadsDeleteUploadsHandler = DeleteUploadsHandler{handlerConfig} + internalAPI.UploadsGetUploadStatusHandler = GetUploadStatusHandler{handlerConfig, upload.NewUploadInformationFetcher()} internalAPI.QueuesShowQueueHandler = ShowQueueHandler{handlerConfig} internalAPI.OfficeApproveMoveHandler = ApproveMoveHandler{handlerConfig, moveRouter} @@ -186,6 +187,7 @@ func NewInternalAPI(handlerConfig handlers.HandlerConfig) *internalops.MymoveAPI internalAPI.PpmShowAOAPacketHandler = showAOAPacketHandler{handlerConfig, SSWPPMComputer, SSWPPMGenerator, AOAPacketCreator} internalAPI.RegisterProducer(uploader.FileTypePDF, PDFProducer()) + internalAPI.TextEventStreamProducer = runtime.ByteStreamProducer() internalAPI.PostalCodesValidatePostalCodeWithRateDataHandler = ValidatePostalCodeWithRateDataHandler{ handlerConfig, diff --git a/pkg/handlers/internalapi/internal/payloads/model_to_payload.go b/pkg/handlers/internalapi/internal/payloads/model_to_payload.go index 68e9cd5b576..f24d3ea21fd 100644 --- a/pkg/handlers/internalapi/internal/payloads/model_to_payload.go +++ b/pkg/handlers/internalapi/internal/payloads/model_to_payload.go @@ -453,12 +453,19 @@ func PayloadForUploadModel( CreatedAt: strfmt.DateTime(upload.CreatedAt), UpdatedAt: strfmt.DateTime(upload.UpdatedAt), } - tags, err := storer.Tags(upload.StorageKey) - if err != nil || len(tags) == 0 { - uploadPayload.Status = "PROCESSING" + + if upload.AVStatus == nil { + tags, err := storer.Tags(upload.StorageKey) + if err != nil || len(tags) == 0 { + uploadPayload.Status = "PROCESSING" + } else { + uploadPayload.Status = tags["av-status"] + // TODO: update db with the tags + } } else { - uploadPayload.Status = tags["av-status"] + uploadPayload.Status = string(*upload.AVStatus) } + return uploadPayload } diff --git a/pkg/handlers/internalapi/uploads.go b/pkg/handlers/internalapi/uploads.go index 4167d7ed2b8..d541a550073 100644 --- a/pkg/handlers/internalapi/uploads.go +++ b/pkg/handlers/internalapi/uploads.go @@ -3,8 +3,10 @@ package internalapi import ( "fmt" "io" + "net/http" "path/filepath" "regexp" + "strconv" "strings" "github.com/go-openapi/runtime" @@ -19,9 +21,11 @@ import ( "github.com/transcom/mymove/pkg/handlers" "github.com/transcom/mymove/pkg/handlers/internalapi/internal/payloads" "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/notifications" "github.com/transcom/mymove/pkg/services" "github.com/transcom/mymove/pkg/services/ppmshipment" weightticketparser "github.com/transcom/mymove/pkg/services/weight_ticket_parser" + "github.com/transcom/mymove/pkg/storage" "github.com/transcom/mymove/pkg/uploader" uploaderpkg "github.com/transcom/mymove/pkg/uploader" ) @@ -246,6 +250,126 @@ func (h DeleteUploadsHandler) Handle(params uploadop.DeleteUploadsParams) middle }) } +// UploadStatusHandler returns status of an upload +type GetUploadStatusHandler struct { + handlers.HandlerConfig + services.UploadInformationFetcher +} + +type CustomNewUploadStatusOK struct { + params uploadop.GetUploadStatusParams + appCtx appcontext.AppContext + receiver notifications.NotificationReceiver + storer storage.FileStorer +} + +func (o *CustomNewUploadStatusOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + // TODO: add check for permissions to view upload + + uploadId := o.params.UploadID.String() + + uploadUUID, err := uuid.FromString(uploadId) + if err != nil { + panic(err) + } + + // Check current tag before event-driven wait for anti-virus + + uploaded, err := models.FetchUserUploadFromUploadID(o.appCtx.DB(), o.appCtx.Session(), uploadUUID) + if err != nil { + o.appCtx.Logger().Error(err.Error()) + } + + tags, err := o.storer.Tags(uploaded.Upload.StorageKey) + var uploadStatus models.AVStatusType + if err != nil || len(tags) == 0 { + uploadStatus = models.AVStatusTypePROCESSING + } else { + uploadStatus = models.AVStatusType(tags["av-status"]) + } + + resProcess := []byte("id: 0\nevent: message\ndata: " + string(uploadStatus) + "\n\n") + if produceErr := producer.Produce(rw, resProcess); produceErr != nil { + panic(produceErr) + } + + if f, ok := rw.(http.Flusher); ok { + f.Flush() + } + + if uploadStatus == models.AVStatusTypeCLEAN || uploadStatus == models.AVStatusTypeINFECTED { + return + } + + // Start waiting for tag updates + + topicName := "app_s3_tag_events" + notificationParams := notifications.NotificationQueueParams{ + Action: "ObjectTagsAdded", + ObjectId: uploadId, + } + + queueUrl, err := o.receiver.CreateQueueWithSubscription(o.appCtx, topicName, notificationParams) + if err != nil { + o.appCtx.Logger().Error(err.Error()) + } + + id_counter := 0 + // Run for 120 seconds, 20 second long polling 6 times + for range 6 { + o.appCtx.Logger().Info("Receiving...") + messages, errs := o.receiver.ReceiveMessages(o.appCtx, queueUrl) + if errs != nil { + o.appCtx.Logger().Error(errs.Error()) + } + + if len(messages) != 0 { + errTransaction := o.appCtx.NewTransaction(func(txnAppCtx appcontext.AppContext) error { + + tags, err := o.storer.Tags(uploaded.Upload.StorageKey) + + if err != nil || len(tags) == 0 { + uploadStatus = models.AVStatusTypePROCESSING + } else { + uploadStatus = models.AVStatusType(tags["av-status"]) + } + + resProcess := []byte("id: " + strconv.Itoa(id_counter) + "\nevent: message\ndata: " + string(uploadStatus) + "\n\n") + if produceErr := producer.Produce(rw, resProcess); produceErr != nil { + panic(produceErr) // let the recovery middleware deal with this + } + + return nil + }) + + if errTransaction != nil { + o.appCtx.Logger().Error(err.Error()) + } + } + + if f, ok := rw.(http.Flusher); ok { + f.Flush() + } + id_counter++ + } + + // TODO: add a close here after ends +} + +// Handle returns status of an upload +func (h GetUploadStatusHandler) Handle(params uploadop.GetUploadStatusParams) middleware.Responder { + return h.AuditableAppContextFromRequestWithErrors(params.HTTPRequest, + func(appCtx appcontext.AppContext) (middleware.Responder, error) { + return &CustomNewUploadStatusOK{ + params: params, + appCtx: h.AppContextFromRequest(params.HTTPRequest), + receiver: h.NotificationReceiver(), + storer: h.FileStorer(), + }, nil + }) +} + func (h CreatePPMUploadHandler) Handle(params ppmop.CreatePPMUploadParams) middleware.Responder { return h.AuditableAppContextFromRequestWithErrors(params.HTTPRequest, func(appCtx appcontext.AppContext) (middleware.Responder, error) { diff --git a/pkg/handlers/internalapi/uploads_test.go b/pkg/handlers/internalapi/uploads_test.go index 36119617912..ebc6eb0373c 100644 --- a/pkg/handlers/internalapi/uploads_test.go +++ b/pkg/handlers/internalapi/uploads_test.go @@ -447,6 +447,50 @@ func (suite *HandlerSuite) TestDeleteUploadHandlerSuccessEvenWithS3Failure() { suite.NotNil(queriedUpload.DeletedAt) } +// TODO: functioning test +func (suite *HandlerSuite) TestGetUploadStatusHandlerSuccess() { + fakeS3 := storageTest.NewFakeS3Storage(true) + + move := factory.BuildMove(suite.DB(), nil, nil) + uploadUser1 := factory.BuildUserUpload(suite.DB(), []factory.Customization{ + { + Model: move.Orders.UploadedOrders, + LinkOnly: true, + }, + { + Model: models.Upload{ + Filename: "FileName", + Bytes: int64(15), + ContentType: uploader.FileTypePDF, + }, + }, + }, nil) + + file := suite.Fixture(FixturePDF) + fakeS3.Store(uploadUser1.Upload.StorageKey, file.Data, "somehash", nil) + + params := uploadop.NewGetUploadStatusParams() + params.UploadID = strfmt.UUID(uploadUser1.ID.String()) + + req := &http.Request{} + req = suite.AuthenticateRequest(req, uploadUser1.Document.ServiceMember) + params.HTTPRequest = req + + handlerConfig := suite.HandlerConfig() + handlerConfig.SetFileStorer(fakeS3) + uploadInformationFetcher := upload.NewUploadInformationFetcher() + handler := GetUploadStatusHandler{handlerConfig, uploadInformationFetcher} + + response := handler.Handle(params) + + _, ok := response.(*CustomNewUploadStatusOK) + suite.True(ok) + + queriedUpload := models.Upload{} + err := suite.DB().Find(&queriedUpload, uploadUser1.Upload.ID) + suite.Nil(err) +} + func (suite *HandlerSuite) TestCreatePPMUploadsHandlerSuccess() { suite.Run("uploads .xls file", func() { fakeS3 := storageTest.NewFakeS3Storage(true) diff --git a/pkg/models/upload.go b/pkg/models/upload.go index d6afc2d0d4a..0703dff29ca 100644 --- a/pkg/models/upload.go +++ b/pkg/models/upload.go @@ -25,19 +25,32 @@ const ( UploadTypeOFFICE UploadType = "OFFICE" ) +// AVStatusType represents the type of the anti-virus status, whether it is still processing, clean or infected +type AVStatusType string + +const ( + // AVStatusTypePROCESSING string PROCESSING + AVStatusTypePROCESSING AVStatusType = "PROCESSING" + // AVStatusTypeCLEAN string CLEAN + AVStatusTypeCLEAN AVStatusType = "CLEAN" + // AVStatusTypeINFECTED string INFECTED + AVStatusTypeINFECTED AVStatusType = "INFECTED" +) + // An Upload represents an uploaded file, such as an image or PDF. type Upload struct { - ID uuid.UUID `db:"id"` - Filename string `db:"filename"` - Bytes int64 `db:"bytes"` - Rotation *int64 `db:"rotation"` - ContentType string `db:"content_type"` - Checksum string `db:"checksum"` - StorageKey string `db:"storage_key"` - UploadType UploadType `db:"upload_type"` - CreatedAt time.Time `db:"created_at"` - UpdatedAt time.Time `db:"updated_at"` - DeletedAt *time.Time `db:"deleted_at"` + ID uuid.UUID `db:"id"` + Filename string `db:"filename"` + Bytes int64 `db:"bytes"` + Rotation *int64 `db:"rotation"` + ContentType string `db:"content_type"` + Checksum string `db:"checksum"` + StorageKey string `db:"storage_key"` + AVStatus *AVStatusType `db:"av_status"` + UploadType UploadType `db:"upload_type"` + CreatedAt time.Time `db:"created_at"` + UpdatedAt time.Time `db:"updated_at"` + DeletedAt *time.Time `db:"deleted_at"` } // TableName overrides the table name used by Pop. diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go new file mode 100644 index 00000000000..7ec0ec655ac --- /dev/null +++ b/pkg/notifications/notification_receiver.go @@ -0,0 +1,192 @@ +package notifications + +import ( + "context" + "fmt" + "log" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/config" + "github.com/aws/aws-sdk-go-v2/service/sns" + "github.com/aws/aws-sdk-go-v2/service/sqs" + "github.com/aws/aws-sdk-go-v2/service/sqs/types" + "github.com/spf13/viper" + "go.uber.org/zap" + + "github.com/transcom/mymove/pkg/appcontext" + "github.com/transcom/mymove/pkg/cli" +) + +// Notification is an interface for creating emails +type NotificationQueueParams struct { + // TODO: change to enum + Action string + ObjectId string +} + +// NotificationSender is an interface for sending notifications +// +//go:generate mockery --name NotificationSender +type NotificationReceiver interface { + CreateQueueWithSubscription(appCtx appcontext.AppContext, topicArn string, params NotificationQueueParams) (string, error) + ReceiveMessages(appCtx appcontext.AppContext, queueUrl string) ([]types.Message, error) +} + +// NotificationSendingContext provides context to a notification sender +type NotificationReceiverContext struct { + snsService *sns.Client + sqsService *sqs.Client + awsRegion string + awsAccountId string +} + +// NewNotificationSender returns a new NotificationSendingContext +func NewNotificationReceiver(snsService *sns.Client, sqsService *sqs.Client, awsRegion string, awsAccountId string) NotificationReceiverContext { + return NotificationReceiverContext{ + snsService: snsService, + sqsService: sqsService, + awsRegion: awsRegion, + awsAccountId: awsAccountId, + } +} + +func (n NotificationReceiverContext) CreateQueueWithSubscription(appCtx appcontext.AppContext, topicName string, params NotificationQueueParams) (string, error) { + + queueName := fmt.Sprintf("%s_%s", params.Action, params.ObjectId) + queueArn := n.constructArn("sqs", queueName) + topicArn := n.constructArn("sns", topicName) + + // Create queue + + accessPolicy := fmt.Sprintf(`{ + "Version": "2012-10-17", + "Statement": [{ + "Sid": "AllowSNSPublish", + "Effect": "Allow", + "Principal": { + "Service": "sns.amazonaws.com" + }, + "Action": ["sqs:SendMessage"], + "Resource": "%s", + "Condition": { + "ArnEquals": { + "aws:SourceArn": "%s" + } + } + }] + }`, queueArn, topicArn) + + input := &sqs.CreateQueueInput{ + QueueName: &queueName, + Attributes: map[string]string{ + "MessageRetentionPeriod": "120", + "Policy": accessPolicy, + }, + } + + result, err := n.sqsService.CreateQueue(context.Background(), input) + if err != nil { + log.Fatalf("Failed to create SQS queue, %v", err) + } + + // Create subscription + + filterPolicy := fmt.Sprintf(`{ + "detail": { + "object": { + "key": [ + {"suffix": "%s"} + ] + } + } + }`, params.ObjectId) + + subscribeInput := &sns.SubscribeInput{ + TopicArn: &topicArn, + Protocol: aws.String("sqs"), + Endpoint: &queueArn, + Attributes: map[string]string{ + "FilterPolicy": filterPolicy, + "FilterPolicyScope": "MessageBody", + }, + } + _, err = n.snsService.Subscribe(context.Background(), subscribeInput) + if err != nil { + log.Fatalf("Failed to create subscription, %v", err) + } + + return *result.QueueUrl, err +} + +// SendNotification sends a one or more notifications for all supported mediums +func (n NotificationReceiverContext) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string) ([]types.Message, error) { + result, err := n.sqsService.ReceiveMessage(context.Background(), &sqs.ReceiveMessageInput{ + QueueUrl: &queueUrl, + MaxNumberOfMessages: 1, + WaitTimeSeconds: 20, + }) + if err != nil { + appCtx.Logger().Fatal("Couldn't get messages from queue. Here's why: %v\n", zap.Error(err)) + } + return result.Messages, err +} + +// InitEmail initializes the email backend +func InitReceiver(v *viper.Viper, logger *zap.Logger) (NotificationReceiver, error) { + // if v.GetString(cli.EmailBackendFlag) == "ses" { + // // Setup Amazon SES (email) service TODO: This might be able + // // to be combined with the AWS Session that we're using for S3 + // // down below. + + // awsSESRegion := v.GetString(cli.AWSSESRegionFlag) + // awsSESDomain := v.GetString(cli.AWSSESDomainFlag) + // sysAdminEmail := v.GetString(cli.SysAdminEmail) + // logger.Info("Using ses email backend", + // zap.String("region", awsSESRegion), + // zap.String("domain", awsSESDomain)) + // cfg, err := config.LoadDefaultConfig(context.Background(), + // config.WithRegion(awsSESRegion), + // ) + // if err != nil { + // logger.Fatal("error loading ses aws config", zap.Error(err)) + // } + + // sesService := ses.NewFromConfig(cfg) + // input := &ses.GetAccountSendingEnabledInput{} + // result, err := sesService.GetAccountSendingEnabled(context.Background(), input) + // if err != nil || result == nil || !result.Enabled { + // logger.Error("email sending not enabled", zap.Error(err)) + // return NewNotificationSender(nil, awsSESDomain, sysAdminEmail), err + // } + // return NewNotificationSender(sesService, awsSESDomain, sysAdminEmail), nil + // } + + // domain := "milmovelocal" + // logger.Info("Using local email backend", zap.String("domain", domain)) + // return NewStubNotificationSender(domain), nil + + // Setup Amazon SES (email) service TODO: This might be able + // to be combined with the AWS Session that we're using for S3 + // down below. + + // TODO: verify if we should change this param name to awsNotificationRegion + awsSESRegion := v.GetString(cli.AWSSESRegionFlag) + awsAccountId := v.GetString("aws-account-id") + + cfg, err := config.LoadDefaultConfig(context.Background(), + config.WithRegion(awsSESRegion), + ) + if err != nil { + logger.Fatal("error loading ses aws config", zap.Error(err)) + return nil, err + } + + snsService := sns.NewFromConfig(cfg) + sqsService := sqs.NewFromConfig(cfg) + + return NewNotificationReceiver(snsService, sqsService, awsSESRegion, awsAccountId), nil +} + +func (n NotificationReceiverContext) constructArn(awsService string, endpointName string) string { + return fmt.Sprintf("arn:aws-us-gov:%s:%s:%s:%s", awsService, n.awsRegion, n.awsAccountId, endpointName) +} diff --git a/swagger-def/internal.yaml b/swagger-def/internal.yaml index a8c8dfb732c..305d4b845b9 100644 --- a/swagger-def/internal.yaml +++ b/swagger-def/internal.yaml @@ -3426,6 +3426,43 @@ paths: description: not found '500': description: server error + + /uploads/{uploadId}/status: + get: + summary: Returns status of an upload + description: Returns status of an upload based on antivirus run + operationId: getUploadStatus + produces: + - text/event-stream + tags: + - uploads + parameters: + - in: path + name: uploadId + type: string + format: uuid + required: true + description: UUID of the upload to return status of + responses: + '200': + description: the requested upload status + schema: + type: string + enum: + - INFECTED + - CLEAN + - PROCESSING + readOnly: true + '400': + description: invalid request + schema: + $ref: '#/definitions/InvalidRequestResponsePayload' + '403': + description: not authorized + '404': + description: not found + '500': + description: server error /service_members: post: summary: Creates service member for a logged-in user diff --git a/swagger/internal.yaml b/swagger/internal.yaml index 84097cd100a..21483825daa 100644 --- a/swagger/internal.yaml +++ b/swagger/internal.yaml @@ -5335,6 +5335,42 @@ paths: description: not found '500': description: server error + /uploads/{uploadId}/status: + get: + summary: Returns status of an upload + description: Returns status of an upload based on antivirus run + operationId: getUploadStatus + produces: + - text/event-stream + tags: + - uploads + parameters: + - in: path + name: uploadId + type: string + format: uuid + required: true + description: UUID of the upload to return status of + responses: + '200': + description: the requested upload status + schema: + type: string + enum: + - INFECTED + - CLEAN + - PROCESSING + readOnly: true + '400': + description: invalid request + schema: + $ref: '#/definitions/InvalidRequestResponsePayload' + '403': + description: not authorized + '404': + description: not found + '500': + description: server error /service_members: post: summary: Creates service member for a logged-in user From 1cb113a06e78e943eec7715a1ee56823c7dda94b Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Fri, 3 Jan 2025 14:46:06 +0000 Subject: [PATCH 028/260] Empty table headers --- src/components/BulkAssignment/BulkAssignmentModal.jsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index ca58c6814a2..709f6fd3658 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -10,6 +10,16 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, content, submitT

{title}

 +
+ + + + + + + +
Select/Deselect All UserEqual AssignmentRe-assignment
+

{content}

- )} + {/* {isSupervisor && isBulkAssignmentFFEnabled && ( */} + + {/* )} */} {showCSVExport && ( Date: Thu, 9 Jan 2025 18:06:36 +0000 Subject: [PATCH 035/260] B-22056 - additional test and .envrc cleanup. --- .envrc | 4 +- pkg/handlers/internalapi/uploads_test.go | 47 +++++++++++++++++++++++- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/.envrc b/.envrc index 64ef9f3c646..7eb37fa168f 100644 --- a/.envrc +++ b/.envrc @@ -229,7 +229,7 @@ export TZ="UTC" # AWS development access # -# To use S3/SES for local builds, you'll need to uncomment the following. +# To use S3/SES or SNS&SQS for local builds, you'll need to uncomment the following. # Do not commit the change: # # export STORAGE_BACKEND=s3 @@ -238,7 +238,7 @@ export TZ="UTC" # # Instructions for using S3 storage backend here: https://dp3.atlassian.net/wiki/spaces/MT/pages/1470955567/How+to+test+storing+data+in+S3+locally # Instructions for using SES email backend here: https://dp3.atlassian.net/wiki/spaces/MT/pages/1467973894/How+to+test+sending+email+locally -# Instructions for using SNS&SQS backend here: ... +# Instructions for using SNS&SQS backend here: https://dp3.atlassian.net/wiki/spaces/MT/pages/2793242625/How+to+test+notifications+receiver+locally # # The default and equivalent to not being set is: # diff --git a/pkg/handlers/internalapi/uploads_test.go b/pkg/handlers/internalapi/uploads_test.go index 143dfa465eb..271495e2991 100644 --- a/pkg/handlers/internalapi/uploads_test.go +++ b/pkg/handlers/internalapi/uploads_test.go @@ -525,7 +525,52 @@ func (suite *HandlerSuite) TestGetUploadStatusHandlerFailure() { suite.Error(err) }) - // TODO: ADD A FORBIDDEN TEST + suite.Run("Error when attempting access to another service member's upload", func() { + fakeS3 := storageTest.NewFakeS3Storage(true) + localReceiver := notifications.StubNotificationReceiver{} + + otherServiceMember := factory.BuildServiceMember(suite.DB(), nil, nil) + + orders := factory.BuildOrder(suite.DB(), nil, nil) + uploadUser1 := factory.BuildUserUpload(suite.DB(), []factory.Customization{ + { + Model: orders.UploadedOrders, + LinkOnly: true, + }, + { + Model: models.Upload{ + Filename: "FileName", + Bytes: int64(15), + ContentType: uploader.FileTypePDF, + }, + }, + }, nil) + + file := suite.Fixture(FixturePDF) + _, err := fakeS3.Store(uploadUser1.Upload.StorageKey, file.Data, "somehash", nil) + suite.NoError(err) + + params := uploadop.NewGetUploadStatusParams() + params.UploadID = strfmt.UUID(uploadUser1.Upload.ID.String()) + + req := &http.Request{} + req = suite.AuthenticateRequest(req, otherServiceMember) + params.HTTPRequest = req + + handlerConfig := suite.HandlerConfig() + handlerConfig.SetFileStorer(fakeS3) + handlerConfig.SetNotificationReceiver(localReceiver) + uploadInformationFetcher := upload.NewUploadInformationFetcher() + handler := GetUploadStatusHandler{handlerConfig, uploadInformationFetcher} + + response := handler.Handle(params) + _, ok := response.(*uploadop.GetUploadStatusForbidden) + suite.True(ok) + + queriedUpload := models.Upload{} + err = suite.DB().Find(&queriedUpload, uploadUser1.Upload.ID) + suite.NoError(err) + }) } func (suite *HandlerSuite) TestCreatePPMUploadsHandlerSuccess() { From 9860dee06931dcbc8a722db07aaf92e39bf5c948 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Thu, 9 Jan 2025 18:15:06 +0000 Subject: [PATCH 036/260] Adding Market to international shuttle for TOO/TIO --- pkg/gen/supportapi/embedded_spec.go | 112 +++- pkg/gen/supportmessages/m_t_o_service_item.go | 6 + ..._t_o_service_item_international_shuttle.go | 577 ++++++++++++++++++ .../m_t_o_service_item_model_type.go | 1 + .../internal/payloads/model_to_payload.go | 2 +- pkg/handlers/ghcapi/mto_service_items.go | 2 + .../internal/payloads/model_to_payload.go | 22 + .../ServiceItemDetails/ServiceItemDetails.jsx | 30 + .../ServiceItemDetails.test.jsx | 27 + swagger-def/support.yaml | 42 ++ swagger/support.yaml | 46 ++ 11 files changed, 864 insertions(+), 3 deletions(-) create mode 100644 pkg/gen/supportmessages/m_t_o_service_item_international_shuttle.go diff --git a/pkg/gen/supportapi/embedded_spec.go b/pkg/gen/supportapi/embedded_spec.go index a209297a071..87feb6109dd 100644 --- a/pkg/gen/supportapi/embedded_spec.go +++ b/pkg/gen/supportapi/embedded_spec.go @@ -1531,8 +1531,62 @@ func init() { } ] }, + "MTOServiceItemInternationalShuttle": { + "description": "Describes an interntional shuttle service item.", + "allOf": [ + { + "$ref": "#/definitions/MTOServiceItem" + }, + { + "type": "object", + "required": [ + "reason", + "reServiceCode", + "description" + ], + "properties": { + "actualWeight": { + "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT \u0026 DOSHUT) service items.", + "type": "integer", + "x-nullable": true, + "x-omitempty": false, + "example": 4000 + }, + "estimatedWeight": { + "description": "An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT \u0026 DOSHUT) service item.", + "type": "integer", + "x-nullable": true, + "x-omitempty": false, + "example": 4200 + }, + "market": { + "description": "To identify whether the service was provided within (CONUS) or (OCONUS)", + "type": "string", + "enum": [ + "CONUS", + "OCONUS" + ], + "example": "CONUS" + }, + "reServiceCode": { + "description": "Service codes allowed for this model type.", + "type": "string", + "enum": [ + "IOSHUT", + "IDSHUT" + ] + }, + "reason": { + "description": "Explanation of why a shuttle service is required.", + "type": "string", + "example": "Storage items need to be picked up." + } + } + } + ] + }, "MTOServiceItemModelType": { - "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", + "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "MTOServiceItemBasic", @@ -4399,8 +4453,62 @@ func init() { } ] }, + "MTOServiceItemInternationalShuttle": { + "description": "Describes an interntional shuttle service item.", + "allOf": [ + { + "$ref": "#/definitions/MTOServiceItem" + }, + { + "type": "object", + "required": [ + "reason", + "reServiceCode", + "description" + ], + "properties": { + "actualWeight": { + "description": "Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT \u0026 DOSHUT) service items.", + "type": "integer", + "x-nullable": true, + "x-omitempty": false, + "example": 4000 + }, + "estimatedWeight": { + "description": "An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT \u0026 DOSHUT) service item.", + "type": "integer", + "x-nullable": true, + "x-omitempty": false, + "example": 4200 + }, + "market": { + "description": "To identify whether the service was provided within (CONUS) or (OCONUS)", + "type": "string", + "enum": [ + "CONUS", + "OCONUS" + ], + "example": "CONUS" + }, + "reServiceCode": { + "description": "Service codes allowed for this model type.", + "type": "string", + "enum": [ + "IOSHUT", + "IDSHUT" + ] + }, + "reason": { + "description": "Explanation of why a shuttle service is required.", + "type": "string", + "example": "Storage items need to be picked up." + } + } + } + ] + }, "MTOServiceItemModelType": { - "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", + "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "MTOServiceItemBasic", diff --git a/pkg/gen/supportmessages/m_t_o_service_item.go b/pkg/gen/supportmessages/m_t_o_service_item.go index 23f35835eb2..482eca76fee 100644 --- a/pkg/gen/supportmessages/m_t_o_service_item.go +++ b/pkg/gen/supportmessages/m_t_o_service_item.go @@ -239,6 +239,12 @@ func unmarshalMTOServiceItem(data []byte, consumer runtime.Consumer) (MTOService return nil, err } return &result, nil + case "MTOServiceItemInternationalShuttle": + var result MTOServiceItemInternationalShuttle + if err := consumer.Consume(buf2, &result); err != nil { + return nil, err + } + return &result, nil case "MTOServiceItemOriginSIT": var result MTOServiceItemOriginSIT if err := consumer.Consume(buf2, &result); err != nil { diff --git a/pkg/gen/supportmessages/m_t_o_service_item_international_shuttle.go b/pkg/gen/supportmessages/m_t_o_service_item_international_shuttle.go new file mode 100644 index 00000000000..b2d55296186 --- /dev/null +++ b/pkg/gen/supportmessages/m_t_o_service_item_international_shuttle.go @@ -0,0 +1,577 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package supportmessages + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +import ( + "bytes" + "context" + "encoding/json" + + "github.com/go-openapi/errors" + "github.com/go-openapi/strfmt" + "github.com/go-openapi/swag" + "github.com/go-openapi/validate" +) + +// MTOServiceItemInternationalShuttle Describes an interntional shuttle service item. +// +// swagger:model MTOServiceItemInternationalShuttle +type MTOServiceItemInternationalShuttle struct { + eTagField string + + idField strfmt.UUID + + moveTaskOrderIdField *strfmt.UUID + + mtoShipmentIdField strfmt.UUID + + reServiceNameField string + + rejectionReasonField *string + + statusField MTOServiceItemStatus + + // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Example: 4000 + ActualWeight *int64 `json:"actualWeight"` + + // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // Example: 4200 + EstimatedWeight *int64 `json:"estimatedWeight"` + + // To identify whether the service was provided within (CONUS) or (OCONUS) + // Example: CONUS + // Enum: [CONUS OCONUS] + Market string `json:"market,omitempty"` + + // Service codes allowed for this model type. + // Required: true + // Enum: [IOSHUT IDSHUT] + ReServiceCode *string `json:"reServiceCode"` + + // Explanation of why a shuttle service is required. + // Example: Storage items need to be picked up. + // Required: true + Reason *string `json:"reason"` +} + +// ETag gets the e tag of this subtype +func (m *MTOServiceItemInternationalShuttle) ETag() string { + return m.eTagField +} + +// SetETag sets the e tag of this subtype +func (m *MTOServiceItemInternationalShuttle) SetETag(val string) { + m.eTagField = val +} + +// ID gets the id of this subtype +func (m *MTOServiceItemInternationalShuttle) ID() strfmt.UUID { + return m.idField +} + +// SetID sets the id of this subtype +func (m *MTOServiceItemInternationalShuttle) SetID(val strfmt.UUID) { + m.idField = val +} + +// ModelType gets the model type of this subtype +func (m *MTOServiceItemInternationalShuttle) ModelType() MTOServiceItemModelType { + return "MTOServiceItemInternationalShuttle" +} + +// SetModelType sets the model type of this subtype +func (m *MTOServiceItemInternationalShuttle) SetModelType(val MTOServiceItemModelType) { +} + +// MoveTaskOrderID gets the move task order ID of this subtype +func (m *MTOServiceItemInternationalShuttle) MoveTaskOrderID() *strfmt.UUID { + return m.moveTaskOrderIdField +} + +// SetMoveTaskOrderID sets the move task order ID of this subtype +func (m *MTOServiceItemInternationalShuttle) SetMoveTaskOrderID(val *strfmt.UUID) { + m.moveTaskOrderIdField = val +} + +// MtoShipmentID gets the mto shipment ID of this subtype +func (m *MTOServiceItemInternationalShuttle) MtoShipmentID() strfmt.UUID { + return m.mtoShipmentIdField +} + +// SetMtoShipmentID sets the mto shipment ID of this subtype +func (m *MTOServiceItemInternationalShuttle) SetMtoShipmentID(val strfmt.UUID) { + m.mtoShipmentIdField = val +} + +// ReServiceName gets the re service name of this subtype +func (m *MTOServiceItemInternationalShuttle) ReServiceName() string { + return m.reServiceNameField +} + +// SetReServiceName sets the re service name of this subtype +func (m *MTOServiceItemInternationalShuttle) SetReServiceName(val string) { + m.reServiceNameField = val +} + +// RejectionReason gets the rejection reason of this subtype +func (m *MTOServiceItemInternationalShuttle) RejectionReason() *string { + return m.rejectionReasonField +} + +// SetRejectionReason sets the rejection reason of this subtype +func (m *MTOServiceItemInternationalShuttle) SetRejectionReason(val *string) { + m.rejectionReasonField = val +} + +// Status gets the status of this subtype +func (m *MTOServiceItemInternationalShuttle) Status() MTOServiceItemStatus { + return m.statusField +} + +// SetStatus sets the status of this subtype +func (m *MTOServiceItemInternationalShuttle) SetStatus(val MTOServiceItemStatus) { + m.statusField = val +} + +// UnmarshalJSON unmarshals this object with a polymorphic type from a JSON structure +func (m *MTOServiceItemInternationalShuttle) UnmarshalJSON(raw []byte) error { + var data struct { + + // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Example: 4000 + ActualWeight *int64 `json:"actualWeight"` + + // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // Example: 4200 + EstimatedWeight *int64 `json:"estimatedWeight"` + + // To identify whether the service was provided within (CONUS) or (OCONUS) + // Example: CONUS + // Enum: [CONUS OCONUS] + Market string `json:"market,omitempty"` + + // Service codes allowed for this model type. + // Required: true + // Enum: [IOSHUT IDSHUT] + ReServiceCode *string `json:"reServiceCode"` + + // Explanation of why a shuttle service is required. + // Example: Storage items need to be picked up. + // Required: true + Reason *string `json:"reason"` + } + buf := bytes.NewBuffer(raw) + dec := json.NewDecoder(buf) + dec.UseNumber() + + if err := dec.Decode(&data); err != nil { + return err + } + + var base struct { + /* Just the base type fields. Used for unmashalling polymorphic types.*/ + + ETag string `json:"eTag,omitempty"` + + ID strfmt.UUID `json:"id,omitempty"` + + ModelType MTOServiceItemModelType `json:"modelType"` + + MoveTaskOrderID *strfmt.UUID `json:"moveTaskOrderID"` + + MtoShipmentID strfmt.UUID `json:"mtoShipmentID,omitempty"` + + ReServiceName string `json:"reServiceName,omitempty"` + + RejectionReason *string `json:"rejectionReason,omitempty"` + + Status MTOServiceItemStatus `json:"status,omitempty"` + } + buf = bytes.NewBuffer(raw) + dec = json.NewDecoder(buf) + dec.UseNumber() + + if err := dec.Decode(&base); err != nil { + return err + } + + var result MTOServiceItemInternationalShuttle + + result.eTagField = base.ETag + + result.idField = base.ID + + if base.ModelType != result.ModelType() { + /* Not the type we're looking for. */ + return errors.New(422, "invalid modelType value: %q", base.ModelType) + } + result.moveTaskOrderIdField = base.MoveTaskOrderID + + result.mtoShipmentIdField = base.MtoShipmentID + + result.reServiceNameField = base.ReServiceName + + result.rejectionReasonField = base.RejectionReason + + result.statusField = base.Status + + result.ActualWeight = data.ActualWeight + result.EstimatedWeight = data.EstimatedWeight + result.Market = data.Market + result.ReServiceCode = data.ReServiceCode + result.Reason = data.Reason + + *m = result + + return nil +} + +// MarshalJSON marshals this object with a polymorphic type to a JSON structure +func (m MTOServiceItemInternationalShuttle) MarshalJSON() ([]byte, error) { + var b1, b2, b3 []byte + var err error + b1, err = json.Marshal(struct { + + // Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + // Example: 4000 + ActualWeight *int64 `json:"actualWeight"` + + // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // Example: 4200 + EstimatedWeight *int64 `json:"estimatedWeight"` + + // To identify whether the service was provided within (CONUS) or (OCONUS) + // Example: CONUS + // Enum: [CONUS OCONUS] + Market string `json:"market,omitempty"` + + // Service codes allowed for this model type. + // Required: true + // Enum: [IOSHUT IDSHUT] + ReServiceCode *string `json:"reServiceCode"` + + // Explanation of why a shuttle service is required. + // Example: Storage items need to be picked up. + // Required: true + Reason *string `json:"reason"` + }{ + + ActualWeight: m.ActualWeight, + + EstimatedWeight: m.EstimatedWeight, + + Market: m.Market, + + ReServiceCode: m.ReServiceCode, + + Reason: m.Reason, + }) + if err != nil { + return nil, err + } + b2, err = json.Marshal(struct { + ETag string `json:"eTag,omitempty"` + + ID strfmt.UUID `json:"id,omitempty"` + + ModelType MTOServiceItemModelType `json:"modelType"` + + MoveTaskOrderID *strfmt.UUID `json:"moveTaskOrderID"` + + MtoShipmentID strfmt.UUID `json:"mtoShipmentID,omitempty"` + + ReServiceName string `json:"reServiceName,omitempty"` + + RejectionReason *string `json:"rejectionReason,omitempty"` + + Status MTOServiceItemStatus `json:"status,omitempty"` + }{ + + ETag: m.ETag(), + + ID: m.ID(), + + ModelType: m.ModelType(), + + MoveTaskOrderID: m.MoveTaskOrderID(), + + MtoShipmentID: m.MtoShipmentID(), + + ReServiceName: m.ReServiceName(), + + RejectionReason: m.RejectionReason(), + + Status: m.Status(), + }) + if err != nil { + return nil, err + } + + return swag.ConcatJSON(b1, b2, b3), nil +} + +// Validate validates this m t o service item international shuttle +func (m *MTOServiceItemInternationalShuttle) Validate(formats strfmt.Registry) error { + var res []error + + if err := m.validateID(formats); err != nil { + res = append(res, err) + } + + if err := m.validateMoveTaskOrderID(formats); err != nil { + res = append(res, err) + } + + if err := m.validateMtoShipmentID(formats); err != nil { + res = append(res, err) + } + + if err := m.validateStatus(formats); err != nil { + res = append(res, err) + } + + if err := m.validateMarket(formats); err != nil { + res = append(res, err) + } + + if err := m.validateReServiceCode(formats); err != nil { + res = append(res, err) + } + + if err := m.validateReason(formats); err != nil { + res = append(res, err) + } + + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +func (m *MTOServiceItemInternationalShuttle) validateID(formats strfmt.Registry) error { + + if swag.IsZero(m.ID()) { // not required + return nil + } + + if err := validate.FormatOf("id", "body", "uuid", m.ID().String(), formats); err != nil { + return err + } + + return nil +} + +func (m *MTOServiceItemInternationalShuttle) validateMoveTaskOrderID(formats strfmt.Registry) error { + + if err := validate.Required("moveTaskOrderID", "body", m.MoveTaskOrderID()); err != nil { + return err + } + + if err := validate.FormatOf("moveTaskOrderID", "body", "uuid", m.MoveTaskOrderID().String(), formats); err != nil { + return err + } + + return nil +} + +func (m *MTOServiceItemInternationalShuttle) validateMtoShipmentID(formats strfmt.Registry) error { + + if swag.IsZero(m.MtoShipmentID()) { // not required + return nil + } + + if err := validate.FormatOf("mtoShipmentID", "body", "uuid", m.MtoShipmentID().String(), formats); err != nil { + return err + } + + return nil +} + +func (m *MTOServiceItemInternationalShuttle) validateStatus(formats strfmt.Registry) error { + + if swag.IsZero(m.Status()) { // not required + return nil + } + + if err := m.Status().Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("status") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("status") + } + return err + } + + return nil +} + +var mTOServiceItemInternationalShuttleTypeMarketPropEnum []interface{} + +func init() { + var res []string + if err := json.Unmarshal([]byte(`["CONUS","OCONUS"]`), &res); err != nil { + panic(err) + } + for _, v := range res { + mTOServiceItemInternationalShuttleTypeMarketPropEnum = append(mTOServiceItemInternationalShuttleTypeMarketPropEnum, v) + } +} + +// property enum +func (m *MTOServiceItemInternationalShuttle) validateMarketEnum(path, location string, value string) error { + if err := validate.EnumCase(path, location, value, mTOServiceItemInternationalShuttleTypeMarketPropEnum, true); err != nil { + return err + } + return nil +} + +func (m *MTOServiceItemInternationalShuttle) validateMarket(formats strfmt.Registry) error { + + if swag.IsZero(m.Market) { // not required + return nil + } + + // value enum + if err := m.validateMarketEnum("market", "body", m.Market); err != nil { + return err + } + + return nil +} + +var mTOServiceItemInternationalShuttleTypeReServiceCodePropEnum []interface{} + +func init() { + var res []string + if err := json.Unmarshal([]byte(`["IOSHUT","IDSHUT"]`), &res); err != nil { + panic(err) + } + for _, v := range res { + mTOServiceItemInternationalShuttleTypeReServiceCodePropEnum = append(mTOServiceItemInternationalShuttleTypeReServiceCodePropEnum, v) + } +} + +// property enum +func (m *MTOServiceItemInternationalShuttle) validateReServiceCodeEnum(path, location string, value string) error { + if err := validate.EnumCase(path, location, value, mTOServiceItemInternationalShuttleTypeReServiceCodePropEnum, true); err != nil { + return err + } + return nil +} + +func (m *MTOServiceItemInternationalShuttle) validateReServiceCode(formats strfmt.Registry) error { + + if err := validate.Required("reServiceCode", "body", m.ReServiceCode); err != nil { + return err + } + + // value enum + if err := m.validateReServiceCodeEnum("reServiceCode", "body", *m.ReServiceCode); err != nil { + return err + } + + return nil +} + +func (m *MTOServiceItemInternationalShuttle) validateReason(formats strfmt.Registry) error { + + if err := validate.Required("reason", "body", m.Reason); err != nil { + return err + } + + return nil +} + +// ContextValidate validate this m t o service item international shuttle based on the context it is used +func (m *MTOServiceItemInternationalShuttle) ContextValidate(ctx context.Context, formats strfmt.Registry) error { + var res []error + + if err := m.contextValidateETag(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateReServiceName(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateStatus(ctx, formats); err != nil { + res = append(res, err) + } + + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +func (m *MTOServiceItemInternationalShuttle) contextValidateETag(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "eTag", "body", string(m.ETag())); err != nil { + return err + } + + return nil +} + +func (m *MTOServiceItemInternationalShuttle) contextValidateModelType(ctx context.Context, formats strfmt.Registry) error { + + if err := m.ModelType().ContextValidate(ctx, formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("modelType") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("modelType") + } + return err + } + + return nil +} + +func (m *MTOServiceItemInternationalShuttle) contextValidateReServiceName(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "reServiceName", "body", string(m.ReServiceName())); err != nil { + return err + } + + return nil +} + +func (m *MTOServiceItemInternationalShuttle) contextValidateStatus(ctx context.Context, formats strfmt.Registry) error { + + if swag.IsZero(m.Status()) { // not required + return nil + } + + if err := m.Status().ContextValidate(ctx, formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("status") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("status") + } + return err + } + + return nil +} + +// MarshalBinary interface implementation +func (m *MTOServiceItemInternationalShuttle) MarshalBinary() ([]byte, error) { + if m == nil { + return nil, nil + } + return swag.WriteJSON(m) +} + +// UnmarshalBinary interface implementation +func (m *MTOServiceItemInternationalShuttle) UnmarshalBinary(b []byte) error { + var res MTOServiceItemInternationalShuttle + if err := swag.ReadJSON(b, &res); err != nil { + return err + } + *m = res + return nil +} diff --git a/pkg/gen/supportmessages/m_t_o_service_item_model_type.go b/pkg/gen/supportmessages/m_t_o_service_item_model_type.go index 3f957023e8a..2899f35c3dd 100644 --- a/pkg/gen/supportmessages/m_t_o_service_item_model_type.go +++ b/pkg/gen/supportmessages/m_t_o_service_item_model_type.go @@ -20,6 +20,7 @@ import ( // - DOFSIT, DOASIT - MTOServiceItemOriginSIT // - DDFSIT, DDASIT - MTOServiceItemDestSIT // - DOSHUT, DDSHUT - MTOServiceItemShuttle +// - IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle // - DCRT, DUCRT - MTOServiceItemDomesticCrating // - ICRT, IUCRT - MTOServiceItemInternationalCrating // diff --git a/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go b/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go index dda4db3527f..87f421bf7a0 100644 --- a/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go +++ b/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go @@ -1917,7 +1917,7 @@ func MTOServiceItemModel(s *models.MTOServiceItem, storer storage.FileStorer) *g } } - if s.ReService.Code == models.ReServiceCodeIDSHUT && s.MTOShipment.PickupAddress != nil { + if s.ReService.Code == models.ReServiceCodeIDSHUT && s.MTOShipment.DestinationAddress != nil { if *s.MTOShipment.DestinationAddress.IsOconus { payload.Market = handlers.FmtString(models.MarketOconus.FullString()) } else { diff --git a/pkg/handlers/ghcapi/mto_service_items.go b/pkg/handlers/ghcapi/mto_service_items.go index 60b8db84c04..aa6ea3a9c42 100644 --- a/pkg/handlers/ghcapi/mto_service_items.go +++ b/pkg/handlers/ghcapi/mto_service_items.go @@ -350,6 +350,8 @@ func (h ListMTOServiceItemsHandler) Handle(params mtoserviceitemop.ListMTOServic query.NewQueryAssociation("SITDestinationFinalAddress"), query.NewQueryAssociation("SITOriginHHGOriginalAddress"), query.NewQueryAssociation("SITOriginHHGActualAddress"), + query.NewQueryAssociation("MTOShipment.PickupAddress"), + query.NewQueryAssociation("MTOShipment.DestinationAddress"), }) var serviceItems models.MTOServiceItems diff --git a/pkg/handlers/supportapi/internal/payloads/model_to_payload.go b/pkg/handlers/supportapi/internal/payloads/model_to_payload.go index 5e43cd2070b..f2ea1ffc5fa 100644 --- a/pkg/handlers/supportapi/internal/payloads/model_to_payload.go +++ b/pkg/handlers/supportapi/internal/payloads/model_to_payload.go @@ -359,6 +359,28 @@ func MTOServiceItem(mtoServiceItem *models.MTOServiceItem) supportmessages.MTOSe EstimatedWeight: handlers.FmtPoundPtr(mtoServiceItem.EstimatedWeight), ActualWeight: handlers.FmtPoundPtr(mtoServiceItem.ActualWeight), } + case models.ReServiceCodeIDSHUT, models.ReServiceCodeIOSHUT: + market := models.MarketConus.FullString() + + if mtoServiceItem.ReService.Code == models.ReServiceCodeIOSHUT && mtoServiceItem.MTOShipment.PickupAddress != nil { + if *mtoServiceItem.MTOShipment.PickupAddress.IsOconus { + market = models.MarketOconus.FullString() + } + } + + if mtoServiceItem.ReService.Code == models.ReServiceCodeIDSHUT && mtoServiceItem.MTOShipment.DestinationAddress != nil { + if *mtoServiceItem.MTOShipment.DestinationAddress.IsOconus { + market = models.MarketOconus.FullString() + } + } + + payload = &supportmessages.MTOServiceItemInternationalShuttle{ + ReServiceCode: handlers.FmtString(string(mtoServiceItem.ReService.Code)), + Reason: mtoServiceItem.Reason, + EstimatedWeight: handlers.FmtPoundPtr(mtoServiceItem.EstimatedWeight), + ActualWeight: handlers.FmtPoundPtr(mtoServiceItem.ActualWeight), + Market: market, + } default: // otherwise, basic service item payload = &supportmessages.MTOServiceItemBasic{ diff --git a/src/components/Office/ServiceItemDetails/ServiceItemDetails.jsx b/src/components/Office/ServiceItemDetails/ServiceItemDetails.jsx index 689a790ca64..77d8870bf81 100644 --- a/src/components/Office/ServiceItemDetails/ServiceItemDetails.jsx +++ b/src/components/Office/ServiceItemDetails/ServiceItemDetails.jsx @@ -481,6 +481,36 @@ const ServiceItemDetails = ({ id, code, details, serviceRequestDocs, shipment, s ); break; } + case 'IOSHUT': + case 'IDSHUT': { + const estimatedWeight = details.estimatedWeight != null ? formatWeight(details.estimatedWeight) : `— lbs`; + detailSection = ( +
+
+
+
{estimatedWeight}
estimated weight
+
+ {generateDetailText({ Reason: details.reason })} + {generateDetailText({ Market: details.market })} + {details.rejectionReason && + generateDetailText({ 'Rejection reason': details.rejectionReason }, id, 'margin-top-2')} + {!isEmpty(serviceRequestDocUploads) ? ( +
+

Download service item documentation:

+ {serviceRequestDocUploads.map((file) => ( + + ))} +
+ ) : null} +
+
+ ); + break; + } case 'DLH': case 'DSH': case 'FSC': diff --git a/src/components/Office/ServiceItemDetails/ServiceItemDetails.test.jsx b/src/components/Office/ServiceItemDetails/ServiceItemDetails.test.jsx index d9267d7e572..286b5ae3bf6 100644 --- a/src/components/Office/ServiceItemDetails/ServiceItemDetails.test.jsx +++ b/src/components/Office/ServiceItemDetails/ServiceItemDetails.test.jsx @@ -475,6 +475,33 @@ describe('ServiceItemDetails Domestic Shuttling', () => { }); }); +describe('ServiceItemDetails International Shuttling', () => { + const shuttleDetails = { + ...details, + market: 'OCONUS', + }; + + it.each([['IOSHUT'], ['IDSHUT']])('renders formatted estimated weight and reason', (code) => { + render(); + + expect(screen.getByText('2,500 lbs')).toBeInTheDocument(); + expect(screen.getByText('estimated weight')).toBeInTheDocument(); + expect(screen.getByText('Reason:')).toBeInTheDocument(); + expect(screen.getByText('Market:')).toBeInTheDocument(); + expect(screen.getByText('some reason')).toBeInTheDocument(); + expect(screen.getByText('Download service item documentation:')).toBeInTheDocument(); + const downloadLink = screen.getByText('receipt.pdf'); + expect(downloadLink).toBeInstanceOf(HTMLAnchorElement); + }); + + it.each([['DOSHUT'], ['DDSHUT']])('renders estimated weight nil values with an em dash', (code) => { + render(); + + expect(screen.getByText('— lbs')).toBeInTheDocument(); + expect(screen.getByText('estimated weight')).toBeInTheDocument(); + }); +}); + describe('ServiceItemDetails Crating Rejected', () => { it('renders the rejection reason field when it is populated with information', () => { render( diff --git a/swagger-def/support.yaml b/swagger-def/support.yaml index 4d4046e3d11..278f936841a 100644 --- a/swagger-def/support.yaml +++ b/swagger-def/support.yaml @@ -1288,6 +1288,7 @@ definitions: * DOFSIT, DOASIT - MTOServiceItemOriginSIT * DDFSIT, DDASIT - MTOServiceItemDestSIT * DOSHUT, DDSHUT - MTOServiceItemShuttle + * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle * DCRT, DUCRT - MTOServiceItemDomesticCrating * ICRT, IUCRT - MTOServiceItemInternationalCrating @@ -1369,6 +1370,47 @@ definitions: - reason - reServiceCode - description + MTOServiceItemInternationalShuttle: # spectral oas2-unused-definition is OK here due to polymorphism + description: Describes an interntional shuttle service item. + allOf: + - $ref: '#/definitions/MTOServiceItem' + - type: object + properties: + reServiceCode: + type: string + description: Service codes allowed for this model type. + enum: + - IOSHUT # Domestic Origin Shuttle Service + - IDSHUT # Domestic Destination Shuttle Service + reason: + type: string + example: Storage items need to be picked up. + description: Explanation of why a shuttle service is required. + market: + type: string + enum: + - CONUS + - OCONUS + example: CONUS + description: >- + To identify whether the service was provided within (CONUS) or + (OCONUS) + estimatedWeight: + type: integer + example: 4200 + description: An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + x-nullable: true + x-omitempty: false + actualWeight: + type: integer + example: 4000 + description: Provided by the movers, based on weight tickets. Relevant for shuttling (DDSHUT & DOSHUT) service items. + x-nullable: true + x-omitempty: false + required: + - reason + - reServiceCode + - description MTOServiceItemStatus: description: Describes all statuses for a MTOServiceItem. type: string diff --git a/swagger/support.yaml b/swagger/support.yaml index 6a423419555..a5747f4bb6f 100644 --- a/swagger/support.yaml +++ b/swagger/support.yaml @@ -1395,6 +1395,7 @@ definitions: * DOFSIT, DOASIT - MTOServiceItemOriginSIT * DDFSIT, DDASIT - MTOServiceItemDestSIT * DOSHUT, DDSHUT - MTOServiceItemShuttle + * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle * DCRT, DUCRT - MTOServiceItemDomesticCrating * ICRT, IUCRT - MTOServiceItemInternationalCrating @@ -1482,6 +1483,51 @@ definitions: - reason - reServiceCode - description + MTOServiceItemInternationalShuttle: + description: Describes an interntional shuttle service item. + allOf: + - $ref: '#/definitions/MTOServiceItem' + - type: object + properties: + reServiceCode: + type: string + description: Service codes allowed for this model type. + enum: + - IOSHUT + - IDSHUT + reason: + type: string + example: Storage items need to be picked up. + description: Explanation of why a shuttle service is required. + market: + type: string + enum: + - CONUS + - OCONUS + example: CONUS + description: >- + To identify whether the service was provided within (CONUS) or + (OCONUS) + estimatedWeight: + type: integer + example: 4200 + description: >- + An estimate of how much weight from a shipment will be included in + a shuttling (DDSHUT & DOSHUT) service item. + x-nullable: true + x-omitempty: false + actualWeight: + type: integer + example: 4000 + description: >- + Provided by the movers, based on weight tickets. Relevant for + shuttling (DDSHUT & DOSHUT) service items. + x-nullable: true + x-omitempty: false + required: + - reason + - reServiceCode + - description MTOServiceItemStatus: description: Describes all statuses for a MTOServiceItem. type: string From 399bfb4d99139b0085acde0943bd67413e0f7b57 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 9 Jan 2025 19:28:15 +0000 Subject: [PATCH 037/260] B-22056 - setup for exp testing. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8d3c39da69..b5bd5920986 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch placeholder_branch_name + dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env placeholder_env + dp3-env: &dp3-env exp # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch placeholder_branch_name + integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name + integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch placeholder_branch_name + client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch placeholder_branch_name + server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint executors: base_small: From 2d77f6dcc4fd226285ae48b9997917a42c2d9a45 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 9 Jan 2025 19:36:42 +0000 Subject: [PATCH 038/260] B-22056 - fix previous merge. --- pkg/gen/internalapi/embedded_spec.go | 10 ++++++++++ swagger/internal.yaml | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/pkg/gen/internalapi/embedded_spec.go b/pkg/gen/internalapi/embedded_spec.go index f30aca3b049..639b229a03a 100644 --- a/pkg/gen/internalapi/embedded_spec.go +++ b/pkg/gen/internalapi/embedded_spec.go @@ -3415,6 +3415,11 @@ func init() { "x-nullable": true, "example": "LOS ANGELES" }, + "destinationGbloc": { + "type": "string", + "pattern": "^[A-Z]{4}$", + "x-nullable": true + }, "eTag": { "type": "string", "readOnly": true @@ -12586,6 +12591,11 @@ func init() { "x-nullable": true, "example": "LOS ANGELES" }, + "destinationGbloc": { + "type": "string", + "pattern": "^[A-Z]{4}$", + "x-nullable": true + }, "eTag": { "type": "string", "readOnly": true diff --git a/swagger/internal.yaml b/swagger/internal.yaml index 21483825daa..15499febdd9 100644 --- a/swagger/internal.yaml +++ b/swagger/internal.yaml @@ -2758,6 +2758,10 @@ definitions: type: string format: uuid example: c56a4180-65aa-42ec-a945-5fd21dec0538 + destinationGbloc: + type: string + pattern: ^[A-Z]{4}$ + x-nullable: true required: - streetAddress1 - city From ed66a1642fe55a16eb26632cdf8c732c68702115 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 9 Jan 2025 20:35:47 +0000 Subject: [PATCH 039/260] B-22056 - restore exp env. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5bd5920986..b8d3c39da69 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + dp3-branch: &dp3-branch placeholder_branch_name # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env exp + dp3-env: &dp3-env placeholder_env # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-ignore-branch: &integration-ignore-branch placeholder_branch_name # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + client-ignore-branch: &client-ignore-branch placeholder_branch_name # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + server-ignore-branch: &server-ignore-branch placeholder_branch_name executors: base_small: From 1697ec75f1ee13e1f7d4c3506d11922df5b4ac6d Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Thu, 9 Jan 2025 21:19:55 +0000 Subject: [PATCH 040/260] Bulk Modal UI --- .../BulkAssignment/BulkAssignmentModal.jsx | 98 +++++++++---------- .../BulkAssignmentModal.module.scss | 60 ++++-------- 2 files changed, 67 insertions(+), 91 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index be7ec0f430f..78a87f1b4bc 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -58,58 +58,58 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, - content, submitText, closeText, // bulkAssignmentData, }) => ( - - onClose()} /> - -

{title}

- - -
- - - - - - - - {data.availableOfficeUsers.map((user) => { - return ( - - - - - - - ); - })} -
Select/Deselect All UserWorkloadEqual Assignment
- - - {user.firstName},{user.lastName} - {user.workload} - -
-
- - - - - +
+ + onClose()} /> + +

{title}

+ +
+ + + + + + + + {data.availableOfficeUsers.map((user) => { + return ( + + + + + + + ); + })} +
Select/Deselect All UserWorkloadAssignment
+ + + {user.firstName},{user.lastName} + {user.workload} + +
+
+ + + + + +
); BulkAssignmentModal.propTypes = { @@ -117,14 +117,12 @@ BulkAssignmentModal.propTypes = { onSubmit: PropTypes.func.isRequired, title: PropTypes.string, - content: PropTypes.string, submitText: PropTypes.string, closeText: PropTypes.string, }; BulkAssignmentModal.defaultProps = { title: 'Bulk Assignment', - content: 'Here we will display moves to be assigned in bulk.', submitText: 'Save', closeText: 'Cancel', }; diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index ecf6a9c146b..712f6657f3e 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -1,45 +1,23 @@ -.BulkAssignmentTable{ - margin: 0 auto; - height: 400px; - - // width isn't doing anything here - /* - make select column with the size of the text and not 200px and do the same with workload and assignment columns - justify-content or align-content: center for all the table cells - */ +.BulkModal { + min-width: 900px !important; + overflow-y: auto; + max-height: 90vh; +} - overflow-y: scroll; +.BulkAssignmentTable { - table { - max-width: 800px; - - td { - max-width: 100px; - } - .BulkAssignmentSelect { - width: 100px; - } - - .BulkAssignmentUser { - width: 10px; - } + table { + th { + max-width: 10px; + color: blue; + text-align: center; } - - header, .BulkAssignmentRow { - display: flex; - justify-content: flex-start; - padding: 10px 20px; - - .BulkAssignmentSelect { - width: 100px; - } - - .BulkAssignmentUser { - width: 200px; - } - - .BulkAssignmentAssignment { - width: 50px - } + .BulkAssignmentDataCenter { + text-align: center; + } + .BulkAssignmentAssignment { + width: 50px; + text-align: center; } -} \ No newline at end of file + } +} From 687ef293971c08ae3f737ace6841a9a6f6db675f Mon Sep 17 00:00:00 2001 From: loganwc Date: Thu, 9 Jan 2025 22:38:28 +0000 Subject: [PATCH 041/260] added data from each queue into modal --- .../BulkAssignment/BulkAssignmentModal.jsx | 91 ++++--------------- .../BulkAssignmentModal.module.scss | 2 +- src/components/Table/TableQueue.jsx | 17 ++-- src/pages/Office/MoveQueue/MoveQueue.jsx | 1 + .../PaymentRequestQueue.jsx | 1 + .../ServicesCounselingQueue.jsx | 10 +- 6 files changed, 38 insertions(+), 84 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 78a87f1b4bc..e8097c2db5b 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -6,62 +6,7 @@ import styles from './BulkAssignmentModal.module.scss'; import Modal, { ModalTitle, ModalClose, ModalActions, connectModal } from 'components/Modal/Modal'; -const data = { - availableOfficeUsers: [ - { - firstName: 'John', - lastName: 'Snow', - officeUserId: '123', - workload: 0, - }, - { - firstName: 'Jane', - lastName: 'Doe', - officeUserId: '456', - workload: 1, - }, - { - firstName: 'Jimmy', - lastName: 'Page', - officeUserId: '789', - workload: 2, - }, - { - firstName: 'Peter', - lastName: 'Pan', - officeUserId: '101', - workload: 3, - }, - { - firstName: 'Ringo', - lastName: 'Starr', - officeUserId: '111', - workload: 4, - }, - { - firstName: 'George', - lastName: 'Harrison', - officeUserId: '121', - workload: 5, - }, - { - firstName: 'Stuart', - lastName: 'Skinner', - officeUserId: '131', - workload: 6, - }, - ], - bulkAssignmentMoveIDs: ['1', '2', '3', '4', '5'], -}; - -export const BulkAssignmentModal = ({ - onClose, - onSubmit, - title, - submitText, - closeText, - // bulkAssignmentData, -}) => ( +export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, closeText, bulkAssignmentData }) => (
onClose()} /> @@ -76,22 +21,24 @@ export const BulkAssignmentModal = ({ Workload Assignment - {data.availableOfficeUsers.map((user) => { - return ( - - - - - - {user.firstName},{user.lastName} - - {user.workload} - - - - - ); - })} + {Object.prototype.hasOwnProperty.call(bulkAssignmentData, 'availableOfficeUsers') + ? bulkAssignmentData.availableOfficeUsers.map((user) => { + return ( + + + + + + {user.lastName}, {user.firstName} + + {user.workload || 0} + + + + + ); + }) + : null}
diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 712f6657f3e..88d6d297cae 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -16,7 +16,7 @@ text-align: center; } .BulkAssignmentAssignment { - width: 50px; + width: 60px; text-align: center; } } diff --git a/src/components/Table/TableQueue.jsx b/src/components/Table/TableQueue.jsx index ea9b177f677..018fe6267d2 100644 --- a/src/components/Table/TableQueue.jsx +++ b/src/components/Table/TableQueue.jsx @@ -27,6 +27,7 @@ import { getSelectionOptionLabel, } from 'components/Table/utils'; import { roleTypes } from 'constants/userRoles'; +import { useBulkAssignmentQueries } from 'hooks/queries'; const defaultPageSize = 20; const defaultPage = 1; @@ -54,9 +55,9 @@ const TableQueue = ({ sessionStorageKey, isSupervisor, isBulkAssignmentFFEnabled, - bulkAssignmentData, officeUser, activeRole, + queueType, }) => { const [isPageReload, setIsPageReload] = useState(true); useEffect(() => { @@ -67,6 +68,8 @@ const TableQueue = ({ }, 500); }, []); + const { bulkAssignmentData } = useBulkAssignmentQueries(queueType); + const [paramSort, setParamSort] = useState( getTableQueueSortParamSessionStorageValue(sessionStorageKey) || defaultSortedColumns, ); @@ -92,7 +95,7 @@ const TableQueue = ({ }, [currentPageSize, sessionStorageKey]); const [pageCount, setPageCount] = useState(0); - const [isBulkAssignModalVisible, setIsBulkAssignModalVisible] = useState(true); + const [isBulkAssignModalVisible, setIsBulkAssignModalVisible] = useState(false); const { id, desc } = paramSort.length ? paramSort[0] : {}; @@ -333,11 +336,11 @@ const TableQueue = ({

{`${title} (${totalCount})`}

- {/* {isSupervisor && isBulkAssignmentFFEnabled && ( */} - - {/* )} */} + {isSupervisor && isBulkAssignmentFFEnabled && ( + + )} {showCSVExport && (
); diff --git a/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx b/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx index 2edaeb880e5..e7d94efcccf 100644 --- a/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx +++ b/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx @@ -331,6 +331,7 @@ const PaymentRequestQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBul key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} + queueType="PAYMENT_REQUEST" />
); diff --git a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx index 3f494d6ed82..b727fd41e09 100644 --- a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx +++ b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx @@ -26,7 +26,6 @@ import { useUserQueries, useMoveSearchQueries, useCustomerSearchQueries, - useBulkAssignmentQueries, } from 'hooks/queries'; import { getServicesCounselingOriginLocations, @@ -206,7 +205,10 @@ export const counselingColumns = (moveLockFlag, originLocationList, supervisor,
handleQueueAssignment(row.id, e.target.value, roleTypes.SERVICES_COUNSELOR)} + onChange={(e) => { + handleQueueAssignment(row.id, e.target.value, roleTypes.SERVICES_COUNSELOR); + window.location.reload(); + }} title="Assigned dropdown" > @@ -517,7 +519,6 @@ const ServicesCounselingQueue = ({ const [search, setSearch] = useState({ moveCode: null, dodID: null, customerName: null }); const [searchHappened, setSearchHappened] = useState(false); const counselorMoveCreateFeatureFlag = isBooleanFlagEnabled('counselor_move_create'); - const { bulkAssignmentData } = useBulkAssignmentQueries('COUNSELING'); const onSubmit = useCallback((values) => { const payload = { @@ -666,6 +667,7 @@ const ServicesCounselingQueue = ({ key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} + queueType="CLOSEOUT" />
); @@ -695,7 +697,7 @@ const ServicesCounselingQueue = ({ key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} - bulkAssignmentData={bulkAssignmentData} // do we want to pass it everytime? + queueType="COUNSELING" /> ); From 99d68dd10c90ad16995613c78805c59744161f84 Mon Sep 17 00:00:00 2001 From: loganwc Date: Thu, 9 Jan 2025 22:44:32 +0000 Subject: [PATCH 042/260] add little test --- .../BulkAssignment/BulkAssignmentModal.jsx | 8 +++- .../BulkAssignmentModal.test.jsx | 47 +++++++++++++++++-- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index e8097c2db5b..1c1aaaee2a0 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -29,9 +29,13 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos - {user.lastName}, {user.firstName} +

+ {user.lastName}, {user.firstName} +

+ + +

{user.workload || 0}

- {user.workload || 0} diff --git a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx index 4ffc69e7bd3..f4c7fe3d0cd 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx @@ -11,15 +11,39 @@ beforeEach(() => { onSubmit = jest.fn(); }); +const data = { + availableOfficeUsers: [ + { + firstName: 'John', + lastName: 'Snow', + officeUserId: '123', + workload: 0, + }, + { + firstName: 'Jane', + lastName: 'Doe', + officeUserId: '456', + workload: 1, + }, + { + firstName: 'Jimmy', + lastName: 'Page', + officeUserId: '789', + workload: 50, + }, + ], + bulkAssignmentMoveIDs: ['1', '2', '3', '4', '5'], +}; + describe('BulkAssignmentModal', () => { it('renders the component', async () => { - render(); + render(); expect(await screen.findByRole('heading', { level: 3, name: 'Bulk Assignment' })).toBeInTheDocument(); }); it('closes the modal when close icon is clicked', async () => { - render(); + render(); const closeButton = await screen.findByTestId('modalCloseButton'); @@ -29,7 +53,7 @@ describe('BulkAssignmentModal', () => { }); it('closes the modal when the Cancel button is clicked', async () => { - render(); + render(); const cancelButton = await screen.findByRole('button', { name: 'Cancel' }); @@ -39,7 +63,7 @@ describe('BulkAssignmentModal', () => { }); it('calls the submit function when Save button is clicked', async () => { - render(); + render(); const saveButton = await screen.findByRole('button', { name: 'Save' }); @@ -47,4 +71,19 @@ describe('BulkAssignmentModal', () => { expect(onSubmit).toHaveBeenCalledTimes(1); }); + + it('renders the user data', async () => { + render(); + + const userTable = await screen.findByRole('table'); + + expect(userTable).toBeInTheDocument(); + expect(screen.getByText('Select/Deselect All')).toBeInTheDocument(); + expect(screen.getByText('User')).toBeInTheDocument(); + expect(screen.getByText('Workload')).toBeInTheDocument(); + expect(screen.getByText('Assignment')).toBeInTheDocument(); + + expect(screen.getByText('Snow, John')).toBeInTheDocument(); + expect(screen.getAllByTestId('bulkAssignmentUserWorkload')[0]).toHaveTextContent('0'); + }); }); From 8602528ae07b9483b7238ebbe0c1f1193b3ecba5 Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Fri, 10 Jan 2025 20:51:11 +0000 Subject: [PATCH 043/260] test case fixes --- .../BulkAssignment/BulkAssignmentModal.module.scss | 1 - src/components/Table/TableQueue.jsx | 6 +----- src/pages/Office/MoveQueue/MoveQueue.jsx | 4 +++- .../Office/PaymentRequestQueue/PaymentRequestQueue.jsx | 10 ++++++++-- .../ServicesCounselingQueue.jsx | 7 +++++-- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 88d6d297cae..cf94e87dea5 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -9,7 +9,6 @@ table { th { max-width: 10px; - color: blue; text-align: center; } .BulkAssignmentDataCenter { diff --git a/src/components/Table/TableQueue.jsx b/src/components/Table/TableQueue.jsx index 018fe6267d2..dccfc31753a 100644 --- a/src/components/Table/TableQueue.jsx +++ b/src/components/Table/TableQueue.jsx @@ -27,7 +27,6 @@ import { getSelectionOptionLabel, } from 'components/Table/utils'; import { roleTypes } from 'constants/userRoles'; -import { useBulkAssignmentQueries } from 'hooks/queries'; const defaultPageSize = 20; const defaultPage = 1; @@ -57,7 +56,7 @@ const TableQueue = ({ isBulkAssignmentFFEnabled, officeUser, activeRole, - queueType, + bulkAssignmentData, }) => { const [isPageReload, setIsPageReload] = useState(true); useEffect(() => { @@ -68,8 +67,6 @@ const TableQueue = ({ }, 500); }, []); - const { bulkAssignmentData } = useBulkAssignmentQueries(queueType); - const [paramSort, setParamSort] = useState( getTableQueueSortParamSessionStorageValue(sessionStorageKey) || defaultSortedColumns, ); @@ -208,7 +205,6 @@ const TableQueue = ({ if (isLoading || (title === 'Move history' && data.length <= 0 && !isError)) return ; if (isError) return ; - const isDateFilterValue = (value) => { return !Number.isNaN(Date.parse(value)); }; diff --git a/src/pages/Office/MoveQueue/MoveQueue.jsx b/src/pages/Office/MoveQueue/MoveQueue.jsx index a78214c7e43..f72d8ea3858 100644 --- a/src/pages/Office/MoveQueue/MoveQueue.jsx +++ b/src/pages/Office/MoveQueue/MoveQueue.jsx @@ -6,7 +6,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import styles from './MoveQueue.module.scss'; import { createHeader } from 'components/Table/utils'; -import { useMovesQueueQueries, useUserQueries, useMoveSearchQueries } from 'hooks/queries'; +import { useMovesQueueQueries, useUserQueries, useMoveSearchQueries, useBulkAssignmentQueries } from 'hooks/queries'; import { getMovesQueue } from 'services/ghcApi'; import { formatDateFromIso, serviceMemberAgencyLabel } from 'utils/formatters'; import MultiSelectCheckBoxFilter from 'components/Table/Filters/MultiSelectCheckBoxFilter'; @@ -191,6 +191,7 @@ const MoveQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBulkAssignmen const [search, setSearch] = useState({ moveCode: null, dodID: null, customerName: null, paymentRequestCode: null }); const [searchHappened, setSearchHappened] = useState(false); const [moveLockFlag, setMoveLockFlag] = useState(false); + const { bulkAssignmentData } = useBulkAssignmentQueries('TASK_ORDER'); const supervisor = userPrivileges ? userPrivileges.some((p) => p.privilegeType === elevatedPrivilegeTypes.SUPERVISOR) : false; @@ -332,6 +333,7 @@ const MoveQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBulkAssignmen isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} queueType="TASK_ORDER" + bulkAssignmentData={bulkAssignmentData} /> ); diff --git a/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx b/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx index e7d94efcccf..11970c501e2 100644 --- a/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx +++ b/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx @@ -7,7 +7,12 @@ import styles from './PaymentRequestQueue.module.scss'; import SearchResultsTable from 'components/Table/SearchResultsTable'; import MoveSearchForm from 'components/MoveSearchForm/MoveSearchForm'; -import { usePaymentRequestQueueQueries, useUserQueries, useMoveSearchQueries } from 'hooks/queries'; +import { + usePaymentRequestQueueQueries, + useUserQueries, + useMoveSearchQueries, + useBulkAssignmentQueries, +} from 'hooks/queries'; import { getPaymentRequestsQueue } from 'services/ghcApi'; import { createHeader } from 'components/Table/utils'; import { @@ -194,6 +199,7 @@ const PaymentRequestQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBul const [search, setSearch] = useState({ moveCode: null, dodID: null, customerName: null, paymentRequestCode: null }); const [searchHappened, setSearchHappened] = useState(false); const [moveLockFlag, setMoveLockFlag] = useState(false); + const { bulkAssignmentData } = useBulkAssignmentQueries('PAYMENT_REQUEST'); const supervisor = userPrivileges ? userPrivileges.some((p) => p.privilegeType === elevatedPrivilegeTypes.SUPERVISOR) : false; @@ -331,7 +337,7 @@ const PaymentRequestQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBul key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} - queueType="PAYMENT_REQUEST" + bulkAssignmentData={bulkAssignmentData} /> ); diff --git a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx index b727fd41e09..5aa7e756b65 100644 --- a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx +++ b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx @@ -26,6 +26,7 @@ import { useUserQueries, useMoveSearchQueries, useCustomerSearchQueries, + useBulkAssignmentQueries, } from 'hooks/queries'; import { getServicesCounselingOriginLocations, @@ -450,6 +451,8 @@ const ServicesCounselingQueue = ({ officeUser?.transportation_office_assignments?.length > 1 && gblocContext ? gblocContext : { selectedGbloc: undefined }; + const { closeoutBulkAssignmentData } = useBulkAssignmentQueries('CLOSEOUT'); + const { counselingBulkAssignmentData } = useBulkAssignmentQueries('COUNSELING'); // Feature Flag useEffect(() => { @@ -667,7 +670,7 @@ const ServicesCounselingQueue = ({ key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} - queueType="CLOSEOUT" + bulkAssignmentData={closeoutBulkAssignmentData} /> ); @@ -697,7 +700,7 @@ const ServicesCounselingQueue = ({ key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} - queueType="COUNSELING" + bulkAssignmentData={counselingBulkAssignmentData} /> ); From b2a4d3e5ae0a5c402c361b89d99bf39c52ffd224 Mon Sep 17 00:00:00 2001 From: Brian Manley Date: Fri, 10 Jan 2025 20:59:22 +0000 Subject: [PATCH 044/260] B-21985 more test for move level service items --- .../ReviewAccountingCodes.test.jsx | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/components/Office/ReviewServiceItems/ReviewAccountingCodes.test.jsx b/src/components/Office/ReviewServiceItems/ReviewAccountingCodes.test.jsx index b3d49269def..98667d11cdd 100644 --- a/src/components/Office/ReviewServiceItems/ReviewAccountingCodes.test.jsx +++ b/src/components/Office/ReviewServiceItems/ReviewAccountingCodes.test.jsx @@ -50,6 +50,42 @@ describe('components/Office/ReviewServiceItems/ReviewAccountingCodes', () => { expect(screen.queryByText('HHG')).not.toBeInTheDocument(); }); + + it('should not display move management fee if move management service item is not requested', () => { + render( + , + ); + + expect(screen.queryByText('Move management Fee')).not.toBeInTheDocument(); + expect(screen.getByText('Counseling Fee')).toBeInTheDocument(); + expect(screen.getByText('$20.65')).toBeInTheDocument(); + }); + + it('should not display counseling fee if counseling service item is not requested', () => { + render( + , + ); + + expect(screen.queryByText('Counseling Fee')).not.toBeInTheDocument(); + expect(screen.getByText('Move management Fee')).toBeInTheDocument(); + expect(screen.getByText('$44.33')).toBeInTheDocument(); + }); }); describe('can display codes', () => { From 0841ec136ed38a12459a32bc1ec4e0b729865d99 Mon Sep 17 00:00:00 2001 From: joeydoyecaci Date: Fri, 10 Jan 2025 21:07:38 +0000 Subject: [PATCH 045/260] Update to allow shipment weight to update when TOO updates an estimated weight when there was already one added --- pkg/handlers/ghcapi/mto_shipment.go | 2 +- pkg/services/orchestrators/shipment/shipment_updater.go | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/handlers/ghcapi/mto_shipment.go b/pkg/handlers/ghcapi/mto_shipment.go index cfc4dbf5312..081556d0605 100644 --- a/pkg/handlers/ghcapi/mto_shipment.go +++ b/pkg/handlers/ghcapi/mto_shipment.go @@ -409,7 +409,7 @@ func (h UpdateShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipmentPar mtoShipment.PrimeEstimatedWeight = &previouslyRecordedWeight } - updatedMtoShipment, err := h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "ghc", nil) + updatedMtoShipment, err := h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "ghc", h.HandlerConfig.HHGPlanner()) if err != nil { return handleError(err) } diff --git a/pkg/services/orchestrators/shipment/shipment_updater.go b/pkg/services/orchestrators/shipment/shipment_updater.go index 53a20840e5e..e65aa023f80 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater.go +++ b/pkg/services/orchestrators/shipment/shipment_updater.go @@ -56,10 +56,17 @@ func (s *shipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment } else { estimatedWeightToUse = *mtoShipment.PrimeEstimatedWeight } + estimatedWeightToUse = unit.Pound(estimatedWeightToUse.Float64() * 1.1) mtoShipment.MTOServiceItems[index].EstimatedWeight = &estimatedWeightToUse serviceItemEstimatedPrice, err := s.mtoServiceItemCreator.FindEstimatedPrice(appCtx, &serviceItem, *mtoShipment) + if serviceItemEstimatedPrice != 0 && err == nil { - mtoShipment.MTOServiceItems[index].PricingEstimate = &serviceItemEstimatedPrice + + priceResult := serviceItemEstimatedPrice + if mtoShipment.MTOServiceItems[index].PricingEstimate.Float64() > 0.0 { + priceResult = priceResult.MultiplyFloat64(1.1) + } + mtoShipment.MTOServiceItems[index].PricingEstimate = &priceResult } if err != nil { return err From bf315ee3df79ef23f9bb1c2f6685dcbc18244a3f Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Fri, 10 Jan 2025 21:39:34 +0000 Subject: [PATCH 046/260] B-22056 - additional test for receiving messages on routing. --- cmd/milmove/serve.go | 7 +- pkg/handlers/internalapi/uploads.go | 87 ++++++++++------ pkg/handlers/internalapi/uploads_test.go | 2 +- .../routing/internalapi_test/uploads_test.go | 50 +++++++++- pkg/notifications/notification_receiver.go | 98 ++++++++++++++++--- .../notification_receiver_stub.go | 4 +- .../notification_receiver_test.go | 11 ++- pkg/storage/test/s3.go | 4 + 8 files changed, 212 insertions(+), 51 deletions(-) diff --git a/cmd/milmove/serve.go b/cmd/milmove/serve.go index 8e9d8878d82..7d4e28a9918 100644 --- a/cmd/milmove/serve.go +++ b/cmd/milmove/serve.go @@ -478,8 +478,11 @@ func buildRoutingConfig(appCtx appcontext.AppContext, v *viper.Viper, redisPool appCtx.Logger().Fatal("notification sender sending not enabled", zap.Error(err)) } - // Email - notificationReceiver, _ := notifications.InitReceiver(v, appCtx.Logger()) + // Notification Receiver + notificationReceiver, err := notifications.InitReceiver(v, appCtx.Logger()) + if err != nil { + appCtx.Logger().Fatal("notification receiver not enabled", zap.Error(err)) + } routingConfig.BuildRoot = v.GetString(cli.BuildRootFlag) sendProductionInvoice := v.GetBool(cli.GEXSendProdInvoiceFlag) diff --git a/pkg/handlers/internalapi/uploads.go b/pkg/handlers/internalapi/uploads.go index 834d2124d43..a1bff90b220 100644 --- a/pkg/handlers/internalapi/uploads.go +++ b/pkg/handlers/internalapi/uploads.go @@ -9,6 +9,7 @@ import ( "regexp" "strconv" "strings" + "time" "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/middleware" @@ -258,7 +259,7 @@ type GetUploadStatusHandler struct { services.UploadInformationFetcher } -type CustomNewUploadStatusOK struct { +type CustomGetUploadStatusResponse struct { params uploadop.GetUploadStatusParams storageKey string appCtx appcontext.AppContext @@ -278,39 +279,45 @@ const ( AVStatusTypeINFECTED AVStatusType = "INFECTED" ) -func writeEventStreamMessage(rw http.ResponseWriter, producer runtime.Producer, id int, event string, data string) { +func (o *CustomGetUploadStatusResponse) writeEventStreamMessage(rw http.ResponseWriter, producer runtime.Producer, id int, event string, data string) { resProcess := []byte(fmt.Sprintf("id: %s\nevent: %s\ndata: %s\n\n", strconv.Itoa(id), event, data)) if produceErr := producer.Produce(rw, resProcess); produceErr != nil { - panic(produceErr) + o.appCtx.Logger().Error(produceErr.Error()) } if f, ok := rw.(http.Flusher); ok { f.Flush() } } -func (o *CustomNewUploadStatusOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { +func (o *CustomGetUploadStatusResponse) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { // Check current tag before event-driven wait for anti-virus tags, err := o.storer.Tags(o.storageKey) var uploadStatus AVStatusType if err != nil || len(tags) == 0 { uploadStatus = AVStatusTypePROCESSING - } else { + } else if _, exists := tags["av-status"]; exists { uploadStatus = AVStatusType(tags["av-status"]) + } else { + uploadStatus = AVStatusTypePROCESSING } - writeEventStreamMessage(rw, producer, 0, "message", string(uploadStatus)) - if uploadStatus == AVStatusTypeCLEAN || uploadStatus == AVStatusTypeINFECTED { - writeEventStreamMessage(rw, producer, 1, "close", "Connection closed") + rw.WriteHeader(http.StatusOK) + o.writeEventStreamMessage(rw, producer, 0, "message", string(uploadStatus)) + o.writeEventStreamMessage(rw, producer, 1, "close", "Connection closed") return // skip notification loop since object already tagged from anti-virus + } else { + // Limitation: once the status code header has been written (first response), we are not able to update the status for subsequent responses. + // StatusAccepted: Standard code 202 for accepted request, but response not yet ready. + rw.WriteHeader(http.StatusAccepted) + o.writeEventStreamMessage(rw, producer, 0, "message", string(uploadStatus)) } // Start waiting for tag updates topicName, err := o.receiver.GetDefaultTopic() if err != nil { - o.appCtx.Logger().Error("aws_sns_object_tags_added_topic key not available.") - return + o.appCtx.Logger().Error(err.Error()) } filterPolicy := fmt.Sprintf(`{ @@ -325,7 +332,7 @@ func (o *CustomNewUploadStatusOK) WriteResponse(rw http.ResponseWriter, producer notificationParams := notifications.NotificationQueueParams{ SubscriptionTopicName: topicName, - NamePrefix: "ObjectTagsAdded", + NamePrefix: notifications.QueuePrefixObjectTagsAdded, FilterPolicy: filterPolicy, } @@ -334,23 +341,36 @@ func (o *CustomNewUploadStatusOK) WriteResponse(rw http.ResponseWriter, producer o.appCtx.Logger().Error(err.Error()) } - // Cleanup + id_counter := 1 + + // For loop over 120 seconds, cancel context when done and it breaks the loop + totalReceiverContext, totalReceiverContextCancelFunc := context.WithTimeout(context.Background(), 120*time.Second) + defer totalReceiverContextCancelFunc() + + // Cleanup if client closes connection go func() { <-o.params.HTTPRequest.Context().Done() + totalReceiverContextCancelFunc() + }() + + // Cleanup at end of work + go func() { + <-totalReceiverContext.Done() + id_counter++ + o.writeEventStreamMessage(rw, producer, id_counter, "close", "Connection closed") _ = o.receiver.CloseoutQueue(o.appCtx, queueUrl) }() - id_counter := 1 - // Run for 120 seconds, 20 second long polling for receiver, 6 times - for range 6 { - o.appCtx.Logger().Info("Receiving...") - messages, errs := o.receiver.ReceiveMessages(o.appCtx, queueUrl) - if errs != nil && errs != context.Canceled { - o.appCtx.Logger().Error(errs.Error()) - } + for { + o.appCtx.Logger().Info("Receiving Messages...") + messages, errs := o.receiver.ReceiveMessages(o.appCtx, queueUrl, totalReceiverContext) - if errs == context.Canceled { - break + if errors.Is(errs, context.Canceled) || errors.Is(errs, context.DeadlineExceeded) { + return + } + if errs != nil { + o.appCtx.Logger().Error(err.Error()) + return } if len(messages) != 0 { @@ -360,11 +380,13 @@ func (o *CustomNewUploadStatusOK) WriteResponse(rw http.ResponseWriter, producer if err != nil || len(tags) == 0 { uploadStatus = AVStatusTypePROCESSING - } else { + } else if _, exists := tags["av-status"]; exists { uploadStatus = AVStatusType(tags["av-status"]) + } else { + uploadStatus = AVStatusTypePROCESSING } - writeEventStreamMessage(rw, producer, id_counter, "message", string(uploadStatus)) + o.writeEventStreamMessage(rw, producer, id_counter, "message", string(uploadStatus)) if uploadStatus == AVStatusTypeCLEAN || uploadStatus == AVStatusTypeINFECTED { return errors.New("connection_closed") @@ -374,16 +396,23 @@ func (o *CustomNewUploadStatusOK) WriteResponse(rw http.ResponseWriter, producer }) if errTransaction != nil && errTransaction.Error() == "connection_closed" { - id_counter++ - writeEventStreamMessage(rw, producer, id_counter, "close", "Connection closed") - break + return } if errTransaction != nil { - panic(errTransaction) // let the recovery middleware deal with this + o.appCtx.Logger().Error(err.Error()) + return } } id_counter++ + + select { + case <-totalReceiverContext.Done(): + return + default: + time.Sleep(1 * time.Second) // Throttle as a precaution against hounding of the SDK + continue + } } } @@ -415,7 +444,7 @@ func (h GetUploadStatusHandler) Handle(params uploadop.GetUploadStatusParams) mi return handleError(err) } - return &CustomNewUploadStatusOK{ + return &CustomGetUploadStatusResponse{ params: params, storageKey: uploaded.Upload.StorageKey, appCtx: h.AppContextFromRequest(params.HTTPRequest), diff --git a/pkg/handlers/internalapi/uploads_test.go b/pkg/handlers/internalapi/uploads_test.go index 271495e2991..ab9c264f77d 100644 --- a/pkg/handlers/internalapi/uploads_test.go +++ b/pkg/handlers/internalapi/uploads_test.go @@ -486,7 +486,7 @@ func (suite *HandlerSuite) TestGetUploadStatusHandlerSuccess() { handler := GetUploadStatusHandler{handlerConfig, uploadInformationFetcher} response := handler.Handle(params) - _, ok := response.(*CustomNewUploadStatusOK) + _, ok := response.(*CustomGetUploadStatusResponse) suite.True(ok) queriedUpload := models.Upload{} diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/internalapi_test/uploads_test.go index 3fe89e8927d..5b760f740bc 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/internalapi_test/uploads_test.go @@ -3,14 +3,17 @@ package internalapi_test import ( "net/http" "net/http/httptest" + "time" "github.com/transcom/mymove/pkg/factory" "github.com/transcom/mymove/pkg/models" + storageTest "github.com/transcom/mymove/pkg/storage/test" "github.com/transcom/mymove/pkg/uploader" ) func (suite *InternalAPISuite) TestUploads() { - suite.Run("Received message for upload", func() { + + suite.Run("Received status for upload, read tag without event queue", func() { orders := factory.BuildOrder(suite.DB(), factory.GetTraitActiveServiceMemberUser(), nil) uploadUser1 := factory.BuildUserUpload(suite.DB(), []factory.Customization{ { @@ -38,4 +41,49 @@ func (suite *InternalAPISuite) TestUploads() { suite.Equal("text/event-stream", rr.Header().Get("content-type")) suite.Equal("id: 0\nevent: message\ndata: CLEAN\n\nid: 1\nevent: close\ndata: Connection closed\n\n", rr.Body.String()) }) + + suite.Run("Received statuses for upload, receiving multiple statuses with event queue", func() { + orders := factory.BuildOrder(suite.DB(), factory.GetTraitActiveServiceMemberUser(), nil) + uploadUser1 := factory.BuildUserUpload(suite.DB(), []factory.Customization{ + { + Model: orders.UploadedOrders, + LinkOnly: true, + }, + { + Model: models.Upload{ + Filename: "FileName", + Bytes: int64(15), + ContentType: uploader.FileTypePDF, + }, + }, + }, nil) + file := suite.Fixture("test.pdf") + _, err := suite.HandlerConfig().FileStorer().Store(uploadUser1.Upload.StorageKey, file.Data, "somehash", nil) + suite.NoError(err) + + req := suite.NewAuthenticatedMilRequest("GET", "/internal/uploads/"+uploadUser1.Upload.ID.String()+"/status", nil, orders.ServiceMember) + rr := httptest.NewRecorder() + + fakeS3, ok := suite.HandlerConfig().FileStorer().(*storageTest.FakeS3Storage) + if ok && fakeS3 != nil { + fakeS3.EmptyTags = true + } + go func() { + time.Sleep(2 * time.Second) + if ok && fakeS3 != nil { + fakeS3.EmptyTags = false + } + }() + + suite.SetupSiteHandler().ServeHTTP(rr, req) + + suite.Equal(http.StatusAccepted, rr.Code) + suite.Equal("text/event-stream", rr.Header().Get("content-type")) + + message1 := "id: 0\nevent: message\ndata: PROCESSING\n\n" + message2 := "id: 1\nevent: message\ndata: CLEAN\n\n" + messageClose := "id: 2\nevent: close\ndata: Connection closed\n\n" + + suite.Equal(message1+message2+messageClose, rr.Body.String()) + }) } diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index e6eba10a5e7..82bc32a02a8 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -4,7 +4,6 @@ import ( "context" "errors" "fmt" - "log" "strings" "github.com/aws/aws-sdk-go-v2/aws" @@ -21,7 +20,7 @@ import ( // NotificationQueueParams stores the params for queue creation type NotificationQueueParams struct { SubscriptionTopicName string - NamePrefix string + NamePrefix QueuePrefixType FilterPolicy string } @@ -30,7 +29,7 @@ type NotificationQueueParams struct { //go:generate mockery --name NotificationReceiver type NotificationReceiver interface { CreateQueueWithSubscription(appCtx appcontext.AppContext, params NotificationQueueParams) (string, error) - ReceiveMessages(appCtx appcontext.AppContext, queueUrl string) ([]ReceivedMessage, error) + ReceiveMessages(appCtx appcontext.AppContext, queueUrl string, timerContext context.Context) ([]ReceivedMessage, error) CloseoutQueue(appCtx appcontext.AppContext, queueUrl string) error GetDefaultTopic() (string, error) } @@ -46,6 +45,13 @@ type NotificationReceiverContext struct { receiverCancelMap map[string]context.CancelFunc } +// QueuePrefixType represents a prefix identifier given to a name of dynamic notification queues +type QueuePrefixType string + +const ( + QueuePrefixObjectTagsAdded QueuePrefixType = "ObjectTagsAdded" +) + type SnsClient interface { Subscribe(ctx context.Context, params *sns.SubscribeInput, optFns ...func(*sns.Options)) (*sns.SubscribeOutput, error) Unsubscribe(ctx context.Context, params *sns.UnsubscribeInput, optFns ...func(*sns.Options)) (*sns.UnsubscribeOutput, error) @@ -118,7 +124,8 @@ func (n NotificationReceiverContext) CreateQueueWithSubscription(appCtx appconte result, err := n.sqsService.CreateQueue(context.Background(), input) if err != nil { - log.Fatalf("Failed to create SQS queue, %v", err) + appCtx.Logger().Error("Failed to create SQS queue, %v", zap.Error(err)) + return "", err } subscribeInput := &sns.SubscribeInput{ @@ -132,17 +139,18 @@ func (n NotificationReceiverContext) CreateQueueWithSubscription(appCtx appconte } subscribeOutput, err := n.snsService.Subscribe(context.Background(), subscribeInput) if err != nil { - log.Fatalf("Failed to create subscription, %v", err) + appCtx.Logger().Error("Failed to create subscription, %v", zap.Error(err)) + return "", err } n.queueSubscriptionMap[*result.QueueUrl] = *subscribeOutput.SubscriptionArn - return *result.QueueUrl, err + return *result.QueueUrl, nil } // ReceiveMessages polls given queue continuously for messages for up to 20 seconds -func (n NotificationReceiverContext) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string) ([]ReceivedMessage, error) { - recCtx, cancelRecCtx := context.WithCancel(context.Background()) +func (n NotificationReceiverContext) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string, timerContext context.Context) ([]ReceivedMessage, error) { + recCtx, cancelRecCtx := context.WithCancel(timerContext) defer cancelRecCtx() n.receiverCancelMap[queueUrl] = cancelRecCtx @@ -151,13 +159,13 @@ func (n NotificationReceiverContext) ReceiveMessages(appCtx appcontext.AppContex MaxNumberOfMessages: 1, WaitTimeSeconds: 20, }) - if err != nil && recCtx.Err() != context.Canceled { - appCtx.Logger().Info("Couldn't get messages from queue. Error: %v\n", zap.Error(err)) - return nil, err + if errors.Is(recCtx.Err(), context.Canceled) || errors.Is(recCtx.Err(), context.DeadlineExceeded) { + return nil, recCtx.Err() } - if recCtx.Err() == context.Canceled { - return nil, recCtx.Err() + if err != nil { + appCtx.Logger().Info("Couldn't get messages from queue. Error: %v\n", zap.Error(err)) + return nil, err } receivedMessages := make([]ReceivedMessage, len(result.Messages)) @@ -207,8 +215,9 @@ func (n NotificationReceiverContext) GetDefaultTopic() (string, error) { return topicName, nil } -// InitReceiver initializes the receiver backend +// InitReceiver initializes the receiver backend, only call this once func InitReceiver(v ViperType, logger *zap.Logger) (NotificationReceiver, error) { + if v.GetString(cli.ReceiverBackendFlag) == "sns&sqs" { // Setup notification receiver service with SNS & SQS backend dependencies awsSNSRegion := v.GetString(cli.SNSRegionFlag) @@ -227,7 +236,15 @@ func InitReceiver(v ViperType, logger *zap.Logger) (NotificationReceiver, error) snsService := sns.NewFromConfig(cfg) sqsService := sqs.NewFromConfig(cfg) - return NewNotificationReceiver(v, snsService, sqsService, awsSNSRegion, awsAccountId), nil + notificationReceiver := NewNotificationReceiver(v, snsService, sqsService, awsSNSRegion, awsAccountId) + + // Remove any remaining previous notification queues on server start + err = notificationReceiver.wipeAllNotificationQueues(snsService, sqsService, logger) + if err != nil { + return nil, err + } + + return notificationReceiver, nil } return NewStubNotificationReceiver(), nil @@ -236,3 +253,54 @@ func InitReceiver(v ViperType, logger *zap.Logger) (NotificationReceiver, error) func (n NotificationReceiverContext) constructArn(awsService string, endpointName string) string { return fmt.Sprintf("arn:aws-us-gov:%s:%s:%s:%s", awsService, n.awsRegion, n.awsAccountId, endpointName) } + +// Removes ALL previously created notification queues +func (n *NotificationReceiverContext) wipeAllNotificationQueues(snsService *sns.Client, sqsService *sqs.Client, logger *zap.Logger) error { + + defaultTopic, err := n.GetDefaultTopic() + if err != nil { + return err + } + + logger.Info("Removing previous subscriptions...") + paginator := sns.NewListSubscriptionsByTopicPaginator(snsService, &sns.ListSubscriptionsByTopicInput{ + TopicArn: aws.String(n.constructArn("sns", defaultTopic)), + }) + + for paginator.HasMorePages() { + output, err := paginator.NextPage(context.Background()) + if err != nil { + return err + } + for _, subscription := range output.Subscriptions { + if strings.Contains(*subscription.Endpoint, string(QueuePrefixObjectTagsAdded)) { + logger.Info("Subscription ARN: ", zap.String("subscription arn", *subscription.SubscriptionArn)) + logger.Info("Endpoint ARN: ", zap.String("endpoint arn", *subscription.Endpoint)) + _, err = snsService.Unsubscribe(context.Background(), &sns.UnsubscribeInput{ + SubscriptionArn: subscription.SubscriptionArn, + }) + if err != nil { + return err + } + } + } + } + + logger.Info("Removing previous queues...") + result, err := sqsService.ListQueues(context.Background(), &sqs.ListQueuesInput{ + QueueNamePrefix: aws.String(string(QueuePrefixObjectTagsAdded)), + }) + if err != nil { + return err + } + + for _, url := range result.QueueUrls { + _, err = sqsService.DeleteQueue(context.Background(), &sqs.DeleteQueueInput{ + QueueUrl: &url, + }) + if err != nil { + return err + } + } + return nil +} diff --git a/pkg/notifications/notification_receiver_stub.go b/pkg/notifications/notification_receiver_stub.go index f87806b9451..b09b61363fc 100644 --- a/pkg/notifications/notification_receiver_stub.go +++ b/pkg/notifications/notification_receiver_stub.go @@ -2,6 +2,7 @@ package notifications import ( "context" + "time" "go.uber.org/zap" @@ -27,7 +28,8 @@ func (n StubNotificationReceiver) CreateQueueWithSubscription(appCtx appcontext. return "stubQueueName", nil } -func (n StubNotificationReceiver) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string) ([]ReceivedMessage, error) { +func (n StubNotificationReceiver) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string, timerContext context.Context) ([]ReceivedMessage, error) { + time.Sleep(2 * time.Second) messageId := "stubMessageId" body := queueUrl + ":stubMessageBody" mockMessages := make([]ReceivedMessage, 1) diff --git a/pkg/notifications/notification_receiver_test.go b/pkg/notifications/notification_receiver_test.go index e5f0bc8ee38..e3275827e21 100644 --- a/pkg/notifications/notification_receiver_test.go +++ b/pkg/notifications/notification_receiver_test.go @@ -5,6 +5,7 @@ import ( "fmt" "strings" "testing" + "time" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/sns" @@ -110,7 +111,10 @@ func (suite *notificationReceiverSuite) TestSuccessPath() { suite.NotContains(createdQueueUrl, queueParams.NamePrefix) suite.Equal(createdQueueUrl, "stubQueueName") - receivedMessages, err := localReceiver.ReceiveMessages(suite.AppContextForTest(), createdQueueUrl) + timerContext, cancelTimerContext := context.WithTimeout(context.Background(), 2*time.Second) + defer cancelTimerContext() + + receivedMessages, err := localReceiver.ReceiveMessages(suite.AppContextForTest(), createdQueueUrl, timerContext) suite.NoError(err) suite.Len(receivedMessages, 1) suite.Equal(receivedMessages[0].MessageId, "stubMessageId") @@ -146,7 +150,10 @@ func (suite *notificationReceiverSuite) TestSuccessPath() { suite.NoError(err) suite.Equal("FakeQueueUrl", createdQueueUrl) - receivedMessages, err := receiver.ReceiveMessages(suite.AppContextForTest(), createdQueueUrl) + timerContext, cancelTimerContext := context.WithTimeout(context.Background(), 2*time.Second) + defer cancelTimerContext() + + receivedMessages, err := receiver.ReceiveMessages(suite.AppContextForTest(), createdQueueUrl, timerContext) suite.NoError(err) suite.Len(receivedMessages, 1) suite.Equal(receivedMessages[0].MessageId, "fakeMessageId") diff --git a/pkg/storage/test/s3.go b/pkg/storage/test/s3.go index 5f738e7b088..901edf370e5 100644 --- a/pkg/storage/test/s3.go +++ b/pkg/storage/test/s3.go @@ -17,6 +17,7 @@ type FakeS3Storage struct { willSucceed bool fs *afero.Afero tempFs *afero.Afero + EmptyTags bool } // Delete removes a file. @@ -93,6 +94,9 @@ func (fake *FakeS3Storage) Tags(_ string) (map[string]string, error) { "tagName": "tagValue", "av-status": "CLEAN", // Assume anti-virus run } + if fake.EmptyTags { + tags = map[string]string{} + } return tags, nil } From 41dcc68832e5f886c7b1ee746e51111f24ff16c4 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Fri, 10 Jan 2025 22:33:06 +0000 Subject: [PATCH 047/260] B-22056 - deploy to exp. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8d3c39da69..b5bd5920986 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch placeholder_branch_name + dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env placeholder_env + dp3-env: &dp3-env exp # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch placeholder_branch_name + integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name + integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch placeholder_branch_name + client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch placeholder_branch_name + server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint executors: base_small: From 51740dc03b9ba20ad1dd5d0f669d7cf37df37aaf Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Fri, 10 Jan 2025 23:27:54 +0000 Subject: [PATCH 048/260] B-22056 - restore exp env. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5bd5920986..b8d3c39da69 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + dp3-branch: &dp3-branch placeholder_branch_name # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env exp + dp3-env: &dp3-env placeholder_env # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-ignore-branch: &integration-ignore-branch placeholder_branch_name # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + client-ignore-branch: &client-ignore-branch placeholder_branch_name # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + server-ignore-branch: &server-ignore-branch placeholder_branch_name executors: base_small: From 0d9ba0cf7356ee56d17a665f6448913d37dea576 Mon Sep 17 00:00:00 2001 From: loganwc Date: Mon, 13 Jan 2025 17:21:58 +0000 Subject: [PATCH 049/260] fix tests --- src/components/Table/TableQueue.jsx | 4 +-- src/pages/Office/MoveQueue/MoveQueue.test.jsx | 25 +++++++++++++++++++ .../PaymentRequestQueue.test.jsx | 25 +++++++++++++++++++ 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/components/Table/TableQueue.jsx b/src/components/Table/TableQueue.jsx index dccfc31753a..52c614f0d49 100644 --- a/src/components/Table/TableQueue.jsx +++ b/src/components/Table/TableQueue.jsx @@ -233,8 +233,6 @@ const TableQueue = ({ } setAllFilters(filters); }; - // const bulkAssignmentRows = bulkAssignmentData.map((item) => Object.values(item)); - // console.log('bulkAssignmentData: ', bulkAssignmentData); const renderFilterPillButton = (index, value, buttonTitle, label, dataTestId) => { return ( @@ -325,7 +323,7 @@ const TableQueue = ({ )} diff --git a/src/pages/Office/MoveQueue/MoveQueue.test.jsx b/src/pages/Office/MoveQueue/MoveQueue.test.jsx index 4e5ec01cd33..468018c37fc 100644 --- a/src/pages/Office/MoveQueue/MoveQueue.test.jsx +++ b/src/pages/Office/MoveQueue/MoveQueue.test.jsx @@ -166,6 +166,31 @@ jest.mock('hooks/queries', () => ({ }, }; }, + useBulkAssignmentQueries: () => { + return { + availableOfficeUsers: [ + { + firstName: 'John', + lastName: 'Snow', + officeUserId: '123', + workload: 0, + }, + { + firstName: 'Jane', + lastName: 'Doe', + officeUserId: '456', + workload: 1, + }, + { + firstName: 'Jimmy', + lastName: 'Page', + officeUserId: '789', + workload: 2, + }, + ], + bulkAssignmentMoveIDs: ['1', '2', '3'], + }; + }, })); const GetMountedComponent = (queueTypeToMount) => { diff --git a/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.test.jsx b/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.test.jsx index 772fd604bba..5d1f3363409 100644 --- a/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.test.jsx +++ b/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.test.jsx @@ -153,6 +153,31 @@ jest.mock('hooks/queries', () => ({ isSuccess: true, }; }, + useBulkAssignmentQueries: () => { + return { + availableOfficeUsers: [ + { + firstName: 'John', + lastName: 'Snow', + officeUserId: '123', + workload: 0, + }, + { + firstName: 'Jane', + lastName: 'Doe', + officeUserId: '456', + workload: 1, + }, + { + firstName: 'Jimmy', + lastName: 'Page', + officeUserId: '789', + workload: 2, + }, + ], + bulkAssignmentMoveIDs: ['1', '2', '3'], + }; + }, })); const SEARCH_OPTIONS = ['Move Code', 'DoD ID', 'Customer Name', 'Payment Request Number']; From f00df5fb911df42383c173f57776d5105122c361 Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Mon, 13 Jan 2025 19:40:34 +0000 Subject: [PATCH 050/260] Fixed Merge conflicts --- src/components/BulkAssignment/BulkAssignmentModal.test.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx index 257496ce472..f4c7fe3d0cd 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx @@ -42,7 +42,7 @@ describe('BulkAssignmentModal', () => { expect(await screen.findByRole('heading', { level: 3, name: 'Bulk Assignment' })).toBeInTheDocument(); }); - it('closes the modal when close icon is clicked', async () => + it('closes the modal when close icon is clicked', async () => { render(); const closeButton = await screen.findByTestId('modalCloseButton'); From a1ce9e1dbbfbb971976e6669b640202c5d8d44db Mon Sep 17 00:00:00 2001 From: loganwc Date: Mon, 13 Jan 2025 19:54:13 +0000 Subject: [PATCH 051/260] fixed assigned column sorting with cached data --- src/pages/Office/MoveQueue/MoveQueue.jsx | 8 ++++++-- .../PaymentRequestQueue/PaymentRequestQueue.jsx | 8 ++++++-- .../ServicesCounselingQueue.jsx | 15 ++++++++------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/pages/Office/MoveQueue/MoveQueue.jsx b/src/pages/Office/MoveQueue/MoveQueue.jsx index f72d8ea3858..02b7dcab70e 100644 --- a/src/pages/Office/MoveQueue/MoveQueue.jsx +++ b/src/pages/Office/MoveQueue/MoveQueue.jsx @@ -161,13 +161,17 @@ export const columns = (moveLockFlag, isQueueManagementEnabled, showBranchFilter ) : (
handleQueueAssignment(row.id, e.target.value, roleTypes.TOO)} title="Assigned dropdown" > {row.availableOfficeUsers?.map(({ lastName, firstName, officeUserId }) => ( - ))} diff --git a/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx b/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx index 11970c501e2..f2a2a392eb5 100644 --- a/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx +++ b/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx @@ -165,7 +165,7 @@ export const columns = (moveLockFlag, isQueueManagementEnabled, showBranchFilter ) : (
{ handleQueueAssignment(row.moveID, e.target.value, roleTypes.TIO); }} @@ -174,7 +174,11 @@ export const columns = (moveLockFlag, isQueueManagementEnabled, showBranchFilter {row.availableOfficeUsers.map(({ lastName, firstName, officeUserId }) => { return ( - ); diff --git a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx index 5aa7e756b65..88b56122cf6 100644 --- a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx +++ b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx @@ -203,18 +203,19 @@ export const counselingColumns = (moveLockFlag, originLocationList, supervisor, return !row?.assignable ? (
{row.assignedTo ? `${row.assignedTo?.lastName}, ${row.assignedTo?.firstName}` : ''}
) : ( -
+
{ - handleQueueAssignment(row.id, e.target.value, roleTypes.SERVICES_COUNSELOR); - window.location.reload(); - }} + key={row.id} + onChange={(e) => handleQueueAssignment(row.id, e.target.value, roleTypes.SERVICES_COUNSELOR)} title="Assigned dropdown" > {row.availableOfficeUsers.map(({ lastName, firstName, officeUserId }) => ( - ))} From 28d9700c13ccaef89a17e20b92910a137f1df32e Mon Sep 17 00:00:00 2001 From: joeydoyecaci Date: Mon, 13 Jan 2025 19:55:44 +0000 Subject: [PATCH 052/260] Broke out update shipment pricing addition into AddPricingEstimatesToMTOServiceItems. --- .../shipment/shipment_updater.go | 57 +++++++++++-------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/pkg/services/orchestrators/shipment/shipment_updater.go b/pkg/services/orchestrators/shipment/shipment_updater.go index e65aa023f80..d7ba3a7c4af 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater.go +++ b/pkg/services/orchestrators/shipment/shipment_updater.go @@ -47,31 +47,10 @@ func (s *shipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment return err } - if mtoShipment != nil && planner != nil { - if mtoShipment.ShipmentType != models.MTOShipmentTypePPM && (shipment.PrimeEstimatedWeight != nil || mtoShipment.PrimeEstimatedWeight != nil) && mtoShipment.Status == models.MTOShipmentStatusApproved { - for index, serviceItem := range mtoShipment.MTOServiceItems { - var estimatedWeightToUse unit.Pound - if shipment.PrimeEstimatedWeight != nil { - estimatedWeightToUse = *shipment.PrimeEstimatedWeight - } else { - estimatedWeightToUse = *mtoShipment.PrimeEstimatedWeight - } - estimatedWeightToUse = unit.Pound(estimatedWeightToUse.Float64() * 1.1) - mtoShipment.MTOServiceItems[index].EstimatedWeight = &estimatedWeightToUse - serviceItemEstimatedPrice, err := s.mtoServiceItemCreator.FindEstimatedPrice(appCtx, &serviceItem, *mtoShipment) - - if serviceItemEstimatedPrice != 0 && err == nil { - - priceResult := serviceItemEstimatedPrice - if mtoShipment.MTOServiceItems[index].PricingEstimate.Float64() > 0.0 { - priceResult = priceResult.MultiplyFloat64(1.1) - } - mtoShipment.MTOServiceItems[index].PricingEstimate = &priceResult - } - if err != nil { - return err - } - } + if mtoShipment != nil && (mtoShipment.ShipmentType != models.MTOShipmentTypePPM) && (shipment.PrimeEstimatedWeight != nil || mtoShipment.PrimeEstimatedWeight != nil) && mtoShipment.Status == models.MTOShipmentStatusApproved { + mtoShipment, err = AddPricingEstimatesToMTOServiceItems(appCtx, *s, mtoShipment, shipment) + if err != nil { + return err } } @@ -161,3 +140,31 @@ func (s *shipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment return mtoShipment, nil } + +func AddPricingEstimatesToMTOServiceItems(appCtx appcontext.AppContext, shipmentUpdater shipmentUpdater, mtoShipment *models.MTOShipment, shipmentDelta *models.MTOShipment) (*models.MTOShipment, error) { + mtoShipmentCopy := mtoShipment + + for index, serviceItem := range mtoShipmentCopy.MTOServiceItems { + var estimatedWeightToUse unit.Pound + if shipmentDelta.PrimeEstimatedWeight != nil { + estimatedWeightToUse = *shipmentDelta.PrimeEstimatedWeight + } else { + estimatedWeightToUse = *mtoShipmentCopy.PrimeEstimatedWeight + } + estimatedWeightToUse = unit.Pound(estimatedWeightToUse.Float64() * 1.1) + mtoShipmentCopy.MTOServiceItems[index].EstimatedWeight = &estimatedWeightToUse + serviceItemEstimatedPrice, err := shipmentUpdater.mtoServiceItemCreator.FindEstimatedPrice(appCtx, &serviceItem, *mtoShipment) + + if serviceItemEstimatedPrice != 0 && err == nil { + + // multiply price by 110% of estimated weight + priceResult := serviceItemEstimatedPrice.MultiplyFloat64(1.1) + + mtoShipmentCopy.MTOServiceItems[index].PricingEstimate = &priceResult + } + if err != nil { + return mtoShipmentCopy, err + } + } + return mtoShipmentCopy, nil +} From 20f887c234d415ac61754f6328118a6caec43021 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Mon, 13 Jan 2025 22:06:49 +0000 Subject: [PATCH 053/260] B-22056 - fix tests. --- cmd/milmove/serve.go | 2 +- pkg/handlers/internalapi/uploads.go | 15 ++++++------ .../routing/internalapi_test/uploads_test.go | 2 +- .../mocks/NotificationReceiver.go | 23 +++++++++++-------- pkg/notifications/notification_receiver.go | 23 +++++++++++-------- .../notification_receiver_test.go | 16 ++++++++++--- 6 files changed, 49 insertions(+), 32 deletions(-) diff --git a/cmd/milmove/serve.go b/cmd/milmove/serve.go index 7d4e28a9918..a19f4b2444f 100644 --- a/cmd/milmove/serve.go +++ b/cmd/milmove/serve.go @@ -479,7 +479,7 @@ func buildRoutingConfig(appCtx appcontext.AppContext, v *viper.Viper, redisPool } // Notification Receiver - notificationReceiver, err := notifications.InitReceiver(v, appCtx.Logger()) + notificationReceiver, err := notifications.InitReceiver(v, appCtx.Logger(), true) if err != nil { appCtx.Logger().Fatal("notification receiver not enabled", zap.Error(err)) } diff --git a/pkg/handlers/internalapi/uploads.go b/pkg/handlers/internalapi/uploads.go index a1bff90b220..e4968707b7b 100644 --- a/pkg/handlers/internalapi/uploads.go +++ b/pkg/handlers/internalapi/uploads.go @@ -302,15 +302,14 @@ func (o *CustomGetUploadStatusResponse) WriteResponse(rw http.ResponseWriter, pr uploadStatus = AVStatusTypePROCESSING } + // Limitation: once the status code header has been written (first response), we are not able to update the status for subsequent responses. + // Standard 200 OK used with common SSE paradigm + rw.WriteHeader(http.StatusOK) if uploadStatus == AVStatusTypeCLEAN || uploadStatus == AVStatusTypeINFECTED { - rw.WriteHeader(http.StatusOK) o.writeEventStreamMessage(rw, producer, 0, "message", string(uploadStatus)) o.writeEventStreamMessage(rw, producer, 1, "close", "Connection closed") return // skip notification loop since object already tagged from anti-virus } else { - // Limitation: once the status code header has been written (first response), we are not able to update the status for subsequent responses. - // StatusAccepted: Standard code 202 for accepted request, but response not yet ready. - rw.WriteHeader(http.StatusAccepted) o.writeEventStreamMessage(rw, producer, 0, "message", string(uploadStatus)) } @@ -345,7 +344,11 @@ func (o *CustomGetUploadStatusResponse) WriteResponse(rw http.ResponseWriter, pr // For loop over 120 seconds, cancel context when done and it breaks the loop totalReceiverContext, totalReceiverContextCancelFunc := context.WithTimeout(context.Background(), 120*time.Second) - defer totalReceiverContextCancelFunc() + defer func() { + id_counter++ + o.writeEventStreamMessage(rw, producer, id_counter, "close", "Connection closed") + totalReceiverContextCancelFunc() + }() // Cleanup if client closes connection go func() { @@ -356,8 +359,6 @@ func (o *CustomGetUploadStatusResponse) WriteResponse(rw http.ResponseWriter, pr // Cleanup at end of work go func() { <-totalReceiverContext.Done() - id_counter++ - o.writeEventStreamMessage(rw, producer, id_counter, "close", "Connection closed") _ = o.receiver.CloseoutQueue(o.appCtx, queueUrl) }() diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/internalapi_test/uploads_test.go index 5b760f740bc..382cd74a5bf 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/internalapi_test/uploads_test.go @@ -77,7 +77,7 @@ func (suite *InternalAPISuite) TestUploads() { suite.SetupSiteHandler().ServeHTTP(rr, req) - suite.Equal(http.StatusAccepted, rr.Code) + suite.Equal(http.StatusOK, rr.Code) suite.Equal("text/event-stream", rr.Header().Get("content-type")) message1 := "id: 0\nevent: message\ndata: PROCESSING\n\n" diff --git a/pkg/notifications/mocks/NotificationReceiver.go b/pkg/notifications/mocks/NotificationReceiver.go index df8329e5f60..04c7d931659 100644 --- a/pkg/notifications/mocks/NotificationReceiver.go +++ b/pkg/notifications/mocks/NotificationReceiver.go @@ -3,9 +3,12 @@ package mocks import ( - mock "github.com/stretchr/testify/mock" + context "context" + appcontext "github.com/transcom/mymove/pkg/appcontext" + mock "github.com/stretchr/testify/mock" + notifications "github.com/transcom/mymove/pkg/notifications" ) @@ -88,9 +91,9 @@ func (_m *NotificationReceiver) GetDefaultTopic() (string, error) { return r0, r1 } -// ReceiveMessages provides a mock function with given fields: appCtx, queueUrl -func (_m *NotificationReceiver) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string) ([]notifications.ReceivedMessage, error) { - ret := _m.Called(appCtx, queueUrl) +// ReceiveMessages provides a mock function with given fields: appCtx, queueUrl, timerContext +func (_m *NotificationReceiver) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string, timerContext context.Context) ([]notifications.ReceivedMessage, error) { + ret := _m.Called(appCtx, queueUrl, timerContext) if len(ret) == 0 { panic("no return value specified for ReceiveMessages") @@ -98,19 +101,19 @@ func (_m *NotificationReceiver) ReceiveMessages(appCtx appcontext.AppContext, qu var r0 []notifications.ReceivedMessage var r1 error - if rf, ok := ret.Get(0).(func(appcontext.AppContext, string) ([]notifications.ReceivedMessage, error)); ok { - return rf(appCtx, queueUrl) + if rf, ok := ret.Get(0).(func(appcontext.AppContext, string, context.Context) ([]notifications.ReceivedMessage, error)); ok { + return rf(appCtx, queueUrl, timerContext) } - if rf, ok := ret.Get(0).(func(appcontext.AppContext, string) []notifications.ReceivedMessage); ok { - r0 = rf(appCtx, queueUrl) + if rf, ok := ret.Get(0).(func(appcontext.AppContext, string, context.Context) []notifications.ReceivedMessage); ok { + r0 = rf(appCtx, queueUrl, timerContext) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]notifications.ReceivedMessage) } } - if rf, ok := ret.Get(1).(func(appcontext.AppContext, string) error); ok { - r1 = rf(appCtx, queueUrl) + if rf, ok := ret.Get(1).(func(appcontext.AppContext, string, context.Context) error); ok { + r1 = rf(appCtx, queueUrl, timerContext) } else { r1 = ret.Error(1) } diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index 82bc32a02a8..09f9cd8b072 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -55,12 +55,14 @@ const ( type SnsClient interface { Subscribe(ctx context.Context, params *sns.SubscribeInput, optFns ...func(*sns.Options)) (*sns.SubscribeOutput, error) Unsubscribe(ctx context.Context, params *sns.UnsubscribeInput, optFns ...func(*sns.Options)) (*sns.UnsubscribeOutput, error) + ListSubscriptionsByTopic(context.Context, *sns.ListSubscriptionsByTopicInput, ...func(*sns.Options)) (*sns.ListSubscriptionsByTopicOutput, error) } type SqsClient interface { CreateQueue(ctx context.Context, params *sqs.CreateQueueInput, optFns ...func(*sqs.Options)) (*sqs.CreateQueueOutput, error) ReceiveMessage(ctx context.Context, params *sqs.ReceiveMessageInput, optFns ...func(*sqs.Options)) (*sqs.ReceiveMessageOutput, error) DeleteQueue(ctx context.Context, params *sqs.DeleteQueueInput, optFns ...func(*sqs.Options)) (*sqs.DeleteQueueOutput, error) + ListQueues(ctx context.Context, params *sqs.ListQueuesInput, optFns ...func(*sqs.Options)) (*sqs.ListQueuesOutput, error) } type ViperType interface { @@ -216,7 +218,7 @@ func (n NotificationReceiverContext) GetDefaultTopic() (string, error) { } // InitReceiver initializes the receiver backend, only call this once -func InitReceiver(v ViperType, logger *zap.Logger) (NotificationReceiver, error) { +func InitReceiver(v ViperType, logger *zap.Logger, wipeAllNotificationQueues bool) (NotificationReceiver, error) { if v.GetString(cli.ReceiverBackendFlag) == "sns&sqs" { // Setup notification receiver service with SNS & SQS backend dependencies @@ -239,9 +241,11 @@ func InitReceiver(v ViperType, logger *zap.Logger) (NotificationReceiver, error) notificationReceiver := NewNotificationReceiver(v, snsService, sqsService, awsSNSRegion, awsAccountId) // Remove any remaining previous notification queues on server start - err = notificationReceiver.wipeAllNotificationQueues(snsService, sqsService, logger) - if err != nil { - return nil, err + if wipeAllNotificationQueues { + err = notificationReceiver.wipeAllNotificationQueues(logger) + if err != nil { + return nil, err + } } return notificationReceiver, nil @@ -255,15 +259,14 @@ func (n NotificationReceiverContext) constructArn(awsService string, endpointNam } // Removes ALL previously created notification queues -func (n *NotificationReceiverContext) wipeAllNotificationQueues(snsService *sns.Client, sqsService *sqs.Client, logger *zap.Logger) error { - +func (n *NotificationReceiverContext) wipeAllNotificationQueues(logger *zap.Logger) error { defaultTopic, err := n.GetDefaultTopic() if err != nil { return err } logger.Info("Removing previous subscriptions...") - paginator := sns.NewListSubscriptionsByTopicPaginator(snsService, &sns.ListSubscriptionsByTopicInput{ + paginator := sns.NewListSubscriptionsByTopicPaginator(n.snsService, &sns.ListSubscriptionsByTopicInput{ TopicArn: aws.String(n.constructArn("sns", defaultTopic)), }) @@ -276,7 +279,7 @@ func (n *NotificationReceiverContext) wipeAllNotificationQueues(snsService *sns. if strings.Contains(*subscription.Endpoint, string(QueuePrefixObjectTagsAdded)) { logger.Info("Subscription ARN: ", zap.String("subscription arn", *subscription.SubscriptionArn)) logger.Info("Endpoint ARN: ", zap.String("endpoint arn", *subscription.Endpoint)) - _, err = snsService.Unsubscribe(context.Background(), &sns.UnsubscribeInput{ + _, err = n.snsService.Unsubscribe(context.Background(), &sns.UnsubscribeInput{ SubscriptionArn: subscription.SubscriptionArn, }) if err != nil { @@ -287,7 +290,7 @@ func (n *NotificationReceiverContext) wipeAllNotificationQueues(snsService *sns. } logger.Info("Removing previous queues...") - result, err := sqsService.ListQueues(context.Background(), &sqs.ListQueuesInput{ + result, err := n.sqsService.ListQueues(context.Background(), &sqs.ListQueuesInput{ QueueNamePrefix: aws.String(string(QueuePrefixObjectTagsAdded)), }) if err != nil { @@ -295,7 +298,7 @@ func (n *NotificationReceiverContext) wipeAllNotificationQueues(snsService *sns. } for _, url := range result.QueueUrls { - _, err = sqsService.DeleteQueue(context.Background(), &sqs.DeleteQueueInput{ + _, err = n.sqsService.DeleteQueue(context.Background(), &sqs.DeleteQueueInput{ QueueUrl: &url, }) if err != nil { diff --git a/pkg/notifications/notification_receiver_test.go b/pkg/notifications/notification_receiver_test.go index e3275827e21..a996a67ce4e 100644 --- a/pkg/notifications/notification_receiver_test.go +++ b/pkg/notifications/notification_receiver_test.go @@ -66,6 +66,10 @@ func (_m *MockSnsClient) Unsubscribe(ctx context.Context, params *sns.Unsubscrib return &sns.UnsubscribeOutput{}, nil } +func (_m *MockSnsClient) ListSubscriptionsByTopic(context.Context, *sns.ListSubscriptionsByTopicInput, ...func(*sns.Options)) (*sns.ListSubscriptionsByTopicOutput, error) { + return &sns.ListSubscriptionsByTopicOutput{}, nil +} + // mock - SQS type MockSqsClient struct { mock.Mock @@ -90,11 +94,15 @@ func (_m *MockSqsClient) DeleteQueue(ctx context.Context, params *sqs.DeleteQueu return &sqs.DeleteQueueOutput{}, nil } +func (_m *MockSqsClient) ListQueues(ctx context.Context, params *sqs.ListQueuesInput, optFns ...func(*sqs.Options)) (*sqs.ListQueuesOutput, error) { + return &sqs.ListQueuesOutput{}, nil +} + func (suite *notificationReceiverSuite) TestSuccessPath() { suite.Run("local backend - notification receiver stub", func() { v := viper.New() - localReceiver, err := InitReceiver(v, suite.Logger()) + localReceiver, err := InitReceiver(v, suite.Logger(), true) suite.NoError(err) suite.IsType(StubNotificationReceiver{}, localReceiver) @@ -121,10 +129,12 @@ func (suite *notificationReceiverSuite) TestSuccessPath() { suite.Equal(*receivedMessages[0].Body, fmt.Sprintf("%s:stubMessageBody", createdQueueUrl)) }) - suite.Run("aws backend - notification receiver init", func() { + suite.Run("aws backend - notification receiver InitReceiver", func() { v := Viper{} - receiver, _ := InitReceiver(&v, suite.Logger()) + receiver, err := InitReceiver(&v, suite.Logger(), false) + + suite.NoError(err) suite.IsType(NotificationReceiverContext{}, receiver) defaultTopic, err := receiver.GetDefaultTopic() suite.Equal("fake_sns_topic", defaultTopic) From 5990b490cb800452d1acbccecdd46505321d4459 Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Tue, 14 Jan 2025 00:08:41 +0000 Subject: [PATCH 054/260] Fixed test cases --- .../ServicesCounselingQueue.test.jsx | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.test.jsx b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.test.jsx index eda36174ca3..592cd9a8500 100644 --- a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.test.jsx +++ b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.test.jsx @@ -19,6 +19,31 @@ jest.mock('hooks/queries', () => ({ useUserQueries: jest.fn(), useServicesCounselingQueueQueries: jest.fn(), useServicesCounselingQueuePPMQueries: jest.fn(), + useBulkAssignmentQueries: () => { + return { + availableOfficeUsers: [ + { + firstName: 'John', + lastName: 'Snow', + officeUserId: '123', + workload: 0, + }, + { + firstName: 'Jane', + lastName: 'Doe', + officeUserId: '456', + workload: 1, + }, + { + firstName: 'Jimmy', + lastName: 'Page', + officeUserId: '789', + workload: 2, + }, + ], + bulkAssignmentMoveIDs: ['1', '2', '3'], + }; + }, })); jest.mock('utils/featureFlags', () => ({ From 0964e6195f9bd74a3c7295dd6079df941ffae393 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Tue, 14 Jan 2025 17:53:36 +0000 Subject: [PATCH 055/260] B-22056 - using generated mocks for unit tests instead. --- .../mocks/NotificationReceiver.go | 136 ------------- pkg/notifications/notification_receiver.go | 5 +- .../notification_receiver_test.go | 124 +++++------- pkg/notifications/receiverMocks/SnsClient.go | 141 ++++++++++++++ pkg/notifications/receiverMocks/SqsClient.go | 178 ++++++++++++++++++ pkg/notifications/receiverMocks/ViperType.go | 51 +++++ 6 files changed, 420 insertions(+), 215 deletions(-) delete mode 100644 pkg/notifications/mocks/NotificationReceiver.go create mode 100644 pkg/notifications/receiverMocks/SnsClient.go create mode 100644 pkg/notifications/receiverMocks/SqsClient.go create mode 100644 pkg/notifications/receiverMocks/ViperType.go diff --git a/pkg/notifications/mocks/NotificationReceiver.go b/pkg/notifications/mocks/NotificationReceiver.go deleted file mode 100644 index 04c7d931659..00000000000 --- a/pkg/notifications/mocks/NotificationReceiver.go +++ /dev/null @@ -1,136 +0,0 @@ -// Code generated by mockery. DO NOT EDIT. - -package mocks - -import ( - context "context" - - appcontext "github.com/transcom/mymove/pkg/appcontext" - - mock "github.com/stretchr/testify/mock" - - notifications "github.com/transcom/mymove/pkg/notifications" -) - -// NotificationReceiver is an autogenerated mock type for the NotificationReceiver type -type NotificationReceiver struct { - mock.Mock -} - -// CloseoutQueue provides a mock function with given fields: appCtx, queueUrl -func (_m *NotificationReceiver) CloseoutQueue(appCtx appcontext.AppContext, queueUrl string) error { - ret := _m.Called(appCtx, queueUrl) - - if len(ret) == 0 { - panic("no return value specified for CloseoutQueue") - } - - var r0 error - if rf, ok := ret.Get(0).(func(appcontext.AppContext, string) error); ok { - r0 = rf(appCtx, queueUrl) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// CreateQueueWithSubscription provides a mock function with given fields: appCtx, params -func (_m *NotificationReceiver) CreateQueueWithSubscription(appCtx appcontext.AppContext, params notifications.NotificationQueueParams) (string, error) { - ret := _m.Called(appCtx, params) - - if len(ret) == 0 { - panic("no return value specified for CreateQueueWithSubscription") - } - - var r0 string - var r1 error - if rf, ok := ret.Get(0).(func(appcontext.AppContext, notifications.NotificationQueueParams) (string, error)); ok { - return rf(appCtx, params) - } - if rf, ok := ret.Get(0).(func(appcontext.AppContext, notifications.NotificationQueueParams) string); ok { - r0 = rf(appCtx, params) - } else { - r0 = ret.Get(0).(string) - } - - if rf, ok := ret.Get(1).(func(appcontext.AppContext, notifications.NotificationQueueParams) error); ok { - r1 = rf(appCtx, params) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetDefaultTopic provides a mock function with given fields: -func (_m *NotificationReceiver) GetDefaultTopic() (string, error) { - ret := _m.Called() - - if len(ret) == 0 { - panic("no return value specified for GetDefaultTopic") - } - - var r0 string - var r1 error - if rf, ok := ret.Get(0).(func() (string, error)); ok { - return rf() - } - if rf, ok := ret.Get(0).(func() string); ok { - r0 = rf() - } else { - r0 = ret.Get(0).(string) - } - - if rf, ok := ret.Get(1).(func() error); ok { - r1 = rf() - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// ReceiveMessages provides a mock function with given fields: appCtx, queueUrl, timerContext -func (_m *NotificationReceiver) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string, timerContext context.Context) ([]notifications.ReceivedMessage, error) { - ret := _m.Called(appCtx, queueUrl, timerContext) - - if len(ret) == 0 { - panic("no return value specified for ReceiveMessages") - } - - var r0 []notifications.ReceivedMessage - var r1 error - if rf, ok := ret.Get(0).(func(appcontext.AppContext, string, context.Context) ([]notifications.ReceivedMessage, error)); ok { - return rf(appCtx, queueUrl, timerContext) - } - if rf, ok := ret.Get(0).(func(appcontext.AppContext, string, context.Context) []notifications.ReceivedMessage); ok { - r0 = rf(appCtx, queueUrl, timerContext) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([]notifications.ReceivedMessage) - } - } - - if rf, ok := ret.Get(1).(func(appcontext.AppContext, string, context.Context) error); ok { - r1 = rf(appCtx, queueUrl, timerContext) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// NewNotificationReceiver creates a new instance of NotificationReceiver. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -// The first argument is typically a *testing.T value. -func NewNotificationReceiver(t interface { - mock.TestingT - Cleanup(func()) -}) *NotificationReceiver { - mock := &NotificationReceiver{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index 09f9cd8b072..76c9d3bebbe 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -25,8 +25,6 @@ type NotificationQueueParams struct { } // NotificationReceiver is an interface for receiving notifications -// -//go:generate mockery --name NotificationReceiver type NotificationReceiver interface { CreateQueueWithSubscription(appCtx appcontext.AppContext, params NotificationQueueParams) (string, error) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string, timerContext context.Context) ([]ReceivedMessage, error) @@ -52,12 +50,14 @@ const ( QueuePrefixObjectTagsAdded QueuePrefixType = "ObjectTagsAdded" ) +//go:generate mockery --name SnsClient --output ./receiverMocks type SnsClient interface { Subscribe(ctx context.Context, params *sns.SubscribeInput, optFns ...func(*sns.Options)) (*sns.SubscribeOutput, error) Unsubscribe(ctx context.Context, params *sns.UnsubscribeInput, optFns ...func(*sns.Options)) (*sns.UnsubscribeOutput, error) ListSubscriptionsByTopic(context.Context, *sns.ListSubscriptionsByTopicInput, ...func(*sns.Options)) (*sns.ListSubscriptionsByTopicOutput, error) } +//go:generate mockery --name SqsClient --output ./receiverMocks type SqsClient interface { CreateQueue(ctx context.Context, params *sqs.CreateQueueInput, optFns ...func(*sqs.Options)) (*sqs.CreateQueueOutput, error) ReceiveMessage(ctx context.Context, params *sqs.ReceiveMessageInput, optFns ...func(*sqs.Options)) (*sqs.ReceiveMessageOutput, error) @@ -65,6 +65,7 @@ type SqsClient interface { ListQueues(ctx context.Context, params *sqs.ListQueuesInput, optFns ...func(*sqs.Options)) (*sqs.ListQueuesOutput, error) } +//go:generate mockery --name ViperType --output ./receiverMocks type ViperType interface { GetString(string) string SetEnvKeyReplacer(*strings.Replacer) diff --git a/pkg/notifications/notification_receiver_test.go b/pkg/notifications/notification_receiver_test.go index a996a67ce4e..e895a7f2e3b 100644 --- a/pkg/notifications/notification_receiver_test.go +++ b/pkg/notifications/notification_receiver_test.go @@ -3,7 +3,6 @@ package notifications import ( "context" "fmt" - "strings" "testing" "time" @@ -11,11 +10,11 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sns" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/aws-sdk-go-v2/service/sqs/types" - "github.com/spf13/viper" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" "github.com/transcom/mymove/pkg/cli" + mocks "github.com/transcom/mymove/pkg/notifications/receiverMocks" "github.com/transcom/mymove/pkg/testingsuite" ) @@ -33,76 +32,16 @@ func TestNotificationReceiverSuite(t *testing.T) { hs.PopTestSuite.TearDown() } -// mock - Viper -type Viper struct { - mock.Mock -} - -func (_m *Viper) GetString(key string) string { - switch key { - case cli.ReceiverBackendFlag: - return "sns&sqs" - case cli.SNSRegionFlag: - return "us-gov-west-1" - case cli.SNSAccountId: - return "12345" - case cli.SNSTagsUpdatedTopicFlag: - return "fake_sns_topic" - } - return "" -} -func (_m *Viper) SetEnvKeyReplacer(_ *strings.Replacer) {} - -// mock - SNS -type MockSnsClient struct { - mock.Mock -} - -func (_m *MockSnsClient) Subscribe(ctx context.Context, params *sns.SubscribeInput, optFns ...func(*sns.Options)) (*sns.SubscribeOutput, error) { - return &sns.SubscribeOutput{SubscriptionArn: aws.String("FakeSubscriptionArn")}, nil -} - -func (_m *MockSnsClient) Unsubscribe(ctx context.Context, params *sns.UnsubscribeInput, optFns ...func(*sns.Options)) (*sns.UnsubscribeOutput, error) { - return &sns.UnsubscribeOutput{}, nil -} - -func (_m *MockSnsClient) ListSubscriptionsByTopic(context.Context, *sns.ListSubscriptionsByTopicInput, ...func(*sns.Options)) (*sns.ListSubscriptionsByTopicOutput, error) { - return &sns.ListSubscriptionsByTopicOutput{}, nil -} - -// mock - SQS -type MockSqsClient struct { - mock.Mock -} - -func (_m *MockSqsClient) CreateQueue(ctx context.Context, params *sqs.CreateQueueInput, optFns ...func(*sqs.Options)) (*sqs.CreateQueueOutput, error) { - return &sqs.CreateQueueOutput{ - QueueUrl: aws.String("FakeQueueUrl"), - }, nil -} -func (_m *MockSqsClient) ReceiveMessage(ctx context.Context, params *sqs.ReceiveMessageInput, optFns ...func(*sqs.Options)) (*sqs.ReceiveMessageOutput, error) { - messages := make([]types.Message, 0) - messages = append(messages, types.Message{ - MessageId: aws.String("fakeMessageId"), - Body: aws.String(*params.QueueUrl + ":fakeMessageBody"), - }) - return &sqs.ReceiveMessageOutput{ - Messages: messages, - }, nil -} -func (_m *MockSqsClient) DeleteQueue(ctx context.Context, params *sqs.DeleteQueueInput, optFns ...func(*sqs.Options)) (*sqs.DeleteQueueOutput, error) { - return &sqs.DeleteQueueOutput{}, nil -} - -func (_m *MockSqsClient) ListQueues(ctx context.Context, params *sqs.ListQueuesInput, optFns ...func(*sqs.Options)) (*sqs.ListQueuesOutput, error) { - return &sqs.ListQueuesOutput{}, nil -} - func (suite *notificationReceiverSuite) TestSuccessPath() { suite.Run("local backend - notification receiver stub", func() { - v := viper.New() - localReceiver, err := InitReceiver(v, suite.Logger(), true) + // Setup mocks + mockedViper := mocks.ViperType{} + mockedViper.On("GetString", cli.ReceiverBackendFlag).Return("local") + mockedViper.On("GetString", cli.SNSRegionFlag).Return("us-gov-west-1") + mockedViper.On("GetString", cli.SNSAccountId).Return("12345") + mockedViper.On("GetString", cli.SNSTagsUpdatedTopicFlag).Return("fake_sns_topic") + localReceiver, err := InitReceiver(&mockedViper, suite.Logger(), true) suite.NoError(err) suite.IsType(StubNotificationReceiver{}, localReceiver) @@ -130,9 +69,14 @@ func (suite *notificationReceiverSuite) TestSuccessPath() { }) suite.Run("aws backend - notification receiver InitReceiver", func() { - v := Viper{} + // Setup mocks + mockedViper := mocks.ViperType{} + mockedViper.On("GetString", cli.ReceiverBackendFlag).Return("sns&sqs") + mockedViper.On("GetString", cli.SNSRegionFlag).Return("us-gov-west-1") + mockedViper.On("GetString", cli.SNSAccountId).Return("12345") + mockedViper.On("GetString", cli.SNSTagsUpdatedTopicFlag).Return("fake_sns_topic") - receiver, err := InitReceiver(&v, suite.Logger(), false) + receiver, err := InitReceiver(&mockedViper, suite.Logger(), false) suite.NoError(err) suite.IsType(NotificationReceiverContext{}, receiver) @@ -142,11 +86,37 @@ func (suite *notificationReceiverSuite) TestSuccessPath() { }) suite.Run("aws backend - notification receiver with mock services", func() { - v := Viper{} - snsService := MockSnsClient{} - sqsService := MockSqsClient{} - - receiver := NewNotificationReceiver(&v, &snsService, &sqsService, "", "") + // Setup mocks + mockedViper := mocks.ViperType{} + mockedViper.On("GetString", cli.ReceiverBackendFlag).Return("sns&sqs") + mockedViper.On("GetString", cli.SNSRegionFlag).Return("us-gov-west-1") + mockedViper.On("GetString", cli.SNSAccountId).Return("12345") + mockedViper.On("GetString", cli.SNSTagsUpdatedTopicFlag).Return("fake_sns_topic") + + mockedSns := mocks.SnsClient{} + mockedSns.On("Subscribe", mock.Anything, mock.AnythingOfType("*sns.SubscribeInput")).Return(&sns.SubscribeOutput{ + SubscriptionArn: aws.String("FakeSubscriptionArn"), + }, nil) + mockedSns.On("Unsubscribe", mock.Anything, mock.AnythingOfType("*sns.UnsubscribeInput")).Return(&sns.UnsubscribeOutput{}, nil) + mockedSns.On("ListSubscriptionsByTopic", mock.Anything, mock.AnythingOfType("*sns.ListSubscriptionsByTopicInput")).Return(&sns.ListSubscriptionsByTopicOutput{}, nil) + + mockedSqs := mocks.SqsClient{} + mockedSqs.On("CreateQueue", mock.Anything, mock.AnythingOfType("*sqs.CreateQueueInput")).Return(&sqs.CreateQueueOutput{ + QueueUrl: aws.String("fakeQueueUrl"), + }, nil) + mockedSqs.On("ReceiveMessage", mock.Anything, mock.AnythingOfType("*sqs.ReceiveMessageInput")).Return(&sqs.ReceiveMessageOutput{ + Messages: []types.Message{ + { + MessageId: aws.String("fakeMessageId"), + Body: aws.String("fakeQueueUrl:fakeMessageBody"), + }, + }, + }, nil) + mockedSqs.On("DeleteQueue", mock.Anything, mock.AnythingOfType("*sqs.DeleteQueueInput")).Return(&sqs.DeleteQueueOutput{}, nil) + mockedSqs.On("ListQueues", mock.Anything, mock.AnythingOfType("*sqs.ListQueuesInput")).Return(&sqs.ListQueuesOutput{}, nil) + + // Run test + receiver := NewNotificationReceiver(&mockedViper, &mockedSns, &mockedSqs, "", "") suite.IsType(NotificationReceiverContext{}, receiver) defaultTopic, err := receiver.GetDefaultTopic() @@ -158,7 +128,7 @@ func (suite *notificationReceiverSuite) TestSuccessPath() { } createdQueueUrl, err := receiver.CreateQueueWithSubscription(suite.AppContextForTest(), queueParams) suite.NoError(err) - suite.Equal("FakeQueueUrl", createdQueueUrl) + suite.Equal("fakeQueueUrl", createdQueueUrl) timerContext, cancelTimerContext := context.WithTimeout(context.Background(), 2*time.Second) defer cancelTimerContext() diff --git a/pkg/notifications/receiverMocks/SnsClient.go b/pkg/notifications/receiverMocks/SnsClient.go new file mode 100644 index 00000000000..0c562896a0d --- /dev/null +++ b/pkg/notifications/receiverMocks/SnsClient.go @@ -0,0 +1,141 @@ +// Code generated by mockery. DO NOT EDIT. + +package mocks + +import ( + context "context" + + mock "github.com/stretchr/testify/mock" + + sns "github.com/aws/aws-sdk-go-v2/service/sns" +) + +// SnsClient is an autogenerated mock type for the SnsClient type +type SnsClient struct { + mock.Mock +} + +// ListSubscriptionsByTopic provides a mock function with given fields: _a0, _a1, _a2 +func (_m *SnsClient) ListSubscriptionsByTopic(_a0 context.Context, _a1 *sns.ListSubscriptionsByTopicInput, _a2 ...func(*sns.Options)) (*sns.ListSubscriptionsByTopicOutput, error) { + _va := make([]interface{}, len(_a2)) + for _i := range _a2 { + _va[_i] = _a2[_i] + } + var _ca []interface{} + _ca = append(_ca, _a0, _a1) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + if len(ret) == 0 { + panic("no return value specified for ListSubscriptionsByTopic") + } + + var r0 *sns.ListSubscriptionsByTopicOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sns.ListSubscriptionsByTopicInput, ...func(*sns.Options)) (*sns.ListSubscriptionsByTopicOutput, error)); ok { + return rf(_a0, _a1, _a2...) + } + if rf, ok := ret.Get(0).(func(context.Context, *sns.ListSubscriptionsByTopicInput, ...func(*sns.Options)) *sns.ListSubscriptionsByTopicOutput); ok { + r0 = rf(_a0, _a1, _a2...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*sns.ListSubscriptionsByTopicOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *sns.ListSubscriptionsByTopicInput, ...func(*sns.Options)) error); ok { + r1 = rf(_a0, _a1, _a2...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// Subscribe provides a mock function with given fields: ctx, params, optFns +func (_m *SnsClient) Subscribe(ctx context.Context, params *sns.SubscribeInput, optFns ...func(*sns.Options)) (*sns.SubscribeOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + if len(ret) == 0 { + panic("no return value specified for Subscribe") + } + + var r0 *sns.SubscribeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sns.SubscribeInput, ...func(*sns.Options)) (*sns.SubscribeOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *sns.SubscribeInput, ...func(*sns.Options)) *sns.SubscribeOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*sns.SubscribeOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *sns.SubscribeInput, ...func(*sns.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// Unsubscribe provides a mock function with given fields: ctx, params, optFns +func (_m *SnsClient) Unsubscribe(ctx context.Context, params *sns.UnsubscribeInput, optFns ...func(*sns.Options)) (*sns.UnsubscribeOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + if len(ret) == 0 { + panic("no return value specified for Unsubscribe") + } + + var r0 *sns.UnsubscribeOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sns.UnsubscribeInput, ...func(*sns.Options)) (*sns.UnsubscribeOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *sns.UnsubscribeInput, ...func(*sns.Options)) *sns.UnsubscribeOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*sns.UnsubscribeOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *sns.UnsubscribeInput, ...func(*sns.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// NewSnsClient creates a new instance of SnsClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewSnsClient(t interface { + mock.TestingT + Cleanup(func()) +}) *SnsClient { + mock := &SnsClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/notifications/receiverMocks/SqsClient.go b/pkg/notifications/receiverMocks/SqsClient.go new file mode 100644 index 00000000000..0ab970fc530 --- /dev/null +++ b/pkg/notifications/receiverMocks/SqsClient.go @@ -0,0 +1,178 @@ +// Code generated by mockery. DO NOT EDIT. + +package mocks + +import ( + context "context" + + mock "github.com/stretchr/testify/mock" + + sqs "github.com/aws/aws-sdk-go-v2/service/sqs" +) + +// SqsClient is an autogenerated mock type for the SqsClient type +type SqsClient struct { + mock.Mock +} + +// CreateQueue provides a mock function with given fields: ctx, params, optFns +func (_m *SqsClient) CreateQueue(ctx context.Context, params *sqs.CreateQueueInput, optFns ...func(*sqs.Options)) (*sqs.CreateQueueOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + if len(ret) == 0 { + panic("no return value specified for CreateQueue") + } + + var r0 *sqs.CreateQueueOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sqs.CreateQueueInput, ...func(*sqs.Options)) (*sqs.CreateQueueOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *sqs.CreateQueueInput, ...func(*sqs.Options)) *sqs.CreateQueueOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*sqs.CreateQueueOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *sqs.CreateQueueInput, ...func(*sqs.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// DeleteQueue provides a mock function with given fields: ctx, params, optFns +func (_m *SqsClient) DeleteQueue(ctx context.Context, params *sqs.DeleteQueueInput, optFns ...func(*sqs.Options)) (*sqs.DeleteQueueOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + if len(ret) == 0 { + panic("no return value specified for DeleteQueue") + } + + var r0 *sqs.DeleteQueueOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sqs.DeleteQueueInput, ...func(*sqs.Options)) (*sqs.DeleteQueueOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *sqs.DeleteQueueInput, ...func(*sqs.Options)) *sqs.DeleteQueueOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*sqs.DeleteQueueOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *sqs.DeleteQueueInput, ...func(*sqs.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// ListQueues provides a mock function with given fields: ctx, params, optFns +func (_m *SqsClient) ListQueues(ctx context.Context, params *sqs.ListQueuesInput, optFns ...func(*sqs.Options)) (*sqs.ListQueuesOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + if len(ret) == 0 { + panic("no return value specified for ListQueues") + } + + var r0 *sqs.ListQueuesOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sqs.ListQueuesInput, ...func(*sqs.Options)) (*sqs.ListQueuesOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *sqs.ListQueuesInput, ...func(*sqs.Options)) *sqs.ListQueuesOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*sqs.ListQueuesOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *sqs.ListQueuesInput, ...func(*sqs.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// ReceiveMessage provides a mock function with given fields: ctx, params, optFns +func (_m *SqsClient) ReceiveMessage(ctx context.Context, params *sqs.ReceiveMessageInput, optFns ...func(*sqs.Options)) (*sqs.ReceiveMessageOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + if len(ret) == 0 { + panic("no return value specified for ReceiveMessage") + } + + var r0 *sqs.ReceiveMessageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sqs.ReceiveMessageInput, ...func(*sqs.Options)) (*sqs.ReceiveMessageOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *sqs.ReceiveMessageInput, ...func(*sqs.Options)) *sqs.ReceiveMessageOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*sqs.ReceiveMessageOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *sqs.ReceiveMessageInput, ...func(*sqs.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// NewSqsClient creates a new instance of SqsClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewSqsClient(t interface { + mock.TestingT + Cleanup(func()) +}) *SqsClient { + mock := &SqsClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/pkg/notifications/receiverMocks/ViperType.go b/pkg/notifications/receiverMocks/ViperType.go new file mode 100644 index 00000000000..bf5e6f84090 --- /dev/null +++ b/pkg/notifications/receiverMocks/ViperType.go @@ -0,0 +1,51 @@ +// Code generated by mockery. DO NOT EDIT. + +package mocks + +import ( + mock "github.com/stretchr/testify/mock" + + strings "strings" +) + +// ViperType is an autogenerated mock type for the ViperType type +type ViperType struct { + mock.Mock +} + +// GetString provides a mock function with given fields: _a0 +func (_m *ViperType) GetString(_a0 string) string { + ret := _m.Called(_a0) + + if len(ret) == 0 { + panic("no return value specified for GetString") + } + + var r0 string + if rf, ok := ret.Get(0).(func(string) string); ok { + r0 = rf(_a0) + } else { + r0 = ret.Get(0).(string) + } + + return r0 +} + +// SetEnvKeyReplacer provides a mock function with given fields: _a0 +func (_m *ViperType) SetEnvKeyReplacer(_a0 *strings.Replacer) { + _m.Called(_a0) +} + +// NewViperType creates a new instance of ViperType. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewViperType(t interface { + mock.TestingT + Cleanup(func()) +}) *ViperType { + mock := &ViperType{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} From 25ed4b2a63f3acd0c692b0f5d9a62d28af7549d4 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Tue, 14 Jan 2025 21:26:55 +0000 Subject: [PATCH 056/260] B-22056 - additional security for sqs based on best practices --- pkg/notifications/notification_receiver.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index 76c9d3bebbe..49222a69fdb 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -111,11 +111,22 @@ func (n NotificationReceiverContext) CreateQueueWithSubscription(appCtx appconte "Resource": "%s", "Condition": { "ArnEquals": { - "aws:SourceArn": "%s" + "aws:SourceArn": "%s" } } + }, { + "Sid": "DenyNonSSLAccess", + "Effect": "Deny", + "Principal": "*", + "Action": "sqs:*", + "Resource": "%s", + "Condition": { + "Bool": { + "aws:SecureTransport": "false" + } + } }] - }`, queueArn, topicArn) + }`, queueArn, topicArn, queueArn) input := &sqs.CreateQueueInput{ QueueName: &queueName, From f80886efe531f4f41af5efd499614c78728a0051 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Tue, 14 Jan 2025 21:37:52 +0000 Subject: [PATCH 057/260] B-22056 - deploy to exp. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8d3c39da69..b5bd5920986 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch placeholder_branch_name + dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env placeholder_env + dp3-env: &dp3-env exp # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch placeholder_branch_name + integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name + integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch placeholder_branch_name + client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch placeholder_branch_name + server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint executors: base_small: From e59cff8ef4dbd87d03a26ceed8f0412b29b5f59f Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Tue, 14 Jan 2025 22:54:47 +0000 Subject: [PATCH 058/260] B-22056 - restore exp env. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5bd5920986..b8d3c39da69 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + dp3-branch: &dp3-branch placeholder_branch_name # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env exp + dp3-env: &dp3-env placeholder_env # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-ignore-branch: &integration-ignore-branch placeholder_branch_name # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + client-ignore-branch: &client-ignore-branch placeholder_branch_name # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + server-ignore-branch: &server-ignore-branch placeholder_branch_name executors: base_small: From bdade45a193bd601c5566babfcdbcb2b763acc14 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Wed, 15 Jan 2025 15:47:41 +0000 Subject: [PATCH 059/260] B-22056 - delete message after receive. --- .../routing/internalapi_test/uploads_test.go | 2 +- pkg/notifications/notification_receiver.go | 11 +++++- .../notification_receiver_stub.go | 2 +- .../notification_receiver_test.go | 1 + pkg/notifications/receiverMocks/SqsClient.go | 37 +++++++++++++++++++ 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/internalapi_test/uploads_test.go index 382cd74a5bf..c75445cc191 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/internalapi_test/uploads_test.go @@ -69,7 +69,7 @@ func (suite *InternalAPISuite) TestUploads() { fakeS3.EmptyTags = true } go func() { - time.Sleep(2 * time.Second) + time.Sleep(3 * time.Second) if ok && fakeS3 != nil { fakeS3.EmptyTags = false } diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index 49222a69fdb..b685cfacaa1 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -61,6 +61,7 @@ type SnsClient interface { type SqsClient interface { CreateQueue(ctx context.Context, params *sqs.CreateQueueInput, optFns ...func(*sqs.Options)) (*sqs.CreateQueueOutput, error) ReceiveMessage(ctx context.Context, params *sqs.ReceiveMessageInput, optFns ...func(*sqs.Options)) (*sqs.ReceiveMessageOutput, error) + DeleteMessage(ctx context.Context, params *sqs.DeleteMessageInput, optFns ...func(*sqs.Options)) (*sqs.DeleteMessageOutput, error) DeleteQueue(ctx context.Context, params *sqs.DeleteQueueInput, optFns ...func(*sqs.Options)) (*sqs.DeleteQueueOutput, error) ListQueues(ctx context.Context, params *sqs.ListQueuesInput, optFns ...func(*sqs.Options)) (*sqs.ListQueuesOutput, error) } @@ -188,6 +189,14 @@ func (n NotificationReceiverContext) ReceiveMessages(appCtx appcontext.AppContex MessageId: *value.MessageId, Body: value.Body, } + + _, err := n.sqsService.DeleteMessage(recCtx, &sqs.DeleteMessageInput{ + QueueUrl: &queueUrl, + ReceiptHandle: value.ReceiptHandle, + }) + if err != nil { + appCtx.Logger().Info("Couldn't delete message from queue. Error: %v\n", zap.Error(err)) + } } return receivedMessages, recCtx.Err() @@ -195,7 +204,7 @@ func (n NotificationReceiverContext) ReceiveMessages(appCtx appcontext.AppContex // CloseoutQueue stops receiving messages and cleans up the queue and its subscriptions func (n NotificationReceiverContext) CloseoutQueue(appCtx appcontext.AppContext, queueUrl string) error { - appCtx.Logger().Info("Closing out queue: %v", zap.String("queueUrl", queueUrl)) + appCtx.Logger().Info("Closing out queue: ", zap.String("queueUrl", queueUrl)) if cancelFunc, exists := n.receiverCancelMap[queueUrl]; exists { cancelFunc() diff --git a/pkg/notifications/notification_receiver_stub.go b/pkg/notifications/notification_receiver_stub.go index b09b61363fc..e98f0c8aa1e 100644 --- a/pkg/notifications/notification_receiver_stub.go +++ b/pkg/notifications/notification_receiver_stub.go @@ -29,7 +29,7 @@ func (n StubNotificationReceiver) CreateQueueWithSubscription(appCtx appcontext. } func (n StubNotificationReceiver) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string, timerContext context.Context) ([]ReceivedMessage, error) { - time.Sleep(2 * time.Second) + time.Sleep(3 * time.Second) messageId := "stubMessageId" body := queueUrl + ":stubMessageBody" mockMessages := make([]ReceivedMessage, 1) diff --git a/pkg/notifications/notification_receiver_test.go b/pkg/notifications/notification_receiver_test.go index e895a7f2e3b..934cb7db20b 100644 --- a/pkg/notifications/notification_receiver_test.go +++ b/pkg/notifications/notification_receiver_test.go @@ -112,6 +112,7 @@ func (suite *notificationReceiverSuite) TestSuccessPath() { }, }, }, nil) + mockedSqs.On("DeleteMessage", mock.Anything, mock.AnythingOfType("*sqs.DeleteMessageInput")).Return(&sqs.DeleteMessageOutput{}, nil) mockedSqs.On("DeleteQueue", mock.Anything, mock.AnythingOfType("*sqs.DeleteQueueInput")).Return(&sqs.DeleteQueueOutput{}, nil) mockedSqs.On("ListQueues", mock.Anything, mock.AnythingOfType("*sqs.ListQueuesInput")).Return(&sqs.ListQueuesOutput{}, nil) diff --git a/pkg/notifications/receiverMocks/SqsClient.go b/pkg/notifications/receiverMocks/SqsClient.go index 0ab970fc530..c8e6e6aa284 100644 --- a/pkg/notifications/receiverMocks/SqsClient.go +++ b/pkg/notifications/receiverMocks/SqsClient.go @@ -52,6 +52,43 @@ func (_m *SqsClient) CreateQueue(ctx context.Context, params *sqs.CreateQueueInp return r0, r1 } +// DeleteMessage provides a mock function with given fields: ctx, params, optFns +func (_m *SqsClient) DeleteMessage(ctx context.Context, params *sqs.DeleteMessageInput, optFns ...func(*sqs.Options)) (*sqs.DeleteMessageOutput, error) { + _va := make([]interface{}, len(optFns)) + for _i := range optFns { + _va[_i] = optFns[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, params) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + if len(ret) == 0 { + panic("no return value specified for DeleteMessage") + } + + var r0 *sqs.DeleteMessageOutput + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *sqs.DeleteMessageInput, ...func(*sqs.Options)) (*sqs.DeleteMessageOutput, error)); ok { + return rf(ctx, params, optFns...) + } + if rf, ok := ret.Get(0).(func(context.Context, *sqs.DeleteMessageInput, ...func(*sqs.Options)) *sqs.DeleteMessageOutput); ok { + r0 = rf(ctx, params, optFns...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*sqs.DeleteMessageOutput) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *sqs.DeleteMessageInput, ...func(*sqs.Options)) error); ok { + r1 = rf(ctx, params, optFns...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // DeleteQueue provides a mock function with given fields: ctx, params, optFns func (_m *SqsClient) DeleteQueue(ctx context.Context, params *sqs.DeleteQueueInput, optFns ...func(*sqs.Options)) (*sqs.DeleteQueueOutput, error) { _va := make([]interface{}, len(optFns)) From b8d1a369b6cf38d17cdeb5af4b708860bfbe294b Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Wed, 15 Jan 2025 16:40:49 +0000 Subject: [PATCH 060/260] B-22056 - attempting to fix test. --- .../routing/internalapi_test/uploads_test.go | 13 ++++++------- pkg/notifications/notification_receiver_stub.go | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/internalapi_test/uploads_test.go index c75445cc191..3a0d64cc01f 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/internalapi_test/uploads_test.go @@ -65,14 +65,13 @@ func (suite *InternalAPISuite) TestUploads() { rr := httptest.NewRecorder() fakeS3, ok := suite.HandlerConfig().FileStorer().(*storageTest.FakeS3Storage) - if ok && fakeS3 != nil { - fakeS3.EmptyTags = true - } + suite.True(ok) + suite.NotNil(fakeS3, "FileStorer should be fakeS3") + + fakeS3.EmptyTags = true go func() { - time.Sleep(3 * time.Second) - if ok && fakeS3 != nil { - fakeS3.EmptyTags = false - } + time.Sleep(5 * time.Second) + fakeS3.EmptyTags = false }() suite.SetupSiteHandler().ServeHTTP(rr, req) diff --git a/pkg/notifications/notification_receiver_stub.go b/pkg/notifications/notification_receiver_stub.go index e98f0c8aa1e..637989040ff 100644 --- a/pkg/notifications/notification_receiver_stub.go +++ b/pkg/notifications/notification_receiver_stub.go @@ -29,7 +29,7 @@ func (n StubNotificationReceiver) CreateQueueWithSubscription(appCtx appcontext. } func (n StubNotificationReceiver) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string, timerContext context.Context) ([]ReceivedMessage, error) { - time.Sleep(3 * time.Second) + time.Sleep(5 * time.Second) messageId := "stubMessageId" body := queueUrl + ":stubMessageBody" mockMessages := make([]ReceivedMessage, 1) From 6dfc3d5cf0678b8768afc98aef133b7e21eaa355 Mon Sep 17 00:00:00 2001 From: loganwc Date: Wed, 15 Jan 2025 17:14:58 +0000 Subject: [PATCH 061/260] fixed counseling and closeout obj dereferencing --- .../ServicesCounselingQueue/ServicesCounselingQueue.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx index 88b56122cf6..f4765ee8238 100644 --- a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx +++ b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx @@ -452,8 +452,8 @@ const ServicesCounselingQueue = ({ officeUser?.transportation_office_assignments?.length > 1 && gblocContext ? gblocContext : { selectedGbloc: undefined }; - const { closeoutBulkAssignmentData } = useBulkAssignmentQueries('CLOSEOUT'); - const { counselingBulkAssignmentData } = useBulkAssignmentQueries('COUNSELING'); + const closeoutBulkAssignmentData = useBulkAssignmentQueries('CLOSEOUT'); + const counselingBulkAssignmentData = useBulkAssignmentQueries('COUNSELING'); // Feature Flag useEffect(() => { @@ -671,7 +671,7 @@ const ServicesCounselingQueue = ({ key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} - bulkAssignmentData={closeoutBulkAssignmentData} + bulkAssignmentData={closeoutBulkAssignmentData.bulkAssignmentData || {}} />
); @@ -701,7 +701,7 @@ const ServicesCounselingQueue = ({ key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} - bulkAssignmentData={counselingBulkAssignmentData} + bulkAssignmentData={counselingBulkAssignmentData.bulkAssignmentData || {}} />
); From 890700f4769163af6ca1cc2958172c69dc424517 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Wed, 15 Jan 2025 17:54:34 +0000 Subject: [PATCH 062/260] B-22056 - attempting to fix test. --- pkg/handlers/routing/internalapi_test/uploads_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/internalapi_test/uploads_test.go index 3a0d64cc01f..f774545504a 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/internalapi_test/uploads_test.go @@ -70,7 +70,7 @@ func (suite *InternalAPISuite) TestUploads() { fakeS3.EmptyTags = true go func() { - time.Sleep(5 * time.Second) + time.Sleep(4 * time.Second) fakeS3.EmptyTags = false }() From 228ac54f4d2afbbb846e262ad54a43a61cda41af Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Wed, 15 Jan 2025 18:38:43 +0000 Subject: [PATCH 063/260] B-22056 - attempting to fix test. --- pkg/handlers/routing/internalapi_test/uploads_test.go | 2 +- pkg/notifications/notification_receiver_stub.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/internalapi_test/uploads_test.go index f774545504a..4d3562d963b 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/internalapi_test/uploads_test.go @@ -70,7 +70,7 @@ func (suite *InternalAPISuite) TestUploads() { fakeS3.EmptyTags = true go func() { - time.Sleep(4 * time.Second) + time.Sleep(8 * time.Second) fakeS3.EmptyTags = false }() diff --git a/pkg/notifications/notification_receiver_stub.go b/pkg/notifications/notification_receiver_stub.go index 637989040ff..e7a54063ef1 100644 --- a/pkg/notifications/notification_receiver_stub.go +++ b/pkg/notifications/notification_receiver_stub.go @@ -29,7 +29,7 @@ func (n StubNotificationReceiver) CreateQueueWithSubscription(appCtx appcontext. } func (n StubNotificationReceiver) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string, timerContext context.Context) ([]ReceivedMessage, error) { - time.Sleep(5 * time.Second) + time.Sleep(18 * time.Second) messageId := "stubMessageId" body := queueUrl + ":stubMessageBody" mockMessages := make([]ReceivedMessage, 1) From e22abd66dc6455c2c61fab226823503188e28025 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Wed, 15 Jan 2025 20:38:11 +0000 Subject: [PATCH 064/260] B-22056 - attempting to fix test. --- .../routing/internalapi_test/uploads_test.go | 22 ++++++++++++++++++- .../notification_receiver_stub.go | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/internalapi_test/uploads_test.go index 4d3562d963b..d7fe179f9e0 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/internalapi_test/uploads_test.go @@ -3,6 +3,7 @@ package internalapi_test import ( "net/http" "net/http/httptest" + "strings" "time" "github.com/transcom/mymove/pkg/factory" @@ -70,7 +71,26 @@ func (suite *InternalAPISuite) TestUploads() { fakeS3.EmptyTags = true go func() { - time.Sleep(8 * time.Second) + ch := make(chan bool) + + go func() { + time.Sleep(10 * time.Second) + ch <- true + }() + + for !strings.Contains(rr.Body.String(), "PROCESSING") { + suite.Logger().Info(rr.Body.String()) + + select { + case <-ch: + fakeS3.EmptyTags = false + close(ch) + return + default: + time.Sleep(1 * time.Second) + } + } + fakeS3.EmptyTags = false }() diff --git a/pkg/notifications/notification_receiver_stub.go b/pkg/notifications/notification_receiver_stub.go index e7a54063ef1..e98f0c8aa1e 100644 --- a/pkg/notifications/notification_receiver_stub.go +++ b/pkg/notifications/notification_receiver_stub.go @@ -29,7 +29,7 @@ func (n StubNotificationReceiver) CreateQueueWithSubscription(appCtx appcontext. } func (n StubNotificationReceiver) ReceiveMessages(appCtx appcontext.AppContext, queueUrl string, timerContext context.Context) ([]ReceivedMessage, error) { - time.Sleep(18 * time.Second) + time.Sleep(3 * time.Second) messageId := "stubMessageId" body := queueUrl + ":stubMessageBody" mockMessages := make([]ReceivedMessage, 1) From c0bf4e249784378c61c80fa6b8773d276120f600 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 16 Jan 2025 00:47:15 +0000 Subject: [PATCH 065/260] B-22056 - attempting to fix test. --- .../routing/internalapi_test/uploads_test.go | 30 +++---------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/internalapi_test/uploads_test.go index d7fe179f9e0..168e291ab46 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/internalapi_test/uploads_test.go @@ -3,7 +3,6 @@ package internalapi_test import ( "net/http" "net/http/httptest" - "strings" "time" "github.com/transcom/mymove/pkg/factory" @@ -71,26 +70,7 @@ func (suite *InternalAPISuite) TestUploads() { fakeS3.EmptyTags = true go func() { - ch := make(chan bool) - - go func() { - time.Sleep(10 * time.Second) - ch <- true - }() - - for !strings.Contains(rr.Body.String(), "PROCESSING") { - suite.Logger().Info(rr.Body.String()) - - select { - case <-ch: - fakeS3.EmptyTags = false - close(ch) - return - default: - time.Sleep(1 * time.Second) - } - } - + time.Sleep(10 * time.Second) fakeS3.EmptyTags = false }() @@ -99,10 +79,8 @@ func (suite *InternalAPISuite) TestUploads() { suite.Equal(http.StatusOK, rr.Code) suite.Equal("text/event-stream", rr.Header().Get("content-type")) - message1 := "id: 0\nevent: message\ndata: PROCESSING\n\n" - message2 := "id: 1\nevent: message\ndata: CLEAN\n\n" - messageClose := "id: 2\nevent: close\ndata: Connection closed\n\n" - - suite.Equal(message1+message2+messageClose, rr.Body.String()) + suite.Contains(rr.Body.String(), "PROCESSING") + suite.Contains(rr.Body.String(), "CLEAN") + suite.Contains(rr.Body.String(), "Connection closed") }) } From 172c643274be4424399e7310803517e7f122f642 Mon Sep 17 00:00:00 2001 From: joeydoyecaci Date: Thu, 16 Jan 2025 01:31:05 +0000 Subject: [PATCH 066/260] Removed Planner, removed price result --- pkg/handlers/ghcapi/mto_service_items.go | 4 ++-- pkg/handlers/ghcapi/mto_shipment.go | 6 +++--- pkg/handlers/internalapi/mto_shipment.go | 2 +- pkg/handlers/primeapiv2/mto_shipment.go | 2 +- pkg/handlers/primeapiv3/mto_shipment.go | 2 +- pkg/services/mocks/ShipmentUpdater.go | 20 +++++++++---------- .../shipment/shipment_updater.go | 9 ++------- .../shipment/shipment_updater_test.go | 12 +++++------ pkg/services/shipment_orchestrator.go | 3 +-- 9 files changed, 26 insertions(+), 34 deletions(-) diff --git a/pkg/handlers/ghcapi/mto_service_items.go b/pkg/handlers/ghcapi/mto_service_items.go index 35b390c3eec..60b8db84c04 100644 --- a/pkg/handlers/ghcapi/mto_service_items.go +++ b/pkg/handlers/ghcapi/mto_service_items.go @@ -153,7 +153,7 @@ func (h UpdateServiceItemSitEntryDateHandler) Handle(params mtoserviceitemop.Upd existingETag := etag.GenerateEtag(shipment.UpdatedAt) - shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc", nil) + shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc") if err != nil { appCtx.Logger().Error(fmt.Sprintf("Could not update the shipment SIT auth end date for shipment ID: %s: %s", shipment.ID, err)) } @@ -266,7 +266,7 @@ func (h UpdateMTOServiceItemStatusHandler) Handle(params mtoserviceitemop.Update existingETag := etag.GenerateEtag(shipment.UpdatedAt) - shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc", nil) + shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc") if err != nil { appCtx.Logger().Error(fmt.Sprintf("Could not update the shipment SIT auth end date for shipment ID: %s: %s", shipment.ID, err)) } diff --git a/pkg/handlers/ghcapi/mto_shipment.go b/pkg/handlers/ghcapi/mto_shipment.go index 081556d0605..0ab30d6ed1a 100644 --- a/pkg/handlers/ghcapi/mto_shipment.go +++ b/pkg/handlers/ghcapi/mto_shipment.go @@ -409,7 +409,7 @@ func (h UpdateShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipmentPar mtoShipment.PrimeEstimatedWeight = &previouslyRecordedWeight } - updatedMtoShipment, err := h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "ghc", h.HandlerConfig.HHGPlanner()) + updatedMtoShipment, err := h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "ghc") if err != nil { return handleError(err) } @@ -1124,7 +1124,7 @@ func (h ApproveSITExtensionHandler) Handle(params shipmentops.ApproveSITExtensio existingETag := etag.GenerateEtag(updatedShipment.UpdatedAt) - updatedShipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc", nil) + updatedShipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc") if err != nil { return handleError(err) } @@ -1371,7 +1371,7 @@ func (h CreateApprovedSITDurationUpdateHandler) Handle(params shipmentops.Create existingETag := etag.GenerateEtag(shipment.UpdatedAt) - shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc", nil) + shipment, err = h.UpdateShipment(appCtx, &shipmentWithSITInfo, existingETag, "ghc") if err != nil { return handleError(err) } diff --git a/pkg/handlers/internalapi/mto_shipment.go b/pkg/handlers/internalapi/mto_shipment.go index 5b401190232..dc23374a6af 100644 --- a/pkg/handlers/internalapi/mto_shipment.go +++ b/pkg/handlers/internalapi/mto_shipment.go @@ -169,7 +169,7 @@ func (h UpdateMTOShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipment h.GetTraceIDFromRequest(params.HTTPRequest))), invalidShipmentStatusErr } - updatedMTOShipment, err := h.shipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "internal", nil) + updatedMTOShipment, err := h.shipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "internal") if err != nil { appCtx.Logger().Error("internalapi.UpdateMTOShipmentHandler", zap.Error(err)) diff --git a/pkg/handlers/primeapiv2/mto_shipment.go b/pkg/handlers/primeapiv2/mto_shipment.go index e4f2c41748a..d4a5e5012da 100644 --- a/pkg/handlers/primeapiv2/mto_shipment.go +++ b/pkg/handlers/primeapiv2/mto_shipment.go @@ -204,7 +204,7 @@ func (h UpdateMTOShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipment mtoShipment.ShipmentType = dbShipment.ShipmentType appCtx.Logger().Info("primeapi.UpdateMTOShipmentHandler info", zap.String("pointOfContact", params.Body.PointOfContact)) - mtoShipment, err = h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "prime-v2", h.planner) + mtoShipment, err = h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "prime-v2") if err != nil { appCtx.Logger().Error("primeapi.UpdateMTOShipmentHandler error", zap.Error(err)) switch e := err.(type) { diff --git a/pkg/handlers/primeapiv3/mto_shipment.go b/pkg/handlers/primeapiv3/mto_shipment.go index aa8476f6267..d2f6221ac9f 100644 --- a/pkg/handlers/primeapiv3/mto_shipment.go +++ b/pkg/handlers/primeapiv3/mto_shipment.go @@ -207,7 +207,7 @@ func (h UpdateMTOShipmentHandler) Handle(params mtoshipmentops.UpdateMTOShipment mtoShipment.ShipmentType = dbShipment.ShipmentType appCtx.Logger().Info("primeapi.UpdateMTOShipmentHandler info", zap.String("pointOfContact", params.Body.PointOfContact)) - mtoShipment, err = h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "prime-v3", h.planner) + mtoShipment, err = h.ShipmentUpdater.UpdateShipment(appCtx, mtoShipment, params.IfMatch, "prime-v3") if err != nil { appCtx.Logger().Error("primeapi.UpdateMTOShipmentHandler error", zap.Error(err)) switch e := err.(type) { diff --git a/pkg/services/mocks/ShipmentUpdater.go b/pkg/services/mocks/ShipmentUpdater.go index 83e0f17d197..94bc241b543 100644 --- a/pkg/services/mocks/ShipmentUpdater.go +++ b/pkg/services/mocks/ShipmentUpdater.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - route "github.com/transcom/mymove/pkg/route" ) // ShipmentUpdater is an autogenerated mock type for the ShipmentUpdater type @@ -16,9 +14,9 @@ type ShipmentUpdater struct { mock.Mock } -// UpdateShipment provides a mock function with given fields: appCtx, shipment, eTag, api, planner -func (_m *ShipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string, planner route.Planner) (*models.MTOShipment, error) { - ret := _m.Called(appCtx, shipment, eTag, api, planner) +// UpdateShipment provides a mock function with given fields: appCtx, shipment, eTag, api +func (_m *ShipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string) (*models.MTOShipment, error) { + ret := _m.Called(appCtx, shipment, eTag, api) if len(ret) == 0 { panic("no return value specified for UpdateShipment") @@ -26,19 +24,19 @@ func (_m *ShipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment var r0 *models.MTOShipment var r1 error - if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOShipment, string, string, route.Planner) (*models.MTOShipment, error)); ok { - return rf(appCtx, shipment, eTag, api, planner) + if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOShipment, string, string) (*models.MTOShipment, error)); ok { + return rf(appCtx, shipment, eTag, api) } - if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOShipment, string, string, route.Planner) *models.MTOShipment); ok { - r0 = rf(appCtx, shipment, eTag, api, planner) + if rf, ok := ret.Get(0).(func(appcontext.AppContext, *models.MTOShipment, string, string) *models.MTOShipment); ok { + r0 = rf(appCtx, shipment, eTag, api) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*models.MTOShipment) } } - if rf, ok := ret.Get(1).(func(appcontext.AppContext, *models.MTOShipment, string, string, route.Planner) error); ok { - r1 = rf(appCtx, shipment, eTag, api, planner) + if rf, ok := ret.Get(1).(func(appcontext.AppContext, *models.MTOShipment, string, string) error); ok { + r1 = rf(appCtx, shipment, eTag, api) } else { r1 = ret.Error(1) } diff --git a/pkg/services/orchestrators/shipment/shipment_updater.go b/pkg/services/orchestrators/shipment/shipment_updater.go index d7ba3a7c4af..bf7fb5b67bd 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater.go +++ b/pkg/services/orchestrators/shipment/shipment_updater.go @@ -5,7 +5,6 @@ import ( "github.com/transcom/mymove/pkg/appcontext" "github.com/transcom/mymove/pkg/models" - "github.com/transcom/mymove/pkg/route" "github.com/transcom/mymove/pkg/services" "github.com/transcom/mymove/pkg/unit" ) @@ -33,7 +32,7 @@ func NewShipmentUpdater(mtoShipmentUpdater services.MTOShipmentUpdater, ppmShipm } // UpdateShipment updates a shipment, taking into account different shipment types and their needs. -func (s *shipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string, planner route.Planner) (*models.MTOShipment, error) { +func (s *shipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string) (*models.MTOShipment, error) { if err := validateShipment(appCtx, *shipment, s.checks...); err != nil { return nil, err } @@ -156,11 +155,7 @@ func AddPricingEstimatesToMTOServiceItems(appCtx appcontext.AppContext, shipment serviceItemEstimatedPrice, err := shipmentUpdater.mtoServiceItemCreator.FindEstimatedPrice(appCtx, &serviceItem, *mtoShipment) if serviceItemEstimatedPrice != 0 && err == nil { - - // multiply price by 110% of estimated weight - priceResult := serviceItemEstimatedPrice.MultiplyFloat64(1.1) - - mtoShipmentCopy.MTOServiceItems[index].PricingEstimate = &priceResult + mtoShipmentCopy.MTOServiceItems[index].PricingEstimate = &serviceItemEstimatedPrice } if err != nil { return mtoShipmentCopy, err diff --git a/pkg/services/orchestrators/shipment/shipment_updater_test.go b/pkg/services/orchestrators/shipment/shipment_updater_test.go index bc42dc4ed5e..9f36fcd2650 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater_test.go +++ b/pkg/services/orchestrators/shipment/shipment_updater_test.go @@ -197,7 +197,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { // Set invalid data, can't pass in blank to the generator above (it'll default to HHG if blank) so we're setting it afterward. shipment.ShipmentType = "" - updatedShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test", nil) + updatedShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test") suite.Nil(updatedShipment) @@ -245,7 +245,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { // Need to start a transaction so we can assert the call with the correct appCtx err := appCtx.NewTransaction(func(txAppCtx appcontext.AppContext) error { - mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(txAppCtx, &shipment, eTag, "test", nil) + mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(txAppCtx, &shipment, eTag, "test") suite.NoError(err) suite.NotNil(mtoShipment) @@ -308,7 +308,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { shipment.PPMShipment.AdvanceAmountReceived = models.CentPointer(unit.Cents(55000)) shipment.PPMShipment.HasReceivedAdvance = models.BoolPointer(true) - mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test", nil) + mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test") suite.NoError(err) suite.NotNil(mtoShipment) @@ -347,7 +347,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { shipment.BoatShipment.LengthInInches = models.IntPointer(20) shipment.BoatShipment.HasTrailer = models.BoolPointer(false) - mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test", nil) + mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test") suite.NoError(err) @@ -426,7 +426,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { }, nil) } - mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test", nil) + mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, etag.GenerateEtag(shipment.UpdatedAt), "test") suite.Nil(mtoShipment) @@ -450,7 +450,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { eTag := etag.GenerateEtag(shipment.UpdatedAt) - mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, eTag, "test", nil) + mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(appCtx, &shipment, eTag, "test") suite.Nil(mtoShipment) diff --git a/pkg/services/shipment_orchestrator.go b/pkg/services/shipment_orchestrator.go index cef3a0c405a..69168e8f997 100644 --- a/pkg/services/shipment_orchestrator.go +++ b/pkg/services/shipment_orchestrator.go @@ -3,7 +3,6 @@ package services import ( "github.com/transcom/mymove/pkg/appcontext" "github.com/transcom/mymove/pkg/models" - "github.com/transcom/mymove/pkg/route" ) // ShipmentCreator creates a shipment, taking into account different shipment types and their needs. @@ -17,5 +16,5 @@ type ShipmentCreator interface { // //go:generate mockery --name ShipmentUpdater type ShipmentUpdater interface { - UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string, planner route.Planner) (*models.MTOShipment, error) + UpdateShipment(appCtx appcontext.AppContext, shipment *models.MTOShipment, eTag string, api string) (*models.MTOShipment, error) } From 12c55df0b62e4514e3add107b19920131df09c1b Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 16 Jan 2025 01:48:01 +0000 Subject: [PATCH 067/260] B-22056 - attempting to fix test. --- pkg/handlers/routing/internalapi_test/uploads_test.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/internalapi_test/uploads_test.go index 168e291ab46..7cea09d4d8e 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/internalapi_test/uploads_test.go @@ -3,7 +3,6 @@ package internalapi_test import ( "net/http" "net/http/httptest" - "time" "github.com/transcom/mymove/pkg/factory" "github.com/transcom/mymove/pkg/models" @@ -69,17 +68,12 @@ func (suite *InternalAPISuite) TestUploads() { suite.NotNil(fakeS3, "FileStorer should be fakeS3") fakeS3.EmptyTags = true - go func() { - time.Sleep(10 * time.Second) - fakeS3.EmptyTags = false - }() suite.SetupSiteHandler().ServeHTTP(rr, req) suite.Equal(http.StatusOK, rr.Code) suite.Equal("text/event-stream", rr.Header().Get("content-type")) - suite.Contains(rr.Body.String(), "PROCESSING") suite.Contains(rr.Body.String(), "CLEAN") suite.Contains(rr.Body.String(), "Connection closed") }) From 06a593caba4311b8a8b766c0e7a70f88a7a3f080 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 16 Jan 2025 15:18:41 +0000 Subject: [PATCH 068/260] B-22056 - deploy to exp. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8d3c39da69..b5bd5920986 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch placeholder_branch_name + dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env placeholder_env + dp3-env: &dp3-env exp # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch placeholder_branch_name + integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name + integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch placeholder_branch_name + client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch placeholder_branch_name + server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint executors: base_small: From dc22fd44be695be76579b4d8e209e57aa10930b6 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 16 Jan 2025 17:07:05 +0000 Subject: [PATCH 069/260] B-22056 - update param while in exp. --- pkg/cli/receiver.go | 8 ++++---- pkg/handlers/routing/internalapi_test/uploads_test.go | 6 ++++++ pkg/notifications/notification_receiver.go | 6 +++--- pkg/notifications/notification_receiver_test.go | 4 ++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/pkg/cli/receiver.go b/pkg/cli/receiver.go index be30daf135d..d5fdc2436a0 100644 --- a/pkg/cli/receiver.go +++ b/pkg/cli/receiver.go @@ -20,7 +20,7 @@ const ( // InitReceiverFlags initializes Storage command line flags func InitReceiverFlags(flag *pflag.FlagSet) { - flag.String(ReceiverBackendFlag, "local", "Receiver backend to use, either local or sns&sqs.") + flag.String(ReceiverBackendFlag, "local", "Receiver backend to use, either local or sns_sqs.") flag.String(SNSTagsUpdatedTopicFlag, "", "SNS Topic for receiving event messages") flag.String(SNSRegionFlag, "", "Region used for SNS and SQS") flag.String(SNSAccountId, "", "SNS account Id") @@ -30,11 +30,11 @@ func InitReceiverFlags(flag *pflag.FlagSet) { func CheckReceiver(v *viper.Viper) error { receiverBackend := v.GetString(ReceiverBackendFlag) - if !stringSliceContains([]string{"local", "sns&sqs"}, receiverBackend) { - return fmt.Errorf("invalid receiver-backend %s, expecting local or sns&sqs", receiverBackend) + if !stringSliceContains([]string{"local", "sns_sqs"}, receiverBackend) { + return fmt.Errorf("invalid receiver-backend %s, expecting local or sns_sqs", receiverBackend) } - if receiverBackend == "sns&sqs" { + if receiverBackend == "sns_sqs" { r := v.GetString(SNSRegionFlag) if r == "" { return fmt.Errorf("invalid value for %s: %s", SNSRegionFlag, r) diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/internalapi_test/uploads_test.go index 7cea09d4d8e..0d957e1de6a 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/internalapi_test/uploads_test.go @@ -3,6 +3,7 @@ package internalapi_test import ( "net/http" "net/http/httptest" + "time" "github.com/transcom/mymove/pkg/factory" "github.com/transcom/mymove/pkg/models" @@ -68,12 +69,17 @@ func (suite *InternalAPISuite) TestUploads() { suite.NotNil(fakeS3, "FileStorer should be fakeS3") fakeS3.EmptyTags = true + go func() { + time.Sleep(12 * time.Second) + fakeS3.EmptyTags = false + }() suite.SetupSiteHandler().ServeHTTP(rr, req) suite.Equal(http.StatusOK, rr.Code) suite.Equal("text/event-stream", rr.Header().Get("content-type")) + suite.Contains(rr.Body.String(), "PROCESSING") suite.Contains(rr.Body.String(), "CLEAN") suite.Contains(rr.Body.String(), "Connection closed") }) diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index b685cfacaa1..a4bec916e86 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -232,7 +232,7 @@ func (n NotificationReceiverContext) CloseoutQueue(appCtx appcontext.AppContext, func (n NotificationReceiverContext) GetDefaultTopic() (string, error) { topicName := n.viper.GetString(cli.SNSTagsUpdatedTopicFlag) receiverBackend := n.viper.GetString(cli.ReceiverBackendFlag) - if topicName == "" && receiverBackend == "sns&sqs" { + if topicName == "" && receiverBackend == "sns_sqs" { return "", errors.New("sns_tags_updated_topic key not available") } return topicName, nil @@ -241,12 +241,12 @@ func (n NotificationReceiverContext) GetDefaultTopic() (string, error) { // InitReceiver initializes the receiver backend, only call this once func InitReceiver(v ViperType, logger *zap.Logger, wipeAllNotificationQueues bool) (NotificationReceiver, error) { - if v.GetString(cli.ReceiverBackendFlag) == "sns&sqs" { + if v.GetString(cli.ReceiverBackendFlag) == "sns_sqs" { // Setup notification receiver service with SNS & SQS backend dependencies awsSNSRegion := v.GetString(cli.SNSRegionFlag) awsAccountId := v.GetString(cli.SNSAccountId) - logger.Info("Using aws sns&sqs receiver backend", zap.String("region", awsSNSRegion)) + logger.Info("Using aws sns_sqs receiver backend", zap.String("region", awsSNSRegion)) cfg, err := config.LoadDefaultConfig(context.Background(), config.WithRegion(awsSNSRegion), diff --git a/pkg/notifications/notification_receiver_test.go b/pkg/notifications/notification_receiver_test.go index 934cb7db20b..f7dab5a91b7 100644 --- a/pkg/notifications/notification_receiver_test.go +++ b/pkg/notifications/notification_receiver_test.go @@ -71,7 +71,7 @@ func (suite *notificationReceiverSuite) TestSuccessPath() { suite.Run("aws backend - notification receiver InitReceiver", func() { // Setup mocks mockedViper := mocks.ViperType{} - mockedViper.On("GetString", cli.ReceiverBackendFlag).Return("sns&sqs") + mockedViper.On("GetString", cli.ReceiverBackendFlag).Return("sns_sqs") mockedViper.On("GetString", cli.SNSRegionFlag).Return("us-gov-west-1") mockedViper.On("GetString", cli.SNSAccountId).Return("12345") mockedViper.On("GetString", cli.SNSTagsUpdatedTopicFlag).Return("fake_sns_topic") @@ -88,7 +88,7 @@ func (suite *notificationReceiverSuite) TestSuccessPath() { suite.Run("aws backend - notification receiver with mock services", func() { // Setup mocks mockedViper := mocks.ViperType{} - mockedViper.On("GetString", cli.ReceiverBackendFlag).Return("sns&sqs") + mockedViper.On("GetString", cli.ReceiverBackendFlag).Return("sns_sqs") mockedViper.On("GetString", cli.SNSRegionFlag).Return("us-gov-west-1") mockedViper.On("GetString", cli.SNSAccountId).Return("12345") mockedViper.On("GetString", cli.SNSTagsUpdatedTopicFlag).Return("fake_sns_topic") From c50ed5fdc0e3b5f58ae9a87feef1e0903cf30734 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 16 Jan 2025 17:57:19 +0000 Subject: [PATCH 070/260] B-22056 - update logging while in exp. --- pkg/notifications/notification_receiver.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index a4bec916e86..2ba55aa939f 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -272,6 +272,8 @@ func InitReceiver(v ViperType, logger *zap.Logger, wipeAllNotificationQueues boo return notificationReceiver, nil } + logger.Info("Using local sns_sqs receiver backend", zap.String("receiver_backend", v.GetString(cli.ReceiverBackendFlag)), zap.String("SNSRegion", v.GetString(cli.SNSRegionFlag))) + return NewStubNotificationReceiver(), nil } From 5bd091823441f0f1be94270313a0974fce50c739 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 16 Jan 2025 15:18:28 -0500 Subject: [PATCH 071/260] B-22056 - update logging while in exp. --- pkg/notifications/notification_receiver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index 2ba55aa939f..0edba0f44a2 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -272,7 +272,7 @@ func InitReceiver(v ViperType, logger *zap.Logger, wipeAllNotificationQueues boo return notificationReceiver, nil } - logger.Info("Using local sns_sqs receiver backend", zap.String("receiver_backend", v.GetString(cli.ReceiverBackendFlag)), zap.String("SNSRegion", v.GetString(cli.SNSRegionFlag))) + logger.Info("Using local sns_sqs receiver backend", zap.String("receiver_backend", v.GetString(cli.ReceiverBackendFlag))) return NewStubNotificationReceiver(), nil } From f597e9694a555a3ff69dc4b58ea1856b2aa45766 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 16 Jan 2025 21:25:18 +0000 Subject: [PATCH 072/260] B-22056 - restore exp env. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5bd5920986..b8d3c39da69 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + dp3-branch: &dp3-branch placeholder_branch_name # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env exp + dp3-env: &dp3-env placeholder_env # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-ignore-branch: &integration-ignore-branch placeholder_branch_name # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + client-ignore-branch: &client-ignore-branch placeholder_branch_name # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + server-ignore-branch: &server-ignore-branch placeholder_branch_name executors: base_small: From 855e52ebc81f3ac5866704c07e6521f1effa4757 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 16 Jan 2025 21:37:04 +0000 Subject: [PATCH 073/260] B-22056 - deploy to exp with updated param format --- .circleci/config.yml | 12 ++++++------ pkg/cli/receiver.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8d3c39da69..b5bd5920986 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch placeholder_branch_name + dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env placeholder_env + dp3-env: &dp3-env exp # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch placeholder_branch_name + integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name + integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch placeholder_branch_name + client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch placeholder_branch_name + server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint executors: base_small: diff --git a/pkg/cli/receiver.go b/pkg/cli/receiver.go index d5fdc2436a0..335c987cd76 100644 --- a/pkg/cli/receiver.go +++ b/pkg/cli/receiver.go @@ -9,7 +9,7 @@ import ( const ( // ReceiverBackend is the Receiver Backend Flag - ReceiverBackendFlag string = "receiver-backend" + ReceiverBackendFlag string = "receiver_backend" // SNSTagsUpdatedTopicFlag is the SNS Tags Updated Topic Flag SNSTagsUpdatedTopicFlag string = "sns-tags-updated-topic" // SNSRegionFlag is the SNS Region flag @@ -31,7 +31,7 @@ func CheckReceiver(v *viper.Viper) error { receiverBackend := v.GetString(ReceiverBackendFlag) if !stringSliceContains([]string{"local", "sns_sqs"}, receiverBackend) { - return fmt.Errorf("invalid receiver-backend %s, expecting local or sns_sqs", receiverBackend) + return fmt.Errorf("invalid receiver_backend %s, expecting local or sns_sqs", receiverBackend) } if receiverBackend == "sns_sqs" { From d17b881efe97e8f52f6bdccaf956b67494afeccd Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 16 Jan 2025 21:43:10 +0000 Subject: [PATCH 074/260] B-22056 - restore format. --- pkg/cli/receiver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cli/receiver.go b/pkg/cli/receiver.go index 335c987cd76..9338a1d17d0 100644 --- a/pkg/cli/receiver.go +++ b/pkg/cli/receiver.go @@ -9,7 +9,7 @@ import ( const ( // ReceiverBackend is the Receiver Backend Flag - ReceiverBackendFlag string = "receiver_backend" + ReceiverBackendFlag string = "receiver-backend" // SNSTagsUpdatedTopicFlag is the SNS Tags Updated Topic Flag SNSTagsUpdatedTopicFlag string = "sns-tags-updated-topic" // SNSRegionFlag is the SNS Region flag From 6ddfa3d55640c933d471f9a17595dac0cbc74256 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 16 Jan 2025 23:49:32 +0000 Subject: [PATCH 075/260] B-22056 - restore exp env. --- .circleci/config.yml | 12 ++++++------ .envrc | 4 ++-- pkg/notifications/notification_receiver.go | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5bd5920986..b8d3c39da69 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + dp3-branch: &dp3-branch placeholder_branch_name # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env exp + dp3-env: &dp3-env placeholder_env # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-ignore-branch: &integration-ignore-branch placeholder_branch_name # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + client-ignore-branch: &client-ignore-branch placeholder_branch_name # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + server-ignore-branch: &server-ignore-branch placeholder_branch_name executors: base_small: diff --git a/.envrc b/.envrc index 7eb37fa168f..7f7d66b0fcd 100644 --- a/.envrc +++ b/.envrc @@ -229,12 +229,12 @@ export TZ="UTC" # AWS development access # -# To use S3/SES or SNS&SQS for local builds, you'll need to uncomment the following. +# To use S3/SES or SNS & SQS for local builds, you'll need to uncomment the following. # Do not commit the change: # # export STORAGE_BACKEND=s3 # export EMAIL_BACKEND=ses -# export RECEIVER_BACKEND="sns&sqs" +# export RECEIVER_BACKEND=sns_sqs # # Instructions for using S3 storage backend here: https://dp3.atlassian.net/wiki/spaces/MT/pages/1470955567/How+to+test+storing+data+in+S3+locally # Instructions for using SES email backend here: https://dp3.atlassian.net/wiki/spaces/MT/pages/1467973894/How+to+test+sending+email+locally diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index 0edba0f44a2..e0bc10e8c97 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -2,6 +2,7 @@ package notifications import ( "context" + "encoding/json" "errors" "fmt" "strings" @@ -190,6 +191,9 @@ func (n NotificationReceiverContext) ReceiveMessages(appCtx appcontext.AppContex Body: value.Body, } + val, _ := json.Marshal(value) + appCtx.Logger().Info("messages incoming", zap.ByteString("message", val)) + _, err := n.sqsService.DeleteMessage(recCtx, &sqs.DeleteMessageInput{ QueueUrl: &queueUrl, ReceiptHandle: value.ReceiptHandle, From 40a6626e6f1d39bd9b398d2319b2fd5ecd63db59 Mon Sep 17 00:00:00 2001 From: joeydoyecaci Date: Fri, 17 Jan 2025 05:57:58 +0000 Subject: [PATCH 076/260] Added unit test, fixed mock setups containing unused parameters --- pkg/handlers/ghcapi/mto_shipment_test.go | 1 - pkg/handlers/internalapi/mto_shipment_test.go | 1 - .../shipment/shipment_updater.go | 9 +- .../shipment/shipment_updater_test.go | 155 ++++++++++++++++++ 4 files changed, 163 insertions(+), 3 deletions(-) diff --git a/pkg/handlers/ghcapi/mto_shipment_test.go b/pkg/handlers/ghcapi/mto_shipment_test.go index a29e60c572c..9432dae0cad 100644 --- a/pkg/handlers/ghcapi/mto_shipment_test.go +++ b/pkg/handlers/ghcapi/mto_shipment_test.go @@ -4665,7 +4665,6 @@ func (suite *HandlerSuite) TestUpdateShipmentHandler() { mock.Anything, mock.Anything, mock.Anything, - nil, ).Return(nil, err) oldShipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ diff --git a/pkg/handlers/internalapi/mto_shipment_test.go b/pkg/handlers/internalapi/mto_shipment_test.go index 3d971cc6a38..af56182d93b 100644 --- a/pkg/handlers/internalapi/mto_shipment_test.go +++ b/pkg/handlers/internalapi/mto_shipment_test.go @@ -1486,7 +1486,6 @@ func (suite *HandlerSuite) TestUpdateMTOShipmentHandler() { mock.AnythingOfType("*models.MTOShipment"), mock.AnythingOfType("string"), mock.AnythingOfType("string"), - nil, ).Return(nil, err) subtestData := getDefaultMTOShipmentAndParams(&mockUpdater) diff --git a/pkg/services/orchestrators/shipment/shipment_updater.go b/pkg/services/orchestrators/shipment/shipment_updater.go index bf7fb5b67bd..d624d33136f 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater.go +++ b/pkg/services/orchestrators/shipment/shipment_updater.go @@ -150,10 +150,17 @@ func AddPricingEstimatesToMTOServiceItems(appCtx appcontext.AppContext, shipment } else { estimatedWeightToUse = *mtoShipmentCopy.PrimeEstimatedWeight } - estimatedWeightToUse = unit.Pound(estimatedWeightToUse.Float64() * 1.1) + originalWeight := estimatedWeightToUse + + // set weight to be modified mtoShipmentCopy.MTOServiceItems[index].EstimatedWeight = &estimatedWeightToUse + + //Calculate the price using 110% of recorded weight + estimatedWeightToUse = unit.Pound(estimatedWeightToUse.Float64() * 1.1) serviceItemEstimatedPrice, err := shipmentUpdater.mtoServiceItemCreator.FindEstimatedPrice(appCtx, &serviceItem, *mtoShipment) + // store actual captured weight + mtoShipmentCopy.MTOServiceItems[index].EstimatedWeight = &originalWeight if serviceItemEstimatedPrice != 0 && err == nil { mtoShipmentCopy.MTOServiceItems[index].PricingEstimate = &serviceItemEstimatedPrice } diff --git a/pkg/services/orchestrators/shipment/shipment_updater_test.go b/pkg/services/orchestrators/shipment/shipment_updater_test.go index 9f36fcd2650..2eaf1fb6cb4 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater_test.go +++ b/pkg/services/orchestrators/shipment/shipment_updater_test.go @@ -2,6 +2,7 @@ package shipment import ( "fmt" + "time" "github.com/gofrs/uuid" "github.com/stretchr/testify/mock" @@ -18,6 +19,7 @@ import ( moveservices "github.com/transcom/mymove/pkg/services/move" mtoserviceitem "github.com/transcom/mymove/pkg/services/mto_service_item" "github.com/transcom/mymove/pkg/services/query" + "github.com/transcom/mymove/pkg/testdatagen" "github.com/transcom/mymove/pkg/unit" ) @@ -33,6 +35,7 @@ func (suite *ShipmentSuite) TestUpdateShipment() { type subtestDataObjects struct { mockMTOShipmentUpdater *mocks.MTOShipmentUpdater + mockMtoServiceItemCreator *mocks.MTOServiceItemCreator mockPPMShipmentUpdater *mocks.PPMShipmentUpdater mockBoatShipmentUpdater *mocks.BoatShipmentUpdater mockMobileHomeShipmentUpdater *mocks.MobileHomeShipmentUpdater @@ -50,6 +53,9 @@ func (suite *ShipmentSuite) TestUpdateShipment() { mockMTOShipmentUpdater := mocks.MTOShipmentUpdater{} subtestData.mockMTOShipmentUpdater = &mockMTOShipmentUpdater + mockMtoServiceItemCreator := mocks.MTOServiceItemCreator{} + subtestData.mockMtoServiceItemCreator = &mockMtoServiceItemCreator + mockPPMShipmentUpdater := mocks.PPMShipmentUpdater{} subtestData.mockPPMShipmentUpdater = &mockPPMShipmentUpdater @@ -186,6 +192,26 @@ func (suite *ShipmentSuite) TestUpdateShipment() { return subtestData } + makeServiceItemSubtestData := func() (subtestData subtestDataObjects) { + mockMTOShipmentUpdater := mocks.MTOShipmentUpdater{} + subtestData.mockMTOShipmentUpdater = &mockMTOShipmentUpdater + + mockMtoServiceItemCreator := mocks.MTOServiceItemCreator{} + subtestData.mockMtoServiceItemCreator = &mockMtoServiceItemCreator + + mockPPMShipmentUpdater := mocks.PPMShipmentUpdater{} + subtestData.mockPPMShipmentUpdater = &mockPPMShipmentUpdater + + mockBoatShipmentUpdater := mocks.BoatShipmentUpdater{} + subtestData.mockBoatShipmentUpdater = &mockBoatShipmentUpdater + + mockMobileHomeShipmentUpdater := mocks.MobileHomeShipmentUpdater{} + subtestData.mockMobileHomeShipmentUpdater = &mockMobileHomeShipmentUpdater + + subtestData.shipmentUpdaterOrchestrator = NewShipmentUpdater(subtestData.mockMTOShipmentUpdater, subtestData.mockPPMShipmentUpdater, subtestData.mockBoatShipmentUpdater, subtestData.mockMobileHomeShipmentUpdater, subtestData.mockMtoServiceItemCreator) + + return subtestData + } suite.Run("Returns an InvalidInputError if there is an error with the shipment info that was input", func() { appCtx := suite.AppContextForTest() @@ -474,4 +500,133 @@ func (suite *ShipmentSuite) TestUpdateShipment() { mock.AnythingOfType("uuid.UUID"), ) }) + + suite.Run("Updating weight will update the estimated price of service items", func() { + appCtx := suite.AppContextForTest() + + subtestData := makeServiceItemSubtestData() + + estimatedWeight := unit.Pound(2000) + pickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + deliveryAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress3}) + + shipment := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + ID: uuid.Must(uuid.FromString("a5e95c1d-97c3-4f79-8097-c12dd2557ac7")), + Status: models.MTOShipmentStatusApproved, + ShipmentType: models.MTOShipmentTypeHHG, + PrimeEstimatedWeight: &estimatedWeight, + }, + }, + { + Model: pickupAddress, + LinkOnly: true, + Type: &factory.Addresses.PickupAddress, + }, + { + Model: deliveryAddress, + LinkOnly: true, + Type: &factory.Addresses.DeliveryAddress, + }, + }, nil) + + reServiceCodeFSC := factory.FetchReServiceByCode(suite.DB(), models.ReServiceCodeFSC) + + startDate := time.Now().AddDate(-1, 0, 0) + endDate := startDate.AddDate(1, 1, 1) + reason := "lorem ipsum" + + testdatagen.FetchOrMakeReContract(suite.DB(), testdatagen.Assertions{}) + testdatagen.FetchOrMakeReContractYear(suite.DB(), + testdatagen.Assertions{ + ReContractYear: models.ReContractYear{ + Name: "Test Contract Year", + EscalationCompounded: 1.125, + StartDate: startDate, + EndDate: endDate, + }, + }) + + testdatagen.FetchOrMakeGHCDieselFuelPrice(suite.DB(), testdatagen.Assertions{ + GHCDieselFuelPrice: models.GHCDieselFuelPrice{ + FuelPriceInMillicents: unit.Millicents(281400), + PublicationDate: time.Date(2020, time.March, 9, 0, 0, 0, 0, time.UTC), + EffectiveDate: time.Date(2020, time.March, 10, 0, 0, 0, 0, time.UTC), + EndDate: time.Date(2025, time.March, 17, 0, 0, 0, 0, time.UTC), + }, + }) + + actualPickupAddress := factory.BuildAddress(suite.DB(), nil, []factory.Trait{factory.GetTraitAddress2}) + requestedPickupDate := time.Date(2020, time.October, 24, 0, 0, 0, 0, time.UTC) + + serviceItemFSC := models.MTOServiceItem{ + MoveTaskOrder: shipment.MoveTaskOrder, + MoveTaskOrderID: shipment.MoveTaskOrderID, + MTOShipment: shipment, + MTOShipmentID: &shipment.ID, + ReService: reServiceCodeFSC, + Reason: &reason, + SITOriginHHGActualAddress: &actualPickupAddress, + Status: models.MTOServiceItemStatusSubmitted, + } + + shipment.MTOServiceItems = append(shipment.MTOServiceItems, serviceItemFSC) + suite.MustSave(&shipment) + + eTag := etag.GenerateEtag(shipment.UpdatedAt) + + subtestData.mockMtoServiceItemCreator.On("ZipTransitDistance", + mock.AnythingOfType("*appcontext.appContext"), + mock.Anything, + mock.Anything, + false, + false, + ).Return(800, nil) + + returnCents := unit.Cents(123) + + subtestData.mockMtoServiceItemCreator.On("FindEstimatedPrice", + mock.AnythingOfType("*appcontext.appContext"), + mock.Anything, + mock.Anything, + mock.Anything, + ).Return(returnCents, nil) + + subtestData.mockMTOShipmentUpdater. + On( + updateMTOShipmentMethodName, + mock.AnythingOfType("*appcontext.appContext"), + mock.AnythingOfType("*models.MTOShipment"), + mock.AnythingOfType("string"), + mock.AnythingOfType("string")). + Return( + &models.MTOShipment{ + ID: uuid.Must(uuid.FromString("a5e95c1d-97c3-4f79-8097-c12dd2557ac7")), + Status: models.MTOShipmentStatusApproved, + ShipmentType: models.MTOShipmentTypeHHG, + PrimeEstimatedWeight: &estimatedWeight, + RequestedPickupDate: &requestedPickupDate, + MTOServiceItems: models.MTOServiceItems{serviceItemFSC}, + PickupAddress: &pickupAddress, + DestinationAddress: &deliveryAddress, + }, nil) + + // Need to start a transaction so we can assert the call with the correct appCtx + err := appCtx.NewTransaction(func(txAppCtx appcontext.AppContext) error { + mtoShipment, err := subtestData.shipmentUpdaterOrchestrator.UpdateShipment(txAppCtx, &shipment, eTag, "test") + + suite.NoError(err) + suite.NotNil(mtoShipment) + + expectedPrice := unit.Cents(123) + expectedWeight := unit.Pound(2000) + suite.Equal(expectedWeight, *mtoShipment.MTOServiceItems[0].EstimatedWeight) + suite.Equal(expectedPrice, *mtoShipment.MTOServiceItems[0].PricingEstimate) + + return nil + }) + + suite.NoError(err) // just making golangci-lint happy + }) } From 7900c0c04d6fc0d238b63ffe42cc83575cf053b1 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Fri, 17 Jan 2025 16:59:11 +0000 Subject: [PATCH 077/260] B-22056 - remove timer from test. --- .envrc | 2 +- pkg/handlers/routing/internalapi_test/uploads_test.go | 6 ------ pkg/notifications/notification_receiver.go | 4 +--- pkg/storage/test/s3.go | 1 + 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.envrc b/.envrc index 7f7d66b0fcd..783cd183534 100644 --- a/.envrc +++ b/.envrc @@ -258,7 +258,7 @@ export AWS_S3_KEY_NAMESPACE=$USER export AWS_SES_DOMAIN="devlocal.dp3.us" export AWS_SES_REGION="us-gov-west-1" -if [ "$RECEIVER_BACKEND" == "sns&sqs" ]; then +if [ "$RECEIVER_BACKEND" == "sns_sqs" ]; then export SNS_TAGS_UPDATED_TOPIC="app_s3_tag_events" export SNS_REGION="us-gov-west-1" fi diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/internalapi_test/uploads_test.go index 0d957e1de6a..06610d84be2 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/internalapi_test/uploads_test.go @@ -3,7 +3,6 @@ package internalapi_test import ( "net/http" "net/http/httptest" - "time" "github.com/transcom/mymove/pkg/factory" "github.com/transcom/mymove/pkg/models" @@ -69,11 +68,6 @@ func (suite *InternalAPISuite) TestUploads() { suite.NotNil(fakeS3, "FileStorer should be fakeS3") fakeS3.EmptyTags = true - go func() { - time.Sleep(12 * time.Second) - fakeS3.EmptyTags = false - }() - suite.SetupSiteHandler().ServeHTTP(rr, req) suite.Equal(http.StatusOK, rr.Code) diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index e0bc10e8c97..1ec6ecd2358 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -2,7 +2,6 @@ package notifications import ( "context" - "encoding/json" "errors" "fmt" "strings" @@ -191,8 +190,7 @@ func (n NotificationReceiverContext) ReceiveMessages(appCtx appcontext.AppContex Body: value.Body, } - val, _ := json.Marshal(value) - appCtx.Logger().Info("messages incoming", zap.ByteString("message", val)) + appCtx.Logger().Info("Message received.", zap.String("messageId", *value.MessageId)) _, err := n.sqsService.DeleteMessage(recCtx, &sqs.DeleteMessageInput{ QueueUrl: &queueUrl, diff --git a/pkg/storage/test/s3.go b/pkg/storage/test/s3.go index 901edf370e5..cbbab7802d5 100644 --- a/pkg/storage/test/s3.go +++ b/pkg/storage/test/s3.go @@ -96,6 +96,7 @@ func (fake *FakeS3Storage) Tags(_ string) (map[string]string, error) { } if fake.EmptyTags { tags = map[string]string{} + fake.EmptyTags = false } return tags, nil } From 80cf55244c75f49243df9b45298f338e62cdfeaa Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Fri, 17 Jan 2025 19:36:23 +0000 Subject: [PATCH 078/260] B-22056 - tests for fakeS3 and local storage. --- pkg/storage/filesystem_test.go | 18 ++++++ pkg/storage/memory_test.go | 18 ++++++ pkg/storage/test/s3_test.go | 101 +++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 pkg/storage/test/s3_test.go diff --git a/pkg/storage/filesystem_test.go b/pkg/storage/filesystem_test.go index 27ecc5e951c..cecf69d2a7c 100644 --- a/pkg/storage/filesystem_test.go +++ b/pkg/storage/filesystem_test.go @@ -1,6 +1,7 @@ package storage import ( + "strings" "testing" ) @@ -21,3 +22,20 @@ func TestFilesystemPresignedURL(t *testing.T) { t.Errorf("wrong presigned url: expected %s, got %s", expected, url) } } + +func TestFilesystemTags(t *testing.T) { + fsParams := FilesystemParams{ + root: "/home/username", + webRoot: "https://example.text/files", + } + fs := NewFilesystem(fsParams) + + tags, err := fs.Tags("anyKey") + if err != nil { + t.Fatalf("could not get tags: %s", err) + } + + if tag, exists := tags["av-status"]; exists && strings.Compare(tag, "CLEAN") != 0 { + t.Fatal("tag 'av-status' should return CLEAN") + } +} diff --git a/pkg/storage/memory_test.go b/pkg/storage/memory_test.go index 59384c5acee..68b96b1b0eb 100644 --- a/pkg/storage/memory_test.go +++ b/pkg/storage/memory_test.go @@ -1,6 +1,7 @@ package storage import ( + "strings" "testing" ) @@ -21,3 +22,20 @@ func TestMemoryPresignedURL(t *testing.T) { t.Errorf("wrong presigned url: expected %s, got %s", expected, url) } } + +func TestMemoryTags(t *testing.T) { + fsParams := MemoryParams{ + root: "/home/username", + webRoot: "https://example.text/files", + } + fs := NewMemory(fsParams) + + tags, err := fs.Tags("anyKey") + if err != nil { + t.Fatalf("could not get tags: %s", err) + } + + if tag, exists := tags["av-status"]; exists && strings.Compare(tag, "CLEAN") != 0 { + t.Fatal("tag 'av-status' should return CLEAN") + } +} diff --git a/pkg/storage/test/s3_test.go b/pkg/storage/test/s3_test.go new file mode 100644 index 00000000000..a3fa89c5c9a --- /dev/null +++ b/pkg/storage/test/s3_test.go @@ -0,0 +1,101 @@ +package test + +import ( + "errors" + "io" + "strings" + "testing" +) + +// Tests all functions of FakeS3Storage +func TestFakeS3ReturnsSuccessful(t *testing.T) { + fakeS3 := NewFakeS3Storage(true) + if fakeS3 == nil { + t.Fatal("could not create new fakeS3") + } + + storeValue := strings.NewReader("anyValue") + _, err := fakeS3.Store("anyKey", storeValue, "", nil) + if err != nil { + t.Fatalf("could not store in fakeS3: %s", err) + } + + retReader, err := fakeS3.Fetch("anyKey") + if err != nil { + t.Fatalf("could not fetch from fakeS3: %s", err) + } + + err = fakeS3.Delete("anyKey") + if err != nil { + t.Fatalf("could not delete on fakeS3: %s", err) + } + + retValue, err := io.ReadAll(retReader) + if strings.Compare(string(retValue[:]), "anyValue") != 0 { + t.Fatalf("could not fetch from fakeS3: %s", err) + } + + fileSystem := fakeS3.FileSystem() + if fileSystem == nil { + t.Fatal("could not retrieve filesystem from fakeS3") + } + + tempFileSystem := fakeS3.TempFileSystem() + if tempFileSystem == nil { + t.Fatal("could not retrieve filesystem from fakeS3") + } + + tags, err := fakeS3.Tags("anyKey") + if err != nil { + t.Fatalf("could not fetch from fakeS3: %s", err) + } + if len(tags) != 2 { + t.Fatal("return tags must have both tagName and av-status for fakeS3") + } + + presignedUrl, err := fakeS3.PresignedURL("anyKey", "anyContentType", "anyFileName") + if err != nil { + t.Fatal("could not retrieve presignedUrl from fakeS3") + } + + if strings.Compare(presignedUrl, "https://example.com/dir/anyKey?response-content-disposition=attachment%3B+filename%3D%22anyFileName%22&response-content-type=anyContentType&signed=test") != 0 { + t.Fatalf("could not retrieve proper presignedUrl from fakeS3 %s", presignedUrl) + } +} + +// Test for willSucceed false +func TestFakeS3WillNotSucceed(t *testing.T) { + fakeS3 := NewFakeS3Storage(false) + if fakeS3 == nil { + t.Fatalf("could not create new fakeS3") + } + + storeValue := strings.NewReader("anyValue") + _, err := fakeS3.Store("anyKey", storeValue, "", nil) + if err == nil || errors.Is(err, errors.New("failed to push")) { + t.Fatalf("should not be able to store when willSucceed false: %s", err) + } + + _, err = fakeS3.Fetch("anyKey") + if err == nil || errors.Is(err, errors.New("failed to fetch file")) { + t.Fatalf("should not find file on Fetch for willSucceed false: %s", err) + } +} + +// Tests empty tag returns empty tags on FakeS3Storage +func TestFakeS3ReturnsEmptyTags(t *testing.T) { + fakeS3 := NewFakeS3Storage(true) + if fakeS3 == nil { + t.Fatal("could not create new fakeS3") + } + + fakeS3.EmptyTags = true + + tags, err := fakeS3.Tags("anyKey") + if err != nil { + t.Fatalf("could not fetch from fakeS3: %s", err) + } + if len(tags) != 0 { + t.Fatal("return tags must be empty for FakeS3 when EmptyTags set to true") + } +} From 6d3fe4179203ebd3c58c5046c606543f55b9558e Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Fri, 17 Jan 2025 19:47:40 +0000 Subject: [PATCH 079/260] removed checkboxes, display available moves, resize modal --- .../BulkAssignment/BulkAssignmentModal.jsx | 45 +++++++++---------- .../BulkAssignmentModal.module.scss | 2 +- .../BulkAssignmentModal.test.jsx | 3 +- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 1c1aaaee2a0..6584c88ed94 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -11,38 +11,35 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos onClose()} /> -

{title}

+

+ {title} ( + {bulkAssignmentData.bulkAssignmentMoveIDs == null ? 0 : bulkAssignmentData.bulkAssignmentMoveIDs.length}) +

- - {Object.prototype.hasOwnProperty.call(bulkAssignmentData, 'availableOfficeUsers') - ? bulkAssignmentData.availableOfficeUsers.map((user) => { - return ( - - - - - - - ); - }) - : null} + {bulkAssignmentData?.availableOfficeUsers?.map((user) => { + return ( + + + + + + ); + })}
Select/Deselect All User Workload Assignment
- - -

- {user.lastName}, {user.firstName} -

- 		-

{user.workload || 0}

- 		- -
+

+ {user.lastName}, {user.firstName} +

+ 		+

{user.workload || 0}

+ 		+ +
diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index cf94e87dea5..83541755d4c 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -1,5 +1,5 @@ .BulkModal { - min-width: 900px !important; + min-width: 650px !important; overflow-y: auto; max-height: 90vh; } diff --git a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx index f4c7fe3d0cd..33663a5dfe4 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx @@ -39,7 +39,7 @@ describe('BulkAssignmentModal', () => { it('renders the component', async () => { render(); - expect(await screen.findByRole('heading', { level: 3, name: 'Bulk Assignment' })).toBeInTheDocument(); + expect(await screen.findByRole('heading', { level: 3, name: 'Bulk Assignment (5)' })).toBeInTheDocument(); }); it('closes the modal when close icon is clicked', async () => { @@ -78,7 +78,6 @@ describe('BulkAssignmentModal', () => { const userTable = await screen.findByRole('table'); expect(userTable).toBeInTheDocument(); - expect(screen.getByText('Select/Deselect All')).toBeInTheDocument(); expect(screen.getByText('User')).toBeInTheDocument(); expect(screen.getByText('Workload')).toBeInTheDocument(); expect(screen.getByText('Assignment')).toBeInTheDocument(); From 46f65c87b7023f00ea346e0267dbeb87030842f5 Mon Sep 17 00:00:00 2001 From: Brian Manley Date: Fri, 17 Jan 2025 20:38:33 +0000 Subject: [PATCH 080/260] B-21698 exclude rejected progear tickets from total weight calculation --- src/utils/shipmentWeights.js | 2 +- src/utils/shipmentWeights.test.js | 26 ++++++++++++++++++- .../test/factories/proGearWeightTicket.js | 14 ++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/src/utils/shipmentWeights.js b/src/utils/shipmentWeights.js index 08d57c8130d..9d57779292d 100644 --- a/src/utils/shipmentWeights.js +++ b/src/utils/shipmentWeights.js @@ -34,7 +34,7 @@ export const getDisplayWeight = (shipment, weightAdjustment = 1.0) => { }; export const calculateNetWeightForProGearWeightTicket = (weightTicket) => { - if (weightTicket.weight == null || Number.isNaN(Number(weightTicket.weight))) { + if (weightTicket.weight == null || Number.isNaN(Number(weightTicket.weight)) || weightTicket.status === 'REJECTED') { return 0; } diff --git a/src/utils/shipmentWeights.test.js b/src/utils/shipmentWeights.test.js index a3ec57823e4..4f4e7616358 100644 --- a/src/utils/shipmentWeights.test.js +++ b/src/utils/shipmentWeights.test.js @@ -10,7 +10,10 @@ import { shipmentIsOverweight, getWeightTicketNetWeight, } from './shipmentWeights'; -import { createCompleteProGearWeightTicket } from './test/factories/proGearWeightTicket'; +import { + createCompleteProGearWeightTicket, + createRejectedProGearWeightTicket, +} from './test/factories/proGearWeightTicket'; import { createCompleteWeightTicket } from './test/factories/weightTicket'; describe('shipmentWeights utils', () => { @@ -202,6 +205,13 @@ describe('calculateNetWeightForProGearWeightTicket', () => { expect(calculateNetWeightForProGearWeightTicket(proGearWeightTicket)).toEqual(expectedNetWeight); }, ); + + it('rejected weight ticket net weight is zero', () => { + const rejectedProGearWeightTicket = createRejectedProGearWeightTicket({}, { weight: 200 }); + // The weight of the ticket should be greater than zero for this test to be valid. + expect(rejectedProGearWeightTicket.weight).toBeGreaterThan(0); + expect(calculateNetWeightForProGearWeightTicket(rejectedProGearWeightTicket)).toEqual(0); + }); }); describe('calculateTotalNetWeightForProGearWeightTickets', () => { @@ -226,6 +236,20 @@ describe('calculateTotalNetWeightForProGearWeightTickets', () => { }); }); +describe('calculateTotalNetWeightForProGearWeightTickets with a rejected weight ticket', () => { + it('rejected weight ticket is not included in total net weight', () => { + const approvedWeight = 350; + const approvedProGearWeightTicket = createCompleteProGearWeightTicket({}, { weight: approvedWeight }); + const rejectedProGearWeightTicket = createRejectedProGearWeightTicket({}, { weight: 200 }); + // The weight of each ticket should be greater than zero for this test to be valid. + expect(approvedProGearWeightTicket.weight).toBeGreaterThan(0); + expect(rejectedProGearWeightTicket.weight).toBeGreaterThan(0); + expect( + calculateTotalNetWeightForProGearWeightTickets([approvedProGearWeightTicket, rejectedProGearWeightTicket]), + ).toEqual(approvedWeight); + }); +}); + describe('Calculating shipment net weights', () => { const ppmShipments = [ { diff --git a/src/utils/test/factories/proGearWeightTicket.js b/src/utils/test/factories/proGearWeightTicket.js index 767dbe667a6..c05e22d8c99 100644 --- a/src/utils/test/factories/proGearWeightTicket.js +++ b/src/utils/test/factories/proGearWeightTicket.js @@ -81,8 +81,22 @@ const createCompleteProGearWeightTicketWithConstructedWeight = ( return weightTicket; }; +const createRejectedProGearWeightTicket = ({ serviceMemberId, creationDate } = {}, fieldOverrides = {}) => { + const fullFieldOverrides = { + belongsToSelf: true, + description: 'Laptop', + hasWeightTickets: true, + weight: 150, + ...fieldOverrides, + }; + const weightTicket = createBaseProGearWeightTicket({ serviceMemberId, creationDate }, fullFieldOverrides); + weightTicket.status = 'REJECTED'; + return weightTicket; +}; + export { createBaseProGearWeightTicket, createCompleteProGearWeightTicket, createCompleteProGearWeightTicketWithConstructedWeight, + createRejectedProGearWeightTicket, }; From 0f0f6d4a73a0cf73b4f1c777aeca4f2597004da7 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Fri, 17 Jan 2025 20:45:14 +0000 Subject: [PATCH 081/260] B-22056 - more tests for memory and filesystem. --- pkg/storage/filesystem_test.go | 43 ++++++++++++++++++++++++++++++++++ pkg/storage/memory_test.go | 43 ++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/pkg/storage/filesystem_test.go b/pkg/storage/filesystem_test.go index cecf69d2a7c..9c37b9204c8 100644 --- a/pkg/storage/filesystem_test.go +++ b/pkg/storage/filesystem_test.go @@ -1,6 +1,7 @@ package storage import ( + "io" "strings" "testing" ) @@ -23,6 +24,48 @@ func TestFilesystemPresignedURL(t *testing.T) { } } +func TestFilesystemReturnsSuccessful(t *testing.T) { + fsParams := FilesystemParams{ + root: "./", + webRoot: "https://example.text/files", + } + filesystem := NewFilesystem(fsParams) + if filesystem == nil { + t.Fatal("could not create new filesystem") + } + + storeValue := strings.NewReader("anyValue") + _, err := filesystem.Store("anyKey", storeValue, "", nil) + if err != nil { + t.Fatalf("could not store in filesystem: %s", err) + } + + retReader, err := filesystem.Fetch("anyKey") + if err != nil { + t.Fatalf("could not fetch from filesystem: %s", err) + } + + err = filesystem.Delete("anyKey") + if err != nil { + t.Fatalf("could not delete on filesystem: %s", err) + } + + retValue, err := io.ReadAll(retReader) + if strings.Compare(string(retValue[:]), "anyValue") != 0 { + t.Fatalf("could not fetch from filesystem: %s", err) + } + + fileSystem := filesystem.FileSystem() + if fileSystem == nil { + t.Fatal("could not retrieve filesystem from filesystem") + } + + tempFileSystem := filesystem.TempFileSystem() + if tempFileSystem == nil { + t.Fatal("could not retrieve filesystem from filesystem") + } +} + func TestFilesystemTags(t *testing.T) { fsParams := FilesystemParams{ root: "/home/username", diff --git a/pkg/storage/memory_test.go b/pkg/storage/memory_test.go index 68b96b1b0eb..bdf3133e9c8 100644 --- a/pkg/storage/memory_test.go +++ b/pkg/storage/memory_test.go @@ -1,6 +1,7 @@ package storage import ( + "io" "strings" "testing" ) @@ -23,6 +24,48 @@ func TestMemoryPresignedURL(t *testing.T) { } } +func TestMemoryReturnsSuccessful(t *testing.T) { + fsParams := MemoryParams{ + root: "/home/username", + webRoot: "https://example.text/files", + } + memory := NewMemory(fsParams) + if memory == nil { + t.Fatal("could not create new memory") + } + + storeValue := strings.NewReader("anyValue") + _, err := memory.Store("anyKey", storeValue, "", nil) + if err != nil { + t.Fatalf("could not store in memory: %s", err) + } + + retReader, err := memory.Fetch("anyKey") + if err != nil { + t.Fatalf("could not fetch from memory: %s", err) + } + + err = memory.Delete("anyKey") + if err != nil { + t.Fatalf("could not delete on memory: %s", err) + } + + retValue, err := io.ReadAll(retReader) + if strings.Compare(string(retValue[:]), "anyValue") != 0 { + t.Fatalf("could not fetch from memory: %s", err) + } + + fileSystem := memory.FileSystem() + if fileSystem == nil { + t.Fatal("could not retrieve filesystem from memory") + } + + tempFileSystem := memory.TempFileSystem() + if tempFileSystem == nil { + t.Fatal("could not retrieve filesystem from memory") + } +} + func TestMemoryTags(t *testing.T) { fsParams := MemoryParams{ root: "/home/username", From 38cc8f7d3f10c738f9a3a9666720064c8e03af90 Mon Sep 17 00:00:00 2001 From: Paul Stonebraker Date: Fri, 17 Jan 2025 20:59:31 +0000 Subject: [PATCH 082/260] update story for happo --- .../BulkAssignment/BulkAssignmentModal.stories.jsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.stories.jsx b/src/components/BulkAssignment/BulkAssignmentModal.stories.jsx index f7fa5b3630d..097a24c6bf0 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.stories.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.stories.jsx @@ -15,4 +15,12 @@ const ConnectedTemplate = (args) => ; export const ConnectedModal = ConnectedTemplate.bind({}); ConnectedModal.args = { isOpen: true, + bulkAssignmentData: { + bulkAssignmentMoveIDs: ['1', '2', '3', '4', '5', '6', '7', '8'], + availableOfficeUsers: [ + { lastName: 'Monk', firstName: 'Art', workload: 81 }, + { lastName: 'Green', firstName: 'Darrell', workload: 28 }, + { lastName: 'Riggins', firstName: 'John', workload: 44 }, + ], + }, }; From e6a690c92a5048f02da670600d60d3a49eb766c0 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Fri, 17 Jan 2025 22:18:19 +0000 Subject: [PATCH 083/260] B-22056 - change local receiver log message. --- pkg/notifications/notification_receiver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index 1ec6ecd2358..1eba5c4e1a7 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -274,7 +274,7 @@ func InitReceiver(v ViperType, logger *zap.Logger, wipeAllNotificationQueues boo return notificationReceiver, nil } - logger.Info("Using local sns_sqs receiver backend", zap.String("receiver_backend", v.GetString(cli.ReceiverBackendFlag))) + logger.Info("Using local notification receiver backend", zap.String("receiver_backend", v.GetString(cli.ReceiverBackendFlag))) return NewStubNotificationReceiver(), nil } From 821067caa4d62afa3e6d64dc6698a59e6e39ac7a Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Fri, 17 Jan 2025 23:02:44 +0000 Subject: [PATCH 084/260] B-22056 - deploy to exp. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a0df9b774a6..51a34eab813 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch placeholder_branch_name + dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env placeholder_env + dp3-env: &dp3-env exp # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch placeholder_branch_name + integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name + integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch placeholder_branch_name + client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch placeholder_branch_name + server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint executors: base_small: From 78f62bb865734c2f9c632e846f76fee7f694d44e Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Sat, 18 Jan 2025 00:07:03 +0000 Subject: [PATCH 085/260] B-22056 - restore exp env. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51a34eab813..a0df9b774a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + dp3-branch: &dp3-branch placeholder_branch_name # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env exp + dp3-env: &dp3-env placeholder_env # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-ignore-branch: &integration-ignore-branch placeholder_branch_name # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + client-ignore-branch: &client-ignore-branch placeholder_branch_name # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + server-ignore-branch: &server-ignore-branch placeholder_branch_name executors: base_small: From 9bd9aa4d8502bc98cdb71eda3e297d0f084a3de3 Mon Sep 17 00:00:00 2001 From: Brian Manley Date: Mon, 20 Jan 2025 14:55:14 +0000 Subject: [PATCH 086/260] B-21698 don't included rejected or excluded expenses in the total --- src/utils/ppmCloseout.jsx | 5 ++++- src/utils/ppmCloseout.test.jsx | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/utils/ppmCloseout.jsx b/src/utils/ppmCloseout.jsx index 6ee33434c7b..30e70c59b8f 100644 --- a/src/utils/ppmCloseout.jsx +++ b/src/utils/ppmCloseout.jsx @@ -166,7 +166,10 @@ export const formatExpenseItems = (expenses, editPath, editParams, handleDelete) }; export const calculateTotalMovingExpensesAmount = (movingExpenses = []) => { + const excludedExpenseStatuses = ['EXCLUDED', 'REJECTED']; // EXCLUDED and REJECTED expenses aren't included in the total. return movingExpenses.reduce((prev, curr) => { - return curr.amount && !Number.isNaN(Number(curr.amount)) ? prev + curr.amount : prev; + return curr.amount && !Number.isNaN(Number(curr.amount)) && !excludedExpenseStatuses.includes(curr.status) + ? prev + curr.amount + : prev; }, 0); }; diff --git a/src/utils/ppmCloseout.test.jsx b/src/utils/ppmCloseout.test.jsx index 4c8df5e07d5..e2963022310 100644 --- a/src/utils/ppmCloseout.test.jsx +++ b/src/utils/ppmCloseout.test.jsx @@ -50,3 +50,25 @@ describe('calculateTotalMovingExpensesAmount', () => { expect(calculateTotalMovingExpensesAmount(expenses)).toEqual(expectedTotal); }); }); + +describe('calculateTotalMovingExpensesAmount with reject and excluded amount', () => { + it('rejected and excluded expenses are not included in total amount', () => { + const approvedMovingExpense1 = createCompleteMovingExpense({}, { status: 'APPROVED', amount: 350 }); + const approvedMovingExpense2 = createCompleteMovingExpense({}, { status: 'APPROVED', amount: 650 }); + const approveAmountTotal = approvedMovingExpense1.amount + approvedMovingExpense2.amount; + const rejectedMovingExpense = createCompleteMovingExpense({}, { status: 'REJECTED', amount: 123 }); + const excludedMovingExpense = createCompleteMovingExpense({}, { status: 'EXCLUDED', amount: 456 }); + expect(approvedMovingExpense1.amount).toBeGreaterThan(0); + expect(approvedMovingExpense2.amount).toBeGreaterThan(0); + expect(rejectedMovingExpense.amount).toBeGreaterThan(0); + expect(excludedMovingExpense.amount).toBeGreaterThan(0); + expect( + calculateTotalMovingExpensesAmount([ + approvedMovingExpense1, + approvedMovingExpense2, + rejectedMovingExpense, + excludedMovingExpense, + ]), + ).toEqual(approveAmountTotal); + }); +}); From 05ffad2bf66fd9e49867299e1e9410b2dc8ece0d Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Mon, 20 Jan 2025 16:23:58 +0000 Subject: [PATCH 087/260] B-22056 - deploy to exp. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a0df9b774a6..51a34eab813 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch placeholder_branch_name + dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env placeholder_env + dp3-env: &dp3-env exp # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch placeholder_branch_name + integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name + integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch placeholder_branch_name + client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch placeholder_branch_name + server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint executors: base_small: From 386a2adeb905e2afc134c3609538a14990cea49e Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Mon, 20 Jan 2025 17:18:31 +0000 Subject: [PATCH 088/260] B-22056 - exp testing. --- cmd/milmove/serve.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/milmove/serve.go b/cmd/milmove/serve.go index a19f4b2444f..102633b2866 100644 --- a/cmd/milmove/serve.go +++ b/cmd/milmove/serve.go @@ -479,7 +479,7 @@ func buildRoutingConfig(appCtx appcontext.AppContext, v *viper.Viper, redisPool } // Notification Receiver - notificationReceiver, err := notifications.InitReceiver(v, appCtx.Logger(), true) + notificationReceiver, err := notifications.InitReceiver(v, appCtx.Logger(), false) if err != nil { appCtx.Logger().Fatal("notification receiver not enabled", zap.Error(err)) } From dc11bfdc2debf2329915accaa3215ac5080fedfc Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Mon, 20 Jan 2025 18:05:53 +0000 Subject: [PATCH 089/260] B-22056 - restore exp env. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51a34eab813..a0df9b774a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + dp3-branch: &dp3-branch placeholder_branch_name # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env exp + dp3-env: &dp3-env placeholder_env # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-ignore-branch: &integration-ignore-branch placeholder_branch_name # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + client-ignore-branch: &client-ignore-branch placeholder_branch_name # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + server-ignore-branch: &server-ignore-branch placeholder_branch_name executors: base_small: From a7129bcfb468dbf9a0e762948e67c038d7dfb1fe Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Mon, 20 Jan 2025 18:17:47 +0000 Subject: [PATCH 090/260] B-22056 - flip wipeNotificationQueues to true. --- cmd/milmove/serve.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/milmove/serve.go b/cmd/milmove/serve.go index 102633b2866..a19f4b2444f 100644 --- a/cmd/milmove/serve.go +++ b/cmd/milmove/serve.go @@ -479,7 +479,7 @@ func buildRoutingConfig(appCtx appcontext.AppContext, v *viper.Viper, redisPool } // Notification Receiver - notificationReceiver, err := notifications.InitReceiver(v, appCtx.Logger(), false) + notificationReceiver, err := notifications.InitReceiver(v, appCtx.Logger(), true) if err != nil { appCtx.Logger().Fatal("notification receiver not enabled", zap.Error(err)) } From c13048291788d1037dbeee9e438260480af310f9 Mon Sep 17 00:00:00 2001 From: Brian Manley Date: Mon, 20 Jan 2025 18:33:34 +0000 Subject: [PATCH 091/260] B-21985 update case --- .../ReviewServiceItems/ReviewAccountingCodes.test.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Office/ReviewServiceItems/ReviewAccountingCodes.test.jsx b/src/components/Office/ReviewServiceItems/ReviewAccountingCodes.test.jsx index 695f167d276..f9ed97ab87a 100644 --- a/src/components/Office/ReviewServiceItems/ReviewAccountingCodes.test.jsx +++ b/src/components/Office/ReviewServiceItems/ReviewAccountingCodes.test.jsx @@ -64,8 +64,8 @@ describe('components/Office/ReviewServiceItems/ReviewAccountingCodes', () => { />, ); - expect(screen.queryByText('Move management Fee')).not.toBeInTheDocument(); - expect(screen.getByText('Counseling Fee')).toBeInTheDocument(); + expect(screen.queryByText('Move management fee')).not.toBeInTheDocument(); + expect(screen.getByText('Counseling fee')).toBeInTheDocument(); expect(screen.getByText('$20.65')).toBeInTheDocument(); }); @@ -82,8 +82,8 @@ describe('components/Office/ReviewServiceItems/ReviewAccountingCodes', () => { />, ); - expect(screen.queryByText('Counseling Fee')).not.toBeInTheDocument(); - expect(screen.getByText('Move management Fee')).toBeInTheDocument(); + expect(screen.queryByText('Counseling fee')).not.toBeInTheDocument(); + expect(screen.getByText('Move management fee')).toBeInTheDocument(); expect(screen.getByText('$44.33')).toBeInTheDocument(); }); }); From f49837f08d90422ef8cc901ef0f698decc4aa9dc Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Mon, 20 Jan 2025 22:32:42 +0000 Subject: [PATCH 092/260] B-22056 - cleanup for pr. --- pkg/gen/internalapi/configure_mymove.go | 5 +-- .../internal/payloads/model_to_payload.go | 18 +++++----- pkg/handlers/ghcapi/move.go | 6 ++-- pkg/handlers/ghcapi/orders.go | 6 ++-- .../internal/payloads/model_to_payload.go | 7 ++-- pkg/handlers/internalapi/moves.go | 6 ++-- pkg/handlers/internalapi/orders.go | 6 ++-- pkg/handlers/internalapi/uploads.go | 34 +++++-------------- pkg/models/upload.go | 20 +++++++++++ pkg/storage/test/s3.go | 4 +-- 10 files changed, 56 insertions(+), 56 deletions(-) diff --git a/pkg/gen/internalapi/configure_mymove.go b/pkg/gen/internalapi/configure_mymove.go index d1fa1bc3756..e94254c7d87 100644 --- a/pkg/gen/internalapi/configure_mymove.go +++ b/pkg/gen/internalapi/configure_mymove.go @@ -4,7 +4,6 @@ package internalapi import ( "crypto/tls" - "io" "net/http" "github.com/go-openapi/errors" @@ -61,9 +60,7 @@ func configureAPI(api *internaloperations.MymoveAPI) http.Handler { api.BinProducer = runtime.ByteStreamProducer() api.JSONProducer = runtime.JSONProducer() - api.TextEventStreamProducer = runtime.ProducerFunc(func(w io.Writer, data interface{}) error { - return errors.NotImplemented("textEventStream producer has not yet been implemented") - }) + api.TextEventStreamProducer = runtime.ByteStreamProducer() // You may change here the memory limit for this multipart form parser. Below is the default (32 MB). // ppm.CreatePPMUploadMaxParseMemory = 32 << 20 diff --git a/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go b/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go index 46c58c10ea1..1d03149af9d 100644 --- a/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go +++ b/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go @@ -2032,10 +2032,10 @@ func Upload(storer storage.FileStorer, upload models.Upload, url string) *ghcmes } tags, err := storer.Tags(upload.StorageKey) - if err != nil || len(tags) == 0 { - uploadPayload.Status = "PROCESSING" + if err != nil { + uploadPayload.Status = string(models.AVStatusPROCESSING) } else { - uploadPayload.Status = tags["av-status"] + uploadPayload.Status = string(models.GetAVStatusFromTags(tags)) } return uploadPayload } @@ -2054,10 +2054,10 @@ func WeightTicketUpload(storer storage.FileStorer, upload models.Upload, url str IsWeightTicket: isWeightTicket, } tags, err := storer.Tags(upload.StorageKey) - if err != nil || len(tags) == 0 { - uploadPayload.Status = "PROCESSING" + if err != nil { + uploadPayload.Status = string(models.AVStatusPROCESSING) } else { - uploadPayload.Status = tags["av-status"] + uploadPayload.Status = string(models.GetAVStatusFromTags(tags)) } return uploadPayload } @@ -2110,10 +2110,10 @@ func PayloadForUploadModel( } tags, err := storer.Tags(upload.StorageKey) - if err != nil || len(tags) == 0 { - uploadPayload.Status = "PROCESSING" + if err != nil { + uploadPayload.Status = string(models.AVStatusPROCESSING) } else { - uploadPayload.Status = tags["av-status"] + uploadPayload.Status = string(models.GetAVStatusFromTags(tags)) } return uploadPayload } diff --git a/pkg/handlers/ghcapi/move.go b/pkg/handlers/ghcapi/move.go index aaf96dde91e..f4abb0b549a 100644 --- a/pkg/handlers/ghcapi/move.go +++ b/pkg/handlers/ghcapi/move.go @@ -429,10 +429,10 @@ func payloadForUploadModelFromAdditionalDocumentsUpload(storer storage.FileStore UpdatedAt: strfmt.DateTime(upload.UpdatedAt), } tags, err := storer.Tags(upload.StorageKey) - if err != nil || len(tags) == 0 { - uploadPayload.Status = "PROCESSING" + if err != nil { + uploadPayload.Status = string(models.AVStatusPROCESSING) } else { - uploadPayload.Status = tags["av-status"] + uploadPayload.Status = string(models.GetAVStatusFromTags(tags)) } return uploadPayload, nil } diff --git a/pkg/handlers/ghcapi/orders.go b/pkg/handlers/ghcapi/orders.go index 09b1464c016..c9ffab07a90 100644 --- a/pkg/handlers/ghcapi/orders.go +++ b/pkg/handlers/ghcapi/orders.go @@ -927,10 +927,10 @@ func payloadForUploadModelFromAmendedOrdersUpload(storer storage.FileStorer, upl UpdatedAt: strfmt.DateTime(upload.UpdatedAt), } tags, err := storer.Tags(upload.StorageKey) - if err != nil || len(tags) == 0 { - uploadPayload.Status = "PROCESSING" + if err != nil { + uploadPayload.Status = string(models.AVStatusPROCESSING) } else { - uploadPayload.Status = tags["av-status"] + uploadPayload.Status = string(models.GetAVStatusFromTags(tags)) } return uploadPayload, nil } diff --git a/pkg/handlers/internalapi/internal/payloads/model_to_payload.go b/pkg/handlers/internalapi/internal/payloads/model_to_payload.go index 9550b4a11f9..26b25349e02 100644 --- a/pkg/handlers/internalapi/internal/payloads/model_to_payload.go +++ b/pkg/handlers/internalapi/internal/payloads/model_to_payload.go @@ -455,11 +455,10 @@ func PayloadForUploadModel( } tags, err := storer.Tags(upload.StorageKey) - if err != nil || len(tags) == 0 { - uploadPayload.Status = "PROCESSING" + if err != nil { + uploadPayload.Status = string(models.AVStatusPROCESSING) } else { - uploadPayload.Status = tags["av-status"] - // TODO: update db with the tags + uploadPayload.Status = string(models.GetAVStatusFromTags(tags)) } return uploadPayload diff --git a/pkg/handlers/internalapi/moves.go b/pkg/handlers/internalapi/moves.go index 891c990e15e..f431da62850 100644 --- a/pkg/handlers/internalapi/moves.go +++ b/pkg/handlers/internalapi/moves.go @@ -588,10 +588,10 @@ func payloadForUploadModelFromAdditionalDocumentsUpload(storer storage.FileStore UpdatedAt: strfmt.DateTime(upload.UpdatedAt), } tags, err := storer.Tags(upload.StorageKey) - if err != nil || len(tags) == 0 { - uploadPayload.Status = "PROCESSING" + if err != nil { + uploadPayload.Status = string(models.AVStatusPROCESSING) } else { - uploadPayload.Status = tags["av-status"] + uploadPayload.Status = string(models.GetAVStatusFromTags(tags)) } return uploadPayload, nil } diff --git a/pkg/handlers/internalapi/orders.go b/pkg/handlers/internalapi/orders.go index 3936dcb39e2..85479be251f 100644 --- a/pkg/handlers/internalapi/orders.go +++ b/pkg/handlers/internalapi/orders.go @@ -34,10 +34,10 @@ func payloadForUploadModelFromAmendedOrdersUpload(storer storage.FileStorer, upl UpdatedAt: strfmt.DateTime(upload.UpdatedAt), } tags, err := storer.Tags(upload.StorageKey) - if err != nil || len(tags) == 0 { - uploadPayload.Status = "PROCESSING" + if err != nil { + uploadPayload.Status = string(models.AVStatusPROCESSING) } else { - uploadPayload.Status = tags["av-status"] + uploadPayload.Status = string(models.GetAVStatusFromTags(tags)) } return uploadPayload, nil } diff --git a/pkg/handlers/internalapi/uploads.go b/pkg/handlers/internalapi/uploads.go index e4968707b7b..248fc86c743 100644 --- a/pkg/handlers/internalapi/uploads.go +++ b/pkg/handlers/internalapi/uploads.go @@ -267,18 +267,6 @@ type CustomGetUploadStatusResponse struct { storer storage.FileStorer } -// AVStatusType represents the type of the anti-virus status, whether it is still processing, clean or infected -type AVStatusType string - -const ( - // AVStatusTypePROCESSING string PROCESSING - AVStatusTypePROCESSING AVStatusType = "PROCESSING" - // AVStatusTypeCLEAN string CLEAN - AVStatusTypeCLEAN AVStatusType = "CLEAN" - // AVStatusTypeINFECTED string INFECTED - AVStatusTypeINFECTED AVStatusType = "INFECTED" -) - func (o *CustomGetUploadStatusResponse) writeEventStreamMessage(rw http.ResponseWriter, producer runtime.Producer, id int, event string, data string) { resProcess := []byte(fmt.Sprintf("id: %s\nevent: %s\ndata: %s\n\n", strconv.Itoa(id), event, data)) if produceErr := producer.Produce(rw, resProcess); produceErr != nil { @@ -293,19 +281,17 @@ func (o *CustomGetUploadStatusResponse) WriteResponse(rw http.ResponseWriter, pr // Check current tag before event-driven wait for anti-virus tags, err := o.storer.Tags(o.storageKey) - var uploadStatus AVStatusType - if err != nil || len(tags) == 0 { - uploadStatus = AVStatusTypePROCESSING - } else if _, exists := tags["av-status"]; exists { - uploadStatus = AVStatusType(tags["av-status"]) + var uploadStatus models.AVStatusType + if err != nil { + uploadStatus = models.AVStatusPROCESSING } else { - uploadStatus = AVStatusTypePROCESSING + uploadStatus = models.GetAVStatusFromTags(tags) } // Limitation: once the status code header has been written (first response), we are not able to update the status for subsequent responses. // Standard 200 OK used with common SSE paradigm rw.WriteHeader(http.StatusOK) - if uploadStatus == AVStatusTypeCLEAN || uploadStatus == AVStatusTypeINFECTED { + if uploadStatus == models.AVStatusCLEAN || uploadStatus == models.AVStatusINFECTED { o.writeEventStreamMessage(rw, producer, 0, "message", string(uploadStatus)) o.writeEventStreamMessage(rw, producer, 1, "close", "Connection closed") return // skip notification loop since object already tagged from anti-virus @@ -379,17 +365,15 @@ func (o *CustomGetUploadStatusResponse) WriteResponse(rw http.ResponseWriter, pr tags, err := o.storer.Tags(o.storageKey) - if err != nil || len(tags) == 0 { - uploadStatus = AVStatusTypePROCESSING - } else if _, exists := tags["av-status"]; exists { - uploadStatus = AVStatusType(tags["av-status"]) + if err != nil { + uploadStatus = models.AVStatusPROCESSING } else { - uploadStatus = AVStatusTypePROCESSING + uploadStatus = models.GetAVStatusFromTags(tags) } o.writeEventStreamMessage(rw, producer, id_counter, "message", string(uploadStatus)) - if uploadStatus == AVStatusTypeCLEAN || uploadStatus == AVStatusTypeINFECTED { + if uploadStatus == models.AVStatusCLEAN || uploadStatus == models.AVStatusINFECTED { return errors.New("connection_closed") } diff --git a/pkg/models/upload.go b/pkg/models/upload.go index d6afc2d0d4a..c03c4ec2bd2 100644 --- a/pkg/models/upload.go +++ b/pkg/models/upload.go @@ -13,6 +13,26 @@ import ( "github.com/transcom/mymove/pkg/db/utilities" ) +// Used tangentally in association with an Upload to provide status of anti-virus scan +// AVStatusType represents the type of the anti-virus status, whether it is still processing, clean or infected +type AVStatusType string + +const ( + // AVStatusPROCESSING string PROCESSING + AVStatusPROCESSING AVStatusType = "PROCESSING" + // AVStatusCLEAN string CLEAN + AVStatusCLEAN AVStatusType = "CLEAN" + // AVStatusINFECTED string INFECTED + AVStatusINFECTED AVStatusType = "INFECTED" +) + +func GetAVStatusFromTags(tags map[string]string) AVStatusType { + if status, exists := tags["av-status"]; exists { + return AVStatusType(status) + } + return AVStatusType(AVStatusPROCESSING) +} + // UploadType represents the type of upload this is, whether is it uploaded for a User or for the Prime type UploadType string diff --git a/pkg/storage/test/s3.go b/pkg/storage/test/s3.go index b00efd75fdf..a2a8a49e052 100644 --- a/pkg/storage/test/s3.go +++ b/pkg/storage/test/s3.go @@ -18,7 +18,7 @@ type FakeS3Storage struct { willSucceed bool fs *afero.Afero tempFs *afero.Afero - EmptyTags bool + EmptyTags bool // Used for testing only } // Delete removes a file. @@ -101,7 +101,7 @@ func (fake *FakeS3Storage) Tags(_ string) (map[string]string, error) { } if fake.EmptyTags { tags = map[string]string{} - fake.EmptyTags = false + fake.EmptyTags = false // Reset after initial return, so future calls (tests) have filled tags } return tags, nil } From a426b6653354402da8b8caf28f5282da641fb924 Mon Sep 17 00:00:00 2001 From: joeydoyecaci Date: Tue, 21 Jan 2025 11:30:04 -0500 Subject: [PATCH 093/260] Removed service item creator ntsr check --- pkg/services/mto_service_item/mto_service_item_creator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 026998e3d11..c57caa7a65c 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator.go +++ b/pkg/services/mto_service_item/mto_service_item_creator.go @@ -606,7 +606,7 @@ func (o *mtoServiceItemCreator) CreateMTOServiceItem(appCtx appcontext.AppContex // DLH, DPK, DOP, DDP, DUPK // NTS-release requested pickup dates are for handle out, their pricing is handled differently as their locations are based on storage facilities, not pickup locations - if mtoShipment.PrimeEstimatedWeight != nil && mtoShipment.RequestedPickupDate != nil && mtoShipment.ShipmentType != models.MTOShipmentTypeHHGOutOfNTS { + if mtoShipment.PrimeEstimatedWeight != nil && mtoShipment.RequestedPickupDate != nil { serviceItemEstimatedPrice, err := o.FindEstimatedPrice(appCtx, serviceItem, mtoShipment) if serviceItemEstimatedPrice != 0 && err == nil { serviceItem.PricingEstimate = &serviceItemEstimatedPrice From 6fdcebcccf1104d3e5c87829dd9d641c52c53ff4 Mon Sep 17 00:00:00 2001 From: Brian Manley Date: Wed, 22 Jan 2025 13:30:40 +0000 Subject: [PATCH 094/260] B-21698 fix spelling --- src/utils/ppmCloseout.test.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/ppmCloseout.test.jsx b/src/utils/ppmCloseout.test.jsx index e2963022310..515a98f233d 100644 --- a/src/utils/ppmCloseout.test.jsx +++ b/src/utils/ppmCloseout.test.jsx @@ -51,7 +51,7 @@ describe('calculateTotalMovingExpensesAmount', () => { }); }); -describe('calculateTotalMovingExpensesAmount with reject and excluded amount', () => { +describe('calculateTotalMovingExpensesAmount with rejected and excluded amount', () => { it('rejected and excluded expenses are not included in total amount', () => { const approvedMovingExpense1 = createCompleteMovingExpense({}, { status: 'APPROVED', amount: 350 }); const approvedMovingExpense2 = createCompleteMovingExpense({}, { status: 'APPROVED', amount: 650 }); From 19068670f93c46bac4db9862aa97ead887fca72c Mon Sep 17 00:00:00 2001 From: Brian Manley Date: Wed, 22 Jan 2025 14:30:09 +0000 Subject: [PATCH 095/260] B-21698 add constants for ppm doc status --- src/shared/constants.js | 6 ++++++ src/utils/ppmCloseout.jsx | 3 ++- src/utils/ppmCloseout.test.jsx | 21 +++++++++++++++---- src/utils/shipmentWeights.js | 10 ++++++--- .../test/factories/proGearWeightTicket.js | 3 ++- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/shared/constants.js b/src/shared/constants.js index 56b7601c585..48f9e4e4b74 100644 --- a/src/shared/constants.js +++ b/src/shared/constants.js @@ -237,3 +237,9 @@ const ADDRESS_LABELS_MAP = { }; export const getAddressLabel = (type) => ADDRESS_LABELS_MAP[type]; + +export const PPM_DOCUMENT_STATUS = { + APPROVED: 'APPROVED', + EXCLUDED: 'EXCLUDED', + REJECTED: 'REJECTED', +}; diff --git a/src/utils/ppmCloseout.jsx b/src/utils/ppmCloseout.jsx index 30e70c59b8f..e702b098757 100644 --- a/src/utils/ppmCloseout.jsx +++ b/src/utils/ppmCloseout.jsx @@ -5,6 +5,7 @@ import moment from 'moment'; import { formatCents, formatCentsTruncateWhole, formatCustomerDate, formatWeight } from 'utils/formatters'; import { expenseTypeLabels, expenseTypes } from 'constants/ppmExpenseTypes'; import { isExpenseComplete, isWeightTicketComplete, isProGearComplete } from 'utils/shipments'; +import { PPM_DOCUMENT_STATUS } from 'shared/constants'; export const getW2Address = (address) => { const addressLine1 = address?.streetAddress2 @@ -166,7 +167,7 @@ export const formatExpenseItems = (expenses, editPath, editParams, handleDelete) }; export const calculateTotalMovingExpensesAmount = (movingExpenses = []) => { - const excludedExpenseStatuses = ['EXCLUDED', 'REJECTED']; // EXCLUDED and REJECTED expenses aren't included in the total. + const excludedExpenseStatuses = [PPM_DOCUMENT_STATUS.EXCLUDED, PPM_DOCUMENT_STATUS.REJECTED]; // EXCLUDED and REJECTED expenses aren't included in the total. return movingExpenses.reduce((prev, curr) => { return curr.amount && !Number.isNaN(Number(curr.amount)) && !excludedExpenseStatuses.includes(curr.status) ? prev + curr.amount diff --git a/src/utils/ppmCloseout.test.jsx b/src/utils/ppmCloseout.test.jsx index 515a98f233d..8c6ebddf37c 100644 --- a/src/utils/ppmCloseout.test.jsx +++ b/src/utils/ppmCloseout.test.jsx @@ -1,6 +1,7 @@ import { calculateTotalMovingExpensesAmount, formatExpenseItems } from 'utils/ppmCloseout'; import { createCompleteMovingExpense, createCompleteSITMovingExpense } from 'utils/test/factories/movingExpense'; import { expenseTypeLabels } from 'constants/ppmExpenseTypes'; +import { PPM_DOCUMENT_STATUS } from 'shared/constants'; describe('formatExpenseItems', () => { it.each([ @@ -53,11 +54,23 @@ describe('calculateTotalMovingExpensesAmount', () => { describe('calculateTotalMovingExpensesAmount with rejected and excluded amount', () => { it('rejected and excluded expenses are not included in total amount', () => { - const approvedMovingExpense1 = createCompleteMovingExpense({}, { status: 'APPROVED', amount: 350 }); - const approvedMovingExpense2 = createCompleteMovingExpense({}, { status: 'APPROVED', amount: 650 }); + const approvedMovingExpense1 = createCompleteMovingExpense( + {}, + { status: PPM_DOCUMENT_STATUS.APPROVED, amount: 350 }, + ); + const approvedMovingExpense2 = createCompleteMovingExpense( + {}, + { status: PPM_DOCUMENT_STATUS.APPROVED, amount: 650 }, + ); const approveAmountTotal = approvedMovingExpense1.amount + approvedMovingExpense2.amount; - const rejectedMovingExpense = createCompleteMovingExpense({}, { status: 'REJECTED', amount: 123 }); - const excludedMovingExpense = createCompleteMovingExpense({}, { status: 'EXCLUDED', amount: 456 }); + const rejectedMovingExpense = createCompleteMovingExpense( + {}, + { status: PPM_DOCUMENT_STATUS.REJECTED, amount: 123 }, + ); + const excludedMovingExpense = createCompleteMovingExpense( + {}, + { status: PPM_DOCUMENT_STATUS.EXCLUDED, amount: 456 }, + ); expect(approvedMovingExpense1.amount).toBeGreaterThan(0); expect(approvedMovingExpense2.amount).toBeGreaterThan(0); expect(rejectedMovingExpense.amount).toBeGreaterThan(0); diff --git a/src/utils/shipmentWeights.js b/src/utils/shipmentWeights.js index 9d57779292d..c2cbd2a3078 100644 --- a/src/utils/shipmentWeights.js +++ b/src/utils/shipmentWeights.js @@ -3,7 +3,7 @@ import returnLowestValue from './returnLowestValue'; -import { SHIPMENT_OPTIONS } from 'shared/constants'; +import { SHIPMENT_OPTIONS, PPM_DOCUMENT_STATUS } from 'shared/constants'; // eslint-disable-next-line import/prefer-default-export export function shipmentIsOverweight(estimatedWeight, weightCap) { @@ -34,7 +34,11 @@ export const getDisplayWeight = (shipment, weightAdjustment = 1.0) => { }; export const calculateNetWeightForProGearWeightTicket = (weightTicket) => { - if (weightTicket.weight == null || Number.isNaN(Number(weightTicket.weight)) || weightTicket.status === 'REJECTED') { + if ( + weightTicket.weight == null || + Number.isNaN(Number(weightTicket.weight)) || + weightTicket.status === PPM_DOCUMENT_STATUS.REJECTED + ) { return 0; } @@ -61,7 +65,7 @@ export const calculateWeightTicketWeightDifference = (weightTicket) => { }; export const getWeightTicketNetWeight = (weightTicket) => { - if (weightTicket.status !== 'REJECTED') + if (weightTicket.status !== PPM_DOCUMENT_STATUS.REJECTED) return weightTicket.adjustedNetWeight ?? calculateWeightTicketWeightDifference(weightTicket); return 0; }; diff --git a/src/utils/test/factories/proGearWeightTicket.js b/src/utils/test/factories/proGearWeightTicket.js index c05e22d8c99..56bbae65696 100644 --- a/src/utils/test/factories/proGearWeightTicket.js +++ b/src/utils/test/factories/proGearWeightTicket.js @@ -3,6 +3,7 @@ import { v4 } from 'uuid'; import createUpload from 'utils/test/factories/upload'; import { createDocumentWithoutUploads } from 'utils/test/factories/document'; +import { PPM_DOCUMENT_STATUS } from 'shared/constants'; const createBaseProGearWeightTicket = ({ serviceMemberId, creationDate = new Date() } = {}, fieldOverrides = {}) => { const createdAt = creationDate.toISOString(); @@ -90,7 +91,7 @@ const createRejectedProGearWeightTicket = ({ serviceMemberId, creationDate } = { ...fieldOverrides, }; const weightTicket = createBaseProGearWeightTicket({ serviceMemberId, creationDate }, fullFieldOverrides); - weightTicket.status = 'REJECTED'; + weightTicket.status = PPM_DOCUMENT_STATUS.REJECTED; return weightTicket; }; From 99eeac920c9d1bbd5622e33d98e7308c5cf4930a Mon Sep 17 00:00:00 2001 From: Brian Manley Date: Wed, 22 Jan 2025 15:27:44 +0000 Subject: [PATCH 096/260] B-21698 use existing ppm document status constants --- src/shared/constants.js | 6 ------ src/utils/ppmCloseout.jsx | 4 ++-- src/utils/ppmCloseout.test.jsx | 16 +++++----------- src/utils/shipmentWeights.js | 7 ++++--- src/utils/test/factories/proGearWeightTicket.js | 4 ++-- 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/shared/constants.js b/src/shared/constants.js index 48f9e4e4b74..56b7601c585 100644 --- a/src/shared/constants.js +++ b/src/shared/constants.js @@ -237,9 +237,3 @@ const ADDRESS_LABELS_MAP = { }; export const getAddressLabel = (type) => ADDRESS_LABELS_MAP[type]; - -export const PPM_DOCUMENT_STATUS = { - APPROVED: 'APPROVED', - EXCLUDED: 'EXCLUDED', - REJECTED: 'REJECTED', -}; diff --git a/src/utils/ppmCloseout.jsx b/src/utils/ppmCloseout.jsx index e702b098757..2a2a121107f 100644 --- a/src/utils/ppmCloseout.jsx +++ b/src/utils/ppmCloseout.jsx @@ -5,7 +5,7 @@ import moment from 'moment'; import { formatCents, formatCentsTruncateWhole, formatCustomerDate, formatWeight } from 'utils/formatters'; import { expenseTypeLabels, expenseTypes } from 'constants/ppmExpenseTypes'; import { isExpenseComplete, isWeightTicketComplete, isProGearComplete } from 'utils/shipments'; -import { PPM_DOCUMENT_STATUS } from 'shared/constants'; +import PPMDocumentsStatus from 'constants/ppms'; export const getW2Address = (address) => { const addressLine1 = address?.streetAddress2 @@ -167,7 +167,7 @@ export const formatExpenseItems = (expenses, editPath, editParams, handleDelete) }; export const calculateTotalMovingExpensesAmount = (movingExpenses = []) => { - const excludedExpenseStatuses = [PPM_DOCUMENT_STATUS.EXCLUDED, PPM_DOCUMENT_STATUS.REJECTED]; // EXCLUDED and REJECTED expenses aren't included in the total. + const excludedExpenseStatuses = [PPMDocumentsStatus.EXCLUDED, PPMDocumentsStatus.REJECTED]; // EXCLUDED and REJECTED expenses aren't included in the total. return movingExpenses.reduce((prev, curr) => { return curr.amount && !Number.isNaN(Number(curr.amount)) && !excludedExpenseStatuses.includes(curr.status) ? prev + curr.amount diff --git a/src/utils/ppmCloseout.test.jsx b/src/utils/ppmCloseout.test.jsx index 8c6ebddf37c..b168a896eaf 100644 --- a/src/utils/ppmCloseout.test.jsx +++ b/src/utils/ppmCloseout.test.jsx @@ -1,7 +1,7 @@ import { calculateTotalMovingExpensesAmount, formatExpenseItems } from 'utils/ppmCloseout'; import { createCompleteMovingExpense, createCompleteSITMovingExpense } from 'utils/test/factories/movingExpense'; import { expenseTypeLabels } from 'constants/ppmExpenseTypes'; -import { PPM_DOCUMENT_STATUS } from 'shared/constants'; +import PPMDocumentsStatus from 'constants/ppms'; describe('formatExpenseItems', () => { it.each([ @@ -56,21 +56,15 @@ describe('calculateTotalMovingExpensesAmount with rejected and excluded amount', it('rejected and excluded expenses are not included in total amount', () => { const approvedMovingExpense1 = createCompleteMovingExpense( {}, - { status: PPM_DOCUMENT_STATUS.APPROVED, amount: 350 }, + { status: PPMDocumentsStatus.APPROVED, amount: 350 }, ); const approvedMovingExpense2 = createCompleteMovingExpense( {}, - { status: PPM_DOCUMENT_STATUS.APPROVED, amount: 650 }, + { status: PPMDocumentsStatus.APPROVED, amount: 650 }, ); const approveAmountTotal = approvedMovingExpense1.amount + approvedMovingExpense2.amount; - const rejectedMovingExpense = createCompleteMovingExpense( - {}, - { status: PPM_DOCUMENT_STATUS.REJECTED, amount: 123 }, - ); - const excludedMovingExpense = createCompleteMovingExpense( - {}, - { status: PPM_DOCUMENT_STATUS.EXCLUDED, amount: 456 }, - ); + const rejectedMovingExpense = createCompleteMovingExpense({}, { status: PPMDocumentsStatus.REJECTED, amount: 123 }); + const excludedMovingExpense = createCompleteMovingExpense({}, { status: PPMDocumentsStatus.EXCLUDED, amount: 456 }); expect(approvedMovingExpense1.amount).toBeGreaterThan(0); expect(approvedMovingExpense2.amount).toBeGreaterThan(0); expect(rejectedMovingExpense.amount).toBeGreaterThan(0); diff --git a/src/utils/shipmentWeights.js b/src/utils/shipmentWeights.js index c2cbd2a3078..58cd6e8ab73 100644 --- a/src/utils/shipmentWeights.js +++ b/src/utils/shipmentWeights.js @@ -3,7 +3,8 @@ import returnLowestValue from './returnLowestValue'; -import { SHIPMENT_OPTIONS, PPM_DOCUMENT_STATUS } from 'shared/constants'; +import { SHIPMENT_OPTIONS } from 'shared/constants'; +import PPMDocumentsStatus from 'constants/ppms'; // eslint-disable-next-line import/prefer-default-export export function shipmentIsOverweight(estimatedWeight, weightCap) { @@ -37,7 +38,7 @@ export const calculateNetWeightForProGearWeightTicket = (weightTicket) => { if ( weightTicket.weight == null || Number.isNaN(Number(weightTicket.weight)) || - weightTicket.status === PPM_DOCUMENT_STATUS.REJECTED + weightTicket.status === PPMDocumentsStatus.REJECTED ) { return 0; } @@ -65,7 +66,7 @@ export const calculateWeightTicketWeightDifference = (weightTicket) => { }; export const getWeightTicketNetWeight = (weightTicket) => { - if (weightTicket.status !== PPM_DOCUMENT_STATUS.REJECTED) + if (weightTicket.status !== PPMDocumentsStatus.REJECTED) return weightTicket.adjustedNetWeight ?? calculateWeightTicketWeightDifference(weightTicket); return 0; }; diff --git a/src/utils/test/factories/proGearWeightTicket.js b/src/utils/test/factories/proGearWeightTicket.js index 56bbae65696..1935bc1b4a8 100644 --- a/src/utils/test/factories/proGearWeightTicket.js +++ b/src/utils/test/factories/proGearWeightTicket.js @@ -3,7 +3,7 @@ import { v4 } from 'uuid'; import createUpload from 'utils/test/factories/upload'; import { createDocumentWithoutUploads } from 'utils/test/factories/document'; -import { PPM_DOCUMENT_STATUS } from 'shared/constants'; +import PPMDocumentsStatus from 'constants/ppms'; const createBaseProGearWeightTicket = ({ serviceMemberId, creationDate = new Date() } = {}, fieldOverrides = {}) => { const createdAt = creationDate.toISOString(); @@ -91,7 +91,7 @@ const createRejectedProGearWeightTicket = ({ serviceMemberId, creationDate } = { ...fieldOverrides, }; const weightTicket = createBaseProGearWeightTicket({ serviceMemberId, creationDate }, fullFieldOverrides); - weightTicket.status = PPM_DOCUMENT_STATUS.REJECTED; + weightTicket.status = PPMDocumentsStatus.REJECTED; return weightTicket; }; From bcd43ecc673e2873b678e3f576073a052120d9e4 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Wed, 22 Jan 2025 18:18:25 +0000 Subject: [PATCH 097/260] B-22056 - added flag for cleanup on start. --- .envrc | 4 +++- cmd/milmove/serve.go | 3 ++- pkg/cli/receiver.go | 10 +++++++++- pkg/notifications/notification_receiver.go | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.envrc b/.envrc index 031a4932458..e2aacb52680 100644 --- a/.envrc +++ b/.envrc @@ -264,6 +264,8 @@ export AWS_SES_REGION="us-gov-west-1" if [ "$RECEIVER_BACKEND" == "sns_sqs" ]; then export SNS_TAGS_UPDATED_TOPIC="app_s3_tag_events" export SNS_REGION="us-gov-west-1" +# cleanup flag false by default, only used at server startup to wipe receiver artifacts from previous runs +# export RECEIVER_CLEANUP_ON_START=false fi # To use s3 links aws-bucketname/xx/user/ for local builds, @@ -423,7 +425,7 @@ if [ ! -r .nix-disable ] && has nix-env; then # add the NIX_PROFILE bin path so that everything we just installed # is available on the path - PATH_add ${NIX_PROFILE}/bin + PATH_add "${NIX_PROFILE}"/bin # Add the node binaries to our path PATH_add ./node_modules/.bin # nix is immutable, so we need to specify a path for local changes, e.g. diff --git a/cmd/milmove/serve.go b/cmd/milmove/serve.go index a19f4b2444f..4f05b86beaa 100644 --- a/cmd/milmove/serve.go +++ b/cmd/milmove/serve.go @@ -479,7 +479,8 @@ func buildRoutingConfig(appCtx appcontext.AppContext, v *viper.Viper, redisPool } // Notification Receiver - notificationReceiver, err := notifications.InitReceiver(v, appCtx.Logger(), true) + runReceiverCleanup := v.GetBool(cli.ReceiverCleanupOnStartFlag) // Cleanup aws artifacts left over from previous runs + notificationReceiver, err := notifications.InitReceiver(v, appCtx.Logger(), runReceiverCleanup) if err != nil { appCtx.Logger().Fatal("notification receiver not enabled", zap.Error(err)) } diff --git a/pkg/cli/receiver.go b/pkg/cli/receiver.go index 9338a1d17d0..ed71d45d209 100644 --- a/pkg/cli/receiver.go +++ b/pkg/cli/receiver.go @@ -8,7 +8,7 @@ import ( ) const ( - // ReceiverBackend is the Receiver Backend Flag + // ReceiverBackendFlag is the Receiver Backend Flag ReceiverBackendFlag string = "receiver-backend" // SNSTagsUpdatedTopicFlag is the SNS Tags Updated Topic Flag SNSTagsUpdatedTopicFlag string = "sns-tags-updated-topic" @@ -16,6 +16,8 @@ const ( SNSRegionFlag string = "sns-region" // SNSAccountId is the application's AWS account id SNSAccountId string = "aws-account-id" + // ReceiverCleanupOnStartFlag is the Receiver Cleanup On Start Flag + ReceiverCleanupOnStartFlag string = "receiver-cleanup-on-start" ) // InitReceiverFlags initializes Storage command line flags @@ -24,6 +26,7 @@ func InitReceiverFlags(flag *pflag.FlagSet) { flag.String(SNSTagsUpdatedTopicFlag, "", "SNS Topic for receiving event messages") flag.String(SNSRegionFlag, "", "Region used for SNS and SQS") flag.String(SNSAccountId, "", "SNS account Id") + flag.Bool(ReceiverCleanupOnStartFlag, false, "Receiver will cleanup previous aws artifacts on start.") } // CheckReceiver validates Storage command line flags @@ -34,6 +37,11 @@ func CheckReceiver(v *viper.Viper) error { return fmt.Errorf("invalid receiver_backend %s, expecting local or sns_sqs", receiverBackend) } + receiverCleanupOnStart := v.GetString(ReceiverCleanupOnStartFlag) + if !stringSliceContains([]string{"true", "false"}, receiverCleanupOnStart) { + return fmt.Errorf("invalid receiver_cleanup_on_start %s, expecting true or false", receiverCleanupOnStart) + } + if receiverBackend == "sns_sqs" { r := v.GetString(SNSRegionFlag) if r == "" { diff --git a/pkg/notifications/notification_receiver.go b/pkg/notifications/notification_receiver.go index 1eba5c4e1a7..6dfab1b5d74 100644 --- a/pkg/notifications/notification_receiver.go +++ b/pkg/notifications/notification_receiver.go @@ -290,7 +290,7 @@ func (n *NotificationReceiverContext) wipeAllNotificationQueues(logger *zap.Logg return err } - logger.Info("Removing previous subscriptions...") + logger.Info("Receiver cleanup - Removing previous subscriptions...") paginator := sns.NewListSubscriptionsByTopicPaginator(n.snsService, &sns.ListSubscriptionsByTopicInput{ TopicArn: aws.String(n.constructArn("sns", defaultTopic)), }) @@ -314,7 +314,7 @@ func (n *NotificationReceiverContext) wipeAllNotificationQueues(logger *zap.Logg } } - logger.Info("Removing previous queues...") + logger.Info("Receiver cleanup - Removing previous queues...") result, err := n.sqsService.ListQueues(context.Background(), &sqs.ListQueuesInput{ QueueNamePrefix: aws.String(string(QueuePrefixObjectTagsAdded)), }) From d042c9d60e6a433d63016857168e644c5f8b1fae Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Wed, 22 Jan 2025 19:21:11 +0000 Subject: [PATCH 098/260] B-22056 - additional gen file --- pkg/gen/internalapi/configure_mymove.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/gen/internalapi/configure_mymove.go b/pkg/gen/internalapi/configure_mymove.go index e94254c7d87..d1fa1bc3756 100644 --- a/pkg/gen/internalapi/configure_mymove.go +++ b/pkg/gen/internalapi/configure_mymove.go @@ -4,6 +4,7 @@ package internalapi import ( "crypto/tls" + "io" "net/http" "github.com/go-openapi/errors" @@ -60,7 +61,9 @@ func configureAPI(api *internaloperations.MymoveAPI) http.Handler { api.BinProducer = runtime.ByteStreamProducer() api.JSONProducer = runtime.JSONProducer() - api.TextEventStreamProducer = runtime.ByteStreamProducer() + api.TextEventStreamProducer = runtime.ProducerFunc(func(w io.Writer, data interface{}) error { + return errors.NotImplemented("textEventStream producer has not yet been implemented") + }) // You may change here the memory limit for this multipart form parser. Below is the default (32 MB). // ppm.CreatePPMUploadMaxParseMemory = 32 << 20 From 16fa17d3586ea1d1ca08c58bc8aa4a8cd1f2fc95 Mon Sep 17 00:00:00 2001 From: joeydoyecaci Date: Wed, 22 Jan 2025 16:14:36 -0500 Subject: [PATCH 099/260] Send 500 to the prime estimator --- pkg/services/orchestrators/shipment/shipment_updater.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/services/orchestrators/shipment/shipment_updater.go b/pkg/services/orchestrators/shipment/shipment_updater.go index d624d33136f..6dc0757cd2e 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater.go +++ b/pkg/services/orchestrators/shipment/shipment_updater.go @@ -157,6 +157,12 @@ func AddPricingEstimatesToMTOServiceItems(appCtx appcontext.AppContext, shipment //Calculate the price using 110% of recorded weight estimatedWeightToUse = unit.Pound(estimatedWeightToUse.Float64() * 1.1) + + // if the weight is less than 500, it should be priced at minimum of 500 + if estimatedWeightToUse < 500 { + estimatedWeightToUse = 500 + } + serviceItemEstimatedPrice, err := shipmentUpdater.mtoServiceItemCreator.FindEstimatedPrice(appCtx, &serviceItem, *mtoShipment) // store actual captured weight From 3c2d562dc6d1436c5b0755f1c4568b4c48a87bb0 Mon Sep 17 00:00:00 2001 From: joeydoyecaci Date: Wed, 22 Jan 2025 18:27:07 -0500 Subject: [PATCH 100/260] Movved 500 lb limit into FindEstimatedPrice, clean up of PrimeEstimatedWeight setting --- .../mto_service_item/mto_service_item_creator.go | 9 ++++++--- pkg/services/orchestrators/shipment/shipment_updater.go | 9 +++------ 2 files changed, 9 insertions(+), 9 deletions(-) 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 c57caa7a65c..0851a845f6d 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator.go +++ b/pkg/services/mto_service_item/mto_service_item_creator.go @@ -56,7 +56,10 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, requestedPickupDate := *mtoShipment.RequestedPickupDate currTime := time.Now() var distance int - primeEstimatedWeight := *mtoShipment.PrimeEstimatedWeight + + if *mtoShipment.PrimeEstimatedWeight < 500 && *mtoShipment.PrimeEstimatedWeight > 0 { + *mtoShipment.PrimeEstimatedWeight = 500 + } contractCode, err := FetchContractCode(appCtx, currTime) if err != nil { @@ -174,7 +177,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, } } - fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, primeEstimatedWeight) + fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, *mtoShipment.PrimeEstimatedWeight) if err != nil { return 0, err } @@ -186,7 +189,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - price, _, err = o.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), primeEstimatedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) + price, _, err = o.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), *mtoShipment.PrimeEstimatedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) if err != nil { return 0, err } diff --git a/pkg/services/orchestrators/shipment/shipment_updater.go b/pkg/services/orchestrators/shipment/shipment_updater.go index 6dc0757cd2e..185e9235cd3 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater.go +++ b/pkg/services/orchestrators/shipment/shipment_updater.go @@ -153,20 +153,17 @@ func AddPricingEstimatesToMTOServiceItems(appCtx appcontext.AppContext, shipment originalWeight := estimatedWeightToUse // set weight to be modified - mtoShipmentCopy.MTOServiceItems[index].EstimatedWeight = &estimatedWeightToUse + mtoShipmentCopy.PrimeEstimatedWeight = &estimatedWeightToUse //Calculate the price using 110% of recorded weight estimatedWeightToUse = unit.Pound(estimatedWeightToUse.Float64() * 1.1) - // if the weight is less than 500, it should be priced at minimum of 500 - if estimatedWeightToUse < 500 { - estimatedWeightToUse = 500 - } - serviceItemEstimatedPrice, err := shipmentUpdater.mtoServiceItemCreator.FindEstimatedPrice(appCtx, &serviceItem, *mtoShipment) // store actual captured weight mtoShipmentCopy.MTOServiceItems[index].EstimatedWeight = &originalWeight + mtoShipmentCopy.PrimeEstimatedWeight = &originalWeight + if serviceItemEstimatedPrice != 0 && err == nil { mtoShipmentCopy.MTOServiceItems[index].PricingEstimate = &serviceItemEstimatedPrice } From 5f182711b3ad86fd1d77163a6548bc0550ecfc8d Mon Sep 17 00:00:00 2001 From: joeydoyecaci Date: Thu, 23 Jan 2025 18:23:26 +0000 Subject: [PATCH 101/260] Added GetAdjustedWeight and moved 110% modifier --- .../mto_service_item_creator.go | 39 ++++++++---- .../mto_service_item_creator_test.go | 63 +++++++++++++++++++ .../shipment/shipment_updater.go | 11 +--- 3 files changed, 93 insertions(+), 20 deletions(-) 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 0851a845f6d..9832fa733b0 100644 --- a/pkg/services/mto_service_item/mto_service_item_creator.go +++ b/pkg/services/mto_service_item/mto_service_item_creator.go @@ -57,9 +57,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, currTime := time.Now() var distance int - if *mtoShipment.PrimeEstimatedWeight < 500 && *mtoShipment.PrimeEstimatedWeight > 0 { - *mtoShipment.PrimeEstimatedWeight = 500 - } + adjustedWeight := GetAdjustedWeight(*mtoShipment.PrimeEstimatedWeight, mtoShipment.ShipmentType == models.MTOShipmentTypeUnaccompaniedBaggage) contractCode, err := FetchContractCode(appCtx, currTime) if err != nil { @@ -78,7 +76,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, return 0, err } - price, _, err = o.originPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) + price, _, err = o.originPricer.Price(appCtx, contractCode, requestedPickupDate, *adjustedWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -91,7 +89,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, servicesScheduleOrigin := domesticServiceArea.ServicesSchedule - price, _, err = o.packPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, servicesScheduleOrigin, isPPM) + price, _, err = o.packPricer.Price(appCtx, contractCode, requestedPickupDate, *adjustedWeight, servicesScheduleOrigin, isPPM) if err != nil { return 0, err } @@ -106,7 +104,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, } } - price, _, err = o.destinationPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) + price, _, err = o.destinationPricer.Price(appCtx, contractCode, requestedPickupDate, *adjustedWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -119,7 +117,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, serviceScheduleDestination := domesticServiceArea.ServicesSchedule - price, _, err = o.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, *mtoShipment.PrimeEstimatedWeight, serviceScheduleDestination, isPPM) + price, _, err = o.unpackPricer.Price(appCtx, contractCode, requestedPickupDate, *adjustedWeight, serviceScheduleDestination, isPPM) if err != nil { return 0, err } @@ -137,7 +135,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - price, _, err = o.linehaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea, isPPM) + price, _, err = o.linehaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), *adjustedWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -153,7 +151,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - price, _, err = o.shorthaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), *mtoShipment.PrimeEstimatedWeight, domesticServiceArea.ServiceArea) + price, _, err = o.shorthaulPricer.Price(appCtx, contractCode, requestedPickupDate, unit.Miles(distance), *adjustedWeight, domesticServiceArea.ServiceArea) if err != nil { return 0, err } @@ -177,7 +175,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, } } - fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, *mtoShipment.PrimeEstimatedWeight) + fscWeightBasedDistanceMultiplier, err := LookupFSCWeightBasedDistanceMultiplier(appCtx, *adjustedWeight) if err != nil { return 0, err } @@ -189,7 +187,7 @@ func (o *mtoServiceItemCreator) FindEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - price, _, err = o.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), *mtoShipment.PrimeEstimatedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) + price, _, err = o.fuelSurchargePricer.Price(appCtx, pickupDateForFSC, unit.Miles(distance), *adjustedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) if err != nil { return 0, err } @@ -941,3 +939,22 @@ func (o *mtoServiceItemCreator) validateFirstDaySITServiceItem(appCtx appcontext return &extraServiceItems, nil } + +// Get Adjusted weight for pricing. Returns the weight at 110% or the minimum billable weight whichever is higher, unless it's 0 +func GetAdjustedWeight(incomingWeight unit.Pound, isUB bool) *unit.Pound { + // minimum weight billed by GHC is 500 lbs unless it's Unaccompanied Baggage (UB) + minimumBilledWeight := unit.Pound(500) + if isUB { + minimumBilledWeight = unit.Pound(300) + } + + // add 110% modifier to billable weight + newWeight := (int(incomingWeight.Float64() * 1.1)) + adjustedWeight := (*unit.Pound)(&newWeight) + + // if the adjusted weight is less than the minimum billable weight but is nonzero, set it to the minimum weight billed + if *adjustedWeight < minimumBilledWeight && *adjustedWeight > 0 { + *adjustedWeight = minimumBilledWeight + } + return adjustedWeight +} 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 d2a7709b9ff..9124119c722 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 @@ -1840,3 +1840,66 @@ func (suite *MTOServiceItemServiceSuite) TestCreateDestSITServiceItem() { suite.Contains(invalidInputError.ValidationErrors.Keys(), "reServiceCode") }) } +func (suite *MTOServiceItemServiceSuite) TestGetAdjustedWeight() { + suite.Run("If no weight is provided", func() { + var incomingWeight unit.Pound + adjustedWeight := GetAdjustedWeight(incomingWeight, false) + suite.Equal(unit.Pound(0), *adjustedWeight) + }) + suite.Run("If a weight of 0 is provided", func() { + incomingWeight := unit.Pound(0) + adjustedWeight := GetAdjustedWeight(incomingWeight, false) + suite.Equal(unit.Pound(0), *adjustedWeight) + }) + suite.Run("If weight of 100 is provided", func() { + incomingWeight := unit.Pound(100) + adjustedWeight := GetAdjustedWeight(incomingWeight, false) + suite.Equal(unit.Pound(500), *adjustedWeight) + }) + suite.Run("If weight of 454 is provided", func() { + incomingWeight := unit.Pound(454) + adjustedWeight := GetAdjustedWeight(incomingWeight, false) + suite.Equal(unit.Pound(500), *adjustedWeight) + }) + suite.Run("If weight of 456 is provided", func() { + incomingWeight := unit.Pound(456) + adjustedWeight := GetAdjustedWeight(incomingWeight, false) + suite.Equal(unit.Pound(501), *adjustedWeight) + }) + suite.Run("If weight of 1000 is provided", func() { + incomingWeight := unit.Pound(1000) + adjustedWeight := GetAdjustedWeight(incomingWeight, false) + suite.Equal(unit.Pound(1100), *adjustedWeight) + }) + + suite.Run("If no weight is provided UB", func() { + var incomingWeight unit.Pound + adjustedWeight := GetAdjustedWeight(incomingWeight, true) + suite.Equal(unit.Pound(0), *adjustedWeight) + }) + suite.Run("If a weight of 0 is provided UB", func() { + incomingWeight := unit.Pound(0) + adjustedWeight := GetAdjustedWeight(incomingWeight, true) + suite.Equal(unit.Pound(0), *adjustedWeight) + }) + suite.Run("If weight of 100 is provided UB", func() { + incomingWeight := unit.Pound(100) + adjustedWeight := GetAdjustedWeight(incomingWeight, true) + suite.Equal(unit.Pound(300), *adjustedWeight) + }) + suite.Run("If weight of 272 is provided UB", func() { + incomingWeight := unit.Pound(272) + adjustedWeight := GetAdjustedWeight(incomingWeight, true) + suite.Equal(unit.Pound(300), *adjustedWeight) + }) + suite.Run("If weight of 274 is provided UB", func() { + incomingWeight := unit.Pound(274) + adjustedWeight := GetAdjustedWeight(incomingWeight, true) + suite.Equal(unit.Pound(301), *adjustedWeight) + }) + suite.Run("If weight of 1000 is provided UB", func() { + incomingWeight := unit.Pound(1000) + adjustedWeight := GetAdjustedWeight(incomingWeight, true) + suite.Equal(unit.Pound(1100), *adjustedWeight) + }) +} diff --git a/pkg/services/orchestrators/shipment/shipment_updater.go b/pkg/services/orchestrators/shipment/shipment_updater.go index 185e9235cd3..d8d82af8e90 100644 --- a/pkg/services/orchestrators/shipment/shipment_updater.go +++ b/pkg/services/orchestrators/shipment/shipment_updater.go @@ -150,19 +150,12 @@ func AddPricingEstimatesToMTOServiceItems(appCtx appcontext.AppContext, shipment } else { estimatedWeightToUse = *mtoShipmentCopy.PrimeEstimatedWeight } - originalWeight := estimatedWeightToUse - - // set weight to be modified - mtoShipmentCopy.PrimeEstimatedWeight = &estimatedWeightToUse - - //Calculate the price using 110% of recorded weight - estimatedWeightToUse = unit.Pound(estimatedWeightToUse.Float64() * 1.1) serviceItemEstimatedPrice, err := shipmentUpdater.mtoServiceItemCreator.FindEstimatedPrice(appCtx, &serviceItem, *mtoShipment) // store actual captured weight - mtoShipmentCopy.MTOServiceItems[index].EstimatedWeight = &originalWeight - mtoShipmentCopy.PrimeEstimatedWeight = &originalWeight + mtoShipmentCopy.MTOServiceItems[index].EstimatedWeight = &estimatedWeightToUse + mtoShipmentCopy.PrimeEstimatedWeight = &estimatedWeightToUse if serviceItemEstimatedPrice != 0 && err == nil { mtoShipmentCopy.MTOServiceItems[index].PricingEstimate = &serviceItemEstimatedPrice From 235e35c052cf4166b2ec2d1d98d00e141b1ca18d Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 23 Jan 2025 20:34:10 +0000 Subject: [PATCH 102/260] B-22056 - another test fix. --- pkg/storage/test/s3.go | 1 - pkg/storage/test/s3_test.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/storage/test/s3.go b/pkg/storage/test/s3.go index a2a8a49e052..56fbac83564 100644 --- a/pkg/storage/test/s3.go +++ b/pkg/storage/test/s3.go @@ -96,7 +96,6 @@ func (fake *FakeS3Storage) TempFileSystem() *afero.Afero { // Tags returns the tags for a specified key func (fake *FakeS3Storage) Tags(_ string) (map[string]string, error) { tags := map[string]string{ - "tagName": "tagValue", "av-status": "CLEAN", // Assume anti-virus run } if fake.EmptyTags { diff --git a/pkg/storage/test/s3_test.go b/pkg/storage/test/s3_test.go index a3fa89c5c9a..3c2f63bbeff 100644 --- a/pkg/storage/test/s3_test.go +++ b/pkg/storage/test/s3_test.go @@ -49,8 +49,8 @@ func TestFakeS3ReturnsSuccessful(t *testing.T) { if err != nil { t.Fatalf("could not fetch from fakeS3: %s", err) } - if len(tags) != 2 { - t.Fatal("return tags must have both tagName and av-status for fakeS3") + if len(tags) != 1 { + t.Fatal("return tags must have av-status key assigned for fakeS3") } presignedUrl, err := fakeS3.PresignedURL("anyKey", "anyContentType", "anyFileName") From 74dfe106e4a0a107de5daebf630534142cc8e703 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 23 Jan 2025 20:46:46 +0000 Subject: [PATCH 103/260] B-22056 - deploy to exp. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a0df9b774a6..51a34eab813 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch placeholder_branch_name + dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env placeholder_env + dp3-env: &dp3-env exp # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch placeholder_branch_name + integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name + integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch placeholder_branch_name + client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch placeholder_branch_name + server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint executors: base_small: From 625d2884531b9dac3ca6970fd861afd672a00deb Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 23 Jan 2025 21:51:18 +0000 Subject: [PATCH 104/260] B-22056 - restore exp env. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51a34eab813..a0df9b774a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + dp3-branch: &dp3-branch placeholder_branch_name # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env exp + dp3-env: &dp3-env placeholder_env # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-ignore-branch: &integration-ignore-branch placeholder_branch_name # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + client-ignore-branch: &client-ignore-branch placeholder_branch_name # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + server-ignore-branch: &server-ignore-branch placeholder_branch_name executors: base_small: From 514aa7b714d59531a1fc275dbf6e56fe36613e16 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Fri, 24 Jan 2025 20:13:52 +0000 Subject: [PATCH 105/260] B-22056 - deploy to exp. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a0df9b774a6..51a34eab813 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch placeholder_branch_name + dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env placeholder_env + dp3-env: &dp3-env exp # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch placeholder_branch_name + integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name + integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch placeholder_branch_name + client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch placeholder_branch_name + server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint executors: base_small: From 492c11734d38b1778ee449f8076ad61a93a8ab1d Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Fri, 24 Jan 2025 22:07:51 +0000 Subject: [PATCH 106/260] B-22056 - restore exp env. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51a34eab813..a0df9b774a6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,30 +40,30 @@ references: # In addition, it's common practice to disable acceptance tests and # ignore tests for dp3 deploys. See the branch settings below. - dp3-branch: &dp3-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + dp3-branch: &dp3-branch placeholder_branch_name # MUST BE ONE OF: loadtest, demo, exp. # These are used to pull in env vars so the spelling matters! - dp3-env: &dp3-env exp + dp3-env: &dp3-env placeholder_env # set integration-ignore-branch to the branch if you want to IGNORE # integration tests, or `placeholder_branch_name` if you do want to # run them - integration-ignore-branch: &integration-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-ignore-branch: &integration-ignore-branch placeholder_branch_name # set integration-mtls-ignore-branch to the branch if you want to # IGNORE mtls integration tests, or `placeholder_branch_name` if you # do want to run them - integration-mtls-ignore-branch: &integration-mtls-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + integration-mtls-ignore-branch: &integration-mtls-ignore-branch placeholder_branch_name # set client-ignore-branch to the branch if you want to IGNORE # client tests, or `placeholder_branch_name` if you do want to run # them - client-ignore-branch: &client-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + client-ignore-branch: &client-ignore-branch placeholder_branch_name # set server-ignore-branch to the branch if you want to IGNORE # server tests, or `placeholder_branch_name` if you do want to run # them - server-ignore-branch: &server-ignore-branch MAIN-B-22056_sns_sqs_deps_w_endpoint + server-ignore-branch: &server-ignore-branch placeholder_branch_name executors: base_small: From 0094a11c0be0795c63cf2a74ea630c52827ca940 Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Mon, 27 Jan 2025 23:01:56 +0000 Subject: [PATCH 107/260] Officer Order, UI Fix, Assignment number Fix --- .../office_user/office_user_fetcher.go | 3 +- .../BulkAssignment/BulkAssignmentModal.jsx | 124 ++++++++++-------- .../BulkAssignmentModal.module.scss | 8 ++ .../BulkAssignmentModal.test.jsx | 67 +++++----- src/components/Table/TableQueue.jsx | 4 +- src/pages/Office/MoveQueue/MoveQueue.jsx | 8 +- .../PaymentRequestQueue.jsx | 12 +- .../ServicesCounselingQueue.jsx | 62 +++++---- 8 files changed, 155 insertions(+), 133 deletions(-) diff --git a/pkg/services/office_user/office_user_fetcher.go b/pkg/services/office_user/office_user_fetcher.go index 350162324d2..5f6f411c9dd 100644 --- a/pkg/services/office_user/office_user_fetcher.go +++ b/pkg/services/office_user/office_user_fetcher.go @@ -153,7 +153,8 @@ func (o *officeUserFetcherPop) FetchOfficeUsersWithWorkloadByRoleAndOffice(appCt WHERE roles.role_type = $1 AND transportation_offices.id = $2 AND office_users.active = TRUE - GROUP BY office_users.id, office_users.first_name, office_users.last_name` + GROUP BY office_users.id, office_users.first_name, office_users.last_name + ORDER BY office_users.last_name ASC` err := appCtx.DB().RawQuery(query, role, officeID).All(&officeUsers) if err != nil { diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 6584c88ed94..8b753a38e57 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -1,65 +1,81 @@ -import React from 'react'; +import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { Button } from '@trussworks/react-uswds'; import styles from './BulkAssignmentModal.module.scss'; import Modal, { ModalTitle, ModalClose, ModalActions, connectModal } from 'components/Modal/Modal'; +import { getBulkAssignmentData } from 'services/ghcApi'; +import { milmoveLogger } from 'utils/milmoveLog'; -export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, closeText, bulkAssignmentData }) => ( -
- - onClose()} /> - -

- {title} ( - {bulkAssignmentData.bulkAssignmentMoveIDs == null ? 0 : bulkAssignmentData.bulkAssignmentMoveIDs.length}) -

- -
- - - - - - - {bulkAssignmentData?.availableOfficeUsers?.map((user) => { - return ( - - - - - - ); - })} -
UserWorkloadAssignment
-

- {user.lastName}, {user.firstName} -

- 		-

{user.workload || 0}

- 		- -
-
- - - - - -
-); +export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, closeText, queueType }) => { + const [bulkAssignmentData, setBulkAssignmentData] = useState(null); + useEffect(() => { + const fetchData = async () => { + try { + getBulkAssignmentData(queueType).then((data) => { + setBulkAssignmentData(data); + }); + } catch (err) { + milmoveLogger.error('Error fetching bulk assignment data:', err); + } + }; + fetchData(); + }, [queueType]); + return ( +
+ + onClose()} /> + +

+ {title} ({bulkAssignmentData == null ? 0 : bulkAssignmentData.bulkAssignmentMoveIDs.length}) +

+ +
+ + + + + + + {bulkAssignmentData?.availableOfficeUsers?.map((user) => { + return ( + + + + + + ); + })} +
UserWorkloadAssignment
+

+ {user.lastName}, {user.firstName} +

+ 		+

{user.workload || 0}

+ 		+ +
+
+ + + + + +
+ ); +}; BulkAssignmentModal.propTypes = { onClose: PropTypes.func.isRequired, onSubmit: PropTypes.func.isRequired, diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 83541755d4c..74a52ead1d2 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -20,3 +20,11 @@ } } } +button.backButton { + color: #005ea2; + background-color: white; + border: 2px solid #005ea2; + border-radius: 0.25rem; + font-weight: 700; + padding: 0.75rem 1.25rem; +} \ No newline at end of file diff --git a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx index 33663a5dfe4..b3f3ae5a6fc 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx @@ -1,8 +1,10 @@ import React from 'react'; -import { render, screen } from '@testing-library/react'; +import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { BulkAssignmentModal } from 'components/BulkAssignment/BulkAssignmentModal'; +import { QUEUE_TYPES } from 'constants/queues'; +import { MockProviders } from 'testUtils'; let onClose; let onSubmit; @@ -11,39 +13,48 @@ beforeEach(() => { onSubmit = jest.fn(); }); -const data = { +const bulkAssignmentData = { availableOfficeUsers: [ { - firstName: 'John', - lastName: 'Snow', - officeUserId: '123', - workload: 0, - }, - { - firstName: 'Jane', - lastName: 'Doe', - officeUserId: '456', + firstName: 'sc', + lastName: 'user', + officeUserId: '045c3048-df9a-4d44-88ed-8cd6e2100e08', workload: 1, }, { - firstName: 'Jimmy', - lastName: 'Page', - officeUserId: '789', - workload: 50, + firstName: 'test1', + lastName: 'person', + officeUserId: '4b1f2722-b0bf-4b16-b8c4-49b4e49ba42a', }, ], - bulkAssignmentMoveIDs: ['1', '2', '3', '4', '5'], + bulkAssignmentMoveIDs: [ + 'b3baf6ce-f43b-437c-85be-e1145c0ddb96', + '962ce8d2-03a2-435c-94ca-6b9ef6c226c1', + 'fee7f916-35a6-4c0b-9ea6-a1d8094b3ed3', + ], }; +jest.mock('services/ghcApi', () => ({ + getBulkAssignmentData: jest.fn().mockImplementation(() => Promise.resolve(bulkAssignmentData)), +})); + describe('BulkAssignmentModal', () => { it('renders the component', async () => { - render(); + render( + + + , + ); - expect(await screen.findByRole('heading', { level: 3, name: 'Bulk Assignment (5)' })).toBeInTheDocument(); + expect(await screen.findByRole('heading', { level: 3, name: 'Bulk Assignment (3)' })).toBeInTheDocument(); }); it('closes the modal when close icon is clicked', async () => { - render(); + render( + + + , + ); const closeButton = await screen.findByTestId('modalCloseButton'); @@ -53,7 +64,7 @@ describe('BulkAssignmentModal', () => { }); it('closes the modal when the Cancel button is clicked', async () => { - render(); + render(); const cancelButton = await screen.findByRole('button', { name: 'Cancel' }); @@ -63,26 +74,22 @@ describe('BulkAssignmentModal', () => { }); it('calls the submit function when Save button is clicked', async () => { - render(); - + render(); const saveButton = await screen.findByRole('button', { name: 'Save' }); - await userEvent.click(saveButton); - expect(onSubmit).toHaveBeenCalledTimes(1); }); it('renders the user data', async () => { - render(); - + render(); const userTable = await screen.findByRole('table'); - expect(userTable).toBeInTheDocument(); expect(screen.getByText('User')).toBeInTheDocument(); expect(screen.getByText('Workload')).toBeInTheDocument(); expect(screen.getByText('Assignment')).toBeInTheDocument(); - - expect(screen.getByText('Snow, John')).toBeInTheDocument(); - expect(screen.getAllByTestId('bulkAssignmentUserWorkload')[0]).toHaveTextContent('0'); + await act(async () => { + expect(await screen.getByText('user, sc')).toBeInTheDocument(); + }); + expect(screen.getAllByTestId('bulkAssignmentUserWorkload')[0]).toHaveTextContent('1'); }); }); diff --git a/src/components/Table/TableQueue.jsx b/src/components/Table/TableQueue.jsx index 52c614f0d49..91aba6f86af 100644 --- a/src/components/Table/TableQueue.jsx +++ b/src/components/Table/TableQueue.jsx @@ -56,7 +56,7 @@ const TableQueue = ({ isBulkAssignmentFFEnabled, officeUser, activeRole, - bulkAssignmentData, + queueType, }) => { const [isPageReload, setIsPageReload] = useState(true); useEffect(() => { @@ -323,7 +323,7 @@ const TableQueue = ({ )} diff --git a/src/pages/Office/MoveQueue/MoveQueue.jsx b/src/pages/Office/MoveQueue/MoveQueue.jsx index 02b7dcab70e..0d24287bc79 100644 --- a/src/pages/Office/MoveQueue/MoveQueue.jsx +++ b/src/pages/Office/MoveQueue/MoveQueue.jsx @@ -6,12 +6,12 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import styles from './MoveQueue.module.scss'; import { createHeader } from 'components/Table/utils'; -import { useMovesQueueQueries, useUserQueries, useMoveSearchQueries, useBulkAssignmentQueries } from 'hooks/queries'; +import { useMovesQueueQueries, useUserQueries, useMoveSearchQueries } from 'hooks/queries'; import { getMovesQueue } from 'services/ghcApi'; import { formatDateFromIso, serviceMemberAgencyLabel } from 'utils/formatters'; import MultiSelectCheckBoxFilter from 'components/Table/Filters/MultiSelectCheckBoxFilter'; import SelectFilter from 'components/Table/Filters/SelectFilter'; -import { MOVE_STATUS_OPTIONS, GBLOC, MOVE_STATUS_LABELS, BRANCH_OPTIONS } from 'constants/queues'; +import { MOVE_STATUS_OPTIONS, GBLOC, MOVE_STATUS_LABELS, BRANCH_OPTIONS, QUEUE_TYPES } from 'constants/queues'; import TableQueue from 'components/Table/TableQueue'; import LoadingPlaceholder from 'shared/LoadingPlaceholder'; import SomethingWentWrong from 'shared/SomethingWentWrong'; @@ -195,7 +195,6 @@ const MoveQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBulkAssignmen const [search, setSearch] = useState({ moveCode: null, dodID: null, customerName: null, paymentRequestCode: null }); const [searchHappened, setSearchHappened] = useState(false); const [moveLockFlag, setMoveLockFlag] = useState(false); - const { bulkAssignmentData } = useBulkAssignmentQueries('TASK_ORDER'); const supervisor = userPrivileges ? userPrivileges.some((p) => p.privilegeType === elevatedPrivilegeTypes.SUPERVISOR) : false; @@ -336,8 +335,7 @@ const MoveQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBulkAssignmen key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} - queueType="TASK_ORDER" - bulkAssignmentData={bulkAssignmentData} + queueType={QUEUE_TYPES.TASK_ORDER} />
); diff --git a/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx b/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx index f2a2a392eb5..546b4a10a31 100644 --- a/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx +++ b/src/pages/Office/PaymentRequestQueue/PaymentRequestQueue.jsx @@ -7,12 +7,7 @@ import styles from './PaymentRequestQueue.module.scss'; import SearchResultsTable from 'components/Table/SearchResultsTable'; import MoveSearchForm from 'components/MoveSearchForm/MoveSearchForm'; -import { - usePaymentRequestQueueQueries, - useUserQueries, - useMoveSearchQueries, - useBulkAssignmentQueries, -} from 'hooks/queries'; +import { usePaymentRequestQueueQueries, useUserQueries, useMoveSearchQueries } from 'hooks/queries'; import { getPaymentRequestsQueue } from 'services/ghcApi'; import { createHeader } from 'components/Table/utils'; import { @@ -23,7 +18,7 @@ import { } from 'utils/formatters'; import SelectFilter from 'components/Table/Filters/SelectFilter'; import DateSelectFilter from 'components/Table/Filters/DateSelectFilter'; -import { BRANCH_OPTIONS, GBLOC } from 'constants/queues'; +import { BRANCH_OPTIONS, GBLOC, QUEUE_TYPES } from 'constants/queues'; import TableQueue from 'components/Table/TableQueue'; import LoadingPlaceholder from 'shared/LoadingPlaceholder'; import SomethingWentWrong from 'shared/SomethingWentWrong'; @@ -203,7 +198,6 @@ const PaymentRequestQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBul const [search, setSearch] = useState({ moveCode: null, dodID: null, customerName: null, paymentRequestCode: null }); const [searchHappened, setSearchHappened] = useState(false); const [moveLockFlag, setMoveLockFlag] = useState(false); - const { bulkAssignmentData } = useBulkAssignmentQueries('PAYMENT_REQUEST'); const supervisor = userPrivileges ? userPrivileges.some((p) => p.privilegeType === elevatedPrivilegeTypes.SUPERVISOR) : false; @@ -341,7 +335,7 @@ const PaymentRequestQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBul key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} - bulkAssignmentData={bulkAssignmentData} + queueType={QUEUE_TYPES.PAYMENT_REQUEST} />
); diff --git a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx index f4765ee8238..7d8cf021952 100644 --- a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx +++ b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx @@ -1,58 +1,58 @@ -import React, { useCallback, useEffect, useState, useContext } from 'react'; -import { generatePath, useNavigate, Navigate, useParams, NavLink } from 'react-router-dom'; -import { connect } from 'react-redux'; -import { Button, Dropdown } from '@trussworks/react-uswds'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import { Button, Dropdown } from '@trussworks/react-uswds'; +import React, { useCallback, useContext, useEffect, useState } from 'react'; +import { connect } from 'react-redux'; +import { generatePath, Navigate, NavLink, useNavigate, useParams } from 'react-router-dom'; import styles from './ServicesCounselingQueue.module.scss'; -import { createHeader } from 'components/Table/utils'; -import SelectFilter from 'components/Table/Filters/SelectFilter'; +import CustomerSearchForm from 'components/CustomerSearchForm/CustomerSearchForm'; +import MoveSearchForm from 'components/MoveSearchForm/MoveSearchForm'; +import NotFound from 'components/NotFound/NotFound'; +import SelectedGblocContext from 'components/Office/GblocSwitcher/SelectedGblocContext'; import DateSelectFilter from 'components/Table/Filters/DateSelectFilter'; +import MultiSelectTypeAheadCheckBoxFilter from 'components/Table/Filters/MutliSelectTypeAheadCheckboxFilter'; +import SelectFilter from 'components/Table/Filters/SelectFilter'; +import SearchResultsTable from 'components/Table/SearchResultsTable'; import TableQueue from 'components/Table/TableQueue'; +import { createHeader } from 'components/Table/utils'; +import TabNav from 'components/TabNav'; +import { CHECK_SPECIAL_ORDERS_TYPES, SPECIAL_ORDERS_TYPES } from 'constants/orders'; import { BRANCH_OPTIONS, + QUEUE_TYPES, SERVICE_COUNSELING_MOVE_STATUS_LABELS, - SERVICE_COUNSELING_PPM_TYPE_OPTIONS, - SERVICE_COUNSELING_PPM_TYPE_LABELS, - SERVICE_COUNSELING_PPM_STATUS_OPTIONS, SERVICE_COUNSELING_PPM_STATUS_LABELS, + SERVICE_COUNSELING_PPM_STATUS_OPTIONS, + SERVICE_COUNSELING_PPM_TYPE_LABELS, + SERVICE_COUNSELING_PPM_TYPE_OPTIONS, } from 'constants/queues'; import { generalRoutes, servicesCounselingRoutes } from 'constants/routes'; import { elevatedPrivilegeTypes } from 'constants/userPrivileges'; +import { roleTypes } from 'constants/userRoles'; +import ConnectedFlashMessage from 'containers/FlashMessage/FlashMessage'; import { - useServicesCounselingQueueQueries, + useCustomerSearchQueries, + useMoveSearchQueries, useServicesCounselingQueuePPMQueries, + useServicesCounselingQueueQueries, useUserQueries, - useMoveSearchQueries, - useCustomerSearchQueries, - useBulkAssignmentQueries, } from 'hooks/queries'; import { getServicesCounselingOriginLocations, - getServicesCounselingQueue, getServicesCounselingPPMQueue, + getServicesCounselingQueue, } from 'services/ghcApi'; import { DATE_FORMAT_STRING, DEFAULT_EMPTY_VALUE, MOVE_STATUSES } from 'shared/constants'; -import { formatDateFromIso, serviceMemberAgencyLabel } from 'utils/formatters'; import LoadingPlaceholder from 'shared/LoadingPlaceholder'; import SomethingWentWrong from 'shared/SomethingWentWrong'; -import NotFound from 'components/NotFound/NotFound'; -import MoveSearchForm from 'components/MoveSearchForm/MoveSearchForm'; -import { roleTypes } from 'constants/userRoles'; -import SearchResultsTable from 'components/Table/SearchResultsTable'; -import TabNav from 'components/TabNav'; +import { isNullUndefinedOrWhitespace } from 'shared/utils'; +import { selectLoggedInUser } from 'store/entities/selectors'; import { isBooleanFlagEnabled, isCounselorMoveCreateEnabled } from 'utils/featureFlags'; -import retryPageLoading from 'utils/retryPageLoading'; +import { formatDateFromIso, serviceMemberAgencyLabel } from 'utils/formatters'; import { milmoveLogger } from 'utils/milmoveLog'; -import { CHECK_SPECIAL_ORDERS_TYPES, SPECIAL_ORDERS_TYPES } from 'constants/orders'; -import ConnectedFlashMessage from 'containers/FlashMessage/FlashMessage'; -import { isNullUndefinedOrWhitespace } from 'shared/utils'; -import CustomerSearchForm from 'components/CustomerSearchForm/CustomerSearchForm'; -import MultiSelectTypeAheadCheckBoxFilter from 'components/Table/Filters/MutliSelectTypeAheadCheckboxFilter'; import handleQueueAssignment from 'utils/queues'; -import { selectLoggedInUser } from 'store/entities/selectors'; -import SelectedGblocContext from 'components/Office/GblocSwitcher/SelectedGblocContext'; +import retryPageLoading from 'utils/retryPageLoading'; export const counselingColumns = (moveLockFlag, originLocationList, supervisor, isQueueManagementEnabled) => { const cols = [ @@ -452,8 +452,6 @@ const ServicesCounselingQueue = ({ officeUser?.transportation_office_assignments?.length > 1 && gblocContext ? gblocContext : { selectedGbloc: undefined }; - const closeoutBulkAssignmentData = useBulkAssignmentQueries('CLOSEOUT'); - const counselingBulkAssignmentData = useBulkAssignmentQueries('COUNSELING'); // Feature Flag useEffect(() => { @@ -671,7 +669,7 @@ const ServicesCounselingQueue = ({ key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} - bulkAssignmentData={closeoutBulkAssignmentData.bulkAssignmentData || {}} + queueType={QUEUE_TYPES.CLOSEOUT} /> ); @@ -701,7 +699,7 @@ const ServicesCounselingQueue = ({ key={queueType} isSupervisor={supervisor} isBulkAssignmentFFEnabled={isBulkAssignmentFFEnabled} - bulkAssignmentData={counselingBulkAssignmentData.bulkAssignmentData || {}} + queueType={QUEUE_TYPES.COUNSELING} /> ); From 76ebacc958ae392c38175a67722ccc2f9eca2d1a Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Tue, 28 Jan 2025 20:49:26 +0000 Subject: [PATCH 108/260] B-22056 - copy api to ghc from internal. --- pkg/gen/ghcapi/configure_mymove.go | 9 + pkg/gen/ghcapi/doc.go | 1 + pkg/gen/ghcapi/embedded_spec.go | 104 ++++++++++ pkg/gen/ghcapi/ghcoperations/mymove_api.go | 24 +++ .../uploads/get_upload_status.go | 58 ++++++ .../uploads/get_upload_status_parameters.go | 91 ++++++++ .../uploads/get_upload_status_responses.go | 177 ++++++++++++++++ .../uploads/get_upload_status_urlbuilder.go | 101 +++++++++ pkg/handlers/ghcapi/api.go | 3 + pkg/handlers/ghcapi/uploads.go | 195 ++++++++++++++++++ pkg/handlers/ghcapi/uploads_test.go | 128 ++++++++++++ .../uploads_test.go | 4 +- swagger-def/ghc.yaml | 36 ++++ swagger/ghc.yaml | 36 ++++ 14 files changed, 965 insertions(+), 2 deletions(-) create mode 100644 pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status.go create mode 100644 pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_parameters.go create mode 100644 pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_responses.go create mode 100644 pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_urlbuilder.go rename pkg/handlers/routing/{internalapi_test => ghcapi_test}/uploads_test.go (97%) diff --git a/pkg/gen/ghcapi/configure_mymove.go b/pkg/gen/ghcapi/configure_mymove.go index 32eb5174c09..bb80917f608 100644 --- a/pkg/gen/ghcapi/configure_mymove.go +++ b/pkg/gen/ghcapi/configure_mymove.go @@ -4,6 +4,7 @@ package ghcapi import ( "crypto/tls" + "io" "net/http" "github.com/go-openapi/errors" @@ -64,6 +65,9 @@ func configureAPI(api *ghcoperations.MymoveAPI) http.Handler { api.BinProducer = runtime.ByteStreamProducer() api.JSONProducer = runtime.JSONProducer() + api.TextEventStreamProducer = runtime.ProducerFunc(func(w io.Writer, data interface{}) error { + return errors.NotImplemented("textEventStream producer has not yet been implemented") + }) // You may change here the memory limit for this multipart form parser. Below is the default (32 MB). // uploads.CreateUploadMaxParseMemory = 32 << 20 @@ -392,6 +396,11 @@ func configureAPI(api *ghcoperations.MymoveAPI) http.Handler { return middleware.NotImplemented("operation uploads.GetUpload has not yet been implemented") }) } + if api.UploadsGetUploadStatusHandler == nil { + api.UploadsGetUploadStatusHandler = uploads.GetUploadStatusHandlerFunc(func(params uploads.GetUploadStatusParams) middleware.Responder { + return middleware.NotImplemented("operation uploads.GetUploadStatus has not yet been implemented") + }) + } if api.CalendarIsDateWeekendHolidayHandler == nil { api.CalendarIsDateWeekendHolidayHandler = calendar.IsDateWeekendHolidayHandlerFunc(func(params calendar.IsDateWeekendHolidayParams) middleware.Responder { return middleware.NotImplemented("operation calendar.IsDateWeekendHoliday has not yet been implemented") diff --git a/pkg/gen/ghcapi/doc.go b/pkg/gen/ghcapi/doc.go index 24f788c8fb2..24ba756c211 100644 --- a/pkg/gen/ghcapi/doc.go +++ b/pkg/gen/ghcapi/doc.go @@ -21,6 +21,7 @@ // Produces: // - application/pdf // - application/json +// - text/event-stream // // swagger:meta package ghcapi diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go index 3db3ec66e71..f400ed267a8 100644 --- a/pkg/gen/ghcapi/embedded_spec.go +++ b/pkg/gen/ghcapi/embedded_spec.go @@ -6475,6 +6475,58 @@ func init() { } } } + }, + "/uploads/{uploadId}/status": { + "get": { + "description": "Returns status of an upload based on antivirus run", + "produces": [ + "text/event-stream" + ], + "tags": [ + "uploads" + ], + "summary": "Returns status of an upload", + "operationId": "getUploadStatus", + "parameters": [ + { + "type": "string", + "format": "uuid", + "description": "UUID of the upload to return status of", + "name": "uploadId", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "the requested upload status", + "schema": { + "type": "string", + "enum": [ + "INFECTED", + "CLEAN", + "PROCESSING" + ], + "readOnly": true + } + }, + "400": { + "description": "invalid request", + "schema": { + "$ref": "#/definitions/InvalidRequestResponsePayload" + } + }, + "403": { + "description": "not authorized" + }, + "404": { + "description": "not found" + }, + "500": { + "description": "server error" + } + } + } } }, "definitions": { @@ -23517,6 +23569,58 @@ func init() { } } } + }, + "/uploads/{uploadId}/status": { + "get": { + "description": "Returns status of an upload based on antivirus run", + "produces": [ + "text/event-stream" + ], + "tags": [ + "uploads" + ], + "summary": "Returns status of an upload", + "operationId": "getUploadStatus", + "parameters": [ + { + "type": "string", + "format": "uuid", + "description": "UUID of the upload to return status of", + "name": "uploadId", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "the requested upload status", + "schema": { + "type": "string", + "enum": [ + "INFECTED", + "CLEAN", + "PROCESSING" + ], + "readOnly": true + } + }, + "400": { + "description": "invalid request", + "schema": { + "$ref": "#/definitions/InvalidRequestResponsePayload" + } + }, + "403": { + "description": "not authorized" + }, + "404": { + "description": "not found" + }, + "500": { + "description": "server error" + } + } + } } }, "definitions": { diff --git a/pkg/gen/ghcapi/ghcoperations/mymove_api.go b/pkg/gen/ghcapi/ghcoperations/mymove_api.go index c53c0fec4d7..24d614ee1e5 100644 --- a/pkg/gen/ghcapi/ghcoperations/mymove_api.go +++ b/pkg/gen/ghcapi/ghcoperations/mymove_api.go @@ -7,6 +7,7 @@ package ghcoperations import ( "fmt" + "io" "net/http" "strings" @@ -70,6 +71,9 @@ func NewMymoveAPI(spec *loads.Document) *MymoveAPI { BinProducer: runtime.ByteStreamProducer(), JSONProducer: runtime.JSONProducer(), + TextEventStreamProducer: runtime.ProducerFunc(func(w io.Writer, data interface{}) error { + return errors.NotImplemented("textEventStream producer has not yet been implemented") + }), OrderAcknowledgeExcessUnaccompaniedBaggageWeightRiskHandler: order.AcknowledgeExcessUnaccompaniedBaggageWeightRiskHandlerFunc(func(params order.AcknowledgeExcessUnaccompaniedBaggageWeightRiskParams) middleware.Responder { return middleware.NotImplemented("operation order.AcknowledgeExcessUnaccompaniedBaggageWeightRisk has not yet been implemented") @@ -263,6 +267,9 @@ func NewMymoveAPI(spec *loads.Document) *MymoveAPI { UploadsGetUploadHandler: uploads.GetUploadHandlerFunc(func(params uploads.GetUploadParams) middleware.Responder { return middleware.NotImplemented("operation uploads.GetUpload has not yet been implemented") }), + UploadsGetUploadStatusHandler: uploads.GetUploadStatusHandlerFunc(func(params uploads.GetUploadStatusParams) middleware.Responder { + return middleware.NotImplemented("operation uploads.GetUploadStatus has not yet been implemented") + }), CalendarIsDateWeekendHolidayHandler: calendar.IsDateWeekendHolidayHandlerFunc(func(params calendar.IsDateWeekendHolidayParams) middleware.Responder { return middleware.NotImplemented("operation calendar.IsDateWeekendHoliday has not yet been implemented") }), @@ -440,6 +447,9 @@ type MymoveAPI struct { // JSONProducer registers a producer for the following mime types: // - application/json JSONProducer runtime.Producer + // TextEventStreamProducer registers a producer for the following mime types: + // - text/event-stream + TextEventStreamProducer runtime.Producer // OrderAcknowledgeExcessUnaccompaniedBaggageWeightRiskHandler sets the operation handler for the acknowledge excess unaccompanied baggage weight risk operation OrderAcknowledgeExcessUnaccompaniedBaggageWeightRiskHandler order.AcknowledgeExcessUnaccompaniedBaggageWeightRiskHandler @@ -569,6 +579,8 @@ type MymoveAPI struct { TransportationOfficeGetTransportationOfficesOpenHandler transportation_office.GetTransportationOfficesOpenHandler // UploadsGetUploadHandler sets the operation handler for the get upload operation UploadsGetUploadHandler uploads.GetUploadHandler + // UploadsGetUploadStatusHandler sets the operation handler for the get upload status operation + UploadsGetUploadStatusHandler uploads.GetUploadStatusHandler // CalendarIsDateWeekendHolidayHandler sets the operation handler for the is date weekend holiday operation CalendarIsDateWeekendHolidayHandler calendar.IsDateWeekendHolidayHandler // MtoServiceItemListMTOServiceItemsHandler sets the operation handler for the list m t o service items operation @@ -739,6 +751,9 @@ func (o *MymoveAPI) Validate() error { if o.JSONProducer == nil { unregistered = append(unregistered, "JSONProducer") } + if o.TextEventStreamProducer == nil { + unregistered = append(unregistered, "TextEventStreamProducer") + } if o.OrderAcknowledgeExcessUnaccompaniedBaggageWeightRiskHandler == nil { unregistered = append(unregistered, "order.AcknowledgeExcessUnaccompaniedBaggageWeightRiskHandler") @@ -932,6 +947,9 @@ func (o *MymoveAPI) Validate() error { if o.UploadsGetUploadHandler == nil { unregistered = append(unregistered, "uploads.GetUploadHandler") } + if o.UploadsGetUploadStatusHandler == nil { + unregistered = append(unregistered, "uploads.GetUploadStatusHandler") + } if o.CalendarIsDateWeekendHolidayHandler == nil { unregistered = append(unregistered, "calendar.IsDateWeekendHolidayHandler") } @@ -1116,6 +1134,8 @@ func (o *MymoveAPI) ProducersFor(mediaTypes []string) map[string]runtime.Produce result["application/pdf"] = o.BinProducer case "application/json": result["application/json"] = o.JSONProducer + case "text/event-stream": + result["text/event-stream"] = o.TextEventStreamProducer } if p, ok := o.customProducers[mt]; ok { @@ -1415,6 +1435,10 @@ func (o *MymoveAPI) initHandlerCache() { if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } + o.handlers["GET"]["/uploads/{uploadId}/status"] = uploads.NewGetUploadStatus(o.context, o.UploadsGetUploadStatusHandler) + if o.handlers["GET"] == nil { + o.handlers["GET"] = make(map[string]http.Handler) + } o.handlers["GET"]["/calendar/{countryCode}/is-weekend-holiday/{date}"] = calendar.NewIsDateWeekendHoliday(o.context, o.CalendarIsDateWeekendHolidayHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) diff --git a/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status.go b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status.go new file mode 100644 index 00000000000..dc2c021f021 --- /dev/null +++ b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status.go @@ -0,0 +1,58 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package uploads + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the generate command + +import ( + "net/http" + + "github.com/go-openapi/runtime/middleware" +) + +// GetUploadStatusHandlerFunc turns a function with the right signature into a get upload status handler +type GetUploadStatusHandlerFunc func(GetUploadStatusParams) middleware.Responder + +// Handle executing the request and returning a response +func (fn GetUploadStatusHandlerFunc) Handle(params GetUploadStatusParams) middleware.Responder { + return fn(params) +} + +// GetUploadStatusHandler interface for that can handle valid get upload status params +type GetUploadStatusHandler interface { + Handle(GetUploadStatusParams) middleware.Responder +} + +// NewGetUploadStatus creates a new http.Handler for the get upload status operation +func NewGetUploadStatus(ctx *middleware.Context, handler GetUploadStatusHandler) *GetUploadStatus { + return &GetUploadStatus{Context: ctx, Handler: handler} +} + +/* + GetUploadStatus swagger:route GET /uploads/{uploadId}/status uploads getUploadStatus + +# Returns status of an upload + +Returns status of an upload based on antivirus run +*/ +type GetUploadStatus struct { + Context *middleware.Context + Handler GetUploadStatusHandler +} + +func (o *GetUploadStatus) ServeHTTP(rw http.ResponseWriter, r *http.Request) { + route, rCtx, _ := o.Context.RouteInfo(r) + if rCtx != nil { + *r = *rCtx + } + var Params = NewGetUploadStatusParams() + if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params + o.Context.Respond(rw, r, route.Produces, route, err) + return + } + + res := o.Handler.Handle(Params) // actually handle the request + o.Context.Respond(rw, r, route.Produces, route, res) + +} diff --git a/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_parameters.go b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_parameters.go new file mode 100644 index 00000000000..1770aa8ca6b --- /dev/null +++ b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_parameters.go @@ -0,0 +1,91 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package uploads + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +import ( + "net/http" + + "github.com/go-openapi/errors" + "github.com/go-openapi/runtime/middleware" + "github.com/go-openapi/strfmt" + "github.com/go-openapi/validate" +) + +// NewGetUploadStatusParams creates a new GetUploadStatusParams object +// +// There are no default values defined in the spec. +func NewGetUploadStatusParams() GetUploadStatusParams { + + return GetUploadStatusParams{} +} + +// GetUploadStatusParams contains all the bound params for the get upload status operation +// typically these are obtained from a http.Request +// +// swagger:parameters getUploadStatus +type GetUploadStatusParams struct { + + // HTTP Request Object + HTTPRequest *http.Request `json:"-"` + + /*UUID of the upload to return status of + Required: true + In: path + */ + UploadID strfmt.UUID +} + +// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface +// for simple values it will use straight method calls. +// +// To ensure default values, the struct must have been initialized with NewGetUploadStatusParams() beforehand. +func (o *GetUploadStatusParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error { + var res []error + + o.HTTPRequest = r + + rUploadID, rhkUploadID, _ := route.Params.GetOK("uploadId") + if err := o.bindUploadID(rUploadID, rhkUploadID, route.Formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +// bindUploadID binds and validates parameter UploadID from path. +func (o *GetUploadStatusParams) bindUploadID(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: true + // Parameter is provided by construction from the route + + // Format: uuid + value, err := formats.Parse("uuid", raw) + if err != nil { + return errors.InvalidType("uploadId", "path", "strfmt.UUID", raw) + } + o.UploadID = *(value.(*strfmt.UUID)) + + if err := o.validateUploadID(formats); err != nil { + return err + } + + return nil +} + +// validateUploadID carries on validations for parameter UploadID +func (o *GetUploadStatusParams) validateUploadID(formats strfmt.Registry) error { + + if err := validate.FormatOf("uploadId", "path", "uuid", o.UploadID.String(), formats); err != nil { + return err + } + return nil +} diff --git a/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_responses.go b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_responses.go new file mode 100644 index 00000000000..894980d6a2b --- /dev/null +++ b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_responses.go @@ -0,0 +1,177 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package uploads + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +import ( + "net/http" + + "github.com/go-openapi/runtime" + + "github.com/transcom/mymove/pkg/gen/ghcmessages" +) + +// GetUploadStatusOKCode is the HTTP code returned for type GetUploadStatusOK +const GetUploadStatusOKCode int = 200 + +/* +GetUploadStatusOK the requested upload status + +swagger:response getUploadStatusOK +*/ +type GetUploadStatusOK struct { + + /* + In: Body + */ + Payload string `json:"body,omitempty"` +} + +// NewGetUploadStatusOK creates GetUploadStatusOK with default headers values +func NewGetUploadStatusOK() *GetUploadStatusOK { + + return &GetUploadStatusOK{} +} + +// WithPayload adds the payload to the get upload status o k response +func (o *GetUploadStatusOK) WithPayload(payload string) *GetUploadStatusOK { + o.Payload = payload + return o +} + +// SetPayload sets the payload to the get upload status o k response +func (o *GetUploadStatusOK) SetPayload(payload string) { + o.Payload = payload +} + +// WriteResponse to the client +func (o *GetUploadStatusOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.WriteHeader(200) + payload := o.Payload + if err := producer.Produce(rw, payload); err != nil { + panic(err) // let the recovery middleware deal with this + } +} + +// GetUploadStatusBadRequestCode is the HTTP code returned for type GetUploadStatusBadRequest +const GetUploadStatusBadRequestCode int = 400 + +/* +GetUploadStatusBadRequest invalid request + +swagger:response getUploadStatusBadRequest +*/ +type GetUploadStatusBadRequest struct { + + /* + In: Body + */ + Payload *ghcmessages.InvalidRequestResponsePayload `json:"body,omitempty"` +} + +// NewGetUploadStatusBadRequest creates GetUploadStatusBadRequest with default headers values +func NewGetUploadStatusBadRequest() *GetUploadStatusBadRequest { + + return &GetUploadStatusBadRequest{} +} + +// WithPayload adds the payload to the get upload status bad request response +func (o *GetUploadStatusBadRequest) WithPayload(payload *ghcmessages.InvalidRequestResponsePayload) *GetUploadStatusBadRequest { + o.Payload = payload + return o +} + +// SetPayload sets the payload to the get upload status bad request response +func (o *GetUploadStatusBadRequest) SetPayload(payload *ghcmessages.InvalidRequestResponsePayload) { + o.Payload = payload +} + +// WriteResponse to the client +func (o *GetUploadStatusBadRequest) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.WriteHeader(400) + if o.Payload != nil { + payload := o.Payload + if err := producer.Produce(rw, payload); err != nil { + panic(err) // let the recovery middleware deal with this + } + } +} + +// GetUploadStatusForbiddenCode is the HTTP code returned for type GetUploadStatusForbidden +const GetUploadStatusForbiddenCode int = 403 + +/* +GetUploadStatusForbidden not authorized + +swagger:response getUploadStatusForbidden +*/ +type GetUploadStatusForbidden struct { +} + +// NewGetUploadStatusForbidden creates GetUploadStatusForbidden with default headers values +func NewGetUploadStatusForbidden() *GetUploadStatusForbidden { + + return &GetUploadStatusForbidden{} +} + +// WriteResponse to the client +func (o *GetUploadStatusForbidden) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses + + rw.WriteHeader(403) +} + +// GetUploadStatusNotFoundCode is the HTTP code returned for type GetUploadStatusNotFound +const GetUploadStatusNotFoundCode int = 404 + +/* +GetUploadStatusNotFound not found + +swagger:response getUploadStatusNotFound +*/ +type GetUploadStatusNotFound struct { +} + +// NewGetUploadStatusNotFound creates GetUploadStatusNotFound with default headers values +func NewGetUploadStatusNotFound() *GetUploadStatusNotFound { + + return &GetUploadStatusNotFound{} +} + +// WriteResponse to the client +func (o *GetUploadStatusNotFound) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses + + rw.WriteHeader(404) +} + +// GetUploadStatusInternalServerErrorCode is the HTTP code returned for type GetUploadStatusInternalServerError +const GetUploadStatusInternalServerErrorCode int = 500 + +/* +GetUploadStatusInternalServerError server error + +swagger:response getUploadStatusInternalServerError +*/ +type GetUploadStatusInternalServerError struct { +} + +// NewGetUploadStatusInternalServerError creates GetUploadStatusInternalServerError with default headers values +func NewGetUploadStatusInternalServerError() *GetUploadStatusInternalServerError { + + return &GetUploadStatusInternalServerError{} +} + +// WriteResponse to the client +func (o *GetUploadStatusInternalServerError) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses + + rw.WriteHeader(500) +} diff --git a/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_urlbuilder.go b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_urlbuilder.go new file mode 100644 index 00000000000..69d1d31ec84 --- /dev/null +++ b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_urlbuilder.go @@ -0,0 +1,101 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package uploads + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the generate command + +import ( + "errors" + "net/url" + golangswaggerpaths "path" + "strings" + + "github.com/go-openapi/strfmt" +) + +// GetUploadStatusURL generates an URL for the get upload status operation +type GetUploadStatusURL struct { + UploadID strfmt.UUID + + _basePath string + // avoid unkeyed usage + _ struct{} +} + +// WithBasePath sets the base path for this url builder, only required when it's different from the +// base path specified in the swagger spec. +// When the value of the base path is an empty string +func (o *GetUploadStatusURL) WithBasePath(bp string) *GetUploadStatusURL { + o.SetBasePath(bp) + return o +} + +// SetBasePath sets the base path for this url builder, only required when it's different from the +// base path specified in the swagger spec. +// When the value of the base path is an empty string +func (o *GetUploadStatusURL) SetBasePath(bp string) { + o._basePath = bp +} + +// Build a url path and query string +func (o *GetUploadStatusURL) Build() (*url.URL, error) { + var _result url.URL + + var _path = "/uploads/{uploadId}/status" + + uploadID := o.UploadID.String() + if uploadID != "" { + _path = strings.Replace(_path, "{uploadId}", uploadID, -1) + } else { + return nil, errors.New("uploadId is required on GetUploadStatusURL") + } + + _basePath := o._basePath + if _basePath == "" { + _basePath = "/ghc/v1" + } + _result.Path = golangswaggerpaths.Join(_basePath, _path) + + return &_result, nil +} + +// Must is a helper function to panic when the url builder returns an error +func (o *GetUploadStatusURL) Must(u *url.URL, err error) *url.URL { + if err != nil { + panic(err) + } + if u == nil { + panic("url can't be nil") + } + return u +} + +// String returns the string representation of the path with query string +func (o *GetUploadStatusURL) String() string { + return o.Must(o.Build()).String() +} + +// BuildFull builds a full url with scheme, host, path and query string +func (o *GetUploadStatusURL) BuildFull(scheme, host string) (*url.URL, error) { + if scheme == "" { + return nil, errors.New("scheme is required for a full url on GetUploadStatusURL") + } + if host == "" { + return nil, errors.New("host is required for a full url on GetUploadStatusURL") + } + + base, err := o.Build() + if err != nil { + return nil, err + } + + base.Scheme = scheme + base.Host = host + return base, nil +} + +// StringFull returns the string representation of a complete url +func (o *GetUploadStatusURL) StringFull(scheme, host string) string { + return o.Must(o.BuildFull(scheme, host)).String() +} diff --git a/pkg/handlers/ghcapi/api.go b/pkg/handlers/ghcapi/api.go index 38ea0a31b64..640cfe484f9 100644 --- a/pkg/handlers/ghcapi/api.go +++ b/pkg/handlers/ghcapi/api.go @@ -4,6 +4,7 @@ import ( "log" "github.com/go-openapi/loads" + "github.com/go-openapi/runtime" "github.com/transcom/mymove/pkg/gen/ghcapi" ghcops "github.com/transcom/mymove/pkg/gen/ghcapi/ghcoperations" @@ -680,6 +681,8 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI { ghcAPI.UploadsCreateUploadHandler = CreateUploadHandler{handlerConfig} ghcAPI.UploadsUpdateUploadHandler = UpdateUploadHandler{handlerConfig, upload.NewUploadInformationFetcher()} ghcAPI.UploadsDeleteUploadHandler = DeleteUploadHandler{handlerConfig, upload.NewUploadInformationFetcher()} + ghcAPI.UploadsGetUploadStatusHandler = GetUploadStatusHandler{handlerConfig, upload.NewUploadInformationFetcher()} + ghcAPI.TextEventStreamProducer = runtime.ByteStreamProducer() // GetUploadStatus produces Event Stream ghcAPI.CustomerSearchCustomersHandler = SearchCustomersHandler{ HandlerConfig: handlerConfig, diff --git a/pkg/handlers/ghcapi/uploads.go b/pkg/handlers/ghcapi/uploads.go index a74e5d48498..70660150326 100644 --- a/pkg/handlers/ghcapi/uploads.go +++ b/pkg/handlers/ghcapi/uploads.go @@ -1,9 +1,16 @@ package ghcapi import ( + "context" + "fmt" + "net/http" + "strconv" + "time" + "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/middleware" "github.com/gofrs/uuid" + "github.com/pkg/errors" "go.uber.org/zap" "github.com/transcom/mymove/pkg/appcontext" @@ -12,8 +19,10 @@ import ( "github.com/transcom/mymove/pkg/handlers" "github.com/transcom/mymove/pkg/handlers/ghcapi/internal/payloads" "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/notifications" "github.com/transcom/mymove/pkg/services" "github.com/transcom/mymove/pkg/services/upload" + "github.com/transcom/mymove/pkg/storage" uploaderpkg "github.com/transcom/mymove/pkg/uploader" ) @@ -157,3 +166,189 @@ func (h DeleteUploadHandler) Handle(params uploadop.DeleteUploadParams) middlewa }) } + +// UploadStatusHandler returns status of an upload +type GetUploadStatusHandler struct { + handlers.HandlerConfig + services.UploadInformationFetcher +} + +type CustomGetUploadStatusResponse struct { + params uploadop.GetUploadStatusParams + storageKey string + appCtx appcontext.AppContext + receiver notifications.NotificationReceiver + storer storage.FileStorer +} + +func (o *CustomGetUploadStatusResponse) writeEventStreamMessage(rw http.ResponseWriter, producer runtime.Producer, id int, event string, data string) { + resProcess := []byte(fmt.Sprintf("id: %s\nevent: %s\ndata: %s\n\n", strconv.Itoa(id), event, data)) + if produceErr := producer.Produce(rw, resProcess); produceErr != nil { + o.appCtx.Logger().Error(produceErr.Error()) + } + if f, ok := rw.(http.Flusher); ok { + f.Flush() + } +} + +func (o *CustomGetUploadStatusResponse) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + // Check current tag before event-driven wait for anti-virus + tags, err := o.storer.Tags(o.storageKey) + var uploadStatus models.AVStatusType + if err != nil { + uploadStatus = models.AVStatusPROCESSING + } else { + uploadStatus = models.GetAVStatusFromTags(tags) + } + + // Limitation: once the status code header has been written (first response), we are not able to update the status for subsequent responses. + // Standard 200 OK used with common SSE paradigm + rw.WriteHeader(http.StatusOK) + if uploadStatus == models.AVStatusCLEAN || uploadStatus == models.AVStatusINFECTED { + o.writeEventStreamMessage(rw, producer, 0, "message", string(uploadStatus)) + o.writeEventStreamMessage(rw, producer, 1, "close", "Connection closed") + return // skip notification loop since object already tagged from anti-virus + } else { + o.writeEventStreamMessage(rw, producer, 0, "message", string(uploadStatus)) + } + + // Start waiting for tag updates + topicName, err := o.receiver.GetDefaultTopic() + if err != nil { + o.appCtx.Logger().Error(err.Error()) + } + + filterPolicy := fmt.Sprintf(`{ + "detail": { + "object": { + "key": [ + {"suffix": "%s"} + ] + } + } + }`, o.params.UploadID) + + notificationParams := notifications.NotificationQueueParams{ + SubscriptionTopicName: topicName, + NamePrefix: notifications.QueuePrefixObjectTagsAdded, + FilterPolicy: filterPolicy, + } + + queueUrl, err := o.receiver.CreateQueueWithSubscription(o.appCtx, notificationParams) + if err != nil { + o.appCtx.Logger().Error(err.Error()) + } + + id_counter := 1 + + // For loop over 120 seconds, cancel context when done and it breaks the loop + totalReceiverContext, totalReceiverContextCancelFunc := context.WithTimeout(context.Background(), 120*time.Second) + defer func() { + id_counter++ + o.writeEventStreamMessage(rw, producer, id_counter, "close", "Connection closed") + totalReceiverContextCancelFunc() + }() + + // Cleanup if client closes connection + go func() { + <-o.params.HTTPRequest.Context().Done() + totalReceiverContextCancelFunc() + }() + + // Cleanup at end of work + go func() { + <-totalReceiverContext.Done() + _ = o.receiver.CloseoutQueue(o.appCtx, queueUrl) + }() + + for { + o.appCtx.Logger().Info("Receiving Messages...") + messages, errs := o.receiver.ReceiveMessages(o.appCtx, queueUrl, totalReceiverContext) + + if errors.Is(errs, context.Canceled) || errors.Is(errs, context.DeadlineExceeded) { + return + } + if errs != nil { + o.appCtx.Logger().Error(err.Error()) + return + } + + if len(messages) != 0 { + errTransaction := o.appCtx.NewTransaction(func(txnAppCtx appcontext.AppContext) error { + + tags, err := o.storer.Tags(o.storageKey) + + if err != nil { + uploadStatus = models.AVStatusPROCESSING + } else { + uploadStatus = models.GetAVStatusFromTags(tags) + } + + o.writeEventStreamMessage(rw, producer, id_counter, "message", string(uploadStatus)) + + if uploadStatus == models.AVStatusCLEAN || uploadStatus == models.AVStatusINFECTED { + return errors.New("connection_closed") + } + + return err + }) + + if errTransaction != nil && errTransaction.Error() == "connection_closed" { + return + } + + if errTransaction != nil { + o.appCtx.Logger().Error(err.Error()) + return + } + } + id_counter++ + + select { + case <-totalReceiverContext.Done(): + return + default: + time.Sleep(1 * time.Second) // Throttle as a precaution against hounding of the SDK + continue + } + } +} + +// Handle returns status of an upload +func (h GetUploadStatusHandler) Handle(params uploadop.GetUploadStatusParams) middleware.Responder { + return h.AuditableAppContextFromRequestWithErrors(params.HTTPRequest, + func(appCtx appcontext.AppContext) (middleware.Responder, error) { + + handleError := func(err error) (middleware.Responder, error) { + appCtx.Logger().Error("GetUploadStatusHandler error", zap.Error(err)) + switch errors.Cause(err) { + case models.ErrFetchForbidden: + return uploadop.NewGetUploadStatusForbidden(), err + case models.ErrFetchNotFound: + return uploadop.NewGetUploadStatusNotFound(), err + default: + return uploadop.NewGetUploadStatusInternalServerError(), err + } + } + + uploadId := params.UploadID.String() + uploadUUID, err := uuid.FromString(uploadId) + if err != nil { + return handleError(err) + } + + uploaded, err := models.FetchUserUploadFromUploadID(appCtx.DB(), appCtx.Session(), uploadUUID) + if err != nil { + return handleError(err) + } + + return &CustomGetUploadStatusResponse{ + params: params, + storageKey: uploaded.Upload.StorageKey, + appCtx: h.AppContextFromRequest(params.HTTPRequest), + receiver: h.NotificationReceiver(), + storer: h.FileStorer(), + }, nil + }) +} diff --git a/pkg/handlers/ghcapi/uploads_test.go b/pkg/handlers/ghcapi/uploads_test.go index 94830bdb5bf..0a22ea6b87a 100644 --- a/pkg/handlers/ghcapi/uploads_test.go +++ b/pkg/handlers/ghcapi/uploads_test.go @@ -4,13 +4,17 @@ import ( "net/http" "github.com/go-openapi/runtime/middleware" + "github.com/go-openapi/strfmt" "github.com/gofrs/uuid" "github.com/transcom/mymove/pkg/factory" uploadop "github.com/transcom/mymove/pkg/gen/ghcapi/ghcoperations/uploads" "github.com/transcom/mymove/pkg/handlers" "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/notifications" + "github.com/transcom/mymove/pkg/services/upload" storageTest "github.com/transcom/mymove/pkg/storage/test" + "github.com/transcom/mymove/pkg/uploader" ) const FixturePDF = "test.pdf" @@ -156,3 +160,127 @@ func (suite *HandlerSuite) TestCreateUploadsHandlerFailure() { t.Fatalf("Wrong number of uploads in database: expected %d, got %d", currentCount, count) } } + +func (suite *HandlerSuite) TestGetUploadStatusHandlerSuccess() { + fakeS3 := storageTest.NewFakeS3Storage(true) + localReceiver := notifications.StubNotificationReceiver{} + + orders := factory.BuildOrder(suite.DB(), nil, nil) + uploadUser1 := factory.BuildUserUpload(suite.DB(), []factory.Customization{ + { + Model: orders.UploadedOrders, + LinkOnly: true, + }, + { + Model: models.Upload{ + Filename: "FileName", + Bytes: int64(15), + ContentType: uploader.FileTypePDF, + }, + }, + }, nil) + + file := suite.Fixture(FixturePDF) + _, err := fakeS3.Store(uploadUser1.Upload.StorageKey, file.Data, "somehash", nil) + suite.NoError(err) + + params := uploadop.NewGetUploadStatusParams() + params.UploadID = strfmt.UUID(uploadUser1.Upload.ID.String()) + + req := &http.Request{} + req = suite.AuthenticateRequest(req, uploadUser1.Document.ServiceMember) + params.HTTPRequest = req + + handlerConfig := suite.HandlerConfig() + handlerConfig.SetFileStorer(fakeS3) + handlerConfig.SetNotificationReceiver(localReceiver) + uploadInformationFetcher := upload.NewUploadInformationFetcher() + handler := GetUploadStatusHandler{handlerConfig, uploadInformationFetcher} + + response := handler.Handle(params) + _, ok := response.(*CustomGetUploadStatusResponse) + suite.True(ok) + + queriedUpload := models.Upload{} + err = suite.DB().Find(&queriedUpload, uploadUser1.Upload.ID) + suite.NoError(err) +} + +func (suite *HandlerSuite) TestGetUploadStatusHandlerFailure() { + suite.Run("Error on no match for uploadId", func() { + orders := factory.BuildOrder(suite.DB(), factory.GetTraitActiveServiceMemberUser(), nil) + + uploadUUID := uuid.Must(uuid.NewV4()) + + params := uploadop.NewGetUploadStatusParams() + params.UploadID = strfmt.UUID(uploadUUID.String()) + + req := &http.Request{} + req = suite.AuthenticateRequest(req, orders.ServiceMember) + params.HTTPRequest = req + + fakeS3 := storageTest.NewFakeS3Storage(true) + localReceiver := notifications.StubNotificationReceiver{} + + handlerConfig := suite.HandlerConfig() + handlerConfig.SetFileStorer(fakeS3) + handlerConfig.SetNotificationReceiver(localReceiver) + uploadInformationFetcher := upload.NewUploadInformationFetcher() + handler := GetUploadStatusHandler{handlerConfig, uploadInformationFetcher} + + response := handler.Handle(params) + _, ok := response.(*uploadop.GetUploadStatusNotFound) + suite.True(ok) + + queriedUpload := models.Upload{} + err := suite.DB().Find(&queriedUpload, uploadUUID) + suite.Error(err) + }) + + suite.Run("Error when attempting access to another service member's upload", func() { + fakeS3 := storageTest.NewFakeS3Storage(true) + localReceiver := notifications.StubNotificationReceiver{} + + otherServiceMember := factory.BuildServiceMember(suite.DB(), nil, nil) + + orders := factory.BuildOrder(suite.DB(), nil, nil) + uploadUser1 := factory.BuildUserUpload(suite.DB(), []factory.Customization{ + { + Model: orders.UploadedOrders, + LinkOnly: true, + }, + { + Model: models.Upload{ + Filename: "FileName", + Bytes: int64(15), + ContentType: uploader.FileTypePDF, + }, + }, + }, nil) + + file := suite.Fixture(FixturePDF) + _, err := fakeS3.Store(uploadUser1.Upload.StorageKey, file.Data, "somehash", nil) + suite.NoError(err) + + params := uploadop.NewGetUploadStatusParams() + params.UploadID = strfmt.UUID(uploadUser1.Upload.ID.String()) + + req := &http.Request{} + req = suite.AuthenticateRequest(req, otherServiceMember) + params.HTTPRequest = req + + handlerConfig := suite.HandlerConfig() + handlerConfig.SetFileStorer(fakeS3) + handlerConfig.SetNotificationReceiver(localReceiver) + uploadInformationFetcher := upload.NewUploadInformationFetcher() + handler := GetUploadStatusHandler{handlerConfig, uploadInformationFetcher} + + response := handler.Handle(params) + _, ok := response.(*uploadop.GetUploadStatusForbidden) + suite.True(ok) + + queriedUpload := models.Upload{} + err = suite.DB().Find(&queriedUpload, uploadUser1.Upload.ID) + suite.NoError(err) + }) +} diff --git a/pkg/handlers/routing/internalapi_test/uploads_test.go b/pkg/handlers/routing/ghcapi_test/uploads_test.go similarity index 97% rename from pkg/handlers/routing/internalapi_test/uploads_test.go rename to pkg/handlers/routing/ghcapi_test/uploads_test.go index 06610d84be2..c171a80f152 100644 --- a/pkg/handlers/routing/internalapi_test/uploads_test.go +++ b/pkg/handlers/routing/ghcapi_test/uploads_test.go @@ -1,4 +1,4 @@ -package internalapi_test +package ghcapi_test import ( "net/http" @@ -10,7 +10,7 @@ import ( "github.com/transcom/mymove/pkg/uploader" ) -func (suite *InternalAPISuite) TestUploads() { +func (suite *GhcAPISuite) TestUploads() { suite.Run("Received status for upload, read tag without event queue", func() { orders := factory.BuildOrder(suite.DB(), factory.GetTraitActiveServiceMemberUser(), nil) diff --git a/swagger-def/ghc.yaml b/swagger-def/ghc.yaml index df06a4ca220..2b3e6f8a390 100644 --- a/swagger-def/ghc.yaml +++ b/swagger-def/ghc.yaml @@ -4284,6 +4284,42 @@ paths: description: payload is too large '500': description: server error + /uploads/{uploadId}/status: + get: + summary: Returns status of an upload + description: Returns status of an upload based on antivirus run + operationId: getUploadStatus + produces: + - text/event-stream + tags: + - uploads + parameters: + - in: path + name: uploadId + type: string + format: uuid + required: true + description: UUID of the upload to return status of + responses: + '200': + description: the requested upload status + schema: + type: string + enum: + - INFECTED + - CLEAN + - PROCESSING + readOnly: true + '400': + description: invalid request + schema: + $ref: '#/definitions/InvalidRequestResponsePayload' + '403': + description: not authorized + '404': + description: not found + '500': + description: server error /application_parameters/{parameterName}: get: summary: Searches for an application parameter by name, returns nil if not found diff --git a/swagger/ghc.yaml b/swagger/ghc.yaml index a92ed3016a6..ac3679e9dff 100644 --- a/swagger/ghc.yaml +++ b/swagger/ghc.yaml @@ -4501,6 +4501,42 @@ paths: description: payload is too large '500': description: server error + /uploads/{uploadId}/status: + get: + summary: Returns status of an upload + description: Returns status of an upload based on antivirus run + operationId: getUploadStatus + produces: + - text/event-stream + tags: + - uploads + parameters: + - in: path + name: uploadId + type: string + format: uuid + required: true + description: UUID of the upload to return status of + responses: + '200': + description: the requested upload status + schema: + type: string + enum: + - INFECTED + - CLEAN + - PROCESSING + readOnly: true + '400': + description: invalid request + schema: + $ref: '#/definitions/InvalidRequestResponsePayload' + '403': + description: not authorized + '404': + description: not found + '500': + description: server error /application_parameters/{parameterName}: get: summary: Searches for an application parameter by name, returns nil if not found From 39cf19d5abb1edb1d32d019fcf1832c13b4bd6d0 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Tue, 28 Jan 2025 21:59:33 +0000 Subject: [PATCH 109/260] B-22056 - remove api call from internal. --- pkg/gen/internalapi/configure_mymove.go | 9 - pkg/gen/internalapi/doc.go | 1 - pkg/gen/internalapi/embedded_spec.go | 104 ---------- .../internaloperations/mymove_api.go | 24 --- .../uploads/get_upload_status.go | 58 ------ .../uploads/get_upload_status_parameters.go | 91 --------- .../uploads/get_upload_status_responses.go | 177 ---------------- .../uploads/get_upload_status_urlbuilder.go | 101 --------- pkg/handlers/internalapi/api.go | 2 - pkg/handlers/internalapi/uploads.go | 193 ------------------ pkg/handlers/internalapi/uploads_test.go | 126 ------------ swagger-def/internal.yaml | 37 ---- swagger/internal.yaml | 36 ---- 13 files changed, 959 deletions(-) delete mode 100644 pkg/gen/internalapi/internaloperations/uploads/get_upload_status.go delete mode 100644 pkg/gen/internalapi/internaloperations/uploads/get_upload_status_parameters.go delete mode 100644 pkg/gen/internalapi/internaloperations/uploads/get_upload_status_responses.go delete mode 100644 pkg/gen/internalapi/internaloperations/uploads/get_upload_status_urlbuilder.go diff --git a/pkg/gen/internalapi/configure_mymove.go b/pkg/gen/internalapi/configure_mymove.go index d1fa1bc3756..3b277e0037c 100644 --- a/pkg/gen/internalapi/configure_mymove.go +++ b/pkg/gen/internalapi/configure_mymove.go @@ -4,7 +4,6 @@ package internalapi import ( "crypto/tls" - "io" "net/http" "github.com/go-openapi/errors" @@ -61,9 +60,6 @@ func configureAPI(api *internaloperations.MymoveAPI) http.Handler { api.BinProducer = runtime.ByteStreamProducer() api.JSONProducer = runtime.JSONProducer() - api.TextEventStreamProducer = runtime.ProducerFunc(func(w io.Writer, data interface{}) error { - return errors.NotImplemented("textEventStream producer has not yet been implemented") - }) // You may change here the memory limit for this multipart form parser. Below is the default (32 MB). // ppm.CreatePPMUploadMaxParseMemory = 32 << 20 @@ -209,11 +205,6 @@ func configureAPI(api *internaloperations.MymoveAPI) http.Handler { return middleware.NotImplemented("operation transportation_offices.GetTransportationOffices has not yet been implemented") }) } - if api.UploadsGetUploadStatusHandler == nil { - api.UploadsGetUploadStatusHandler = uploads.GetUploadStatusHandlerFunc(func(params uploads.GetUploadStatusParams) middleware.Responder { - return middleware.NotImplemented("operation uploads.GetUploadStatus has not yet been implemented") - }) - } if api.EntitlementsIndexEntitlementsHandler == nil { api.EntitlementsIndexEntitlementsHandler = entitlements.IndexEntitlementsHandlerFunc(func(params entitlements.IndexEntitlementsParams) middleware.Responder { return middleware.NotImplemented("operation entitlements.IndexEntitlements has not yet been implemented") diff --git a/pkg/gen/internalapi/doc.go b/pkg/gen/internalapi/doc.go index f8040028e22..463e7be3e81 100644 --- a/pkg/gen/internalapi/doc.go +++ b/pkg/gen/internalapi/doc.go @@ -22,7 +22,6 @@ // Produces: // - application/pdf // - application/json -// - text/event-stream // // swagger:meta package internalapi diff --git a/pkg/gen/internalapi/embedded_spec.go b/pkg/gen/internalapi/embedded_spec.go index 8d699776891..c872ff075a7 100644 --- a/pkg/gen/internalapi/embedded_spec.go +++ b/pkg/gen/internalapi/embedded_spec.go @@ -3275,58 +3275,6 @@ func init() { } } }, - "/uploads/{uploadId}/status": { - "get": { - "description": "Returns status of an upload based on antivirus run", - "produces": [ - "text/event-stream" - ], - "tags": [ - "uploads" - ], - "summary": "Returns status of an upload", - "operationId": "getUploadStatus", - "parameters": [ - { - "type": "string", - "format": "uuid", - "description": "UUID of the upload to return status of", - "name": "uploadId", - "in": "path", - "required": true - } - ], - "responses": { - "200": { - "description": "the requested upload status", - "schema": { - "type": "string", - "enum": [ - "INFECTED", - "CLEAN", - "PROCESSING" - ], - "readOnly": true - } - }, - "400": { - "description": "invalid request", - "schema": { - "$ref": "#/definitions/InvalidRequestResponsePayload" - } - }, - "403": { - "description": "not authorized" - }, - "404": { - "description": "not found" - }, - "500": { - "description": "server error" - } - } - } - }, "/users/is_logged_in": { "get": { "description": "Returns boolean as to whether the user is logged in", @@ -12454,58 +12402,6 @@ func init() { } } }, - "/uploads/{uploadId}/status": { - "get": { - "description": "Returns status of an upload based on antivirus run", - "produces": [ - "text/event-stream" - ], - "tags": [ - "uploads" - ], - "summary": "Returns status of an upload", - "operationId": "getUploadStatus", - "parameters": [ - { - "type": "string", - "format": "uuid", - "description": "UUID of the upload to return status of", - "name": "uploadId", - "in": "path", - "required": true - } - ], - "responses": { - "200": { - "description": "the requested upload status", - "schema": { - "type": "string", - "enum": [ - "INFECTED", - "CLEAN", - "PROCESSING" - ], - "readOnly": true - } - }, - "400": { - "description": "invalid request", - "schema": { - "$ref": "#/definitions/InvalidRequestResponsePayload" - } - }, - "403": { - "description": "not authorized" - }, - "404": { - "description": "not found" - }, - "500": { - "description": "server error" - } - } - } - }, "/users/is_logged_in": { "get": { "description": "Returns boolean as to whether the user is logged in", diff --git a/pkg/gen/internalapi/internaloperations/mymove_api.go b/pkg/gen/internalapi/internaloperations/mymove_api.go index f061964c6f5..b1ba4e1ac47 100644 --- a/pkg/gen/internalapi/internaloperations/mymove_api.go +++ b/pkg/gen/internalapi/internaloperations/mymove_api.go @@ -7,7 +7,6 @@ package internaloperations import ( "fmt" - "io" "net/http" "strings" @@ -67,9 +66,6 @@ func NewMymoveAPI(spec *loads.Document) *MymoveAPI { BinProducer: runtime.ByteStreamProducer(), JSONProducer: runtime.JSONProducer(), - TextEventStreamProducer: runtime.ProducerFunc(func(w io.Writer, data interface{}) error { - return errors.NotImplemented("textEventStream producer has not yet been implemented") - }), OfficeApproveMoveHandler: office.ApproveMoveHandlerFunc(func(params office.ApproveMoveParams) middleware.Responder { return middleware.NotImplemented("operation office.ApproveMove has not yet been implemented") @@ -152,9 +148,6 @@ func NewMymoveAPI(spec *loads.Document) *MymoveAPI { TransportationOfficesGetTransportationOfficesHandler: transportation_offices.GetTransportationOfficesHandlerFunc(func(params transportation_offices.GetTransportationOfficesParams) middleware.Responder { return middleware.NotImplemented("operation transportation_offices.GetTransportationOffices has not yet been implemented") }), - UploadsGetUploadStatusHandler: uploads.GetUploadStatusHandlerFunc(func(params uploads.GetUploadStatusParams) middleware.Responder { - return middleware.NotImplemented("operation uploads.GetUploadStatus has not yet been implemented") - }), EntitlementsIndexEntitlementsHandler: entitlements.IndexEntitlementsHandlerFunc(func(params entitlements.IndexEntitlementsParams) middleware.Responder { return middleware.NotImplemented("operation entitlements.IndexEntitlements has not yet been implemented") }), @@ -330,9 +323,6 @@ type MymoveAPI struct { // JSONProducer registers a producer for the following mime types: // - application/json JSONProducer runtime.Producer - // TextEventStreamProducer registers a producer for the following mime types: - // - text/event-stream - TextEventStreamProducer runtime.Producer // OfficeApproveMoveHandler sets the operation handler for the approve move operation OfficeApproveMoveHandler office.ApproveMoveHandler @@ -388,8 +378,6 @@ type MymoveAPI struct { AddressesGetLocationByZipCityStateHandler addresses.GetLocationByZipCityStateHandler // TransportationOfficesGetTransportationOfficesHandler sets the operation handler for the get transportation offices operation TransportationOfficesGetTransportationOfficesHandler transportation_offices.GetTransportationOfficesHandler - // UploadsGetUploadStatusHandler sets the operation handler for the get upload status operation - UploadsGetUploadStatusHandler uploads.GetUploadStatusHandler // EntitlementsIndexEntitlementsHandler sets the operation handler for the index entitlements operation EntitlementsIndexEntitlementsHandler entitlements.IndexEntitlementsHandler // MoveDocsIndexMoveDocumentsHandler sets the operation handler for the index move documents operation @@ -558,9 +546,6 @@ func (o *MymoveAPI) Validate() error { if o.JSONProducer == nil { unregistered = append(unregistered, "JSONProducer") } - if o.TextEventStreamProducer == nil { - unregistered = append(unregistered, "TextEventStreamProducer") - } if o.OfficeApproveMoveHandler == nil { unregistered = append(unregistered, "office.ApproveMoveHandler") @@ -643,9 +628,6 @@ func (o *MymoveAPI) Validate() error { if o.TransportationOfficesGetTransportationOfficesHandler == nil { unregistered = append(unregistered, "transportation_offices.GetTransportationOfficesHandler") } - if o.UploadsGetUploadStatusHandler == nil { - unregistered = append(unregistered, "uploads.GetUploadStatusHandler") - } if o.EntitlementsIndexEntitlementsHandler == nil { unregistered = append(unregistered, "entitlements.IndexEntitlementsHandler") } @@ -827,8 +809,6 @@ func (o *MymoveAPI) ProducersFor(mediaTypes []string) map[string]runtime.Produce result["application/pdf"] = o.BinProducer case "application/json": result["application/json"] = o.JSONProducer - case "text/event-stream": - result["text/event-stream"] = o.TextEventStreamProducer } if p, ok := o.customProducers[mt]; ok { @@ -980,10 +960,6 @@ func (o *MymoveAPI) initHandlerCache() { if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/uploads/{uploadId}/status"] = uploads.NewGetUploadStatus(o.context, o.UploadsGetUploadStatusHandler) - if o.handlers["GET"] == nil { - o.handlers["GET"] = make(map[string]http.Handler) - } o.handlers["GET"]["/entitlements"] = entitlements.NewIndexEntitlements(o.context, o.EntitlementsIndexEntitlementsHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) diff --git a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status.go b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status.go deleted file mode 100644 index dc2c021f021..00000000000 --- a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status.go +++ /dev/null @@ -1,58 +0,0 @@ -// Code generated by go-swagger; DO NOT EDIT. - -package uploads - -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the generate command - -import ( - "net/http" - - "github.com/go-openapi/runtime/middleware" -) - -// GetUploadStatusHandlerFunc turns a function with the right signature into a get upload status handler -type GetUploadStatusHandlerFunc func(GetUploadStatusParams) middleware.Responder - -// Handle executing the request and returning a response -func (fn GetUploadStatusHandlerFunc) Handle(params GetUploadStatusParams) middleware.Responder { - return fn(params) -} - -// GetUploadStatusHandler interface for that can handle valid get upload status params -type GetUploadStatusHandler interface { - Handle(GetUploadStatusParams) middleware.Responder -} - -// NewGetUploadStatus creates a new http.Handler for the get upload status operation -func NewGetUploadStatus(ctx *middleware.Context, handler GetUploadStatusHandler) *GetUploadStatus { - return &GetUploadStatus{Context: ctx, Handler: handler} -} - -/* - GetUploadStatus swagger:route GET /uploads/{uploadId}/status uploads getUploadStatus - -# Returns status of an upload - -Returns status of an upload based on antivirus run -*/ -type GetUploadStatus struct { - Context *middleware.Context - Handler GetUploadStatusHandler -} - -func (o *GetUploadStatus) ServeHTTP(rw http.ResponseWriter, r *http.Request) { - route, rCtx, _ := o.Context.RouteInfo(r) - if rCtx != nil { - *r = *rCtx - } - var Params = NewGetUploadStatusParams() - if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params - o.Context.Respond(rw, r, route.Produces, route, err) - return - } - - res := o.Handler.Handle(Params) // actually handle the request - o.Context.Respond(rw, r, route.Produces, route, res) - -} diff --git a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_parameters.go b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_parameters.go deleted file mode 100644 index 1770aa8ca6b..00000000000 --- a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_parameters.go +++ /dev/null @@ -1,91 +0,0 @@ -// Code generated by go-swagger; DO NOT EDIT. - -package uploads - -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - -import ( - "net/http" - - "github.com/go-openapi/errors" - "github.com/go-openapi/runtime/middleware" - "github.com/go-openapi/strfmt" - "github.com/go-openapi/validate" -) - -// NewGetUploadStatusParams creates a new GetUploadStatusParams object -// -// There are no default values defined in the spec. -func NewGetUploadStatusParams() GetUploadStatusParams { - - return GetUploadStatusParams{} -} - -// GetUploadStatusParams contains all the bound params for the get upload status operation -// typically these are obtained from a http.Request -// -// swagger:parameters getUploadStatus -type GetUploadStatusParams struct { - - // HTTP Request Object - HTTPRequest *http.Request `json:"-"` - - /*UUID of the upload to return status of - Required: true - In: path - */ - UploadID strfmt.UUID -} - -// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface -// for simple values it will use straight method calls. -// -// To ensure default values, the struct must have been initialized with NewGetUploadStatusParams() beforehand. -func (o *GetUploadStatusParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error { - var res []error - - o.HTTPRequest = r - - rUploadID, rhkUploadID, _ := route.Params.GetOK("uploadId") - if err := o.bindUploadID(rUploadID, rhkUploadID, route.Formats); err != nil { - res = append(res, err) - } - if len(res) > 0 { - return errors.CompositeValidationError(res...) - } - return nil -} - -// bindUploadID binds and validates parameter UploadID from path. -func (o *GetUploadStatusParams) bindUploadID(rawData []string, hasKey bool, formats strfmt.Registry) error { - var raw string - if len(rawData) > 0 { - raw = rawData[len(rawData)-1] - } - - // Required: true - // Parameter is provided by construction from the route - - // Format: uuid - value, err := formats.Parse("uuid", raw) - if err != nil { - return errors.InvalidType("uploadId", "path", "strfmt.UUID", raw) - } - o.UploadID = *(value.(*strfmt.UUID)) - - if err := o.validateUploadID(formats); err != nil { - return err - } - - return nil -} - -// validateUploadID carries on validations for parameter UploadID -func (o *GetUploadStatusParams) validateUploadID(formats strfmt.Registry) error { - - if err := validate.FormatOf("uploadId", "path", "uuid", o.UploadID.String(), formats); err != nil { - return err - } - return nil -} diff --git a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_responses.go b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_responses.go deleted file mode 100644 index 7b6b4b15b7d..00000000000 --- a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_responses.go +++ /dev/null @@ -1,177 +0,0 @@ -// Code generated by go-swagger; DO NOT EDIT. - -package uploads - -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the swagger generate command - -import ( - "net/http" - - "github.com/go-openapi/runtime" - - "github.com/transcom/mymove/pkg/gen/internalmessages" -) - -// GetUploadStatusOKCode is the HTTP code returned for type GetUploadStatusOK -const GetUploadStatusOKCode int = 200 - -/* -GetUploadStatusOK the requested upload status - -swagger:response getUploadStatusOK -*/ -type GetUploadStatusOK struct { - - /* - In: Body - */ - Payload string `json:"body,omitempty"` -} - -// NewGetUploadStatusOK creates GetUploadStatusOK with default headers values -func NewGetUploadStatusOK() *GetUploadStatusOK { - - return &GetUploadStatusOK{} -} - -// WithPayload adds the payload to the get upload status o k response -func (o *GetUploadStatusOK) WithPayload(payload string) *GetUploadStatusOK { - o.Payload = payload - return o -} - -// SetPayload sets the payload to the get upload status o k response -func (o *GetUploadStatusOK) SetPayload(payload string) { - o.Payload = payload -} - -// WriteResponse to the client -func (o *GetUploadStatusOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { - - rw.WriteHeader(200) - payload := o.Payload - if err := producer.Produce(rw, payload); err != nil { - panic(err) // let the recovery middleware deal with this - } -} - -// GetUploadStatusBadRequestCode is the HTTP code returned for type GetUploadStatusBadRequest -const GetUploadStatusBadRequestCode int = 400 - -/* -GetUploadStatusBadRequest invalid request - -swagger:response getUploadStatusBadRequest -*/ -type GetUploadStatusBadRequest struct { - - /* - In: Body - */ - Payload *internalmessages.InvalidRequestResponsePayload `json:"body,omitempty"` -} - -// NewGetUploadStatusBadRequest creates GetUploadStatusBadRequest with default headers values -func NewGetUploadStatusBadRequest() *GetUploadStatusBadRequest { - - return &GetUploadStatusBadRequest{} -} - -// WithPayload adds the payload to the get upload status bad request response -func (o *GetUploadStatusBadRequest) WithPayload(payload *internalmessages.InvalidRequestResponsePayload) *GetUploadStatusBadRequest { - o.Payload = payload - return o -} - -// SetPayload sets the payload to the get upload status bad request response -func (o *GetUploadStatusBadRequest) SetPayload(payload *internalmessages.InvalidRequestResponsePayload) { - o.Payload = payload -} - -// WriteResponse to the client -func (o *GetUploadStatusBadRequest) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { - - rw.WriteHeader(400) - if o.Payload != nil { - payload := o.Payload - if err := producer.Produce(rw, payload); err != nil { - panic(err) // let the recovery middleware deal with this - } - } -} - -// GetUploadStatusForbiddenCode is the HTTP code returned for type GetUploadStatusForbidden -const GetUploadStatusForbiddenCode int = 403 - -/* -GetUploadStatusForbidden not authorized - -swagger:response getUploadStatusForbidden -*/ -type GetUploadStatusForbidden struct { -} - -// NewGetUploadStatusForbidden creates GetUploadStatusForbidden with default headers values -func NewGetUploadStatusForbidden() *GetUploadStatusForbidden { - - return &GetUploadStatusForbidden{} -} - -// WriteResponse to the client -func (o *GetUploadStatusForbidden) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { - - rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses - - rw.WriteHeader(403) -} - -// GetUploadStatusNotFoundCode is the HTTP code returned for type GetUploadStatusNotFound -const GetUploadStatusNotFoundCode int = 404 - -/* -GetUploadStatusNotFound not found - -swagger:response getUploadStatusNotFound -*/ -type GetUploadStatusNotFound struct { -} - -// NewGetUploadStatusNotFound creates GetUploadStatusNotFound with default headers values -func NewGetUploadStatusNotFound() *GetUploadStatusNotFound { - - return &GetUploadStatusNotFound{} -} - -// WriteResponse to the client -func (o *GetUploadStatusNotFound) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { - - rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses - - rw.WriteHeader(404) -} - -// GetUploadStatusInternalServerErrorCode is the HTTP code returned for type GetUploadStatusInternalServerError -const GetUploadStatusInternalServerErrorCode int = 500 - -/* -GetUploadStatusInternalServerError server error - -swagger:response getUploadStatusInternalServerError -*/ -type GetUploadStatusInternalServerError struct { -} - -// NewGetUploadStatusInternalServerError creates GetUploadStatusInternalServerError with default headers values -func NewGetUploadStatusInternalServerError() *GetUploadStatusInternalServerError { - - return &GetUploadStatusInternalServerError{} -} - -// WriteResponse to the client -func (o *GetUploadStatusInternalServerError) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { - - rw.Header().Del(runtime.HeaderContentType) //Remove Content-Type on empty responses - - rw.WriteHeader(500) -} diff --git a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_urlbuilder.go b/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_urlbuilder.go deleted file mode 100644 index 276a011d780..00000000000 --- a/pkg/gen/internalapi/internaloperations/uploads/get_upload_status_urlbuilder.go +++ /dev/null @@ -1,101 +0,0 @@ -// Code generated by go-swagger; DO NOT EDIT. - -package uploads - -// This file was generated by the swagger tool. -// Editing this file might prove futile when you re-run the generate command - -import ( - "errors" - "net/url" - golangswaggerpaths "path" - "strings" - - "github.com/go-openapi/strfmt" -) - -// GetUploadStatusURL generates an URL for the get upload status operation -type GetUploadStatusURL struct { - UploadID strfmt.UUID - - _basePath string - // avoid unkeyed usage - _ struct{} -} - -// WithBasePath sets the base path for this url builder, only required when it's different from the -// base path specified in the swagger spec. -// When the value of the base path is an empty string -func (o *GetUploadStatusURL) WithBasePath(bp string) *GetUploadStatusURL { - o.SetBasePath(bp) - return o -} - -// SetBasePath sets the base path for this url builder, only required when it's different from the -// base path specified in the swagger spec. -// When the value of the base path is an empty string -func (o *GetUploadStatusURL) SetBasePath(bp string) { - o._basePath = bp -} - -// Build a url path and query string -func (o *GetUploadStatusURL) Build() (*url.URL, error) { - var _result url.URL - - var _path = "/uploads/{uploadId}/status" - - uploadID := o.UploadID.String() - if uploadID != "" { - _path = strings.Replace(_path, "{uploadId}", uploadID, -1) - } else { - return nil, errors.New("uploadId is required on GetUploadStatusURL") - } - - _basePath := o._basePath - if _basePath == "" { - _basePath = "/internal" - } - _result.Path = golangswaggerpaths.Join(_basePath, _path) - - return &_result, nil -} - -// Must is a helper function to panic when the url builder returns an error -func (o *GetUploadStatusURL) Must(u *url.URL, err error) *url.URL { - if err != nil { - panic(err) - } - if u == nil { - panic("url can't be nil") - } - return u -} - -// String returns the string representation of the path with query string -func (o *GetUploadStatusURL) String() string { - return o.Must(o.Build()).String() -} - -// BuildFull builds a full url with scheme, host, path and query string -func (o *GetUploadStatusURL) BuildFull(scheme, host string) (*url.URL, error) { - if scheme == "" { - return nil, errors.New("scheme is required for a full url on GetUploadStatusURL") - } - if host == "" { - return nil, errors.New("host is required for a full url on GetUploadStatusURL") - } - - base, err := o.Build() - if err != nil { - return nil, err - } - - base.Scheme = scheme - base.Host = host - return base, nil -} - -// StringFull returns the string representation of a complete url -func (o *GetUploadStatusURL) StringFull(scheme, host string) string { - return o.Must(o.BuildFull(scheme, host)).String() -} diff --git a/pkg/handlers/internalapi/api.go b/pkg/handlers/internalapi/api.go index 2302994203c..cbdba27433a 100644 --- a/pkg/handlers/internalapi/api.go +++ b/pkg/handlers/internalapi/api.go @@ -175,7 +175,6 @@ func NewInternalAPI(handlerConfig handlers.HandlerConfig) *internalops.MymoveAPI internalAPI.UploadsCreateUploadHandler = CreateUploadHandler{handlerConfig} internalAPI.UploadsDeleteUploadHandler = DeleteUploadHandler{handlerConfig, upload.NewUploadInformationFetcher()} internalAPI.UploadsDeleteUploadsHandler = DeleteUploadsHandler{handlerConfig} - internalAPI.UploadsGetUploadStatusHandler = GetUploadStatusHandler{handlerConfig, upload.NewUploadInformationFetcher()} internalAPI.OfficeApproveMoveHandler = ApproveMoveHandler{handlerConfig, moveRouter} internalAPI.OfficeApproveReimbursementHandler = ApproveReimbursementHandler{handlerConfig} @@ -188,7 +187,6 @@ func NewInternalAPI(handlerConfig handlers.HandlerConfig) *internalops.MymoveAPI internalAPI.PpmShowAOAPacketHandler = showAOAPacketHandler{handlerConfig, SSWPPMComputer, SSWPPMGenerator, AOAPacketCreator} internalAPI.RegisterProducer(uploader.FileTypePDF, PDFProducer()) - internalAPI.TextEventStreamProducer = runtime.ByteStreamProducer() internalAPI.PostalCodesValidatePostalCodeWithRateDataHandler = ValidatePostalCodeWithRateDataHandler{ handlerConfig, diff --git a/pkg/handlers/internalapi/uploads.go b/pkg/handlers/internalapi/uploads.go index 248fc86c743..4167d7ed2b8 100644 --- a/pkg/handlers/internalapi/uploads.go +++ b/pkg/handlers/internalapi/uploads.go @@ -1,21 +1,16 @@ package internalapi import ( - "context" "fmt" "io" - "net/http" "path/filepath" "regexp" - "strconv" "strings" - "time" "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/middleware" "github.com/gobuffalo/validate/v3" "github.com/gofrs/uuid" - "github.com/pkg/errors" "go.uber.org/zap" "github.com/transcom/mymove/pkg/appcontext" @@ -24,11 +19,9 @@ import ( "github.com/transcom/mymove/pkg/handlers" "github.com/transcom/mymove/pkg/handlers/internalapi/internal/payloads" "github.com/transcom/mymove/pkg/models" - "github.com/transcom/mymove/pkg/notifications" "github.com/transcom/mymove/pkg/services" "github.com/transcom/mymove/pkg/services/ppmshipment" weightticketparser "github.com/transcom/mymove/pkg/services/weight_ticket_parser" - "github.com/transcom/mymove/pkg/storage" "github.com/transcom/mymove/pkg/uploader" uploaderpkg "github.com/transcom/mymove/pkg/uploader" ) @@ -253,192 +246,6 @@ func (h DeleteUploadsHandler) Handle(params uploadop.DeleteUploadsParams) middle }) } -// UploadStatusHandler returns status of an upload -type GetUploadStatusHandler struct { - handlers.HandlerConfig - services.UploadInformationFetcher -} - -type CustomGetUploadStatusResponse struct { - params uploadop.GetUploadStatusParams - storageKey string - appCtx appcontext.AppContext - receiver notifications.NotificationReceiver - storer storage.FileStorer -} - -func (o *CustomGetUploadStatusResponse) writeEventStreamMessage(rw http.ResponseWriter, producer runtime.Producer, id int, event string, data string) { - resProcess := []byte(fmt.Sprintf("id: %s\nevent: %s\ndata: %s\n\n", strconv.Itoa(id), event, data)) - if produceErr := producer.Produce(rw, resProcess); produceErr != nil { - o.appCtx.Logger().Error(produceErr.Error()) - } - if f, ok := rw.(http.Flusher); ok { - f.Flush() - } -} - -func (o *CustomGetUploadStatusResponse) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { - - // Check current tag before event-driven wait for anti-virus - tags, err := o.storer.Tags(o.storageKey) - var uploadStatus models.AVStatusType - if err != nil { - uploadStatus = models.AVStatusPROCESSING - } else { - uploadStatus = models.GetAVStatusFromTags(tags) - } - - // Limitation: once the status code header has been written (first response), we are not able to update the status for subsequent responses. - // Standard 200 OK used with common SSE paradigm - rw.WriteHeader(http.StatusOK) - if uploadStatus == models.AVStatusCLEAN || uploadStatus == models.AVStatusINFECTED { - o.writeEventStreamMessage(rw, producer, 0, "message", string(uploadStatus)) - o.writeEventStreamMessage(rw, producer, 1, "close", "Connection closed") - return // skip notification loop since object already tagged from anti-virus - } else { - o.writeEventStreamMessage(rw, producer, 0, "message", string(uploadStatus)) - } - - // Start waiting for tag updates - topicName, err := o.receiver.GetDefaultTopic() - if err != nil { - o.appCtx.Logger().Error(err.Error()) - } - - filterPolicy := fmt.Sprintf(`{ - "detail": { - "object": { - "key": [ - {"suffix": "%s"} - ] - } - } - }`, o.params.UploadID) - - notificationParams := notifications.NotificationQueueParams{ - SubscriptionTopicName: topicName, - NamePrefix: notifications.QueuePrefixObjectTagsAdded, - FilterPolicy: filterPolicy, - } - - queueUrl, err := o.receiver.CreateQueueWithSubscription(o.appCtx, notificationParams) - if err != nil { - o.appCtx.Logger().Error(err.Error()) - } - - id_counter := 1 - - // For loop over 120 seconds, cancel context when done and it breaks the loop - totalReceiverContext, totalReceiverContextCancelFunc := context.WithTimeout(context.Background(), 120*time.Second) - defer func() { - id_counter++ - o.writeEventStreamMessage(rw, producer, id_counter, "close", "Connection closed") - totalReceiverContextCancelFunc() - }() - - // Cleanup if client closes connection - go func() { - <-o.params.HTTPRequest.Context().Done() - totalReceiverContextCancelFunc() - }() - - // Cleanup at end of work - go func() { - <-totalReceiverContext.Done() - _ = o.receiver.CloseoutQueue(o.appCtx, queueUrl) - }() - - for { - o.appCtx.Logger().Info("Receiving Messages...") - messages, errs := o.receiver.ReceiveMessages(o.appCtx, queueUrl, totalReceiverContext) - - if errors.Is(errs, context.Canceled) || errors.Is(errs, context.DeadlineExceeded) { - return - } - if errs != nil { - o.appCtx.Logger().Error(err.Error()) - return - } - - if len(messages) != 0 { - errTransaction := o.appCtx.NewTransaction(func(txnAppCtx appcontext.AppContext) error { - - tags, err := o.storer.Tags(o.storageKey) - - if err != nil { - uploadStatus = models.AVStatusPROCESSING - } else { - uploadStatus = models.GetAVStatusFromTags(tags) - } - - o.writeEventStreamMessage(rw, producer, id_counter, "message", string(uploadStatus)) - - if uploadStatus == models.AVStatusCLEAN || uploadStatus == models.AVStatusINFECTED { - return errors.New("connection_closed") - } - - return err - }) - - if errTransaction != nil && errTransaction.Error() == "connection_closed" { - return - } - - if errTransaction != nil { - o.appCtx.Logger().Error(err.Error()) - return - } - } - id_counter++ - - select { - case <-totalReceiverContext.Done(): - return - default: - time.Sleep(1 * time.Second) // Throttle as a precaution against hounding of the SDK - continue - } - } -} - -// Handle returns status of an upload -func (h GetUploadStatusHandler) Handle(params uploadop.GetUploadStatusParams) middleware.Responder { - return h.AuditableAppContextFromRequestWithErrors(params.HTTPRequest, - func(appCtx appcontext.AppContext) (middleware.Responder, error) { - - handleError := func(err error) (middleware.Responder, error) { - appCtx.Logger().Error("GetUploadStatusHandler error", zap.Error(err)) - switch errors.Cause(err) { - case models.ErrFetchForbidden: - return uploadop.NewGetUploadStatusForbidden(), err - case models.ErrFetchNotFound: - return uploadop.NewGetUploadStatusNotFound(), err - default: - return uploadop.NewGetUploadStatusInternalServerError(), err - } - } - - uploadId := params.UploadID.String() - uploadUUID, err := uuid.FromString(uploadId) - if err != nil { - return handleError(err) - } - - uploaded, err := models.FetchUserUploadFromUploadID(appCtx.DB(), appCtx.Session(), uploadUUID) - if err != nil { - return handleError(err) - } - - return &CustomGetUploadStatusResponse{ - params: params, - storageKey: uploaded.Upload.StorageKey, - appCtx: h.AppContextFromRequest(params.HTTPRequest), - receiver: h.NotificationReceiver(), - storer: h.FileStorer(), - }, nil - }) -} - func (h CreatePPMUploadHandler) Handle(params ppmop.CreatePPMUploadParams) middleware.Responder { return h.AuditableAppContextFromRequestWithErrors(params.HTTPRequest, func(appCtx appcontext.AppContext) (middleware.Responder, error) { diff --git a/pkg/handlers/internalapi/uploads_test.go b/pkg/handlers/internalapi/uploads_test.go index db436a4fa79..36823072f73 100644 --- a/pkg/handlers/internalapi/uploads_test.go +++ b/pkg/handlers/internalapi/uploads_test.go @@ -25,7 +25,6 @@ import ( uploadop "github.com/transcom/mymove/pkg/gen/internalapi/internaloperations/uploads" "github.com/transcom/mymove/pkg/handlers" "github.com/transcom/mymove/pkg/models" - "github.com/transcom/mymove/pkg/notifications" paperworkgenerator "github.com/transcom/mymove/pkg/paperwork" "github.com/transcom/mymove/pkg/services/upload" weightticketparser "github.com/transcom/mymove/pkg/services/weight_ticket_parser" @@ -111,7 +110,6 @@ func createPPMExpensePrereqs(suite *HandlerSuite, fixtureFile string) (models.Do func makeRequest(suite *HandlerSuite, params uploadop.CreateUploadParams, serviceMember models.ServiceMember, fakeS3 *storageTest.FakeS3Storage) middleware.Responder { req := &http.Request{} - req = suite.AuthenticateRequest(req, serviceMember) params.HTTPRequest = req @@ -450,130 +448,6 @@ func (suite *HandlerSuite) TestDeleteUploadHandlerSuccessEvenWithS3Failure() { suite.NotNil(queriedUpload.DeletedAt) } -func (suite *HandlerSuite) TestGetUploadStatusHandlerSuccess() { - fakeS3 := storageTest.NewFakeS3Storage(true) - localReceiver := notifications.StubNotificationReceiver{} - - orders := factory.BuildOrder(suite.DB(), nil, nil) - uploadUser1 := factory.BuildUserUpload(suite.DB(), []factory.Customization{ - { - Model: orders.UploadedOrders, - LinkOnly: true, - }, - { - Model: models.Upload{ - Filename: "FileName", - Bytes: int64(15), - ContentType: uploader.FileTypePDF, - }, - }, - }, nil) - - file := suite.Fixture(FixturePDF) - _, err := fakeS3.Store(uploadUser1.Upload.StorageKey, file.Data, "somehash", nil) - suite.NoError(err) - - params := uploadop.NewGetUploadStatusParams() - params.UploadID = strfmt.UUID(uploadUser1.Upload.ID.String()) - - req := &http.Request{} - req = suite.AuthenticateRequest(req, uploadUser1.Document.ServiceMember) - params.HTTPRequest = req - - handlerConfig := suite.HandlerConfig() - handlerConfig.SetFileStorer(fakeS3) - handlerConfig.SetNotificationReceiver(localReceiver) - uploadInformationFetcher := upload.NewUploadInformationFetcher() - handler := GetUploadStatusHandler{handlerConfig, uploadInformationFetcher} - - response := handler.Handle(params) - _, ok := response.(*CustomGetUploadStatusResponse) - suite.True(ok) - - queriedUpload := models.Upload{} - err = suite.DB().Find(&queriedUpload, uploadUser1.Upload.ID) - suite.NoError(err) -} - -func (suite *HandlerSuite) TestGetUploadStatusHandlerFailure() { - suite.Run("Error on no match for uploadId", func() { - orders := factory.BuildOrder(suite.DB(), factory.GetTraitActiveServiceMemberUser(), nil) - - uploadUUID := uuid.Must(uuid.NewV4()) - - params := uploadop.NewGetUploadStatusParams() - params.UploadID = strfmt.UUID(uploadUUID.String()) - - req := &http.Request{} - req = suite.AuthenticateRequest(req, orders.ServiceMember) - params.HTTPRequest = req - - fakeS3 := storageTest.NewFakeS3Storage(true) - localReceiver := notifications.StubNotificationReceiver{} - - handlerConfig := suite.HandlerConfig() - handlerConfig.SetFileStorer(fakeS3) - handlerConfig.SetNotificationReceiver(localReceiver) - uploadInformationFetcher := upload.NewUploadInformationFetcher() - handler := GetUploadStatusHandler{handlerConfig, uploadInformationFetcher} - - response := handler.Handle(params) - _, ok := response.(*uploadop.GetUploadStatusNotFound) - suite.True(ok) - - queriedUpload := models.Upload{} - err := suite.DB().Find(&queriedUpload, uploadUUID) - suite.Error(err) - }) - - suite.Run("Error when attempting access to another service member's upload", func() { - fakeS3 := storageTest.NewFakeS3Storage(true) - localReceiver := notifications.StubNotificationReceiver{} - - otherServiceMember := factory.BuildServiceMember(suite.DB(), nil, nil) - - orders := factory.BuildOrder(suite.DB(), nil, nil) - uploadUser1 := factory.BuildUserUpload(suite.DB(), []factory.Customization{ - { - Model: orders.UploadedOrders, - LinkOnly: true, - }, - { - Model: models.Upload{ - Filename: "FileName", - Bytes: int64(15), - ContentType: uploader.FileTypePDF, - }, - }, - }, nil) - - file := suite.Fixture(FixturePDF) - _, err := fakeS3.Store(uploadUser1.Upload.StorageKey, file.Data, "somehash", nil) - suite.NoError(err) - - params := uploadop.NewGetUploadStatusParams() - params.UploadID = strfmt.UUID(uploadUser1.Upload.ID.String()) - - req := &http.Request{} - req = suite.AuthenticateRequest(req, otherServiceMember) - params.HTTPRequest = req - - handlerConfig := suite.HandlerConfig() - handlerConfig.SetFileStorer(fakeS3) - handlerConfig.SetNotificationReceiver(localReceiver) - uploadInformationFetcher := upload.NewUploadInformationFetcher() - handler := GetUploadStatusHandler{handlerConfig, uploadInformationFetcher} - - response := handler.Handle(params) - _, ok := response.(*uploadop.GetUploadStatusForbidden) - suite.True(ok) - - queriedUpload := models.Upload{} - err = suite.DB().Find(&queriedUpload, uploadUser1.Upload.ID) - suite.NoError(err) - }) -} - func (suite *HandlerSuite) TestCreatePPMUploadsHandlerSuccess() { suite.Run("uploads .xls file", func() { fakeS3 := storageTest.NewFakeS3Storage(true) diff --git a/swagger-def/internal.yaml b/swagger-def/internal.yaml index 981557d95f2..3e9e054343a 100644 --- a/swagger-def/internal.yaml +++ b/swagger-def/internal.yaml @@ -3426,43 +3426,6 @@ paths: description: not found '500': description: server error - - /uploads/{uploadId}/status: - get: - summary: Returns status of an upload - description: Returns status of an upload based on antivirus run - operationId: getUploadStatus - produces: - - text/event-stream - tags: - - uploads - parameters: - - in: path - name: uploadId - type: string - format: uuid - required: true - description: UUID of the upload to return status of - responses: - '200': - description: the requested upload status - schema: - type: string - enum: - - INFECTED - - CLEAN - - PROCESSING - readOnly: true - '400': - description: invalid request - schema: - $ref: '#/definitions/InvalidRequestResponsePayload' - '403': - description: not authorized - '404': - description: not found - '500': - description: server error /service_members: post: summary: Creates service member for a logged-in user diff --git a/swagger/internal.yaml b/swagger/internal.yaml index 077d67bd9de..f7275136ef6 100644 --- a/swagger/internal.yaml +++ b/swagger/internal.yaml @@ -5339,42 +5339,6 @@ paths: description: not found '500': description: server error - /uploads/{uploadId}/status: - get: - summary: Returns status of an upload - description: Returns status of an upload based on antivirus run - operationId: getUploadStatus - produces: - - text/event-stream - tags: - - uploads - parameters: - - in: path - name: uploadId - type: string - format: uuid - required: true - description: UUID of the upload to return status of - responses: - '200': - description: the requested upload status - schema: - type: string - enum: - - INFECTED - - CLEAN - - PROCESSING - readOnly: true - '400': - description: invalid request - schema: - $ref: '#/definitions/InvalidRequestResponsePayload' - '403': - description: not authorized - '404': - description: not found - '500': - description: server error /service_members: post: summary: Creates service member for a logged-in user From a0510726252170b5fa16e8fb8216dea696925574 Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Tue, 28 Jan 2025 22:11:17 +0000 Subject: [PATCH 110/260] PR comments/fixes --- .../office_user/office_user_fetcher.go | 2 +- .../BulkAssignment/BulkAssignmentModal.jsx | 26 ++++++++++++------- .../BulkAssignmentModal.module.scss | 9 ++++--- .../BulkAssignmentModal.test.jsx | 7 +++-- src/components/Table/TableQueue.jsx | 2 +- src/components/Table/TableQueue.module.scss | 5 ++++ src/utils/formatters.js | 16 ++++++++++++ 7 files changed, 48 insertions(+), 19 deletions(-) diff --git a/pkg/services/office_user/office_user_fetcher.go b/pkg/services/office_user/office_user_fetcher.go index 5f6f411c9dd..2042fa3475d 100644 --- a/pkg/services/office_user/office_user_fetcher.go +++ b/pkg/services/office_user/office_user_fetcher.go @@ -154,7 +154,7 @@ func (o *officeUserFetcherPop) FetchOfficeUsersWithWorkloadByRoleAndOffice(appCt AND transportation_offices.id = $2 AND office_users.active = TRUE GROUP BY office_users.id, office_users.first_name, office_users.last_name - ORDER BY office_users.last_name ASC` + ORDER BY office_users.last_name ASC, office_users.first_name ASC` err := appCtx.DB().RawQuery(query, role, officeID).All(&officeUsers) if err != nil { diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 8b753a38e57..85b1dd66320 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -7,15 +7,23 @@ import styles from './BulkAssignmentModal.module.scss'; import Modal, { ModalTitle, ModalClose, ModalActions, connectModal } from 'components/Modal/Modal'; import { getBulkAssignmentData } from 'services/ghcApi'; import { milmoveLogger } from 'utils/milmoveLog'; +import { userName } from 'utils/formatters'; export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, closeText, queueType }) => { const [bulkAssignmentData, setBulkAssignmentData] = useState(null); - + const [isDisabled, setIsDisabled] = useState(false); + const [numberOfMoves, setNumberOfMoves] = useState(0); useEffect(() => { const fetchData = async () => { try { getBulkAssignmentData(queueType).then((data) => { setBulkAssignmentData(data); + if (data.bulkAssignmentMoveIDs === undefined) { + setIsDisabled(true); + setNumberOfMoves(0); + } else { + setNumberOfMoves(data.bulkAssignmentMoveIDs.length); + } }); } catch (err) { milmoveLogger.error('Error fetching bulk assignment data:', err); @@ -26,10 +34,10 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos return (
- onClose()} /> +

- {title} ({bulkAssignmentData == null ? 0 : bulkAssignmentData.bulkAssignmentMoveIDs.length}) + {title} ({numberOfMoves})

@@ -43,15 +51,13 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos return ( -

- {user.lastName}, {user.firstName} -

+

{userName(user)}

{user.workload || 0}

- + ); @@ -60,17 +66,17 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos
- +
diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 74a52ead1d2..3e949ebae0c 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -1,3 +1,4 @@ +@import 'shared/styles/colors.scss'; .BulkModal { min-width: 650px !important; overflow-y: auto; @@ -17,14 +18,16 @@ .BulkAssignmentAssignment { width: 60px; text-align: center; + padding-left: 15px } } } -button.backButton { - color: #005ea2; - background-color: white; +button.cancelButton { + color: $primary; + background-color: $bg-white; border: 2px solid #005ea2; border-radius: 0.25rem; font-weight: 700; padding: 0.75rem 1.25rem; + justify-content: center; } \ No newline at end of file diff --git a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx index b3f3ae5a6fc..169e6f4a89c 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx @@ -56,7 +56,7 @@ describe('BulkAssignmentModal', () => { , ); - const closeButton = await screen.findByTestId('modalCloseButton'); + const closeButton = await screen.findByTestId('modalCancelButton'); await userEvent.click(closeButton); @@ -66,8 +66,7 @@ describe('BulkAssignmentModal', () => { it('closes the modal when the Cancel button is clicked', async () => { render(); - const cancelButton = await screen.findByRole('button', { name: 'Cancel' }); - + const cancelButton = await screen.findByTestId('modalCancelButton'); await userEvent.click(cancelButton); expect(onClose).toHaveBeenCalledTimes(1); @@ -75,7 +74,7 @@ describe('BulkAssignmentModal', () => { it('calls the submit function when Save button is clicked', async () => { render(); - const saveButton = await screen.findByRole('button', { name: 'Save' }); + const saveButton = await screen.findByTestId('modalSubmitButton'); await userEvent.click(saveButton); expect(onSubmit).toHaveBeenCalledTimes(1); }); diff --git a/src/components/Table/TableQueue.jsx b/src/components/Table/TableQueue.jsx index 91aba6f86af..75c7cea1fc4 100644 --- a/src/components/Table/TableQueue.jsx +++ b/src/components/Table/TableQueue.jsx @@ -331,7 +331,7 @@ const TableQueue = ({

{`${title} (${totalCount})`}

{isSupervisor && isBulkAssignmentFFEnabled && ( - )} diff --git a/src/components/Table/TableQueue.module.scss b/src/components/Table/TableQueue.module.scss index 0da067b63ac..f9c0fdd7f88 100644 --- a/src/components/Table/TableQueue.module.scss +++ b/src/components/Table/TableQueue.module.scss @@ -38,6 +38,11 @@ cursor: pointer; } + .bulkModal { + padding: 10px; + cursor: pointer; + } + .tableContainer { flex: auto; @include u-margin-top(1); diff --git a/src/utils/formatters.js b/src/utils/formatters.js index 60f06a1f6c3..fdc58aa690e 100644 --- a/src/utils/formatters.js +++ b/src/utils/formatters.js @@ -600,3 +600,19 @@ export const constructSCOrderOconusFields = (values) => { null, }; }; + +export const userName = (user) => { + let formattedUser = ''; + if (user.firstName && user.lastName) { + formattedUser += `${user.lastName}, `; + formattedUser += ` ${user.firstName}`; + } else { + if (user.firstName) { + formattedUser += ` ${user.firstName}`; + } + if (user.lastName) { + formattedUser += ` ${user.lastName}`; + } + } + return formattedUser; +}; From 55767df1c8294ee2dd4e71e3c009972d85701133 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Tue, 28 Jan 2025 22:27:55 +0000 Subject: [PATCH 111/260] B-22056 - fix tests after api change. --- pkg/handlers/routing/ghcapi_test/uploads_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/handlers/routing/ghcapi_test/uploads_test.go b/pkg/handlers/routing/ghcapi_test/uploads_test.go index c171a80f152..5eb27758d00 100644 --- a/pkg/handlers/routing/ghcapi_test/uploads_test.go +++ b/pkg/handlers/routing/ghcapi_test/uploads_test.go @@ -6,6 +6,7 @@ import ( "github.com/transcom/mymove/pkg/factory" "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/models/roles" storageTest "github.com/transcom/mymove/pkg/storage/test" "github.com/transcom/mymove/pkg/uploader" ) @@ -31,7 +32,9 @@ func (suite *GhcAPISuite) TestUploads() { _, err := suite.HandlerConfig().FileStorer().Store(uploadUser1.Upload.StorageKey, file.Data, "somehash", nil) suite.NoError(err) - req := suite.NewAuthenticatedMilRequest("GET", "/internal/uploads/"+uploadUser1.Upload.ID.String()+"/status", nil, orders.ServiceMember) + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitActiveOfficeUser(), + []roles.RoleType{roles.RoleTypeTOO}) + req := suite.NewAuthenticatedOfficeRequest("GET", "/ghc/v1/uploads/"+uploadUser1.Upload.ID.String()+"/status", nil, officeUser) rr := httptest.NewRecorder() suite.SetupSiteHandler().ServeHTTP(rr, req) @@ -60,7 +63,9 @@ func (suite *GhcAPISuite) TestUploads() { _, err := suite.HandlerConfig().FileStorer().Store(uploadUser1.Upload.StorageKey, file.Data, "somehash", nil) suite.NoError(err) - req := suite.NewAuthenticatedMilRequest("GET", "/internal/uploads/"+uploadUser1.Upload.ID.String()+"/status", nil, orders.ServiceMember) + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitActiveOfficeUser(), + []roles.RoleType{roles.RoleTypeTOO}) + req := suite.NewAuthenticatedOfficeRequest("GET", "/ghc/v1/uploads/"+uploadUser1.Upload.ID.String()+"/status", nil, officeUser) rr := httptest.NewRecorder() fakeS3, ok := suite.HandlerConfig().FileStorer().(*storageTest.FakeS3Storage) From 75cf0cd6c1b1abc5237641b732d493d4d9c172a8 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Wed, 29 Jan 2025 21:04:23 +0000 Subject: [PATCH 112/260] B-22056 - rename param to cleanup api in postman. --- pkg/gen/ghcapi/embedded_spec.go | 208 +++++++++--------- pkg/gen/ghcapi/ghcoperations/mymove_api.go | 2 +- .../uploads/get_upload_status.go | 2 +- .../uploads/get_upload_status_parameters.go | 6 +- .../uploads/get_upload_status_urlbuilder.go | 4 +- swagger-def/ghc.yaml | 4 +- swagger/ghc.yaml | 4 +- 7 files changed, 115 insertions(+), 115 deletions(-) diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go index 7e393da9cb9..f50c560d2ab 100644 --- a/pkg/gen/ghcapi/embedded_spec.go +++ b/pkg/gen/ghcapi/embedded_spec.go @@ -6413,53 +6413,45 @@ func init() { } } }, - "/uploads/{uploadID}/update": { - "patch": { - "description": "Uploads represent a single digital file, such as a JPEG or PDF. The rotation is relevant to how it is displayed on the page.", - "consumes": [ - "application/json" - ], + "/uploads/{uploadID}/status": { + "get": { + "description": "Returns status of an upload based on antivirus run", "produces": [ - "application/json" + "text/event-stream" ], "tags": [ "uploads" ], - "summary": "Update an existing upload. This is only needed currently for updating the image rotation.", - "operationId": "updateUpload", + "summary": "Returns status of an upload", + "operationId": "getUploadStatus", "parameters": [ { "type": "string", "format": "uuid", - "description": "UUID of the upload to be updated", + "description": "UUID of the upload to return status of", "name": "uploadID", "in": "path", "required": true - }, - { - "name": "body", - "in": "body", - "required": true, - "schema": { - "properties": { - "rotation": { - "description": "The rotation of the image", - "type": "integer", - "maximum": 3 - } - } - } } ], "responses": { - "201": { - "description": "updated upload", + "200": { + "description": "the requested upload status", "schema": { - "$ref": "#/definitions/Upload" + "type": "string", + "enum": [ + "INFECTED", + "CLEAN", + "PROCESSING" + ], + "readOnly": true } }, "400": { - "description": "invalid request" + "description": "invalid request", + "schema": { + "$ref": "#/definitions/InvalidRequestResponsePayload" + } }, "403": { "description": "not authorized" @@ -6467,54 +6459,59 @@ func init() { "404": { "description": "not found" }, - "413": { - "description": "payload is too large" - }, "500": { "description": "server error" } } } }, - "/uploads/{uploadId}/status": { - "get": { - "description": "Returns status of an upload based on antivirus run", + "/uploads/{uploadID}/update": { + "patch": { + "description": "Uploads represent a single digital file, such as a JPEG or PDF. The rotation is relevant to how it is displayed on the page.", + "consumes": [ + "application/json" + ], "produces": [ - "text/event-stream" + "application/json" ], "tags": [ "uploads" ], - "summary": "Returns status of an upload", - "operationId": "getUploadStatus", + "summary": "Update an existing upload. This is only needed currently for updating the image rotation.", + "operationId": "updateUpload", "parameters": [ { "type": "string", "format": "uuid", - "description": "UUID of the upload to return status of", - "name": "uploadId", + "description": "UUID of the upload to be updated", + "name": "uploadID", "in": "path", "required": true + }, + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "properties": { + "rotation": { + "description": "The rotation of the image", + "type": "integer", + "maximum": 3 + } + } + } } ], "responses": { - "200": { - "description": "the requested upload status", + "201": { + "description": "updated upload", "schema": { - "type": "string", - "enum": [ - "INFECTED", - "CLEAN", - "PROCESSING" - ], - "readOnly": true + "$ref": "#/definitions/Upload" } }, "400": { - "description": "invalid request", - "schema": { - "$ref": "#/definitions/InvalidRequestResponsePayload" - } + "description": "invalid request" }, "403": { "description": "not authorized" @@ -6522,6 +6519,9 @@ func init() { "404": { "description": "not found" }, + "413": { + "description": "payload is too large" + }, "500": { "description": "server error" } @@ -23511,6 +23511,58 @@ func init() { } } }, + "/uploads/{uploadID}/status": { + "get": { + "description": "Returns status of an upload based on antivirus run", + "produces": [ + "text/event-stream" + ], + "tags": [ + "uploads" + ], + "summary": "Returns status of an upload", + "operationId": "getUploadStatus", + "parameters": [ + { + "type": "string", + "format": "uuid", + "description": "UUID of the upload to return status of", + "name": "uploadID", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "the requested upload status", + "schema": { + "type": "string", + "enum": [ + "INFECTED", + "CLEAN", + "PROCESSING" + ], + "readOnly": true + } + }, + "400": { + "description": "invalid request", + "schema": { + "$ref": "#/definitions/InvalidRequestResponsePayload" + } + }, + "403": { + "description": "not authorized" + }, + "404": { + "description": "not found" + }, + "500": { + "description": "server error" + } + } + } + }, "/uploads/{uploadID}/update": { "patch": { "description": "Uploads represent a single digital file, such as a JPEG or PDF. The rotation is relevant to how it is displayed on the page.", @@ -23574,58 +23626,6 @@ func init() { } } } - }, - "/uploads/{uploadId}/status": { - "get": { - "description": "Returns status of an upload based on antivirus run", - "produces": [ - "text/event-stream" - ], - "tags": [ - "uploads" - ], - "summary": "Returns status of an upload", - "operationId": "getUploadStatus", - "parameters": [ - { - "type": "string", - "format": "uuid", - "description": "UUID of the upload to return status of", - "name": "uploadId", - "in": "path", - "required": true - } - ], - "responses": { - "200": { - "description": "the requested upload status", - "schema": { - "type": "string", - "enum": [ - "INFECTED", - "CLEAN", - "PROCESSING" - ], - "readOnly": true - } - }, - "400": { - "description": "invalid request", - "schema": { - "$ref": "#/definitions/InvalidRequestResponsePayload" - } - }, - "403": { - "description": "not authorized" - }, - "404": { - "description": "not found" - }, - "500": { - "description": "server error" - } - } - } } }, "definitions": { diff --git a/pkg/gen/ghcapi/ghcoperations/mymove_api.go b/pkg/gen/ghcapi/ghcoperations/mymove_api.go index 24d614ee1e5..57a2b196ffc 100644 --- a/pkg/gen/ghcapi/ghcoperations/mymove_api.go +++ b/pkg/gen/ghcapi/ghcoperations/mymove_api.go @@ -1435,7 +1435,7 @@ func (o *MymoveAPI) initHandlerCache() { if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } - o.handlers["GET"]["/uploads/{uploadId}/status"] = uploads.NewGetUploadStatus(o.context, o.UploadsGetUploadStatusHandler) + o.handlers["GET"]["/uploads/{uploadID}/status"] = uploads.NewGetUploadStatus(o.context, o.UploadsGetUploadStatusHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } diff --git a/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status.go b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status.go index dc2c021f021..b893657d488 100644 --- a/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status.go +++ b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status.go @@ -30,7 +30,7 @@ func NewGetUploadStatus(ctx *middleware.Context, handler GetUploadStatusHandler) } /* - GetUploadStatus swagger:route GET /uploads/{uploadId}/status uploads getUploadStatus + GetUploadStatus swagger:route GET /uploads/{uploadID}/status uploads getUploadStatus # Returns status of an upload diff --git a/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_parameters.go b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_parameters.go index 1770aa8ca6b..fa1b3ef9329 100644 --- a/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_parameters.go +++ b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_parameters.go @@ -47,7 +47,7 @@ func (o *GetUploadStatusParams) BindRequest(r *http.Request, route *middleware.M o.HTTPRequest = r - rUploadID, rhkUploadID, _ := route.Params.GetOK("uploadId") + rUploadID, rhkUploadID, _ := route.Params.GetOK("uploadID") if err := o.bindUploadID(rUploadID, rhkUploadID, route.Formats); err != nil { res = append(res, err) } @@ -70,7 +70,7 @@ func (o *GetUploadStatusParams) bindUploadID(rawData []string, hasKey bool, form // Format: uuid value, err := formats.Parse("uuid", raw) if err != nil { - return errors.InvalidType("uploadId", "path", "strfmt.UUID", raw) + return errors.InvalidType("uploadID", "path", "strfmt.UUID", raw) } o.UploadID = *(value.(*strfmt.UUID)) @@ -84,7 +84,7 @@ func (o *GetUploadStatusParams) bindUploadID(rawData []string, hasKey bool, form // validateUploadID carries on validations for parameter UploadID func (o *GetUploadStatusParams) validateUploadID(formats strfmt.Registry) error { - if err := validate.FormatOf("uploadId", "path", "uuid", o.UploadID.String(), formats); err != nil { + if err := validate.FormatOf("uploadID", "path", "uuid", o.UploadID.String(), formats); err != nil { return err } return nil diff --git a/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_urlbuilder.go b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_urlbuilder.go index 69d1d31ec84..edd3c2fd6f8 100644 --- a/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_urlbuilder.go +++ b/pkg/gen/ghcapi/ghcoperations/uploads/get_upload_status_urlbuilder.go @@ -42,11 +42,11 @@ func (o *GetUploadStatusURL) SetBasePath(bp string) { func (o *GetUploadStatusURL) Build() (*url.URL, error) { var _result url.URL - var _path = "/uploads/{uploadId}/status" + var _path = "/uploads/{uploadID}/status" uploadID := o.UploadID.String() if uploadID != "" { - _path = strings.Replace(_path, "{uploadId}", uploadID, -1) + _path = strings.Replace(_path, "{uploadID}", uploadID, -1) } else { return nil, errors.New("uploadId is required on GetUploadStatusURL") } diff --git a/swagger-def/ghc.yaml b/swagger-def/ghc.yaml index 2b3e6f8a390..e429a430bcd 100644 --- a/swagger-def/ghc.yaml +++ b/swagger-def/ghc.yaml @@ -4284,7 +4284,7 @@ paths: description: payload is too large '500': description: server error - /uploads/{uploadId}/status: + /uploads/{uploadID}/status: get: summary: Returns status of an upload description: Returns status of an upload based on antivirus run @@ -4295,7 +4295,7 @@ paths: - uploads parameters: - in: path - name: uploadId + name: uploadID type: string format: uuid required: true diff --git a/swagger/ghc.yaml b/swagger/ghc.yaml index 0536f8cd2f3..78ba66adc8d 100644 --- a/swagger/ghc.yaml +++ b/swagger/ghc.yaml @@ -4501,7 +4501,7 @@ paths: description: payload is too large '500': description: server error - /uploads/{uploadId}/status: + /uploads/{uploadID}/status: get: summary: Returns status of an upload description: Returns status of an upload based on antivirus run @@ -4512,7 +4512,7 @@ paths: - uploads parameters: - in: path - name: uploadId + name: uploadID type: string format: uuid required: true From 7b667ebf25f14be9bdf04d4b6f5ba12c00e95dd7 Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Thu, 30 Jan 2025 15:18:36 +0000 Subject: [PATCH 113/260] Fixed button --- src/components/BulkAssignment/BulkAssignmentModal.jsx | 2 +- .../BulkAssignment/BulkAssignmentModal.module.scss | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 85b1dd66320..27135491f9c 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -74,7 +74,7 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos > {submitText} - diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 3e949ebae0c..012ead351c7 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -21,13 +21,4 @@ padding-left: 15px } } -} -button.cancelButton { - color: $primary; - background-color: $bg-white; - border: 2px solid #005ea2; - border-radius: 0.25rem; - font-weight: 700; - padding: 0.75rem 1.25rem; - justify-content: center; } \ No newline at end of file From 3972c54fa2b1275f6f117bdafaf9ef89506a9cdf Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Thu, 30 Jan 2025 17:02:14 +0000 Subject: [PATCH 114/260] Button style --- src/components/BulkAssignment/BulkAssignmentModal.jsx | 2 +- src/components/BulkAssignment/BulkAssignmentModal.module.scss | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 27135491f9c..c960f163736 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -74,7 +74,7 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos > {submitText} - diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 012ead351c7..8997526b680 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -21,4 +21,7 @@ padding-left: 15px } } +} +Button { + min-width: 4vw; } \ No newline at end of file From 1dd6636890dc4b1085120cf39d93c3ea33c9d00c Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 30 Jan 2025 20:37:14 +0000 Subject: [PATCH 115/260] B-21943 - add field, mapped field to body, and tests for domestic & origin SIT service items. --- .../PrimeUI/UpdateServiceItems/PrimeUIUpdateDestSITForm.jsx | 5 +++++ .../UpdateServiceItems/PrimeUIUpdateDestSITForm.test.jsx | 2 ++ .../UpdateServiceItems/PrimeUIUpdateOriginSITForm.jsx | 5 +++++ .../UpdateServiceItems/PrimeUIUpdateOriginSITForm.test.jsx | 2 ++ .../PrimeUI/UpdateServiceItems/PrimeUIUpdateServiceItem.jsx | 2 ++ .../UpdateServiceItems/PrimeUpdateSitServiceItem.test.jsx | 2 ++ 6 files changed, 18 insertions(+) diff --git a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateDestSITForm.jsx b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateDestSITForm.jsx index 6ef614279da..7903fc4f494 100644 --- a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateDestSITForm.jsx +++ b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateDestSITForm.jsx @@ -36,6 +36,7 @@ const PrimeUIUpdateDestSITForm = ({ initialValues, onSubmit, serviceItem }) => { Here you can update specific fields for a destination SIT service item.
At this time, only the following values can be updated:
{' '} + SIT Entry Date
SIT Departure Date
SIT Requested Delivery
SIT Customer Contacted
@@ -67,8 +68,12 @@ const PrimeUIUpdateDestSITForm = ({ initialValues, onSubmit, serviceItem }) => {
+ +
+
+
{serviceItem.status === SERVICE_ITEM_STATUSES.REJECTED && ( diff --git a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateDestSITForm.test.jsx b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateDestSITForm.test.jsx index 60e50555bba..3e7c1c055e3 100644 --- a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateDestSITForm.test.jsx +++ b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateDestSITForm.test.jsx @@ -26,6 +26,7 @@ const reformatPrimeApiSITDestinationAddress = fromPrimeAPIAddressFormat(shipment const destSitInitialValues = { sitDestinationFinalAddress: reformatPrimeApiSITDestinationAddress, + sitEntryDate: '25 Oct 2023', sitDepartureDate: '01 Nov 2023', sitRequestedDelivery: '01 Dec 2023', sitCustomerContacted: '15 Oct 2023', @@ -56,6 +57,7 @@ describe('PrimeUIRequestSITDestAddressChangeForm', () => { expect( screen.getByRole('heading', { name: 'DDDSIT - Domestic destination SIT delivery', level: 3 }), ).toBeInTheDocument(); + expect(await screen.findByLabelText('SIT Entry Date')).toHaveValue('25 Oct 2023'); expect(await screen.findByLabelText('SIT Departure Date')).toHaveValue('01 Nov 2023'); expect(await screen.findByLabelText('SIT Requested Delivery')).toHaveValue('01 Dec 2023'); expect(await screen.findByLabelText('SIT Customer Contacted')).toHaveValue('15 Oct 2023'); diff --git a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateOriginSITForm.jsx b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateOriginSITForm.jsx index 240eb042f39..8865706bacd 100644 --- a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateOriginSITForm.jsx +++ b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateOriginSITForm.jsx @@ -36,6 +36,7 @@ const PrimeUIUpdateOriginSITForm = ({ initialValues, onSubmit, serviceItem }) => Here you can update specific fields for an origin SIT service item.
At this time, only the following values can be updated:
{' '} + SIT Entry Date
SIT Departure Date
SIT Requested Delivery
SIT Customer Contacted
@@ -67,8 +68,12 @@ const PrimeUIUpdateOriginSITForm = ({ initialValues, onSubmit, serviceItem }) =>
+ +
+
+
{serviceItem.status === SERVICE_ITEM_STATUSES.REJECTED && ( diff --git a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateOriginSITForm.test.jsx b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateOriginSITForm.test.jsx index 317f52b16bc..8503af25088 100644 --- a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateOriginSITForm.test.jsx +++ b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateOriginSITForm.test.jsx @@ -8,6 +8,7 @@ import { renderWithProviders } from 'testUtils'; import { primeSimulatorRoutes } from 'constants/routes'; const originSitInitialValues = { + sitEntryDate: '25 Oct 2023', sitDepartureDate: '01 Nov 2023', sitRequestedDelivery: '01 Dec 2023', sitCustomerContacted: '15 Oct 2023', @@ -40,6 +41,7 @@ describe('PrimeUIRequestSITDestAddressChangeForm', () => { expect(screen.getByRole('heading', { name: 'Update Origin SIT Service Item', level: 2 })).toBeInTheDocument(); expect(screen.getByRole('heading', { name: 'DOPSIT - Domestic origin SIT pickup', level: 3 })).toBeInTheDocument(); + expect(await screen.findByLabelText('SIT Entry Date')).toHaveValue('25 Oct 2023'); expect(await screen.findByLabelText('SIT Departure Date')).toHaveValue('01 Nov 2023'); expect(await screen.findByLabelText('SIT Requested Delivery')).toHaveValue('01 Dec 2023'); expect(await screen.findByLabelText('SIT Customer Contacted')).toHaveValue('15 Oct 2023'); diff --git a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateServiceItem.jsx b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateServiceItem.jsx index 387981922c4..921d7de1850 100644 --- a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateServiceItem.jsx +++ b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateServiceItem.jsx @@ -85,6 +85,7 @@ const PrimeUIUpdateServiceItem = ({ setFlashMessage }) => { onSubmit = (values) => { const { sitCustomerContacted, + sitEntryDate, sitDepartureDate, sitRequestedDelivery, updateReason, @@ -94,6 +95,7 @@ const PrimeUIUpdateServiceItem = ({ setFlashMessage }) => { } = values; const body = { + sitEntryDate: sitEntryDate === 'Invalid date' ? null : formatDateForSwagger(sitEntryDate), sitDepartureDate: sitDepartureDate === 'Invalid date' ? null : formatDateForSwagger(sitDepartureDate), sitRequestedDelivery: sitRequestedDelivery === 'Invalid date' ? null : formatDateForSwagger(sitRequestedDelivery), diff --git a/src/pages/PrimeUI/UpdateServiceItems/PrimeUpdateSitServiceItem.test.jsx b/src/pages/PrimeUI/UpdateServiceItems/PrimeUpdateSitServiceItem.test.jsx index e7f21f94309..c69825cf388 100644 --- a/src/pages/PrimeUI/UpdateServiceItems/PrimeUpdateSitServiceItem.test.jsx +++ b/src/pages/PrimeUI/UpdateServiceItems/PrimeUpdateSitServiceItem.test.jsx @@ -69,6 +69,7 @@ describe('PrimeUIUpdateSitServiceItems page', () => { renderComponent(); expect(screen.getByRole('heading', { name: 'Update Destination SIT Service Item', level: 2 })).toBeInTheDocument(); + expect(screen.getByRole('textbox', { name: 'SIT Entry Date' })).toBeInTheDocument(); expect(screen.getByRole('textbox', { name: 'SIT Departure Date' })).toBeInTheDocument(); expect(screen.getByRole('textbox', { name: 'SIT Requested Delivery' })).toBeInTheDocument(); expect(screen.getByRole('textbox', { name: 'SIT Customer Contacted' })).toBeInTheDocument(); @@ -131,6 +132,7 @@ describe('PrimeUIUpdateSitServiceItems page', () => { renderComponent(); expect(screen.getByRole('heading', { name: 'Update Origin SIT Service Item', level: 2 })).toBeInTheDocument(); + expect(screen.getByRole('textbox', { name: 'SIT Entry Date' })).toBeInTheDocument(); expect(screen.getByRole('textbox', { name: 'SIT Departure Date' })).toBeInTheDocument(); expect(screen.getByRole('textbox', { name: 'SIT Requested Delivery' })).toBeInTheDocument(); expect(screen.getByRole('textbox', { name: 'SIT Customer Contacted' })).toBeInTheDocument(); From 2dfa4363d18cd361c361b93e83f8c9712db2bdc4 Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Thu, 30 Jan 2025 21:44:23 +0000 Subject: [PATCH 116/260] Custom Button fix --- .../BulkAssignment/BulkAssignmentModal.jsx | 40 ++++++++++--------- .../BulkAssignmentModal.module.scss | 28 +++++++++---- 2 files changed, 42 insertions(+), 26 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index c960f163736..ffc9da7322e 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useCallback, useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { Button } from '@trussworks/react-uswds'; @@ -13,24 +13,26 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos const [bulkAssignmentData, setBulkAssignmentData] = useState(null); const [isDisabled, setIsDisabled] = useState(false); const [numberOfMoves, setNumberOfMoves] = useState(0); - useEffect(() => { - const fetchData = async () => { - try { - getBulkAssignmentData(queueType).then((data) => { - setBulkAssignmentData(data); - if (data.bulkAssignmentMoveIDs === undefined) { - setIsDisabled(true); - setNumberOfMoves(0); - } else { - setNumberOfMoves(data.bulkAssignmentMoveIDs.length); - } - }); - } catch (err) { - milmoveLogger.error('Error fetching bulk assignment data:', err); + const fetchData = useCallback(async () => { + try { + const data = await getBulkAssignmentData(queueType); + setBulkAssignmentData(data); + + if (!data.bulkAssignmentMoveIDs) { + setIsDisabled(true); + setNumberOfMoves(0); + } else { + setNumberOfMoves(data.bulkAssignmentMoveIDs.length); } - }; - fetchData(); + } catch (err) { + milmoveLogger.error('Error fetching bulk assignment data:', err); + } }, [queueType]); + + useEffect(() => { + fetchData(); + }, [fetchData]); + return (
@@ -74,9 +76,9 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos > {submitText} - +
diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 8997526b680..63eae5fbe15 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -6,7 +6,6 @@ } .BulkAssignmentTable { - table { th { max-width: 10px; @@ -16,12 +15,27 @@ text-align: center; } .BulkAssignmentAssignment { - width: 60px; - text-align: center; - padding-left: 15px + width: 60px; + text-align: center; + padding-left: 15px; } } } -Button { - min-width: 4vw; -} \ No newline at end of file +button.cancelButton { + color: $primary; + background-color: $bg-white; + border: 2px solid #005ea2; + border-radius: 0.25rem; + font-weight: 700; + padding: 0.75rem 1.25rem; + justify-content: center; + + &:hover, + &:focus { + font-weight: bold; + background-color: $bg-white; + border: 2px solid $primary-dark; + cursor: pointer; + color: $primary-dark; + } +} From 070c74f2aaf52e7626808c49c3ca1812b00a1c68 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 30 Jan 2025 22:06:43 +0000 Subject: [PATCH 117/260] B-21943 - populating sitEntryDate with initial value. --- .../PrimeUI/UpdateServiceItems/PrimeUIUpdateServiceItem.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateServiceItem.jsx b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateServiceItem.jsx index 921d7de1850..56b13f04b40 100644 --- a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateServiceItem.jsx +++ b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateServiceItem.jsx @@ -73,6 +73,7 @@ const PrimeUIUpdateServiceItem = ({ setFlashMessage }) => { let onSubmit; if (modelType === 'MTOServiceItemOriginSIT' || modelType === 'MTOServiceItemDestSIT') { initialValues = { + sitEntryDate: formatDateWithUTC(serviceItem.sitEntryDate, 'YYYY-MM-DD', 'DD MMM YYYY') || '', sitDepartureDate: formatDateWithUTC(serviceItem.sitDepartureDate, 'YYYY-MM-DD', 'DD MMM YYYY') || '', sitRequestedDelivery: formatDateWithUTC(serviceItem.sitRequestedDelivery, 'YYYY-MM-DD', 'DD MMM YYYY') || '', sitCustomerContacted: formatDateWithUTC(serviceItem.sitCustomerContacted, 'YYYY-MM-DD', 'DD MMM YYYY') || '', From 626b8e4d3157e7e38e7fb17554c7cafff7572bfb Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Thu, 30 Jan 2025 23:15:02 +0000 Subject: [PATCH 118/260] min width --- src/components/BulkAssignment/BulkAssignmentModal.module.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 63eae5fbe15..f197e0d055a 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -29,6 +29,7 @@ button.cancelButton { font-weight: 700; padding: 0.75rem 1.25rem; justify-content: center; + min-width: 4vw; &:hover, &:focus { @@ -37,5 +38,6 @@ button.cancelButton { border: 2px solid $primary-dark; cursor: pointer; color: $primary-dark; + min-width: 4vw; } } From c63bb3091a20980eaf74c1a96e39acf746dbf58e Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Thu, 30 Jan 2025 23:50:06 +0000 Subject: [PATCH 119/260] button fix --- .../BulkAssignment/BulkAssignmentModal.jsx | 4 +-- .../BulkAssignmentModal.module.scss | 29 ++++++------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index ffc9da7322e..a9c62ce429d 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -76,9 +76,9 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos > {submitText} - + diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index f197e0d055a..1495e210ada 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -1,8 +1,17 @@ @import 'shared/styles/colors.scss'; + .BulkModal { min-width: 650px !important; overflow-y: auto; max-height: 90vh; + + button, + :global(.usa-button){ + margin: 0; + flex-grow: 0; + flex-basis: auto; + text-decoration: none; + } } .BulkAssignmentTable { @@ -21,23 +30,3 @@ } } } -button.cancelButton { - color: $primary; - background-color: $bg-white; - border: 2px solid #005ea2; - border-radius: 0.25rem; - font-weight: 700; - padding: 0.75rem 1.25rem; - justify-content: center; - min-width: 4vw; - - &:hover, - &:focus { - font-weight: bold; - background-color: $bg-white; - border: 2px solid $primary-dark; - cursor: pointer; - color: $primary-dark; - min-width: 4vw; - } -} From 5b882c0fc9946dec125ae301837be828b1248808 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Fri, 31 Jan 2025 14:33:01 +0000 Subject: [PATCH 120/260] Removing Duplicate --- .../mto_service_item/mto_service_item_updater.go | 14 -------------- 1 file changed, 14 deletions(-) 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 650964dcaa4..986eb246250 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -186,20 +186,6 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - if serviceItem.ReService.Code == models.ReServiceCodeDUPK { - domesticServiceArea, err := fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.DestinationAddress.PostalCode) - if err != nil { - return 0, err - } - - serviceScheduleDestination := domesticServiceArea.ServicesSchedule - - price, _, err = p.unpackPricer.Price(appCtx, contractCode, *pickupDate, shipmentWeight, serviceScheduleDestination, isPPM) - if err != nil { - return 0, err - } - } - // linehaul if serviceItem.ReService.Code == models.ReServiceCodeDLH { domesticServiceArea, err := fetchDomesticServiceArea(appCtx, contractCode, mtoShipment.PickupAddress.PostalCode) From 38c40f6595806108e2e49c4a048e404e4e275762 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Fri, 31 Jan 2025 15:11:11 +0000 Subject: [PATCH 121/260] Adding tests --- pkg/testdatagen/testharness/make_move.go | 191 ++++++++++++++++++ .../office/txo/tooFlowsInternational.spec.js | 116 +++++++++++ playwright/tests/utils/testharness.js | 8 + 3 files changed, 315 insertions(+) diff --git a/pkg/testdatagen/testharness/make_move.go b/pkg/testdatagen/testharness/make_move.go index ca192666c7d..cd6c036aedf 100644 --- a/pkg/testdatagen/testharness/make_move.go +++ b/pkg/testdatagen/testharness/make_move.go @@ -729,6 +729,197 @@ func MakeHHGMoveWithIntlCratingServiceItemsTOO(appCtx appcontext.AppContext) mod return *newmove } +// MakeHHGMoveWithIntlShuttleServiceItemsTOO is a function +// that creates an HHG move with international service items +// from the Prime for review by the TOO +func MakeHHGMoveWithIntlShuttleServiceItemsTOO(appCtx appcontext.AppContext) models.Move { + userUploader := newUserUploader(appCtx) + primeUploader := newPrimeUploader(appCtx) + userInfo := newUserInfo("customer") + + user := factory.BuildUser(appCtx.DB(), []factory.Customization{ + { + Model: models.User{ + OktaEmail: userInfo.email, + Active: true, + }, + }, + }, nil) + customer := factory.BuildExtendedServiceMember(appCtx.DB(), []factory.Customization{ + { + Model: models.ServiceMember{ + PersonalEmail: &userInfo.email, + FirstName: &userInfo.firstName, + LastName: &userInfo.lastName, + CacValidated: true, + }, + }, + { + Model: user, + LinkOnly: true, + }, + }, nil) + dependentsAuthorized := true + entitlements := factory.BuildEntitlement(appCtx.DB(), []factory.Customization{ + { + Model: models.Entitlement{ + DependentsAuthorized: &dependentsAuthorized, + }, + }, + }, nil) + orders := factory.BuildOrder(appCtx.DB(), []factory.Customization{ + { + Model: customer, + LinkOnly: true, + }, + { + Model: entitlements, + LinkOnly: true, + }, + { + Model: models.UserUpload{}, + ExtendedParams: &factory.UserUploadExtendedParams{ + UserUploader: userUploader, + AppContext: appCtx, + }, + }, + }, nil) + mto := factory.BuildMove(appCtx.DB(), []factory.Customization{ + { + Model: orders, + LinkOnly: true, + }, + { + Model: models.Move{ + Status: models.MoveStatusSUBMITTED, + }, + }, + }, nil) + estimatedWeight := unit.Pound(1400) + actualWeight := unit.Pound(2000) + actualPickupDate := time.Now().AddDate(0, 0, 1) + + MTOShipment := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: &estimatedWeight, + PrimeActualWeight: &actualWeight, + ShipmentType: models.MTOShipmentTypeHHG, + Status: models.MTOShipmentStatusSubmitted, + ActualPickupDate: &actualPickupDate, + }, + }, + { + Model: mto, + LinkOnly: true, + }, + }, nil) + + agentUserInfo := newUserInfo("agent") + factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ + { + Model: MTOShipment, + LinkOnly: true, + }, + { + Model: models.MTOAgent{ + FirstName: &agentUserInfo.firstName, + LastName: &agentUserInfo.lastName, + Email: &agentUserInfo.email, + MTOAgentType: models.MTOAgentReleasing, + }, + }, + }, nil) + + paymentRequest := factory.BuildPaymentRequest(appCtx.DB(), []factory.Customization{ + { + Model: models.PaymentRequest{ + IsFinal: false, + Status: models.PaymentRequestStatusPending, + }, + }, + { + Model: mto, + LinkOnly: true, + }, + }, nil) + + _ = factory.BuildMTOServiceItem(appCtx.DB(), []factory.Customization{ + { + Model: mto, + LinkOnly: true, + }, + { + Model: MTOShipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + ID: uuid.FromStringOrNil("22fc07ed-be15-4f50-b941-cbd38153b378"), // IDSHUT - International Destination Shuttle + }, + }, + }, nil) + + _ = factory.BuildMTOServiceItem(appCtx.DB(), []factory.Customization{ + { + Model: mto, + LinkOnly: true, + }, + { + Model: MTOShipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + ID: uuid.FromStringOrNil("624a97c5-dfbf-4da9-a6e9-526b4f95af8d"), // IOSHUT - International Origin Shuttle + }, + }, + }, nil) + + factory.BuildPrimeUpload(appCtx.DB(), []factory.Customization{ + { + Model: paymentRequest, + LinkOnly: true, + }, + }, nil) + posImage := factory.BuildProofOfServiceDoc(appCtx.DB(), []factory.Customization{ + { + Model: paymentRequest, + LinkOnly: true, + }, + }, nil) + primeContractor := uuid.FromStringOrNil("5db13bb4-6d29-4bdb-bc81-262f4513ecf6") + + // Creates custom test.jpg prime upload + file := testdatagen.Fixture("test.jpg") + _, verrs, err := primeUploader.CreatePrimeUploadForDocument(appCtx, &posImage.ID, primeContractor, uploader.File{File: file}, uploader.AllowedTypesPaymentRequest) + if verrs.HasAny() || err != nil { + appCtx.Logger().Error("errors encountered saving test.jpg prime upload", zap.Error(err)) + } + + // Creates custom test.png prime upload + file = testdatagen.Fixture("test.png") + _, verrs, err = primeUploader.CreatePrimeUploadForDocument(appCtx, &posImage.ID, primeContractor, uploader.File{File: file}, uploader.AllowedTypesPaymentRequest) + if verrs.HasAny() || err != nil { + appCtx.Logger().Error("errors encountered saving test.png prime upload", zap.Error(err)) + } + + // re-fetch the move so that we ensure we have exactly what is in + // the db + newmove, err := models.FetchMove(appCtx.DB(), &auth.Session{}, mto.ID) + if err != nil { + log.Panic(fmt.Errorf("failed to fetch move: %w", err)) + } + + // load payment requests so tests can confirm + err = appCtx.DB().Load(newmove, "PaymentRequests") + if err != nil { + log.Panic(fmt.Errorf("failed to fetch move payment requestse: %w", err)) + } + + return *newmove +} + // MakeHHGMoveForTOOAfterActualPickupDate is a function // that creates an HHG move with an actual pickup date in the past for diversion testing // copied almost verbatim from e2ebasic createHHGMoveWithServiceItemsAndPaymentRequestsAndFiles diff --git a/playwright/tests/office/txo/tooFlowsInternational.spec.js b/playwright/tests/office/txo/tooFlowsInternational.spec.js index 31fa0741487..fdeb02599c4 100644 --- a/playwright/tests/office/txo/tooFlowsInternational.spec.js +++ b/playwright/tests/office/txo/tooFlowsInternational.spec.js @@ -163,5 +163,121 @@ test.describe('TOO user', () => { await expect(getServiceItemsInTable(requestedServiceItemsTable)).toHaveCount(requestedServiceItemCount - 1); }); + + test.skip(alaskaEnabled === 'false', 'Skip if Alaska FF is disabled.'); + test('is able to approve and reject international shuttle service items', async ({ officePage, page }) => { + const move = await officePage.testHarness.buildHHGMoveWithIntlShuttleServiceItemsTOO(); + await officePage.signInAsNewTOOUser(); + tooFlowPage = new TooFlowPage(officePage, move); + await tooFlowPage.waitForLoading(); + await officePage.tooNavigateToMove(tooFlowPage.moveLocator); + + // Edit the shipment address to AK + await page.locator('[data-testid="ShipmentContainer"] .usa-button').first().click(); + await page.locator('input[id="delivery.address-location-input"]').fill('99505'); + await page.keyboard.press('Enter'); + + await page.getByRole('button', { name: 'Save' }).click(); + await tooFlowPage.waitForPage.moveDetails(); + + await tooFlowPage.waitForLoading(); + await tooFlowPage.approveAllShipments(); + + await page.getByTestId('MoveTaskOrder-Tab').click(); + await tooFlowPage.waitForLoading(); + expect(page.url()).toContain(`/moves/${tooFlowPage.moveLocator}/mto`); + + // Wait for page to load to deal with flakiness resulting from Service Item tables loading + await tooFlowPage.page.waitForLoadState(); + + // Move Task Order page + await expect(page.getByTestId('ShipmentContainer')).toHaveCount(1); + + /** + * @function + * @description This test approves and rejects service items, which moves them from one table to another + * and expects the counts of each table to increment/decrement by one item each time + * This function gets the service items for a given table to help count them + * @param {import("playwright-core").Locator} table + * @returns {import("playwright-core").Locator} + */ + const getServiceItemsInTable = (table) => { + return table.getByRole('rowgroup').nth(1).getByRole('row'); + }; + + const requestedServiceItemsTable = page.getByTestId('RequestedServiceItemsTable'); + let requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); + const approvedServiceItemsTable = page.getByTestId('ApprovedServiceItemsTable'); + let approvedServiceItemCount = await getServiceItemsInTable(approvedServiceItemsTable).count(); + const rejectedServiceItemsTable = page.getByTestId('RejectedServiceItemsTable'); + let rejectedServiceItemCount = await getServiceItemsInTable(rejectedServiceItemsTable).count(); + + await expect(page.getByText('Requested Service Items', { exact: false })).toBeVisible(); + await expect(getServiceItemsInTable(requestedServiceItemsTable).nth(1)).toBeVisible(); + + await expect(page.getByTestId('modal')).not.toBeVisible(); + + // Approve a requested service item + expect((await getServiceItemsInTable(requestedServiceItemsTable).count()) > 0); + // ICRT + await requestedServiceItemsTable.getByRole('button', { name: 'Accept' }).first().click(); + await tooFlowPage.waitForLoading(); + + await expect(getServiceItemsInTable(approvedServiceItemsTable)).toHaveCount(approvedServiceItemCount + 1); + approvedServiceItemCount = await getServiceItemsInTable(approvedServiceItemsTable).count(); + + await expect(getServiceItemsInTable(requestedServiceItemsTable)).toHaveCount(requestedServiceItemCount - 1); + requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); + + // IUCRT + await requestedServiceItemsTable.getByRole('button', { name: 'Accept' }).first().click(); + await tooFlowPage.waitForLoading(); + + await expect(getServiceItemsInTable(approvedServiceItemsTable)).toHaveCount(approvedServiceItemCount + 1); + approvedServiceItemCount = await getServiceItemsInTable(approvedServiceItemsTable).count(); + + await expect(getServiceItemsInTable(requestedServiceItemsTable)).toHaveCount(requestedServiceItemCount - 1); + requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); + + // Reject a requested service item + await expect(page.getByText('Requested Service Items', { exact: false })).toBeVisible(); + expect((await getServiceItemsInTable(requestedServiceItemsTable).count()) > 0); + // ICRT + await requestedServiceItemsTable.getByRole('button', { name: 'Reject' }).first().click(); + + await expect(page.getByTestId('modal')).toBeVisible(); + let modal = page.getByTestId('modal'); + + await expect(modal.getByRole('button', { name: 'Submit' })).toBeDisabled(); + await modal.getByRole('textbox').fill('my very valid reason'); + await modal.getByRole('button', { name: 'Submit' }).click(); + + await expect(page.getByTestId('modal')).not.toBeVisible(); + + await expect(page.getByText('Rejected Service Items', { exact: false })).toBeVisible(); + await expect(getServiceItemsInTable(rejectedServiceItemsTable)).toHaveCount(rejectedServiceItemCount + 1); + rejectedServiceItemCount = await getServiceItemsInTable(rejectedServiceItemsTable).count(); + + await expect(getServiceItemsInTable(requestedServiceItemsTable)).toHaveCount(requestedServiceItemCount - 1); + requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); + + // IUCRT + await requestedServiceItemsTable.getByRole('button', { name: 'Reject' }).first().click(); + + await expect(page.getByTestId('modal')).toBeVisible(); + modal = page.getByTestId('modal'); + + await expect(modal.getByRole('button', { name: 'Submit' })).toBeDisabled(); + await modal.getByRole('textbox').fill('my very valid reason'); + await modal.getByRole('button', { name: 'Submit' }).click(); + + await expect(page.getByTestId('modal')).not.toBeVisible(); + + await expect(page.getByText('Rejected Service Items', { exact: false })).toBeVisible(); + await expect(getServiceItemsInTable(rejectedServiceItemsTable)).toHaveCount(rejectedServiceItemCount + 1); + rejectedServiceItemCount = await getServiceItemsInTable(rejectedServiceItemsTable).count(); + + await expect(getServiceItemsInTable(requestedServiceItemsTable)).toHaveCount(requestedServiceItemCount - 1); + }); }); }); diff --git a/playwright/tests/utils/testharness.js b/playwright/tests/utils/testharness.js index cc84f4c61f9..05055e73787 100644 --- a/playwright/tests/utils/testharness.js +++ b/playwright/tests/utils/testharness.js @@ -299,6 +299,14 @@ export class TestHarness { return this.buildDefault('HHGMoveWithIntlCratingServiceItemsTOO'); } + /** + * Use testharness to build hhg move with international crating service items for TOO + * @returns {Promise} + */ + async buildHHGMoveWithIntlShuttleServiceItemsTOO() { + return this.buildDefault('HHGMoveWithIntlShuttleServiceItemsTOO'); + } + /** * Use testharness to build hhg move for TOO with actualPickupDate in the past * @returns {Promise} From 485f3705ca66884d9322d098529878358bd76dd8 Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Fri, 31 Jan 2025 15:16:45 +0000 Subject: [PATCH 122/260] removed code in storybook --- .../BulkAssignment/BulkAssignmentModal.stories.jsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.stories.jsx b/src/components/BulkAssignment/BulkAssignmentModal.stories.jsx index 097a24c6bf0..f7fa5b3630d 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.stories.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.stories.jsx @@ -15,12 +15,4 @@ const ConnectedTemplate = (args) => ; export const ConnectedModal = ConnectedTemplate.bind({}); ConnectedModal.args = { isOpen: true, - bulkAssignmentData: { - bulkAssignmentMoveIDs: ['1', '2', '3', '4', '5', '6', '7', '8'], - availableOfficeUsers: [ - { lastName: 'Monk', firstName: 'Art', workload: 81 }, - { lastName: 'Green', firstName: 'Darrell', workload: 28 }, - { lastName: 'Riggins', firstName: 'John', workload: 44 }, - ], - }, }; From 40c8b9dc23244ad5f25647c914386c2f8210e4b7 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Fri, 31 Jan 2025 16:03:01 +0000 Subject: [PATCH 123/260] Updating pricing to use 110% weight --- .../mto_service_item_updater.go | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) 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 986eb246250..b3db491e050 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -181,7 +181,8 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, } } - price, _, err = p.destinationPricer.Price(appCtx, contractCode, *pickupDate, shipmentWeight, domesticServiceArea.ServiceArea, isPPM) + adjustedWeight := GetAdjustedWeight(shipmentWeight, mtoShipment.ShipmentType == models.MTOShipmentTypeUnaccompaniedBaggage) + price, _, err = p.destinationPricer.Price(appCtx, contractCode, *pickupDate, *adjustedWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -198,7 +199,9 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, return 0, err } } - price, _, err = p.linehaulPricer.Price(appCtx, contractCode, *pickupDate, unit.Miles(distance), shipmentWeight, domesticServiceArea.ServiceArea, isPPM) + + adjustedWeight := GetAdjustedWeight(shipmentWeight, mtoShipment.ShipmentType == models.MTOShipmentTypeUnaccompaniedBaggage) + price, _, err = p.linehaulPricer.Price(appCtx, contractCode, *pickupDate, unit.Miles(distance), *adjustedWeight, domesticServiceArea.ServiceArea, isPPM) if err != nil { return 0, err } @@ -209,7 +212,9 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - price, _, err = p.unpackPricer.Price(appCtx, contractCode, *pickupDate, shipmentWeight, domesticServiceArea.ServicesSchedule, isPPM) + + adjustedWeight := GetAdjustedWeight(shipmentWeight, mtoShipment.ShipmentType == models.MTOShipmentTypeUnaccompaniedBaggage) + price, _, err = p.unpackPricer.Price(appCtx, contractCode, *pickupDate, *adjustedWeight, domesticServiceArea.ServicesSchedule, isPPM) if err != nil { return 0, err } @@ -235,7 +240,9 @@ func (p *mtoServiceItemUpdater) findEstimatedPrice(appCtx appcontext.AppContext, if err != nil { return 0, err } - price, _, err = p.fuelSurchargePricer.Price(appCtx, *pickupDate, unit.Miles(distance), shipmentWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) + + adjustedWeight := GetAdjustedWeight(shipmentWeight, mtoShipment.ShipmentType == models.MTOShipmentTypeUnaccompaniedBaggage) + price, _, err = p.fuelSurchargePricer.Price(appCtx, *pickupDate, unit.Miles(distance), *adjustedWeight, fscWeightBasedDistanceMultiplierFloat, eiaFuelPrice, isPPM) if err != nil { return 0, err } @@ -814,3 +821,22 @@ func ValidateUpdateMTOServiceItem(appCtx appcontext.AppContext, serviceItemData return newServiceItem, nil } + +// Get Adjusted weight for pricing. Returns the weight at 110% or the minimum billable weight whichever is higher, unless it's 0 +func GetAdjustedWeight(incomingWeight unit.Pound, isUB bool) *unit.Pound { + // minimum weight billed by GHC is 500 lbs unless it's Unaccompanied Baggage (UB) + minimumBilledWeight := unit.Pound(500) + if isUB { + minimumBilledWeight = unit.Pound(300) + } + + // add 110% modifier to billable weight + newWeight := (int(incomingWeight.Float64() * 1.1)) + adjustedWeight := (*unit.Pound)(&newWeight) + + // if the adjusted weight is less than the minimum billable weight but is nonzero, set it to the minimum weight billed + if *adjustedWeight < minimumBilledWeight && *adjustedWeight > 0 { + *adjustedWeight = minimumBilledWeight + } + return adjustedWeight +} From a63e374e0b5aa337bfc559f679cd29152c62f2be Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Fri, 31 Jan 2025 10:29:58 -0600 Subject: [PATCH 124/260] removing duplicate call --- .../mto_service_item_updater.go | 19 ------------------- 1 file changed, 19 deletions(-) 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 b3db491e050..1bc9a64ec85 100644 --- a/pkg/services/mto_service_item/mto_service_item_updater.go +++ b/pkg/services/mto_service_item/mto_service_item_updater.go @@ -821,22 +821,3 @@ func ValidateUpdateMTOServiceItem(appCtx appcontext.AppContext, serviceItemData return newServiceItem, nil } - -// Get Adjusted weight for pricing. Returns the weight at 110% or the minimum billable weight whichever is higher, unless it's 0 -func GetAdjustedWeight(incomingWeight unit.Pound, isUB bool) *unit.Pound { - // minimum weight billed by GHC is 500 lbs unless it's Unaccompanied Baggage (UB) - minimumBilledWeight := unit.Pound(500) - if isUB { - minimumBilledWeight = unit.Pound(300) - } - - // add 110% modifier to billable weight - newWeight := (int(incomingWeight.Float64() * 1.1)) - adjustedWeight := (*unit.Pound)(&newWeight) - - // if the adjusted weight is less than the minimum billable weight but is nonzero, set it to the minimum weight billed - if *adjustedWeight < minimumBilledWeight && *adjustedWeight > 0 { - *adjustedWeight = minimumBilledWeight - } - return adjustedWeight -} From c874308526408fdfac910b52a4b3a5ef22a98c52 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Fri, 31 Jan 2025 17:14:08 +0000 Subject: [PATCH 125/260] updating comment --- pkg/gen/supportapi/embedded_spec.go | 4 ++-- .../m_t_o_service_item_international_shuttle.go | 6 +++--- swagger-def/support.yaml | 2 +- swagger/support.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/gen/supportapi/embedded_spec.go b/pkg/gen/supportapi/embedded_spec.go index 2a2a3fd8a19..73ec11e42a1 100644 --- a/pkg/gen/supportapi/embedded_spec.go +++ b/pkg/gen/supportapi/embedded_spec.go @@ -1553,7 +1553,7 @@ func init() { "example": 4000 }, "estimatedWeight": { - "description": "An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT \u0026 DOSHUT) service item.", + "description": "An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT \u0026 IOSHUT) service item.", "type": "integer", "x-nullable": true, "x-omitempty": false, @@ -4475,7 +4475,7 @@ func init() { "example": 4000 }, "estimatedWeight": { - "description": "An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT \u0026 DOSHUT) service item.", + "description": "An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT \u0026 IOSHUT) service item.", "type": "integer", "x-nullable": true, "x-omitempty": false, diff --git a/pkg/gen/supportmessages/m_t_o_service_item_international_shuttle.go b/pkg/gen/supportmessages/m_t_o_service_item_international_shuttle.go index b2d55296186..8286a2e6dd6 100644 --- a/pkg/gen/supportmessages/m_t_o_service_item_international_shuttle.go +++ b/pkg/gen/supportmessages/m_t_o_service_item_international_shuttle.go @@ -38,7 +38,7 @@ type MTOServiceItemInternationalShuttle struct { // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` @@ -145,7 +145,7 @@ func (m *MTOServiceItemInternationalShuttle) UnmarshalJSON(raw []byte) error { // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` @@ -240,7 +240,7 @@ func (m MTOServiceItemInternationalShuttle) MarshalJSON() ([]byte, error) { // Example: 4000 ActualWeight *int64 `json:"actualWeight"` - // An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + // An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. // Example: 4200 EstimatedWeight *int64 `json:"estimatedWeight"` diff --git a/swagger-def/support.yaml b/swagger-def/support.yaml index 7a93893d31b..4a51027855d 100644 --- a/swagger-def/support.yaml +++ b/swagger-def/support.yaml @@ -1398,7 +1398,7 @@ definitions: estimatedWeight: type: integer example: 4200 - description: An estimate of how much weight from a shipment will be included in a shuttling (DDSHUT & DOSHUT) service item. + description: An estimate of how much weight from a shipment will be included in a shuttling (IDSHUT & IOSHUT) service item. x-nullable: true x-omitempty: false actualWeight: diff --git a/swagger/support.yaml b/swagger/support.yaml index db5d1367f89..adb2cb97f68 100644 --- a/swagger/support.yaml +++ b/swagger/support.yaml @@ -1513,7 +1513,7 @@ definitions: example: 4200 description: >- An estimate of how much weight from a shipment will be included in - a shuttling (DDSHUT & DOSHUT) service item. + a shuttling (IDSHUT & IOSHUT) service item. x-nullable: true x-omitempty: false actualWeight: From ff9411d36e036b624eecdf79a8550d9eb7dbc532 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Fri, 31 Jan 2025 18:17:50 +0000 Subject: [PATCH 126/260] Adding estimated price --- .../Office/ServiceItemDetails/ServiceItemDetails.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Office/ServiceItemDetails/ServiceItemDetails.jsx b/src/components/Office/ServiceItemDetails/ServiceItemDetails.jsx index 77d8870bf81..29b2fe49c89 100644 --- a/src/components/Office/ServiceItemDetails/ServiceItemDetails.jsx +++ b/src/components/Office/ServiceItemDetails/ServiceItemDetails.jsx @@ -490,6 +490,9 @@ const ServiceItemDetails = ({ id, code, details, serviceRequestDocs, shipment, s
{estimatedWeight}
estimated weight
+ {generateDetailText({ + 'Estimated Price': details.estimatedPrice ? toDollarString(formatCents(details.estimatedPrice)) : '-', + })} {generateDetailText({ Reason: details.reason })} {generateDetailText({ Market: details.market })} {details.rejectionReason && From e87e766cfacb191b359f6dfa2e738b407bef11e5 Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Fri, 31 Jan 2025 20:55:07 +0000 Subject: [PATCH 127/260] Long name scenario --- src/components/BulkAssignment/BulkAssignmentModal.module.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 1495e210ada..10072f9dfd6 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -2,8 +2,10 @@ .BulkModal { min-width: 650px !important; + max-width: 90vw; overflow-y: auto; max-height: 90vh; + overflow-x: hidden; button, :global(.usa-button){ From 23af78899a2655c041662fe2464b249da21cad5c Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Fri, 31 Jan 2025 21:54:00 +0000 Subject: [PATCH 128/260] Sizing of bulk assignment button --- src/components/Table/TableQueue.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Table/TableQueue.module.scss b/src/components/Table/TableQueue.module.scss index f9c0fdd7f88..47a1912d639 100644 --- a/src/components/Table/TableQueue.module.scss +++ b/src/components/Table/TableQueue.module.scss @@ -39,7 +39,7 @@ } .bulkModal { - padding: 10px; + padding: 10.787px; cursor: pointer; } From 4722713e3111810a715200f1371f129007c0bdee Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Mon, 3 Feb 2025 16:32:24 +0000 Subject: [PATCH 129/260] B-21943 - sitEntryDate cannot equal sitDepartureDate --- .../mto_service_item/mto_service_item_validators.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/services/mto_service_item/mto_service_item_validators.go b/pkg/services/mto_service_item/mto_service_item_validators.go index e6111caa531..aa09ffb0987 100644 --- a/pkg/services/mto_service_item/mto_service_item_validators.go +++ b/pkg/services/mto_service_item/mto_service_item_validators.go @@ -131,6 +131,7 @@ func (v *primeUpdateMTOServiceItemValidator) validate(appCtx appcontext.AppConte // Checks that the SITDepartureDate // - is not later than the authorized end date + // - is not earlier than the SIT entry date err = serviceItemData.checkSITDepartureDate(appCtx) if err != nil { return err @@ -466,6 +467,7 @@ func (v *updateMTOServiceItemData) checkSITEntryDateAndFADD(_ appcontext.AppCont // checkSITDepartureDate checks that the SITDepartureDate: // - is not later than the authorized end date +// - is not earlier than the SIT entry date func (v *updateMTOServiceItemData) checkSITDepartureDate(_ appcontext.AppContext) error { if v.updatedServiceItem.SITDepartureDate == nil || v.updatedServiceItem.SITDepartureDate == v.oldServiceItem.SITDepartureDate { return nil // the SITDepartureDate isn't being updated, so we're fine here @@ -485,9 +487,9 @@ func (v *updateMTOServiceItemData) checkSITDepartureDate(_ appcontext.AppContext if v.updatedServiceItem.SITEntryDate != nil { SITEntryDate = v.updatedServiceItem.SITEntryDate } - // Check that departure date is not before the current entry date - if v.updatedServiceItem.SITDepartureDate.Before(*SITEntryDate) { - v.verrs.Add("SITDepartureDate", "SIT departure date cannot be set before the SIT entry date.") + // Check that departure date is not before or equal to the current entry date + if v.updatedServiceItem.SITDepartureDate.Compare(*SITEntryDate) != 1 { + v.verrs.Add("SITDepartureDate", "SIT departure date cannot be set before or equal the SIT entry date.") } } return nil From 6f446ee9f7d209a536769461b287be3ded1305b6 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Mon, 3 Feb 2025 16:52:21 +0000 Subject: [PATCH 130/260] B-21943 - update validator test. --- .../mto_service_item_validators.go | 2 +- .../mto_service_item_validators_test.go | 58 +++++++++++++++++-- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/pkg/services/mto_service_item/mto_service_item_validators.go b/pkg/services/mto_service_item/mto_service_item_validators.go index aa09ffb0987..ade6c125fd2 100644 --- a/pkg/services/mto_service_item/mto_service_item_validators.go +++ b/pkg/services/mto_service_item/mto_service_item_validators.go @@ -489,7 +489,7 @@ func (v *updateMTOServiceItemData) checkSITDepartureDate(_ appcontext.AppContext } // Check that departure date is not before or equal to the current entry date if v.updatedServiceItem.SITDepartureDate.Compare(*SITEntryDate) != 1 { - v.verrs.Add("SITDepartureDate", "SIT departure date cannot be set before or equal the SIT entry date.") + v.verrs.Add("SITDepartureDate", "SIT departure date cannot be set before or equal to the SIT entry date.") } } return nil diff --git a/pkg/services/mto_service_item/mto_service_item_validators_test.go b/pkg/services/mto_service_item/mto_service_item_validators_test.go index 888c094becd..46cda067981 100644 --- a/pkg/services/mto_service_item/mto_service_item_validators_test.go +++ b/pkg/services/mto_service_item/mto_service_item_validators_test.go @@ -827,7 +827,7 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemData() { }, { Model: models.MTOServiceItem{ - SITEntryDate: &later, + SITEntryDate: &before, }, }, }, nil) @@ -848,11 +848,11 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemData() { suite.NoError(err) if tc.reServiceCode == models.ReServiceCodeDOPSIT { suite.True(mtoShipment.OriginSITAuthEndDate.Truncate(24 * time.Hour).Equal(postUpdateShipment.OriginSITAuthEndDate.Truncate(24 * time.Hour))) - suite.True(newSITServiceItem.SITEntryDate.Truncate(24 * time.Hour).After(postUpdateShipment.OriginSITAuthEndDate.Truncate(24 * time.Hour))) + suite.True(newSITServiceItem.SITDepartureDate.Truncate(24 * time.Hour).After(postUpdateShipment.OriginSITAuthEndDate.Truncate(24 * time.Hour))) } if tc.reServiceCode == models.ReServiceCodeDDDSIT { suite.True(mtoShipment.DestinationSITAuthEndDate.Truncate(24 * time.Hour).Equal(postUpdateShipment.DestinationSITAuthEndDate.Truncate(24 * time.Hour))) - suite.True(newSITServiceItem.SITEntryDate.Truncate(24 * time.Hour).After(postUpdateShipment.DestinationSITAuthEndDate.Truncate(24 * time.Hour))) + suite.True(newSITServiceItem.SITDepartureDate.Truncate(24 * time.Hour).After(postUpdateShipment.DestinationSITAuthEndDate.Truncate(24 * time.Hour))) } } @@ -903,7 +903,57 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemData() { suite.NoError(err) // Just verrs suite.True(serviceItemData.verrs.HasAny()) suite.Contains(serviceItemData.verrs.Keys(), "SITDepartureDate") - suite.Contains(serviceItemData.verrs.Get("SITDepartureDate"), "SIT departure date cannot be set before the SIT entry date.") + suite.Contains(serviceItemData.verrs.Get("SITDepartureDate"), "SIT departure date cannot be set before or equal to the SIT entry date.") + } + + }) + + suite.Run("SITDepartureDate - errors when set equal to the SIT entry date", func() { + mtoShipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: models.MTOShipment{OriginSITAuthEndDate: &now, + DestinationSITAuthEndDate: &now}, + }, + }, nil) + testCases := []struct { + reServiceCode models.ReServiceCode + }{ + { + reServiceCode: models.ReServiceCodeDOPSIT, + }, + { + reServiceCode: models.ReServiceCodeDDDSIT, + }, + } + for _, tc := range testCases { + oldSITServiceItem := factory.BuildMTOServiceItem(nil, []factory.Customization{ + { + Model: models.ReService{ + Code: tc.reServiceCode, + }, + }, + { + Model: mtoShipment, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + SITEntryDate: &now, + }, + }, + }, nil) + newSITServiceItem := oldSITServiceItem + newSITServiceItem.SITDepartureDate = &now + serviceItemData := updateMTOServiceItemData{ + updatedServiceItem: newSITServiceItem, + oldServiceItem: oldSITServiceItem, + verrs: validate.NewErrors(), + } + err := serviceItemData.checkSITDepartureDate(suite.AppContextForTest()) + suite.NoError(err) // Just verrs + suite.True(serviceItemData.verrs.HasAny()) + suite.Contains(serviceItemData.verrs.Keys(), "SITDepartureDate") + suite.Contains(serviceItemData.verrs.Get("SITDepartureDate"), "SIT departure date cannot be set before or equal to the SIT entry date.") } }) From b88811300b1fd0c79cc99fe9d9571dfbb3b8942c Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Mon, 3 Feb 2025 18:15:11 +0000 Subject: [PATCH 131/260] B-21943 - more readable check. --- pkg/services/mto_service_item/mto_service_item_validators.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/mto_service_item/mto_service_item_validators.go b/pkg/services/mto_service_item/mto_service_item_validators.go index ade6c125fd2..de67433f459 100644 --- a/pkg/services/mto_service_item/mto_service_item_validators.go +++ b/pkg/services/mto_service_item/mto_service_item_validators.go @@ -488,7 +488,7 @@ func (v *updateMTOServiceItemData) checkSITDepartureDate(_ appcontext.AppContext SITEntryDate = v.updatedServiceItem.SITEntryDate } // Check that departure date is not before or equal to the current entry date - if v.updatedServiceItem.SITDepartureDate.Compare(*SITEntryDate) != 1 { + if !v.updatedServiceItem.SITDepartureDate.After(*SITEntryDate) { v.verrs.Add("SITDepartureDate", "SIT departure date cannot be set before or equal to the SIT entry date.") } } From 73667815d471b5ddac3aec812518c010d68dc166 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Tue, 4 Feb 2025 15:18:40 +0000 Subject: [PATCH 132/260] Adding TIO flow test updates --- pkg/testdatagen/testharness/make_move.go | 42 +++++++++++++++++ .../office/txo/tioFlowsInternational.spec.js | 15 +++++- .../Office/ServiceItemCalculations/helpers.js | 46 +++++++++++++++++++ src/constants/serviceItems.js | 4 ++ 4 files changed, 105 insertions(+), 2 deletions(-) diff --git a/pkg/testdatagen/testharness/make_move.go b/pkg/testdatagen/testharness/make_move.go index 6a846830c6a..dd5a82b3618 100644 --- a/pkg/testdatagen/testharness/make_move.go +++ b/pkg/testdatagen/testharness/make_move.go @@ -9107,6 +9107,7 @@ func MakeBasicInternationalHHGMoveWithServiceItemsandPaymentRequestsForTIO(appCt ihpkCost := unit.Cents(298800) ihupkCost := unit.Cents(33280) poefscCost := unit.Cents(25000) + idshutCost := unit.Cents(623) // Create Customer userInfo := newUserInfo("customer") @@ -9441,6 +9442,47 @@ func MakeBasicInternationalHHGMoveWithServiceItemsandPaymentRequestsForTIO(appCt }, }, nil) + // Shuttling service item + approvedAtTime := time.Now() + idshut := factory.BuildMTOServiceItem(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &approvedAtTime, + EstimatedWeight: &estimatedWeight, + ActualWeight: &actualWeight, + }, + }, + { + Model: mto, + LinkOnly: true, + }, + { + Model: mtoShipmentHHG, + LinkOnly: true, + }, + { + Model: models.ReService{ + ID: uuid.FromStringOrNil("22fc07ed-be15-4f50-b941-cbd38153b378"), // IDSHUT - International Destination Shuttle + }, + }, + }, nil) + + factory.BuildPaymentServiceItemWithParams(appCtx.DB(), models.ReServiceCodeIDSHUT, + basicPaymentServiceItemParams, []factory.Customization{ + { + Model: models.PaymentServiceItem{ + PriceCents: &idshutCost, + }, + }, { + Model: paymentRequestHHG, + LinkOnly: true, + }, { + Model: idshut, + LinkOnly: true, + }, + }, nil) + basicPortFuelSurchargePaymentServiceItemParams := []factory.CreatePaymentServiceItemParams{ { Key: models.ServiceItemParamNameContractCode, diff --git a/playwright/tests/office/txo/tioFlowsInternational.spec.js b/playwright/tests/office/txo/tioFlowsInternational.spec.js index 2b97f19078b..9b09a053729 100644 --- a/playwright/tests/office/txo/tioFlowsInternational.spec.js +++ b/playwright/tests/office/txo/tioFlowsInternational.spec.js @@ -143,6 +143,17 @@ test.describe('TIO user', () => { await page.getByText('Next').click(); await tioFlowPage.slowDown(); + await expect(page.getByText('International destination shuttle service')).toBeVisible(); + await page.getByText('Show calculations').click(); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Calculations'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Billable weight (cwt)'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Destination price'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Price escalation factor'); + // approve + await tioFlowPage.approveServiceItem(); + await page.getByText('Next').click(); + await tioFlowPage.slowDown(); + await expect(page.getByText('International POE Fuel Surcharge')).toBeVisible(); await page.getByText('Show calculations').click(); await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Calculations'); @@ -159,8 +170,8 @@ test.describe('TIO user', () => { await expect(page.getByText('needs your review')).toHaveCount(0, { timeout: 10000 }); await page.getByText('Complete request').click(); - await expect(page.locator('[data-testid="requested"]')).toContainText('$4,281.48'); - await expect(page.locator('[data-testid="accepted"]')).toContainText('$4,281.48'); + await expect(page.locator('[data-testid="requested"]')).toContainText('$4,287.71'); + await expect(page.locator('[data-testid="accepted"]')).toContainText('$4,287.71'); await expect(page.locator('[data-testid="rejected"]')).toContainText('$0.00'); await page.getByText('Authorize payment').click(); diff --git a/src/components/Office/ServiceItemCalculations/helpers.js b/src/components/Office/ServiceItemCalculations/helpers.js index c5d26d73e75..638127266e4 100644 --- a/src/components/Office/ServiceItemCalculations/helpers.js +++ b/src/components/Office/ServiceItemCalculations/helpers.js @@ -368,6 +368,20 @@ const shuttleOriginPriceDomestic = (params) => { ); }; +const shuttleOriginPriceInternational = (params) => { + const value = getPriceRateOrFactor(params); + const label = SERVICE_ITEM_CALCULATION_LABELS.OriginPrice; + + const pickupDate = `${SERVICE_ITEM_CALCULATION_LABELS.PickupDate}: ${formatDateWithUTC( + getParamValue(SERVICE_ITEM_PARAM_KEYS.ReferenceDate, params), + 'DD MMM YYYY', + )}`; + + const market = getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketDest, params) === 'O' ? 'Oconus' : 'Conus'; + + return calculation(value, label, formatDetail(pickupDate), formatDetail(market)); +}; + // There is no param representing the destination price as available in the re_domestic_service_area_prices table // A param to return the service schedule is also not being created const destinationPrice = (params, shipmentType) => { @@ -406,6 +420,20 @@ const shuttleDestinationPriceDomestic = (params) => { ); }; +const shuttleDestinationPriceInternational = (params) => { + const value = getPriceRateOrFactor(params); + const label = SERVICE_ITEM_CALCULATION_LABELS.DestinationPrice; + + const deliveryDate = `${SERVICE_ITEM_CALCULATION_LABELS.DeliveryDate}: ${formatDateWithUTC( + getParamValue(SERVICE_ITEM_PARAM_KEYS.ReferenceDate, params), + 'DD MMM YYYY', + )}`; + + const market = getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketDest, params) === 'O' ? 'Oconus' : 'Conus'; + + return calculation(value, label, formatDetail(deliveryDate), formatDetail(market)); +}; + const priceEscalationFactor = (params) => { const value = getParamValue(SERVICE_ITEM_PARAM_KEYS.EscalationCompounded, params) ? getParamValue(SERVICE_ITEM_PARAM_KEYS.EscalationCompounded, params) @@ -851,6 +879,15 @@ export default function makeCalculations(itemCode, totalAmount, params, mtoParam totalAmountRequested(totalAmount), ]; break; + // International origin shuttle service + case SERVICE_ITEM_CODES.IOSHUT: + result = [ + shuttleBillableWeight(params), + shuttleOriginPriceInternational(params), + priceEscalationFactorWithoutContractYear(params), + totalAmountRequested(totalAmount), + ]; + break; // Domestic Destination Additional Days SIT case SERVICE_ITEM_CODES.DDASIT: result = [ @@ -879,6 +916,15 @@ export default function makeCalculations(itemCode, totalAmount, params, mtoParam totalAmountRequested(totalAmount), ]; break; + // International destination shuttle service + case SERVICE_ITEM_CODES.IDSHUT: + result = [ + shuttleBillableWeight(params), + shuttleDestinationPriceInternational(params), + priceEscalationFactorWithoutContractYear(params), + totalAmountRequested(totalAmount), + ]; + break; // Domestic crating case SERVICE_ITEM_CODES.DCRT: result = [ diff --git a/src/constants/serviceItems.js b/src/constants/serviceItems.js index 213afb45f38..06045545394 100644 --- a/src/constants/serviceItems.js +++ b/src/constants/serviceItems.js @@ -54,6 +54,8 @@ const SERVICE_ITEM_PARAM_KEYS = { StandaloneCrate: 'StandaloneCrate', StandaloneCrateCap: 'StandaloneCrateCap', UncappedRequestTotal: 'UncappedRequestTotal', + MarketOrigin: 'MarketOrigin', + MarketDest: 'MarketDest', }; const SERVICE_ITEM_CALCULATION_LABELS = { @@ -219,12 +221,14 @@ const allowedServiceItemCalculations = [ SERVICE_ITEM_CODES.DOP, SERVICE_ITEM_CODES.DOPSIT, SERVICE_ITEM_CODES.DOSHUT, + SERVICE_ITEM_CODES.IOSHUT, SERVICE_ITEM_CODES.DPK, SERVICE_ITEM_CODES.DNPK, SERVICE_ITEM_CODES.DSH, SERVICE_ITEM_CODES.DUPK, SERVICE_ITEM_CODES.FSC, SERVICE_ITEM_CODES.DDSHUT, + SERVICE_ITEM_CODES.IDSHUT, SERVICE_ITEM_CODES.DCRT, SERVICE_ITEM_CODES.DUCRT, SERVICE_ITEM_CODES.DOSFSC, From e7ac938c523dc14c26d685a8ff04b759e3fd888e Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Tue, 4 Feb 2025 22:06:24 +0000 Subject: [PATCH 133/260] Vertical alignment for numbers --- src/components/BulkAssignment/BulkAssignmentModal.module.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 10072f9dfd6..8237727d049 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -24,6 +24,7 @@ } .BulkAssignmentDataCenter { text-align: center; + padding-top: 15px; } .BulkAssignmentAssignment { width: 60px; From fb05e7f893a3316d2eb8e5016af03b4c951ddee7 Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Tue, 4 Feb 2025 22:46:48 +0000 Subject: [PATCH 134/260] linting issue after merge conflict --- src/utils/formatters.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/formatters.js b/src/utils/formatters.js index 60d14e841f2..d22593bf028 100644 --- a/src/utils/formatters.js +++ b/src/utils/formatters.js @@ -643,4 +643,4 @@ export function formatPortInfo(port) { return `${port.portCode} - ${port.portName}\n${formattedCity}, ${formattedState} ${port.zip}`; } return '-'; -} \ No newline at end of file +} From 9d0c850a7e8c0b30d3cff5d11973ba8d609876b2 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Wed, 5 Feb 2025 19:27:48 +0000 Subject: [PATCH 135/260] Updating test --- pkg/testdatagen/testharness/dispatch.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/testdatagen/testharness/dispatch.go b/pkg/testdatagen/testharness/dispatch.go index 0ed11caf74a..d86597d175d 100644 --- a/pkg/testdatagen/testharness/dispatch.go +++ b/pkg/testdatagen/testharness/dispatch.go @@ -104,6 +104,9 @@ var actionDispatcher = map[string]actionFunc{ "HHGMoveWithIntlCratingServiceItemsTOO": func(appCtx appcontext.AppContext) testHarnessResponse { return MakeHHGMoveWithIntlCratingServiceItemsTOO(appCtx) }, + "HHGMoveWithIntlShuttleServiceItemsTOO": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeHHGMoveWithIntlShuttleServiceItemsTOO(appCtx) + }, "HHGMoveForTOOAfterActualPickupDate": func(appCtx appcontext.AppContext) testHarnessResponse { return MakeHHGMoveForTOOAfterActualPickupDate(appCtx) }, From 50d3acfb066f6b9d50aa769474fa4b4fba8bb1ee Mon Sep 17 00:00:00 2001 From: Tae Jung Date: Wed, 5 Feb 2025 19:46:07 +0000 Subject: [PATCH 136/260] updates for intl crating and uncrating pricing --- migrations/app/migrations_manifest.txt | 2 + ...t_params_for_intl_crating_uncrating.up.sql | 28 ++ ...orial_service_item_proc_for_crating.up.sql | 131 ++++++ pkg/gen/primeapi/embedded_spec.go | 136 ++++++- .../update_m_t_o_service_item.go | 25 ++ .../mto_service_item_client.go | 25 ++ .../update_m_t_o_service_item.go | 6 + .../update_m_t_o_service_item_crating.go | 377 ++++++++++++++++++ .../update_m_t_o_service_item_model_type.go | 7 +- pkg/models/mto_service_items.go | 13 +- pkg/models/re_intl_accessorial_price.go | 22 +- pkg/models/service_item_param_key.go | 4 + .../cubic_feet_billed_lookup.go | 8 +- .../cubic_feet_billed_lookup_test.go | 123 +++++- .../external_crate_lookup.go | 22 + .../external_crate_lookup_test.go | 50 +++ .../service_param_value_lookups.go | 8 +- pkg/services/ghc_rate_engine.go | 16 + .../ghcrateengine/intl_crating_pricer.go | 66 +++ .../ghcrateengine/intl_crating_pricer_test.go | 136 +++++++ .../ghcrateengine/intl_uncrating_pricer.go | 50 +++ .../intl_uncrating_pricer_test.go | 102 +++++ .../ghcrateengine/pricer_helpers_intl.go | 60 +++ .../ghcrateengine/pricer_helpers_intl_test.go | 55 +++ .../ghcrateengine/service_item_pricer.go | 4 + .../ghcrateengine/service_item_pricer_test.go | 2 + .../mto_service_item_validators.go | 2 + swagger-def/prime.yaml | 66 +++ swagger/prime.yaml | 76 ++++ 29 files changed, 1598 insertions(+), 24 deletions(-) create mode 100644 migrations/app/schema/20250110201339_add_payment_params_for_intl_crating_uncrating.up.sql create mode 100644 migrations/app/schema/20250204162411_updating_create_accessorial_service_item_proc_for_crating.up.sql create mode 100644 pkg/gen/primemessages/update_m_t_o_service_item_crating.go create mode 100644 pkg/payment_request/service_param_value_lookups/external_crate_lookup.go create mode 100644 pkg/payment_request/service_param_value_lookups/external_crate_lookup_test.go create mode 100644 pkg/services/ghcrateengine/intl_crating_pricer.go create mode 100644 pkg/services/ghcrateengine/intl_crating_pricer_test.go create mode 100644 pkg/services/ghcrateengine/intl_uncrating_pricer.go create mode 100644 pkg/services/ghcrateengine/intl_uncrating_pricer_test.go diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt index 8b547c35245..e9324285a92 100644 --- a/migrations/app/migrations_manifest.txt +++ b/migrations/app/migrations_manifest.txt @@ -1074,6 +1074,7 @@ 20250103180420_update_pricing_proc_to_use_local_price_variable.up.sql 20250110001339_update_nts_release_enum_name.up.sql 20250110153428_add_shipment_address_updates_to_move_history.up.sql +20250110201339_add_payment_params_for_intl_crating_uncrating.up.sql 20250110214012_homesafeconnect_cert.up.sql 20250113152050_rename_ubp.up.sql 20250113160816_updating_create_accessorial_service_item_proc.up.sql @@ -1081,3 +1082,4 @@ 20250116200912_disable_homesafe_stg_cert.up.sql 20250120144247_update_pricing_proc_to_use_110_percent_weight.up.sql 20250121153007_update_pricing_proc_to_handle_international_shuttle.up.sql +20250204162411_updating_create_accessorial_service_item_proc_for_crating.up.sql diff --git a/migrations/app/schema/20250110201339_add_payment_params_for_intl_crating_uncrating.up.sql b/migrations/app/schema/20250110201339_add_payment_params_for_intl_crating_uncrating.up.sql new file mode 100644 index 00000000000..dedc7e9637d --- /dev/null +++ b/migrations/app/schema/20250110201339_add_payment_params_for_intl_crating_uncrating.up.sql @@ -0,0 +1,28 @@ +-- adding ExternalCrate param key for intl crating +INSERT INTO service_item_param_keys +(id,key,description,type,origin,created_at,updated_at) +VALUES +('7bb4a8eb-7fff-4e02-8809-f2def00af455','ExternalCrate', 'True if this an external crate', 'BOOLEAN', 'PRIME', now(), now()); + + +-- ICRT +INSERT INTO service_params +(id,service_id,service_item_param_key_id,created_at,updated_at,is_optional) +VALUES +('2ee4d131-041f-498e-b921-cc77970341e9', (SELECT id FROM re_services WHERE code='ICRT'), (SELECT id FROM service_item_param_keys WHERE key='ContractCode'), now(), now(), 'false'), +('bd36234a-090e-4c06-a478-8194c3a78f82', (SELECT id FROM re_services WHERE code='ICRT'), (SELECT id FROM service_item_param_keys WHERE key='ContractYearName'), now(), now(), 'false'), +('bdcda078-6007-48d3-9c1a-16a1ae54dc69', (SELECT id FROM re_services WHERE code='ICRT'), (SELECT id FROM service_item_param_keys WHERE key='EscalationCompounded'), now(), now(), 'false'), +('c6f982f5-d603-43e7-94ed-15ae6e703f86', (SELECT id FROM re_services WHERE code='ICRT'), (SELECT id FROM service_item_param_keys WHERE key='PriceRateOrFactor'), now(), now(), 'false'), +('b323a481-3591-4609-84a5-5a1e8a56a51a', (SELECT id FROM re_services WHERE code='ICRT'), (SELECT id FROM service_item_param_keys WHERE key='StandaloneCrate'), now(), now(), 'true'), +('7fb5a389-bfd7-44d5-a8ff-ef784d37a6a1', (SELECT id FROM re_services WHERE code='ICRT'), (SELECT id FROM service_item_param_keys WHERE key='StandaloneCrateCap'), now(), now(), 'true'), +('3ca76951-c612-491f-ac9a-ad73c1129c99', (SELECT id FROM re_services WHERE code='ICRT'), (SELECT id FROM service_item_param_keys WHERE key='UncappedRequestTotal'), now(), now(), 'true'), +('d486a522-3fa3-45b2-9749-827c40b002b0', (SELECT id FROM re_services WHERE code='ICRT'), (SELECT id FROM service_item_param_keys where key='ExternalCrate'), now(), now(), 'true'); + +-- IUCRT +INSERT INTO service_params +(id,service_id,service_item_param_key_id,created_at,updated_at) +VALUES +('b4619dc8-d1ba-4f85-a198-e985ae80e614', (SELECT id FROM re_services WHERE code='IUCRT'), (SELECT id FROM service_item_param_keys WHERE key='ContractCode'), now(), now()), +('d5d7fc34-2b48-4f99-b053-9d118171f202', (SELECT id FROM re_services WHERE code='IUCRT'), (SELECT id FROM service_item_param_keys WHERE key='ContractYearName'), now(), now()), +('2272b490-ffd0-4b24-8ae1-38019dc5c67d', (SELECT id FROM re_services WHERE code='IUCRT'), (SELECT id FROM service_item_param_keys WHERE key='EscalationCompounded'), now(), now()), +('5fd0739b-695a-4d96-9c5a-f048dfaa8f0c', (SELECT id FROM re_services WHERE code='IUCRT'), (SELECT id FROM service_item_param_keys WHERE key='PriceRateOrFactor'), now(), now()); \ No newline at end of file diff --git a/migrations/app/schema/20250204162411_updating_create_accessorial_service_item_proc_for_crating.up.sql b/migrations/app/schema/20250204162411_updating_create_accessorial_service_item_proc_for_crating.up.sql new file mode 100644 index 00000000000..135a027eecd --- /dev/null +++ b/migrations/app/schema/20250204162411_updating_create_accessorial_service_item_proc_for_crating.up.sql @@ -0,0 +1,131 @@ +DO ' +BEGIN + IF EXISTS (SELECT 1 FROM pg_type WHERE typname = ''mto_service_item_type'') THEN + IF NOT EXISTS ( + SELECT 1 FROM pg_attribute + WHERE attrelid = ''mto_service_item_type''::regtype + AND attname = ''external_crate'' + ) THEN + ALTER TYPE mto_service_item_type ADD ATTRIBUTE "external_crate" bool; + END IF; + END IF; +END +'; + +-- added external_crate +CREATE OR REPLACE PROCEDURE create_accessorial_service_items_for_shipment ( + IN shipment_id UUID, + IN service_items mto_service_item_type[], + INOUT created_service_item_ids text[] +) AS ' +DECLARE + s_type mto_shipment_type; + m_code market_code_enum; + move_id UUID; + service_item RECORD; + item mto_service_item_type; + new_service_id text; +BEGIN + -- get the shipment type, market code, and move_id based on shipment_id + SELECT ms.shipment_type, ms.market_code, ms.move_id + INTO s_type, m_code, move_id + FROM mto_shipments ms + WHERE ms.id = shipment_id; + + IF s_type IS NULL OR m_code IS NULL THEN + RAISE EXCEPTION ''Shipment with ID % not found or missing required details.'', shipment_id; + END IF; + + -- loop through each provided service item object + FOREACH item IN ARRAY service_items + LOOP + FOR service_item IN + SELECT rsi.id, + rs.id AS re_service_id, + rs.service_location, + rsi.is_auto_approved, + rs.code AS service_code + FROM re_service_items rsi + JOIN re_services rs ON rsi.service_id = rs.id + WHERE rsi.shipment_type = s_type + AND rsi.market_code = m_code + AND rs.code = (item.re_service_code) + AND rsi.is_auto_approved = false + LOOP + BEGIN + -- International crating/uncrating will not have the SI update functionality. + -- Prime should to be able to create multiple crating SI for now. + IF service_item.service_code IN (''ICRT'', ''IUCRT'') OR (NOT does_service_item_exist(service_item.re_service_id, shipment_id)) THEN + + INSERT INTO mto_service_items ( + mto_shipment_id, + move_id, + re_service_id, + service_location, + status, + created_at, + updated_at, + sit_postal_code, + sit_entry_date, + sit_customer_contacted, + reason, + estimated_weight, + actual_weight, + pickup_postal_code, + description, + sit_destination_original_address_id, + sit_destination_final_address_id, + sit_requested_delivery, + sit_departure_date, + sit_origin_hhg_original_address_id, + sit_origin_hhg_actual_address_id, + customer_expense, + customer_expense_reason, + sit_delivery_miles, + standalone_crate, + external_crate + ) + VALUES ( + shipment_id, + move_id, + service_item.re_service_id, + service_item.service_location, + ''SUBMITTED''::service_item_status, + NOW(), + NOW(), + (item).sit_postal_code, + (item).sit_entry_date, + (item).sit_customer_contacted, + (item).reason, + (item).estimated_weight, + (item).actual_weight, + (item).pickup_postal_code, + (item).description, + (item).sit_destination_original_address_id, + (item).sit_destination_final_address_id, + (item).sit_requested_delivery, + (item).sit_departure_date, + (item).sit_origin_hhg_original_address_id, + (item).sit_origin_hhg_actual_address_id, + (item).customer_expense, + (item).customer_expense_reason, + (item).sit_delivery_miles, + (item).standalone_crate, + (item).external_crate + ) RETURNING id INTO new_service_id; + + created_service_item_ids := array_append(created_service_item_ids, new_service_id); + + END IF; + EXCEPTION + WHEN OTHERS THEN + RAISE EXCEPTION ''Error creating accessorial service item with code % for shipment %: %'', + service_item.service_code, shipment_id, SQLERRM; + END; + END LOOP; + END LOOP; + + UPDATE moves SET status = ''APPROVALS REQUESTED'' WHERE id = move_id; +END; +' +LANGUAGE plpgsql; \ No newline at end of file diff --git a/pkg/gen/primeapi/embedded_spec.go b/pkg/gen/primeapi/embedded_spec.go index ab7b9225ce4..dc23907a672 100644 --- a/pkg/gen/primeapi/embedded_spec.go +++ b/pkg/gen/primeapi/embedded_spec.go @@ -355,7 +355,7 @@ func init() { }, "/mto-service-items/{mtoServiceItemID}": { "patch": { - "description": "Updates MTOServiceItems after creation. Not all service items or fields may be updated, please see details below.\n\nThis endpoint supports different body definitions. In the modelType field below, select the modelType corresponding\n to the service item you wish to update and the documentation will update with the new definition.\n\n* Addresses: To update a destination service item's SIT destination final address, update the shipment delivery address.\nFor approved shipments, please use [updateShipmentDestinationAddress](#mtoShipment/updateShipmentDestinationAddress).\nFor shipments not yet approved, please use [updateMTOShipmentAddress](#mtoShipment/updateMTOShipmentAddress).\n\n* SIT Service Items: Take note that when updating ` + "`" + `sitCustomerContacted` + "`" + `, ` + "`" + `sitDepartureDate` + "`" + `, or ` + "`" + `sitRequestedDelivery` + "`" + `, we want\nthose to be updated on ` + "`" + `DOASIT` + "`" + ` (for origin SIT) and ` + "`" + `DDASIT` + "`" + ` (for destination SIT). If updating those values in other service\nitems, the office users will not have as much attention to those values.\n\nTo create a service item, please use [createMTOServiceItem](#mtoServiceItem/createMTOServiceItem)) endpoint.\n\n* Resubmitting rejected SIT/Accessorial service items: This endpoint will handle the logic of changing the status of rejected SIT/Accessorial service items from\nREJECTED to SUBMITTED. Please provide the ` + "`" + `requestedApprovalsRequestedStatus: true` + "`" + ` when resubmitting as this will give attention to the TOO to\nreview the resubmitted SIT/Accessorial service item. Another note, ` + "`" + `updateReason` + "`" + ` must have a different value than the current ` + "`" + `reason` + "`" + ` value on the service item.\nIf this value is not updated, then an error will be sent back.\n\nThe following SIT service items can be resubmitted following a rejection:\n- DDASIT\n- DDDSIT\n- DDFSIT\n- DOASIT\n- DOPSIT\n- DOFSIT\n- DDSFSC\n- DOSFSC\n\nThe following Accessorial service items can be resubmitted following a rejection:\n- IOSHUT\n- IDSHUT\n\nAt a MINIMUM, the payload for resubmitting a rejected SIT/Accessorial service item must look like this:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"reServiceCode\": \"DDFSIT\",\n \"updateReason\": \"A reason that differs from the previous reason\",\n \"modelType\": \"UpdateMTOServiceItemSIT\",\n \"requestApprovalsRequestedStatus\": true\n}\n` + "`" + `` + "`" + `` + "`" + `\n\nThe following service items allow you to update the Port that the shipment will use:\n- PODFSC (Port of Debarkation can be updated)\n- POEFSC (Port of Embarkation can be updated)\n\nAt a MINIMUM, the payload for updating the port should contain the reServiceCode (PODFSC or POEFSC), modelType (UpdateMTOServiceItemInternationalPortFSC), portCode, and id for the service item.\nPlease see the example payload below:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"id\": \"1ed224b6-c65e-4616-b88e-8304d26c9562\",\n \"modelType\": \"UpdateMTOServiceItemInternationalPortFSC\",\n \"portCode\": \"SEA\",\n \"reServiceCode\": \"POEFSC\"\n}\n` + "`" + `` + "`" + `` + "`" + `\n", + "description": "Updates MTOServiceItems after creation. Not all service items or fields may be updated, please see details below.\n\nThis endpoint supports different body definitions. In the modelType field below, select the modelType corresponding\n to the service item you wish to update and the documentation will update with the new definition.\n\n* Addresses: To update a destination service item's SIT destination final address, update the shipment delivery address.\nFor approved shipments, please use [updateShipmentDestinationAddress](#mtoShipment/updateShipmentDestinationAddress).\nFor shipments not yet approved, please use [updateMTOShipmentAddress](#mtoShipment/updateMTOShipmentAddress).\n\n* SIT Service Items: Take note that when updating ` + "`" + `sitCustomerContacted` + "`" + `, ` + "`" + `sitDepartureDate` + "`" + `, or ` + "`" + `sitRequestedDelivery` + "`" + `, we want\nthose to be updated on ` + "`" + `DOASIT` + "`" + ` (for origin SIT) and ` + "`" + `DDASIT` + "`" + ` (for destination SIT). If updating those values in other service\nitems, the office users will not have as much attention to those values.\n\nTo create a service item, please use [createMTOServiceItem](#mtoServiceItem/createMTOServiceItem)) endpoint.\n\n* Resubmitting rejected SIT/Accessorial service items: This endpoint will handle the logic of changing the status of rejected SIT/Accessorial service items from\nREJECTED to SUBMITTED. Please provide the ` + "`" + `requestedApprovalsRequestedStatus: true` + "`" + ` when resubmitting as this will give attention to the TOO to\nreview the resubmitted SIT/Accessorial service item. Another note, ` + "`" + `updateReason` + "`" + ` must have a different value than the current ` + "`" + `reason` + "`" + ` value on the service item.\nIf this value is not updated, then an error will be sent back.\n\nThe following SIT service items can be resubmitted following a rejection:\n- DDASIT\n- DDDSIT\n- DDFSIT\n- DOASIT\n- DOPSIT\n- DOFSIT\n- DDSFSC\n- DOSFSC\n\nThe following Accessorial service items can be resubmitted following a rejection:\n- IOSHUT\n- IDSHUT\n\nAt a MINIMUM, the payload for resubmitting a rejected SIT/Accessorial service item must look like this:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"reServiceCode\": \"DDFSIT\",\n \"updateReason\": \"A reason that differs from the previous reason\",\n \"modelType\": \"UpdateMTOServiceItemSIT\",\n \"requestApprovalsRequestedStatus\": true\n}\n` + "`" + `` + "`" + `` + "`" + `\n\nThe following service items allow you to update the Port that the shipment will use:\n- PODFSC (Port of Debarkation can be updated)\n- POEFSC (Port of Embarkation can be updated)\n\nAt a MINIMUM, the payload for updating the port should contain the reServiceCode (PODFSC or POEFSC), modelType (UpdateMTOServiceItemInternationalPortFSC), portCode, and id for the service item.\nPlease see the example payload below:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"id\": \"1ed224b6-c65e-4616-b88e-8304d26c9562\",\n \"modelType\": \"UpdateMTOServiceItemInternationalPortFSC\",\n \"portCode\": \"SEA\",\n \"reServiceCode\": \"POEFSC\"\n}\n` + "`" + `` + "`" + `` + "`" + `\n\nThe following crating/uncrating service items can be resubmitted following a rejection:\n- ICRT\n- IUCRT\n\nAt a MINIMUM, the payload for resubmitting a rejected crating/uncrating service item must look like this:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"item\": {\n \"length\": 10000,\n \"width\": 10000,\n \"height\": 10000\n },\n \"crate\": {\n \"length\": 20000,\n \"width\": 20000,\n \"height\": 20000\n },\n \"updateReason\": \"A reason that differs from the previous reason\",\n \"modelType\": \"UpdateMTOServiceItemCrating\",\n \"requestApprovalsRequestedStatus\": true\n}\n` + "`" + `` + "`" + `` + "`" + `\n", "consumes": [ "application/json" ], @@ -4063,6 +4063,67 @@ func init() { }, "discriminator": "modelType" }, + "UpdateMTOServiceItemCrating": { + "description": "Subtype used to provide the size and types for crating. This is not creating a new service item but rather updating an existing service item.\n", + "allOf": [ + { + "$ref": "#/definitions/UpdateMTOServiceItem" + }, + { + "type": "object", + "properties": { + "crate": { + "description": "The dimensions for the crate the item will be shipped in.", + "allOf": [ + { + "$ref": "#/definitions/MTOServiceItemDimension" + } + ] + }, + "description": { + "description": "A description of the item being crated.", + "type": "string", + "x-nullable": true, + "example": "Decorated horse head to be crated." + }, + "externalCrate": { + "type": "boolean", + "x-nullable": true + }, + "item": { + "description": "The dimensions of the item being crated.", + "allOf": [ + { + "$ref": "#/definitions/MTOServiceItemDimension" + } + ] + }, + "reServiceCode": { + "description": "Service code allowed for this model type.", + "type": "string", + "enum": [ + "ICRT", + "IUCRT" + ] + }, + "requestApprovalsRequestedStatus": { + "description": "Indicates if \"Approvals Requested\" status is being requested.", + "type": "boolean", + "x-nullable": true + }, + "standaloneCrate": { + "type": "boolean", + "x-nullable": true + }, + "updateReason": { + "description": "Reason for updating service item.", + "type": "string", + "x-nullable": true + } + } + } + ] + }, "UpdateMTOServiceItemInternationalPortFSC": { "description": "Subtype used to provide the port for fuel surcharge. This is not creating a new service item but rather updating an existing service item.\n", "allOf": [ @@ -4132,13 +4193,14 @@ func init() { ] }, "UpdateMTOServiceItemModelType": { - "description": "Using this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DDDSIT - UpdateMTOServiceItemSIT\n * DDFSIT - UpdateMTOServiceItemSIT\n * DDASIT - UpdateMTOServiceItemSIT\n * DOPSIT - UpdateMTOServiceItemSIT\n * DOASIT - UpdateMTOServiceItemSIT\n * DOFSIT - UpdateMTOServiceItemSIT\n * DOSFSC - UpdateMTOServiceItemSIT\n * DDSFSC - UpdateMTOServiceItemSIT\n * DDSHUT - UpdateMTOServiceItemShuttle\n * DOSHUT - UpdateMTOServiceItemShuttle\n * PODFSC - UpdateMTOServiceItemInternationalPortFSC\n * POEFSC - UpdateMTOServiceItemInternationalPortFSC\n * IDSHUT - UpdateMTOServiceItemInternationalShuttle\n * IOSHUT - UpdateMTOServiceItemInternationalShuttle\n\nThe documentation will then update with the supported fields.\n", + "description": "Using this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DDDSIT - UpdateMTOServiceItemSIT\n * DDFSIT - UpdateMTOServiceItemSIT\n * DDASIT - UpdateMTOServiceItemSIT\n * DOPSIT - UpdateMTOServiceItemSIT\n * DOASIT - UpdateMTOServiceItemSIT\n * DOFSIT - UpdateMTOServiceItemSIT\n * DOSFSC - UpdateMTOServiceItemSIT\n * DDSFSC - UpdateMTOServiceItemSIT\n * DDSHUT - UpdateMTOServiceItemShuttle\n * DOSHUT - UpdateMTOServiceItemShuttle\n * PODFSC - UpdateMTOServiceItemInternationalPortFSC\n * POEFSC - UpdateMTOServiceItemInternationalPortFSC\n * IDSHUT - UpdateMTOServiceItemInternationalShuttle\n * IOSHUT - UpdateMTOServiceItemInternationalShuttle\n * ICRT - UpdateMTOServiceItemCrating\n * IUCRT - UpdateMTOServiceItemCrating\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "UpdateMTOServiceItemSIT", "UpdateMTOServiceItemShuttle", "UpdateMTOServiceItemInternationalPortFSC", - "UpdateMTOServiceItemInternationalShuttle" + "UpdateMTOServiceItemInternationalShuttle", + "UpdateMTOServiceItemCrating" ] }, "UpdateMTOServiceItemSIT": { @@ -5151,7 +5213,7 @@ func init() { }, "/mto-service-items/{mtoServiceItemID}": { "patch": { - "description": "Updates MTOServiceItems after creation. Not all service items or fields may be updated, please see details below.\n\nThis endpoint supports different body definitions. In the modelType field below, select the modelType corresponding\n to the service item you wish to update and the documentation will update with the new definition.\n\n* Addresses: To update a destination service item's SIT destination final address, update the shipment delivery address.\nFor approved shipments, please use [updateShipmentDestinationAddress](#mtoShipment/updateShipmentDestinationAddress).\nFor shipments not yet approved, please use [updateMTOShipmentAddress](#mtoShipment/updateMTOShipmentAddress).\n\n* SIT Service Items: Take note that when updating ` + "`" + `sitCustomerContacted` + "`" + `, ` + "`" + `sitDepartureDate` + "`" + `, or ` + "`" + `sitRequestedDelivery` + "`" + `, we want\nthose to be updated on ` + "`" + `DOASIT` + "`" + ` (for origin SIT) and ` + "`" + `DDASIT` + "`" + ` (for destination SIT). If updating those values in other service\nitems, the office users will not have as much attention to those values.\n\nTo create a service item, please use [createMTOServiceItem](#mtoServiceItem/createMTOServiceItem)) endpoint.\n\n* Resubmitting rejected SIT/Accessorial service items: This endpoint will handle the logic of changing the status of rejected SIT/Accessorial service items from\nREJECTED to SUBMITTED. Please provide the ` + "`" + `requestedApprovalsRequestedStatus: true` + "`" + ` when resubmitting as this will give attention to the TOO to\nreview the resubmitted SIT/Accessorial service item. Another note, ` + "`" + `updateReason` + "`" + ` must have a different value than the current ` + "`" + `reason` + "`" + ` value on the service item.\nIf this value is not updated, then an error will be sent back.\n\nThe following SIT service items can be resubmitted following a rejection:\n- DDASIT\n- DDDSIT\n- DDFSIT\n- DOASIT\n- DOPSIT\n- DOFSIT\n- DDSFSC\n- DOSFSC\n\nThe following Accessorial service items can be resubmitted following a rejection:\n- IOSHUT\n- IDSHUT\n\nAt a MINIMUM, the payload for resubmitting a rejected SIT/Accessorial service item must look like this:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"reServiceCode\": \"DDFSIT\",\n \"updateReason\": \"A reason that differs from the previous reason\",\n \"modelType\": \"UpdateMTOServiceItemSIT\",\n \"requestApprovalsRequestedStatus\": true\n}\n` + "`" + `` + "`" + `` + "`" + `\n\nThe following service items allow you to update the Port that the shipment will use:\n- PODFSC (Port of Debarkation can be updated)\n- POEFSC (Port of Embarkation can be updated)\n\nAt a MINIMUM, the payload for updating the port should contain the reServiceCode (PODFSC or POEFSC), modelType (UpdateMTOServiceItemInternationalPortFSC), portCode, and id for the service item.\nPlease see the example payload below:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"id\": \"1ed224b6-c65e-4616-b88e-8304d26c9562\",\n \"modelType\": \"UpdateMTOServiceItemInternationalPortFSC\",\n \"portCode\": \"SEA\",\n \"reServiceCode\": \"POEFSC\"\n}\n` + "`" + `` + "`" + `` + "`" + `\n", + "description": "Updates MTOServiceItems after creation. Not all service items or fields may be updated, please see details below.\n\nThis endpoint supports different body definitions. In the modelType field below, select the modelType corresponding\n to the service item you wish to update and the documentation will update with the new definition.\n\n* Addresses: To update a destination service item's SIT destination final address, update the shipment delivery address.\nFor approved shipments, please use [updateShipmentDestinationAddress](#mtoShipment/updateShipmentDestinationAddress).\nFor shipments not yet approved, please use [updateMTOShipmentAddress](#mtoShipment/updateMTOShipmentAddress).\n\n* SIT Service Items: Take note that when updating ` + "`" + `sitCustomerContacted` + "`" + `, ` + "`" + `sitDepartureDate` + "`" + `, or ` + "`" + `sitRequestedDelivery` + "`" + `, we want\nthose to be updated on ` + "`" + `DOASIT` + "`" + ` (for origin SIT) and ` + "`" + `DDASIT` + "`" + ` (for destination SIT). If updating those values in other service\nitems, the office users will not have as much attention to those values.\n\nTo create a service item, please use [createMTOServiceItem](#mtoServiceItem/createMTOServiceItem)) endpoint.\n\n* Resubmitting rejected SIT/Accessorial service items: This endpoint will handle the logic of changing the status of rejected SIT/Accessorial service items from\nREJECTED to SUBMITTED. Please provide the ` + "`" + `requestedApprovalsRequestedStatus: true` + "`" + ` when resubmitting as this will give attention to the TOO to\nreview the resubmitted SIT/Accessorial service item. Another note, ` + "`" + `updateReason` + "`" + ` must have a different value than the current ` + "`" + `reason` + "`" + ` value on the service item.\nIf this value is not updated, then an error will be sent back.\n\nThe following SIT service items can be resubmitted following a rejection:\n- DDASIT\n- DDDSIT\n- DDFSIT\n- DOASIT\n- DOPSIT\n- DOFSIT\n- DDSFSC\n- DOSFSC\n\nThe following Accessorial service items can be resubmitted following a rejection:\n- IOSHUT\n- IDSHUT\n\nAt a MINIMUM, the payload for resubmitting a rejected SIT/Accessorial service item must look like this:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"reServiceCode\": \"DDFSIT\",\n \"updateReason\": \"A reason that differs from the previous reason\",\n \"modelType\": \"UpdateMTOServiceItemSIT\",\n \"requestApprovalsRequestedStatus\": true\n}\n` + "`" + `` + "`" + `` + "`" + `\n\nThe following service items allow you to update the Port that the shipment will use:\n- PODFSC (Port of Debarkation can be updated)\n- POEFSC (Port of Embarkation can be updated)\n\nAt a MINIMUM, the payload for updating the port should contain the reServiceCode (PODFSC or POEFSC), modelType (UpdateMTOServiceItemInternationalPortFSC), portCode, and id for the service item.\nPlease see the example payload below:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"id\": \"1ed224b6-c65e-4616-b88e-8304d26c9562\",\n \"modelType\": \"UpdateMTOServiceItemInternationalPortFSC\",\n \"portCode\": \"SEA\",\n \"reServiceCode\": \"POEFSC\"\n}\n` + "`" + `` + "`" + `` + "`" + `\n\nThe following crating/uncrating service items can be resubmitted following a rejection:\n- ICRT\n- IUCRT\n\nAt a MINIMUM, the payload for resubmitting a rejected crating/uncrating service item must look like this:\n` + "`" + `` + "`" + `` + "`" + `json\n{\n \"item\": {\n \"length\": 10000,\n \"width\": 10000,\n \"height\": 10000\n },\n \"crate\": {\n \"length\": 20000,\n \"width\": 20000,\n \"height\": 20000\n },\n \"updateReason\": \"A reason that differs from the previous reason\",\n \"modelType\": \"UpdateMTOServiceItemCrating\",\n \"requestApprovalsRequestedStatus\": true\n}\n` + "`" + `` + "`" + `` + "`" + `\n", "consumes": [ "application/json" ], @@ -9139,6 +9201,67 @@ func init() { }, "discriminator": "modelType" }, + "UpdateMTOServiceItemCrating": { + "description": "Subtype used to provide the size and types for crating. This is not creating a new service item but rather updating an existing service item.\n", + "allOf": [ + { + "$ref": "#/definitions/UpdateMTOServiceItem" + }, + { + "type": "object", + "properties": { + "crate": { + "description": "The dimensions for the crate the item will be shipped in.", + "allOf": [ + { + "$ref": "#/definitions/MTOServiceItemDimension" + } + ] + }, + "description": { + "description": "A description of the item being crated.", + "type": "string", + "x-nullable": true, + "example": "Decorated horse head to be crated." + }, + "externalCrate": { + "type": "boolean", + "x-nullable": true + }, + "item": { + "description": "The dimensions of the item being crated.", + "allOf": [ + { + "$ref": "#/definitions/MTOServiceItemDimension" + } + ] + }, + "reServiceCode": { + "description": "Service code allowed for this model type.", + "type": "string", + "enum": [ + "ICRT", + "IUCRT" + ] + }, + "requestApprovalsRequestedStatus": { + "description": "Indicates if \"Approvals Requested\" status is being requested.", + "type": "boolean", + "x-nullable": true + }, + "standaloneCrate": { + "type": "boolean", + "x-nullable": true + }, + "updateReason": { + "description": "Reason for updating service item.", + "type": "string", + "x-nullable": true + } + } + } + ] + }, "UpdateMTOServiceItemInternationalPortFSC": { "description": "Subtype used to provide the port for fuel surcharge. This is not creating a new service item but rather updating an existing service item.\n", "allOf": [ @@ -9208,13 +9331,14 @@ func init() { ] }, "UpdateMTOServiceItemModelType": { - "description": "Using this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DDDSIT - UpdateMTOServiceItemSIT\n * DDFSIT - UpdateMTOServiceItemSIT\n * DDASIT - UpdateMTOServiceItemSIT\n * DOPSIT - UpdateMTOServiceItemSIT\n * DOASIT - UpdateMTOServiceItemSIT\n * DOFSIT - UpdateMTOServiceItemSIT\n * DOSFSC - UpdateMTOServiceItemSIT\n * DDSFSC - UpdateMTOServiceItemSIT\n * DDSHUT - UpdateMTOServiceItemShuttle\n * DOSHUT - UpdateMTOServiceItemShuttle\n * PODFSC - UpdateMTOServiceItemInternationalPortFSC\n * POEFSC - UpdateMTOServiceItemInternationalPortFSC\n * IDSHUT - UpdateMTOServiceItemInternationalShuttle\n * IOSHUT - UpdateMTOServiceItemInternationalShuttle\n\nThe documentation will then update with the supported fields.\n", + "description": "Using this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DDDSIT - UpdateMTOServiceItemSIT\n * DDFSIT - UpdateMTOServiceItemSIT\n * DDASIT - UpdateMTOServiceItemSIT\n * DOPSIT - UpdateMTOServiceItemSIT\n * DOASIT - UpdateMTOServiceItemSIT\n * DOFSIT - UpdateMTOServiceItemSIT\n * DOSFSC - UpdateMTOServiceItemSIT\n * DDSFSC - UpdateMTOServiceItemSIT\n * DDSHUT - UpdateMTOServiceItemShuttle\n * DOSHUT - UpdateMTOServiceItemShuttle\n * PODFSC - UpdateMTOServiceItemInternationalPortFSC\n * POEFSC - UpdateMTOServiceItemInternationalPortFSC\n * IDSHUT - UpdateMTOServiceItemInternationalShuttle\n * IOSHUT - UpdateMTOServiceItemInternationalShuttle\n * ICRT - UpdateMTOServiceItemCrating\n * IUCRT - UpdateMTOServiceItemCrating\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "UpdateMTOServiceItemSIT", "UpdateMTOServiceItemShuttle", "UpdateMTOServiceItemInternationalPortFSC", - "UpdateMTOServiceItemInternationalShuttle" + "UpdateMTOServiceItemInternationalShuttle", + "UpdateMTOServiceItemCrating" ] }, "UpdateMTOServiceItemSIT": { diff --git a/pkg/gen/primeapi/primeoperations/mto_service_item/update_m_t_o_service_item.go b/pkg/gen/primeapi/primeoperations/mto_service_item/update_m_t_o_service_item.go index 8bfdb75c0f7..884e2637045 100644 --- a/pkg/gen/primeapi/primeoperations/mto_service_item/update_m_t_o_service_item.go +++ b/pkg/gen/primeapi/primeoperations/mto_service_item/update_m_t_o_service_item.go @@ -96,6 +96,31 @@ Please see the example payload below: "reServiceCode": "POEFSC" } +``` + +The following crating/uncrating service items can be resubmitted following a rejection: +- ICRT +- IUCRT + +At a MINIMUM, the payload for resubmitting a rejected crating/uncrating service item must look like this: +```json + + { + "item": { + "length": 10000, + "width": 10000, + "height": 10000 + }, + "crate": { + "length": 20000, + "width": 20000, + "height": 20000 + }, + "updateReason": "A reason that differs from the previous reason", + "modelType": "UpdateMTOServiceItemCrating", + "requestApprovalsRequestedStatus": true + } + ``` */ type UpdateMTOServiceItem struct { diff --git a/pkg/gen/primeclient/mto_service_item/mto_service_item_client.go b/pkg/gen/primeclient/mto_service_item/mto_service_item_client.go index 9fe2fa1212d..07040bad20e 100644 --- a/pkg/gen/primeclient/mto_service_item/mto_service_item_client.go +++ b/pkg/gen/primeclient/mto_service_item/mto_service_item_client.go @@ -279,6 +279,31 @@ Please see the example payload below: "reServiceCode": "POEFSC" } +``` + +The following crating/uncrating service items can be resubmitted following a rejection: +- ICRT +- IUCRT + +At a MINIMUM, the payload for resubmitting a rejected crating/uncrating service item must look like this: +```json + + { + "item": { + "length": 10000, + "width": 10000, + "height": 10000 + }, + "crate": { + "length": 20000, + "width": 20000, + "height": 20000 + }, + "updateReason": "A reason that differs from the previous reason", + "modelType": "UpdateMTOServiceItemCrating", + "requestApprovalsRequestedStatus": true + } + ``` */ func (a *Client) UpdateMTOServiceItem(params *UpdateMTOServiceItemParams, opts ...ClientOption) (*UpdateMTOServiceItemOK, error) { diff --git a/pkg/gen/primemessages/update_m_t_o_service_item.go b/pkg/gen/primemessages/update_m_t_o_service_item.go index 36fc059bd0a..7a5abce67d9 100644 --- a/pkg/gen/primemessages/update_m_t_o_service_item.go +++ b/pkg/gen/primemessages/update_m_t_o_service_item.go @@ -117,6 +117,12 @@ func unmarshalUpdateMTOServiceItem(data []byte, consumer runtime.Consumer) (Upda return nil, err } return &result, nil + case "UpdateMTOServiceItemCrating": + var result UpdateMTOServiceItemCrating + if err := consumer.Consume(buf2, &result); err != nil { + return nil, err + } + return &result, nil case "UpdateMTOServiceItemInternationalPortFSC": var result UpdateMTOServiceItemInternationalPortFSC if err := consumer.Consume(buf2, &result); err != nil { diff --git a/pkg/gen/primemessages/update_m_t_o_service_item_crating.go b/pkg/gen/primemessages/update_m_t_o_service_item_crating.go new file mode 100644 index 00000000000..45396947c3a --- /dev/null +++ b/pkg/gen/primemessages/update_m_t_o_service_item_crating.go @@ -0,0 +1,377 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package primemessages + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +import ( + "bytes" + "context" + "encoding/json" + + "github.com/go-openapi/errors" + "github.com/go-openapi/strfmt" + "github.com/go-openapi/swag" + "github.com/go-openapi/validate" +) + +// UpdateMTOServiceItemCrating Subtype used to provide the size and types for crating. This is not creating a new service item but rather updating an existing service item. +// +// swagger:model UpdateMTOServiceItemCrating +type UpdateMTOServiceItemCrating struct { + idField strfmt.UUID + + // The dimensions for the crate the item will be shipped in. + Crate struct { + MTOServiceItemDimension + } `json:"crate,omitempty"` + + // A description of the item being crated. + // Example: Decorated horse head to be crated. + Description *string `json:"description,omitempty"` + + // external crate + ExternalCrate *bool `json:"externalCrate,omitempty"` + + // The dimensions of the item being crated. + Item struct { + MTOServiceItemDimension + } `json:"item,omitempty"` + + // Service code allowed for this model type. + // Enum: [ICRT IUCRT] + ReServiceCode string `json:"reServiceCode,omitempty"` + + // Indicates if "Approvals Requested" status is being requested. + RequestApprovalsRequestedStatus *bool `json:"requestApprovalsRequestedStatus,omitempty"` + + // standalone crate + StandaloneCrate *bool `json:"standaloneCrate,omitempty"` + + // Reason for updating service item. + UpdateReason *string `json:"updateReason,omitempty"` +} + +// ID gets the id of this subtype +func (m *UpdateMTOServiceItemCrating) ID() strfmt.UUID { + return m.idField +} + +// SetID sets the id of this subtype +func (m *UpdateMTOServiceItemCrating) SetID(val strfmt.UUID) { + m.idField = val +} + +// ModelType gets the model type of this subtype +func (m *UpdateMTOServiceItemCrating) ModelType() UpdateMTOServiceItemModelType { + return "UpdateMTOServiceItemCrating" +} + +// SetModelType sets the model type of this subtype +func (m *UpdateMTOServiceItemCrating) SetModelType(val UpdateMTOServiceItemModelType) { +} + +// UnmarshalJSON unmarshals this object with a polymorphic type from a JSON structure +func (m *UpdateMTOServiceItemCrating) UnmarshalJSON(raw []byte) error { + var data struct { + + // The dimensions for the crate the item will be shipped in. + Crate struct { + MTOServiceItemDimension + } `json:"crate,omitempty"` + + // A description of the item being crated. + // Example: Decorated horse head to be crated. + Description *string `json:"description,omitempty"` + + // external crate + ExternalCrate *bool `json:"externalCrate,omitempty"` + + // The dimensions of the item being crated. + Item struct { + MTOServiceItemDimension + } `json:"item,omitempty"` + + // Service code allowed for this model type. + // Enum: [ICRT IUCRT] + ReServiceCode string `json:"reServiceCode,omitempty"` + + // Indicates if "Approvals Requested" status is being requested. + RequestApprovalsRequestedStatus *bool `json:"requestApprovalsRequestedStatus,omitempty"` + + // standalone crate + StandaloneCrate *bool `json:"standaloneCrate,omitempty"` + + // Reason for updating service item. + UpdateReason *string `json:"updateReason,omitempty"` + } + buf := bytes.NewBuffer(raw) + dec := json.NewDecoder(buf) + dec.UseNumber() + + if err := dec.Decode(&data); err != nil { + return err + } + + var base struct { + /* Just the base type fields. Used for unmashalling polymorphic types.*/ + + ID strfmt.UUID `json:"id,omitempty"` + + ModelType UpdateMTOServiceItemModelType `json:"modelType"` + } + buf = bytes.NewBuffer(raw) + dec = json.NewDecoder(buf) + dec.UseNumber() + + if err := dec.Decode(&base); err != nil { + return err + } + + var result UpdateMTOServiceItemCrating + + result.idField = base.ID + + if base.ModelType != result.ModelType() { + /* Not the type we're looking for. */ + return errors.New(422, "invalid modelType value: %q", base.ModelType) + } + + result.Crate = data.Crate + result.Description = data.Description + result.ExternalCrate = data.ExternalCrate + result.Item = data.Item + result.ReServiceCode = data.ReServiceCode + result.RequestApprovalsRequestedStatus = data.RequestApprovalsRequestedStatus + result.StandaloneCrate = data.StandaloneCrate + result.UpdateReason = data.UpdateReason + + *m = result + + return nil +} + +// MarshalJSON marshals this object with a polymorphic type to a JSON structure +func (m UpdateMTOServiceItemCrating) MarshalJSON() ([]byte, error) { + var b1, b2, b3 []byte + var err error + b1, err = json.Marshal(struct { + + // The dimensions for the crate the item will be shipped in. + Crate struct { + MTOServiceItemDimension + } `json:"crate,omitempty"` + + // A description of the item being crated. + // Example: Decorated horse head to be crated. + Description *string `json:"description,omitempty"` + + // external crate + ExternalCrate *bool `json:"externalCrate,omitempty"` + + // The dimensions of the item being crated. + Item struct { + MTOServiceItemDimension + } `json:"item,omitempty"` + + // Service code allowed for this model type. + // Enum: [ICRT IUCRT] + ReServiceCode string `json:"reServiceCode,omitempty"` + + // Indicates if "Approvals Requested" status is being requested. + RequestApprovalsRequestedStatus *bool `json:"requestApprovalsRequestedStatus,omitempty"` + + // standalone crate + StandaloneCrate *bool `json:"standaloneCrate,omitempty"` + + // Reason for updating service item. + UpdateReason *string `json:"updateReason,omitempty"` + }{ + + Crate: m.Crate, + + Description: m.Description, + + ExternalCrate: m.ExternalCrate, + + Item: m.Item, + + ReServiceCode: m.ReServiceCode, + + RequestApprovalsRequestedStatus: m.RequestApprovalsRequestedStatus, + + StandaloneCrate: m.StandaloneCrate, + + UpdateReason: m.UpdateReason, + }) + if err != nil { + return nil, err + } + b2, err = json.Marshal(struct { + ID strfmt.UUID `json:"id,omitempty"` + + ModelType UpdateMTOServiceItemModelType `json:"modelType"` + }{ + + ID: m.ID(), + + ModelType: m.ModelType(), + }) + if err != nil { + return nil, err + } + + return swag.ConcatJSON(b1, b2, b3), nil +} + +// Validate validates this update m t o service item crating +func (m *UpdateMTOServiceItemCrating) Validate(formats strfmt.Registry) error { + var res []error + + if err := m.validateID(formats); err != nil { + res = append(res, err) + } + + if err := m.validateCrate(formats); err != nil { + res = append(res, err) + } + + if err := m.validateItem(formats); err != nil { + res = append(res, err) + } + + if err := m.validateReServiceCode(formats); err != nil { + res = append(res, err) + } + + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +func (m *UpdateMTOServiceItemCrating) validateID(formats strfmt.Registry) error { + + if swag.IsZero(m.ID()) { // not required + return nil + } + + if err := validate.FormatOf("id", "body", "uuid", m.ID().String(), formats); err != nil { + return err + } + + return nil +} + +func (m *UpdateMTOServiceItemCrating) validateCrate(formats strfmt.Registry) error { + + if swag.IsZero(m.Crate) { // not required + return nil + } + + return nil +} + +func (m *UpdateMTOServiceItemCrating) validateItem(formats strfmt.Registry) error { + + if swag.IsZero(m.Item) { // not required + return nil + } + + return nil +} + +var updateMTOServiceItemCratingTypeReServiceCodePropEnum []interface{} + +func init() { + var res []string + if err := json.Unmarshal([]byte(`["ICRT","IUCRT"]`), &res); err != nil { + panic(err) + } + for _, v := range res { + updateMTOServiceItemCratingTypeReServiceCodePropEnum = append(updateMTOServiceItemCratingTypeReServiceCodePropEnum, v) + } +} + +// property enum +func (m *UpdateMTOServiceItemCrating) validateReServiceCodeEnum(path, location string, value string) error { + if err := validate.EnumCase(path, location, value, updateMTOServiceItemCratingTypeReServiceCodePropEnum, true); err != nil { + return err + } + return nil +} + +func (m *UpdateMTOServiceItemCrating) validateReServiceCode(formats strfmt.Registry) error { + + if swag.IsZero(m.ReServiceCode) { // not required + return nil + } + + // value enum + if err := m.validateReServiceCodeEnum("reServiceCode", "body", m.ReServiceCode); err != nil { + return err + } + + return nil +} + +// ContextValidate validate this update m t o service item crating based on the context it is used +func (m *UpdateMTOServiceItemCrating) ContextValidate(ctx context.Context, formats strfmt.Registry) error { + var res []error + + if err := m.contextValidateCrate(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateItem(ctx, formats); err != nil { + res = append(res, err) + } + + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +func (m *UpdateMTOServiceItemCrating) contextValidateModelType(ctx context.Context, formats strfmt.Registry) error { + + if err := m.ModelType().ContextValidate(ctx, formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("modelType") + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("modelType") + } + return err + } + + return nil +} + +func (m *UpdateMTOServiceItemCrating) contextValidateCrate(ctx context.Context, formats strfmt.Registry) error { + + return nil +} + +func (m *UpdateMTOServiceItemCrating) contextValidateItem(ctx context.Context, formats strfmt.Registry) error { + + return nil +} + +// MarshalBinary interface implementation +func (m *UpdateMTOServiceItemCrating) MarshalBinary() ([]byte, error) { + if m == nil { + return nil, nil + } + return swag.WriteJSON(m) +} + +// UnmarshalBinary interface implementation +func (m *UpdateMTOServiceItemCrating) UnmarshalBinary(b []byte) error { + var res UpdateMTOServiceItemCrating + if err := swag.ReadJSON(b, &res); err != nil { + return err + } + *m = res + return nil +} diff --git a/pkg/gen/primemessages/update_m_t_o_service_item_model_type.go b/pkg/gen/primemessages/update_m_t_o_service_item_model_type.go index cc59a427e36..24f9aa5707e 100644 --- a/pkg/gen/primemessages/update_m_t_o_service_item_model_type.go +++ b/pkg/gen/primemessages/update_m_t_o_service_item_model_type.go @@ -29,6 +29,8 @@ import ( // - POEFSC - UpdateMTOServiceItemInternationalPortFSC // - IDSHUT - UpdateMTOServiceItemInternationalShuttle // - IOSHUT - UpdateMTOServiceItemInternationalShuttle +// - ICRT - UpdateMTOServiceItemCrating +// - IUCRT - UpdateMTOServiceItemCrating // // The documentation will then update with the supported fields. // @@ -57,6 +59,9 @@ const ( // UpdateMTOServiceItemModelTypeUpdateMTOServiceItemInternationalShuttle captures enum value "UpdateMTOServiceItemInternationalShuttle" UpdateMTOServiceItemModelTypeUpdateMTOServiceItemInternationalShuttle UpdateMTOServiceItemModelType = "UpdateMTOServiceItemInternationalShuttle" + + // UpdateMTOServiceItemModelTypeUpdateMTOServiceItemCrating captures enum value "UpdateMTOServiceItemCrating" + UpdateMTOServiceItemModelTypeUpdateMTOServiceItemCrating UpdateMTOServiceItemModelType = "UpdateMTOServiceItemCrating" ) // for schema @@ -64,7 +69,7 @@ var updateMTOServiceItemModelTypeEnum []interface{} func init() { var res []UpdateMTOServiceItemModelType - if err := json.Unmarshal([]byte(`["UpdateMTOServiceItemSIT","UpdateMTOServiceItemShuttle","UpdateMTOServiceItemInternationalPortFSC","UpdateMTOServiceItemInternationalShuttle"]`), &res); err != nil { + if err := json.Unmarshal([]byte(`["UpdateMTOServiceItemSIT","UpdateMTOServiceItemShuttle","UpdateMTOServiceItemInternationalPortFSC","UpdateMTOServiceItemInternationalShuttle","UpdateMTOServiceItemCrating"]`), &res); err != nil { panic(err) } for _, v := range res { diff --git a/pkg/models/mto_service_items.go b/pkg/models/mto_service_items.go index 42a749626ce..da1079f74f9 100644 --- a/pkg/models/mto_service_items.go +++ b/pkg/models/mto_service_items.go @@ -158,7 +158,8 @@ func FetchServiceItem(db *pop.Connection, serviceItemID uuid.UUID) (MTOServiceIt "ReService", "CustomerContacts", "MTOShipment.PickupAddress", - "MTOShipment.DestinationAddress").Where("id = ?", serviceItemID).First(&serviceItem) + "MTOShipment.DestinationAddress", + "Dimensions").Where("id = ?", serviceItemID).First(&serviceItem) if err != nil { if errors.Cause(err).Error() == RecordNotFoundErrorString { @@ -214,6 +215,7 @@ type MTOServiceItemType struct { ServiceLocation *ServiceLocationType `json:"service_location"` POELocationID *uuid.UUID `json:"poe_location_id"` PODLocationID *uuid.UUID `json:"pod_location_id"` + ExternalCrate *bool `json:"external_crate"` } func (m MTOServiceItem) GetMTOServiceItemTypeFromServiceItem() MTOServiceItemType { @@ -250,6 +252,7 @@ func (m MTOServiceItem) GetMTOServiceItemTypeFromServiceItem() MTOServiceItemTyp ServiceLocation: m.ServiceLocation, POELocationID: m.POELocationID, PODLocationID: m.PODLocationID, + ExternalCrate: m.ExternalCrate, } } @@ -283,6 +286,7 @@ func (m MTOServiceItem) Value() (driver.Value, error) { var estimatedWeight int64 var actualWeight int64 var pricingEstimate int64 + var externalCrate bool if m.ID != uuid.Nil { id = m.ID.String() @@ -376,6 +380,10 @@ func (m MTOServiceItem) Value() (driver.Value, error) { standaloneCrate = *m.StandaloneCrate } + if m.ExternalCrate != nil { + externalCrate = *m.ExternalCrate + } + if m.LockedPriceCents != nil { lockedPriceCents = m.LockedPriceCents.Int64() } @@ -400,7 +408,7 @@ func (m MTOServiceItem) Value() (driver.Value, error) { pricingEstimate = m.PricingEstimate.Int64() } - s := fmt.Sprintf("(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%d,%d,%s,%s,%s,%t,%t,%s,%d,%d,%t,%d,%s,%s,%s,%s)", + s := fmt.Sprintf("(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%d,%d,%s,%s,%s,%t,%t,%s,%d,%d,%t,%d,%s,%s,%s,%s,%t)", id, moveTaskOrderID, mtoShipmentID, @@ -435,6 +443,7 @@ func (m MTOServiceItem) Value() (driver.Value, error) { poeLocationID, podLocationID, m.ReService.Code.String(), + externalCrate, ) return []byte(s), nil } diff --git a/pkg/models/re_intl_accessorial_price.go b/pkg/models/re_intl_accessorial_price.go index b61b281b76a..431f87f845b 100644 --- a/pkg/models/re_intl_accessorial_price.go +++ b/pkg/models/re_intl_accessorial_price.go @@ -29,6 +29,17 @@ var validMarkets = []string{ string(MarketOconus), } +func (m Market) FullString() string { + switch m { + case MarketConus: + return "CONUS" + case MarketOconus: + return "OCONUS" + default: + return "" + } +} + // ReIntlAccessorialPrice model struct type ReIntlAccessorialPrice struct { ID uuid.UUID `json:"id" db:"id"` @@ -61,14 +72,3 @@ func (r *ReIntlAccessorialPrice) Validate(_ *pop.Connection) (*validate.Errors, &validators.IntIsGreaterThan{Field: r.PerUnitCents.Int(), Name: "PerUnitCents", Compared: -1}, ), nil } - -func (m Market) FullString() string { - switch m { - case MarketConus: - return "CONUS" - case MarketOconus: - return "OCONUS" - default: - return "" - } -} diff --git a/pkg/models/service_item_param_key.go b/pkg/models/service_item_param_key.go index 0c637cc7d92..7c2692b7e8d 100644 --- a/pkg/models/service_item_param_key.go +++ b/pkg/models/service_item_param_key.go @@ -161,6 +161,8 @@ const ( ServiceItemParamNameUncappedRequestTotal ServiceItemParamName = "UncappedRequestTotal" // ServiceItemParamNameLockedPriceCents is the param key name LockedPriceCents ServiceItemParamNameLockedPriceCents ServiceItemParamName = "LockedPriceCents" + // ServiceItemParamNameExternalCrate is the param key name ExternalCrate + ServiceItemParamNameExternalCrate ServiceItemParamName = "ExternalCrate" ) // ServiceItemParamType is a type of service item parameter @@ -281,6 +283,7 @@ var ValidServiceItemParamNames = []ServiceItemParamName{ ServiceItemParamNameLockedPriceCents, ServiceItemParamNamePerUnitCents, ServiceItemParamNamePortZip, + ServiceItemParamNameExternalCrate, } // ValidServiceItemParamNameStrings lists all valid service item param key names @@ -357,6 +360,7 @@ var ValidServiceItemParamNameStrings = []string{ string(ServiceItemParamNameLockedPriceCents), string(ServiceItemParamNamePerUnitCents), string(ServiceItemParamNamePortZip), + string(ServiceItemParamNameExternalCrate), } // ValidServiceItemParamTypes lists all valid service item param types diff --git a/pkg/payment_request/service_param_value_lookups/cubic_feet_billed_lookup.go b/pkg/payment_request/service_param_value_lookups/cubic_feet_billed_lookup.go index 547d900cfc8..80f26837b3f 100644 --- a/pkg/payment_request/service_param_value_lookups/cubic_feet_billed_lookup.go +++ b/pkg/payment_request/service_param_value_lookups/cubic_feet_billed_lookup.go @@ -13,17 +13,21 @@ const ( // CubicFeetBilledLookup does lookup for CubicFeetBilled type CubicFeetBilledLookup struct { - Dimensions models.MTOServiceItemDimensions + Dimensions models.MTOServiceItemDimensions + ServiceItem models.MTOServiceItem } func (c CubicFeetBilledLookup) lookup(_ appcontext.AppContext, keyData *ServiceItemParamKeyData) (string, error) { + isIntlCrateUncrate := c.ServiceItem.ReService.Code == models.ReServiceCodeICRT || c.ServiceItem.ReService.Code == models.ReServiceCodeIUCRT + isExternalCrate := c.ServiceItem.ExternalCrate != nil && *c.ServiceItem.ExternalCrate + // Each service item has an array of dimensions. There is a DB constraint preventing // more than one dimension of each type for a given service item, so we just have to // look for the first crating dimension. for _, dimension := range c.Dimensions { if dimension.Type == models.DimensionTypeCrate { volume := dimension.Volume().ToCubicFeet() - if volume < minCubicFeetBilled { + if (!isIntlCrateUncrate || isExternalCrate) && volume < minCubicFeetBilled { volume = minCubicFeetBilled } return volume.String(), nil diff --git a/pkg/payment_request/service_param_value_lookups/cubic_feet_billed_lookup_test.go b/pkg/payment_request/service_param_value_lookups/cubic_feet_billed_lookup_test.go index 29965d9f03a..48374649c74 100644 --- a/pkg/payment_request/service_param_value_lookups/cubic_feet_billed_lookup_test.go +++ b/pkg/payment_request/service_param_value_lookups/cubic_feet_billed_lookup_test.go @@ -74,7 +74,7 @@ func (suite *ServiceParamValueLookupsSuite) TestCubicFeetBilledLookup() { suite.Equal("1029.33", stringValue) }) - suite.Run("When crate volume is less than minimum, billed volume should be set to minimum", func() { + suite.Run("When domestic crate volume is less than minimum, billed volume should be set to minimum", func() { testdatagen.MakeReContractYear(suite.DB(), testdatagen.Assertions{ ReContractYear: models.ReContractYear{ StartDate: time.Now().Add(-24 * time.Hour), @@ -134,6 +134,127 @@ func (suite *ServiceParamValueLookupsSuite) TestCubicFeetBilledLookup() { suite.Equal("4.00", stringValue) }) + suite.Run("When international external crate volume is less than minimum, billed volume should be set to minimum", func() { + testdatagen.MakeReContractYear(suite.DB(), testdatagen.Assertions{ + ReContractYear: models.ReContractYear{ + StartDate: time.Now().Add(-24 * time.Hour), + EndDate: time.Now().Add(24 * time.Hour), + }, + }) + mtoServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeICRT, + }, + }, + }, []factory.Trait{ + factory.GetTraitAvailableToPrimeMove, + }) + + cratingDimension := factory.BuildMTOServiceItemDimension(suite.DB(), []factory.Customization{ + { + Model: models.MTOServiceItemDimension{ + Type: models.DimensionTypeCrate, + Length: 1000, + Height: 1000, + Width: 1000, + CreatedAt: time.Time{}, + UpdatedAt: time.Time{}, + }, + }, + { + Model: mtoServiceItem, + LinkOnly: true, + }, + }, nil) + itemDimension := factory.BuildMTOServiceItemDimension(suite.DB(), []factory.Customization{ + { + Model: models.MTOServiceItemDimension{ + Type: models.DimensionTypeItem, + Length: 100, + Height: 100, + Width: 100, + CreatedAt: time.Time{}, + UpdatedAt: time.Time{}, + }, + }, + { + Model: mtoServiceItem, + LinkOnly: true, + }, + }, nil) + mtoServiceItem.Dimensions = []models.MTOServiceItemDimension{itemDimension, cratingDimension} + mtoServiceItem.ExternalCrate = models.BoolPointer(true) + suite.MustSave(&mtoServiceItem) + paramLookup, err := ServiceParamLookupInitialize(suite.AppContextForTest(), suite.planner, mtoServiceItem, uuid.Must(uuid.NewV4()), mtoServiceItem.MoveTaskOrderID, nil) + suite.FatalNoError(err) + + stringValue, err := paramLookup.ServiceParamValue(suite.AppContextForTest(), key) + suite.FatalNoError(err) + + suite.Equal("4.00", stringValue) + }) + + suite.Run("When international non-external crate volume is less than minimum, billed volume should NOT be set to minimum", func() { + testdatagen.MakeReContractYear(suite.DB(), testdatagen.Assertions{ + ReContractYear: models.ReContractYear{ + StartDate: time.Now().Add(-24 * time.Hour), + EndDate: time.Now().Add(24 * time.Hour), + }, + }) + mtoServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeICRT, + }, + }, + }, []factory.Trait{ + factory.GetTraitAvailableToPrimeMove, + }) + + cratingDimension := factory.BuildMTOServiceItemDimension(suite.DB(), []factory.Customization{ + { + Model: models.MTOServiceItemDimension{ + Type: models.DimensionTypeCrate, + Length: 12000, + Height: 12000, + Width: 12000, + CreatedAt: time.Time{}, + UpdatedAt: time.Time{}, + }, + }, + { + Model: mtoServiceItem, + LinkOnly: true, + }, + }, nil) + itemDimension := factory.BuildMTOServiceItemDimension(suite.DB(), []factory.Customization{ + { + Model: models.MTOServiceItemDimension{ + Type: models.DimensionTypeItem, + Length: 100, + Height: 100, + Width: 100, + CreatedAt: time.Time{}, + UpdatedAt: time.Time{}, + }, + }, + { + Model: mtoServiceItem, + LinkOnly: true, + }, + }, nil) + mtoServiceItem.Dimensions = []models.MTOServiceItemDimension{itemDimension, cratingDimension} + suite.MustSave(&mtoServiceItem) + paramLookup, err := ServiceParamLookupInitialize(suite.AppContextForTest(), suite.planner, mtoServiceItem, uuid.Must(uuid.NewV4()), mtoServiceItem.MoveTaskOrderID, nil) + suite.FatalNoError(err) + + stringValue, err := paramLookup.ServiceParamValue(suite.AppContextForTest(), key) + suite.FatalNoError(err) + + suite.Equal("1.00", stringValue) + }) + suite.Run("missing dimension should error", func() { testdatagen.MakeReContractYear(suite.DB(), testdatagen.Assertions{ ReContractYear: models.ReContractYear{ diff --git a/pkg/payment_request/service_param_value_lookups/external_crate_lookup.go b/pkg/payment_request/service_param_value_lookups/external_crate_lookup.go new file mode 100644 index 00000000000..64aef2da1d4 --- /dev/null +++ b/pkg/payment_request/service_param_value_lookups/external_crate_lookup.go @@ -0,0 +1,22 @@ +package serviceparamvaluelookups + +import ( + "strconv" + + "github.com/transcom/mymove/pkg/appcontext" + "github.com/transcom/mymove/pkg/models" +) + +// ExternalCrateLookup does lookup on externalCrate +type ExternalCrateLookup struct { + ServiceItem models.MTOServiceItem +} + +func (r ExternalCrateLookup) lookup(_ appcontext.AppContext, _ *ServiceItemParamKeyData) (string, error) { + externalCrate := r.ServiceItem.ExternalCrate + if externalCrate == nil { + return "false", nil + } + + return strconv.FormatBool(*externalCrate), nil +} diff --git a/pkg/payment_request/service_param_value_lookups/external_crate_lookup_test.go b/pkg/payment_request/service_param_value_lookups/external_crate_lookup_test.go new file mode 100644 index 00000000000..59606485500 --- /dev/null +++ b/pkg/payment_request/service_param_value_lookups/external_crate_lookup_test.go @@ -0,0 +1,50 @@ +package serviceparamvaluelookups + +import ( + "strconv" + + "github.com/transcom/mymove/pkg/models" +) + +func (suite *ServiceParamValueLookupsSuite) TestExternalCrateLookup() { + suite.Run("ExternalCrate is true", func() { + externalCrate := true + mtoServiceItem := models.MTOServiceItem{ + ExternalCrate: &externalCrate, + } + + paramLookup := ExternalCrateLookup{ServiceItem: mtoServiceItem} + valueStr, err := paramLookup.lookup(suite.AppContextForTest(), nil) + + suite.FatalNoError(err) + expected := strconv.FormatBool(externalCrate) + suite.Equal(expected, valueStr) + }) + + suite.Run("ExternalCrate is false", func() { + externalCrate := false + mtoServiceItem := models.MTOServiceItem{ + ExternalCrate: &externalCrate, + } + + paramLookup := ExternalCrateLookup{ServiceItem: mtoServiceItem} + valueStr, err := paramLookup.lookup(suite.AppContextForTest(), nil) + + suite.FatalNoError(err) + expected := strconv.FormatBool(externalCrate) + suite.Equal(expected, valueStr) + }) + + suite.Run("ExternalCrate is nil", func() { + mtoServiceItem := models.MTOServiceItem{ + ExternalCrate: nil, + } + + paramLookup := ExternalCrateLookup{ServiceItem: mtoServiceItem} + valueStr, err := paramLookup.lookup(suite.AppContextForTest(), nil) + + suite.FatalNoError(err) + expected := "false" + suite.Equal(expected, valueStr) + }) +} diff --git a/pkg/payment_request/service_param_value_lookups/service_param_value_lookups.go b/pkg/payment_request/service_param_value_lookups/service_param_value_lookups.go index 580ec02bc19..8247a795f66 100644 --- a/pkg/payment_request/service_param_value_lookups/service_param_value_lookups.go +++ b/pkg/payment_request/service_param_value_lookups/service_param_value_lookups.go @@ -90,6 +90,7 @@ var ServiceItemParamsWithLookups = []models.ServiceItemParamName{ models.ServiceItemParamNamePortZip, models.ServiceItemParamNameMarketDest, models.ServiceItemParamNameMarketOrigin, + models.ServiceItemParamNameExternalCrate, } // ServiceParamLookupInitialize initializes service parameter lookup @@ -338,7 +339,8 @@ func InitializeLookups(appCtx appcontext.AppContext, shipment models.MTOShipment lookups[models.ServiceItemParamNameContractCode] = ContractCodeLookup{} lookups[models.ServiceItemParamNameCubicFeetBilled] = CubicFeetBilledLookup{ - Dimensions: serviceItem.Dimensions, + Dimensions: serviceItem.Dimensions, + ServiceItem: serviceItem, } lookups[models.ServiceItemParamNamePSILinehaulDom] = PSILinehaulDomLookup{ @@ -451,6 +453,10 @@ func InitializeLookups(appCtx appcontext.AppContext, shipment models.MTOShipment Address: *shipment.DestinationAddress, } + lookups[models.ServiceItemParamNameExternalCrate] = ExternalCrateLookup{ + ServiceItem: serviceItem, + } + return lookups } diff --git a/pkg/services/ghc_rate_engine.go b/pkg/services/ghc_rate_engine.go index 2aa23954ce6..1aa479aa567 100644 --- a/pkg/services/ghc_rate_engine.go +++ b/pkg/services/ghc_rate_engine.go @@ -280,3 +280,19 @@ type IntlPortFuelSurchargePricer interface { Price(appCtx appcontext.AppContext, actualPickupDate time.Time, distance unit.Miles, weight unit.Pound, fscWeightBasedDistanceMultiplier float64, eiaFuelPrice unit.Millicents) (unit.Cents, PricingDisplayParams, error) ParamsPricer } + +// IntlCratingPricer prices the international crating service for a Move +// +//go:generate mockery --name IntlCratingPricer +type IntlCratingPricer interface { + Price(appCtx appcontext.AppContext, contractCode string, requestedPickupDate time.Time, billedCubicFeet unit.CubicFeet, standaloneCrate bool, standaloneCrateCap unit.Cents, externalCrate bool, market models.Market) (unit.Cents, PricingDisplayParams, error) + ParamsPricer +} + +// IntlUncratingPricer prices the international uncrating service for a Move +// +//go:generate mockery --name IntlUncratingPricer +type IntlUncratingPricer interface { + Price(appCtx appcontext.AppContext, contractCode string, requestedPickupDate time.Time, billedCubicFeet unit.CubicFeet, market models.Market) (unit.Cents, PricingDisplayParams, error) + ParamsPricer +} diff --git a/pkg/services/ghcrateengine/intl_crating_pricer.go b/pkg/services/ghcrateengine/intl_crating_pricer.go new file mode 100644 index 00000000000..096045a07ce --- /dev/null +++ b/pkg/services/ghcrateengine/intl_crating_pricer.go @@ -0,0 +1,66 @@ +package ghcrateengine + +import ( + "time" + + "github.com/transcom/mymove/pkg/appcontext" + "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/services" + "github.com/transcom/mymove/pkg/unit" +) + +type intlCratingPricer struct { +} + +// NewIntlCratingPricer creates a new pricer for international crating +func NewIntlCratingPricer() services.IntlCratingPricer { + return &intlCratingPricer{} +} + +// Price determines the price for international crating +func (p intlCratingPricer) Price(appCtx appcontext.AppContext, contractCode string, referenceDate time.Time, billedCubicFeet unit.CubicFeet, standaloneCrate bool, standaloneCrateCap unit.Cents, externalCrate bool, market models.Market) (unit.Cents, services.PricingDisplayParams, error) { + return priceIntlCratingUncrating(appCtx, models.ReServiceCodeICRT, contractCode, referenceDate, billedCubicFeet, standaloneCrate, standaloneCrateCap, externalCrate, market) +} + +// PriceUsingParams determines the price for international crating given PaymentServiceItemParams +func (p intlCratingPricer) PriceUsingParams(appCtx appcontext.AppContext, params models.PaymentServiceItemParams) (unit.Cents, services.PricingDisplayParams, error) { + contractCode, err := getParamString(params, models.ServiceItemParamNameContractCode) + if err != nil { + return unit.Cents(0), nil, err + } + + cubicFeetFloat, err := getParamFloat(params, models.ServiceItemParamNameCubicFeetBilled) + if err != nil { + return unit.Cents(0), nil, err + } + + cubicFeetBilled := unit.CubicFeet(cubicFeetFloat) + + referenceDate, err := getParamTime(params, models.ServiceItemParamNameReferenceDate) + if err != nil { + return unit.Cents(0), nil, err + } + + market, err := getParamMarket(params, models.ServiceItemParamNameMarketOrigin) + if err != nil { + return unit.Cents(0), nil, err + } + + standaloneCrate, err := getParamBool(params, models.ServiceItemParamNameStandaloneCrate) + if err != nil { + return unit.Cents(0), nil, err + } + + externalCrate, err := getParamBool(params, models.ServiceItemParamNameExternalCrate) + if err != nil { + return unit.Cents(0), nil, err + } + + standaloneCrateCapParam, err := getParamInt(params, models.ServiceItemParamNameStandaloneCrateCap) + if err != nil { + return unit.Cents(0), nil, err + } + standaloneCrateCap := unit.Cents(float64(standaloneCrateCapParam)) + + return p.Price(appCtx, contractCode, referenceDate, cubicFeetBilled, standaloneCrate, standaloneCrateCap, externalCrate, market) +} diff --git a/pkg/services/ghcrateengine/intl_crating_pricer_test.go b/pkg/services/ghcrateengine/intl_crating_pricer_test.go new file mode 100644 index 00000000000..3c8fc47a754 --- /dev/null +++ b/pkg/services/ghcrateengine/intl_crating_pricer_test.go @@ -0,0 +1,136 @@ +package ghcrateengine + +import ( + "strconv" + "time" + + "github.com/transcom/mymove/pkg/factory" + "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/services" + "github.com/transcom/mymove/pkg/testdatagen" + "github.com/transcom/mymove/pkg/unit" +) + +const ( + icrtTestMarket = models.Market("O") + icrtTestBasePriceCents = unit.Cents(2300) + icrtTestEscalationCompounded = 1.125 + icrtTestBilledCubicFeet = unit.CubicFeet(10) + icrtTestPriceCents = unit.Cents(25880) + icrtTestStandaloneCrate = false + icrtTestStandaloneCrateCap = unit.Cents(1000000) + icrtTestUncappedRequestTotal = unit.Cents(25880) + icrtTestExternalCrate = false +) + +var icrtTestRequestedPickupDate = time.Date(testdatagen.TestYear, time.June, 5, 7, 33, 11, 456, time.UTC) + +func (suite *GHCRateEngineServiceSuite) TestIntlCratingPricer() { + pricer := NewIntlCratingPricer() + + suite.Run("success using PaymentServiceItemParams", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + + paymentServiceItem := suite.setupIntlCratingServiceItem(icrtTestBilledCubicFeet) + priceCents, displayParams, err := pricer.PriceUsingParams(suite.AppContextForTest(), paymentServiceItem.PaymentServiceItemParams) + suite.NoError(err) + suite.Equal(icrtTestPriceCents, priceCents) + + expectedParams := services.PricingDisplayParams{ + {Key: models.ServiceItemParamNameContractYearName, Value: testdatagen.DefaultContractCode}, + {Key: models.ServiceItemParamNameEscalationCompounded, Value: FormatEscalation(icrtTestEscalationCompounded)}, + {Key: models.ServiceItemParamNamePriceRateOrFactor, Value: FormatCents(icrtTestBasePriceCents)}, + {Key: models.ServiceItemParamNameUncappedRequestTotal, Value: FormatCents(icrtTestUncappedRequestTotal)}, + } + suite.validatePricerCreatedParams(expectedParams, displayParams) + }) + suite.Run("success with truncating cubic feet", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + + paymentServiceItem := suite.setupIntlCratingServiceItem(unit.CubicFeet(10.005)) + priceCents, _, err := pricer.PriceUsingParams(suite.AppContextForTest(), paymentServiceItem.PaymentServiceItemParams) + suite.NoError(err) + suite.Equal(icrtTestPriceCents, priceCents) + }) + + suite.Run("success without PaymentServiceItemParams", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + + priceCents, _, err := pricer.Price(suite.AppContextForTest(), testdatagen.DefaultContractCode, icrtTestRequestedPickupDate, icrtTestBilledCubicFeet, icrtTestStandaloneCrate, icrtTestStandaloneCrateCap, icrtTestExternalCrate, icrtTestMarket) + suite.NoError(err) + suite.Equal(icrtTestPriceCents, priceCents) + }) + + suite.Run("PriceUsingParams but sending empty params", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + _, _, err := pricer.PriceUsingParams(suite.AppContextForTest(), models.PaymentServiceItemParams{}) + suite.Error(err) + }) + + suite.Run("invalid crating volume - external crate", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + badVolume := unit.CubicFeet(3.0) + _, _, err := pricer.Price(suite.AppContextForTest(), testdatagen.DefaultContractCode, icrtTestRequestedPickupDate, badVolume, icrtTestStandaloneCrate, icrtTestStandaloneCrateCap, true, icrtTestMarket) + suite.Error(err) + suite.Contains(err.Error(), "external crates must be billed for a minimum of 4 cubic feet") + }) + + suite.Run("not finding a rate record", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + _, _, err := pricer.Price(suite.AppContextForTest(), "BOGUS", icrtTestRequestedPickupDate, icrtTestBilledCubicFeet, icrtTestStandaloneCrate, icrtTestStandaloneCrateCap, icrtTestExternalCrate, icrtTestMarket) + suite.Error(err) + suite.Contains(err.Error(), "could not lookup International Accessorial Area Price") + }) + + suite.Run("not finding a contract year record", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + twoYearsLaterPickupDate := icrtTestRequestedPickupDate.AddDate(2, 0, 0) + _, _, err := pricer.Price(suite.AppContextForTest(), testdatagen.DefaultContractCode, twoYearsLaterPickupDate, icrtTestBilledCubicFeet, icrtTestStandaloneCrate, icrtTestStandaloneCrateCap, icrtTestExternalCrate, icrtTestMarket) + suite.Error(err) + suite.Contains(err.Error(), "could not lookup contract year") + }) +} + +func (suite *GHCRateEngineServiceSuite) setupIntlCratingServiceItem(cubicFeet unit.CubicFeet) models.PaymentServiceItem { + return factory.BuildPaymentServiceItemWithParams( + suite.DB(), + models.ReServiceCodeICRT, + []factory.CreatePaymentServiceItemParams{ + { + Key: models.ServiceItemParamNameContractCode, + KeyType: models.ServiceItemParamTypeString, + Value: factory.DefaultContractCode, + }, + { + Key: models.ServiceItemParamNameCubicFeetBilled, + KeyType: models.ServiceItemParamTypeDecimal, + Value: cubicFeet.String(), + }, + { + Key: models.ServiceItemParamNameReferenceDate, + KeyType: models.ServiceItemParamTypeDate, + Value: icrtTestRequestedPickupDate.Format(DateParamFormat), + }, + { + Key: models.ServiceItemParamNameStandaloneCrate, + KeyType: models.ServiceItemParamTypeBoolean, + Value: strconv.FormatBool(false), + }, + { + Key: models.ServiceItemParamNameStandaloneCrateCap, + KeyType: models.ServiceItemParamTypeInteger, + Value: strconv.FormatInt(100000, 10), + }, + { + Key: models.ServiceItemParamNameMarketOrigin, + KeyType: models.ServiceItemParamTypeString, + Value: icrtTestMarket.String(), + }, + { + Key: models.ServiceItemParamNameExternalCrate, + KeyType: models.ServiceItemParamTypeBoolean, + Value: strconv.FormatBool(false), + }, + }, nil, nil, + ) +} diff --git a/pkg/services/ghcrateengine/intl_uncrating_pricer.go b/pkg/services/ghcrateengine/intl_uncrating_pricer.go new file mode 100644 index 00000000000..23c3470f102 --- /dev/null +++ b/pkg/services/ghcrateengine/intl_uncrating_pricer.go @@ -0,0 +1,50 @@ +package ghcrateengine + +import ( + "time" + + "github.com/transcom/mymove/pkg/appcontext" + "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/services" + "github.com/transcom/mymove/pkg/unit" +) + +type intlUncratingPricer struct { +} + +// NewIntlUncratingPricer creates a new pricer for international uncrating +func NewIntlUncratingPricer() services.IntlUncratingPricer { + return &intlUncratingPricer{} +} + +// Price determines the price for international uncrating +func (p intlUncratingPricer) Price(appCtx appcontext.AppContext, contractCode string, referenceDate time.Time, billedCubicFeet unit.CubicFeet, market models.Market) (unit.Cents, services.PricingDisplayParams, error) { + return priceIntlCratingUncrating(appCtx, models.ReServiceCodeIUCRT, contractCode, referenceDate, billedCubicFeet, false, 0, false, market) +} + +// PriceUsingParams determines the price for international uncrating given PaymentServiceItemParams +func (p intlUncratingPricer) PriceUsingParams(appCtx appcontext.AppContext, params models.PaymentServiceItemParams) (unit.Cents, services.PricingDisplayParams, error) { + contractCode, err := getParamString(params, models.ServiceItemParamNameContractCode) + if err != nil { + return unit.Cents(0), nil, err + } + + cubicFeetFloat, err := getParamFloat(params, models.ServiceItemParamNameCubicFeetBilled) + if err != nil { + return unit.Cents(0), nil, err + } + + cubicFeetBilled := unit.CubicFeet(cubicFeetFloat) + + referenceDate, err := getParamTime(params, models.ServiceItemParamNameReferenceDate) + if err != nil { + return unit.Cents(0), nil, err + } + + market, err := getParamMarket(params, models.ServiceItemParamNameMarketDest) + if err != nil { + return unit.Cents(0), nil, err + } + + return p.Price(appCtx, contractCode, referenceDate, cubicFeetBilled, market) +} diff --git a/pkg/services/ghcrateengine/intl_uncrating_pricer_test.go b/pkg/services/ghcrateengine/intl_uncrating_pricer_test.go new file mode 100644 index 00000000000..5369172b039 --- /dev/null +++ b/pkg/services/ghcrateengine/intl_uncrating_pricer_test.go @@ -0,0 +1,102 @@ +package ghcrateengine + +import ( + "fmt" + "time" + + "github.com/transcom/mymove/pkg/factory" + "github.com/transcom/mymove/pkg/models" + "github.com/transcom/mymove/pkg/services" + "github.com/transcom/mymove/pkg/testdatagen" + "github.com/transcom/mymove/pkg/unit" +) + +const ( + iucrtTestMarket = models.Market("O") + iucrtTestBasePriceCents = unit.Cents(595) + iucrtTestEscalationCompounded = 1.125 + iucrtTestBilledCubicFeet = 10 + iucrtTestPriceCents = unit.Cents(6690) + iucrtTestUncappedRequestTotal = unit.Cents(6690) +) + +var iucrtTestRequestedPickupDate = time.Date(testdatagen.TestYear, time.June, 5, 7, 33, 11, 456, time.UTC) + +func (suite *GHCRateEngineServiceSuite) TestIntlUncratingPricer() { + pricer := NewIntlUncratingPricer() + + suite.Run("success using PaymentServiceItemParams", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeIUCRT, iucrtTestMarket, iucrtTestBasePriceCents, testdatagen.DefaultContractCode, iucrtTestEscalationCompounded) + + paymentServiceItem := suite.setupIntlUncratingServiceItem() + priceCents, displayParams, err := pricer.PriceUsingParams(suite.AppContextForTest(), paymentServiceItem.PaymentServiceItemParams) + suite.NoError(err) + suite.Equal(iucrtTestPriceCents, priceCents) + + expectedParams := services.PricingDisplayParams{ + {Key: models.ServiceItemParamNameContractYearName, Value: testdatagen.DefaultContractCode}, + {Key: models.ServiceItemParamNameEscalationCompounded, Value: FormatEscalation(iucrtTestEscalationCompounded)}, + {Key: models.ServiceItemParamNamePriceRateOrFactor, Value: FormatCents(iucrtTestBasePriceCents)}, + {Key: models.ServiceItemParamNameUncappedRequestTotal, Value: FormatCents(iucrtTestUncappedRequestTotal)}, + } + suite.validatePricerCreatedParams(expectedParams, displayParams) + }) + + suite.Run("success without PaymentServiceItemParams", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeIUCRT, iucrtTestMarket, iucrtTestBasePriceCents, testdatagen.DefaultContractCode, iucrtTestEscalationCompounded) + + priceCents, _, err := pricer.Price(suite.AppContextForTest(), testdatagen.DefaultContractCode, iucrtTestRequestedPickupDate, iucrtTestBilledCubicFeet, iucrtTestMarket) + suite.NoError(err) + suite.Equal(iucrtTestPriceCents, priceCents) + }) + + suite.Run("PriceUsingParams but sending empty params", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeIUCRT, iucrtTestMarket, iucrtTestBasePriceCents, testdatagen.DefaultContractCode, iucrtTestEscalationCompounded) + _, _, err := pricer.PriceUsingParams(suite.AppContextForTest(), models.PaymentServiceItemParams{}) + suite.Error(err) + }) + + suite.Run("not finding a rate record", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeIUCRT, iucrtTestMarket, iucrtTestBasePriceCents, testdatagen.DefaultContractCode, iucrtTestEscalationCompounded) + _, _, err := pricer.Price(suite.AppContextForTest(), "BOGUS", iucrtTestRequestedPickupDate, iucrtTestBilledCubicFeet, iucrtTestMarket) + suite.Error(err) + suite.Contains(err.Error(), "could not lookup International Accessorial Area Price") + }) + + suite.Run("not finding a contract year record", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeIUCRT, iucrtTestMarket, iucrtTestBasePriceCents, testdatagen.DefaultContractCode, iucrtTestEscalationCompounded) + twoYearsLaterPickupDate := iucrtTestRequestedPickupDate.AddDate(2, 0, 0) + _, _, err := pricer.Price(suite.AppContextForTest(), testdatagen.DefaultContractCode, twoYearsLaterPickupDate, iucrtTestBilledCubicFeet, iucrtTestMarket) + suite.Error(err) + suite.Contains(err.Error(), "could not lookup contract year") + }) +} + +func (suite *GHCRateEngineServiceSuite) setupIntlUncratingServiceItem() models.PaymentServiceItem { + return factory.BuildPaymentServiceItemWithParams( + suite.DB(), + models.ReServiceCodeIUCRT, + []factory.CreatePaymentServiceItemParams{ + { + Key: models.ServiceItemParamNameContractCode, + KeyType: models.ServiceItemParamTypeString, + Value: factory.DefaultContractCode, + }, + { + Key: models.ServiceItemParamNameCubicFeetBilled, + KeyType: models.ServiceItemParamTypeDecimal, + Value: fmt.Sprintf("%d", int(iucrtTestBilledCubicFeet)), + }, + { + Key: models.ServiceItemParamNameReferenceDate, + KeyType: models.ServiceItemParamTypeDate, + Value: iucrtTestRequestedPickupDate.Format(DateParamFormat), + }, + { + Key: models.ServiceItemParamNameMarketDest, + KeyType: models.ServiceItemParamTypeString, + Value: iucrtTestMarket.String(), + }, + }, nil, nil, + ) +} diff --git a/pkg/services/ghcrateengine/pricer_helpers_intl.go b/pkg/services/ghcrateengine/pricer_helpers_intl.go index 7d8d70508ea..db7337d19c3 100644 --- a/pkg/services/ghcrateengine/pricer_helpers_intl.go +++ b/pkg/services/ghcrateengine/pricer_helpers_intl.go @@ -114,3 +114,63 @@ func priceIntlPackUnpack(appCtx appcontext.AppContext, packUnpackCode models.ReS return totalCost, displayParams, nil } + +func priceIntlCratingUncrating(appCtx appcontext.AppContext, cratingUncratingCode models.ReServiceCode, contractCode string, referenceDate time.Time, billedCubicFeet unit.CubicFeet, standaloneCrate bool, standaloneCrateCap unit.Cents, externalCrate bool, market models.Market) (unit.Cents, services.PricingDisplayParams, error) { + if cratingUncratingCode != models.ReServiceCodeICRT && cratingUncratingCode != models.ReServiceCodeIUCRT { + return 0, nil, fmt.Errorf("unsupported international crating/uncrating code of %s", cratingUncratingCode) + } + + // Validate parameters + if len(contractCode) == 0 { + return 0, nil, errors.New("ContractCode is required") + } + if referenceDate.IsZero() { + return 0, nil, errors.New("ReferenceDate is required") + } + if market == "" { + return 0, nil, errors.New("Market is required") + } + + if externalCrate && billedCubicFeet < 4.0 { + return 0, nil, fmt.Errorf("external crates must be billed for a minimum of 4 cubic feet") + } + + internationalAccessorialPrice, err := fetchInternationalAccessorialPrice(appCtx, contractCode, cratingUncratingCode, market) + if err != nil { + return 0, nil, fmt.Errorf("could not lookup International Accessorial Area Price: %w", err) + } + + basePrice := internationalAccessorialPrice.PerUnitCents.Float64() + escalatedPrice, contractYear, err := escalatePriceForContractYear(appCtx, internationalAccessorialPrice.ContractID, referenceDate, false, basePrice) + if err != nil { + return 0, nil, fmt.Errorf("could not calculate escalated price: %w", err) + } + + escalatedPrice = escalatedPrice * float64(billedCubicFeet) + totalCost := unit.Cents(math.Round(escalatedPrice)) + + displayParams := services.PricingDisplayParams{ + { + Key: models.ServiceItemParamNamePriceRateOrFactor, + Value: FormatCents(internationalAccessorialPrice.PerUnitCents), + }, + { + Key: models.ServiceItemParamNameContractYearName, + Value: contractYear.Name, + }, + { + Key: models.ServiceItemParamNameEscalationCompounded, + Value: FormatEscalation(contractYear.EscalationCompounded), + }, + { + Key: models.ServiceItemParamNameUncappedRequestTotal, + Value: FormatCents(totalCost), + }, + } + + if (standaloneCrate) && (totalCost > standaloneCrateCap) { + totalCost = standaloneCrateCap + } + + return totalCost, displayParams, nil +} diff --git a/pkg/services/ghcrateengine/pricer_helpers_intl_test.go b/pkg/services/ghcrateengine/pricer_helpers_intl_test.go index 56d5bcce1dc..e0ae8a9817d 100644 --- a/pkg/services/ghcrateengine/pricer_helpers_intl_test.go +++ b/pkg/services/ghcrateengine/pricer_helpers_intl_test.go @@ -99,3 +99,58 @@ func (suite *GHCRateEngineServiceSuite) TestPriceIntlPackUnpack() { }) } + +func (suite *GHCRateEngineServiceSuite) TestPriceIntlCratingUncrating() { + suite.Run("crating golden path", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + + priceCents, displayParams, err := priceIntlCratingUncrating(suite.AppContextForTest(), models.ReServiceCodeICRT, testdatagen.DefaultContractCode, icrtTestRequestedPickupDate, icrtTestBilledCubicFeet, icrtTestStandaloneCrate, icrtTestStandaloneCrateCap, icrtTestExternalCrate, icrtTestMarket) + suite.NoError(err) + suite.Equal(icrtTestPriceCents, priceCents) + + expectedParams := services.PricingDisplayParams{ + {Key: models.ServiceItemParamNameContractYearName, Value: testdatagen.DefaultContractCode}, + {Key: models.ServiceItemParamNameEscalationCompounded, Value: FormatEscalation(icrtTestEscalationCompounded)}, + {Key: models.ServiceItemParamNamePriceRateOrFactor, Value: FormatCents(icrtTestBasePriceCents)}, + {Key: models.ServiceItemParamNameUncappedRequestTotal, Value: FormatCents(dcrtTestUncappedRequestTotal)}, + } + suite.validatePricerCreatedParams(expectedParams, displayParams) + }) + + suite.Run("invalid service code", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + _, _, err := priceIntlCratingUncrating(suite.AppContextForTest(), models.ReServiceCodeCS, testdatagen.DefaultContractCode, icrtTestRequestedPickupDate, icrtTestBilledCubicFeet, icrtTestStandaloneCrate, icrtTestStandaloneCrateCap, icrtTestExternalCrate, icrtTestMarket) + + suite.Error(err) + suite.Contains(err.Error(), "unsupported international crating/uncrating code") + }) + + suite.Run("invalid crate size - external crate", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + + badSize := unit.CubicFeet(1.0) + _, _, err := priceIntlCratingUncrating(suite.AppContextForTest(), models.ReServiceCodeICRT, testdatagen.DefaultContractCode, icrtTestRequestedPickupDate, badSize, icrtTestStandaloneCrate, icrtTestStandaloneCrateCap, true, icrtTestMarket) + + suite.Error(err) + suite.Contains(err.Error(), "external crates must be billed for a minimum of 4 cubic feet") + }) + + suite.Run("not finding a rate record", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + + _, _, err := priceIntlCratingUncrating(suite.AppContextForTest(), models.ReServiceCodeICRT, "BOGUS", icrtTestRequestedPickupDate, icrtTestBilledCubicFeet, icrtTestStandaloneCrate, icrtTestStandaloneCrateCap, icrtTestExternalCrate, icrtTestMarket) + + suite.Error(err) + suite.Contains(err.Error(), "could not lookup International Accessorial Area Price") + }) + + suite.Run("not finding a contract year record", func() { + suite.setupInternationalAccessorialPrice(models.ReServiceCodeICRT, icrtTestMarket, icrtTestBasePriceCents, testdatagen.DefaultContractCode, icrtTestEscalationCompounded) + + twoYearsLaterPickupDate := ioshutTestRequestedPickupDate.AddDate(2, 0, 0) + _, _, err := priceIntlCratingUncrating(suite.AppContextForTest(), models.ReServiceCodeICRT, testdatagen.DefaultContractCode, twoYearsLaterPickupDate, icrtTestBilledCubicFeet, icrtTestStandaloneCrate, icrtTestStandaloneCrateCap, icrtTestExternalCrate, icrtTestMarket) + + suite.Error(err) + suite.Contains(err.Error(), "could not calculate escalated price: could not lookup contract year") + }) +} diff --git a/pkg/services/ghcrateengine/service_item_pricer.go b/pkg/services/ghcrateengine/service_item_pricer.go index 130c137c7c6..93b83631a77 100644 --- a/pkg/services/ghcrateengine/service_item_pricer.go +++ b/pkg/services/ghcrateengine/service_item_pricer.go @@ -107,6 +107,10 @@ func PricerForServiceItem(serviceCode models.ReServiceCode) (services.ParamsPric return NewPortFuelSurchargePricer(), nil case models.ReServiceCodePODFSC: return NewPortFuelSurchargePricer(), nil + case models.ReServiceCodeICRT: + return NewIntlCratingPricer(), nil + case models.ReServiceCodeIUCRT: + return NewIntlUncratingPricer(), nil default: // TODO: We may want a different error type here after all pricers have been implemented return nil, apperror.NewNotImplementedError(fmt.Sprintf("pricer not found for code %s", serviceCode)) diff --git a/pkg/services/ghcrateengine/service_item_pricer_test.go b/pkg/services/ghcrateengine/service_item_pricer_test.go index c27652cf90d..cbaf02ba2e2 100644 --- a/pkg/services/ghcrateengine/service_item_pricer_test.go +++ b/pkg/services/ghcrateengine/service_item_pricer_test.go @@ -55,6 +55,8 @@ func (suite *GHCRateEngineServiceSuite) TestGetPricer() { {models.ReServiceCodeIOSHUT, &internationalOriginShuttlingPricer{}}, {models.ReServiceCodeDCRT, &domesticCratingPricer{}}, {models.ReServiceCodeDUCRT, &domesticUncratingPricer{}}, + {models.ReServiceCodeICRT, &intlCratingPricer{}}, + {models.ReServiceCodeIUCRT, &intlUncratingPricer{}}, {models.ReServiceCodeDPK, &domesticPackPricer{}}, {models.ReServiceCodeDNPK, &domesticNTSPackPricer{}}, {models.ReServiceCodeDUPK, &domesticUnpackPricer{}}, diff --git a/pkg/services/mto_service_item/mto_service_item_validators.go b/pkg/services/mto_service_item/mto_service_item_validators.go index 25a6768c335..5d915d230a7 100644 --- a/pkg/services/mto_service_item/mto_service_item_validators.go +++ b/pkg/services/mto_service_item/mto_service_item_validators.go @@ -48,6 +48,8 @@ var allSITServiceItemsToCheck = []models.ReServiceCode{ var allAccessorialServiceItemsToCheck = []models.ReServiceCode{ models.ReServiceCodeIDSHUT, models.ReServiceCodeIOSHUT, + models.ReServiceCodeICRT, + models.ReServiceCodeIUCRT, } var destSITServiceItems = []models.ReServiceCode{ diff --git a/swagger-def/prime.yaml b/swagger-def/prime.yaml index 5ca10ba69f1..5c352dad1fc 100644 --- a/swagger-def/prime.yaml +++ b/swagger-def/prime.yaml @@ -852,6 +852,29 @@ paths: } ``` + The following crating/uncrating service items can be resubmitted following a rejection: + - ICRT + - IUCRT + + At a MINIMUM, the payload for resubmitting a rejected crating/uncrating service item must look like this: + ```json + { + "item": { + "length": 10000, + "width": 10000, + "height": 10000 + }, + "crate": { + "length": 20000, + "width": 20000, + "height": 20000 + }, + "updateReason": "A reason that differs from the previous reason", + "modelType": "UpdateMTOServiceItemCrating", + "requestApprovalsRequestedStatus": true + } + ``` + operationId: updateMTOServiceItem tags: - mtoServiceItem @@ -1808,6 +1831,8 @@ definitions: * POEFSC - UpdateMTOServiceItemInternationalPortFSC * IDSHUT - UpdateMTOServiceItemInternationalShuttle * IOSHUT - UpdateMTOServiceItemInternationalShuttle + * ICRT - UpdateMTOServiceItemCrating + * IUCRT - UpdateMTOServiceItemCrating The documentation will then update with the supported fields. type: string @@ -1816,6 +1841,7 @@ definitions: - UpdateMTOServiceItemShuttle - UpdateMTOServiceItemInternationalPortFSC - UpdateMTOServiceItemInternationalShuttle + - UpdateMTOServiceItemCrating UpdateMTOServiceItemShuttle: # spectral oas2-unused-definition is OK here due to polymorphism description: | Subtype used to provide the estimated weight and actual weight for shuttle. This is not creating a new service item but rather updating an existing service item. @@ -1975,6 +2001,46 @@ definitions: enum: - PODFSC # International Port of Debarkation Fuel Surcharge - POEFSC # International Port of Embarkation Fuel Surcharge + UpdateMTOServiceItemCrating: # spectral oas2-unused-definition is OK here due to polymorphism + description: | + Subtype used to provide the size and types for crating. This is not creating a new service item but rather updating an existing service item. + allOf: + - $ref: '#/definitions/UpdateMTOServiceItem' + - type: object + properties: + item: + description: The dimensions of the item being crated. + allOf: + - $ref: 'definitions/prime/MTOServiceItemDimension.yaml' + crate: + description: The dimensions for the crate the item will be shipped in. + allOf: + - $ref: 'definitions/prime/MTOServiceItemDimension.yaml' + description: + type: string + example: Decorated horse head to be crated. + description: A description of the item being crated. + x-nullable: true + updateReason: + type: string + description: Reason for updating service item. + x-nullable: true + standaloneCrate: + type: boolean + x-nullable: true + externalCrate: + type: boolean + x-nullable: true + requestApprovalsRequestedStatus: + description: Indicates if "Approvals Requested" status is being requested. + type: boolean + x-nullable: true + reServiceCode: + type: string + description: Service code allowed for this model type. + enum: + - ICRT # International Crating + - IUCRT # International Uncrating UpdateMTOShipment: properties: actualProGearWeight: diff --git a/swagger/prime.yaml b/swagger/prime.yaml index e183ef0aa0d..16a75eaca9b 100644 --- a/swagger/prime.yaml +++ b/swagger/prime.yaml @@ -1108,6 +1108,38 @@ paths: } ``` + + + The following crating/uncrating service items can be resubmitted + following a rejection: + + - ICRT + + - IUCRT + + + At a MINIMUM, the payload for resubmitting a rejected crating/uncrating + service item must look like this: + + ```json + + { + "item": { + "length": 10000, + "width": 10000, + "height": 10000 + }, + "crate": { + "length": 20000, + "width": 20000, + "height": 20000 + }, + "updateReason": "A reason that differs from the previous reason", + "modelType": "UpdateMTOServiceItemCrating", + "requestApprovalsRequestedStatus": true + } + + ``` operationId: updateMTOServiceItem tags: - mtoServiceItem @@ -2688,6 +2720,8 @@ definitions: * POEFSC - UpdateMTOServiceItemInternationalPortFSC * IDSHUT - UpdateMTOServiceItemInternationalShuttle * IOSHUT - UpdateMTOServiceItemInternationalShuttle + * ICRT - UpdateMTOServiceItemCrating + * IUCRT - UpdateMTOServiceItemCrating The documentation will then update with the supported fields. type: string @@ -2696,6 +2730,7 @@ definitions: - UpdateMTOServiceItemShuttle - UpdateMTOServiceItemInternationalPortFSC - UpdateMTOServiceItemInternationalShuttle + - UpdateMTOServiceItemCrating UpdateMTOServiceItemShuttle: description: > Subtype used to provide the estimated weight and actual weight for @@ -2884,6 +2919,47 @@ definitions: enum: - PODFSC - POEFSC + UpdateMTOServiceItemCrating: + description: > + Subtype used to provide the size and types for crating. This is not + creating a new service item but rather updating an existing service item. + allOf: + - $ref: '#/definitions/UpdateMTOServiceItem' + - type: object + properties: + item: + description: The dimensions of the item being crated. + allOf: + - $ref: '#/definitions/MTOServiceItemDimension' + crate: + description: The dimensions for the crate the item will be shipped in. + allOf: + - $ref: '#/definitions/MTOServiceItemDimension' + description: + type: string + example: Decorated horse head to be crated. + description: A description of the item being crated. + x-nullable: true + updateReason: + type: string + description: Reason for updating service item. + x-nullable: true + standaloneCrate: + type: boolean + x-nullable: true + externalCrate: + type: boolean + x-nullable: true + requestApprovalsRequestedStatus: + description: Indicates if "Approvals Requested" status is being requested. + type: boolean + x-nullable: true + reServiceCode: + type: string + description: Service code allowed for this model type. + enum: + - ICRT + - IUCRT UpdateMTOShipment: properties: actualProGearWeight: From 99ba5afb34e0c2b18e037f8e12434089848bed54 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Wed, 5 Feb 2025 19:52:11 +0000 Subject: [PATCH 137/260] fixing test --- playwright/tests/office/txo/tooFlowsInternational.spec.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/playwright/tests/office/txo/tooFlowsInternational.spec.js b/playwright/tests/office/txo/tooFlowsInternational.spec.js index fdeb02599c4..0c5816fff1c 100644 --- a/playwright/tests/office/txo/tooFlowsInternational.spec.js +++ b/playwright/tests/office/txo/tooFlowsInternational.spec.js @@ -59,7 +59,6 @@ test.describe('TOO user', () => { // Edit the shipment address to AK await page.locator('[data-testid="ShipmentContainer"] .usa-button').first().click(); await page.locator('input[id="delivery.address-location-input"]').fill('99505'); - await page.keyboard.press('Enter'); await page.getByRole('button', { name: 'Save' }).click(); await tooFlowPage.waitForPage.moveDetails(); @@ -175,7 +174,6 @@ test.describe('TOO user', () => { // Edit the shipment address to AK await page.locator('[data-testid="ShipmentContainer"] .usa-button').first().click(); await page.locator('input[id="delivery.address-location-input"]').fill('99505'); - await page.keyboard.press('Enter'); await page.getByRole('button', { name: 'Save' }).click(); await tooFlowPage.waitForPage.moveDetails(); @@ -219,7 +217,7 @@ test.describe('TOO user', () => { // Approve a requested service item expect((await getServiceItemsInTable(requestedServiceItemsTable).count()) > 0); - // ICRT + await requestedServiceItemsTable.getByRole('button', { name: 'Accept' }).first().click(); await tooFlowPage.waitForLoading(); @@ -229,7 +227,6 @@ test.describe('TOO user', () => { await expect(getServiceItemsInTable(requestedServiceItemsTable)).toHaveCount(requestedServiceItemCount - 1); requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); - // IUCRT await requestedServiceItemsTable.getByRole('button', { name: 'Accept' }).first().click(); await tooFlowPage.waitForLoading(); @@ -242,7 +239,7 @@ test.describe('TOO user', () => { // Reject a requested service item await expect(page.getByText('Requested Service Items', { exact: false })).toBeVisible(); expect((await getServiceItemsInTable(requestedServiceItemsTable).count()) > 0); - // ICRT + await requestedServiceItemsTable.getByRole('button', { name: 'Reject' }).first().click(); await expect(page.getByTestId('modal')).toBeVisible(); @@ -261,7 +258,6 @@ test.describe('TOO user', () => { await expect(getServiceItemsInTable(requestedServiceItemsTable)).toHaveCount(requestedServiceItemCount - 1); requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); - // IUCRT await requestedServiceItemsTable.getByRole('button', { name: 'Reject' }).first().click(); await expect(page.getByTestId('modal')).toBeVisible(); From bad93ba9b22d86a85abf9a1b34d1840b8b0ac41a Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Wed, 5 Feb 2025 20:15:44 +0000 Subject: [PATCH 138/260] wrong class --- src/components/BulkAssignment/BulkAssignmentModal.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 8237727d049..e1342f6a94b 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -24,12 +24,12 @@ } .BulkAssignmentDataCenter { text-align: center; - padding-top: 15px; } .BulkAssignmentAssignment { width: 60px; text-align: center; padding-left: 15px; + padding-top: 15px; } } } From aa9734682fa8d67bbb4fb6065d557980b7105487 Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Wed, 5 Feb 2025 20:55:31 +0000 Subject: [PATCH 139/260] fixed px --- src/components/BulkAssignment/BulkAssignmentModal.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index e1342f6a94b..eadc1ee77bf 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -29,7 +29,7 @@ width: 60px; text-align: center; padding-left: 15px; - padding-top: 15px; + padding-top: 4px; } } } From 21f1e4ddd22769af4bb93123b3ecd578fa9cb74f Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Wed, 5 Feb 2025 21:14:57 +0000 Subject: [PATCH 140/260] fixing tests --- .../office/txo/tooFlowsInternational.spec.js | 52 ++++++------------- 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/playwright/tests/office/txo/tooFlowsInternational.spec.js b/playwright/tests/office/txo/tooFlowsInternational.spec.js index 0c5816fff1c..2b209b143ec 100644 --- a/playwright/tests/office/txo/tooFlowsInternational.spec.js +++ b/playwright/tests/office/txo/tooFlowsInternational.spec.js @@ -88,17 +88,19 @@ test.describe('TOO user', () => { return table.getByRole('rowgroup').nth(1).getByRole('row'); }; + await expect(page.getByText('Requested Service Items', { exact: false })).toBeVisible(); + await expect(page.getByTestId('modal')).not.toBeVisible(); + const requestedServiceItemsTable = page.getByTestId('RequestedServiceItemsTable'); - let requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); const approvedServiceItemsTable = page.getByTestId('ApprovedServiceItemsTable'); - let approvedServiceItemCount = await getServiceItemsInTable(approvedServiceItemsTable).count(); const rejectedServiceItemsTable = page.getByTestId('RejectedServiceItemsTable'); - let rejectedServiceItemCount = await getServiceItemsInTable(rejectedServiceItemsTable).count(); - await expect(page.getByText('Requested Service Items', { exact: false })).toBeVisible(); await expect(getServiceItemsInTable(requestedServiceItemsTable).nth(1)).toBeVisible(); + await expect(getServiceItemsInTable(approvedServiceItemsTable).nth(1)).toBeVisible(); - await expect(page.getByTestId('modal')).not.toBeVisible(); + let requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); + let approvedServiceItemCount = await getServiceItemsInTable(approvedServiceItemsTable).count(); + let rejectedServiceItemCount = await getServiceItemsInTable(rejectedServiceItemsTable).count(); // Approve a requested service item expect((await getServiceItemsInTable(requestedServiceItemsTable).count()) > 0); @@ -203,17 +205,19 @@ test.describe('TOO user', () => { return table.getByRole('rowgroup').nth(1).getByRole('row'); }; + await expect(page.getByText('Requested Service Items', { exact: false })).toBeVisible(); + await expect(page.getByTestId('modal')).not.toBeVisible(); + const requestedServiceItemsTable = page.getByTestId('RequestedServiceItemsTable'); - let requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); const approvedServiceItemsTable = page.getByTestId('ApprovedServiceItemsTable'); - let approvedServiceItemCount = await getServiceItemsInTable(approvedServiceItemsTable).count(); const rejectedServiceItemsTable = page.getByTestId('RejectedServiceItemsTable'); - let rejectedServiceItemCount = await getServiceItemsInTable(rejectedServiceItemsTable).count(); - await expect(page.getByText('Requested Service Items', { exact: false })).toBeVisible(); await expect(getServiceItemsInTable(requestedServiceItemsTable).nth(1)).toBeVisible(); + await expect(getServiceItemsInTable(approvedServiceItemsTable).nth(1)).toBeVisible(); - await expect(page.getByTestId('modal')).not.toBeVisible(); + let requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); + let approvedServiceItemCount = await getServiceItemsInTable(approvedServiceItemsTable).count(); + let rejectedServiceItemCount = await getServiceItemsInTable(rejectedServiceItemsTable).count(); // Approve a requested service item expect((await getServiceItemsInTable(requestedServiceItemsTable).count()) > 0); @@ -227,15 +231,6 @@ test.describe('TOO user', () => { await expect(getServiceItemsInTable(requestedServiceItemsTable)).toHaveCount(requestedServiceItemCount - 1); requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); - await requestedServiceItemsTable.getByRole('button', { name: 'Accept' }).first().click(); - await tooFlowPage.waitForLoading(); - - await expect(getServiceItemsInTable(approvedServiceItemsTable)).toHaveCount(approvedServiceItemCount + 1); - approvedServiceItemCount = await getServiceItemsInTable(approvedServiceItemsTable).count(); - - await expect(getServiceItemsInTable(requestedServiceItemsTable)).toHaveCount(requestedServiceItemCount - 1); - requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); - // Reject a requested service item await expect(page.getByText('Requested Service Items', { exact: false })).toBeVisible(); expect((await getServiceItemsInTable(requestedServiceItemsTable).count()) > 0); @@ -243,7 +238,7 @@ test.describe('TOO user', () => { await requestedServiceItemsTable.getByRole('button', { name: 'Reject' }).first().click(); await expect(page.getByTestId('modal')).toBeVisible(); - let modal = page.getByTestId('modal'); + const modal = page.getByTestId('modal'); await expect(modal.getByRole('button', { name: 'Submit' })).toBeDisabled(); await modal.getByRole('textbox').fill('my very valid reason'); @@ -257,23 +252,6 @@ test.describe('TOO user', () => { await expect(getServiceItemsInTable(requestedServiceItemsTable)).toHaveCount(requestedServiceItemCount - 1); requestedServiceItemCount = await getServiceItemsInTable(requestedServiceItemsTable).count(); - - await requestedServiceItemsTable.getByRole('button', { name: 'Reject' }).first().click(); - - await expect(page.getByTestId('modal')).toBeVisible(); - modal = page.getByTestId('modal'); - - await expect(modal.getByRole('button', { name: 'Submit' })).toBeDisabled(); - await modal.getByRole('textbox').fill('my very valid reason'); - await modal.getByRole('button', { name: 'Submit' }).click(); - - await expect(page.getByTestId('modal')).not.toBeVisible(); - - await expect(page.getByText('Rejected Service Items', { exact: false })).toBeVisible(); - await expect(getServiceItemsInTable(rejectedServiceItemsTable)).toHaveCount(rejectedServiceItemCount + 1); - rejectedServiceItemCount = await getServiceItemsInTable(rejectedServiceItemsTable).count(); - - await expect(getServiceItemsInTable(requestedServiceItemsTable)).toHaveCount(requestedServiceItemCount - 1); }); }); }); From 35d45ae9ab188521cf74abe21b0168811e2554d6 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 6 Feb 2025 18:16:34 +0000 Subject: [PATCH 141/260] B-21943 - update test comments, additional base case check for validator, added failing test optional skip flag. --- .../mto_service_item/mto_service_item_validators.go | 6 ++---- .../mto_service_item/mto_service_item_validators_test.go | 9 +++++---- scripts/run-server-test | 6 ++++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pkg/services/mto_service_item/mto_service_item_validators.go b/pkg/services/mto_service_item/mto_service_item_validators.go index c854181ad57..781cb30caf1 100644 --- a/pkg/services/mto_service_item/mto_service_item_validators.go +++ b/pkg/services/mto_service_item/mto_service_item_validators.go @@ -135,7 +135,6 @@ func (v *primeUpdateMTOServiceItemValidator) validate(appCtx appcontext.AppConte } // Checks that the SITDepartureDate - // - is not later than the authorized end date // - is not earlier than the SIT entry date err = serviceItemData.checkSITDepartureDate(appCtx) if err != nil { @@ -504,11 +503,10 @@ func (v *updateMTOServiceItemData) checkSITEntryDateAndFADD(_ appcontext.AppCont } // checkSITDepartureDate checks that the SITDepartureDate: -// - is not later than the authorized end date // - is not earlier than the SIT entry date func (v *updateMTOServiceItemData) checkSITDepartureDate(_ appcontext.AppContext) error { - if v.updatedServiceItem.SITDepartureDate == nil || v.updatedServiceItem.SITDepartureDate == v.oldServiceItem.SITDepartureDate { - return nil // the SITDepartureDate isn't being updated, so we're fine here + if (v.updatedServiceItem.SITDepartureDate == nil || v.updatedServiceItem.SITDepartureDate == v.oldServiceItem.SITDepartureDate) && (v.updatedServiceItem.SITEntryDate == nil || v.updatedServiceItem.SITEntryDate == v.oldServiceItem.SITEntryDate) { + return nil // the SITDepartureDate or SITEntryDate isn't being updated, so we're fine here } if v.updatedServiceItem.SITDepartureDate != nil { diff --git a/pkg/services/mto_service_item/mto_service_item_validators_test.go b/pkg/services/mto_service_item/mto_service_item_validators_test.go index 46cda067981..de41dc6bc9d 100644 --- a/pkg/services/mto_service_item/mto_service_item_validators_test.go +++ b/pkg/services/mto_service_item/mto_service_item_validators_test.go @@ -793,8 +793,9 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemData() { suite.Run("SITDepartureDate - Does not error or update shipment auth end date when set after the authorized end date", func() { // Under test: checkSITDepartureDate checks that - // the SITDepartureDate is not later than the authorized end date - // Set up: Create an old and new DOPSIT and DDDSIT, with a date later than the + // the SITDepartureDate can be later than the authorized end date + // and that the authorized end dates is not updated when that occurs + // Set up: Create an old and new DOPSIT and DDDSIT, with a departure date later than the // shipment and try to update. // Expected outcome: No ERROR if departure date comes after the end date. // Shipment auth end date does not change @@ -842,7 +843,7 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemData() { suite.NoError(err) suite.False(serviceItemData.verrs.HasAny()) - // Double check the shipment and ensure that the SITDepartureDate is in fact after the authorized end date + // Double check the shipment and ensure that the SITDepartureDate is after the authorized end date and does not alter the authorized end date var postUpdateShipment models.MTOShipment err = suite.DB().Find(&postUpdateShipment, mtoShipment.ID) suite.NoError(err) @@ -858,7 +859,7 @@ func (suite *MTOServiceItemServiceSuite) TestUpdateMTOServiceItemData() { }) - suite.Run("SITDepartureDate - errors when set before the SIT entry date", func() { + suite.Run("SITDepartureDate - errors when set before or equal the SIT entry date", func() { mtoShipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ { Model: models.MTOShipment{OriginSITAuthEndDate: &now, diff --git a/scripts/run-server-test b/scripts/run-server-test index 0ead8674b81..8dfc3ef3be0 100755 --- a/scripts/run-server-test +++ b/scripts/run-server-test @@ -47,6 +47,12 @@ else gotest_args+=("-parallel" "8") gotest_args+=("-failfast") fi + +## Add SKIP_FAIL_TESTS on dev machine within .envrc.local file +if [ -n "${SKIP_FAIL_TESTS+x}" ]; then + gotest_args+=("-skip" "TestGHCRateEngineImportSuite") +fi + ## mac users uncomment the following line to run tests with the classic linker, which clears a lot of warnings that fill the console, do not commit to repo uncommented #gotest_args+=("-ldflags=-extldflags=-Wl,-ld_classic") From 00cf63a58108fd985a32ffdf6dc3face39182df9 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 6 Feb 2025 18:45:43 +0000 Subject: [PATCH 142/260] B-22056 - deploy to exp. --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dcf1897da35..cc13ae3a7a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,16 +29,16 @@ variables: GOLANGCI_LINT_VERBOSE: "-v" # Specify the environment: loadtest, demo, exp - DP3_ENV: &dp3_env placeholder_env + DP3_ENV: &dp3_env exp # Specify the branch to deploy TODO: this might be not needed. So far useless - DP3_BRANCH: &dp3_branch placeholder_branch_name + DP3_BRANCH: &dp3_branch MAIN-B-22056_sns_sqs_deps_w_endpoint # Ignore branches for integration tests - INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch placeholder_branch_name - INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch placeholder_branch_name - CLIENT_IGNORE_BRANCH: &client_ignore_branch placeholder_branch_name - SERVER_IGNORE_BRANCH: &server_ignore_branch placeholder_branch_name + INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch MAIN-B-22056_sns_sqs_deps_w_endpoint + INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch MAIN-B-22056_sns_sqs_deps_w_endpoint + CLIENT_IGNORE_BRANCH: &client_ignore_branch MAIN-B-22056_sns_sqs_deps_w_endpoint + SERVER_IGNORE_BRANCH: &server_ignore_branch MAIN-B-22056_sns_sqs_deps_w_endpoint OTEL_IMAGE_TAG: &otel_image_tag "git-$OTEL_VERSION-$CI_COMMIT_SHORT_SHA" From ede66c823a1c4d8cf53905128bd3c3db8f64d7b3 Mon Sep 17 00:00:00 2001 From: ryan-mchugh Date: Thu, 6 Feb 2025 20:04:12 +0000 Subject: [PATCH 143/260] B-22056 - restore exp env. --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc13ae3a7a9..dcf1897da35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,16 +29,16 @@ variables: GOLANGCI_LINT_VERBOSE: "-v" # Specify the environment: loadtest, demo, exp - DP3_ENV: &dp3_env exp + DP3_ENV: &dp3_env placeholder_env # Specify the branch to deploy TODO: this might be not needed. So far useless - DP3_BRANCH: &dp3_branch MAIN-B-22056_sns_sqs_deps_w_endpoint + DP3_BRANCH: &dp3_branch placeholder_branch_name # Ignore branches for integration tests - INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch MAIN-B-22056_sns_sqs_deps_w_endpoint - INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch MAIN-B-22056_sns_sqs_deps_w_endpoint - CLIENT_IGNORE_BRANCH: &client_ignore_branch MAIN-B-22056_sns_sqs_deps_w_endpoint - SERVER_IGNORE_BRANCH: &server_ignore_branch MAIN-B-22056_sns_sqs_deps_w_endpoint + INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch placeholder_branch_name + INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch placeholder_branch_name + CLIENT_IGNORE_BRANCH: &client_ignore_branch placeholder_branch_name + SERVER_IGNORE_BRANCH: &server_ignore_branch placeholder_branch_name OTEL_IMAGE_TAG: &otel_image_tag "git-$OTEL_VERSION-$CI_COMMIT_SHORT_SHA" From e19e11c090e40bcb48f2ab856553f7d85636b8a7 Mon Sep 17 00:00:00 2001 From: Tae Jung Date: Thu, 6 Feb 2025 23:09:22 +0000 Subject: [PATCH 144/260] added frontend work for intl crating and uncrating payment request --- pkg/testdatagen/testharness/dispatch.go | 3 + pkg/testdatagen/testharness/make_move.go | 371 ++++++++++++++++++ .../office/txo/tioFlowsInternational.spec.js | 92 +++++ playwright/tests/utils/testharness.js | 8 + .../Office/ServiceItemCalculations/helpers.js | 102 ++++- .../ServiceItemCalculations/helpers.test.js | 28 +- .../serviceItemTestParams.js | 54 +++ src/constants/serviceItems.js | 13 +- 8 files changed, 663 insertions(+), 8 deletions(-) diff --git a/pkg/testdatagen/testharness/dispatch.go b/pkg/testdatagen/testharness/dispatch.go index 0ed11caf74a..f7e39c22f2f 100644 --- a/pkg/testdatagen/testharness/dispatch.go +++ b/pkg/testdatagen/testharness/dispatch.go @@ -272,6 +272,9 @@ var actionDispatcher = map[string]actionFunc{ "InternationalHHGMoveWithServiceItemsandPaymentRequestsForTIO": func(appCtx appcontext.AppContext) testHarnessResponse { return MakeBasicInternationalHHGMoveWithServiceItemsandPaymentRequestsForTIO(appCtx) }, + "IntlHHGMoveWithCratingUncratingServiceItemsAndPaymentRequestsForTIO": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveWithCratingUncratingServiceItemsAndPaymentRequestsForTIO(appCtx) + }, } func Actions() []string { diff --git a/pkg/testdatagen/testharness/make_move.go b/pkg/testdatagen/testharness/make_move.go index 3e2f5fed100..16984751b00 100644 --- a/pkg/testdatagen/testharness/make_move.go +++ b/pkg/testdatagen/testharness/make_move.go @@ -9380,3 +9380,374 @@ func MakeBasicInternationalHHGMoveWithServiceItemsandPaymentRequestsForTIO(appCt return *newmove } + +// MakeIntlHHGMoveWithCratingUncratingServiceItemsAndPaymentRequestsForTIO creates an iHHG move +// that has been approved by TOO & prime has requested payment for intl crating and uncrating service items +func MakeIntlHHGMoveWithCratingUncratingServiceItemsAndPaymentRequestsForTIO(appCtx appcontext.AppContext) models.Move { + userUploader := newUserUploader(appCtx) + + // Create Customer + userInfo := newUserInfo("customer") + customer := factory.BuildExtendedServiceMember(appCtx.DB(), []factory.Customization{ + { + Model: models.ServiceMember{ + PersonalEmail: &userInfo.email, + FirstName: &userInfo.firstName, + LastName: &userInfo.lastName, + CacValidated: true, + }, + }, + }, nil) + + // address setup + addressAK := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: "123 Cold St", + City: "Anchorage", + State: "AK", + PostalCode: "99505", + }, + }, + }, nil) + destDutyLocationAK := factory.BuildDutyLocation(appCtx.DB(), []factory.Customization{ + { + Model: addressAK, + LinkOnly: true, + }, + }, nil) + + // orders setup using AK destination duty location + orders := factory.BuildOrder(appCtx.DB(), []factory.Customization{ + { + Model: customer, + LinkOnly: true, + }, + { + Model: models.UserUpload{}, + ExtendedParams: &factory.UserUploadExtendedParams{ + UserUploader: userUploader, + AppContext: appCtx, + }, + }, + { + Model: models.Order{ + NewDutyLocationID: destDutyLocationAK.ID, + }, + }, + }, nil) + + mto := factory.BuildMove(appCtx.DB(), []factory.Customization{ + { + Model: orders, + LinkOnly: true, + }, + { + Model: models.Move{ + AvailableToPrimeAt: models.TimePointer(time.Now()), + }, + }, + }, nil) + + shipmentPickupAddress := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + // This is a postal code that maps to the default office user gbloc KKFA in the PostalCodeToGBLOC table + PostalCode: "85004", + }, + }, + }, nil) + alaskaDestAddress := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: "123 Cold St", + City: "Anchorage", + State: "AK", + PostalCode: "99505", + IsOconus: models.BoolPointer(true), + }, + }, + }, nil) + + estimatedWeight := unit.Pound(2000) + actualWeight := unit.Pound(2000) + mtoShipmentHHG := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: &estimatedWeight, + PrimeActualWeight: &actualWeight, + ShipmentType: models.MTOShipmentTypeHHG, + ApprovedDate: models.TimePointer(time.Now()), + MarketCode: models.MarketCodeInternational, + }, + }, + { + Model: shipmentPickupAddress, + LinkOnly: true, + Type: &factory.Addresses.PickupAddress, + }, + { + Model: alaskaDestAddress, + LinkOnly: true, + Type: &factory.Addresses.DeliveryAddress, + }, + { + Model: mto, + LinkOnly: true, + }, + }, nil) + + // Create Releasing Agent + agentUserInfo := newUserInfo("agent") + factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ + { + Model: mtoShipmentHHG, + LinkOnly: true, + }, + { + Model: models.MTOAgent{ + ID: uuid.Must(uuid.NewV4()), + FirstName: &agentUserInfo.firstName, + LastName: &agentUserInfo.lastName, + Email: &agentUserInfo.email, + MTOAgentType: models.MTOAgentReleasing, + }, + }, + }, nil) + + paymentRequestHHG := factory.BuildPaymentRequest(appCtx.DB(), []factory.Customization{ + { + Model: models.PaymentRequest{ + IsFinal: false, + Status: models.PaymentRequestStatusPending, + RejectionReason: nil, + }, + }, + { + Model: mto, + LinkOnly: true, + }, + }, nil) + + // for soft deleted proof of service docs + factory.BuildPrimeUpload(appCtx.DB(), []factory.Customization{ + { + Model: paymentRequestHHG, + LinkOnly: true, + }, + }, []factory.Trait{factory.GetTraitPrimeUploadDeleted}) + + currentTime := time.Now() + + cratingPaymentServiceItemParams := []factory.CreatePaymentServiceItemParams{ + { + Key: models.ServiceItemParamNameContractCode, + KeyType: models.ServiceItemParamTypeString, + Value: factory.DefaultContractCode, + }, + { + Key: models.ServiceItemParamNameEscalationCompounded, + KeyType: models.ServiceItemParamTypeString, + Value: strconv.FormatFloat(1.125, 'f', 5, 64), + }, + { + Key: models.ServiceItemParamNamePriceRateOrFactor, + KeyType: models.ServiceItemParamTypeString, + Value: "1.71", + }, + { + Key: models.ServiceItemParamNameCubicFeetBilled, + KeyType: models.ServiceItemParamTypeDecimal, + Value: "12", + }, + { + Key: models.ServiceItemParamNameReferenceDate, + KeyType: models.ServiceItemParamTypeDate, + Value: currentTime.Format("2006-01-02"), + }, + { + Key: models.ServiceItemParamNameStandaloneCrate, + KeyType: models.ServiceItemParamTypeBoolean, + Value: strconv.FormatBool(true), + }, + { + Key: models.ServiceItemParamNameStandaloneCrateCap, + KeyType: models.ServiceItemParamTypeInteger, + Value: strconv.FormatInt(100000, 10), + }, + { + Key: models.ServiceItemParamNameMarketOrigin, + KeyType: models.ServiceItemParamTypeString, + Value: "O", + }, + { + Key: models.ServiceItemParamNameExternalCrate, + KeyType: models.ServiceItemParamTypeBoolean, + Value: strconv.FormatBool(true), + }, + { + Key: models.ServiceItemParamNameDimensionHeight, + KeyType: models.ServiceItemParamTypeString, + Value: "10", + }, + { + Key: models.ServiceItemParamNameDimensionLength, + KeyType: models.ServiceItemParamTypeString, + Value: "12", + }, + { + Key: models.ServiceItemParamNameDimensionWidth, + KeyType: models.ServiceItemParamTypeString, + Value: "3", + }, + } + desc := "description test" + icrt := factory.BuildMTOServiceItem(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + Description: &desc, + StandaloneCrate: models.BoolPointer(true), + ExternalCrate: models.BoolPointer(true), + }, + }, + { + Model: mto, + LinkOnly: true, + }, + { + Model: mtoShipmentHHG, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeICRT, + }, + }, + }, nil) + + factory.BuildPaymentServiceItemWithParams(appCtx.DB(), models.ReServiceCodeICRT, + cratingPaymentServiceItemParams, []factory.Customization{ + { + Model: mto, + LinkOnly: true, + }, + { + Model: mtoShipmentHHG, + LinkOnly: true, + }, + { + Model: paymentRequestHHG, + LinkOnly: true, + }, + { + Model: icrt, + LinkOnly: true, + }, + }, nil) + + iucrt := factory.BuildMTOServiceItem(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + Description: &desc, + }, + }, + { + Model: mto, + LinkOnly: true, + }, + { + Model: mtoShipmentHHG, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeIUCRT, + }, + }, + }, nil) + + unCratingPaymentServiceItemParams := []factory.CreatePaymentServiceItemParams{ + { + Key: models.ServiceItemParamNameContractCode, + KeyType: models.ServiceItemParamTypeString, + Value: factory.DefaultContractCode, + }, + { + Key: models.ServiceItemParamNameEscalationCompounded, + KeyType: models.ServiceItemParamTypeString, + Value: strconv.FormatFloat(1.125, 'f', 5, 64), + }, + { + Key: models.ServiceItemParamNamePriceRateOrFactor, + KeyType: models.ServiceItemParamTypeString, + Value: "1.71", + }, + { + Key: models.ServiceItemParamNameCubicFeetBilled, + KeyType: models.ServiceItemParamTypeDecimal, + Value: "12", + }, + { + Key: models.ServiceItemParamNameReferenceDate, + KeyType: models.ServiceItemParamTypeDate, + Value: currentTime.Format("2006-01-02"), + }, + { + Key: models.ServiceItemParamNameMarketDest, + KeyType: models.ServiceItemParamTypeString, + Value: "O", + }, + { + Key: models.ServiceItemParamNameDimensionHeight, + KeyType: models.ServiceItemParamTypeString, + Value: "10", + }, + { + Key: models.ServiceItemParamNameDimensionLength, + KeyType: models.ServiceItemParamTypeString, + Value: "12", + }, + { + Key: models.ServiceItemParamNameDimensionWidth, + KeyType: models.ServiceItemParamTypeString, + Value: "3", + }, + } + + factory.BuildPaymentServiceItemWithParams(appCtx.DB(), models.ReServiceCodeIUCRT, + unCratingPaymentServiceItemParams, []factory.Customization{ + { + Model: mto, + LinkOnly: true, + }, + { + Model: mtoShipmentHHG, + LinkOnly: true, + }, + { + Model: paymentRequestHHG, + LinkOnly: true, + }, + { + Model: iucrt, + LinkOnly: true, + }, + }, nil) + + // re-fetch the move so that we ensure we have exactly what is in + // the db + newmove, err := models.FetchMove(appCtx.DB(), &auth.Session{}, mto.ID) + if err != nil { + log.Panic(fmt.Errorf("failed to fetch move: %w", err)) + } + + // load payment requests so tests can confirm + err = appCtx.DB().Load(newmove, "PaymentRequests") + if err != nil { + log.Panic(fmt.Errorf("failed to fetch move payment requestse: %w", err)) + } + + return *newmove +} diff --git a/playwright/tests/office/txo/tioFlowsInternational.spec.js b/playwright/tests/office/txo/tioFlowsInternational.spec.js index 2b97f19078b..bf565aa85c2 100644 --- a/playwright/tests/office/txo/tioFlowsInternational.spec.js +++ b/playwright/tests/office/txo/tioFlowsInternational.spec.js @@ -187,4 +187,96 @@ test.describe('TIO user', () => { // in the TIO queue - only "Payment requested" moves will appear await expect(paymentSection.locator('td', { hasText: 'Reviewed' })).not.toBeVisible(); }); + + test('can review a payment request for international crating/uncrating service items', async ({ + page, + officePage, + }) => { + test.slow(); + const move = + await officePage.testHarness.buildIntlHHGMoveWithCratingUncratingServiceItemsAndPaymentRequestsForTIO(); + await officePage.signInAsNewTIOUser(); + + tioFlowPage = new TioFlowPage(officePage, move, true); + await tioFlowPage.waitForLoading(); + await officePage.tioNavigateToMove(tioFlowPage.moveLocator); + await officePage.page.getByRole('heading', { name: 'Payment Requests', exact: true }).waitFor(); + expect(page.url()).toContain('/payment-requests'); + await expect(page.getByTestId('MovePaymentRequests')).toBeVisible(); + + const prNumber = tioFlowPage.paymentRequest.payment_request_number; + const prHeading = page.getByRole('heading', { name: `Payment Request ${prNumber}` }); + await expect(prHeading).toBeVisible(); + await tioFlowPage.waitForLoading(); + + await page.getByRole('button', { name: 'Review service items' }).click(); + + await page.waitForURL(`**/payment-requests/${tioFlowPage.paymentRequest.id}`); + await tioFlowPage.waitForLoading(); + + // ICRT + await expect(page.getByTestId('ReviewServiceItems')).toBeVisible(); + await expect(page.getByText('International crating')).toBeVisible(); + await page.getByText('Show calculations').click(); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Calculations'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Crating size (cu ft)'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Description'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Dimensions'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('External crate'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Crating price (per cu ft)'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Market'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Crating date'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('International'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Price escalation factor'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Uncapped request total'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Standalone crate cap'); + // approve + await tioFlowPage.approveServiceItem(); + await page.getByTestId('nextServiceItem').click(); + await tioFlowPage.slowDown(); + + // IUCRT + await expect(page.getByText('International uncrating')).toBeVisible(); + await page.getByText('Show calculations').click(); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Calculations'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Crating size (cu ft)'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Description'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Dimensions'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Uncrating price (per cu ft)'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Market'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Uncrating date'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('International'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Price escalation factor'); + // approve + await tioFlowPage.approveServiceItem(); + await page.getByTestId('nextServiceItem').click(); + await tioFlowPage.slowDown(); + + await expect(page.getByText('needs your review')).toHaveCount(0, { timeout: 10000 }); + await page.getByText('Complete request').click(); + + await page.getByText('Authorize payment').click(); + await tioFlowPage.waitForLoading(); + + await tioFlowPage.slowDown(); + expect(page.url()).toContain('/payment-requests'); + + await expect(page.getByTestId('tag')).toBeVisible(); + await expect(page.getByTestId('tag').getByText('Reviewed')).toHaveCount(1); + + // ensure the payment request we approved no longer has the "Review Service Items" button + await expect(page.getByText('Review Service Items')).toHaveCount(0); + + // Go back to queue + await page.locator('a[title="Home"]').click(); + await tioFlowPage.waitForLoading(); + + // search for the moveLocator in case this move doesn't show up on the first page + await page.locator('#locator').fill(tioFlowPage.moveLocator); + await page.locator('#locator').blur(); + const paymentSection = page.locator(`[data-uuid="${tioFlowPage.paymentRequest.id}"]`); + // the payment request that is now in the "Reviewed" status will no longer appear + // in the TIO queue - only "Payment requested" moves will appear + await expect(paymentSection.locator('td', { hasText: 'Reviewed' })).not.toBeVisible(); + }); }); diff --git a/playwright/tests/utils/testharness.js b/playwright/tests/utils/testharness.js index cc84f4c61f9..9a9e6ebb124 100644 --- a/playwright/tests/utils/testharness.js +++ b/playwright/tests/utils/testharness.js @@ -387,6 +387,14 @@ export class TestHarness { return this.buildDefault('InternationalHHGMoveWithServiceItemsandPaymentRequestsForTIO'); } + /** + * Use testharness to build ihhg move for TIO + * @returns {Promise} + */ + async buildIntlHHGMoveWithCratingUncratingServiceItemsAndPaymentRequestsForTIO() { + return this.buildDefault('IntlHHGMoveWithCratingUncratingServiceItemsAndPaymentRequestsForTIO'); + } + /** * Use testharness to build hhg move for QAE * @returns {Promise} diff --git a/src/components/Office/ServiceItemCalculations/helpers.js b/src/components/Office/ServiceItemCalculations/helpers.js index c5d26d73e75..6621896a7ff 100644 --- a/src/components/Office/ServiceItemCalculations/helpers.js +++ b/src/components/Office/ServiceItemCalculations/helpers.js @@ -28,6 +28,22 @@ const peak = (params) => { }`; }; +const market = (params) => { + let marketText = `${SERVICE_ITEM_CALCULATION_LABELS.Market}: `; + + if (getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketOrigin, params)) { + marketText += ` ${ + getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketOrigin, params)?.toLowerCase() === 'o' ? 'OCONUS' : 'CONUS' + }`; + } else { + marketText += ` ${ + getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketDest, params)?.toLowerCase() === 'o' ? 'OCONUS' : 'CONUS' + }`; + } + + return marketText; +}; + const serviceAreaOrigin = (params) => { return `${SERVICE_ITEM_CALCULATION_LABELS[SERVICE_ITEM_PARAM_KEYS.ServiceAreaOrigin]}: ${getParamValue( SERVICE_ITEM_PARAM_KEYS.ServiceAreaOrigin, @@ -647,18 +663,71 @@ const unCratingPrice = (params) => { ); }; +const cratingPriceIntl = (params) => { + const value = getParamValue(SERVICE_ITEM_PARAM_KEYS.PriceRateOrFactor, params); + const label = SERVICE_ITEM_CALCULATION_LABELS.CratingPrice; + + return calculation( + value, + label, + formatDetail(market(params)), + formatDetail(cratingDate(params)), + formatDetail(SERVICE_ITEM_CALCULATION_LABELS.International), + ); +}; + +const unCratingPriceIntl = (params) => { + const value = getParamValue(SERVICE_ITEM_PARAM_KEYS.PriceRateOrFactor, params); + const label = SERVICE_ITEM_CALCULATION_LABELS.UncratingPrice; + + return calculation( + value, + label, + formatDetail(market(params)), + formatDetail(unCratingDate(params)), + formatDetail(SERVICE_ITEM_CALCULATION_LABELS.International), + ); +}; + const cratingSize = (params, mtoParams) => { - const value = getParamValue(SERVICE_ITEM_PARAM_KEYS.CubicFeetBilled, params); + const cubicFeetBilled = getParamValue(SERVICE_ITEM_PARAM_KEYS.CubicFeetBilled, params); const length = getParamValue(SERVICE_ITEM_PARAM_KEYS.DimensionLength, params); const height = getParamValue(SERVICE_ITEM_PARAM_KEYS.DimensionHeight, params); const width = getParamValue(SERVICE_ITEM_PARAM_KEYS.DimensionWidth, params); - const label = SERVICE_ITEM_CALCULATION_LABELS.CubicFeetBilled; + let label = SERVICE_ITEM_CALCULATION_LABELS.CubicFeetBilled; const description = `${SERVICE_ITEM_CALCULATION_LABELS.Description}: ${mtoParams.description}`; const formattedDimensions = `${SERVICE_ITEM_CALCULATION_LABELS.Dimensions}: ${length}x${width}x${height} in`; - return calculation(value, label, formatDetail(description), formatDetail(formattedDimensions)); + const externalCrate = + getParamValue(SERVICE_ITEM_PARAM_KEYS.ExternalCrate, params)?.toLowerCase() === 'true' + ? SERVICE_ITEM_CALCULATION_LABELS.ExternalCrate + : ''; + + // currently external intl crate gets 4 cu ft min applied to pricing + const minimumSizeApplied = externalCrate && cubicFeetBilled.toString() === '4.00'; + + if (minimumSizeApplied) { + label += ' - Minimum'; + } + + // show actual size if minimum was applied + const cubicFeetCrating = minimumSizeApplied + ? `${SERVICE_ITEM_CALCULATION_LABELS.CubicFeetCrating}: ${getParamValue( + SERVICE_ITEM_PARAM_KEYS.CubicFeetCrating, + params, + )} cu ft` + : ''; + + return calculation( + cubicFeetBilled, + label, + formatDetail(description), + formatDetail(formattedDimensions), + formatDetail(cubicFeetCrating), + formatDetail(externalCrate), + ); }; const standaloneCrate = (params) => { @@ -680,7 +749,7 @@ const standaloneCrate = (params) => { const uncappedRequestTotal = (params) => { const uncappedTotal = getParamValue(SERVICE_ITEM_PARAM_KEYS.UncappedRequestTotal, params); const value = toDollarString(uncappedTotal); - const label = `${SERVICE_ITEM_CALCULATION_LABELS.UncappedRequestTotal}:`; + const label = `${SERVICE_ITEM_CALCULATION_LABELS.UncappedRequestTotal}`; return calculation(value, label); }; @@ -950,6 +1019,31 @@ export default function makeCalculations(itemCode, totalAmount, params, mtoParam totalAmountRequested(totalAmount), ]; break; + // International crating + case SERVICE_ITEM_CODES.ICRT: + result = [ + cratingSize(params, mtoParams), + cratingPriceIntl(params), + priceEscalationFactorWithoutContractYear(params), + totalAmountRequested(totalAmount), + ]; + if ( + SERVICE_ITEM_PARAM_KEYS.StandaloneCrate !== null && + getParamValue(SERVICE_ITEM_PARAM_KEYS.StandaloneCrate, params) === 'true' + ) { + result.splice(result.length - 1, 0, uncappedRequestTotal(params)); + result.splice(result.length - 1, 0, standaloneCrate(params)); + } + break; + // International uncrating + case SERVICE_ITEM_CODES.IUCRT: + result = [ + cratingSize(params, mtoParams), + unCratingPriceIntl(params), + priceEscalationFactorWithoutContractYear(params), + totalAmountRequested(totalAmount), + ]; + break; default: break; } diff --git a/src/components/Office/ServiceItemCalculations/helpers.test.js b/src/components/Office/ServiceItemCalculations/helpers.test.js index 8ca38112f65..4ff4fb3e02b 100644 --- a/src/components/Office/ServiceItemCalculations/helpers.test.js +++ b/src/components/Office/ServiceItemCalculations/helpers.test.js @@ -11,12 +11,12 @@ function testData(code) { 'Crating size (cu ft)': '4.00', }; } - if (code === 'DCRT') { + if (code === 'DCRT' || code === 'ICRT') { result = { ...result, 'Crating price (per cu ft)': '1.71', }; - } else if (code === 'DUCRT') { + } else if (code === 'DUCRT' || code === 'IUCRT') { result = { ...result, 'Uncrating price (per cu ft)': '1.71', @@ -363,4 +363,28 @@ describe('DomesticDestinationSITDelivery', () => { const expected = testData('PODFSC'); testAB(result, expected); }); + + it('returns correct data for ICRT', () => { + const result = makeCalculations( + 'ICRT', + 99999, + testParams.InternationalCrating, + testParams.additionalCratingDataDCRT, + ); + const expected = testData('ICRT'); + + testAB(result, expected); + }); + + it('returns correct data for IUCRT', () => { + const result = makeCalculations( + 'IUCRT', + 99999, + testParams.InternationalUncrating, + testParams.additionalCratingDataDCRT, + ); + const expected = testData('IUCRT'); + + testAB(result, expected); + }); }); diff --git a/src/components/Office/ServiceItemCalculations/serviceItemTestParams.js b/src/components/Office/ServiceItemCalculations/serviceItemTestParams.js index e234dc167c9..bf29cdd1807 100644 --- a/src/components/Office/ServiceItemCalculations/serviceItemTestParams.js +++ b/src/components/Office/ServiceItemCalculations/serviceItemTestParams.js @@ -493,6 +493,33 @@ const PortZip = { type: 'STRING', value: '99505', }; +const ExternalCrate = { + eTag: 'MjAyMS0wNy0yOVQyMDoxNTowMS4xNDA1MjZa', + id: 'f5bb063e-38da-4c86-88ce-a6a328e70b92', + key: 'ExternalCrate', + origin: 'PRIME', + paymentServiceItemID: '28039a62-387d-479f-b50f-e0041b7e6e22', + type: 'BOOLEAN', + value: 'FALSE', +}; +const MarketOrigin = { + eTag: 'MjAyMS0wNy0yOVQyMDoxNTowMS4xNDA1MjZa', + id: 'f5bb063e-38da-4c86-88ce-a6a328e70b92', + key: 'MarketOrigin', + origin: 'PRIME', + paymentServiceItemID: '28039a62-387d-479f-b50f-e0041b7e6e22', + type: 'STRING', + value: 'O', +}; +const MarketDest = { + eTag: 'MjAyMS0wNy0yOVQyMDoxNTowMS4xNDA1MjZa', + id: 'f5bb063e-38da-4c86-88ce-a6a328e70b92', + key: 'MarketDest', + origin: 'PRIME', + paymentServiceItemID: '28039a62-387d-479f-b50f-e0041b7e6e22', + type: 'STRING', + value: 'C', +}; const testParams = { DomesticLongHaul: [ ContractCode, @@ -916,6 +943,33 @@ const testParams = { ZipPickupAddress, PortZip, ], + InternationalCrating: [ + ContractYearName, + EscalationCompounded, + PriceRateOrFactor, + ReferenceDate, + CubicFeetBilled, + MarketOrigin, + ServiceAreaOrigin, + ZipPickupAddress, + DimensionWidth, + DimensionHeight, + DimensionLength, + StandaloneCrate, + ExternalCrate, + ], + InternationalUncrating: [ + ReferenceDate, + EscalationCompounded, + CubicFeetBilled, + PriceRateOrFactor, + MarketDest, + ServiceAreaDest, + ZipDestAddress, + DimensionWidth, + DimensionHeight, + DimensionLength, + ], additionalCratingDataDCRT: { reServiceCode: 'DCRT', description: 'Grand piano', diff --git a/src/constants/serviceItems.js b/src/constants/serviceItems.js index 213afb45f38..9c3f3d1db23 100644 --- a/src/constants/serviceItems.js +++ b/src/constants/serviceItems.js @@ -17,10 +17,13 @@ const SERVICE_ITEM_PARAM_KEYS = { DistanceZipSITDest: 'DistanceZipSITDest', DistanceZipSITOrigin: 'DistanceZipSITOrigin', EIAFuelPrice: 'EIAFuelPrice', + ExternalCrate: 'ExternalCrate', FSCPriceDifferenceInCents: 'FSCPriceDifferenceInCents', EscalationCompounded: 'EscalationCompounded', FSCWeightBasedDistanceMultiplier: 'FSCWeightBasedDistanceMultiplier', IsPeak: 'IsPeak', + MarketDest: 'MarketDest', + MarketOrigin: 'MarketOrigin', NTSPackingFactor: 'NTSPackingFactor', NumberDaysSIT: 'NumberDaysSIT', OriginPrice: 'OriginPrice', @@ -59,8 +62,10 @@ const SERVICE_ITEM_PARAM_KEYS = { const SERVICE_ITEM_CALCULATION_LABELS = { [SERVICE_ITEM_PARAM_KEYS.ActualPickupDate]: 'Pickup date', [SERVICE_ITEM_PARAM_KEYS.ContractYearName]: 'Base year', + [SERVICE_ITEM_PARAM_KEYS.CubicFeetCrating]: 'Actual size', [SERVICE_ITEM_PARAM_KEYS.DestinationPrice]: 'Destination price', [SERVICE_ITEM_PARAM_KEYS.EIAFuelPrice]: 'EIA diesel', + [SERVICE_ITEM_PARAM_KEYS.ExternalCrate]: 'External crate', [SERVICE_ITEM_PARAM_KEYS.FSCPriceDifferenceInCents]: 'Baseline rate difference', [SERVICE_ITEM_PARAM_KEYS.FSCWeightBasedDistanceMultiplier]: 'Weight-based distance multiplier', // Domestic non-peak or Domestic peak @@ -101,7 +106,9 @@ const SERVICE_ITEM_CALCULATION_LABELS = { Dimensions: 'Dimensions', Domestic: 'Domestic', FuelSurchargePrice: 'Mileage factor', + International: 'International', InternationalShippingAndLinehaul: 'ISLH price', + Market: 'Market', Mileage: 'Mileage', MileageIntoSIT: 'Mileage into SIT', MileageOutOfSIT: 'Mileage out of SIT', @@ -121,8 +128,8 @@ const SERVICE_ITEM_CALCULATION_LABELS = { UncratingDate: 'Uncrating date', UncratingPrice: 'Uncrating price (per cu ft)', SITFuelSurchargePrice: 'SIT mileage factor', - StandaloneCrate: 'Standalone Crate Cap', - UncappedRequestTotal: 'Uncapped Request Total', + StandaloneCrate: 'Standalone crate cap', + UncappedRequestTotal: 'Uncapped request total', Total: 'Total', }; @@ -234,6 +241,8 @@ const allowedServiceItemCalculations = [ SERVICE_ITEM_CODES.ISLH, SERVICE_ITEM_CODES.POEFSC, SERVICE_ITEM_CODES.PODFSC, + SERVICE_ITEM_CODES.ICRT, + SERVICE_ITEM_CODES.IUCRT, ]; export default SERVICE_ITEM_STATUSES; From cf06032fae490106f6ccea67a64da672780bbcc3 Mon Sep 17 00:00:00 2001 From: Tae Jung Date: Fri, 7 Feb 2025 20:36:34 +0000 Subject: [PATCH 145/260] added tests --- pkg/models/mto_service_items.go | 33 ++++++------ pkg/models/mto_service_items_test.go | 52 +++++++++++++++++++ .../ghcrateengine/pricer_helpers_intl.go | 4 +- .../ghcrateengine/pricer_helpers_intl_test.go | 2 +- pkg/services/ghcrateengine/shared.go | 3 ++ 5 files changed, 76 insertions(+), 18 deletions(-) diff --git a/pkg/models/mto_service_items.go b/pkg/models/mto_service_items.go index da1079f74f9..dc6b9e8ab9c 100644 --- a/pkg/models/mto_service_items.go +++ b/pkg/models/mto_service_items.go @@ -152,23 +152,26 @@ func FetchRelatedDestinationSITServiceItems(tx *pop.Connection, mtoServiceItemID } func FetchServiceItem(db *pop.Connection, serviceItemID uuid.UUID) (MTOServiceItem, error) { - var serviceItem MTOServiceItem - err := db.Eager("SITDestinationOriginalAddress", - "SITDestinationFinalAddress", - "ReService", - "CustomerContacts", - "MTOShipment.PickupAddress", - "MTOShipment.DestinationAddress", - "Dimensions").Where("id = ?", serviceItemID).First(&serviceItem) - - if err != nil { - if errors.Cause(err).Error() == RecordNotFoundErrorString { - return MTOServiceItem{}, ErrFetchNotFound + if db != nil { + var serviceItem MTOServiceItem + err := db.Eager("SITDestinationOriginalAddress", + "SITDestinationFinalAddress", + "ReService", + "CustomerContacts", + "MTOShipment.PickupAddress", + "MTOShipment.DestinationAddress", + "Dimensions").Where("id = ?", serviceItemID).First(&serviceItem) + + if err != nil { + if errors.Cause(err).Error() == RecordNotFoundErrorString { + return MTOServiceItem{}, ErrFetchNotFound + } + return MTOServiceItem{}, err } - return MTOServiceItem{}, err + return serviceItem, nil + } else { + return MTOServiceItem{}, errors.New("db connection is nil; unable to fetch service item") } - - return serviceItem, nil } func FetchRelatedDestinationSITFuelCharge(tx *pop.Connection, mtoServiceItemID uuid.UUID) (MTOServiceItem, error) { diff --git a/pkg/models/mto_service_items_test.go b/pkg/models/mto_service_items_test.go index 8d55e1c4bea..00d028e3bf9 100644 --- a/pkg/models/mto_service_items_test.go +++ b/pkg/models/mto_service_items_test.go @@ -164,3 +164,55 @@ func (suite *ModelSuite) TestGetMTOServiceItemTypeFromServiceItem() { suite.NotNil(returnedShipment) }) } + +func (suite *ModelSuite) TestFetchServiceItem() { + suite.Run("successful fetch service item", func() { + move := factory.BuildMove(suite.DB(), nil, nil) + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + msServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeMS, + }, + }, + }, nil) + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeCS, + }, + }, + }, nil) + serviceItem, fetchErr := models.FetchServiceItem(suite.DB(), msServiceItem.ID) + suite.NoError(fetchErr) + suite.NotNil(serviceItem) + }) + + suite.Run("failed fetch service item - db connection is nil", func() { + serviceItem, fetchErr := models.FetchServiceItem(nil, uuid.Must(uuid.NewV4())) + suite.Error(fetchErr) + suite.EqualError(fetchErr, "db connection is nil; unable to fetch service item") + suite.Empty(serviceItem) + }) + + suite.Run("failed fetch service item - record not found", func() { + nonExistentID := uuid.Must(uuid.NewV4()) + serviceItem, fetchErr := models.FetchServiceItem(suite.DB(), nonExistentID) + suite.Error(fetchErr) + suite.Equal(fetchErr, models.ErrFetchNotFound) + suite.Empty(serviceItem) + }) +} diff --git a/pkg/services/ghcrateengine/pricer_helpers_intl.go b/pkg/services/ghcrateengine/pricer_helpers_intl.go index ff559555dfd..195dc117b1c 100644 --- a/pkg/services/ghcrateengine/pricer_helpers_intl.go +++ b/pkg/services/ghcrateengine/pricer_helpers_intl.go @@ -239,8 +239,8 @@ func priceIntlCratingUncrating(appCtx appcontext.AppContext, cratingUncratingCod return 0, nil, errors.New("Market is required") } - if externalCrate && billedCubicFeet < 4.0 { - return 0, nil, fmt.Errorf("external crates must be billed for a minimum of 4 cubic feet") + if externalCrate && billedCubicFeet < minIntlExternalCrateBilledCubicFeet { + return 0, nil, fmt.Errorf("external crates must be billed for a minimum of %.2f cubic feet", minIntlExternalCrateBilledCubicFeet) } internationalAccessorialPrice, err := fetchInternationalAccessorialPrice(appCtx, contractCode, cratingUncratingCode, market) diff --git a/pkg/services/ghcrateengine/pricer_helpers_intl_test.go b/pkg/services/ghcrateengine/pricer_helpers_intl_test.go index e3ed425a3fc..a0721e001fb 100644 --- a/pkg/services/ghcrateengine/pricer_helpers_intl_test.go +++ b/pkg/services/ghcrateengine/pricer_helpers_intl_test.go @@ -238,7 +238,7 @@ func (suite *GHCRateEngineServiceSuite) TestPriceIntlCratingUncrating() { _, _, err := priceIntlCratingUncrating(suite.AppContextForTest(), models.ReServiceCodeICRT, testdatagen.DefaultContractCode, icrtTestRequestedPickupDate, badSize, icrtTestStandaloneCrate, icrtTestStandaloneCrateCap, true, icrtTestMarket) suite.Error(err) - suite.Contains(err.Error(), "external crates must be billed for a minimum of 4 cubic feet") + suite.Contains(err.Error(), "external crates must be billed for a minimum of 4.00 cubic feet") }) suite.Run("not finding a rate record", func() { diff --git a/pkg/services/ghcrateengine/shared.go b/pkg/services/ghcrateengine/shared.go index 1a76f817734..44eb2100124 100644 --- a/pkg/services/ghcrateengine/shared.go +++ b/pkg/services/ghcrateengine/shared.go @@ -15,6 +15,9 @@ const minIntlWeightHHG = unit.Pound(500) // minInternationalWeight is the minimum weight used in international calculations (weights below this are upgraded to the min) const minInternationalWeight = unit.Pound(500) +// minIntlExternalCrateBilledCubicFeet is the minimum billed cubic feet used in international external crate +const minIntlExternalCrateBilledCubicFeet = 4.00 + // dateInYear represents a specific date in a year (without caring what year it is) type dateInYear struct { month time.Month From 80dc47e2a49718746a78dec6a411f5709b171fb3 Mon Sep 17 00:00:00 2001 From: Tae Jung Date: Fri, 7 Feb 2025 20:43:33 +0000 Subject: [PATCH 146/260] fix test --- pkg/services/ghcrateengine/intl_crating_pricer_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/ghcrateengine/intl_crating_pricer_test.go b/pkg/services/ghcrateengine/intl_crating_pricer_test.go index 3c8fc47a754..d49951cb30c 100644 --- a/pkg/services/ghcrateengine/intl_crating_pricer_test.go +++ b/pkg/services/ghcrateengine/intl_crating_pricer_test.go @@ -72,7 +72,7 @@ func (suite *GHCRateEngineServiceSuite) TestIntlCratingPricer() { badVolume := unit.CubicFeet(3.0) _, _, err := pricer.Price(suite.AppContextForTest(), testdatagen.DefaultContractCode, icrtTestRequestedPickupDate, badVolume, icrtTestStandaloneCrate, icrtTestStandaloneCrateCap, true, icrtTestMarket) suite.Error(err) - suite.Contains(err.Error(), "external crates must be billed for a minimum of 4 cubic feet") + suite.Contains(err.Error(), "external crates must be billed for a minimum of 4.00 cubic feet") }) suite.Run("not finding a rate record", func() { From 0eb5beeaddd16791d53233b82fe18d9c4c500936 Mon Sep 17 00:00:00 2001 From: loganwc Date: Mon, 10 Feb 2025 17:41:56 +0000 Subject: [PATCH 147/260] moved cancel modal within bulk assign modal and fixed confirmation button styles --- .../BulkAssignment/BulkAssignmentModal.jsx | 188 ++++++++++-------- .../BulkAssignmentModal.module.scss | 42 ++-- .../BulkAssignmentModal.test.jsx | 82 ++++---- src/components/Table/TableQueue.jsx | 5 +- src/utils/formatters.js | 16 ++ 5 files changed, 186 insertions(+), 147 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 4459891fea7..69819626855 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -1,99 +1,117 @@ -import React, { useState } from 'react'; +import React, { useCallback, useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { Button } from '@trussworks/react-uswds'; import styles from './BulkAssignmentModal.module.scss'; import Modal, { ModalTitle, ModalClose, ModalActions, connectModal } from 'components/Modal/Modal'; +import { getBulkAssignmentData } from 'services/ghcApi'; +import { milmoveLogger } from 'utils/milmoveLog'; +import { userName } from 'utils/formatters'; -export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, closeText, bulkAssignmentData }) => { +export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, closeText, queueType }) => { const [showCancelModal, setShowCancelModal] = useState(false); + const [bulkAssignmentData, setBulkAssignmentData] = useState(null); + const [isDisabled, setIsDisabled] = useState(false); + const [numberOfMoves, setNumberOfMoves] = useState(0); + const fetchData = useCallback(async () => { + try { + const data = await getBulkAssignmentData(queueType); + setBulkAssignmentData(data); + + if (!data.bulkAssignmentMoveIDs) { + setIsDisabled(true); + setNumberOfMoves(0); + } else { + setNumberOfMoves(data.bulkAssignmentMoveIDs.length); + } + } catch (err) { + milmoveLogger.error('Error fetching bulk assignment data:', err); + } + }, [queueType]); + + useEffect(() => { + fetchData(); + }, [fetchData]); return (
- - setShowCancelModal(true)} /> - -

{title}

- -
- - - - - - - - {Object.prototype.hasOwnProperty.call(bulkAssignmentData, 'availableOfficeUsers') - ? bulkAssignmentData.availableOfficeUsers.map((user) => { - return ( - - - - - - - ); - }) - : null} -
Select/Deselect All UserWorkloadAssignment
- - -

- {user.lastName}, {user.firstName} -

- 		-

{user.workload || 0}

- 		- -
-
- - - - - - - {showCancelModal && ( -
- - Any unsaved work will be lost. Are you sure you want to cancel? - - - - - -
+ {showCancelModal ? ( + + Any unsaved work will be lost. Are you sure you want to cancel? + + + + + + ) : ( + + setShowCancelModal(true)} /> + +

+ {title} ({numberOfMoves}) +

+ +
+ + + + + + + {bulkAssignmentData?.availableOfficeUsers?.map((user) => { + return ( + + + + + + ); + })} +
UserWorkloadAssignment
+

{userName(user)}

+ 		+

{user.workload || 0}

+ 		+ +
+
+ + + + + )}
); diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 23adc3640f1..87d3e196aa8 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -1,16 +1,33 @@ +@import 'shared/styles/colors.scss'; + .BulkModal { - min-width: 900px !important; + min-width: 650px !important; + max-width: 90vw; overflow-y: auto; - max-height: 50vh; - margin-bottom: 0; - padding-bottom: 0; + max-height: 90vh; + overflow-x: hidden; + + button, + :global(.usa-button) { + margin: 0; + flex-grow: 0; + flex-basis: auto; + text-decoration: none; + } + + .cancelYesButton { + background-color: $color-red; + color: white; + } + .cancelYesButton:hover { + background-color: $error-dark; + } } .BulkAssignmentTable { table { th { max-width: 10px; - color: blue; text-align: center; } .BulkAssignmentDataCenter { @@ -19,19 +36,8 @@ .BulkAssignmentAssignment { width: 60px; text-align: center; + padding-left: 15px; + padding-top: 4px; } } } - -.CancelConfirmationModalWrapper { - position: fixed !important; - left: 0; - bottom: 50px; - width: 100%; - display: flex; - justify-content: center; -} - -.CancelConfirmationModal { - width: 350px; -} \ No newline at end of file diff --git a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx index 7deeb2cf122..d1cf48141ef 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx @@ -1,8 +1,10 @@ import React from 'react'; -import { render, screen } from '@testing-library/react'; +import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { BulkAssignmentModal } from 'components/BulkAssignment/BulkAssignmentModal'; +import { QUEUE_TYPES } from 'constants/queues'; +import { MockProviders } from 'testUtils'; let onClose; let onSubmit; @@ -11,84 +13,84 @@ beforeEach(() => { onSubmit = jest.fn(); }); -const data = { +const bulkAssignmentData = { availableOfficeUsers: [ { - firstName: 'John', - lastName: 'Snow', - officeUserId: '123', - workload: 0, - }, - { - firstName: 'Jane', - lastName: 'Doe', - officeUserId: '456', + firstName: 'sc', + lastName: 'user', + officeUserId: '045c3048-df9a-4d44-88ed-8cd6e2100e08', workload: 1, }, { - firstName: 'Jimmy', - lastName: 'Page', - officeUserId: '789', - workload: 50, + firstName: 'test1', + lastName: 'person', + officeUserId: '4b1f2722-b0bf-4b16-b8c4-49b4e49ba42a', }, ], - bulkAssignmentMoveIDs: ['1', '2', '3', '4', '5'], + bulkAssignmentMoveIDs: [ + 'b3baf6ce-f43b-437c-85be-e1145c0ddb96', + '962ce8d2-03a2-435c-94ca-6b9ef6c226c1', + 'fee7f916-35a6-4c0b-9ea6-a1d8094b3ed3', + ], }; +jest.mock('services/ghcApi', () => ({ + getBulkAssignmentData: jest.fn().mockImplementation(() => Promise.resolve(bulkAssignmentData)), +})); + describe('BulkAssignmentModal', () => { it('renders the component', async () => { - render(); + render( + + + , + ); - expect(await screen.findByRole('heading', { level: 3, name: 'Bulk Assignment' })).toBeInTheDocument(); + expect(await screen.findByRole('heading', { level: 3, name: 'Bulk Assignment (3)' })).toBeInTheDocument(); }); it('shows cancel confirmation modal when close icon is clicked', async () => { - render(); + render(); const closeButton = await screen.findByTestId('modalCloseButton'); await userEvent.click(closeButton); - expect(screen.getByTestId('cancelConfirmationModal')).toBeInTheDocument(); + expect(screen.getByTestId('cancelModalYes')).toBeInTheDocument(); }); it('shows cancel confirmation modal when the Cancel button is clicked', async () => { - render(); + render(); const cancelButton = await screen.findByRole('button', { name: 'Cancel' }); await userEvent.click(cancelButton); - expect(screen.getByTestId('cancelConfirmationModal')).toBeInTheDocument(); + expect(screen.getByTestId('cancelModalYes')).toBeInTheDocument(); }); it('calls the submit function when Save button is clicked', async () => { - render(); - - const saveButton = await screen.findByRole('button', { name: 'Save' }); - + render(); + const saveButton = await screen.findByTestId('modalSubmitButton'); await userEvent.click(saveButton); - expect(onSubmit).toHaveBeenCalledTimes(1); }); it('renders the user data', async () => { - render(); - + render(); const userTable = await screen.findByRole('table'); - expect(userTable).toBeInTheDocument(); - expect(screen.getByText('Select/Deselect All')).toBeInTheDocument(); expect(screen.getByText('User')).toBeInTheDocument(); expect(screen.getByText('Workload')).toBeInTheDocument(); expect(screen.getByText('Assignment')).toBeInTheDocument(); - - expect(screen.getByText('Snow, John')).toBeInTheDocument(); - expect(screen.getAllByTestId('bulkAssignmentUserWorkload')[0]).toHaveTextContent('0'); + await act(async () => { + expect(await screen.getByText('user, sc')).toBeInTheDocument(); + }); + expect(screen.getAllByTestId('bulkAssignmentUserWorkload')[0]).toHaveTextContent('1'); }); it('closes the modal when the close is confirmed', async () => { - render(); + render(); const closeButton = await screen.findByTestId('modalCloseButton'); @@ -101,15 +103,15 @@ describe('BulkAssignmentModal', () => { }); it('close confirmation goes away when clicking no', async () => { - render(); + render(); const closeButton = await screen.findByTestId('modalCloseButton'); - await userEvent.click(closeButton); - const confirmButton = await screen.findByTestId('cancelModalNo'); - await userEvent.click(confirmButton); + const cancelModalNo = await screen.findByTestId('cancelModalNo'); + await userEvent.click(cancelModalNo); - expect(screen.getByTestId('cancelConfirmationModal')).not.toBeInTheDocument(); + const confirmButton = await screen.queryByTestId('cancelModalYes'); + expect(confirmButton).not.toBeInTheDocument(); }); }); diff --git a/src/components/Table/TableQueue.jsx b/src/components/Table/TableQueue.jsx index 018fe6267d2..168dfde1feb 100644 --- a/src/components/Table/TableQueue.jsx +++ b/src/components/Table/TableQueue.jsx @@ -27,7 +27,6 @@ import { getSelectionOptionLabel, } from 'components/Table/utils'; import { roleTypes } from 'constants/userRoles'; -import { useBulkAssignmentQueries } from 'hooks/queries'; const defaultPageSize = 20; const defaultPage = 1; @@ -68,8 +67,6 @@ const TableQueue = ({ }, 500); }, []); - const { bulkAssignmentData } = useBulkAssignmentQueries(queueType); - const [paramSort, setParamSort] = useState( getTableQueueSortParamSessionStorageValue(sessionStorageKey) || defaultSortedColumns, ); @@ -329,7 +326,7 @@ const TableQueue = ({ )} diff --git a/src/utils/formatters.js b/src/utils/formatters.js index 53f0afa3567..d22593bf028 100644 --- a/src/utils/formatters.js +++ b/src/utils/formatters.js @@ -601,6 +601,22 @@ export const constructSCOrderOconusFields = (values) => { }; }; +export const userName = (user) => { + let formattedUser = ''; + if (user.firstName && user.lastName) { + formattedUser += `${user.lastName}, `; + formattedUser += ` ${user.firstName}`; + } else { + if (user.firstName) { + formattedUser += ` ${user.firstName}`; + } + if (user.lastName) { + formattedUser += ` ${user.lastName}`; + } + } + return formattedUser; +}; + /** * @description Converts a string to title case (capitalizes the first letter of each word) * @param {string} str - The input string to format. From 48964bbcf408abbe27c4ade57747df6a44b80b10 Mon Sep 17 00:00:00 2001 From: Tae Jung Date: Mon, 10 Feb 2025 20:08:34 +0000 Subject: [PATCH 148/260] added min crating size applied --- pkg/testdatagen/testharness/make_move.go | 21 +++++--- .../office/txo/tioFlowsInternational.spec.js | 2 + .../ServiceItemCalculations.jsx | 2 +- .../ServiceItemCalculations.module.scss | 1 + .../Office/ServiceItemCalculations/helpers.js | 50 ++++++++++++++----- src/constants/serviceItems.js | 4 ++ 6 files changed, 59 insertions(+), 21 deletions(-) diff --git a/pkg/testdatagen/testharness/make_move.go b/pkg/testdatagen/testharness/make_move.go index 16984751b00..0a4a930fe2f 100644 --- a/pkg/testdatagen/testharness/make_move.go +++ b/pkg/testdatagen/testharness/make_move.go @@ -9558,7 +9558,12 @@ func MakeIntlHHGMoveWithCratingUncratingServiceItemsAndPaymentRequestsForTIO(app { Key: models.ServiceItemParamNameCubicFeetBilled, KeyType: models.ServiceItemParamTypeDecimal, - Value: "12", + Value: "4.00", + }, + { + Key: models.ServiceItemParamNameCubicFeetCrating, + KeyType: models.ServiceItemParamTypeDecimal, + Value: "1", }, { Key: models.ServiceItemParamNameReferenceDate, @@ -9588,17 +9593,17 @@ func MakeIntlHHGMoveWithCratingUncratingServiceItemsAndPaymentRequestsForTIO(app { Key: models.ServiceItemParamNameDimensionHeight, KeyType: models.ServiceItemParamTypeString, - Value: "10", + Value: "1", }, { Key: models.ServiceItemParamNameDimensionLength, KeyType: models.ServiceItemParamTypeString, - Value: "12", + Value: "1", }, { Key: models.ServiceItemParamNameDimensionWidth, KeyType: models.ServiceItemParamTypeString, - Value: "3", + Value: "1", }, } desc := "description test" @@ -9687,7 +9692,7 @@ func MakeIntlHHGMoveWithCratingUncratingServiceItemsAndPaymentRequestsForTIO(app { Key: models.ServiceItemParamNameCubicFeetBilled, KeyType: models.ServiceItemParamTypeDecimal, - Value: "12", + Value: "8", }, { Key: models.ServiceItemParamNameReferenceDate, @@ -9702,17 +9707,17 @@ func MakeIntlHHGMoveWithCratingUncratingServiceItemsAndPaymentRequestsForTIO(app { Key: models.ServiceItemParamNameDimensionHeight, KeyType: models.ServiceItemParamTypeString, - Value: "10", + Value: "2", }, { Key: models.ServiceItemParamNameDimensionLength, KeyType: models.ServiceItemParamTypeString, - Value: "12", + Value: "2", }, { Key: models.ServiceItemParamNameDimensionWidth, KeyType: models.ServiceItemParamTypeString, - Value: "3", + Value: "2", }, } diff --git a/playwright/tests/office/txo/tioFlowsInternational.spec.js b/playwright/tests/office/txo/tioFlowsInternational.spec.js index bf565aa85c2..a002dc505ee 100644 --- a/playwright/tests/office/txo/tioFlowsInternational.spec.js +++ b/playwright/tests/office/txo/tioFlowsInternational.spec.js @@ -222,6 +222,7 @@ test.describe('TIO user', () => { await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Crating size (cu ft)'); await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Description'); await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Dimensions'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Actual size'); await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('External crate'); await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Crating price (per cu ft)'); await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Market'); @@ -230,6 +231,7 @@ test.describe('TIO user', () => { await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Price escalation factor'); await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Uncapped request total'); await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Standalone crate cap'); + await expect(page.locator('[data-testid="ServiceItemCalculations"]')).toContainText('Minimum crating size applied'); // approve await tioFlowPage.approveServiceItem(); await page.getByTestId('nextServiceItem').click(); diff --git a/src/components/Office/ServiceItemCalculations/ServiceItemCalculations.jsx b/src/components/Office/ServiceItemCalculations/ServiceItemCalculations.jsx index fea91773c2e..9e4fd608148 100644 --- a/src/components/Office/ServiceItemCalculations/ServiceItemCalculations.jsx +++ b/src/components/Office/ServiceItemCalculations/ServiceItemCalculations.jsx @@ -83,7 +83,7 @@ const ServiceItemCalculations = ({ {calc.label} - {appendSign(index, calculations.length)} + {calc.value === null || calc.value === '' ? null : appendSign(index, calculations.length)} {calc.value} diff --git a/src/components/Office/ServiceItemCalculations/ServiceItemCalculations.module.scss b/src/components/Office/ServiceItemCalculations/ServiceItemCalculations.module.scss index 48e25cd1efb..d7b5246dc2b 100644 --- a/src/components/Office/ServiceItemCalculations/ServiceItemCalculations.module.scss +++ b/src/components/Office/ServiceItemCalculations/ServiceItemCalculations.module.scss @@ -102,6 +102,7 @@ .descriptionTitle { @include u-font-weight('bold'); + @include u-margin-right(0.5); color: $base-darker; } diff --git a/src/components/Office/ServiceItemCalculations/helpers.js b/src/components/Office/ServiceItemCalculations/helpers.js index 92c342540a4..4161c256d12 100644 --- a/src/components/Office/ServiceItemCalculations/helpers.js +++ b/src/components/Office/ServiceItemCalculations/helpers.js @@ -1,4 +1,9 @@ -import { SERVICE_ITEM_CALCULATION_LABELS, SERVICE_ITEM_CODES, SERVICE_ITEM_PARAM_KEYS } from 'constants/serviceItems'; +import { + SERVICE_ITEM_CALCULATION_LABELS, + SERVICE_ITEM_CODES, + SERVICE_ITEM_PARAM_KEYS, + EXTERNAL_CRATE_MIN_CUBIC_FT, +} from 'constants/serviceItems'; import { LONGHAUL_MIN_DISTANCE } from 'constants/shipments'; import { formatDateWithUTC } from 'shared/dates'; import { @@ -689,12 +694,26 @@ const unCratingPriceIntl = (params) => { ); }; +const isExternalCrateMinSizeApplied = (params) => { + const cubicFeetBilled = getParamValue(SERVICE_ITEM_PARAM_KEYS.CubicFeetBilled, params); + const cubicFeetCrating = getParamValue(SERVICE_ITEM_PARAM_KEYS.CubicFeetCrating, params); + const externalCrate = + getParamValue(SERVICE_ITEM_PARAM_KEYS.ExternalCrate, params)?.toLowerCase() === 'true' + ? SERVICE_ITEM_CALCULATION_LABELS.ExternalCrate + : ''; + + return ( + cubicFeetCrating !== cubicFeetBilled && externalCrate && cubicFeetBilled?.toString() === EXTERNAL_CRATE_MIN_CUBIC_FT + ); +}; + const cratingSize = (params, mtoParams) => { const cubicFeetBilled = getParamValue(SERVICE_ITEM_PARAM_KEYS.CubicFeetBilled, params); const length = getParamValue(SERVICE_ITEM_PARAM_KEYS.DimensionLength, params); const height = getParamValue(SERVICE_ITEM_PARAM_KEYS.DimensionHeight, params); const width = getParamValue(SERVICE_ITEM_PARAM_KEYS.DimensionWidth, params); let label = SERVICE_ITEM_CALCULATION_LABELS.CubicFeetBilled; + let cubicFeetCratingInfo = ''; const description = `${SERVICE_ITEM_CALCULATION_LABELS.Description}: ${mtoParams.description}`; @@ -706,26 +725,24 @@ const cratingSize = (params, mtoParams) => { : ''; // currently external intl crate gets 4 cu ft min applied to pricing - const minimumSizeApplied = externalCrate && cubicFeetBilled.toString() === '4.00'; + const isMinCrateSizeApplied = isExternalCrateMinSizeApplied(params); - if (minimumSizeApplied) { + if (isMinCrateSizeApplied) { label += ' - Minimum'; - } - // show actual size if minimum was applied - const cubicFeetCrating = minimumSizeApplied - ? `${SERVICE_ITEM_CALCULATION_LABELS.CubicFeetCrating}: ${getParamValue( - SERVICE_ITEM_PARAM_KEYS.CubicFeetCrating, - params, - )} cu ft` - : ''; + // show actual size if minimum was applied + cubicFeetCratingInfo = `${SERVICE_ITEM_CALCULATION_LABELS.CubicFeetCrating}: ${getParamValue( + SERVICE_ITEM_PARAM_KEYS.CubicFeetCrating, + params, + )} cu ft`; + } return calculation( cubicFeetBilled, label, formatDetail(description), formatDetail(formattedDimensions), - formatDetail(cubicFeetCrating), + formatDetail(cubicFeetCratingInfo), formatDetail(externalCrate), ); }; @@ -754,6 +771,12 @@ const uncappedRequestTotal = (params) => { return calculation(value, label); }; +const minSizeCrateApplied = () => { + const label = SERVICE_ITEM_CALCULATION_LABELS.MinSizeCrateApplied; + + return calculation('', label); +}; + const totalAmountRequested = (totalAmount) => { const value = toDollarString(formatCents(totalAmount)); const label = `${SERVICE_ITEM_CALCULATION_LABELS.Total}: `; @@ -1034,6 +1057,9 @@ export default function makeCalculations(itemCode, totalAmount, params, mtoParam result.splice(result.length - 1, 0, uncappedRequestTotal(params)); result.splice(result.length - 1, 0, standaloneCrate(params)); } + if (isExternalCrateMinSizeApplied(params)) { + result.splice(result.length - 1, 0, minSizeCrateApplied(params)); + } break; // International uncrating case SERVICE_ITEM_CODES.IUCRT: diff --git a/src/constants/serviceItems.js b/src/constants/serviceItems.js index 9c3f3d1db23..cc73b0bd0b3 100644 --- a/src/constants/serviceItems.js +++ b/src/constants/serviceItems.js @@ -110,6 +110,7 @@ const SERVICE_ITEM_CALCULATION_LABELS = { InternationalShippingAndLinehaul: 'ISLH price', Market: 'Market', Mileage: 'Mileage', + MinSizeCrateApplied: 'Minimum crating size applied', MileageIntoSIT: 'Mileage into SIT', MileageOutOfSIT: 'Mileage out of SIT', NTSPackingFactor: 'NTS packing factor', @@ -245,6 +246,8 @@ const allowedServiceItemCalculations = [ SERVICE_ITEM_CODES.IUCRT, ]; +const EXTERNAL_CRATE_MIN_CUBIC_FT = '4.00'; + export default SERVICE_ITEM_STATUSES; export { @@ -256,4 +259,5 @@ export { SERVICE_ITEM_STATUSES, SERVICE_ITEMS_ALLOWED_WEIGHT_BILLED_PARAM, SERVICE_ITEMS_ALLOWED_UPDATE, + EXTERNAL_CRATE_MIN_CUBIC_FT, }; From 975d11468b7a1bb2653715159f524e82cc0b5cf9 Mon Sep 17 00:00:00 2001 From: loganwc Date: Mon, 10 Feb 2025 20:23:03 +0000 Subject: [PATCH 149/260] uswds button styles work weird in queue created my own styles for cancel confirmation buttons --- .../BulkAssignment/BulkAssignmentModal.jsx | 2 +- .../BulkAssignmentModal.module.scss | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 69819626855..4c81efedb2f 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -50,7 +50,7 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos Yes - - - - ) : ( - - setShowCancelModal(true)} /> - -

- {title} ({numberOfMoves}) -

- -
- - - - - - - {bulkAssignmentData?.availableOfficeUsers?.map((user) => { - return ( - - - - - - ); - })} -
UserWorkloadAssignment
-

{userName(user)}

- 		-

{user.workload || 0}

- 		- -
+ + setShowCancelModal(true)} /> + +

+ {title} ({numberOfMoves}) +

+ +
+ + + + + + + {bulkAssignmentData?.availableOfficeUsers?.map((user) => { + return ( + + + + + + ); + })} +
UserWorkloadAssignment
+

{userName(user)}

+ 		+

{user.workload || 0}

+ 		+ +
+
+ + + + + {showCancelModal && ( +
+ Any unsaved work will be lost. Are you sure you want to cancel? +
+ + +
- - - - - - )} + )} +
); }; diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index b397998fdd4..7b96541b26c 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -61,3 +61,19 @@ } } } + +.areYouSureSection { + display: flex; + justify-content: space-evenly; + align-items: center; + padding-top: 20px; + + .confirmButtons { + display: flex; + gap: 20px; + } + + .smallButton { + font-size: small; + } +} From 3175ad09d8820c3256fe281cd67421ac30c7838a Mon Sep 17 00:00:00 2001 From: loganwc Date: Tue, 11 Feb 2025 00:07:31 +0000 Subject: [PATCH 157/260] fixed test --- src/components/BulkAssignment/BulkAssignmentModal.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 249a92a6156..1c87cf5dae7 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -91,10 +91,14 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos
Any unsaved work will be lost. Are you sure you want to cancel?
- -
From 2c1f2e13fbf1d51c8cec41cdae7f2643b92f8e5a Mon Sep 17 00:00:00 2001 From: Tae Jung Date: Tue, 11 Feb 2025 15:18:02 +0000 Subject: [PATCH 158/260] refactor --- .../Office/ServiceItemCalculations/helpers.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/components/Office/ServiceItemCalculations/helpers.js b/src/components/Office/ServiceItemCalculations/helpers.js index ded0b5f0d5f..d555fe17733 100644 --- a/src/components/Office/ServiceItemCalculations/helpers.js +++ b/src/components/Office/ServiceItemCalculations/helpers.js @@ -34,19 +34,10 @@ const peak = (params) => { }; const getMarket = (params) => { - let marketText = ''; - - if (getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketOrigin, params)) { - marketText = ` ${ - getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketOrigin, params)?.toLowerCase() === 'o' ? 'OCONUS' : 'CONUS' - }`; - } else { - marketText = ` ${ - getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketDest, params)?.toLowerCase() === 'o' ? 'OCONUS' : 'CONUS' - }`; - } - - return marketText; + const marketValue = + getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketOrigin, params) || + getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketDest, params); + return ` ${marketValue?.toLowerCase() === 'o' ? 'OCONUS' : 'CONUS'}`; }; const serviceAreaOrigin = (params) => { From 0470709b6841366afcaf18f3053bbee6fe5961d1 Mon Sep 17 00:00:00 2001 From: loganwc Date: Tue, 11 Feb 2025 16:47:04 +0000 Subject: [PATCH 159/260] update button text --- src/components/BulkAssignment/BulkAssignmentModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 1c87cf5dae7..6b9c4662f84 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -99,7 +99,7 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos No
From 760a3ffe7b0374939e3f3b3cd5f93854c3fc1c3b Mon Sep 17 00:00:00 2001 From: loganwc Date: Tue, 11 Feb 2025 21:51:39 +0000 Subject: [PATCH 160/260] button refinement --- .../BulkAssignment/BulkAssignmentModal.jsx | 47 ++++++++++--------- .../BulkAssignmentModal.module.scss | 17 ++----- 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 6b9c4662f84..41bedad5e9b 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -67,42 +67,43 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos })} - - - - - {showCancelModal && ( + {showCancelModal ? (
Any unsaved work will be lost. Are you sure you want to cancel?
-
+ ) : ( + + + + )} diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 7b96541b26c..c4db1b9e888 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -17,19 +17,6 @@ } /* these styles are used to fix an issue with duplicate usa-button--secondary definitions in USWDS */ - .cancelYesButton { - background-color: $color-red; - color: white; - padding-left: 1.6rem; - padding-right: 1.6rem; - padding-bottom: 0.8rem; - padding-top: 0.8rem; - height: 42px; - width: 73px; - } - .cancelYesButton:hover { - background-color: $error-dark; - } .cancelNoButton { border-radius: 0.2666666667rem; color: #0050d8; @@ -71,9 +58,11 @@ .confirmButtons { display: flex; gap: 20px; + padding: 10px; } - .smallButton { + .cancelYesButton { font-size: small; + max-width: 100px; } } From 0feac133aa7a0064641ba6066eaeeedce87db987 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Tue, 11 Feb 2025 20:06:07 -0600 Subject: [PATCH 161/260] split into separate manifest files --- .envrc | 19 ++- cmd/milmove/migrate.go | 168 +++++++++------------ migrations/app/ddl_functions_manifest.txt | 0 migrations/app/ddl_migrations_manifest.txt | 4 - migrations/app/ddl_procedures_manifest.txt | 1 + migrations/app/ddl_tables_manifest.txt | 1 + migrations/app/ddl_types_manifest.txt | 1 + migrations/app/ddl_views_manifest.txt | 1 + migrations/app/dml_migrations_manifest.txt | 0 pkg/cli/migration.go | 33 +++- 10 files changed, 119 insertions(+), 109 deletions(-) create mode 100644 migrations/app/ddl_functions_manifest.txt delete mode 100644 migrations/app/ddl_migrations_manifest.txt create mode 100644 migrations/app/ddl_procedures_manifest.txt create mode 100644 migrations/app/ddl_tables_manifest.txt create mode 100644 migrations/app/ddl_types_manifest.txt create mode 100644 migrations/app/ddl_views_manifest.txt create mode 100644 migrations/app/dml_migrations_manifest.txt diff --git a/.envrc b/.envrc index 76ec72729b4..c74aa073807 100644 --- a/.envrc +++ b/.envrc @@ -101,8 +101,23 @@ export APPLICATION=app # Migration Path export MIGRATION_PATH="file://${MYMOVE_DIR}/migrations/app/schema;file://${MYMOVE_DIR}/migrations/app/secure" export MIGRATION_MANIFEST="${MYMOVE_DIR}/migrations/app/migrations_manifest.txt" -export DDL_MIGRATION_MANIFEST="${MYMOVE_DIR}/migrations/app/ddl_migrations_manifest.txt" -export DDL_MIGRATION_PATH="file://${MYMOVE_DIR}/migrations/app/ddl_migrations/ddl_tables;file://${MYMOVE_DIR}/migrations/app/ddl_migrations/ddl_types;file://${MYMOVE_DIR}/migrations/app/ddl_migrations/ddl_views;file://${MYMOVE_DIR}/migrations/app/ddl_migrations/ddl_functions;file://${MYMOVE_DIR}/migrations/app/ddl_migrations/ddl_procedures" + +# DDL Migrations +export DDL_TYPES_MIGRATION_PATH="file://${MYMOVE_DIR}/migrations/app/ddl_migrations/ddl_types" +export DDL_TYPES_MIGRATION_MANIFEST="${MYMOVE_DIR}/migrations/app/ddl_types_manifest.txt" + +export DDL_TABLES_MIGRATION_PATH="file://${MYMOVE_DIR}/migrations/app/ddl_migrations/ddl_tables" +export DDL_TABLES_MIGRATION_MANIFEST="${MYMOVE_DIR}/migrations/app/ddl_tables_manifest.txt" + +export DDL_VIEWS_MIGRATION_PATH="file://${MYMOVE_DIR}/migrations/app/ddl_migrations/ddl_views" +export DDL_VIEWS_MIGRATION_MANIFEST="${MYMOVE_DIR}/migrations/app/ddl_views_manifest.txt" + +export DDL_FUNCTIONS_MIGRATION_PATH="file://${MYMOVE_DIR}/migrations/app/ddl_migrations/ddl_functions" +export DDL_FUNCTIONS_MIGRATION_MANIFEST="${MYMOVE_DIR}/migrations/app/ddl_functions_manifest.txt" + +export DDL_PROCEDURES_MIGRATION_PATH="file://${MYMOVE_DIR}/migrations/app/ddl_migrations/ddl_procedures" +export DDL_PROCEDURES_MIGRATION_MANIFEST="${MYMOVE_DIR}/migrations/app/ddl_procedures_manifest.txt" + # Default DB configuration export DB_PASSWORD=mysecretpassword diff --git a/cmd/milmove/migrate.go b/cmd/milmove/migrate.go index 0bbc83dd9af..5d5d699859a 100644 --- a/cmd/milmove/migrate.go +++ b/cmd/milmove/migrate.go @@ -308,119 +308,89 @@ func migrateFunction(cmd *cobra.Command, args []string) error { } // Begin DDL migrations - ddlMigrationManifest := expandPath(v.GetString(cli.DDLMigrationManifestFlag)) - ddlMigrationPath := expandPath(v.GetString(cli.DDLMigrationPathFlag)) - ddlMigrationPathsExpanded := expandPaths(strings.Split(ddlMigrationPath, ";")) - - if ddlMigrationManifest != "" && len(ddlMigrationPathsExpanded) > 0 { - // Define ordered folders - orderedFolders := []string{ - "ddl_tables", - "ddl_types", - "ddl_views", - "ddl_functions", - "ddl_procedures", - } - - // Create tracking map - successfulMigrations := make(map[string][]string) - - // Process each folder in order - for _, folder := range orderedFolders { - logger.Info("Processing folder", zap.String("current_folder", folder)) - - for _, path := range ddlMigrationPathsExpanded { - cleanPath := strings.TrimPrefix(path, "file://") - pathParts := strings.Split(cleanPath, "/") - currentFolder := pathParts[len(pathParts)-1] - - if currentFolder != folder { - continue - } - filenames, errListFiles := fileHelper.ListFiles(path, s3Client) - if errListFiles != nil { - logger.Fatal(fmt.Sprintf("Error listing DDL migrations directory %s", path), zap.Error(errListFiles)) - } - - logger.Info(fmt.Sprintf("Found files in %s:", folder)) - for _, file := range filenames { - logger.Info(fmt.Sprintf(" - %s", file)) - } - - ddlMigrationFiles := map[string][]string{ - path: filenames, - } - - logger.Info(fmt.Sprintf("=== Processing %s Files ===", folder)) - - ddlManifest, err := os.Open(ddlMigrationManifest[len("file://"):]) - if err != nil { - return errors.Wrap(err, "error reading DDL manifest") - } - - scanner := bufio.NewScanner(ddlManifest) - logger.Info(fmt.Sprintf("Reading manifest for folder %s", folder)) - for scanner.Scan() { - target := scanner.Text() - logger.Info(fmt.Sprintf("Manifest entry: %s", target)) + ddlTypesManifest := expandPath(v.GetString(cli.DDLTypesMigrationManifestFlag)) + ddlTypesManifestPath := expandPath(v.GetString(cli.DDLTypesMigrationPathFlag)) + + ddlTablesManifest := expandPath(v.GetString(cli.DDLTablesMigrationManifestFlag)) + ddlTablesPath := expandPath(v.GetString(cli.DDLTablesMigrationPathFlag)) + + ddlViewsManifest := expandPath(v.GetString(cli.DDLViewsMigrationManifestFlag)) + ddlViewsPath := expandPath(v.GetString(cli.DDLViewsMigrationPathFlag)) + + ddlFunctionsManifest := expandPath(v.GetString(cli.DDLFunctionsMigrationManifestFlag)) + ddlFunctionsPath := expandPath(v.GetString(cli.DDLFunctionsMigrationPathFlag)) + + ddlProceduresManifest := expandPath(v.GetString(cli.DDLProceduresMigrationManifestFlag)) + ddlProceduresPath := expandPath(v.GetString(cli.DDLProceduresMigrationPathFlag)) + + ddlTypes := []struct { + name string + manifest string + path string + }{ + {"DDL Types", ddlTypesManifest, ddlTypesManifestPath}, + {"DDL Tables", ddlTablesManifest, ddlTablesPath}, + {"DDL Views", ddlViewsManifest, ddlViewsPath}, + {"DDL Functions", ddlFunctionsManifest, ddlFunctionsPath}, + {"DDL Procedures", ddlProceduresManifest, ddlProceduresPath}, + } - if strings.HasPrefix(target, "#") { - logger.Info("Skipping commented line") - continue - } + for _, ddlType := range ddlTypes { + logger.Info(fmt.Sprintf("=== Processing %s ===", ddlType.name)) - if !strings.Contains(target, folder) { - logger.Info(fmt.Sprintf("Skipping entry - not in current folder %s", folder)) - continue - } + filenames, errListFiles := fileHelper.ListFiles(ddlType.path, s3Client) + if errListFiles != nil { + logger.Fatal(fmt.Sprintf("Error listing %s directory %s", ddlType.name, ddlType.path), zap.Error(errListFiles)) + } - logger.Info(fmt.Sprintf("Processing manifest entry: %s", target)) + ddlMigrationFiles := map[string][]string{ + ddlType.path: filenames, + } - uri := "" - for dir, files := range ddlMigrationFiles { - for _, filename := range files { - if target == filename { - uri = fmt.Sprintf("%s/%s", dir, filename) - break - } - } - } + manifest, err := os.Open(ddlType.manifest[len("file://"):]) + if err != nil { + return errors.Wrap(err, fmt.Sprintf("error reading %s manifest", ddlType.name)) + } - if len(uri) == 0 { - return errors.Errorf("Error finding DDL migration for filename %q", target) - } + scanner := bufio.NewScanner(manifest) + for scanner.Scan() { + target := scanner.Text() + if strings.HasPrefix(target, "#") { + continue + } - m, err := pop.ParseMigrationFilename(target) - if err != nil { - return errors.Wrapf(err, "error parsing DDL migration filename %q", uri) + uri := "" + for dir, files := range ddlMigrationFiles { + for _, filename := range files { + if target == filename { + uri = fmt.Sprintf("%s/%s", dir, filename) + break } + } + } - b := &migrate.Builder{Match: m, Path: uri} - migration, errCompile := b.Compile(s3Client, wait, logger) - if errCompile != nil { - return errors.Wrap(errCompile, "Error compiling DDL migration") - } + if len(uri) == 0 { + return errors.Errorf("Error finding %s migration for filename %q", ddlType.name, target) + } - if err := migration.Run(dbConnection); err != nil { - return errors.Wrap(err, "error executing DDL migration") - } + m, err := pop.ParseMigrationFilename(target) + if err != nil { + return errors.Wrapf(err, "error parsing %s migration filename %q", ddlType.name, uri) + } - successfulMigrations[folder] = append(successfulMigrations[folder], target) - logger.Info(fmt.Sprintf("Successfully executed: %s", target)) - } - ddlManifest.Close() + b := &migrate.Builder{Match: m, Path: uri} + migration, errCompile := b.Compile(s3Client, wait, logger) + if errCompile != nil { + return errors.Wrap(errCompile, fmt.Sprintf("Error compiling %s migration", ddlType.name)) } - } - logger.Info("=== DDL Migration Summary ===") - for _, folder := range orderedFolders { - logger.Info(fmt.Sprintf("Folder: %s", folder)) - if migrations, ok := successfulMigrations[folder]; ok { - for _, migration := range migrations { - logger.Info(fmt.Sprintf(" ✓ %s", migration)) - } + if err := migration.Run(dbConnection); err != nil { + return errors.Wrap(err, fmt.Sprintf("error executing %s migration", ddlType.name)) } + + logger.Info(fmt.Sprintf("Successfully executed %s: %s", ddlType.name, target)) } + manifest.Close() } return nil } diff --git a/migrations/app/ddl_functions_manifest.txt b/migrations/app/ddl_functions_manifest.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/migrations/app/ddl_migrations_manifest.txt b/migrations/app/ddl_migrations_manifest.txt deleted file mode 100644 index 96183ff1c8a..00000000000 --- a/migrations/app/ddl_migrations_manifest.txt +++ /dev/null @@ -1,4 +0,0 @@ -01_create_test_table.up.sql -01_create_test_view.up.sql -01_create_tesT_type.up.sql -0001_create_test_procedures.up.sql \ No newline at end of file diff --git a/migrations/app/ddl_procedures_manifest.txt b/migrations/app/ddl_procedures_manifest.txt new file mode 100644 index 00000000000..779e70c4e96 --- /dev/null +++ b/migrations/app/ddl_procedures_manifest.txt @@ -0,0 +1 @@ +0001_create_test_procedures.up.sql \ No newline at end of file diff --git a/migrations/app/ddl_tables_manifest.txt b/migrations/app/ddl_tables_manifest.txt new file mode 100644 index 00000000000..b8449b3cfb5 --- /dev/null +++ b/migrations/app/ddl_tables_manifest.txt @@ -0,0 +1 @@ +01_create_test_table.up.sql diff --git a/migrations/app/ddl_types_manifest.txt b/migrations/app/ddl_types_manifest.txt new file mode 100644 index 00000000000..66edc0ec7c1 --- /dev/null +++ b/migrations/app/ddl_types_manifest.txt @@ -0,0 +1 @@ +01_create_tesT_type.up.sql diff --git a/migrations/app/ddl_views_manifest.txt b/migrations/app/ddl_views_manifest.txt new file mode 100644 index 00000000000..c970b9b345c --- /dev/null +++ b/migrations/app/ddl_views_manifest.txt @@ -0,0 +1 @@ +01_create_test_view.up.sql diff --git a/migrations/app/dml_migrations_manifest.txt b/migrations/app/dml_migrations_manifest.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/pkg/cli/migration.go b/pkg/cli/migration.go index d71c799c22d..61fe168074d 100644 --- a/pkg/cli/migration.go +++ b/pkg/cli/migration.go @@ -14,9 +14,24 @@ const ( // MigrationWaitFlag is the migration wait flag MigrationWaitFlag string = "migration-wait" // DDLMigrationManifestFlag is the ddl migration manifest flag - DDLMigrationManifestFlag = "ddl-migration-manifest" + //DDLMigrationManifestFlag = "ddl-migration-manifest" // DDLMigrationPathFlag is the ddl migration path flag - DDLMigrationPathFlag = "ddl-migration-path" + //DDLMigrationPathFlag = "ddl-migration-path" + + DDLTablesMigrationPathFlag = "ddl-tables-migration-path" + DDLTablesMigrationManifestFlag = "ddl-tables-migration-manifest" + + DDLTypesMigrationPathFlag = "ddl-types-migration-path" + DDLTypesMigrationManifestFlag = "ddl-types-migration-manifest" + + DDLViewsMigrationPathFlag = "ddl-views-migration-path" + DDLViewsMigrationManifestFlag = "ddl-views-migration-manifest" + + DDLFunctionsMigrationPathFlag = "ddl-functions-migration-path" + DDLFunctionsMigrationManifestFlag = "ddl-functions-migration-manifest" + + DDLProceduresMigrationPathFlag = "ddl-procedures-migration-path" + DDLProceduresMigrationManifestFlag = "ddl-procedures-migration-manifest" ) var ( @@ -27,8 +42,18 @@ var ( func InitMigrationFlags(flag *pflag.FlagSet) { flag.StringP(MigrationManifestFlag, "m", "migrations/app/migrations_manifest.txt", "Path to the manifest") flag.DurationP(MigrationWaitFlag, "w", time.Millisecond*10, "duration to wait when polling for new data from migration file") - flag.String(DDLMigrationManifestFlag, "", "Path to DDL migrations manifest") - flag.String(DDLMigrationPathFlag, "", "Path to DDL migrations directory") + //flag.String(DDLMigrationManifestFlag, "", "Path to DDL migrations manifest") + //flag.String(DDLMigrationPathFlag, "", "Path to DDL migrations directory") + flag.String(DDLTablesMigrationPathFlag, "", "Path to DDL tables migrations directory") + flag.String(DDLTablesMigrationManifestFlag, "", "Path to DDL tables migrations manifest") + flag.String(DDLTypesMigrationPathFlag, "", "Path to DDL types migrations directory") + flag.String(DDLTypesMigrationManifestFlag, "", "Path to DDL types migrations manifest") + flag.String(DDLViewsMigrationPathFlag, "", "Path to DDL views migrations directory") + flag.String(DDLViewsMigrationManifestFlag, "", "Path to DDL views migrations manifest") + flag.String(DDLFunctionsMigrationPathFlag, "", "Path to DDL functions migrations directory") + flag.String(DDLFunctionsMigrationManifestFlag, "", "Path to DDL functions migrations manifest") + flag.String(DDLProceduresMigrationPathFlag, "", "Path to DDL procedures migrations directory") + flag.String(DDLProceduresMigrationManifestFlag, "", "Path to DDL procedures migrations manifest") } // CheckMigration validates migration command line flags From b234eb32b05de8e986614f85a580a61e20190b21 Mon Sep 17 00:00:00 2001 From: loganwc Date: Wed, 12 Feb 2025 20:30:19 +0000 Subject: [PATCH 162/260] some css stuff --- src/components/BulkAssignment/BulkAssignmentModal.jsx | 2 +- .../BulkAssignment/BulkAssignmentModal.module.scss | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.jsx b/src/components/BulkAssignment/BulkAssignmentModal.jsx index 41bedad5e9b..9b84c51b4ce 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.jsx @@ -37,7 +37,7 @@ export const BulkAssignmentModal = ({ onClose, onSubmit, title, submitText, clos return (
- setShowCancelModal(true)} /> + {!showCancelModal && setShowCancelModal(true)} />}

{title} ({numberOfMoves}) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index c4db1b9e888..4fa9fd266a5 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -57,12 +57,16 @@ .confirmButtons { display: flex; - gap: 20px; + align-items: center; + gap: 10px; padding: 10px; + max-height: 42px; } .cancelYesButton { - font-size: small; + font-size: 12px; max-width: 100px; + height: 42px; + align-items: center; } } From 59b28212204edb53eddc02c2164d520b2a9cf380 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Mon, 23 Dec 2024 19:45:59 +0000 Subject: [PATCH 163/260] easier to read changes --- pkg/services/order/order_fetcher.go | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 923a4dfe82b..1001841c235 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -122,8 +122,9 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid tooAssignedUserQuery := tooAssignedUserFilter(params.TOOAssignedUser) sortOrderQuery := sortOrder(params.Sort, params.Order, ppmCloseoutGblocs) counselingQuery := counselingOfficeFilter(params.CounselingOffice) + tooDestinationRequestsQuery := tooDestinationOnlyRequestsFilter(role) // Adding to an array so we can iterate over them and apply the filters after the query structure is set below - options := [20]QueryOption{branchQuery, locatorQuery, dodIDQuery, emplidQuery, customerNameQuery, originDutyLocationQuery, destinationDutyLocationQuery, moveStatusQuery, gblocQuery, submittedAtQuery, appearedInTOOAtQuery, requestedMoveDateQuery, ppmTypeQuery, closeoutInitiatedQuery, closeoutLocationQuery, ppmStatusQuery, sortOrderQuery, scAssignedUserQuery, tooAssignedUserQuery, counselingQuery} + options := [21]QueryOption{branchQuery, locatorQuery, dodIDQuery, emplidQuery, customerNameQuery, originDutyLocationQuery, destinationDutyLocationQuery, tooDestinationRequestsQuery, moveStatusQuery, gblocQuery, submittedAtQuery, appearedInTOOAtQuery, requestedMoveDateQuery, ppmTypeQuery, closeoutInitiatedQuery, closeoutLocationQuery, ppmStatusQuery, sortOrderQuery, scAssignedUserQuery, tooAssignedUserQuery, counselingQuery} var query *pop.Query if ppmCloseoutGblocs { @@ -191,6 +192,9 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid } if role == roles.RoleTypeTOO { query.LeftJoin("office_users as assigned_user", "moves.too_assigned_id = assigned_user.id") + query.LeftJoin("mto_service_items", "mto_shipments.id = mto_service_items.mto_shipment_id"). + LeftJoin("re_services", "mto_service_items.re_service_id = re_services.id"). + LeftJoin("shipment_address_updates", "shipment_address_updates.shipment_id = mto_shipments.id AND shipment_address_updates.new_address_id != mto_shipments.destination_address_id") } if params.NeedsPPMCloseout != nil { @@ -781,3 +785,26 @@ func sortOrder(sort *string, order *string, ppmCloseoutGblocs bool) QueryOption } } } + +func tooDestinationOnlyRequestsFilter(role roles.RoleType) QueryOption { + return func(query *pop.Query) { + if role == roles.RoleTypeTOO { + query.Where(` + ( + (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code NOT IN ('DDFSIT', 'DDASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC', 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT'))) + AND (moves.status = 'SUBMITTED' OR moves.status = 'SERVICE COUNSELING COMPLETED' OR moves.status = 'APPROVALS REQUESTED') + ) + `) + // OR --excess weight + // ( + // (moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) + // AND (moves.status = 'SUBMITTED' OR moves.status = 'SERVICE COUNSELING COMPLETED' OR moves.status = 'APPROVALS REQUESTED') + // ) + // OR --excess ub weight + // ( + // (moves.excess_unaccompanied_baggage_weight_qualified_at IS NOT NULL AND moves.excess_unaccompanied_baggage_weight_acknowledged_at IS NULL) + // AND (moves.status = 'SUBMITTED' OR moves.status = 'SERVICE COUNSELING COMPLETED' OR moves.status = 'APPROVALS REQUESTED') + // ) + } + } +} From e6a361bcfbc242023bc9cf268b4f927ff0be9ff4 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Mon, 23 Dec 2024 21:08:28 +0000 Subject: [PATCH 164/260] removing moves.status query --- pkg/services/order/order_fetcher.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 1001841c235..d89c510983e 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -791,10 +791,10 @@ func tooDestinationOnlyRequestsFilter(role roles.RoleType) QueryOption { if role == roles.RoleTypeTOO { query.Where(` ( - (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code NOT IN ('DDFSIT', 'DDASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC', 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT'))) - AND (moves.status = 'SUBMITTED' OR moves.status = 'SERVICE COUNSELING COMPLETED' OR moves.status = 'APPROVALS REQUESTED') + (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code NOT IN ('DOFSIT', 'DOASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC', 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT'))) ) `) + // `) // OR --excess weight // ( // (moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) From 2f00fd42aad40495576f80fd730d5161c896f22f Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Mon, 23 Dec 2024 21:15:55 +0000 Subject: [PATCH 165/260] removing moves.status query --- pkg/services/order/order_fetcher.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index d89c510983e..399da9e61eb 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -124,7 +124,7 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid counselingQuery := counselingOfficeFilter(params.CounselingOffice) tooDestinationRequestsQuery := tooDestinationOnlyRequestsFilter(role) // Adding to an array so we can iterate over them and apply the filters after the query structure is set below - options := [21]QueryOption{branchQuery, locatorQuery, dodIDQuery, emplidQuery, customerNameQuery, originDutyLocationQuery, destinationDutyLocationQuery, tooDestinationRequestsQuery, moveStatusQuery, gblocQuery, submittedAtQuery, appearedInTOOAtQuery, requestedMoveDateQuery, ppmTypeQuery, closeoutInitiatedQuery, closeoutLocationQuery, ppmStatusQuery, sortOrderQuery, scAssignedUserQuery, tooAssignedUserQuery, counselingQuery} + options := [21]QueryOption{branchQuery, locatorQuery, dodIDQuery, emplidQuery, customerNameQuery, originDutyLocationQuery, destinationDutyLocationQuery, moveStatusQuery, tooDestinationRequestsQuery, gblocQuery, submittedAtQuery, appearedInTOOAtQuery, requestedMoveDateQuery, ppmTypeQuery, closeoutInitiatedQuery, closeoutLocationQuery, ppmStatusQuery, sortOrderQuery, scAssignedUserQuery, tooAssignedUserQuery, counselingQuery} var query *pop.Query if ppmCloseoutGblocs { From 4a570403c0b9a847408fdcf5bc74743846fe1d3c Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Tue, 24 Dec 2024 00:35:23 +0000 Subject: [PATCH 166/260] FINALLY --- pkg/services/order/order_fetcher.go | 30 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 399da9e61eb..59b582ccb26 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -122,9 +122,9 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid tooAssignedUserQuery := tooAssignedUserFilter(params.TOOAssignedUser) sortOrderQuery := sortOrder(params.Sort, params.Order, ppmCloseoutGblocs) counselingQuery := counselingOfficeFilter(params.CounselingOffice) - tooDestinationRequestsQuery := tooDestinationOnlyRequestsFilter(role) + tooDestinationRequestsQuery := tooDestinationOnlyRequestsFilter(role, params.Locator) // Adding to an array so we can iterate over them and apply the filters after the query structure is set below - options := [21]QueryOption{branchQuery, locatorQuery, dodIDQuery, emplidQuery, customerNameQuery, originDutyLocationQuery, destinationDutyLocationQuery, moveStatusQuery, tooDestinationRequestsQuery, gblocQuery, submittedAtQuery, appearedInTOOAtQuery, requestedMoveDateQuery, ppmTypeQuery, closeoutInitiatedQuery, closeoutLocationQuery, ppmStatusQuery, sortOrderQuery, scAssignedUserQuery, tooAssignedUserQuery, counselingQuery} + options := [21]QueryOption{branchQuery, locatorQuery, dodIDQuery, emplidQuery, customerNameQuery, originDutyLocationQuery, destinationDutyLocationQuery, moveStatusQuery, gblocQuery, submittedAtQuery, appearedInTOOAtQuery, requestedMoveDateQuery, ppmTypeQuery, closeoutInitiatedQuery, closeoutLocationQuery, ppmStatusQuery, sortOrderQuery, scAssignedUserQuery, tooAssignedUserQuery, counselingQuery, tooDestinationRequestsQuery} var query *pop.Query if ppmCloseoutGblocs { @@ -786,25 +786,23 @@ func sortOrder(sort *string, order *string, ppmCloseoutGblocs bool) QueryOption } } -func tooDestinationOnlyRequestsFilter(role roles.RoleType) QueryOption { +func tooDestinationOnlyRequestsFilter(role roles.RoleType, locator *string) QueryOption { return func(query *pop.Query) { if role == roles.RoleTypeTOO { - query.Where(` + if locator != nil { + // ignore this query if searching for a move + query.Where("moves.locator = ?", strings.ToUpper(*locator)) + } else { + query.Where(` + ( + (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT'))) + ) + OR ( - (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code NOT IN ('DOFSIT', 'DOASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC', 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT'))) + ((moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') ) `) - // `) - // OR --excess weight - // ( - // (moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) - // AND (moves.status = 'SUBMITTED' OR moves.status = 'SERVICE COUNSELING COMPLETED' OR moves.status = 'APPROVALS REQUESTED') - // ) - // OR --excess ub weight - // ( - // (moves.excess_unaccompanied_baggage_weight_qualified_at IS NOT NULL AND moves.excess_unaccompanied_baggage_weight_acknowledged_at IS NULL) - // AND (moves.status = 'SUBMITTED' OR moves.status = 'SERVICE COUNSELING COMPLETED' OR moves.status = 'APPROVALS REQUESTED') - // ) + } } } } From d65894e6eaa77960875c754d7d0ae931441d7b8c Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Tue, 24 Dec 2024 02:48:19 +0000 Subject: [PATCH 167/260] test updates --- pkg/services/order/order_fetcher_test.go | 148 +++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/pkg/services/order/order_fetcher_test.go b/pkg/services/order/order_fetcher_test.go index 57e85401246..b19d968a162 100644 --- a/pkg/services/order/order_fetcher_test.go +++ b/pkg/services/order/order_fetcher_test.go @@ -580,6 +580,154 @@ func (suite *OrderServiceSuite) TestListOrders() { suite.Equal(1, len(moves)) suite.Equal(createdPPM.Shipment.MoveTaskOrder.Locator, moves[0].Locator) }) + + suite.Run("task order queue does not return move with ONLY a destination address update request", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + // build a move with a destination address request, should NOT appear in Task Order Queue + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + testUUID := uuid.UUID{} + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + { + Model: models.MTOShipment{ + DestinationAddressID: &testUUID, + }, + }, + }, nil) + + suite.NotNil(shipment) + // newTestUUID := uuid.UUID{} + + shipmentAddressUpdate := factory.BuildShipmentAddressUpdate(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: models.ShipmentAddressUpdate{ + NewAddressID: testUUID, + }, + }, + }, []factory.Trait{factory.GetTraitShipmentAddressUpdateRequested}) + suite.NotNil(shipmentAddressUpdate) + + // build a second move + move2 := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVED, + Show: models.BoolPointer(true), + }, + }}, nil) + suite.NotNil(move2) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.FatalNoError(err) + // even though 2 moves were created, only one will be returned from the call to List Orders since we filter out + // the one with only a shipment address update to be routed to the destination requests queue + suite.Equal(1, moveCount) + suite.Equal(1, len(moves)) + }) + + suite.Run("task order queue does not return move with ONLY requested destination SIT service items", func() { + // officeUser, _, session := setupTestData() + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + // build a move with a only origin service items + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + originSITServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDOFSIT, + }, + }, + }, nil) + suite.NotNil(originSITServiceItem) + + // build a move with a both origin and destination service items + move2 := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + shipment2 := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move2, + LinkOnly: true, + }, + }, nil) + + destinationSITServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment2, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDDFSIT, + }, + }, + }, nil) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.Equal(models.MTOServiceItemStatusSubmitted, destinationSITServiceItem.Status) + + suite.FatalNoError(err) + // even though 2 moves were created, only one will be returned from the call to List Orders since we filter out + // the one with only destination service items + suite.Equal(1, moveCount) + suite.Equal(1, len(moves)) + }) } func (suite *OrderServiceSuite) TestListOrderWithAssignedUserSingle() { // Under test: ListOrders From f572ddf60edb06e3ca0553fe2201e0ac5dae5659 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Tue, 24 Dec 2024 05:07:37 +0000 Subject: [PATCH 168/260] fix queue handler test --- pkg/handlers/ghcapi/queues_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/handlers/ghcapi/queues_test.go b/pkg/handlers/ghcapi/queues_test.go index 6a658d6c2aa..aa251e2627c 100644 --- a/pkg/handlers/ghcapi/queues_test.go +++ b/pkg/handlers/ghcapi/queues_test.go @@ -478,6 +478,11 @@ func (suite *HandlerSuite) TestGetMoveQueuesHandlerFilters() { Status: models.MTOServiceItemStatusSubmitted, }, }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDOFSIT, + }, + }, }, nil) // Service Counseling Completed Move From 2749f62432d219e351022ba0fe6b034b78bbb598 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Thu, 26 Dec 2024 21:29:51 +0000 Subject: [PATCH 169/260] remove comments --- pkg/services/order/order_fetcher_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/services/order/order_fetcher_test.go b/pkg/services/order/order_fetcher_test.go index b19d968a162..be5ebf9c471 100644 --- a/pkg/services/order/order_fetcher_test.go +++ b/pkg/services/order/order_fetcher_test.go @@ -613,7 +613,6 @@ func (suite *OrderServiceSuite) TestListOrders() { }, nil) suite.NotNil(shipment) - // newTestUUID := uuid.UUID{} shipmentAddressUpdate := factory.BuildShipmentAddressUpdate(suite.DB(), []factory.Customization{ { @@ -652,7 +651,6 @@ func (suite *OrderServiceSuite) TestListOrders() { }) suite.Run("task order queue does not return move with ONLY requested destination SIT service items", func() { - // officeUser, _, session := setupTestData() officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) session := auth.Session{ ApplicationName: auth.OfficeApp, From 2bbb3dc016c4900b8d0bfd490815dae4968a4fe7 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Thu, 26 Dec 2024 22:49:23 +0000 Subject: [PATCH 170/260] nicer formatting for AND --- pkg/services/order/order_fetcher.go | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 59b582ccb26..d44e450229b 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -790,8 +790,21 @@ func tooDestinationOnlyRequestsFilter(role roles.RoleType, locator *string) Quer return func(query *pop.Query) { if role == roles.RoleTypeTOO { if locator != nil { - // ignore this query if searching for a move - query.Where("moves.locator = ?", strings.ToUpper(*locator)) + query.Where(` + ( + moves.locator = ? + ) + AND + ( + ( + (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT'))) + ) + OR + ( + ((moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') + ) + ) + `, strings.ToUpper(*locator)) } else { query.Where(` ( From b2b9e7830f2e9033bf1a712716144ba6a742bb27 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Thu, 26 Dec 2024 22:52:00 +0000 Subject: [PATCH 171/260] add additional origin service item reservice codes --- pkg/services/order/order_fetcher.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index d44e450229b..935309f27c1 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -797,7 +797,7 @@ func tooDestinationOnlyRequestsFilter(role roles.RoleType, locator *string) Quer AND ( ( - (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT'))) + (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) ) OR ( @@ -808,7 +808,7 @@ func tooDestinationOnlyRequestsFilter(role roles.RoleType, locator *string) Quer } else { query.Where(` ( - (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT'))) + (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) ) OR ( From 37849ff053bb020e850e5a509a35c23598a31aee Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Fri, 3 Jan 2025 19:38:21 +0000 Subject: [PATCH 172/260] update test to use search --- playwright/tests/office/txo/tooFlows.spec.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/playwright/tests/office/txo/tooFlows.spec.js b/playwright/tests/office/txo/tooFlows.spec.js index dd85150f3fd..412076deb28 100644 --- a/playwright/tests/office/txo/tooFlows.spec.js +++ b/playwright/tests/office/txo/tooFlows.spec.js @@ -626,17 +626,10 @@ test.describe('TOO user', () => { await page.getByRole('button', { name: 'Select task_ordering_officer' }).click(); }); test('weight-based multiplier prioritizes billed weight', async ({ page }) => { - await page.getByRole('row', { name: 'Select...' }).getByTestId('locator').getByTestId('TextBoxFilter').click(); - await page - .getByRole('row', { name: 'Select...' }) - .getByTestId('locator') - .getByTestId('TextBoxFilter') - .fill(moveLoc); - await page - .getByRole('row', { name: 'Select...' }) - .getByTestId('locator') - .getByTestId('TextBoxFilter') - .press('Enter'); + await page.getByRole('link', { name: 'Search' }).click(); + await page.getByTestId('searchText').click(); + await page.getByTestId('searchText').fill(moveLoc); + await page.getByTestId('searchText').press('Enter'); await page.getByTestId('locator-0').click(); await page.getByRole('link', { name: 'Payment requests' }).click(); await page.getByRole('button', { name: 'Review shipment weights' }).click(); From bea2ee0cc121c5266076af0f1068a1140bc483c6 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Fri, 3 Jan 2025 20:58:13 +0000 Subject: [PATCH 173/260] include DOPSIT --- pkg/services/order/order_fetcher.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 935309f27c1..d2cd6004f97 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -797,7 +797,7 @@ func tooDestinationOnlyRequestsFilter(role roles.RoleType, locator *string) Quer AND ( ( - (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) + (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOPSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) ) OR ( @@ -808,7 +808,7 @@ func tooDestinationOnlyRequestsFilter(role roles.RoleType, locator *string) Quer } else { query.Where(` ( - (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) + (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOPSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) ) OR ( From 5d7b9df2af67fdb165687bda97aab3a08b554cf7 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Fri, 3 Jan 2025 21:37:01 +0000 Subject: [PATCH 174/260] refactor into base query plus additional loc query if needed --- pkg/services/order/order_fetcher.go | 33 ++++++++++++----------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index d2cd6004f97..47a8d21c58d 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -194,7 +194,8 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid query.LeftJoin("office_users as assigned_user", "moves.too_assigned_id = assigned_user.id") query.LeftJoin("mto_service_items", "mto_shipments.id = mto_service_items.mto_shipment_id"). LeftJoin("re_services", "mto_service_items.re_service_id = re_services.id"). - LeftJoin("shipment_address_updates", "shipment_address_updates.shipment_id = mto_shipments.id AND shipment_address_updates.new_address_id != mto_shipments.destination_address_id") + LeftJoin("shipment_address_updates", "shipment_address_updates.shipment_id = mto_shipments.id AND shipment_address_updates.new_address_id != mto_shipments.destination_address_id"). + LeftJoin("sit_extensions", "mto_shipments.id = sit_extensions.mto_shipment_id") } if params.NeedsPPMCloseout != nil { @@ -789,32 +790,24 @@ func sortOrder(sort *string, order *string, ppmCloseoutGblocs bool) QueryOption func tooDestinationOnlyRequestsFilter(role roles.RoleType, locator *string) QueryOption { return func(query *pop.Query) { if role == roles.RoleTypeTOO { - if locator != nil { - query.Where(` - ( - moves.locator = ? - ) - AND + baseQuery := ` ( - ( - (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOPSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) - ) - OR - ( - ((moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') - ) + (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) ) - `, strings.ToUpper(*locator)) - } else { - query.Where(` + OR ( - (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOPSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) + ((moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') ) OR ( - ((moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') + ((sit_extensions.mto_shipment_id IS NOT NULL) AND sit_extensions.status = 'PENDING') ) - `) + ` + if locator != nil { + query.Where(` + (moves.locator = ?) AND ( `+baseQuery+`)`, strings.ToUpper(*locator)) + } else { + query.Where(baseQuery) } } } From 4fe3bd63018083d78173988f55b6b6a3b0aac4a1 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Fri, 3 Jan 2025 21:43:34 +0000 Subject: [PATCH 175/260] whoops get back in there DOPSIT --- pkg/services/order/order_fetcher.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 47a8d21c58d..80a0e20a829 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -792,7 +792,7 @@ func tooDestinationOnlyRequestsFilter(role roles.RoleType, locator *string) Quer if role == roles.RoleTypeTOO { baseQuery := ` ( - (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) + (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOPSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) ) OR ( From e5c31b8af9d00dfcb09e4db74bed01248b5d3e82 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Fri, 3 Jan 2025 21:47:50 +0000 Subject: [PATCH 176/260] remove nonexistest reservice code --- pkg/services/order/order_fetcher.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 80a0e20a829..004a13ebab3 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -792,7 +792,7 @@ func tooDestinationOnlyRequestsFilter(role roles.RoleType, locator *string) Quer if role == roles.RoleTypeTOO { baseQuery := ` ( - (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DODSIT', 'DOPSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) + (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DOPSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) ) OR ( From 77e66f5bbc0b168e4a6343af840b1cee2ca06ee1 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Mon, 6 Jan 2025 15:34:02 +0000 Subject: [PATCH 177/260] update move status for test --- pkg/services/order/order_fetcher_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/order/order_fetcher_test.go b/pkg/services/order/order_fetcher_test.go index be5ebf9c471..f2101d283ce 100644 --- a/pkg/services/order/order_fetcher_test.go +++ b/pkg/services/order/order_fetcher_test.go @@ -635,7 +635,7 @@ func (suite *OrderServiceSuite) TestListOrders() { move2 := factory.BuildMove(suite.DB(), []factory.Customization{ { Model: models.Move{ - Status: models.MoveStatusAPPROVED, + Status: models.MoveStatusAPPROVALSREQUESTED, Show: models.BoolPointer(true), }, }}, nil) From 5e57d2b31268fdcb7a41ae9513cc75b9d1c1ecaf Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Tue, 7 Jan 2025 15:57:02 +0000 Subject: [PATCH 178/260] add comment and update function name --- pkg/services/order/order_fetcher.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 004a13ebab3..c0c54ce9524 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -122,7 +122,7 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid tooAssignedUserQuery := tooAssignedUserFilter(params.TOOAssignedUser) sortOrderQuery := sortOrder(params.Sort, params.Order, ppmCloseoutGblocs) counselingQuery := counselingOfficeFilter(params.CounselingOffice) - tooDestinationRequestsQuery := tooDestinationOnlyRequestsFilter(role, params.Locator) + tooDestinationRequestsQuery := tooQueueOriginRequestsFilter(role, params.Locator) // Adding to an array so we can iterate over them and apply the filters after the query structure is set below options := [21]QueryOption{branchQuery, locatorQuery, dodIDQuery, emplidQuery, customerNameQuery, originDutyLocationQuery, destinationDutyLocationQuery, moveStatusQuery, gblocQuery, submittedAtQuery, appearedInTOOAtQuery, requestedMoveDateQuery, ppmTypeQuery, closeoutInitiatedQuery, closeoutLocationQuery, ppmStatusQuery, sortOrderQuery, scAssignedUserQuery, tooAssignedUserQuery, counselingQuery, tooDestinationRequestsQuery} @@ -787,7 +787,10 @@ func sortOrder(sort *string, order *string, ppmCloseoutGblocs bool) QueryOption } } -func tooDestinationOnlyRequestsFilter(role roles.RoleType, locator *string) QueryOption { +// We want to filter out any moves that have ONLY destination type requests to them, such as destination SIT, shuttle, out of the +// task order queue. If the moves have origin SIT, excess weight risks, or sit extensions, they should still appear in the task order +// queue, which is what this query looks for +func tooQueueOriginRequestsFilter(role roles.RoleType, locator *string) QueryOption { return func(query *pop.Query) { if role == roles.RoleTypeTOO { baseQuery := ` From e06b9615eec61750d6ea558a13935e7988052be0 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Mon, 13 Jan 2025 20:56:13 +0000 Subject: [PATCH 179/260] update query to account for UB excess weight warning needing review --- pkg/services/order/order_fetcher.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index c0c54ce9524..114ecbeebf2 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -802,6 +802,10 @@ func tooQueueOriginRequestsFilter(role roles.RoleType, locator *string) QueryOpt ((moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') ) OR + ( + ((moves.excess_unaccompanied_baggage_weight_qualified_at IS NOT NULL AND moves.excess_unaccompanied_baggage_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') + ) + OR ( ((sit_extensions.mto_shipment_id IS NOT NULL) AND sit_extensions.status = 'PENDING') ) From 25b666dfdbd361f7572fa366f9562d6e5ef139c4 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Mon, 13 Jan 2025 21:39:58 +0000 Subject: [PATCH 180/260] Revert "update query to account for UB excess weight warning needing review" This reverts commit bf88d9478c13dbf8ebc2c611ce13895b7cac6c44. --- pkg/services/order/order_fetcher.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 114ecbeebf2..c0c54ce9524 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -802,10 +802,6 @@ func tooQueueOriginRequestsFilter(role roles.RoleType, locator *string) QueryOpt ((moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') ) OR - ( - ((moves.excess_unaccompanied_baggage_weight_qualified_at IS NOT NULL AND moves.excess_unaccompanied_baggage_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') - ) - OR ( ((sit_extensions.mto_shipment_id IS NOT NULL) AND sit_extensions.status = 'PENDING') ) From bbd2951a5ce65f0228cdb2c13ac6205325b5b792 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Mon, 13 Jan 2025 22:32:12 +0000 Subject: [PATCH 181/260] update query to consider UB excess weight risk --- pkg/services/order/order_fetcher.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index c0c54ce9524..114ecbeebf2 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -802,6 +802,10 @@ func tooQueueOriginRequestsFilter(role roles.RoleType, locator *string) QueryOpt ((moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') ) OR + ( + ((moves.excess_unaccompanied_baggage_weight_qualified_at IS NOT NULL AND moves.excess_unaccompanied_baggage_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') + ) + OR ( ((sit_extensions.mto_shipment_id IS NOT NULL) AND sit_extensions.status = 'PENDING') ) From 59651d58d192da37c32c84f501527a54e72143f9 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Wed, 15 Jan 2025 00:47:35 +0000 Subject: [PATCH 182/260] yay plz be nice to me query --- pkg/services/order/order_fetcher.go | 63 ++++++++++++++++------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 114ecbeebf2..c4b3ae0ca19 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -122,7 +122,7 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid tooAssignedUserQuery := tooAssignedUserFilter(params.TOOAssignedUser) sortOrderQuery := sortOrder(params.Sort, params.Order, ppmCloseoutGblocs) counselingQuery := counselingOfficeFilter(params.CounselingOffice) - tooDestinationRequestsQuery := tooQueueOriginRequestsFilter(role, params.Locator) + tooDestinationRequestsQuery := tooQueueOriginRequestsFilter(role) // Adding to an array so we can iterate over them and apply the filters after the query structure is set below options := [21]QueryOption{branchQuery, locatorQuery, dodIDQuery, emplidQuery, customerNameQuery, originDutyLocationQuery, destinationDutyLocationQuery, moveStatusQuery, gblocQuery, submittedAtQuery, appearedInTOOAtQuery, requestedMoveDateQuery, ppmTypeQuery, closeoutInitiatedQuery, closeoutLocationQuery, ppmStatusQuery, sortOrderQuery, scAssignedUserQuery, tooAssignedUserQuery, counselingQuery, tooDestinationRequestsQuery} @@ -192,10 +192,6 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid } if role == roles.RoleTypeTOO { query.LeftJoin("office_users as assigned_user", "moves.too_assigned_id = assigned_user.id") - query.LeftJoin("mto_service_items", "mto_shipments.id = mto_service_items.mto_shipment_id"). - LeftJoin("re_services", "mto_service_items.re_service_id = re_services.id"). - LeftJoin("shipment_address_updates", "shipment_address_updates.shipment_id = mto_shipments.id AND shipment_address_updates.new_address_id != mto_shipments.destination_address_id"). - LeftJoin("sit_extensions", "mto_shipments.id = sit_extensions.mto_shipment_id") } if params.NeedsPPMCloseout != nil { @@ -790,32 +786,43 @@ func sortOrder(sort *string, order *string, ppmCloseoutGblocs bool) QueryOption // We want to filter out any moves that have ONLY destination type requests to them, such as destination SIT, shuttle, out of the // task order queue. If the moves have origin SIT, excess weight risks, or sit extensions, they should still appear in the task order // queue, which is what this query looks for -func tooQueueOriginRequestsFilter(role roles.RoleType, locator *string) QueryOption { +func tooQueueOriginRequestsFilter(role roles.RoleType) QueryOption { return func(query *pop.Query) { if role == roles.RoleTypeTOO { baseQuery := ` - ( - (mto_service_items.status IS NULL OR (mto_service_items.status = 'SUBMITTED' AND re_services.code IN ('DOFSIT', 'DOASIT', 'DOPSIT', 'DOSHUT', 'DOSFSC', 'IOFSIT', 'IOASIT', 'IODSIT', 'IOSHUT', 'IOPSIT', 'ICRT', 'IOSFSC'))) - ) - OR - ( - ((moves.excess_weight_qualified_at IS NOT NULL AND moves.excess_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') - ) - OR - ( - ((moves.excess_unaccompanied_baggage_weight_qualified_at IS NOT NULL AND moves.excess_unaccompanied_baggage_weight_acknowledged_at IS NULL) AND moves.status = 'APPROVALS REQUESTED') - ) - OR - ( - ((sit_extensions.mto_shipment_id IS NOT NULL) AND sit_extensions.status = 'PENDING') - ) - ` - if locator != nil { - query.Where(` - (moves.locator = ?) AND ( `+baseQuery+`)`, strings.ToUpper(*locator)) - } else { - query.Where(baseQuery) - } + NOT ( + ( + -- moves with destination requests (submitted destination re_services codes) + EXISTS ( + SELECT 1 + FROM mto_service_items msi + JOIN re_services rs ON msi.re_service_id = rs.id + WHERE msi.mto_shipment_id = mto_shipments.id + AND msi.status = 'SUBMITTED' + AND rs.code IN ('DDFSIT', 'DDASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC', 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT') + ) + -- moves with destination requests (destination address update requested) + OR + EXISTS ( + SELECT 1 + FROM shipment_address_updates sau + WHERE sau.shipment_id = mto_shipments.id + AND sau.status = 'REQUESTED' + ) + ) + + -- moves with origin requests (submitted origin re_services codes) + AND NOT EXISTS ( + SELECT 1 + FROM mto_service_items msi + JOIN re_services rs ON msi.re_service_id = rs.id + WHERE msi.mto_shipment_id = mto_shipments.id + AND msi.status = 'SUBMITTED' + AND rs.code NOT IN ('DDFSIT', 'DDASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC', 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT') + ) + ) + ` + query.Where(baseQuery) } } } From dad02a1dc03970dcc89ad8e72ca0d75840d0c278 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Wed, 15 Jan 2025 02:16:43 +0000 Subject: [PATCH 183/260] update and expand tests --- pkg/services/order/order_fetcher_test.go | 94 +++++++++++++++++++----- 1 file changed, 74 insertions(+), 20 deletions(-) diff --git a/pkg/services/order/order_fetcher_test.go b/pkg/services/order/order_fetcher_test.go index f2101d283ce..0336785bf9d 100644 --- a/pkg/services/order/order_fetcher_test.go +++ b/pkg/services/order/order_fetcher_test.go @@ -582,15 +582,7 @@ func (suite *OrderServiceSuite) TestListOrders() { }) suite.Run("task order queue does not return move with ONLY a destination address update request", func() { - officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) - session := auth.Session{ - ApplicationName: auth.OfficeApp, - Roles: officeUser.User.Roles, - OfficeUserID: officeUser.ID, - IDToken: "fake_token", - AccessToken: "fakeAccessToken", - } - // build a move with a destination address request, should NOT appear in Task Order Queue + officeUser, _, session := setupTestData() move := factory.BuildMove(suite.DB(), []factory.Customization{ { Model: models.Move{ @@ -631,20 +623,10 @@ func (suite *OrderServiceSuite) TestListOrders() { }, []factory.Trait{factory.GetTraitShipmentAddressUpdateRequested}) suite.NotNil(shipmentAddressUpdate) - // build a second move - move2 := factory.BuildMove(suite.DB(), []factory.Customization{ - { - Model: models.Move{ - Status: models.MoveStatusAPPROVALSREQUESTED, - Show: models.BoolPointer(true), - }, - }}, nil) - suite.NotNil(move2) - moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) suite.FatalNoError(err) - // even though 2 moves were created, only one will be returned from the call to List Orders since we filter out + // even though 2 moves were created, (one by setupTestData(), only one will be returned from the call to List Orders since we filter out // the one with only a shipment address update to be routed to the destination requests queue suite.Equal(1, moveCount) suite.Equal(1, len(moves)) @@ -726,6 +708,78 @@ func (suite *OrderServiceSuite) TestListOrders() { suite.Equal(1, moveCount) suite.Equal(1, len(moves)) }) + + suite.Run("task order queue returns a move with excess weight flagged for review", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + now := time.Now() + // build a move with a non null ExcessWeightQualifiedAt + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + ExcessWeightQualifiedAt: &now, + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.FatalNoError(err) + suite.Equal(1, moveCount) + suite.Equal(1, len(moves)) + }) + + suite.Run("task order queue returns a move with unaccompanied baggage excess weight flagged for review", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + now := time.Now() + // build a move with a non null ExcessUnaccompaniedBaggageWeightQualifiedAt + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + ExcessUnaccompaniedBaggageWeightQualifiedAt: &now, + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.FatalNoError(err) + suite.Equal(1, moveCount) + suite.Equal(1, len(moves)) + }) } func (suite *OrderServiceSuite) TestListOrderWithAssignedUserSingle() { // Under test: ListOrders From 0e7623346621aff0f1135d14d09f1ec2d4cb05f5 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Thu, 16 Jan 2025 15:10:57 +0000 Subject: [PATCH 184/260] tidy up those test comments --- pkg/services/order/order_fetcher_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/services/order/order_fetcher_test.go b/pkg/services/order/order_fetcher_test.go index 0336785bf9d..764b4f9b401 100644 --- a/pkg/services/order/order_fetcher_test.go +++ b/pkg/services/order/order_fetcher_test.go @@ -626,7 +626,7 @@ func (suite *OrderServiceSuite) TestListOrders() { moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) suite.FatalNoError(err) - // even though 2 moves were created, (one by setupTestData(), only one will be returned from the call to List Orders since we filter out + // even though 2 moves were created, one by setupTestData(), only one will be returned from the call to List Orders since we filter out // the one with only a shipment address update to be routed to the destination requests queue suite.Equal(1, moveCount) suite.Equal(1, len(moves)) @@ -642,7 +642,7 @@ func (suite *OrderServiceSuite) TestListOrders() { AccessToken: "fakeAccessToken", } - // build a move with a only origin service items + // build a move with only origin service items move := factory.BuildMove(suite.DB(), []factory.Customization{ { Model: models.Move{ @@ -671,7 +671,7 @@ func (suite *OrderServiceSuite) TestListOrders() { }, nil) suite.NotNil(originSITServiceItem) - // build a move with a both origin and destination service items + // build a move with both origin and destination service items move2 := factory.BuildMove(suite.DB(), []factory.Customization{ { Model: models.Move{ @@ -720,7 +720,7 @@ func (suite *OrderServiceSuite) TestListOrders() { } now := time.Now() - // build a move with a non null ExcessWeightQualifiedAt + // build a move with a ExcessWeightQualifiedAt value move := factory.BuildMove(suite.DB(), []factory.Customization{ { Model: models.Move{ @@ -756,7 +756,7 @@ func (suite *OrderServiceSuite) TestListOrders() { } now := time.Now() - // build a move with a non null ExcessUnaccompaniedBaggageWeightQualifiedAt + // build a move with a ExcessUnaccompaniedBaggageWeightQualifiedAt value move := factory.BuildMove(suite.DB(), []factory.Customization{ { Model: models.Move{ From 10f4e68233539428c1fd42c4adffe07d9b7fffb5 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Thu, 16 Jan 2025 22:53:17 +0000 Subject: [PATCH 185/260] anotha version of the query and even more tests --- pkg/services/order/order_fetcher.go | 61 +++- pkg/services/order/order_fetcher_test.go | 386 ++++++++++++++++++++++- 2 files changed, 431 insertions(+), 16 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index c4b3ae0ca19..7b00aa0e141 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -790,37 +790,68 @@ func tooQueueOriginRequestsFilter(role roles.RoleType) QueryOption { return func(query *pop.Query) { if role == roles.RoleTypeTOO { baseQuery := ` - NOT ( + -- check for moves with destination requests and NOT origin requests, then return the inverse for the TOO queue with the NOT wrapped around the query + NOT ( + ( + -- check for moves with destination requests ( - -- moves with destination requests (submitted destination re_services codes) + -- moves with destination SIT or shuttle submitted service items EXISTS ( + -- Destination service items SELECT 1 FROM mto_service_items msi JOIN re_services rs ON msi.re_service_id = rs.id WHERE msi.mto_shipment_id = mto_shipments.id AND msi.status = 'SUBMITTED' - AND rs.code IN ('DDFSIT', 'DDASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC', 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT') + AND rs.code IN ('DDFSIT', 'DDASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC', + 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT') ) - -- moves with destination requests (destination address update requested) - OR - EXISTS ( + -- requested shipment address update + OR EXISTS ( + -- Shipment address updates (destination address update requested) SELECT 1 FROM shipment_address_updates sau WHERE sau.shipment_id = mto_shipments.id AND sau.status = 'REQUESTED' ) ) - - -- moves with origin requests (submitted origin re_services codes) - AND NOT EXISTS ( - SELECT 1 - FROM mto_service_items msi - JOIN re_services rs ON msi.re_service_id = rs.id - WHERE msi.mto_shipment_id = mto_shipments.id - AND msi.status = 'SUBMITTED' - AND rs.code NOT IN ('DDFSIT', 'DDASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC', 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT') + -- check for moves with origin requests or conditions where move should appear in TOO queue + AND NOT ( + -- moves with origin submitted service items + EXISTS ( + SELECT 1 + FROM mto_service_items msi + JOIN re_services rs ON msi.re_service_id = rs.id + WHERE msi.mto_shipment_id = mto_shipments.id + AND msi.status = 'SUBMITTED' + AND rs.code IN ('ICRT', 'IUBPK', 'IOFSIT', 'IOASIT', 'IOPSIT', 'IOSHUT', + 'IHUPK', 'IUCRT', 'DCRT', 'MS', 'CS', 'DOFSIT', 'DOASIT', + 'DOPSIT', 'DOSFSC', 'IOSFSC', 'DUPK', 'DUCRT', 'DOSHUT', + 'FSC', 'DMHF', 'DBTF', 'DBHF', 'IBTF', 'IBHF', 'DCRTSA', + 'DLH', 'DOP', 'DPK', 'DSH', 'DNPK', 'INPK', 'UBP', + 'ISLH', 'POEFSC', 'PODFSC', 'IHPK') + ) + OR ( + -- moves with excess weight risk to acknowledge + moves.excess_weight_qualified_at IS NOT NULL + AND moves.excess_weight_acknowledged_at IS NULL + ) + OR ( + -- moves with UB excess weight risk to acknowledge + moves.excess_unaccompanied_baggage_weight_qualified_at IS NOT NULL + AND moves.excess_unaccompanied_baggage_weight_acknowledged_at IS NULL + ) + OR EXISTS ( + -- moves with SIT extension to review + SELECT 1 + FROM sit_extensions se + WHERE se.mto_shipment_id = mto_shipments.id + AND se.status = 'PENDING' + ) ) ) + ) + ` query.Where(baseQuery) } diff --git a/pkg/services/order/order_fetcher_test.go b/pkg/services/order/order_fetcher_test.go index 764b4f9b401..47b706d31e5 100644 --- a/pkg/services/order/order_fetcher_test.go +++ b/pkg/services/order/order_fetcher_test.go @@ -632,6 +632,70 @@ func (suite *OrderServiceSuite) TestListOrders() { suite.Equal(1, len(moves)) }) + suite.Run("task order queue returns a move with origin service items and destination address update request", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + // build a move with only destination shuttle service item + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + originSITServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDOASIT, + }, + }, + }, nil) + suite.NotNil(originSITServiceItem) + + testUUID := uuid.UUID{} + shipmentAddressUpdate := factory.BuildShipmentAddressUpdate(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: models.ShipmentAddressUpdate{ + NewAddressID: testUUID, + }, + }, + }, []factory.Trait{factory.GetTraitShipmentAddressUpdateRequested}) + suite.NotNil(shipmentAddressUpdate) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.FatalNoError(err) + suite.Equal(1, moveCount) + suite.Equal(1, len(moves)) + }) + suite.Run("task order queue does not return move with ONLY requested destination SIT service items", func() { officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) session := auth.Session{ @@ -671,7 +735,7 @@ func (suite *OrderServiceSuite) TestListOrders() { }, nil) suite.NotNil(originSITServiceItem) - // build a move with both origin and destination service items + // build a move with destination service items move2 := factory.BuildMove(suite.DB(), []factory.Customization{ { Model: models.Move{ @@ -709,6 +773,262 @@ func (suite *OrderServiceSuite) TestListOrders() { suite.Equal(1, len(moves)) }) + suite.Run("task order queue returns a move with origin requested SIT service items", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + // build a move with only origin service items + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + originSITServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDOFSIT, + }, + }, + }, nil) + suite.NotNil(originSITServiceItem) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.FatalNoError(err) + suite.Equal(1, moveCount) + suite.Equal(1, len(moves)) + }) + + suite.Run("task order queue returns a move with both origin and destination requested SIT service items", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + // build a move with only origin service items + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + originSITServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDOFSIT, + }, + }, + }, nil) + suite.NotNil(originSITServiceItem) + + destinationSITServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDDFSIT, + }, + }, + }, nil) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.Equal(models.MTOServiceItemStatusSubmitted, destinationSITServiceItem.Status) + suite.FatalNoError(err) + suite.Equal(1, moveCount) + suite.Equal(1, len(moves)) + }) + + suite.Run("task order queue returns a move with origin shuttle service item", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + // build a move with only origin shuttle service item + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + internationalOriginShuttleServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeIOSHUT, + }, + }, + }, nil) + suite.NotNil(internationalOriginShuttleServiceItem) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.FatalNoError(err) + suite.Equal(1, moveCount) + suite.Equal(1, len(moves)) + }) + + suite.Run("task order queue does not return a move with ONLY destination shuttle service item", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + // build a move with only destination shuttle service item + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + domesticDestinationShuttleServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDDSHUT, + }, + }, + }, nil) + suite.NotNil(domesticDestinationShuttleServiceItem) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.FatalNoError(err) + suite.Equal(0, moveCount) + suite.Equal(0, len(moves)) + }) + + suite.Run("task order queue returns a move with both origin and destination shuttle service item", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + // build a move with only destination shuttle service item + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + domesticOriginShuttleServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDOSHUT, + }, + }, + }, nil) + suite.NotNil(domesticOriginShuttleServiceItem) + + internationalDestinationShuttleServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeIDSHUT, + }, + }, + }, nil) + suite.NotNil(internationalDestinationShuttleServiceItem) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.FatalNoError(err) + suite.Equal(1, moveCount) + suite.Equal(1, len(moves)) + }) + suite.Run("task order queue returns a move with excess weight flagged for review", func() { officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) session := auth.Session{ @@ -780,6 +1100,70 @@ func (suite *OrderServiceSuite) TestListOrders() { suite.Equal(1, moveCount) suite.Equal(1, len(moves)) }) + + suite.Run("task order queue returns a move with a pending SIT extension to review", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + // build a move with origin service items + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + originSITServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + }, + }, + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDOFSIT, + }, + }, + }, nil) + suite.NotNil(originSITServiceItem) + sitExtension := factory.BuildSITDurationUpdate(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.SITDurationUpdate{ + Status: models.SITExtensionStatusPending, + }, + }, + }, nil) + suite.NotNil(sitExtension) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.FatalNoError(err) + suite.Equal(1, moveCount) + suite.Equal(1, len(moves)) + }) + } func (suite *OrderServiceSuite) TestListOrderWithAssignedUserSingle() { // Under test: ListOrders From 522c15ece0f7702e09001768b2370cc8e25051f6 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Fri, 17 Jan 2025 20:49:55 +0000 Subject: [PATCH 186/260] add test coverage for pkg/unit/millicents --- pkg/unit/millicents_test.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkg/unit/millicents_test.go b/pkg/unit/millicents_test.go index 0e7056f5f66..d7af7278abe 100644 --- a/pkg/unit/millicents_test.go +++ b/pkg/unit/millicents_test.go @@ -4,6 +4,16 @@ import ( "testing" ) +func TestMillicents_Int64(t *testing.T) { + millicents := Millicents(250000) + result := millicents.Int64() + + expected := int64(250000) + if result != expected { + t.Errorf("wrong number of Millicents: expected %v, got %v", expected, result) + } +} + func TestMillicents_Float64(t *testing.T) { millicents := Millicents(250000) result := millicents.Float64() From 53be9eee09d163c5b8d60bf77bff421f5e1c8110 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Thu, 13 Feb 2025 00:04:33 +0000 Subject: [PATCH 187/260] update query and tests to account for new SIT extension logic --- pkg/services/order/order_fetcher.go | 61 ++++++---- pkg/services/order/order_fetcher_test.go | 136 ++++++++++++++++++++++- 2 files changed, 174 insertions(+), 23 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 7b00aa0e141..d3820dde1d4 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -792,32 +792,56 @@ func tooQueueOriginRequestsFilter(role roles.RoleType) QueryOption { baseQuery := ` -- check for moves with destination requests and NOT origin requests, then return the inverse for the TOO queue with the NOT wrapped around the query NOT ( - ( -- check for moves with destination requests ( - -- moves with destination SIT or shuttle submitted service items + -- moves with submitted destination SIT or shuttle submitted service items EXISTS ( - -- Destination service items SELECT 1 FROM mto_service_items msi JOIN re_services rs ON msi.re_service_id = rs.id WHERE msi.mto_shipment_id = mto_shipments.id AND msi.status = 'SUBMITTED' AND rs.code IN ('DDFSIT', 'DDASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC', - 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT') + 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT', 'IDSFSC') ) -- requested shipment address update OR EXISTS ( - -- Shipment address updates (destination address update requested) SELECT 1 FROM shipment_address_updates sau WHERE sau.shipment_id = mto_shipments.id AND sau.status = 'REQUESTED' ) + -- Moves with SIT extensions and ONLY destination SIT service items we filter out of TOO queue + OR ( + EXISTS ( + SELECT 1 + FROM sit_extensions se + JOIN mto_service_items msi ON se.mto_shipment_id = msi.mto_shipment_id + JOIN re_services rs ON msi.re_service_id = rs.id + WHERE se.mto_shipment_id = mto_shipments.id + AND se.status = 'PENDING' + AND rs.code IN ('DDFSIT', 'DDASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC', + 'IDFSIT', 'IDASIT', 'IDDSIT', 'IDSHUT', 'IDSFSC') + ) + -- make sure there are NO origin SIT service items (otherwise, it should be in both queues) + AND NOT EXISTS ( + SELECT 1 + FROM mto_service_items msi + JOIN re_services rs ON msi.re_service_id = rs.id + WHERE msi.mto_shipment_id = mto_shipments.id + AND msi.status = 'SUBMITTED' + AND rs.code IN ('ICRT', 'IUBPK', 'IOFSIT', 'IOASIT', 'IOPSIT', 'IOSHUT', + 'IHUPK', 'IUCRT', 'DCRT', 'MS', 'CS', 'DOFSIT', 'DOASIT', + 'DOPSIT', 'DOSFSC', 'IOSFSC', 'DUPK', 'DUCRT', 'DOSHUT', + 'FSC', 'DMHF', 'DBTF', 'DBHF', 'IBTF', 'IBHF', 'DCRTSA', + 'DLH', 'DOP', 'DPK', 'DSH', 'DNPK', 'INPK', 'UBP', + 'ISLH', 'POEFSC', 'PODFSC', 'IHPK') + ) + ) ) -- check for moves with origin requests or conditions where move should appear in TOO queue AND NOT ( - -- moves with origin submitted service items + -- keep moves in the TOO queue with origin submitted service items EXISTS ( SELECT 1 FROM mto_service_items msi @@ -831,26 +855,19 @@ func tooQueueOriginRequestsFilter(role roles.RoleType) QueryOption { 'DLH', 'DOP', 'DPK', 'DSH', 'DNPK', 'INPK', 'UBP', 'ISLH', 'POEFSC', 'PODFSC', 'IHPK') ) + -- keep moves in the TOO queue if they have an unacknowledged excess weight risk OR ( - -- moves with excess weight risk to acknowledge - moves.excess_weight_qualified_at IS NOT NULL - AND moves.excess_weight_acknowledged_at IS NULL - ) - OR ( - -- moves with UB excess weight risk to acknowledge - moves.excess_unaccompanied_baggage_weight_qualified_at IS NOT NULL - AND moves.excess_unaccompanied_baggage_weight_acknowledged_at IS NULL - ) - OR EXISTS ( - -- moves with SIT extension to review - SELECT 1 - FROM sit_extensions se - WHERE se.mto_shipment_id = mto_shipments.id - AND se.status = 'PENDING' + ( + moves.excess_weight_qualified_at IS NOT NULL + AND moves.excess_weight_acknowledged_at IS NULL + ) + OR ( + moves.excess_unaccompanied_baggage_weight_qualified_at IS NOT NULL + AND moves.excess_unaccompanied_baggage_weight_acknowledged_at IS NULL + ) ) ) ) - ) ` query.Where(baseQuery) diff --git a/pkg/services/order/order_fetcher_test.go b/pkg/services/order/order_fetcher_test.go index 47b706d31e5..a56a655520a 100644 --- a/pkg/services/order/order_fetcher_test.go +++ b/pkg/services/order/order_fetcher_test.go @@ -1101,7 +1101,7 @@ func (suite *OrderServiceSuite) TestListOrders() { suite.Equal(1, len(moves)) }) - suite.Run("task order queue returns a move with a pending SIT extension to review", func() { + suite.Run("task order queue returns a move with a pending SIT extension and origin service items to review", func() { officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) session := auth.Session{ ApplicationName: auth.OfficeApp, @@ -1164,6 +1164,140 @@ func (suite *OrderServiceSuite) TestListOrders() { suite.Equal(1, len(moves)) }) + suite.Run("task order queue does NOT return a move with a pending SIT extension and only destination service items to review", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + // build a move with destination service items + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + destinationSITServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + }, + }, + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDDFSIT, + }, + }, + }, nil) + suite.NotNil(destinationSITServiceItem) + sitExtension := factory.BuildSITDurationUpdate(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.SITDurationUpdate{ + Status: models.SITExtensionStatusPending, + }, + }, + }, nil) + suite.NotNil(sitExtension) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.FatalNoError(err) + suite.Equal(0, moveCount) + suite.Equal(0, len(moves)) + }) + + suite.Run("task order queue returns a move with a pending SIT extension and BOTH origin and destination service items to review", func() { + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + // build a move with only origin service items + move := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: move, + LinkOnly: true, + }, + }, nil) + suite.NotNil(shipment) + originSITServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDOFSIT, + }, + }, + }, nil) + suite.NotNil(originSITServiceItem) + + destinationSITServiceItem := factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeDDFSIT, + }, + }, + }, nil) + + sitExtension := factory.BuildSITDurationUpdate(suite.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.SITDurationUpdate{ + Status: models.SITExtensionStatusPending, + }, + }, + }, nil) + suite.NotNil(sitExtension) + + moves, moveCount, err := orderFetcher.ListOrders(suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}) + + suite.Equal(models.MTOServiceItemStatusSubmitted, destinationSITServiceItem.Status) + suite.FatalNoError(err) + suite.Equal(1, moveCount) + suite.Equal(1, len(moves)) + }) } func (suite *OrderServiceSuite) TestListOrderWithAssignedUserSingle() { // Under test: ListOrders From b8e55babf8bb3888a48a83955c458b78be686d81 Mon Sep 17 00:00:00 2001 From: Maria Traskowsky Date: Thu, 13 Feb 2025 16:12:56 +0000 Subject: [PATCH 188/260] add comment update for extensions --- pkg/services/order/order_fetcher.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index d3820dde1d4..687be4270aa 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -784,8 +784,8 @@ func sortOrder(sort *string, order *string, ppmCloseoutGblocs bool) QueryOption } // We want to filter out any moves that have ONLY destination type requests to them, such as destination SIT, shuttle, out of the -// task order queue. If the moves have origin SIT, excess weight risks, or sit extensions, they should still appear in the task order -// queue, which is what this query looks for +// task order queue. If the moves have origin SIT, excess weight risks, or sit extensions with origin SIT service items, they +// should still appear in the task order queue, which is what this query looks for func tooQueueOriginRequestsFilter(role roles.RoleType) QueryOption { return func(query *pop.Query) { if role == roles.RoleTypeTOO { From ed43d63f0da51405a8dbd9fced1b27a1a81f30e2 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Thu, 13 Feb 2025 21:13:19 +0000 Subject: [PATCH 189/260] Updating Oconus to OConus --- src/components/Office/ServiceItemCalculations/helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Office/ServiceItemCalculations/helpers.js b/src/components/Office/ServiceItemCalculations/helpers.js index 638127266e4..86d3c1a8d9b 100644 --- a/src/components/Office/ServiceItemCalculations/helpers.js +++ b/src/components/Office/ServiceItemCalculations/helpers.js @@ -429,7 +429,7 @@ const shuttleDestinationPriceInternational = (params) => { 'DD MMM YYYY', )}`; - const market = getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketDest, params) === 'O' ? 'Oconus' : 'Conus'; + const market = getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketDest, params) === 'O' ? 'OConus' : 'Conus'; return calculation(value, label, formatDetail(deliveryDate), formatDetail(market)); }; From 1c73dd5fb2d3f68a2ac6e1278fbcebf5bea852ba Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Fri, 14 Feb 2025 02:41:31 +0000 Subject: [PATCH 190/260] Updating location --- pkg/gen/supportapi/embedded_spec.go | 4 ++-- pkg/gen/supportmessages/m_t_o_service_item_model_type.go | 2 +- swagger-def/support.yaml | 2 +- swagger/support.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/gen/supportapi/embedded_spec.go b/pkg/gen/supportapi/embedded_spec.go index 01ca7c6479c..2a386568f72 100644 --- a/pkg/gen/supportapi/embedded_spec.go +++ b/pkg/gen/supportapi/embedded_spec.go @@ -1631,7 +1631,7 @@ func init() { ] }, "MTOServiceItemModelType": { - "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle\n * DOSHUT, DDSHUT - MTOServiceItemDomesticShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", + "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DOSHUT, DDSHUT - MTOServiceItemDomesticShuttle\n * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "MTOServiceItemBasic", @@ -4599,7 +4599,7 @@ func init() { ] }, "MTOServiceItemModelType": { - "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle\n * DOSHUT, DDSHUT - MTOServiceItemDomesticShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", + "description": "Describes all model sub-types for a MTOServiceItem model.\n\nUsing this list, choose the correct modelType in the dropdown, corresponding to the service item type.\n * DOFSIT, DOASIT - MTOServiceItemOriginSIT\n * DDFSIT, DDASIT - MTOServiceItemDestSIT\n * DOSHUT, DDSHUT - MTOServiceItemShuttle\n * DOSHUT, DDSHUT - MTOServiceItemDomesticShuttle\n * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle\n * DCRT, DUCRT - MTOServiceItemDomesticCrating\n * ICRT, IUCRT - MTOServiceItemInternationalCrating\n\nThe documentation will then update with the supported fields.\n", "type": "string", "enum": [ "MTOServiceItemBasic", diff --git a/pkg/gen/supportmessages/m_t_o_service_item_model_type.go b/pkg/gen/supportmessages/m_t_o_service_item_model_type.go index d2c9e324a24..52f3729cdab 100644 --- a/pkg/gen/supportmessages/m_t_o_service_item_model_type.go +++ b/pkg/gen/supportmessages/m_t_o_service_item_model_type.go @@ -20,8 +20,8 @@ import ( // - DOFSIT, DOASIT - MTOServiceItemOriginSIT // - DDFSIT, DDASIT - MTOServiceItemDestSIT // - DOSHUT, DDSHUT - MTOServiceItemShuttle -// - IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle // - DOSHUT, DDSHUT - MTOServiceItemDomesticShuttle +// - IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle // - DCRT, DUCRT - MTOServiceItemDomesticCrating // - ICRT, IUCRT - MTOServiceItemInternationalCrating // diff --git a/swagger-def/support.yaml b/swagger-def/support.yaml index fb6cfda2ec8..fd9fe041f37 100644 --- a/swagger-def/support.yaml +++ b/swagger-def/support.yaml @@ -1288,8 +1288,8 @@ definitions: * DOFSIT, DOASIT - MTOServiceItemOriginSIT * DDFSIT, DDASIT - MTOServiceItemDestSIT * DOSHUT, DDSHUT - MTOServiceItemShuttle - * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle * DOSHUT, DDSHUT - MTOServiceItemDomesticShuttle + * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle * DCRT, DUCRT - MTOServiceItemDomesticCrating * ICRT, IUCRT - MTOServiceItemInternationalCrating diff --git a/swagger/support.yaml b/swagger/support.yaml index 3940b8f5fdf..17d69eb2d31 100644 --- a/swagger/support.yaml +++ b/swagger/support.yaml @@ -1395,8 +1395,8 @@ definitions: * DOFSIT, DOASIT - MTOServiceItemOriginSIT * DDFSIT, DDASIT - MTOServiceItemDestSIT * DOSHUT, DDSHUT - MTOServiceItemShuttle - * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle * DOSHUT, DDSHUT - MTOServiceItemDomesticShuttle + * IOSHUT, IDSHUT - MTOServiceItemInternationalShuttle * DCRT, DUCRT - MTOServiceItemDomesticCrating * ICRT, IUCRT - MTOServiceItemInternationalCrating From d2ebe231541338a280ca8b684801ee5770c15ce4 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Fri, 14 Feb 2025 16:51:54 +0000 Subject: [PATCH 191/260] Updating oconus --- src/components/Office/ServiceItemCalculations/helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Office/ServiceItemCalculations/helpers.js b/src/components/Office/ServiceItemCalculations/helpers.js index 86d3c1a8d9b..56df8d29fd3 100644 --- a/src/components/Office/ServiceItemCalculations/helpers.js +++ b/src/components/Office/ServiceItemCalculations/helpers.js @@ -429,7 +429,7 @@ const shuttleDestinationPriceInternational = (params) => { 'DD MMM YYYY', )}`; - const market = getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketDest, params) === 'O' ? 'OConus' : 'Conus'; + const market = getParamValue(SERVICE_ITEM_PARAM_KEYS.MarketDest, params) === 'O' ? 'OCONUS' : 'CONUS'; return calculation(value, label, formatDetail(deliveryDate), formatDetail(market)); }; From bf335d1a4058379040972b2e08df84b699f9d59c Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Fri, 14 Feb 2025 16:54:07 +0000 Subject: [PATCH 192/260] initial commit, should be good --- pkg/services/order/order_updater.go | 4 ++ pkg/services/order/order_updater_test.go | 60 +++++++++++++++++++ .../AllowancesDetailForm.jsx | 23 ++++--- .../AllowancesDetailForm.test.jsx | 20 +++++-- .../Office/MoveAllowances/MoveAllowances.jsx | 8 ++- 5 files changed, 97 insertions(+), 18 deletions(-) diff --git a/pkg/services/order/order_updater.go b/pkg/services/order/order_updater.go index 8929d047684..492c43acabe 100644 --- a/pkg/services/order/order_updater.go +++ b/pkg/services/order/order_updater.go @@ -488,6 +488,8 @@ func allowanceFromTOOPayload(appCtx appcontext.AppContext, existingOrder models. if payload.WeightRestriction != nil { weightRestriction := int(*payload.WeightRestriction) order.Entitlement.WeightRestriction = &weightRestriction + } else { + order.Entitlement.WeightRestriction = nil } if payload.AccompaniedTour != nil { @@ -596,6 +598,8 @@ func allowanceFromCounselingPayload(appCtx appcontext.AppContext, existingOrder if payload.WeightRestriction != nil { weightRestriction := int(*payload.WeightRestriction) order.Entitlement.WeightRestriction = &weightRestriction + } else { + order.Entitlement.WeightRestriction = nil } if payload.AccompaniedTour != nil { diff --git a/pkg/services/order/order_updater_test.go b/pkg/services/order/order_updater_test.go index 9e86e990f95..b4b1c7cf154 100644 --- a/pkg/services/order/order_updater_test.go +++ b/pkg/services/order/order_updater_test.go @@ -651,6 +651,36 @@ func (suite *OrderServiceSuite) TestUpdateAllowanceAsTOO() { suite.Equal(*payload.DependentsUnderTwelve, int64(*updatedOrder.Entitlement.DependentsUnderTwelve)) }) + suite.Run("Updates the allowance when weightRestriction is null", func() { + moveRouter := move.NewMoveRouter() + orderUpdater := NewOrderUpdater(moveRouter) + order := factory.BuildNeedsServiceCounselingMove(suite.DB(), []factory.Customization{ + { + Model: models.Entitlement{ + WeightRestriction: models.IntPointer(1000), + }, + }, + }, nil).Orders + + eTag := etag.GenerateEtag(order.UpdatedAt) + + payload := ghcmessages.UpdateAllowancePayload{ + WeightRestriction: nil, + } + + updatedOrder, _, err := orderUpdater.UpdateAllowanceAsTOO(suite.AppContextForTest(), order.ID, payload, eTag) + suite.NoError(err) + + var orderInDB models.Order + err = suite.DB().Find(&orderInDB, order.ID) + + fetchedSM := models.ServiceMember{} + _ = suite.DB().Find(&fetchedSM, order.ServiceMember.ID) + + suite.NoError(err) + suite.Nil(updatedOrder.Entitlement.WeightRestriction) + }) + suite.Run("Updates the allowance when all fields are valid with dependents", func() { moveRouter := move.NewMoveRouter() orderUpdater := NewOrderUpdater(moveRouter) @@ -810,6 +840,36 @@ func (suite *OrderServiceSuite) TestUpdateAllowanceAsCounselor() { suite.Equal(*payload.WeightRestriction, int64(*updatedOrder.Entitlement.WeightRestriction)) }) + suite.Run("Updates the allowance when weightRestriction is null", func() { + moveRouter := move.NewMoveRouter() + orderUpdater := NewOrderUpdater(moveRouter) + order := factory.BuildNeedsServiceCounselingMove(suite.DB(), []factory.Customization{ + { + Model: models.Entitlement{ + WeightRestriction: models.IntPointer(1000), + }, + }, + }, nil).Orders + + eTag := etag.GenerateEtag(order.UpdatedAt) + + payload := ghcmessages.CounselingUpdateAllowancePayload{ + WeightRestriction: nil, + } + + updatedOrder, _, err := orderUpdater.UpdateAllowanceAsCounselor(suite.AppContextForTest(), order.ID, payload, eTag) + suite.NoError(err) + + var orderInDB models.Order + err = suite.DB().Find(&orderInDB, order.ID) + + fetchedSM := models.ServiceMember{} + _ = suite.DB().Find(&fetchedSM, order.ServiceMember.ID) + + suite.NoError(err) + suite.Nil(updatedOrder.Entitlement.WeightRestriction) + }) + suite.Run("Updates the allowance when all fields are valid with dependents present and authorized", func() { moveRouter := move.NewMoveRouter() orderUpdater := NewOrderUpdater(moveRouter) diff --git a/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.jsx b/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.jsx index 7b38d00bb68..cfbcd359779 100644 --- a/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.jsx +++ b/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.jsx @@ -21,7 +21,7 @@ const AllowancesDetailForm = ({ header, entitlements, branchOptions, formIsDisab entitlements?.dependentsTwelveAndOver || entitlements?.dependentsUnderTwelve ); - const { setFieldValue } = useFormikContext(); + const { values, setFieldValue } = useFormikContext(); const [isAdminWeightLocationChecked, setIsAdminWeightLocationChecked] = useState(entitlements?.weightRestriction > 0); useEffect(() => { // Functional component version of "componentDidMount" @@ -37,20 +37,20 @@ const AllowancesDetailForm = ({ header, entitlements, branchOptions, formIsDisab useEffect(() => { if (!isAdminWeightLocationChecked) { - // Find the weight restriction input and reset its value to 0 - const weightRestrictionInput = document.getElementById('weightRestrictionId'); - if (weightRestrictionInput) { - weightRestrictionInput.value = ''; - } + setFieldValue('weightRestriction', `${values.weightRestriction}`); } - }, [isAdminWeightLocationChecked]); + }, [setFieldValue, values.weightRestriction, isAdminWeightLocationChecked]); const handleAdminWeightLocationChange = (e) => { const isChecked = e.target.checked; setIsAdminWeightLocationChecked(isChecked); if (!isChecked) { - setFieldValue('weightRestriction', ''); + setFieldValue('weightRestriction', `${values.weightRestriction}`); + } else if (isChecked && values.weightRestriction) { + setFieldValue('weightRestriction', `${values.weightRestriction}`); + } else { + setFieldValue('weightRestriction', null); } }; @@ -205,14 +205,13 @@ const AllowancesDetailForm = ({ header, entitlements, branchOptions, formIsDisab )} diff --git a/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx b/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx index fcf825bd404..f117fed08f7 100644 --- a/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx +++ b/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx @@ -12,6 +12,7 @@ const initialValues = { proGearWeightSpouse: '500', requiredMedicalEquipmentWeight: '1000', organizationalClothingAndIndividualEquipment: true, + weightRestriction: '500', }; const initialValuesOconusAdditions = { @@ -81,6 +82,7 @@ const entitlements = { storageInTransit: 90, totalWeight: 11000, totalDependents: 2, + weightRestriction: 500, }; const entitlementOconusAdditions = { @@ -179,11 +181,21 @@ describe('AllowancesDetailForm additional tests', () => { const adminWeightCheckbox = await screen.findByTestId('adminWeightLocation'); expect(adminWeightCheckbox).toBeInTheDocument(); - expect(screen.queryByTestId('weightRestrictionInput')).not.toBeInTheDocument(); - await act(async () => { - adminWeightCheckbox.click(); - }); expect(screen.getByTestId('weightRestrictionInput')).toBeInTheDocument(); + expect(screen.getByTestId('weightRestrictionInput')).toHaveValue('500'); + }); + + it('does not render the admin weight location section when the weightRestriction entitlement is null', async () => { + entitlements.weightRestriction = null; + render( + + + , + ); + + const adminWeightCheckbox = await screen.findByTestId('adminWeightLocation'); + expect(adminWeightCheckbox).toBeInTheDocument(); + expect(screen.queryByTestId('weightRestrictionInput')).not.toBeInTheDocument(); }); it('displays the total weight allowance correctly', async () => { diff --git a/src/pages/Office/MoveAllowances/MoveAllowances.jsx b/src/pages/Office/MoveAllowances/MoveAllowances.jsx index 5e7057c752f..8628656d0ce 100644 --- a/src/pages/Office/MoveAllowances/MoveAllowances.jsx +++ b/src/pages/Office/MoveAllowances/MoveAllowances.jsx @@ -103,11 +103,13 @@ const MoveAllowances = () => { organizationalClothingAndIndividualEquipment, storageInTransit, gunSafe, + adminRestrictedWeightLocation, weightRestriction, accompaniedTour, dependentsTwelveAndOver, dependentsUnderTwelve, } = values; + const body = { issueDate: order.date_issued, newDutyLocationId: order.destinationDutyLocation.id, @@ -124,11 +126,12 @@ const MoveAllowances = () => { organizationalClothingAndIndividualEquipment, storageInTransit: Number(storageInTransit), gunSafe, - weightRestriction: Number(weightRestriction), + weightRestriction: adminRestrictedWeightLocation && weightRestriction ? Number(weightRestriction) : null, accompaniedTour, dependentsTwelveAndOver: Number(dependentsTwelveAndOver), dependentsUnderTwelve: Number(dependentsUnderTwelve), }; + mutateOrders({ orderID: orderId, ifMatchETag: order.eTag, body }); }; @@ -156,7 +159,8 @@ const MoveAllowances = () => { requiredMedicalEquipmentWeight: `${requiredMedicalEquipmentWeight}`, organizationalClothingAndIndividualEquipment, gunSafe, - weightRestriction: `${weightRestriction}`, + adminRestrictedWeightLocation: weightRestriction > 0, + weightRestriction: weightRestriction ? `${weightRestriction}` : '0', storageInTransit: `${storageInTransit}`, accompaniedTour, dependentsUnderTwelve: `${dependentsUnderTwelve}`, From d7fd96091e0de75e1a6e7d1e136c408a0a12d454 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Fri, 14 Feb 2025 17:09:41 +0000 Subject: [PATCH 193/260] validation updates --- .../AllowancesDetailForm.test.jsx | 7 +++++-- src/pages/Office/MoveAllowances/MoveAllowances.jsx | 14 +++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx b/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx index f117fed08f7..6b6c57aafdc 100644 --- a/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx +++ b/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx @@ -181,8 +181,11 @@ describe('AllowancesDetailForm additional tests', () => { const adminWeightCheckbox = await screen.findByTestId('adminWeightLocation'); expect(adminWeightCheckbox).toBeInTheDocument(); - expect(screen.getByTestId('weightRestrictionInput')).toBeInTheDocument(); - expect(screen.getByTestId('weightRestrictionInput')).toHaveValue('500'); + expect(screen.getByLabelText('Admin restricted weight location')).toBeChecked(); + + const weightRestrictionInput = screen.getByTestId('weightRestrictionInput'); + expect(weightRestrictionInput).toBeInTheDocument(); + expect(weightRestrictionInput).toHaveValue('500'); }); it('does not render the admin weight location section when the weightRestriction entitlement is null', async () => { diff --git a/src/pages/Office/MoveAllowances/MoveAllowances.jsx b/src/pages/Office/MoveAllowances/MoveAllowances.jsx index 8628656d0ce..f35a26da1a7 100644 --- a/src/pages/Office/MoveAllowances/MoveAllowances.jsx +++ b/src/pages/Office/MoveAllowances/MoveAllowances.jsx @@ -44,10 +44,18 @@ const validationSchema = Yup.object({ .transform((value) => (Number.isNaN(value) ? 0 : value)) .notRequired(), weightRestriction: Yup.number() - .min(1, 'Weight restriction must be greater than 0') - .max(18000, 'Weight restriction cannot exceed 18,000 lbs') .transform((value) => (Number.isNaN(value) ? 0 : value)) - .notRequired(), + .when('adminRestrictedWeightLocation', { + is: true, // Apply rules only if adminRestrictedWeightLocation is true + then: (schema) => + schema + .min(1, 'Weight restriction must be greater than 0') + .max(18000, 'Weight restriction cannot exceed 18,000 lbs') + .required('Weight restriction is required when Admin Restricted Weight Location is enabled'), + otherwise: (schema) => schema.notRequired().nullable(), // No validation when false + }), + + adminRestrictedWeightLocation: Yup.boolean().notRequired(), }); const MoveAllowances = () => { From 16ca8e848f512161a01196a839c96f4f2ce75297 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Fri, 14 Feb 2025 17:24:46 +0000 Subject: [PATCH 194/260] updating test to consider validations --- .../MoveAllowances/MoveAllowances.test.jsx | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/pages/Office/MoveAllowances/MoveAllowances.test.jsx b/src/pages/Office/MoveAllowances/MoveAllowances.test.jsx index b9ff87d66e5..8b415b82f9c 100644 --- a/src/pages/Office/MoveAllowances/MoveAllowances.test.jsx +++ b/src/pages/Office/MoveAllowances/MoveAllowances.test.jsx @@ -1,10 +1,12 @@ import React from 'react'; -import { render, screen } from '@testing-library/react'; +import { fireEvent, render, screen, waitFor } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; import MoveAllowances from './MoveAllowances'; import { MockProviders } from 'testUtils'; import { useOrdersDocumentQueries } from 'hooks/queries'; +import { permissionTypes } from 'constants/permissions'; const mockOriginDutyLocation = { address: { @@ -67,6 +69,7 @@ const useOrdersDocumentQueriesReturnValue = { storageInTransit: 2, totalDependents: 1, totalWeight: 5000, + weightRestriction: 500, }, first_name: 'Leo', grade: 'E_1', @@ -139,9 +142,9 @@ describe('MoveAllowances page', () => { expect(await screen.findByTestId('view-orders')).toHaveTextContent('View Orders'); }); - it('renders displays the allowances in the sidebar form', async () => { + it('renders displays the allowances in the sidebar form and allows editing with correct permissions', async () => { render( - + , ); @@ -156,6 +159,27 @@ describe('MoveAllowances page', () => { expect(screen.getByLabelText('Dependents authorized')).toBeChecked(); expect(screen.getByTestId('weightAllowance')).toHaveTextContent('5,000 lbs'); + const adminWeightCheckbox = await screen.findByTestId('adminWeightLocation'); + expect(adminWeightCheckbox).toBeChecked(); + const weightRestrictionInput = screen.getByTestId('weightRestrictionInput'); + expect(weightRestrictionInput).toHaveValue('500'); + + await userEvent.click(weightRestrictionInput); + await userEvent.clear(weightRestrictionInput); + await userEvent.type(weightRestrictionInput, '0'); + fireEvent.blur(weightRestrictionInput); + + await waitFor(() => { + expect(screen.getByText(/Weight restriction must be greater than 0/i)).toBeInTheDocument(); + }); + + await userEvent.clear(weightRestrictionInput); + + await waitFor(() => { + expect( + screen.getByText(/Weight restriction is required when Admin Restricted Weight Location is enabled/i), + ).toBeInTheDocument(); + }); }); }); }); From 473b189345a91465c0fc293164babdfbf18435e0 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Fri, 14 Feb 2025 17:38:46 +0000 Subject: [PATCH 195/260] removing unused portion of test --- pkg/services/order/order_updater_test.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkg/services/order/order_updater_test.go b/pkg/services/order/order_updater_test.go index b4b1c7cf154..b88d9ab435a 100644 --- a/pkg/services/order/order_updater_test.go +++ b/pkg/services/order/order_updater_test.go @@ -673,10 +673,6 @@ func (suite *OrderServiceSuite) TestUpdateAllowanceAsTOO() { var orderInDB models.Order err = suite.DB().Find(&orderInDB, order.ID) - - fetchedSM := models.ServiceMember{} - _ = suite.DB().Find(&fetchedSM, order.ServiceMember.ID) - suite.NoError(err) suite.Nil(updatedOrder.Entitlement.WeightRestriction) }) @@ -862,10 +858,6 @@ func (suite *OrderServiceSuite) TestUpdateAllowanceAsCounselor() { var orderInDB models.Order err = suite.DB().Find(&orderInDB, order.ID) - - fetchedSM := models.ServiceMember{} - _ = suite.DB().Find(&fetchedSM, order.ServiceMember.ID) - suite.NoError(err) suite.Nil(updatedOrder.Entitlement.WeightRestriction) }) From 408fe81b9547a717168ec5c47339b0dce4478a6d Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Fri, 14 Feb 2025 18:11:41 +0000 Subject: [PATCH 196/260] spread em --- .../AllowancesDetailForm/AllowancesDetailForm.test.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx b/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx index 6b6c57aafdc..3b0e5dbe29e 100644 --- a/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx +++ b/src/components/Office/AllowancesDetailForm/AllowancesDetailForm.test.jsx @@ -189,10 +189,12 @@ describe('AllowancesDetailForm additional tests', () => { }); it('does not render the admin weight location section when the weightRestriction entitlement is null', async () => { - entitlements.weightRestriction = null; render( - + , ); From 6aa5ea49d4f3653dafabfe3b0bebc4db60340aac Mon Sep 17 00:00:00 2001 From: Tae Jung Date: Fri, 14 Feb 2025 18:33:02 +0000 Subject: [PATCH 197/260] display fix for service items --- pkg/gen/ghcapi/embedded_spec.go | 4 ++-- .../PaymentRequestDetails/PaymentRequestDetails.jsx | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go index d84b59fe148..a6d319c8a4d 100644 --- a/pkg/gen/ghcapi/embedded_spec.go +++ b/pkg/gen/ghcapi/embedded_spec.go @@ -1516,7 +1516,7 @@ func init() { }, "/move-task-orders/{moveTaskOrderID}/status": { "patch": { - "description": "Changes move task order status to make it available to prime", + "description": "Changes move task order status", "consumes": [ "application/json" ], @@ -1526,7 +1526,7 @@ func init() { "tags": [ "moveTaskOrder" ], - "summary": "Change the status of a move task order to make it available to prime", + "summary": "Change the status of a move task order", "operationId": "updateMoveTaskOrderStatus", "parameters": [ { diff --git a/src/components/Office/PaymentRequestDetails/PaymentRequestDetails.jsx b/src/components/Office/PaymentRequestDetails/PaymentRequestDetails.jsx index 4dbd4e2f0b0..e1c38c20c91 100644 --- a/src/components/Office/PaymentRequestDetails/PaymentRequestDetails.jsx +++ b/src/components/Office/PaymentRequestDetails/PaymentRequestDetails.jsx @@ -106,8 +106,8 @@ const PaymentRequestDetails = ({ const [headingType, shipmentStyle] = shipmentHeadingAndStyle(mtoShipmentType); const { modificationType, departureDate, address, mtoServiceItems } = shipment; - const findAdditionalServiceItemData = (mtoServiceItemCode) => { - return mtoServiceItems?.find((mtoServiceItem) => mtoServiceItem.reServiceCode === mtoServiceItemCode); + const findAdditionalServiceItemData = (mtoServiceItemID) => { + return mtoServiceItems?.find((mtoServiceItem) => mtoServiceItem.id === mtoServiceItemID); }; return ( @@ -167,7 +167,7 @@ const PaymentRequestDetails = ({ return ( Date: Fri, 14 Feb 2025 18:47:55 +0000 Subject: [PATCH 198/260] adding isValid check --- src/pages/Office/MoveAllowances/MoveAllowances.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Office/MoveAllowances/MoveAllowances.jsx b/src/pages/Office/MoveAllowances/MoveAllowances.jsx index f35a26da1a7..edf027963e3 100644 --- a/src/pages/Office/MoveAllowances/MoveAllowances.jsx +++ b/src/pages/Office/MoveAllowances/MoveAllowances.jsx @@ -218,7 +218,7 @@ const MoveAllowances = () => {
-
-
); From 282d46df0ac55ba74db30d406965061791eeb847 Mon Sep 17 00:00:00 2001 From: Jacinta Callahan Date: Tue, 18 Feb 2025 20:04:24 +0000 Subject: [PATCH 209/260] changed debian:stable image --- Dockerfile | 2 +- Dockerfile.dp3 | 2 +- Dockerfile.migrations | 2 +- Dockerfile.tasks | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 293ea88db39..61bb314fa6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM harbor.csde.caci.com/docker.io/debian:stable AS build-env +FROM harbor.csde.caci.com/docker.io/library/debian:stable AS build-env COPY config/tls/dod-wcf-root-ca-1.pem /usr/local/share/ca-certificates/dod-wcf-root-ca-1.pem.crt COPY config/tls/dod-wcf-intermediate-ca-1.pem /usr/local/share/ca-certificates/dod-wcf-intermediate-ca-1.pem.crt diff --git a/Dockerfile.dp3 b/Dockerfile.dp3 index c2cafd6bd07..f02187cd763 100644 --- a/Dockerfile.dp3 +++ b/Dockerfile.dp3 @@ -1,4 +1,4 @@ -FROM harbor.csde.caci.com/docker.io/debian:stable AS build-env +FROM harbor.csde.caci.com/docker.io/library/debian:stable AS build-env # hadolint ignore=DL3007 FROM gcr.io/distroless/base-debian12@sha256:74ddbf52d93fafbdd21b399271b0b4aac1babf8fa98cab59e5692e01169a1348 diff --git a/Dockerfile.migrations b/Dockerfile.migrations index 5d4956df394..021428de322 100644 --- a/Dockerfile.migrations +++ b/Dockerfile.migrations @@ -1,4 +1,4 @@ -FROM harbor.csde.caci.com/docker.io/debian:stable AS build-env +FROM harbor.csde.caci.com/docker.io/library/debian:stable AS build-env COPY config/tls/dod-wcf-root-ca-1.pem /usr/local/share/ca-certificates/dod-wcf-root-ca-1.pem.crt COPY config/tls/dod-wcf-intermediate-ca-1.pem /usr/local/share/ca-certificates/dod-wcf-intermediate-ca-1.pem.crt diff --git a/Dockerfile.tasks b/Dockerfile.tasks index d41ee54e808..7546db7c4c8 100644 --- a/Dockerfile.tasks +++ b/Dockerfile.tasks @@ -1,4 +1,4 @@ -FROM harbor.csde.caci.com/docker.io/debian:stable AS build-env +FROM harbor.csde.caci.com/docker.io/library/debian:stable AS build-env COPY config/tls/dod-wcf-root-ca-1.pem /usr/local/share/ca-certificates/dod-wcf-root-ca-1.pem.crt COPY config/tls/dod-wcf-intermediate-ca-1.pem /usr/local/share/ca-certificates/dod-wcf-intermediate-ca-1.pem.crt From 8f131e5a13940bb07fdb15df2f90d9b23c731a1e Mon Sep 17 00:00:00 2001 From: Jon Spight Date: Tue, 18 Feb 2025 20:53:14 +0000 Subject: [PATCH 210/260] missing test --- pkg/services/move/move_fetcher_test.go | 84 ++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/pkg/services/move/move_fetcher_test.go b/pkg/services/move/move_fetcher_test.go index 62b6551add5..b37cdb6c277 100644 --- a/pkg/services/move/move_fetcher_test.go +++ b/pkg/services/move/move_fetcher_test.go @@ -519,6 +519,90 @@ func (suite *MoveServiceSuite) TestMoveFetcherBulkAssignmentSC() { suite.Equal(1, len(moves)) suite.NotEqual(marinePPM.ID, moves[0].ID) }) + + suite.Run("Closeout returns non Navy/USCG/USMC ppms in needs closeout status", func() { + moveFetcher := NewMoveFetcherBulkAssignment() + transportationOffice := factory.BuildTransportationOffice(suite.DB(), nil, nil) + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), []factory.Customization{ + { + Model: transportationOffice, + LinkOnly: true, + Type: &factory.TransportationOffices.CloseoutOffice, + }, + }, []roles.RoleType{roles.RoleTypeServicesCounselor}) + + submittedAt := time.Now() + + // create non USMC/USCG/NAVY ppm in need closeout status + factory.BuildMoveWithPPMShipment(suite.DB(), []factory.Customization{ + { + Model: transportationOffice, + LinkOnly: true, + Type: &factory.TransportationOffices.CloseoutOffice, + }, + { + Model: models.PPMShipment{ + Status: models.PPMShipmentStatusNeedsCloseout, + SubmittedAt: &submittedAt, + }, + }, + { + Model: models.Move{ + Status: models.MoveStatusAPPROVED, + }, + }, + }, nil) + + // create non closeout needed ppm + factory.BuildMoveWithPPMShipment(suite.DB(), []factory.Customization{ + { + Model: transportationOffice, + LinkOnly: true, + Type: &factory.TransportationOffices.CloseoutOffice, + }, + { + Model: models.PPMShipment{ + Status: models.PPMShipmentStatusWaitingOnCustomer, + SubmittedAt: &submittedAt, + }, + }, + { + Model: models.Move{ + Status: models.MoveStatusAPPROVED, + }, + }, + }, nil) + + marine := models.AffiliationMARINES + marinePPM := factory.BuildPPMShipment(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVED, + }, + }, + { + Model: models.MTOShipment{ + ShipmentType: models.MTOShipmentTypePPM, + }, + }, + { + Model: models.PPMShipment{ + Status: models.PPMShipmentStatusNeedsCloseout, + SubmittedAt: &submittedAt, + }, + }, + { + Model: models.ServiceMember{ + Affiliation: &marine, + }, + }, + }, nil) + + moves, err := moveFetcher.FetchMovesForBulkAssignmentCloseout(suite.AppContextForTest(), "KKFA", officeUser.TransportationOffice.ID) + suite.FatalNoError(err) + suite.Equal(1, len(moves)) + suite.NotEqual(marinePPM.ID, moves[0].ID) + }) } func (suite *MoveServiceSuite) TestMoveFetcherBulkAssignmentTOO() { From 18d4f7eae979d9c42d980148825da29bf49ce757 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Tue, 18 Feb 2025 16:09:13 -0600 Subject: [PATCH 211/260] add ddl create script --- scripts/README.md | 1 + scripts/generate-ddl-migration | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100755 scripts/generate-ddl-migration diff --git a/scripts/README.md b/scripts/README.md index 46aa61a74c1..d010b67b7fe 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -170,6 +170,7 @@ migrations. | `download-secure-migration` | A script to download secure migrations from all environments | | `generate-secure-migration` | A script to help manage the creation of secure migrations | | `upload-secure-migration` | A script to upload secure migrations to all environments in both commercial and GovCloud AWS | +| `generate-ddl-migration` | A script to help manage the creation of DDL migrations | ### Database Scripts diff --git a/scripts/generate-ddl-migration b/scripts/generate-ddl-migration new file mode 100755 index 00000000000..3b457d1561b --- /dev/null +++ b/scripts/generate-ddl-migration @@ -0,0 +1,22 @@ +#!/bin/bash + +dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +version=$(date +"%Y%m%d%H%M%S") +filename=$1 +type=$2 + +if [ "$type" == "function" ]; then + echo "${version}_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_functions_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_functions/${version}_${filename}.up.sql" +elif [ "$type" == "tables" ]; then + echo "${version}_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_tables_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_tables/${version}_${filename}.up.sql" +elif [ "$type" == "types" ]; then + echo "${version}_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_types_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_types/${version}_${filename}.up.sql" + elif [ "$type" == "views" ]; then + echo "${version}_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_views_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_views/${version}_${filename}.up.sql" +else + touch "${dir}/../migrations/app/ddl_migrations/${version}_${filename}.up.sql" +fi From e40cece07a448748d22bf5e8c522700bccdcb2c3 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 19 Feb 2025 08:15:23 -0600 Subject: [PATCH 212/260] test exp --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f83d084326b..41a9edbf214 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,16 +30,16 @@ variables: GOLANGCI_LINT_VERBOSE: "-v" # Specify the environment: loadtest, demo, exp - DP3_ENV: &dp3_env placeholder_env + DP3_ENV: &dp3_env exp # Specify the branch to deploy TODO: this might be not needed. So far useless - DP3_BRANCH: &dp3_branch placeholder_branch_name + DP3_BRANCH: &dp3_branch ddl_migrations # Ignore branches for integration tests - INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch placeholder_branch_name - INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch placeholder_branch_name - CLIENT_IGNORE_BRANCH: &client_ignore_branch placeholder_branch_name - SERVER_IGNORE_BRANCH: &server_ignore_branch placeholder_branch_name + INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch ddl_migrations + INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch ddl_migrations + CLIENT_IGNORE_BRANCH: &client_ignore_branch ddl_migrations + SERVER_IGNORE_BRANCH: &server_ignore_branch ddl_migrations OTEL_IMAGE_TAG: &otel_image_tag "git-$OTEL_VERSION-$CI_COMMIT_SHORT_SHA" From 51a5a6f2003a85622b85502785400c1cc7cca83a Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 19 Feb 2025 09:48:17 -0600 Subject: [PATCH 213/260] update gitlab vars --- .gitlab-ci.yml | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41a9edbf214..47b682bde16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -220,7 +220,16 @@ stages: export DB_HOST=localhost export DB_PORT=5432 export MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/migrations_manifest.txt' + export DML_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' + export DDL_TYPES_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' + export DDL_TABLES_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' + export DDL_VIEWS_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' + export DDL_FUNCTIONS_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' export MIGRATION_PATH='file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' + export DDL_TYPES_MIGRATION_PATH='file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' + export DDL_TABLES_MIGRATION_PATH='file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' + export DDL_VIEWS_MIGRATION_PATH='file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_views' + export DDL_FUNCTIONS_MIGRATION_PATH='file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_functions' export EIA_KEY=db2522a43820268a41a802a16ae9fd26 .setup_devseed_env_variables: &setup_devseed_env_variables @@ -789,7 +798,16 @@ server_test: DB_NAME_TEST: test_db DTOD_USE_MOCK: 'true' MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' + DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' + DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' + DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' + DDL_VIEWS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_views' + DDL_FUNCTIONS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_functions' EIA_KEY: db2522a43820268a41a802a16ae9fd26 # dummy key generated with openssl rand -hex 16 ENV: test ENVIRONMENT: test @@ -948,7 +966,16 @@ integration_test_devseed: DB_NAME: dev_db DB_NAME_DEV: dev_db MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' + DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' + DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' + DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' + DDL_VIEWS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_views' + DDL_FUNCTIONS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_functions' EIA_KEY: db2522a43820268a41a802a16ae9fd26 # dummy key generated with openssl rand -hex 16 ENVIRONMENT: development DOD_CA_PACKAGE: /builds/milmove/mymove/config/tls/milmove-cert-bundle.p7b @@ -1023,7 +1050,16 @@ integration_test_mtls: DB_NAME: dev_db DB_NAME_DEV: dev_db MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' + DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' + DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' + DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' + DDL_VIEWS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_views' + DDL_FUNCTIONS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_functions' EIA_KEY: db2522a43820268a41a802a16ae9fd26 # dummy key generated with openssl rand -hex 16 ENVIRONMENT: development DOD_CA_PACKAGE: /builds/milmove/mymove/config/tls/milmove-cert-bundle.p7b @@ -1076,7 +1112,16 @@ integration_test_admin: DB_NAME: dev_db DB_NAME_DEV: dev_db MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' + DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' + DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' + DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' + DDL_VIEWS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_views' + DDL_FUNCTIONS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_functions' EIA_KEY: db2522a43820268a41a802a16ae9fd26 # dummy key generated with openssl rand -hex 16 ENVIRONMENT: development DOD_CA_PACKAGE: /builds/milmove/mymove/config/tls/milmove-cert-bundle.p7b @@ -1134,7 +1179,16 @@ integration_test_my: DB_NAME: dev_db DB_NAME_DEV: dev_db MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' + DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' + DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' + DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' + DDL_VIEWS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_views' + DDL_FUNCTIONS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_functions' EIA_KEY: db2522a43820268a41a802a16ae9fd26 # dummy key generated with openssl rand -hex 16 ENVIRONMENT: development DOD_CA_PACKAGE: /builds/milmove/mymove/config/tls/milmove-cert-bundle.p7b @@ -1193,7 +1247,16 @@ integration_test_office: DB_NAME: dev_db DB_NAME_DEV: dev_db MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' + DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' + DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' + DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' + DDL_VIEWS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_views' + DDL_FUNCTIONS_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_functions' EIA_KEY: db2522a43820268a41a802a16ae9fd26 # dummy key generated with openssl rand -hex 16 ENVIRONMENT: development DOD_CA_PACKAGE: /builds/milmove/mymove/config/tls/milmove-cert-bundle.p7b From ab39a641a068ac49e1d595b6ff2cdd0d8da0fbb5 Mon Sep 17 00:00:00 2001 From: Logan Cunningham <148146808+loganwc@users.noreply.github.com> Date: Wed, 19 Feb 2025 09:57:29 -0600 Subject: [PATCH 214/260] Update BulkAssignmentModal.module.scss --- .../BulkAssignment/BulkAssignmentModal.module.scss | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.module.scss b/src/components/BulkAssignment/BulkAssignmentModal.module.scss index 77878b645a3..4fa9fd266a5 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.module.scss +++ b/src/components/BulkAssignment/BulkAssignmentModal.module.scss @@ -15,6 +15,20 @@ text-decoration: none; font-size: 1rem; } + + /* these styles are used to fix an issue with duplicate usa-button--secondary definitions in USWDS */ + .cancelNoButton { + border-radius: 0.2666666667rem; + color: #0050d8; + background-color: transparent; + box-shadow: inset 0 0 0 2px #0050d8; + padding-left: 1.6rem; + padding-right: 1.6rem; + padding-bottom: 0.8rem; + padding-top: 0.8rem; + height: 42px; + width: 68px; + } } .BulkAssignmentTable { From 27c5e16b5c5a8e7d9ffcd0f3d3b2b4a1ce3c100e Mon Sep 17 00:00:00 2001 From: Logan Cunningham <148146808+loganwc@users.noreply.github.com> Date: Wed, 19 Feb 2025 09:58:18 -0600 Subject: [PATCH 215/260] Update BulkAssignmentModal.test.jsx --- .../BulkAssignment/BulkAssignmentModal.test.jsx | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx index 7d39e32fdf2..cc6a43414ac 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx @@ -115,17 +115,4 @@ describe('BulkAssignmentModal', () => { const confirmButton = await screen.queryByTestId('cancelModalYes'); expect(confirmButton).not.toBeInTheDocument(); }); - - it('renders the user data', async () => { - render(); - const userTable = await screen.findByRole('table'); - expect(userTable).toBeInTheDocument(); - expect(screen.getByText('User')).toBeInTheDocument(); - expect(screen.getByText('Workload')).toBeInTheDocument(); - expect(screen.getByText('Assignment')).toBeInTheDocument(); - await act(async () => { - expect(await screen.getByText('user, sc')).toBeInTheDocument(); - }); - expect(screen.getAllByTestId('bulkAssignmentUserWorkload')[0]).toHaveTextContent('1'); - }); }); From 0c38f5c41e014bf29e98bc6bc7130804f73cbba8 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 19 Feb 2025 10:04:30 -0600 Subject: [PATCH 216/260] s's matter --- scripts/generate-ddl-migration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-ddl-migration b/scripts/generate-ddl-migration index 3b457d1561b..794f4904157 100755 --- a/scripts/generate-ddl-migration +++ b/scripts/generate-ddl-migration @@ -5,7 +5,7 @@ version=$(date +"%Y%m%d%H%M%S") filename=$1 type=$2 -if [ "$type" == "function" ]; then +if [ "$type" == "functions" ]; then echo "${version}_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_functions_manifest.txt" touch "${dir}/../migrations/app/ddl_migrations/ddl_functions/${version}_${filename}.up.sql" elif [ "$type" == "tables" ]; then From cd22670c3c90a6a0ea6df33fe04cd19d3dcefb0b Mon Sep 17 00:00:00 2001 From: Logan Cunningham <148146808+loganwc@users.noreply.github.com> Date: Wed, 19 Feb 2025 10:20:03 -0600 Subject: [PATCH 217/260] Update BulkAssignmentModal.test.jsx --- src/components/BulkAssignment/BulkAssignmentModal.test.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx index cc6a43414ac..bba8fdf268d 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx @@ -52,7 +52,7 @@ describe('BulkAssignmentModal', () => { it('shows cancel confirmation modal when close icon is clicked', async () => { render(); - const closeButton = await screen.findByTestId('modalCancelButton'); + const closeButton = await screen.findByTestId('modalCloseButton'); await userEvent.click(closeButton); From 236c92361e0b85ad248564d654108028446b2d07 Mon Sep 17 00:00:00 2001 From: Logan Cunningham <148146808+loganwc@users.noreply.github.com> Date: Wed, 19 Feb 2025 10:21:11 -0600 Subject: [PATCH 218/260] Update BulkAssignmentModal.test.jsx --- src/components/BulkAssignment/BulkAssignmentModal.test.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx index bba8fdf268d..af451446a7d 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx @@ -64,7 +64,7 @@ describe('BulkAssignmentModal', () => { const cancelButton = await screen.findByRole('button', { name: 'Cancel' }); - const cancelButton = await screen.findByTestId('modalCancelButton'); + const cancelButton = await screen.findByTestId('modalCloseButton'); await userEvent.click(cancelButton); expect(screen.getByTestId('cancelModalYes')).toBeInTheDocument(); From 2d489b4a0619ae573292c3f7b0bfa61c19944ba9 Mon Sep 17 00:00:00 2001 From: Logan Cunningham <148146808+loganwc@users.noreply.github.com> Date: Wed, 19 Feb 2025 10:22:33 -0600 Subject: [PATCH 219/260] Update BulkAssignmentModal.test.jsx --- src/components/BulkAssignment/BulkAssignmentModal.test.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx index af451446a7d..d1cf48141ef 100644 --- a/src/components/BulkAssignment/BulkAssignmentModal.test.jsx +++ b/src/components/BulkAssignment/BulkAssignmentModal.test.jsx @@ -64,7 +64,6 @@ describe('BulkAssignmentModal', () => { const cancelButton = await screen.findByRole('button', { name: 'Cancel' }); - const cancelButton = await screen.findByTestId('modalCloseButton'); await userEvent.click(cancelButton); expect(screen.getByTestId('cancelModalYes')).toBeInTheDocument(); From d52710bba81696ebe8de2e2ec56a26b6767f5b9a Mon Sep 17 00:00:00 2001 From: Logan Cunningham <148146808+loganwc@users.noreply.github.com> Date: Wed, 19 Feb 2025 10:23:16 -0600 Subject: [PATCH 220/260] Update formatters.js --- src/utils/formatters.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils/formatters.js b/src/utils/formatters.js index 2b4eb193541..4e926cfc66e 100644 --- a/src/utils/formatters.js +++ b/src/utils/formatters.js @@ -643,7 +643,6 @@ export const formatAssignedOfficeUserFromContext = (historyRecord) => { } return newValues; }; - /** * @description Converts a string to title case (capitalizes the first letter of each word) * @param {string} str - The input string to format. From 00cf7449a1e3b712690843e30954a8b9bce4e0a4 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Tue, 10 Dec 2024 16:11:02 +0000 Subject: [PATCH 221/260] initial commit, using existing work from 21940 but will change this to a db func --- migrations/app/migrations_manifest.txt | 1 + ...73216_add_destination_queue_db_func.up.sql | 106 +++ pkg/gen/ghcapi/configure_mymove.go | 5 + pkg/gen/ghcapi/embedded_spec.go | 326 +++++++++ pkg/gen/ghcapi/ghcoperations/mymove_api.go | 12 + .../queues/get_destination_requests_queue.go | 58 ++ ...t_destination_requests_queue_parameters.go | 644 ++++++++++++++++++ ...et_destination_requests_queue_responses.go | 149 ++++ ...t_destination_requests_queue_urlbuilder.go | 274 ++++++++ pkg/handlers/ghcapi/api.go | 7 + pkg/handlers/ghcapi/queues.go | 127 ++++ pkg/services/mocks/OrderFetcher.go | 37 + pkg/services/order.go | 1 + pkg/services/order/order_fetcher.go | 148 +++- src/constants/routes.js | 6 +- src/hooks/queries.js | 23 + src/pages/Office/MoveQueue/MoveQueue.jsx | 44 +- src/services/ghcApi.js | 16 + swagger-def/ghc.yaml | 122 +++- swagger/ghc.yaml | 119 ++++ 20 files changed, 2215 insertions(+), 10 deletions(-) create mode 100644 migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql create mode 100644 pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue.go create mode 100644 pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go create mode 100644 pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_responses.go create mode 100644 pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_urlbuilder.go diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt index 020752483cd..a14296a57cf 100644 --- a/migrations/app/migrations_manifest.txt +++ b/migrations/app/migrations_manifest.txt @@ -1089,3 +1089,4 @@ 20250120214107_add_international_ntsr_service_items.up.sql 20250121153007_update_pricing_proc_to_handle_international_shuttle.up.sql 20250121184450_upd_duty_loc_B-22242.up.sql +20250123173216_add_destination_queue_db_func.up.sql diff --git a/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql b/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql new file mode 100644 index 00000000000..8808b472e68 --- /dev/null +++ b/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql @@ -0,0 +1,106 @@ +CREATE OR REPLACE FUNCTION get_destination_queue( + move_code TEXT DEFAULT NULL, -- Search parameter for Move Code + input_move_id UUID DEFAULT NULL, -- Search parameter for Move ID + page INTEGER DEFAULT 1, -- Page number for pagination + per_page INTEGER DEFAULT 20, -- Number of results per page + branch TEXT DEFAULT NULL, -- Filter: service_member.affiliation + edipi TEXT DEFAULT NULL, -- Filter: service_member.edipi + emplid TEXT DEFAULT NULL, -- Filter: service_member.emplid + customer_name TEXT DEFAULT NULL, -- Filter: service_member.first_name + last_name + destination_duty_location TEXT DEFAULT NULL,-- Filter: orders.new_duty_location_id.name + origin_duty_location TEXT DEFAULT NULL, -- Filter: orders.origin_duty_location_id.name + origin_gbloc TEXT DEFAULT NULL, -- Filter: move.counseling_office_transportation_office.gbloc + submitted_at TIMESTAMP DEFAULT NULL, -- Filter: moves.submitted_at + appeared_in_too_at TIMESTAMP DEFAULT NULL, -- Filter: moves.appeared_in_too_at + too_assigned_user TEXT DEFAULT NULL -- Filter: moves.too_assigned_id -> office_users.first_name + last_name +) +RETURNS TABLE ( + move_id UUID, + locator TEXT, + orders_id UUID, + available_to_prime_at TIMESTAMP WITH TIME ZONE, + show BOOLEAN, + total_count BIGINT +) AS $$ +DECLARE + sql_query TEXT; + offset_value INTEGER; +BEGIN + -- OFFSET for pagination + offset_value := (page - 1) * per_page; + + sql_query := ' + SELECT moves.id AS move_id, + moves.locator::TEXT AS locator, + moves.orders_id, + moves.available_to_prime_at, + moves.show, + COUNT(*) OVER() AS total_count + FROM moves + INNER JOIN orders ON moves.orders_id = orders.id + INNER JOIN service_members ON orders.service_member_id = service_members.id + LEFT JOIN duty_locations AS new_duty_locations ON orders.new_duty_location_id = new_duty_locations.id + LEFT JOIN duty_locations AS origin_duty_locations ON orders.origin_duty_location_id = origin_duty_locations.id + LEFT JOIN office_users ON moves.too_assigned_id = office_users.id + LEFT JOIN transportation_offices AS counseling_offices + ON moves.counseling_transportation_office_id = counseling_offices.id + WHERE moves.available_to_prime_at IS NOT NULL + AND moves.show = TRUE + '; + + -- add dynamic filters based on provided parameters + IF move_code IS NOT NULL THEN + sql_query := sql_query || ' AND moves.locator ILIKE ''%' || UPPER(move_code) || '%'' '; + END IF; + + IF input_move_id IS NOT NULL THEN + sql_query := sql_query || ' AND moves.id = ''' || input_move_id || ''' '; + END IF; + + IF branch IS NOT NULL THEN + sql_query := sql_query || ' AND service_members.affiliation ILIKE ''%' || branch || '%'' '; + END IF; + + IF edipi IS NOT NULL THEN + sql_query := sql_query || ' AND service_members.edipi ILIKE ''%' || edipi || '%'' '; + END IF; + + IF emplid IS NOT NULL THEN + sql_query := sql_query || ' AND service_members.emplid ILIKE ''%' || emplid || '%'' '; + END IF; + + IF customer_name IS NOT NULL THEN + sql_query := sql_query || ' AND (service_members.first_name || '' '' || service_members.last_name) ILIKE ''%' || customer_name || '%'' '; + END IF; + + IF destination_duty_location IS NOT NULL THEN + sql_query := sql_query || ' AND new_duty_locations.name ILIKE ''%' || destination_duty_location || '%'' '; + END IF; + + IF origin_duty_location IS NOT NULL THEN + sql_query := sql_query || ' AND origin_duty_locations.name ILIKE ''%' || origin_duty_location || '%'' '; + END IF; + + IF origin_gbloc IS NOT NULL THEN + sql_query := sql_query || ' AND counseling_offices.gbloc ILIKE ''%' || origin_gbloc || '%'' '; + END IF; + + IF submitted_at IS NOT NULL THEN + sql_query := sql_query || ' AND moves.submitted_at = ''' || submitted_at || ''' '; + END IF; + + IF appeared_in_too_at IS NOT NULL THEN + sql_query := sql_query || ' AND moves.appeared_in_too_at = ''' || appeared_in_too_at || ''' '; + END IF; + + IF too_assigned_user IS NOT NULL THEN + sql_query := sql_query || ' AND (office_users.first_name || '' '' || office_users.last_name) ILIKE ''%' || too_assigned_user || '%'' '; + END IF; + + sql_query := sql_query || ' ORDER BY moves.id ASC '; + sql_query := sql_query || ' LIMIT ' || per_page || ' OFFSET ' || offset_value || ' '; + + RETURN QUERY EXECUTE sql_query; + +END; +$$ LANGUAGE plpgsql; \ No newline at end of file diff --git a/pkg/gen/ghcapi/configure_mymove.go b/pkg/gen/ghcapi/configure_mymove.go index 6000c169aaf..415ee1c890d 100644 --- a/pkg/gen/ghcapi/configure_mymove.go +++ b/pkg/gen/ghcapi/configure_mymove.go @@ -247,6 +247,11 @@ func configureAPI(api *ghcoperations.MymoveAPI) http.Handler { return middleware.NotImplemented("operation customer_support_remarks.GetCustomerSupportRemarksForMove has not yet been implemented") }) } + if api.QueuesGetDestinationRequestsQueueHandler == nil { + api.QueuesGetDestinationRequestsQueueHandler = queues.GetDestinationRequestsQueueHandlerFunc(func(params queues.GetDestinationRequestsQueueParams) middleware.Responder { + return middleware.NotImplemented("operation queues.GetDestinationRequestsQueue has not yet been implemented") + }) + } if api.GhcDocumentsGetDocumentHandler == nil { api.GhcDocumentsGetDocumentHandler = ghc_documents.GetDocumentHandlerFunc(func(params ghc_documents.GetDocumentParams) middleware.Responder { return middleware.NotImplemented("operation ghc_documents.GetDocument has not yet been implemented") diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go index fb4caa55f90..2e6924e475c 100644 --- a/pkg/gen/ghcapi/embedded_spec.go +++ b/pkg/gen/ghcapi/embedded_spec.go @@ -4682,6 +4682,166 @@ func init() { } } }, + "/queues/destination-requests": { + "get": { + "description": "A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items (including shuttle) and destination address requests that are not approved.\n", + "produces": [ + "application/json" + ], + "tags": [ + "queues" + ], + "summary": "Gets queued list of all customer moves by GBLOC that have destination requests (destination SIT, shuttle, address requests)", + "operationId": "getDestinationRequestsQueue", + "parameters": [ + { + "type": "integer", + "description": "requested page of results", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "description": "results per page", + "name": "perPage", + "in": "query" + }, + { + "enum": [ + "customerName", + "edipi", + "emplid", + "branch", + "locator", + "status", + "originDutyLocation", + "destinationDutyLocation", + "requestedMoveDate", + "appearedInTooAt", + "assignedTo", + "counselingOffice" + ], + "type": "string", + "description": "field that results should be sorted by", + "name": "sort", + "in": "query" + }, + { + "enum": [ + "asc", + "desc" + ], + "type": "string", + "description": "direction of sort order if applied", + "name": "order", + "in": "query" + }, + { + "type": "string", + "name": "branch", + "in": "query" + }, + { + "type": "string", + "name": "locator", + "in": "query" + }, + { + "type": "string", + "name": "customerName", + "in": "query" + }, + { + "type": "string", + "name": "edipi", + "in": "query" + }, + { + "type": "string", + "name": "emplid", + "in": "query" + }, + { + "uniqueItems": true, + "type": "array", + "items": { + "type": "string" + }, + "collectionFormat": "multi", + "name": "originDutyLocation", + "in": "query" + }, + { + "type": "string", + "name": "destinationDutyLocation", + "in": "query" + }, + { + "type": "string", + "format": "date-time", + "name": "appearedInTooAt", + "in": "query" + }, + { + "type": "string", + "description": "filters the requested pickup date of a shipment on the move", + "name": "requestedMoveDate", + "in": "query" + }, + { + "uniqueItems": true, + "type": "array", + "items": { + "enum": [ + "APPROVALS REQUESTED" + ], + "type": "string" + }, + "description": "Filtering for the status.", + "name": "status", + "in": "query" + }, + { + "type": "string", + "description": "order type", + "name": "orderType", + "in": "query" + }, + { + "type": "string", + "description": "Used to return a queue for a GBLOC other than the default of the current user. Requires the HQ role. The parameter is ignored if the requesting user does not have the necessary role.\n", + "name": "viewAsGBLOC", + "in": "query" + }, + { + "type": "string", + "description": "Used to illustrate which user is assigned to this move.\n", + "name": "assignedTo", + "in": "query" + }, + { + "type": "string", + "description": "filters using a counselingOffice name of the move", + "name": "counselingOffice", + "in": "query" + } + ], + "responses": { + "200": { + "description": "Successfully returned all moves matching the criteria", + "schema": { + "$ref": "#/definitions/QueueMovesResult" + } + }, + "403": { + "$ref": "#/responses/PermissionDenied" + }, + "500": { + "$ref": "#/responses/ServerError" + } + } + } + }, "/queues/moves": { "get": { "description": "An office TOO user will be assigned a transportation office that will determine which moves are displayed in their queue based on the origin duty location. GHC moves will show up here onced they have reached the submitted status sent by the customer and have move task orders, shipments, and service items to approve.\n", @@ -21571,6 +21731,172 @@ func init() { } } }, + "/queues/destination-requests": { + "get": { + "description": "A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items (including shuttle) and destination address requests that are not approved.\n", + "produces": [ + "application/json" + ], + "tags": [ + "queues" + ], + "summary": "Gets queued list of all customer moves by GBLOC that have destination requests (destination SIT, shuttle, address requests)", + "operationId": "getDestinationRequestsQueue", + "parameters": [ + { + "type": "integer", + "description": "requested page of results", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "description": "results per page", + "name": "perPage", + "in": "query" + }, + { + "enum": [ + "customerName", + "edipi", + "emplid", + "branch", + "locator", + "status", + "originDutyLocation", + "destinationDutyLocation", + "requestedMoveDate", + "appearedInTooAt", + "assignedTo", + "counselingOffice" + ], + "type": "string", + "description": "field that results should be sorted by", + "name": "sort", + "in": "query" + }, + { + "enum": [ + "asc", + "desc" + ], + "type": "string", + "description": "direction of sort order if applied", + "name": "order", + "in": "query" + }, + { + "type": "string", + "name": "branch", + "in": "query" + }, + { + "type": "string", + "name": "locator", + "in": "query" + }, + { + "type": "string", + "name": "customerName", + "in": "query" + }, + { + "type": "string", + "name": "edipi", + "in": "query" + }, + { + "type": "string", + "name": "emplid", + "in": "query" + }, + { + "uniqueItems": true, + "type": "array", + "items": { + "type": "string" + }, + "collectionFormat": "multi", + "name": "originDutyLocation", + "in": "query" + }, + { + "type": "string", + "name": "destinationDutyLocation", + "in": "query" + }, + { + "type": "string", + "format": "date-time", + "name": "appearedInTooAt", + "in": "query" + }, + { + "type": "string", + "description": "filters the requested pickup date of a shipment on the move", + "name": "requestedMoveDate", + "in": "query" + }, + { + "uniqueItems": true, + "type": "array", + "items": { + "enum": [ + "APPROVALS REQUESTED" + ], + "type": "string" + }, + "description": "Filtering for the status.", + "name": "status", + "in": "query" + }, + { + "type": "string", + "description": "order type", + "name": "orderType", + "in": "query" + }, + { + "type": "string", + "description": "Used to return a queue for a GBLOC other than the default of the current user. Requires the HQ role. The parameter is ignored if the requesting user does not have the necessary role.\n", + "name": "viewAsGBLOC", + "in": "query" + }, + { + "type": "string", + "description": "Used to illustrate which user is assigned to this move.\n", + "name": "assignedTo", + "in": "query" + }, + { + "type": "string", + "description": "filters using a counselingOffice name of the move", + "name": "counselingOffice", + "in": "query" + } + ], + "responses": { + "200": { + "description": "Successfully returned all moves matching the criteria", + "schema": { + "$ref": "#/definitions/QueueMovesResult" + } + }, + "403": { + "description": "The request was denied", + "schema": { + "$ref": "#/definitions/Error" + } + }, + "500": { + "description": "A server error occurred", + "schema": { + "$ref": "#/definitions/Error" + } + } + } + } + }, "/queues/moves": { "get": { "description": "An office TOO user will be assigned a transportation office that will determine which moves are displayed in their queue based on the origin duty location. GHC moves will show up here onced they have reached the submitted status sent by the customer and have move task orders, shipments, and service items to approve.\n", diff --git a/pkg/gen/ghcapi/ghcoperations/mymove_api.go b/pkg/gen/ghcapi/ghcoperations/mymove_api.go index 772eafbd710..c7668464a5d 100644 --- a/pkg/gen/ghcapi/ghcoperations/mymove_api.go +++ b/pkg/gen/ghcapi/ghcoperations/mymove_api.go @@ -176,6 +176,9 @@ func NewMymoveAPI(spec *loads.Document) *MymoveAPI { CustomerSupportRemarksGetCustomerSupportRemarksForMoveHandler: customer_support_remarks.GetCustomerSupportRemarksForMoveHandlerFunc(func(params customer_support_remarks.GetCustomerSupportRemarksForMoveParams) middleware.Responder { return middleware.NotImplemented("operation customer_support_remarks.GetCustomerSupportRemarksForMove has not yet been implemented") }), + QueuesGetDestinationRequestsQueueHandler: queues.GetDestinationRequestsQueueHandlerFunc(func(params queues.GetDestinationRequestsQueueParams) middleware.Responder { + return middleware.NotImplemented("operation queues.GetDestinationRequestsQueue has not yet been implemented") + }), GhcDocumentsGetDocumentHandler: ghc_documents.GetDocumentHandlerFunc(func(params ghc_documents.GetDocumentParams) middleware.Responder { return middleware.NotImplemented("operation ghc_documents.GetDocument has not yet been implemented") }), @@ -517,6 +520,8 @@ type MymoveAPI struct { CustomerGetCustomerHandler customer.GetCustomerHandler // CustomerSupportRemarksGetCustomerSupportRemarksForMoveHandler sets the operation handler for the get customer support remarks for move operation CustomerSupportRemarksGetCustomerSupportRemarksForMoveHandler customer_support_remarks.GetCustomerSupportRemarksForMoveHandler + // QueuesGetDestinationRequestsQueueHandler sets the operation handler for the get destination requests queue operation + QueuesGetDestinationRequestsQueueHandler queues.GetDestinationRequestsQueueHandler // GhcDocumentsGetDocumentHandler sets the operation handler for the get document operation GhcDocumentsGetDocumentHandler ghc_documents.GetDocumentHandler // MoveTaskOrderGetEntitlementsHandler sets the operation handler for the get entitlements operation @@ -855,6 +860,9 @@ func (o *MymoveAPI) Validate() error { if o.CustomerSupportRemarksGetCustomerSupportRemarksForMoveHandler == nil { unregistered = append(unregistered, "customer_support_remarks.GetCustomerSupportRemarksForMoveHandler") } + if o.QueuesGetDestinationRequestsQueueHandler == nil { + unregistered = append(unregistered, "queues.GetDestinationRequestsQueueHandler") + } if o.GhcDocumentsGetDocumentHandler == nil { unregistered = append(unregistered, "ghc_documents.GetDocumentHandler") } @@ -1315,6 +1323,10 @@ func (o *MymoveAPI) initHandlerCache() { if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } + o.handlers["GET"]["/queues/destination-requests"] = queues.NewGetDestinationRequestsQueue(o.context, o.QueuesGetDestinationRequestsQueueHandler) + if o.handlers["GET"] == nil { + o.handlers["GET"] = make(map[string]http.Handler) + } o.handlers["GET"]["/documents/{documentId}"] = ghc_documents.NewGetDocument(o.context, o.GhcDocumentsGetDocumentHandler) if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) diff --git a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue.go b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue.go new file mode 100644 index 00000000000..f4fdf4135d3 --- /dev/null +++ b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue.go @@ -0,0 +1,58 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package queues + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the generate command + +import ( + "net/http" + + "github.com/go-openapi/runtime/middleware" +) + +// GetDestinationRequestsQueueHandlerFunc turns a function with the right signature into a get destination requests queue handler +type GetDestinationRequestsQueueHandlerFunc func(GetDestinationRequestsQueueParams) middleware.Responder + +// Handle executing the request and returning a response +func (fn GetDestinationRequestsQueueHandlerFunc) Handle(params GetDestinationRequestsQueueParams) middleware.Responder { + return fn(params) +} + +// GetDestinationRequestsQueueHandler interface for that can handle valid get destination requests queue params +type GetDestinationRequestsQueueHandler interface { + Handle(GetDestinationRequestsQueueParams) middleware.Responder +} + +// NewGetDestinationRequestsQueue creates a new http.Handler for the get destination requests queue operation +func NewGetDestinationRequestsQueue(ctx *middleware.Context, handler GetDestinationRequestsQueueHandler) *GetDestinationRequestsQueue { + return &GetDestinationRequestsQueue{Context: ctx, Handler: handler} +} + +/* + GetDestinationRequestsQueue swagger:route GET /queues/destination-requests queues getDestinationRequestsQueue + +Gets queued list of all customer moves by GBLOC that have destination requests (destination SIT, shuttle, address requests) + +A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items (including shuttle) and destination address requests that are not approved. +*/ +type GetDestinationRequestsQueue struct { + Context *middleware.Context + Handler GetDestinationRequestsQueueHandler +} + +func (o *GetDestinationRequestsQueue) ServeHTTP(rw http.ResponseWriter, r *http.Request) { + route, rCtx, _ := o.Context.RouteInfo(r) + if rCtx != nil { + *r = *rCtx + } + var Params = NewGetDestinationRequestsQueueParams() + if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params + o.Context.Respond(rw, r, route.Produces, route, err) + return + } + + res := o.Handler.Handle(Params) // actually handle the request + o.Context.Respond(rw, r, route.Produces, route, res) + +} diff --git a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go new file mode 100644 index 00000000000..69171c50aed --- /dev/null +++ b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go @@ -0,0 +1,644 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package queues + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +import ( + "fmt" + "net/http" + + "github.com/go-openapi/errors" + "github.com/go-openapi/runtime" + "github.com/go-openapi/runtime/middleware" + "github.com/go-openapi/strfmt" + "github.com/go-openapi/swag" + "github.com/go-openapi/validate" +) + +// NewGetDestinationRequestsQueueParams creates a new GetDestinationRequestsQueueParams object +// +// There are no default values defined in the spec. +func NewGetDestinationRequestsQueueParams() GetDestinationRequestsQueueParams { + + return GetDestinationRequestsQueueParams{} +} + +// GetDestinationRequestsQueueParams contains all the bound params for the get destination requests queue operation +// typically these are obtained from a http.Request +// +// swagger:parameters getDestinationRequestsQueue +type GetDestinationRequestsQueueParams struct { + + // HTTP Request Object + HTTPRequest *http.Request `json:"-"` + + /* + In: query + */ + AppearedInTooAt *strfmt.DateTime + /*Used to illustrate which user is assigned to this move. + + In: query + */ + AssignedTo *string + /* + In: query + */ + Branch *string + /*filters using a counselingOffice name of the move + In: query + */ + CounselingOffice *string + /* + In: query + */ + CustomerName *string + /* + In: query + */ + DestinationDutyLocation *string + /* + In: query + */ + Edipi *string + /* + In: query + */ + Emplid *string + /* + In: query + */ + Locator *string + /*direction of sort order if applied + In: query + */ + Order *string + /*order type + In: query + */ + OrderType *string + /* + Unique: true + In: query + Collection Format: multi + */ + OriginDutyLocation []string + /*requested page of results + In: query + */ + Page *int64 + /*results per page + In: query + */ + PerPage *int64 + /*filters the requested pickup date of a shipment on the move + In: query + */ + RequestedMoveDate *string + /*field that results should be sorted by + In: query + */ + Sort *string + /*Filtering for the status. + Unique: true + In: query + */ + Status []string + /*Used to return a queue for a GBLOC other than the default of the current user. Requires the HQ role. The parameter is ignored if the requesting user does not have the necessary role. + + In: query + */ + ViewAsGBLOC *string +} + +// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface +// for simple values it will use straight method calls. +// +// To ensure default values, the struct must have been initialized with NewGetDestinationRequestsQueueParams() beforehand. +func (o *GetDestinationRequestsQueueParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error { + var res []error + + o.HTTPRequest = r + + qs := runtime.Values(r.URL.Query()) + + qAppearedInTooAt, qhkAppearedInTooAt, _ := qs.GetOK("appearedInTooAt") + if err := o.bindAppearedInTooAt(qAppearedInTooAt, qhkAppearedInTooAt, route.Formats); err != nil { + res = append(res, err) + } + + qAssignedTo, qhkAssignedTo, _ := qs.GetOK("assignedTo") + if err := o.bindAssignedTo(qAssignedTo, qhkAssignedTo, route.Formats); err != nil { + res = append(res, err) + } + + qBranch, qhkBranch, _ := qs.GetOK("branch") + if err := o.bindBranch(qBranch, qhkBranch, route.Formats); err != nil { + res = append(res, err) + } + + qCounselingOffice, qhkCounselingOffice, _ := qs.GetOK("counselingOffice") + if err := o.bindCounselingOffice(qCounselingOffice, qhkCounselingOffice, route.Formats); err != nil { + res = append(res, err) + } + + qCustomerName, qhkCustomerName, _ := qs.GetOK("customerName") + if err := o.bindCustomerName(qCustomerName, qhkCustomerName, route.Formats); err != nil { + res = append(res, err) + } + + qDestinationDutyLocation, qhkDestinationDutyLocation, _ := qs.GetOK("destinationDutyLocation") + if err := o.bindDestinationDutyLocation(qDestinationDutyLocation, qhkDestinationDutyLocation, route.Formats); err != nil { + res = append(res, err) + } + + qEdipi, qhkEdipi, _ := qs.GetOK("edipi") + if err := o.bindEdipi(qEdipi, qhkEdipi, route.Formats); err != nil { + res = append(res, err) + } + + qEmplid, qhkEmplid, _ := qs.GetOK("emplid") + if err := o.bindEmplid(qEmplid, qhkEmplid, route.Formats); err != nil { + res = append(res, err) + } + + qLocator, qhkLocator, _ := qs.GetOK("locator") + if err := o.bindLocator(qLocator, qhkLocator, route.Formats); err != nil { + res = append(res, err) + } + + qOrder, qhkOrder, _ := qs.GetOK("order") + if err := o.bindOrder(qOrder, qhkOrder, route.Formats); err != nil { + res = append(res, err) + } + + qOrderType, qhkOrderType, _ := qs.GetOK("orderType") + if err := o.bindOrderType(qOrderType, qhkOrderType, route.Formats); err != nil { + res = append(res, err) + } + + qOriginDutyLocation, qhkOriginDutyLocation, _ := qs.GetOK("originDutyLocation") + if err := o.bindOriginDutyLocation(qOriginDutyLocation, qhkOriginDutyLocation, route.Formats); err != nil { + res = append(res, err) + } + + qPage, qhkPage, _ := qs.GetOK("page") + if err := o.bindPage(qPage, qhkPage, route.Formats); err != nil { + res = append(res, err) + } + + qPerPage, qhkPerPage, _ := qs.GetOK("perPage") + if err := o.bindPerPage(qPerPage, qhkPerPage, route.Formats); err != nil { + res = append(res, err) + } + + qRequestedMoveDate, qhkRequestedMoveDate, _ := qs.GetOK("requestedMoveDate") + if err := o.bindRequestedMoveDate(qRequestedMoveDate, qhkRequestedMoveDate, route.Formats); err != nil { + res = append(res, err) + } + + qSort, qhkSort, _ := qs.GetOK("sort") + if err := o.bindSort(qSort, qhkSort, route.Formats); err != nil { + res = append(res, err) + } + + qStatus, qhkStatus, _ := qs.GetOK("status") + if err := o.bindStatus(qStatus, qhkStatus, route.Formats); err != nil { + res = append(res, err) + } + + qViewAsGBLOC, qhkViewAsGBLOC, _ := qs.GetOK("viewAsGBLOC") + if err := o.bindViewAsGBLOC(qViewAsGBLOC, qhkViewAsGBLOC, route.Formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +// bindAppearedInTooAt binds and validates parameter AppearedInTooAt from query. +func (o *GetDestinationRequestsQueueParams) bindAppearedInTooAt(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + + // Format: date-time + value, err := formats.Parse("date-time", raw) + if err != nil { + return errors.InvalidType("appearedInTooAt", "query", "strfmt.DateTime", raw) + } + o.AppearedInTooAt = (value.(*strfmt.DateTime)) + + if err := o.validateAppearedInTooAt(formats); err != nil { + return err + } + + return nil +} + +// validateAppearedInTooAt carries on validations for parameter AppearedInTooAt +func (o *GetDestinationRequestsQueueParams) validateAppearedInTooAt(formats strfmt.Registry) error { + + if err := validate.FormatOf("appearedInTooAt", "query", "date-time", o.AppearedInTooAt.String(), formats); err != nil { + return err + } + return nil +} + +// bindAssignedTo binds and validates parameter AssignedTo from query. +func (o *GetDestinationRequestsQueueParams) bindAssignedTo(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.AssignedTo = &raw + + return nil +} + +// bindBranch binds and validates parameter Branch from query. +func (o *GetDestinationRequestsQueueParams) bindBranch(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.Branch = &raw + + return nil +} + +// bindCounselingOffice binds and validates parameter CounselingOffice from query. +func (o *GetDestinationRequestsQueueParams) bindCounselingOffice(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.CounselingOffice = &raw + + return nil +} + +// bindCustomerName binds and validates parameter CustomerName from query. +func (o *GetDestinationRequestsQueueParams) bindCustomerName(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.CustomerName = &raw + + return nil +} + +// bindDestinationDutyLocation binds and validates parameter DestinationDutyLocation from query. +func (o *GetDestinationRequestsQueueParams) bindDestinationDutyLocation(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.DestinationDutyLocation = &raw + + return nil +} + +// bindEdipi binds and validates parameter Edipi from query. +func (o *GetDestinationRequestsQueueParams) bindEdipi(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.Edipi = &raw + + return nil +} + +// bindEmplid binds and validates parameter Emplid from query. +func (o *GetDestinationRequestsQueueParams) bindEmplid(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.Emplid = &raw + + return nil +} + +// bindLocator binds and validates parameter Locator from query. +func (o *GetDestinationRequestsQueueParams) bindLocator(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.Locator = &raw + + return nil +} + +// bindOrder binds and validates parameter Order from query. +func (o *GetDestinationRequestsQueueParams) bindOrder(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.Order = &raw + + if err := o.validateOrder(formats); err != nil { + return err + } + + return nil +} + +// validateOrder carries on validations for parameter Order +func (o *GetDestinationRequestsQueueParams) validateOrder(formats strfmt.Registry) error { + + if err := validate.EnumCase("order", "query", *o.Order, []interface{}{"asc", "desc"}, true); err != nil { + return err + } + + return nil +} + +// bindOrderType binds and validates parameter OrderType from query. +func (o *GetDestinationRequestsQueueParams) bindOrderType(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.OrderType = &raw + + return nil +} + +// bindOriginDutyLocation binds and validates array parameter OriginDutyLocation from query. +// +// Arrays are parsed according to CollectionFormat: "multi" (defaults to "csv" when empty). +func (o *GetDestinationRequestsQueueParams) bindOriginDutyLocation(rawData []string, hasKey bool, formats strfmt.Registry) error { + // CollectionFormat: multi + originDutyLocationIC := rawData + if len(originDutyLocationIC) == 0 { + return nil + } + + var originDutyLocationIR []string + for _, originDutyLocationIV := range originDutyLocationIC { + originDutyLocationI := originDutyLocationIV + + originDutyLocationIR = append(originDutyLocationIR, originDutyLocationI) + } + + o.OriginDutyLocation = originDutyLocationIR + if err := o.validateOriginDutyLocation(formats); err != nil { + return err + } + + return nil +} + +// validateOriginDutyLocation carries on validations for parameter OriginDutyLocation +func (o *GetDestinationRequestsQueueParams) validateOriginDutyLocation(formats strfmt.Registry) error { + + // uniqueItems: true + if err := validate.UniqueItems("originDutyLocation", "query", o.OriginDutyLocation); err != nil { + return err + } + return nil +} + +// bindPage binds and validates parameter Page from query. +func (o *GetDestinationRequestsQueueParams) bindPage(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + + value, err := swag.ConvertInt64(raw) + if err != nil { + return errors.InvalidType("page", "query", "int64", raw) + } + o.Page = &value + + return nil +} + +// bindPerPage binds and validates parameter PerPage from query. +func (o *GetDestinationRequestsQueueParams) bindPerPage(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + + value, err := swag.ConvertInt64(raw) + if err != nil { + return errors.InvalidType("perPage", "query", "int64", raw) + } + o.PerPage = &value + + return nil +} + +// bindRequestedMoveDate binds and validates parameter RequestedMoveDate from query. +func (o *GetDestinationRequestsQueueParams) bindRequestedMoveDate(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.RequestedMoveDate = &raw + + return nil +} + +// bindSort binds and validates parameter Sort from query. +func (o *GetDestinationRequestsQueueParams) bindSort(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.Sort = &raw + + if err := o.validateSort(formats); err != nil { + return err + } + + return nil +} + +// validateSort carries on validations for parameter Sort +func (o *GetDestinationRequestsQueueParams) validateSort(formats strfmt.Registry) error { + + if err := validate.EnumCase("sort", "query", *o.Sort, []interface{}{"customerName", "edipi", "emplid", "branch", "locator", "status", "originDutyLocation", "destinationDutyLocation", "requestedMoveDate", "appearedInTooAt", "assignedTo", "counselingOffice"}, true); err != nil { + return err + } + + return nil +} + +// bindStatus binds and validates array parameter Status from query. +// +// Arrays are parsed according to CollectionFormat: "" (defaults to "csv" when empty). +func (o *GetDestinationRequestsQueueParams) bindStatus(rawData []string, hasKey bool, formats strfmt.Registry) error { + var qvStatus string + if len(rawData) > 0 { + qvStatus = rawData[len(rawData)-1] + } + + // CollectionFormat: + statusIC := swag.SplitByFormat(qvStatus, "") + if len(statusIC) == 0 { + return nil + } + + var statusIR []string + for i, statusIV := range statusIC { + statusI := statusIV + + if err := validate.EnumCase(fmt.Sprintf("%s.%v", "status", i), "query", statusI, []interface{}{"APPROVALS REQUESTED"}, true); err != nil { + return err + } + + statusIR = append(statusIR, statusI) + } + + o.Status = statusIR + if err := o.validateStatus(formats); err != nil { + return err + } + + return nil +} + +// validateStatus carries on validations for parameter Status +func (o *GetDestinationRequestsQueueParams) validateStatus(formats strfmt.Registry) error { + + // uniqueItems: true + if err := validate.UniqueItems("status", "query", o.Status); err != nil { + return err + } + return nil +} + +// bindViewAsGBLOC binds and validates parameter ViewAsGBLOC from query. +func (o *GetDestinationRequestsQueueParams) bindViewAsGBLOC(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: false + // AllowEmptyValue: false + + if raw == "" { // empty values pass all other validations + return nil + } + o.ViewAsGBLOC = &raw + + return nil +} diff --git a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_responses.go b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_responses.go new file mode 100644 index 00000000000..ea27ea91263 --- /dev/null +++ b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_responses.go @@ -0,0 +1,149 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package queues + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the swagger generate command + +import ( + "net/http" + + "github.com/go-openapi/runtime" + + "github.com/transcom/mymove/pkg/gen/ghcmessages" +) + +// GetDestinationRequestsQueueOKCode is the HTTP code returned for type GetDestinationRequestsQueueOK +const GetDestinationRequestsQueueOKCode int = 200 + +/* +GetDestinationRequestsQueueOK Successfully returned all moves matching the criteria + +swagger:response getDestinationRequestsQueueOK +*/ +type GetDestinationRequestsQueueOK struct { + + /* + In: Body + */ + Payload *ghcmessages.QueueMovesResult `json:"body,omitempty"` +} + +// NewGetDestinationRequestsQueueOK creates GetDestinationRequestsQueueOK with default headers values +func NewGetDestinationRequestsQueueOK() *GetDestinationRequestsQueueOK { + + return &GetDestinationRequestsQueueOK{} +} + +// WithPayload adds the payload to the get destination requests queue o k response +func (o *GetDestinationRequestsQueueOK) WithPayload(payload *ghcmessages.QueueMovesResult) *GetDestinationRequestsQueueOK { + o.Payload = payload + return o +} + +// SetPayload sets the payload to the get destination requests queue o k response +func (o *GetDestinationRequestsQueueOK) SetPayload(payload *ghcmessages.QueueMovesResult) { + o.Payload = payload +} + +// WriteResponse to the client +func (o *GetDestinationRequestsQueueOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.WriteHeader(200) + if o.Payload != nil { + payload := o.Payload + if err := producer.Produce(rw, payload); err != nil { + panic(err) // let the recovery middleware deal with this + } + } +} + +// GetDestinationRequestsQueueForbiddenCode is the HTTP code returned for type GetDestinationRequestsQueueForbidden +const GetDestinationRequestsQueueForbiddenCode int = 403 + +/* +GetDestinationRequestsQueueForbidden The request was denied + +swagger:response getDestinationRequestsQueueForbidden +*/ +type GetDestinationRequestsQueueForbidden struct { + + /* + In: Body + */ + Payload *ghcmessages.Error `json:"body,omitempty"` +} + +// NewGetDestinationRequestsQueueForbidden creates GetDestinationRequestsQueueForbidden with default headers values +func NewGetDestinationRequestsQueueForbidden() *GetDestinationRequestsQueueForbidden { + + return &GetDestinationRequestsQueueForbidden{} +} + +// WithPayload adds the payload to the get destination requests queue forbidden response +func (o *GetDestinationRequestsQueueForbidden) WithPayload(payload *ghcmessages.Error) *GetDestinationRequestsQueueForbidden { + o.Payload = payload + return o +} + +// SetPayload sets the payload to the get destination requests queue forbidden response +func (o *GetDestinationRequestsQueueForbidden) SetPayload(payload *ghcmessages.Error) { + o.Payload = payload +} + +// WriteResponse to the client +func (o *GetDestinationRequestsQueueForbidden) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.WriteHeader(403) + if o.Payload != nil { + payload := o.Payload + if err := producer.Produce(rw, payload); err != nil { + panic(err) // let the recovery middleware deal with this + } + } +} + +// GetDestinationRequestsQueueInternalServerErrorCode is the HTTP code returned for type GetDestinationRequestsQueueInternalServerError +const GetDestinationRequestsQueueInternalServerErrorCode int = 500 + +/* +GetDestinationRequestsQueueInternalServerError A server error occurred + +swagger:response getDestinationRequestsQueueInternalServerError +*/ +type GetDestinationRequestsQueueInternalServerError struct { + + /* + In: Body + */ + Payload *ghcmessages.Error `json:"body,omitempty"` +} + +// NewGetDestinationRequestsQueueInternalServerError creates GetDestinationRequestsQueueInternalServerError with default headers values +func NewGetDestinationRequestsQueueInternalServerError() *GetDestinationRequestsQueueInternalServerError { + + return &GetDestinationRequestsQueueInternalServerError{} +} + +// WithPayload adds the payload to the get destination requests queue internal server error response +func (o *GetDestinationRequestsQueueInternalServerError) WithPayload(payload *ghcmessages.Error) *GetDestinationRequestsQueueInternalServerError { + o.Payload = payload + return o +} + +// SetPayload sets the payload to the get destination requests queue internal server error response +func (o *GetDestinationRequestsQueueInternalServerError) SetPayload(payload *ghcmessages.Error) { + o.Payload = payload +} + +// WriteResponse to the client +func (o *GetDestinationRequestsQueueInternalServerError) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.WriteHeader(500) + if o.Payload != nil { + payload := o.Payload + if err := producer.Produce(rw, payload); err != nil { + panic(err) // let the recovery middleware deal with this + } + } +} diff --git a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_urlbuilder.go b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_urlbuilder.go new file mode 100644 index 00000000000..c267cfe2aa8 --- /dev/null +++ b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_urlbuilder.go @@ -0,0 +1,274 @@ +// Code generated by go-swagger; DO NOT EDIT. + +package queues + +// This file was generated by the swagger tool. +// Editing this file might prove futile when you re-run the generate command + +import ( + "errors" + "net/url" + golangswaggerpaths "path" + + "github.com/go-openapi/strfmt" + "github.com/go-openapi/swag" +) + +// GetDestinationRequestsQueueURL generates an URL for the get destination requests queue operation +type GetDestinationRequestsQueueURL struct { + AppearedInTooAt *strfmt.DateTime + AssignedTo *string + Branch *string + CounselingOffice *string + CustomerName *string + DestinationDutyLocation *string + Edipi *string + Emplid *string + Locator *string + Order *string + OrderType *string + OriginDutyLocation []string + Page *int64 + PerPage *int64 + RequestedMoveDate *string + Sort *string + Status []string + ViewAsGBLOC *string + + _basePath string + // avoid unkeyed usage + _ struct{} +} + +// WithBasePath sets the base path for this url builder, only required when it's different from the +// base path specified in the swagger spec. +// When the value of the base path is an empty string +func (o *GetDestinationRequestsQueueURL) WithBasePath(bp string) *GetDestinationRequestsQueueURL { + o.SetBasePath(bp) + return o +} + +// SetBasePath sets the base path for this url builder, only required when it's different from the +// base path specified in the swagger spec. +// When the value of the base path is an empty string +func (o *GetDestinationRequestsQueueURL) SetBasePath(bp string) { + o._basePath = bp +} + +// Build a url path and query string +func (o *GetDestinationRequestsQueueURL) Build() (*url.URL, error) { + var _result url.URL + + var _path = "/queues/destination-requests" + + _basePath := o._basePath + if _basePath == "" { + _basePath = "/ghc/v1" + } + _result.Path = golangswaggerpaths.Join(_basePath, _path) + + qs := make(url.Values) + + var appearedInTooAtQ string + if o.AppearedInTooAt != nil { + appearedInTooAtQ = o.AppearedInTooAt.String() + } + if appearedInTooAtQ != "" { + qs.Set("appearedInTooAt", appearedInTooAtQ) + } + + var assignedToQ string + if o.AssignedTo != nil { + assignedToQ = *o.AssignedTo + } + if assignedToQ != "" { + qs.Set("assignedTo", assignedToQ) + } + + var branchQ string + if o.Branch != nil { + branchQ = *o.Branch + } + if branchQ != "" { + qs.Set("branch", branchQ) + } + + var counselingOfficeQ string + if o.CounselingOffice != nil { + counselingOfficeQ = *o.CounselingOffice + } + if counselingOfficeQ != "" { + qs.Set("counselingOffice", counselingOfficeQ) + } + + var customerNameQ string + if o.CustomerName != nil { + customerNameQ = *o.CustomerName + } + if customerNameQ != "" { + qs.Set("customerName", customerNameQ) + } + + var destinationDutyLocationQ string + if o.DestinationDutyLocation != nil { + destinationDutyLocationQ = *o.DestinationDutyLocation + } + if destinationDutyLocationQ != "" { + qs.Set("destinationDutyLocation", destinationDutyLocationQ) + } + + var edipiQ string + if o.Edipi != nil { + edipiQ = *o.Edipi + } + if edipiQ != "" { + qs.Set("edipi", edipiQ) + } + + var emplidQ string + if o.Emplid != nil { + emplidQ = *o.Emplid + } + if emplidQ != "" { + qs.Set("emplid", emplidQ) + } + + var locatorQ string + if o.Locator != nil { + locatorQ = *o.Locator + } + if locatorQ != "" { + qs.Set("locator", locatorQ) + } + + var orderQ string + if o.Order != nil { + orderQ = *o.Order + } + if orderQ != "" { + qs.Set("order", orderQ) + } + + var orderTypeQ string + if o.OrderType != nil { + orderTypeQ = *o.OrderType + } + if orderTypeQ != "" { + qs.Set("orderType", orderTypeQ) + } + + var originDutyLocationIR []string + for _, originDutyLocationI := range o.OriginDutyLocation { + originDutyLocationIS := originDutyLocationI + if originDutyLocationIS != "" { + originDutyLocationIR = append(originDutyLocationIR, originDutyLocationIS) + } + } + + originDutyLocation := swag.JoinByFormat(originDutyLocationIR, "multi") + + for _, qsv := range originDutyLocation { + qs.Add("originDutyLocation", qsv) + } + + var pageQ string + if o.Page != nil { + pageQ = swag.FormatInt64(*o.Page) + } + if pageQ != "" { + qs.Set("page", pageQ) + } + + var perPageQ string + if o.PerPage != nil { + perPageQ = swag.FormatInt64(*o.PerPage) + } + if perPageQ != "" { + qs.Set("perPage", perPageQ) + } + + var requestedMoveDateQ string + if o.RequestedMoveDate != nil { + requestedMoveDateQ = *o.RequestedMoveDate + } + if requestedMoveDateQ != "" { + qs.Set("requestedMoveDate", requestedMoveDateQ) + } + + var sortQ string + if o.Sort != nil { + sortQ = *o.Sort + } + if sortQ != "" { + qs.Set("sort", sortQ) + } + + var statusIR []string + for _, statusI := range o.Status { + statusIS := statusI + if statusIS != "" { + statusIR = append(statusIR, statusIS) + } + } + + status := swag.JoinByFormat(statusIR, "") + + if len(status) > 0 { + qsv := status[0] + if qsv != "" { + qs.Set("status", qsv) + } + } + + var viewAsGBLOCQ string + if o.ViewAsGBLOC != nil { + viewAsGBLOCQ = *o.ViewAsGBLOC + } + if viewAsGBLOCQ != "" { + qs.Set("viewAsGBLOC", viewAsGBLOCQ) + } + + _result.RawQuery = qs.Encode() + + return &_result, nil +} + +// Must is a helper function to panic when the url builder returns an error +func (o *GetDestinationRequestsQueueURL) Must(u *url.URL, err error) *url.URL { + if err != nil { + panic(err) + } + if u == nil { + panic("url can't be nil") + } + return u +} + +// String returns the string representation of the path with query string +func (o *GetDestinationRequestsQueueURL) String() string { + return o.Must(o.Build()).String() +} + +// BuildFull builds a full url with scheme, host, path and query string +func (o *GetDestinationRequestsQueueURL) BuildFull(scheme, host string) (*url.URL, error) { + if scheme == "" { + return nil, errors.New("scheme is required for a full url on GetDestinationRequestsQueueURL") + } + if host == "" { + return nil, errors.New("host is required for a full url on GetDestinationRequestsQueueURL") + } + + base, err := o.Build() + if err != nil { + return nil, err + } + + base.Scheme = scheme + base.Host = host + return base, nil +} + +// StringFull returns the string representation of a complete url +func (o *GetDestinationRequestsQueueURL) StringFull(scheme, host string) string { + return o.Must(o.BuildFull(scheme, host)).String() +} diff --git a/pkg/handlers/ghcapi/api.go b/pkg/handlers/ghcapi/api.go index 696148cba36..e1e9c8a7b75 100644 --- a/pkg/handlers/ghcapi/api.go +++ b/pkg/handlers/ghcapi/api.go @@ -568,6 +568,13 @@ func NewGhcAPIHandler(handlerConfig handlers.HandlerConfig) *ghcops.MymoveAPI { officeusercreator.NewOfficeUserFetcherPop(), } + ghcAPI.QueuesGetDestinationRequestsQueueHandler = GetDestinationRequestsQueueHandler{ + handlerConfig, + order.NewOrderFetcher(waf), + movelocker.NewMoveUnlocker(), + officeusercreator.NewOfficeUserFetcherPop(), + } + ghcAPI.QueuesListPrimeMovesHandler = ListPrimeMovesHandler{ handlerConfig, movetaskorder.NewMoveTaskOrderFetcher(waf), diff --git a/pkg/handlers/ghcapi/queues.go b/pkg/handlers/ghcapi/queues.go index 202e5d3d6a0..7db44c4df4a 100644 --- a/pkg/handlers/ghcapi/queues.go +++ b/pkg/handlers/ghcapi/queues.go @@ -183,6 +183,133 @@ func (h GetMovesQueueHandler) Handle(params queues.GetMovesQueueParams) middlewa }) } +// GetDestinationRequestsQueueHandler returns the moves for the TOO queue user via GET /queues/destination-requests +type GetDestinationRequestsQueueHandler struct { + handlers.HandlerConfig + services.OrderFetcher + services.MoveUnlocker + services.OfficeUserFetcherPop +} + +// Handle returns the paginated list of moves with destination requests for a TOO user +func (h GetDestinationRequestsQueueHandler) Handle(params queues.GetDestinationRequestsQueueParams) middleware.Responder { + return h.AuditableAppContextFromRequestWithErrors(params.HTTPRequest, + func(appCtx appcontext.AppContext) (middleware.Responder, error) { + if !appCtx.Session().IsOfficeUser() || + (!appCtx.Session().Roles.HasRole(roles.RoleTypeTOO) && !appCtx.Session().Roles.HasRole(roles.RoleTypeHQ)) { + forbiddenErr := apperror.NewForbiddenError( + "user is not authenticated with TOO or HQ office role", + ) + appCtx.Logger().Error(forbiddenErr.Error()) + return queues.NewGetDestinationRequestsQueueForbidden(), forbiddenErr + } + + ListOrderParams := services.ListOrderParams{ + Branch: params.Branch, + Locator: params.Locator, + Edipi: params.Edipi, + Emplid: params.Emplid, + CustomerName: params.CustomerName, + DestinationDutyLocation: params.DestinationDutyLocation, + OriginDutyLocation: params.OriginDutyLocation, + AppearedInTOOAt: handlers.FmtDateTimePtrToPopPtr(params.AppearedInTooAt), + RequestedMoveDate: params.RequestedMoveDate, + Status: params.Status, + Page: params.Page, + PerPage: params.PerPage, + Sort: params.Sort, + Order: params.Order, + OrderType: params.OrderType, + TOOAssignedUser: params.AssignedTo, + CounselingOffice: params.CounselingOffice, + } + + if params.Status == nil { + ListOrderParams.Status = []string{string(models.MoveStatusAPPROVALSREQUESTED)} + } + + // Let's set default values for page and perPage if we don't get arguments for them. We'll use 1 for page and 20 for perPage. + if params.Page == nil { + ListOrderParams.Page = models.Int64Pointer(1) + } + // Same for perPage + if params.PerPage == nil { + ListOrderParams.PerPage = models.Int64Pointer(20) + } + + if params.ViewAsGBLOC != nil && appCtx.Session().Roles.HasRole(roles.RoleTypeHQ) { + ListOrderParams.ViewAsGBLOC = params.ViewAsGBLOC + } + + moves, count, err := h.OrderFetcher.ListDestinationRequestsOrders( + appCtx, + appCtx.Session().OfficeUserID, + roles.RoleTypeTOO, + &ListOrderParams, + ) + if err != nil { + appCtx.Logger(). + Error("error fetching list of moves for office user", zap.Error(err)) + return queues.NewGetDestinationRequestsQueueInternalServerError(), err + } + + var officeUser models.OfficeUser + if appCtx.Session().OfficeUserID != uuid.Nil { + officeUser, err = h.OfficeUserFetcherPop.FetchOfficeUserByID(appCtx, appCtx.Session().OfficeUserID) + if err != nil { + appCtx.Logger().Error("Error retrieving office user", zap.Error(err)) + return queues.NewGetDestinationRequestsQueueInternalServerError(), err + } + } + privileges, err := models.FetchPrivilegesForUser(appCtx.DB(), appCtx.Session().UserID) + if err != nil { + appCtx.Logger().Error("Error retreiving user privileges", zap.Error(err)) + } + officeUser.User.Privileges = privileges + officeUser.User.Roles = appCtx.Session().Roles + + if err != nil { + appCtx.Logger(). + Error("error fetching office users", zap.Error(err)) + return queues.NewGetDestinationRequestsQueueInternalServerError(), err + } + + // if the TOO/office user is accessing the queue, we need to unlock move/moves they have locked + if appCtx.Session().IsOfficeUser() { + officeUserID := appCtx.Session().OfficeUserID + for i, move := range moves { + lockedOfficeUserID := move.LockedByOfficeUserID + if lockedOfficeUserID != nil && *lockedOfficeUserID == officeUserID { + copyOfMove := move + unlockedMove, err := h.UnlockMove(appCtx, ©OfMove, officeUserID) + if err != nil { + return queues.NewGetDestinationRequestsQueueInternalServerError(), err + } + moves[i] = *unlockedMove + } + } + // checking if moves that are NOT in their queue are locked by the user (using search, etc) + err := h.CheckForLockedMovesAndUnlock(appCtx, officeUserID) + if err != nil { + appCtx.Logger().Error(fmt.Sprintf("failed to unlock moves for office user ID: %s", officeUserID), zap.Error(err)) + } + } + + var activeRole string + officeUsers := models.OfficeUsers{officeUser} + queueMoves := payloads.QueueMoves(moves, officeUsers, nil, officeUser, nil, activeRole) + + result := &ghcmessages.QueueMovesResult{ + Page: *ListOrderParams.Page, + PerPage: *ListOrderParams.PerPage, + TotalCount: int64(count), + QueueMoves: *queueMoves, + } + + return queues.NewGetDestinationRequestsQueueOK().WithPayload(result), nil + }) +} + // ListMovesHandler lists moves with the option to filter since a particular date. Optimized ver. type ListPrimeMovesHandler struct { handlers.HandlerConfig diff --git a/pkg/services/mocks/OrderFetcher.go b/pkg/services/mocks/OrderFetcher.go index c7eb39d01ce..012df5ccb1b 100644 --- a/pkg/services/mocks/OrderFetcher.go +++ b/pkg/services/mocks/OrderFetcher.go @@ -80,6 +80,43 @@ func (_m *OrderFetcher) ListAllOrderLocations(appCtx appcontext.AppContext, offi return r0, r1 } +// ListDestinationRequestsOrders provides a mock function with given fields: appCtx, officeUserID, role, params +func (_m *OrderFetcher) ListDestinationRequestsOrders(appCtx appcontext.AppContext, officeUserID uuid.UUID, role roles.RoleType, params *services.ListOrderParams) ([]models.Move, int, error) { + ret := _m.Called(appCtx, officeUserID, role, params) + + if len(ret) == 0 { + panic("no return value specified for ListDestinationRequestsOrders") + } + + var r0 []models.Move + var r1 int + var r2 error + if rf, ok := ret.Get(0).(func(appcontext.AppContext, uuid.UUID, roles.RoleType, *services.ListOrderParams) ([]models.Move, int, error)); ok { + return rf(appCtx, officeUserID, role, params) + } + if rf, ok := ret.Get(0).(func(appcontext.AppContext, uuid.UUID, roles.RoleType, *services.ListOrderParams) []models.Move); ok { + r0 = rf(appCtx, officeUserID, role, params) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]models.Move) + } + } + + if rf, ok := ret.Get(1).(func(appcontext.AppContext, uuid.UUID, roles.RoleType, *services.ListOrderParams) int); ok { + r1 = rf(appCtx, officeUserID, role, params) + } else { + r1 = ret.Get(1).(int) + } + + if rf, ok := ret.Get(2).(func(appcontext.AppContext, uuid.UUID, roles.RoleType, *services.ListOrderParams) error); ok { + r2 = rf(appCtx, officeUserID, role, params) + } else { + r2 = ret.Error(2) + } + + return r0, r1, r2 +} + // ListOrders provides a mock function with given fields: appCtx, officeUserID, role, params func (_m *OrderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid.UUID, role roles.RoleType, params *services.ListOrderParams) ([]models.Move, int, error) { ret := _m.Called(appCtx, officeUserID, role, params) diff --git a/pkg/services/order.go b/pkg/services/order.go index c1bd25d1b84..217f3e069f2 100644 --- a/pkg/services/order.go +++ b/pkg/services/order.go @@ -20,6 +20,7 @@ import ( type OrderFetcher interface { FetchOrder(appCtx appcontext.AppContext, orderID uuid.UUID) (*models.Order, error) ListOrders(appCtx appcontext.AppContext, officeUserID uuid.UUID, role roles.RoleType, params *ListOrderParams) ([]models.Move, int, error) + ListDestinationRequestsOrders(appCtx appcontext.AppContext, officeUserID uuid.UUID, role roles.RoleType, params *ListOrderParams) ([]models.Move, int, error) ListAllOrderLocations(appCtx appcontext.AppContext, officeUserID uuid.UUID, params *ListOrderParams) ([]models.Move, error) } diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 923a4dfe82b..1a7d097eb6d 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -307,7 +307,153 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid return moves, count, nil } -// TODO: Update query to select distinct duty locations +func (f orderFetcher) ListDestinationRequestsOrders(appCtx appcontext.AppContext, officeUserID uuid.UUID, role roles.RoleType, params *services.ListOrderParams) ([]models.Move, int, error) { + var moves []models.Move + + var officeUserGbloc string + if params.ViewAsGBLOC != nil { + officeUserGbloc = *params.ViewAsGBLOC + } else { + var gblocErr error + gblocFetcher := officeuser.NewOfficeUserGblocFetcher() + officeUserGbloc, gblocErr = gblocFetcher.FetchGblocForOfficeUser(appCtx, officeUserID) + if gblocErr != nil { + return []models.Move{}, 0, gblocErr + } + } + + ppmCloseoutGblocs := officeUserGbloc == "NAVY" || officeUserGbloc == "TVCB" || officeUserGbloc == "USCG" + + branchQuery := branchFilter(params.Branch, false, ppmCloseoutGblocs) + + // If the user is associated with the USMC GBLOC we want to show them ALL the USMC moves, so let's override here. + // We also only want to do the gbloc filtering thing if we aren't a USMC user, which we cover with the else. + // var gblocQuery QueryOption + var gblocToFilterBy *string + if officeUserGbloc == "USMC" { + branchQuery = branchFilter(models.StringPointer(string(models.AffiliationMARINES)), false, ppmCloseoutGblocs) + gblocToFilterBy = params.OriginGBLOC + } else { + gblocToFilterBy = &officeUserGbloc + } + + gblocQuery := gblocFilterForTOO(gblocToFilterBy) + + locatorQuery := locatorFilter(params.Locator) + dodIDQuery := dodIDFilter(params.Edipi) + emplidQuery := emplidFilter(params.Emplid) + customerNameQuery := customerNameFilter(params.CustomerName) + originDutyLocationQuery := originDutyLocationFilter(params.OriginDutyLocation) + destinationDutyLocationQuery := destinationDutyLocationFilter(params.DestinationDutyLocation) + moveStatusQuery := moveStatusFilter(params.Status) + submittedAtQuery := submittedAtFilter(params.SubmittedAt) + appearedInTOOAtQuery := appearedInTOOAtFilter(params.AppearedInTOOAt) + requestedMoveDateQuery := requestedMoveDateFilter(params.RequestedMoveDate) + closeoutInitiatedQuery := closeoutInitiatedFilter(params.CloseoutInitiated) + closeoutLocationQuery := closeoutLocationFilter(params.CloseoutLocation, ppmCloseoutGblocs) + ppmTypeQuery := ppmTypeFilter(params.PPMType) + ppmStatusQuery := ppmStatusFilter(params.PPMStatus) + scAssignedUserQuery := scAssignedUserFilter(params.SCAssignedUser) + tooAssignedUserQuery := tooAssignedUserFilter(params.TOOAssignedUser) + sortOrderQuery := sortOrder(params.Sort, params.Order, ppmCloseoutGblocs) + counselingQuery := counselingOfficeFilter(params.CounselingOffice) + + // Adding to an array so we can iterate over them and apply the filters after the query structure is set below + options := [20]QueryOption{branchQuery, locatorQuery, dodIDQuery, emplidQuery, customerNameQuery, originDutyLocationQuery, destinationDutyLocationQuery, moveStatusQuery, gblocQuery, submittedAtQuery, appearedInTOOAtQuery, requestedMoveDateQuery, ppmTypeQuery, closeoutInitiatedQuery, closeoutLocationQuery, ppmStatusQuery, sortOrderQuery, scAssignedUserQuery, tooAssignedUserQuery, counselingQuery} + + // we want to set the query up to where it only shows moves that have orders.destination_gbloc that are in the office user's GBLOC (some exclusions apply) + query := appCtx.DB().Q().Scope(utilities.ExcludeDeletedScope(models.MTOShipment{})).EagerPreload( + "Orders.ServiceMember", + "Orders.NewDutyLocation.Address", + "Orders.OriginDutyLocation.Address", + "Orders.Entitlement", + "MTOShipments.DeliveryAddressUpdate", + "MTOServiceItems.ReService.Code", + "ShipmentGBLOC", + "MTOShipments.PPMShipment", + "CloseoutOffice", + "LockedByOfficeUser", + "CounselingOffice", + "SCAssignedUser", + "TOOAssignedUser", + ).InnerJoin("orders", "orders.id = moves.orders_id"). + InnerJoin("service_members", "orders.service_member_id = service_members.id"). + InnerJoin("mto_shipments", "moves.id = mto_shipments.move_id"). + InnerJoin("mto_service_items", "mto_shipments.id = mto_service_items.mto_shipment_id"). + InnerJoin("re_services", "mto_service_items.re_service_id = re_services.id"). + InnerJoin("duty_locations as origin_dl", "orders.origin_duty_location_id = origin_dl.id"). + LeftJoin("transportation_offices as origin_to", "origin_dl.transportation_office_id = origin_to.id"). + LeftJoin("move_to_gbloc", "move_to_gbloc.move_id = moves.id"). + LeftJoin("duty_locations as dest_dl", "dest_dl.id = orders.new_duty_location_id"). + LeftJoin("office_users", "office_users.id = moves.locked_by"). + LeftJoin("transportation_offices", "moves.counseling_transportation_office_id = transportation_offices.id"). + LeftJoin("office_users as assigned_user", "moves.too_assigned_id = assigned_user.id"). + LeftJoin("ppm_shipments", "ppm_shipments.shipment_id = mto_shipments.id"). + LeftJoin("shipment_address_updates", "shipment_address_updates.shipment_id = mto_shipments.id"). + Where("moves.status = 'APPROVALS REQUESTED' "+ + "AND mto_service_items.status = 'SUBMITTED' "+ + "AND re_services.code IN ('DDFSIT', 'DDASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC') "+ + "OR shipment_address_updates.status = 'REQUESTED'"). + Where("orders.destination_gbloc = ?", officeUserGbloc). + Where("moves.show = ?", models.BoolPointer(true)) + + for _, option := range options { + if option != nil { + option(query) + } + } + + // Pass zeros into paginate in this case. Which will give us 1 page and 20 per page respectively + if params.Page == nil { + params.Page = models.Int64Pointer(0) + } + if params.PerPage == nil { + params.PerPage = models.Int64Pointer(0) + } + + var groupByColumms []string + groupByColumms = append(groupByColumms, "service_members.id", "orders.id", "origin_dl.id") + + if params.Sort != nil && *params.Sort == "originDutyLocation" { + groupByColumms = append(groupByColumms, "origin_dl.name") + } + if params.Sort != nil && *params.Sort == "destinationDutyLocation" { + groupByColumms = append(groupByColumms, "dest_dl.name") + } + if params.Sort != nil && *params.Sort == "originGBLOC" { + groupByColumms = append(groupByColumms, "origin_to.id") + } + if params.Sort != nil && *params.Sort == "counselingOffice" { + groupByColumms = append(groupByColumms, "transportation_offices.id") + } + if params.Sort != nil && *params.Sort == "assignedTo" { + groupByColumms = append(groupByColumms, "assigned_user.last_name", "assigned_user.first_name") + } + + err := query.GroupBy("moves.id", groupByColumms...).Paginate(int(*params.Page), int(*params.PerPage)).All(&moves) + if err != nil { + return []models.Move{}, 0, err + } + + count := query.Paginator.TotalEntriesSize + + for i := range moves { + if moves[i].Orders.OriginDutyLocation != nil { + loadErr := appCtx.DB().Load(moves[i].Orders.OriginDutyLocation, "TransportationOffice") + if loadErr != nil { + return []models.Move{}, 0, err + } + } + + err := appCtx.DB().Load(&moves[i].Orders.ServiceMember, "BackupContacts") + if err != nil { + return []models.Move{}, 0, err + } + } + + return moves, count, nil +} + func (f orderFetcher) ListAllOrderLocations(appCtx appcontext.AppContext, officeUserID uuid.UUID, params *services.ListOrderParams) ([]models.Move, error) { var moves []models.Move var err error diff --git a/src/constants/routes.js b/src/constants/routes.js index 1c4121aef59..a018cef31ea 100644 --- a/src/constants/routes.js +++ b/src/constants/routes.js @@ -4,8 +4,8 @@ export const generalRoutes = { REQUEST_ACCOUNT: '/request-account', PRIVACY_SECURITY_POLICY_PATH: '/privacy-and-security-policy', ACCESSIBILITY_PATH: '/accessibility', - QUEUE_SEARCH_PATH: 'Search', - BASE_QUEUE_SEARCH_PATH: '/Search', + QUEUE_SEARCH_PATH: 'search', + BASE_QUEUE_SEARCH_PATH: '/search', }; export const customerRoutes = { @@ -120,6 +120,8 @@ export const tooRoutes = { BASE_SHIPMENT_EDIT_PATH: `${BASE_MOVES_PATH}/shipments/:shipmentId`, MOVE_QUEUE: `move-queue`, BASE_MOVE_QUEUE: `/move-queue`, + BASE_DESTINATION_REQUESTS_QUEUE: `/destination-requests`, + DESTINATION_REQUESTS_QUEUE: `destination-requests`, SHIPMENT_EDIT_PATH: 'shipments/:shipmentId', BASE_MOVE_VIEW_PATH: `${BASE_MOVES_PATH}/details`, MOVE_VIEW_PATH: 'details', diff --git a/src/hooks/queries.js b/src/hooks/queries.js index 17ccfe30f5a..1129a3e7901 100644 --- a/src/hooks/queries.js +++ b/src/hooks/queries.js @@ -34,6 +34,7 @@ import { getPPMActualWeight, searchCustomers, getGBLOCs, + getDestinationRequestsQueue, getBulkAssignmentData, } from 'services/ghcApi'; import { getLoggedInUserQueries } from 'services/internalApi'; @@ -587,6 +588,28 @@ export const useMovesQueueQueries = ({ }; }; +export const useDestinationRequestsQueueQueries = ({ + sort, + order, + filters = [], + currentPage = PAGINATION_PAGE_DEFAULT, + currentPageSize = PAGINATION_PAGE_SIZE_DEFAULT, + viewAsGBLOC, +}) => { + const { data = {}, ...movesQueueQuery } = useQuery( + [MOVES_QUEUE, { sort, order, filters, currentPage, currentPageSize, viewAsGBLOC }], + ({ queryKey }) => getDestinationRequestsQueue(...queryKey), + ); + const { isLoading, isError, isSuccess } = movesQueueQuery; + const { queueMoves, ...dataProps } = data; + return { + queueResult: { data: queueMoves, ...dataProps }, + isLoading, + isError, + isSuccess, + }; +}; + export const useServicesCounselingQueuePPMQueries = ({ sort, order, diff --git a/src/pages/Office/MoveQueue/MoveQueue.jsx b/src/pages/Office/MoveQueue/MoveQueue.jsx index 12d42ac5d22..e88766c2443 100644 --- a/src/pages/Office/MoveQueue/MoveQueue.jsx +++ b/src/pages/Office/MoveQueue/MoveQueue.jsx @@ -6,8 +6,13 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import styles from './MoveQueue.module.scss'; import { createHeader } from 'components/Table/utils'; -import { useMovesQueueQueries, useUserQueries, useMoveSearchQueries } from 'hooks/queries'; -import { getMovesQueue } from 'services/ghcApi'; +import { + useMovesQueueQueries, + useUserQueries, + useMoveSearchQueries, + useDestinationRequestsQueueQueries, +} from 'hooks/queries'; +import { getDestinationRequestsQueue, getMovesQueue } from 'services/ghcApi'; import { formatDateFromIso, serviceMemberAgencyLabel } from 'utils/formatters'; import MultiSelectCheckBoxFilter from 'components/Table/Filters/MultiSelectCheckBoxFilter'; import SelectFilter from 'components/Table/Filters/SelectFilter'; @@ -270,6 +275,15 @@ const MoveQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBulkAssignmen Task Order Queue , + (isActive ? 'usa-current' : '')} + to={tooRoutes.BASE_DESTINATION_REQUESTS_QUEUE} + > + + Destination Requests Queue + + , (isActive ? 'usa-current' : '')} @@ -339,6 +353,32 @@ const MoveQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBulkAssignmen
); } + if (queueType === tooRoutes.DESTINATION_REQUESTS_QUEUE) { + return ( +
+ {renderNavBar()} + +
+ ); + } return ; }; diff --git a/src/services/ghcApi.js b/src/services/ghcApi.js index b05441939fc..c600b531a72 100644 --- a/src/services/ghcApi.js +++ b/src/services/ghcApi.js @@ -643,6 +643,22 @@ export async function getMovesQueue( ); } +export async function getDestinationRequestsQueue( + key, + { sort, order, filters = [], currentPage = 1, currentPageSize = 20, viewAsGBLOC }, +) { + const operationPath = 'queues.getDestinationRequestsQueue'; + const paramFilters = {}; + filters.forEach((filter) => { + paramFilters[`${filter.id}`] = filter.value; + }); + return makeGHCRequest( + operationPath, + { sort, order, page: currentPage, perPage: currentPageSize, viewAsGBLOC, ...paramFilters }, + { schemaKey: 'queueMovesResult', normalize: false }, + ); +} + export async function getServicesCounselingQueue( key, { diff --git a/swagger-def/ghc.yaml b/swagger-def/ghc.yaml index ee2e02c7e4d..1ff32d5e3da 100644 --- a/swagger-def/ghc.yaml +++ b/swagger-def/ghc.yaml @@ -3784,11 +3784,123 @@ paths: "200": description: Successfully returned all moves matching the criteria schema: - $ref: "#/definitions/QueueMovesResult" - "403": - $ref: "#/responses/PermissionDenied" - "500": - $ref: "#/responses/ServerError" + $ref: '#/definitions/QueueMovesResult' + '403': + $ref: '#/responses/PermissionDenied' + '500': + $ref: '#/responses/ServerError' + /queues/destination-requests: + get: + produces: + - application/json + summary: Gets queued list of all customer moves by GBLOC that have destination requests (destination SIT, shuttle, address requests) + description: > + A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items (including shuttle) and destination address requests that are not approved. + operationId: getDestinationRequestsQueue + tags: + - queues + parameters: + - in: query + name: page + type: integer + description: requested page of results + - in: query + name: perPage + type: integer + description: results per page + - in: query + name: sort + type: string + enum: + [ + customerName, + edipi, + emplid, + branch, + locator, + status, + originDutyLocation, + destinationDutyLocation, + requestedMoveDate, + appearedInTooAt, + assignedTo, + counselingOffice, + ] + description: field that results should be sorted by + - in: query + name: order + type: string + enum: [asc, desc] + description: direction of sort order if applied + - in: query + name: branch + type: string + - in: query + name: locator + type: string + - in: query + name: customerName + type: string + - in: query + name: edipi + type: string + - in: query + name: emplid + type: string + - in: query + name: originDutyLocation + type: array + uniqueItems: true + collectionFormat: multi + items: + type: string + - in: query + name: destinationDutyLocation + type: string + - in: query + name: appearedInTooAt + type: string + format: date-time + - in: query + name: requestedMoveDate + type: string + description: filters the requested pickup date of a shipment on the move + - in: query + name: status + type: array + description: Filtering for the status. + uniqueItems: true + items: + type: string + enum: + - APPROVALS REQUESTED + - in: query + name: orderType + type: string + description: order type + - in: query + name: viewAsGBLOC + type: string + description: | + Used to return a queue for a GBLOC other than the default of the current user. Requires the HQ role. The parameter is ignored if the requesting user does not have the necessary role. + - in: query + name: assignedTo + type: string + description: | + Used to illustrate which user is assigned to this move. + - in: query + name: counselingOffice + type: string + description: filters using a counselingOffice name of the move + responses: + '200': + description: Successfully returned all moves matching the criteria + schema: + $ref: '#/definitions/QueueMovesResult' + '403': + $ref: '#/responses/PermissionDenied' + '500': + $ref: '#/responses/ServerError' /queues/payment-requests: get: produces: diff --git a/swagger/ghc.yaml b/swagger/ghc.yaml index b32dfe180f4..b20bf2e167d 100644 --- a/swagger/ghc.yaml +++ b/swagger/ghc.yaml @@ -3947,6 +3947,125 @@ paths: $ref: '#/responses/PermissionDenied' '500': $ref: '#/responses/ServerError' + /queues/destination-requests: + get: + produces: + - application/json + summary: >- + Gets queued list of all customer moves by GBLOC that have destination + requests (destination SIT, shuttle, address requests) + description: > + A TOO will view this queue when they have destination requests tied to + their GBLOC. This includes unapproved destination SIT service items + (including shuttle) and destination address requests that are not + approved. + operationId: getDestinationRequestsQueue + tags: + - queues + parameters: + - in: query + name: page + type: integer + description: requested page of results + - in: query + name: perPage + type: integer + description: results per page + - in: query + name: sort + type: string + enum: + - customerName + - edipi + - emplid + - branch + - locator + - status + - originDutyLocation + - destinationDutyLocation + - requestedMoveDate + - appearedInTooAt + - assignedTo + - counselingOffice + description: field that results should be sorted by + - in: query + name: order + type: string + enum: + - asc + - desc + description: direction of sort order if applied + - in: query + name: branch + type: string + - in: query + name: locator + type: string + - in: query + name: customerName + type: string + - in: query + name: edipi + type: string + - in: query + name: emplid + type: string + - in: query + name: originDutyLocation + type: array + uniqueItems: true + collectionFormat: multi + items: + type: string + - in: query + name: destinationDutyLocation + type: string + - in: query + name: appearedInTooAt + type: string + format: date-time + - in: query + name: requestedMoveDate + type: string + description: filters the requested pickup date of a shipment on the move + - in: query + name: status + type: array + description: Filtering for the status. + uniqueItems: true + items: + type: string + enum: + - APPROVALS REQUESTED + - in: query + name: orderType + type: string + description: order type + - in: query + name: viewAsGBLOC + type: string + description: > + Used to return a queue for a GBLOC other than the default of the + current user. Requires the HQ role. The parameter is ignored if the + requesting user does not have the necessary role. + - in: query + name: assignedTo + type: string + description: | + Used to illustrate which user is assigned to this move. + - in: query + name: counselingOffice + type: string + description: filters using a counselingOffice name of the move + responses: + '200': + description: Successfully returned all moves matching the criteria + schema: + $ref: '#/definitions/QueueMovesResult' + '403': + $ref: '#/responses/PermissionDenied' + '500': + $ref: '#/responses/ServerError' /queues/payment-requests: get: produces: From a77fb3bd4ae3ef00015b09bc376d90d0e47d18c9 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 19 Feb 2025 10:59:50 -0600 Subject: [PATCH 222/260] dockerfile --- Dockerfile.migrations | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Dockerfile.migrations b/Dockerfile.migrations index 021428de322..a1e8f21dc60 100644 --- a/Dockerfile.migrations +++ b/Dockerfile.migrations @@ -20,6 +20,15 @@ COPY bin/rds-ca-2019-root.pem /bin/rds-ca-2019-root.pem COPY bin/milmove /bin/milmove COPY migrations/app/schema /migrate/schema +COPY migrations/app/ddl_migrations/ddl_types /migrate/ddl_migrations/ddl_types +COPY migrations/app/ddl_migrations/ddl_tables /migrate/ddl_migrations/ddl_tables +COPY migrations/app/ddl_migrations/ddl_views /migrate/ddl_migrations/ddl_views +COPY migrations/app/ddl_migrations/ddl_functions /migrate/ddl_migrations/ddl_functions COPY migrations/app/migrations_manifest.txt /migrate/migrations_manifest.txt +COPY migrations/app/dml_migrations_manifest.txt /migrate/dml_migrations_manifest.txt +COPY migrations/app/ddl_types_migrations_manifest.txt /migrate/ddl_types_migrations_manifest.txt +COPY migrations/app/ddl_tables_migrations_manifest.txt /migrate/ddl_tables_migrations_manifest.txt +COPY migrations/app/ddl_views_migrations_manifest.txt /migrate/ddl_views_migrations_manifest.txt +COPY migrations/app/ddl_functions_migrations_manifest.txt /migrate/ddl_functions_migrations_manifest.txt ENTRYPOINT ["/bin/milmove", "migrate", "-p", "file:///migrate/migrations", "-m", "/migrate/migrations_manifest.txt"] \ No newline at end of file From ce37712ea373e297ba01988eb31bcd55d8684bbb Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Fri, 24 Jan 2025 22:19:34 +0000 Subject: [PATCH 223/260] most of it is working, just need to get clarification on move_to_gblocs, add tests, and refine refine refine --- ...73216_add_destination_queue_db_func.up.sql | 206 +++++++++++++----- pkg/gen/ghcapi/embedded_spec.go | 4 + ...t_destination_requests_queue_parameters.go | 2 +- .../internal/payloads/model_to_payload.go | 2 +- pkg/models/move.go | 6 +- pkg/models/mto_shipments.go | 136 ++++++------ pkg/models/order.go | 4 +- pkg/services/order/order_fetcher.go | 202 ++++++++--------- swagger-def/ghc.yaml | 2 + swagger/ghc.yaml | 2 + 10 files changed, 325 insertions(+), 241 deletions(-) diff --git a/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql b/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql index 8808b472e68..f6c40773200 100644 --- a/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql +++ b/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql @@ -1,64 +1,139 @@ +-- database function that returns a list of moves that have destination requests +-- this includes shipment address update requests & destination service items CREATE OR REPLACE FUNCTION get_destination_queue( - move_code TEXT DEFAULT NULL, -- Search parameter for Move Code - input_move_id UUID DEFAULT NULL, -- Search parameter for Move ID - page INTEGER DEFAULT 1, -- Page number for pagination - per_page INTEGER DEFAULT 20, -- Number of results per page - branch TEXT DEFAULT NULL, -- Filter: service_member.affiliation - edipi TEXT DEFAULT NULL, -- Filter: service_member.edipi - emplid TEXT DEFAULT NULL, -- Filter: service_member.emplid - customer_name TEXT DEFAULT NULL, -- Filter: service_member.first_name + last_name - destination_duty_location TEXT DEFAULT NULL,-- Filter: orders.new_duty_location_id.name - origin_duty_location TEXT DEFAULT NULL, -- Filter: orders.origin_duty_location_id.name - origin_gbloc TEXT DEFAULT NULL, -- Filter: move.counseling_office_transportation_office.gbloc - submitted_at TIMESTAMP DEFAULT NULL, -- Filter: moves.submitted_at - appeared_in_too_at TIMESTAMP DEFAULT NULL, -- Filter: moves.appeared_in_too_at - too_assigned_user TEXT DEFAULT NULL -- Filter: moves.too_assigned_id -> office_users.first_name + last_name + user_gbloc TEXT DEFAULT NULL, + customer_name TEXT DEFAULT NULL, + edipi TEXT DEFAULT NULL, + emplid TEXT DEFAULT NULL, + m_status TEXT[] DEFAULT NULL, + move_code TEXT DEFAULT NULL, + requested_move_date TIMESTAMP DEFAULT NULL, + date_submitted TIMESTAMP DEFAULT NULL, + branch TEXT DEFAULT NULL, + origin_duty_location TEXT DEFAULT NULL, + counseling_office TEXT DEFAULT NULL, + too_assigned_user TEXT DEFAULT NULL, + page INTEGER DEFAULT 1, + per_page INTEGER DEFAULT 20 ) RETURNS TABLE ( - move_id UUID, + id UUID, locator TEXT, + submitted_at TIMESTAMP WITH TIME ZONE, orders_id UUID, - available_to_prime_at TIMESTAMP WITH TIME ZONE, - show BOOLEAN, + status TEXT, + locked_by UUID, + too_assigned_id UUID, + counseling_transportation_office_id UUID, + orders JSONB, + mto_shipments JSONB, + counseling_transportation_office JSONB, + too_assigned JSONB, total_count BIGINT ) AS $$ DECLARE sql_query TEXT; offset_value INTEGER; BEGIN + IF page < 1 THEN + page := 1; + END IF; + + IF per_page < 1 THEN + per_page := 20; + END IF; + -- OFFSET for pagination offset_value := (page - 1) * per_page; sql_query := ' - SELECT moves.id AS move_id, - moves.locator::TEXT AS locator, - moves.orders_id, - moves.available_to_prime_at, - moves.show, - COUNT(*) OVER() AS total_count + SELECT + moves.id AS id, + moves.locator::TEXT AS locator, + moves.submitted_at::TIMESTAMP WITH TIME ZONE AS submitted_at, + moves.orders_id AS orders_id, + moves.status::TEXT AS status, + moves.locked_by AS locked_by, + moves.too_assigned_id AS too_assigned_id, + moves.counseling_transportation_office_id AS counseling_transportation_office_id, + json_build_object( + ''id'', orders.id, + ''origin_duty_location_gbloc'', orders.gbloc, + ''service_member'', json_build_object( + ''id'', service_members.id, + ''first_name'', service_members.first_name, + ''last_name'', service_members.last_name, + ''edipi'', service_members.edipi, + ''emplid'', service_members.emplid, + ''affiliation'', service_members.affiliation + ), + ''origin_duty_location'', json_build_object( + ''name'', origin_duty_locations.name + ) + )::JSONB AS orders, + COALESCE( + json_agg( + json_build_object( + ''id'', mto_shipments.id, + ''shipment_type'', mto_shipments.shipment_type, + ''status'', mto_shipments.status, + ''requested_pickup_date'', TO_CHAR(mto_shipments.requested_pickup_date, ''YYYY-MM-DD"T00:00:00Z"''), + ''scheduled_pickup_date'', TO_CHAR(mto_shipments.scheduled_pickup_date, ''YYYY-MM-DD"T00:00:00Z"''), + ''requested_delivery_date'', TO_CHAR(mto_shipments.requested_delivery_date, ''YYYY-MM-DD"T00:00:00Z"''), + ''approved_date'', TO_CHAR(mto_shipments.approved_date, ''YYYY-MM-DD"T00:00:00Z"''), + ''prime_estimated_weight'', mto_shipments.prime_estimated_weight + ) + ) FILTER (WHERE mto_shipments.id IS NOT NULL), + ''[]'' + )::JSONB AS mto_shipments, + json_build_object( + ''name'', counseling_offices.name + )::JSONB AS counseling_transportation_office, + json_build_object( + ''first_name'', too_user.first_name, + ''last_name'', too_user.last_name + )::JSONB AS too_assigned, + COUNT(*) OVER() AS total_count FROM moves INNER JOIN orders ON moves.orders_id = orders.id - INNER JOIN service_members ON orders.service_member_id = service_members.id + LEFT JOIN mto_shipments ON mto_shipments.move_id = moves.id + LEFT JOIN ppm_shipments ON ppm_shipments.shipment_id = mto_shipments.id + LEFT JOIN mto_service_items ON mto_shipments.id = mto_service_items.mto_shipment_id + LEFT JOIN re_services ON mto_service_items.re_service_id = re_services.id + LEFT JOIN service_members ON orders.service_member_id = service_members.id LEFT JOIN duty_locations AS new_duty_locations ON orders.new_duty_location_id = new_duty_locations.id LEFT JOIN duty_locations AS origin_duty_locations ON orders.origin_duty_location_id = origin_duty_locations.id - LEFT JOIN office_users ON moves.too_assigned_id = office_users.id + LEFT JOIN office_users AS too_user ON moves.too_assigned_id = too_user.id + LEFT JOIN office_users AS locked_user ON moves.locked_by = locked_user.id LEFT JOIN transportation_offices AS counseling_offices ON moves.counseling_transportation_office_id = counseling_offices.id - WHERE moves.available_to_prime_at IS NOT NULL - AND moves.show = TRUE + LEFT JOIN shipment_address_updates ON shipment_address_updates.shipment_id = mto_shipments.id + LEFT JOIN move_to_gbloc ON move_to_gbloc.move_id = moves.id + WHERE moves.show = TRUE '; - -- add dynamic filters based on provided parameters - IF move_code IS NOT NULL THEN - sql_query := sql_query || ' AND moves.locator ILIKE ''%' || UPPER(move_code) || '%'' '; - END IF; + -- adding conditionals for destination queue + -- we only want to see moves that have destination requests (shipment address updates, destination service items in SUBMITTED status) + sql_query := sql_query || ' + AND ( + shipment_address_updates.status = ''REQUESTED'' + OR ( + mto_service_items.status = ''SUBMITTED'' + AND re_services.code IN (''DDFSIT'', ''DDASIT'', ''DDDSIT'', ''DDSHUT'', ''DDSFSC'', ''IDFSIT'', ''IDASIT'', ''IDDSIT'', ''IDSHUT'') + ) + ) + '; - IF input_move_id IS NOT NULL THEN - sql_query := sql_query || ' AND moves.id = ''' || input_move_id || ''' '; + -- this should always be passed in from the service object, but will nil check it anyway + IF user_gbloc IS NOT NULL THEN + sql_query := sql_query || ' AND move_to_gbloc.gbloc = ''%' || user_gbloc || '%'' '; END IF; - IF branch IS NOT NULL THEN - sql_query := sql_query || ' AND service_members.affiliation ILIKE ''%' || branch || '%'' '; + IF customer_name IS NOT NULL AND customer_name <> '' THEN + sql_query := sql_query || ' AND ( + service_members.first_name || '' '' || service_members.last_name ILIKE ''%' || customer_name || '%'' + OR service_members.last_name || '' '' || service_members.first_name ILIKE ''%' || customer_name || '%'' + ) '; END IF; IF edipi IS NOT NULL THEN @@ -69,38 +144,69 @@ BEGIN sql_query := sql_query || ' AND service_members.emplid ILIKE ''%' || emplid || '%'' '; END IF; - IF customer_name IS NOT NULL THEN - sql_query := sql_query || ' AND (service_members.first_name || '' '' || service_members.last_name) ILIKE ''%' || customer_name || '%'' '; + IF m_status IS NOT NULL THEN + sql_query := sql_query || ' AND moves.status IN (SELECT unnest($1)) '; END IF; - IF destination_duty_location IS NOT NULL THEN - sql_query := sql_query || ' AND new_duty_locations.name ILIKE ''%' || destination_duty_location || '%'' '; + IF move_code IS NOT NULL THEN + sql_query := sql_query || ' AND moves.locator ILIKE ''%' || UPPER(move_code) || '%'' '; END IF; - IF origin_duty_location IS NOT NULL THEN - sql_query := sql_query || ' AND origin_duty_locations.name ILIKE ''%' || origin_duty_location || '%'' '; + IF requested_move_date IS NOT NULL THEN + sql_query := sql_query || ' AND ( + mto_shipments.requested_pickup_date::DATE = ' || quote_literal(requested_move_date) || '::DATE + OR ppm_shipments.expected_departure_date::DATE = ' || quote_literal(requested_move_date) || '::DATE + OR (mto_shipments.shipment_type = ''HHG_OUTOF_NTS'' AND mto_shipments.requested_delivery_date::DATE = ' || quote_literal(requested_move_date) || '::DATE) + )'; END IF; - IF origin_gbloc IS NOT NULL THEN - sql_query := sql_query || ' AND counseling_offices.gbloc ILIKE ''%' || origin_gbloc || '%'' '; + IF date_submitted IS NOT NULL THEN + sql_query := sql_query || ' AND moves.submitted_at = ' || quote_literal(date_submitted) || ' '; END IF; - IF submitted_at IS NOT NULL THEN - sql_query := sql_query || ' AND moves.submitted_at = ''' || submitted_at || ''' '; + IF branch IS NOT NULL THEN + sql_query := sql_query || ' AND service_members.affiliation ILIKE ''%' || branch || '%'' '; END IF; - IF appeared_in_too_at IS NOT NULL THEN - sql_query := sql_query || ' AND moves.appeared_in_too_at = ''' || appeared_in_too_at || ''' '; + IF origin_duty_location IS NOT NULL AND origin_duty_location <> '' THEN + sql_query := sql_query || ' AND origin_duty_locations.name ILIKE ''%' || origin_duty_location || '%'' '; + END IF; + + IF counseling_office IS NOT NULL THEN + sql_query := sql_query || ' AND counseling_offices.name ILIKE ''%' || counseling_office || '%'' '; END IF; IF too_assigned_user IS NOT NULL THEN - sql_query := sql_query || ' AND (office_users.first_name || '' '' || office_users.last_name) ILIKE ''%' || too_assigned_user || '%'' '; + sql_query := sql_query || ' AND (too_user.first_name || '' '' || too_user.last_name) ILIKE ''%' || quote_literal(too_assigned_user) || '%'' '; END IF; + sql_query := sql_query || ' + GROUP BY + moves.id, + moves.locator, + moves.submitted_at, + moves.orders_id, + moves.status, + moves.locked_by, + moves.too_assigned_id, + moves.counseling_transportation_office_id, + orders.id, + service_members.id, + service_members.first_name, + service_members.last_name, + service_members.edipi, + service_members.emplid, + service_members.affiliation, + origin_duty_locations.name, + counseling_offices.name, + too_user.first_name, + too_user.last_name'; sql_query := sql_query || ' ORDER BY moves.id ASC '; sql_query := sql_query || ' LIMIT ' || per_page || ' OFFSET ' || offset_value || ' '; - RETURN QUERY EXECUTE sql_query; + RAISE NOTICE 'Query: %', sql_query; + + RETURN QUERY EXECUTE sql_query USING m_status; END; -$$ LANGUAGE plpgsql; \ No newline at end of file +$$ LANGUAGE plpgsql; diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go index 2e6924e475c..3ccbc457cf5 100644 --- a/pkg/gen/ghcapi/embedded_spec.go +++ b/pkg/gen/ghcapi/embedded_spec.go @@ -4793,6 +4793,8 @@ func init() { "type": "array", "items": { "enum": [ + "SUBMITTED", + "SERVICE COUNSELING COMPLETED", "APPROVALS REQUESTED" ], "type": "string" @@ -21842,6 +21844,8 @@ func init() { "type": "array", "items": { "enum": [ + "SUBMITTED", + "SERVICE COUNSELING COMPLETED", "APPROVALS REQUESTED" ], "type": "string" diff --git a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go index 69171c50aed..86930ef5fab 100644 --- a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go +++ b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go @@ -600,7 +600,7 @@ func (o *GetDestinationRequestsQueueParams) bindStatus(rawData []string, hasKey for i, statusIV := range statusIC { statusI := statusIV - if err := validate.EnumCase(fmt.Sprintf("%s.%v", "status", i), "query", statusI, []interface{}{"APPROVALS REQUESTED"}, true); err != nil { + if err := validate.EnumCase(fmt.Sprintf("%s.%v", "status", i), "query", statusI, []interface{}{"SUBMITTED", "SERVICE COUNSELING COMPLETED", "APPROVALS REQUESTED"}, true); err != nil { return err } diff --git a/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go b/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go index 8a00f7814d5..9b8a354c34b 100644 --- a/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go +++ b/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go @@ -54,7 +54,7 @@ func OfficeUser(officeUser *models.OfficeUser) *ghcmessages.LockedOfficeUser { } func AssignedOfficeUser(officeUser *models.OfficeUser) *ghcmessages.AssignedOfficeUser { - if officeUser != nil { + if officeUser != nil && officeUser.FirstName != "" && officeUser.LastName != "" { payload := ghcmessages.AssignedOfficeUser{ OfficeUserID: strfmt.UUID(officeUser.ID.String()), FirstName: officeUser.FirstName, diff --git a/pkg/models/move.go b/pkg/models/move.go index 236bef5af6b..b740c85c5d0 100644 --- a/pkg/models/move.go +++ b/pkg/models/move.go @@ -71,7 +71,7 @@ type Move struct { PPMType *string `db:"ppm_type"` MTOServiceItems MTOServiceItems `has_many:"mto_service_items" fk_id:"move_id"` PaymentRequests PaymentRequests `has_many:"payment_requests" fk_id:"move_id"` - MTOShipments MTOShipments `has_many:"mto_shipments" fk_id:"move_id"` + MTOShipments MTOShipments `json:"mto_shipments" has_many:"mto_shipments" fk_id:"move_id"` ReferenceID *string `db:"reference_id"` ServiceCounselingCompletedAt *time.Time `db:"service_counseling_completed_at"` PrimeCounselingCompletedAt *time.Time `db:"prime_counseling_completed_at"` @@ -98,11 +98,11 @@ type Move struct { SCAssignedID *uuid.UUID `json:"sc_assigned_id" db:"sc_assigned_id"` SCAssignedUser *OfficeUser `belongs_to:"office_users" fk_id:"sc_assigned_id"` TOOAssignedID *uuid.UUID `json:"too_assigned_id" db:"too_assigned_id"` - TOOAssignedUser *OfficeUser `belongs_to:"office_users" fk_id:"too_assigned_id"` + TOOAssignedUser *OfficeUser `json:"too_assigned" belongs_to:"office_users" fk_id:"too_assigned_id"` TIOAssignedID *uuid.UUID `json:"tio_assigned_id" db:"tio_assigned_id"` TIOAssignedUser *OfficeUser `belongs_to:"office_users" fk_id:"tio_assigned_id"` CounselingOfficeID *uuid.UUID `json:"counseling_transportation_office_id" db:"counseling_transportation_office_id"` - CounselingOffice *TransportationOffice `belongs_to:"transportation_offices" fk_id:"counseling_transportation_office_id"` + CounselingOffice *TransportationOffice `json:"counseling_transportation_office" belongs_to:"transportation_offices" fk_id:"counseling_transportation_office_id"` } type MoveWithEarliestDate struct { diff --git a/pkg/models/mto_shipments.go b/pkg/models/mto_shipments.go index b3c69cb52bb..148f1130e65 100644 --- a/pkg/models/mto_shipments.go +++ b/pkg/models/mto_shipments.go @@ -118,74 +118,74 @@ const ( // MTOShipment is an object representing data for a move task order shipment type MTOShipment struct { - ID uuid.UUID `db:"id"` - MoveTaskOrder Move `belongs_to:"moves" fk_id:"move_id"` - MoveTaskOrderID uuid.UUID `db:"move_id"` - ScheduledPickupDate *time.Time `db:"scheduled_pickup_date"` - RequestedPickupDate *time.Time `db:"requested_pickup_date"` - RequestedDeliveryDate *time.Time `db:"requested_delivery_date"` - ApprovedDate *time.Time `db:"approved_date"` - FirstAvailableDeliveryDate *time.Time `db:"first_available_delivery_date"` - ActualPickupDate *time.Time `db:"actual_pickup_date"` - RequiredDeliveryDate *time.Time `db:"required_delivery_date"` - ScheduledDeliveryDate *time.Time `db:"scheduled_delivery_date"` - ActualDeliveryDate *time.Time `db:"actual_delivery_date"` - CustomerRemarks *string `db:"customer_remarks"` - CounselorRemarks *string `db:"counselor_remarks"` - PickupAddress *Address `belongs_to:"addresses" fk_id:"pickup_address_id"` - PickupAddressID *uuid.UUID `db:"pickup_address_id"` - DestinationAddress *Address `belongs_to:"addresses" fk_id:"destination_address_id"` - DestinationAddressID *uuid.UUID `db:"destination_address_id"` - DestinationType *DestinationType `db:"destination_address_type"` - MTOAgents MTOAgents `has_many:"mto_agents" fk_id:"mto_shipment_id"` - MTOServiceItems MTOServiceItems `has_many:"mto_service_items" fk_id:"mto_shipment_id"` - SecondaryPickupAddress *Address `belongs_to:"addresses" fk_id:"secondary_pickup_address_id"` - SecondaryPickupAddressID *uuid.UUID `db:"secondary_pickup_address_id"` - HasSecondaryPickupAddress *bool `db:"has_secondary_pickup_address"` - SecondaryDeliveryAddress *Address `belongs_to:"addresses" fk_id:"secondary_delivery_address_id"` - SecondaryDeliveryAddressID *uuid.UUID `db:"secondary_delivery_address_id"` - HasSecondaryDeliveryAddress *bool `db:"has_secondary_delivery_address"` - TertiaryPickupAddress *Address `belongs_to:"addresses" fk_id:"tertiary_pickup_address_id"` - TertiaryPickupAddressID *uuid.UUID `db:"tertiary_pickup_address_id"` - HasTertiaryPickupAddress *bool `db:"has_tertiary_pickup_address"` - TertiaryDeliveryAddress *Address `belongs_to:"addresses" fk_id:"tertiary_delivery_address_id"` - TertiaryDeliveryAddressID *uuid.UUID `db:"tertiary_delivery_address_id"` - HasTertiaryDeliveryAddress *bool `db:"has_tertiary_delivery_address"` - SITDaysAllowance *int `db:"sit_days_allowance"` - SITDurationUpdates SITDurationUpdates `has_many:"sit_extensions" fk_id:"mto_shipment_id"` - PrimeEstimatedWeight *unit.Pound `db:"prime_estimated_weight"` - PrimeEstimatedWeightRecordedDate *time.Time `db:"prime_estimated_weight_recorded_date"` - PrimeActualWeight *unit.Pound `db:"prime_actual_weight"` - BillableWeightCap *unit.Pound `db:"billable_weight_cap"` - BillableWeightJustification *string `db:"billable_weight_justification"` - NTSRecordedWeight *unit.Pound `db:"nts_recorded_weight"` - ShipmentType MTOShipmentType `db:"shipment_type"` - Status MTOShipmentStatus `db:"status"` - Diversion bool `db:"diversion"` - DiversionReason *string `db:"diversion_reason"` - DivertedFromShipmentID *uuid.UUID `db:"diverted_from_shipment_id"` - ActualProGearWeight *unit.Pound `db:"actual_pro_gear_weight"` - ActualSpouseProGearWeight *unit.Pound `db:"actual_spouse_pro_gear_weight"` - RejectionReason *string `db:"rejection_reason"` - Distance *unit.Miles `db:"distance"` - Reweigh *Reweigh `has_one:"reweighs" fk_id:"shipment_id"` - UsesExternalVendor bool `db:"uses_external_vendor"` - StorageFacility *StorageFacility `belongs_to:"storage_facilities" fk:"storage_facility_id"` - StorageFacilityID *uuid.UUID `db:"storage_facility_id"` - ServiceOrderNumber *string `db:"service_order_number"` - TACType *LOAType `db:"tac_type"` - SACType *LOAType `db:"sac_type"` - PPMShipment *PPMShipment `has_one:"ppm_shipment" fk_id:"shipment_id"` - BoatShipment *BoatShipment `has_one:"boat_shipment" fk_id:"shipment_id"` - DeliveryAddressUpdate *ShipmentAddressUpdate `has_one:"shipment_address_update" fk_id:"shipment_id"` - CreatedAt time.Time `db:"created_at"` - UpdatedAt time.Time `db:"updated_at"` - DeletedAt *time.Time `db:"deleted_at"` - ShipmentLocator *string `db:"shipment_locator"` - OriginSITAuthEndDate *time.Time `db:"origin_sit_auth_end_date"` - DestinationSITAuthEndDate *time.Time `db:"dest_sit_auth_end_date"` - MobileHome *MobileHome `has_one:"mobile_home" fk_id:"shipment_id"` - MarketCode MarketCode `db:"market_code"` + ID uuid.UUID `json:"id" db:"id"` + MoveTaskOrder Move `json:"move_task_order" belongs_to:"moves" fk_id:"move_id"` + MoveTaskOrderID uuid.UUID `json:"move_task_order_id" db:"move_id"` + ScheduledPickupDate *time.Time `json:"scheduled_pickup_date" db:"scheduled_pickup_date"` + RequestedPickupDate *time.Time `json:"requested_pickup_date" db:"requested_pickup_date"` + RequestedDeliveryDate *time.Time `json:"requested_delivery_date" db:"requested_delivery_date"` + ApprovedDate *time.Time `json:"approved_date" db:"approved_date"` + FirstAvailableDeliveryDate *time.Time `json:"first_available_delivery_date" db:"first_available_delivery_date"` + ActualPickupDate *time.Time `json:"actual_pickup_date" db:"actual_pickup_date"` + RequiredDeliveryDate *time.Time `json:"required_delivery_date" db:"required_delivery_date"` + ScheduledDeliveryDate *time.Time `json:"scheduled_delivery_date" db:"scheduled_delivery_date"` + ActualDeliveryDate *time.Time `json:"actual_delivery_date" db:"actual_delivery_date"` + CustomerRemarks *string `json:"customer_remarks" db:"customer_remarks"` + CounselorRemarks *string `json:"counselor_remarks" db:"counselor_remarks"` + PickupAddress *Address `json:"pickup_address" belongs_to:"addresses" fk_id:"pickup_address_id"` + PickupAddressID *uuid.UUID `json:"pickup_address_id" db:"pickup_address_id"` + DestinationAddress *Address `json:"destination_address" belongs_to:"addresses" fk_id:"destination_address_id"` + DestinationAddressID *uuid.UUID `json:"destination_address_id" db:"destination_address_id"` + DestinationType *DestinationType `json:"destination_type" db:"destination_address_type"` + MTOAgents MTOAgents `json:"mto_agents" has_many:"mto_agents" fk_id:"mto_shipment_id"` + MTOServiceItems MTOServiceItems `json:"mto_service_items" has_many:"mto_service_items" fk_id:"mto_shipment_id"` + SecondaryPickupAddress *Address `json:"secondary_pickup_address" belongs_to:"addresses" fk_id:"secondary_pickup_address_id"` + SecondaryPickupAddressID *uuid.UUID `json:"secondary_pickup_address_id" db:"secondary_pickup_address_id"` + HasSecondaryPickupAddress *bool `json:"has_secondary_pickup_address" db:"has_secondary_pickup_address"` + SecondaryDeliveryAddress *Address `json:"secondary_delivery_address" belongs_to:"addresses" fk_id:"secondary_delivery_address_id"` + SecondaryDeliveryAddressID *uuid.UUID `json:"secondary_delivery_address_id" db:"secondary_delivery_address_id"` + HasSecondaryDeliveryAddress *bool `json:"has_secondary_delivery_address" db:"has_secondary_delivery_address"` + TertiaryPickupAddress *Address `json:"tertiary_pickup_address" belongs_to:"addresses" fk_id:"tertiary_pickup_address_id"` + TertiaryPickupAddressID *uuid.UUID `json:"tertiary_pickup_address_id" db:"tertiary_pickup_address_id"` + HasTertiaryPickupAddress *bool `json:"has_tertiary_pickup_address" db:"has_tertiary_pickup_address"` + TertiaryDeliveryAddress *Address `json:"tertiary_delivery_address" belongs_to:"addresses" fk_id:"tertiary_delivery_address_id"` + TertiaryDeliveryAddressID *uuid.UUID `json:"tertiary_delivery_address_id" db:"tertiary_delivery_address_id"` + HasTertiaryDeliveryAddress *bool `json:"has_tertiary_delivery_address" db:"has_tertiary_delivery_address"` + SITDaysAllowance *int `json:"sit_days_allowance" db:"sit_days_allowance"` + SITDurationUpdates SITDurationUpdates `json:"sit_duration_updates" has_many:"sit_extensions" fk_id:"mto_shipment_id"` + PrimeEstimatedWeight *unit.Pound `json:"prime_estimated_weight" db:"prime_estimated_weight"` + PrimeEstimatedWeightRecordedDate *time.Time `json:"prime_estimated_weight_recorded_date" db:"prime_estimated_weight_recorded_date"` + PrimeActualWeight *unit.Pound `json:"prime_actual_weight" db:"prime_actual_weight"` + BillableWeightCap *unit.Pound `json:"billable_weight_cap" db:"billable_weight_cap"` + BillableWeightJustification *string `json:"billable_weight_justification" db:"billable_weight_justification"` + NTSRecordedWeight *unit.Pound `json:"nts_recorded_weight" db:"nts_recorded_weight"` + ShipmentType MTOShipmentType `json:"shipment_type" db:"shipment_type"` + Status MTOShipmentStatus `json:"status" db:"status"` + Diversion bool `json:"diversion" db:"diversion"` + DiversionReason *string `json:"diversion_reason" db:"diversion_reason"` + DivertedFromShipmentID *uuid.UUID `json:"diverted_from_shipment_id" db:"diverted_from_shipment_id"` + ActualProGearWeight *unit.Pound `json:"actual_pro_gear_weight" db:"actual_pro_gear_weight"` + ActualSpouseProGearWeight *unit.Pound `json:"actual_spouse_pro_gear_weight" db:"actual_spouse_pro_gear_weight"` + RejectionReason *string `json:"rejection_reason" db:"rejection_reason"` + Distance *unit.Miles `json:"distance" db:"distance"` + Reweigh *Reweigh `json:"reweigh" has_one:"reweighs" fk_id:"shipment_id"` + UsesExternalVendor bool `json:"uses_external_vendor" db:"uses_external_vendor"` + StorageFacility *StorageFacility `json:"storage_facility" belongs_to:"storage_facilities" fk:"storage_facility_id"` + StorageFacilityID *uuid.UUID `json:"storage_facility_id" db:"storage_facility_id"` + ServiceOrderNumber *string `json:"service_order_number" db:"service_order_number"` + TACType *LOAType `json:"tac_type" db:"tac_type"` + SACType *LOAType `json:"sac_type" db:"sac_type"` + PPMShipment *PPMShipment `json:"ppm_shipment" has_one:"ppm_shipment" fk_id:"shipment_id"` + BoatShipment *BoatShipment `json:"boat_shipment" has_one:"boat_shipment" fk_id:"shipment_id"` + DeliveryAddressUpdate *ShipmentAddressUpdate `json:"delivery_address_update" has_one:"shipment_address_update" fk_id:"shipment_id"` + CreatedAt time.Time `json:"created_at" db:"created_at"` + UpdatedAt time.Time `json:"updated_at" db:"updated_at"` + DeletedAt *time.Time `json:"deleted_at" db:"deleted_at"` + ShipmentLocator *string `json:"shipment_locator" db:"shipment_locator"` + OriginSITAuthEndDate *time.Time `json:"origin_sit_auth_end_date" db:"origin_sit_auth_end_date"` + DestinationSITAuthEndDate *time.Time `json:"destination_sit_auth_end_date" db:"dest_sit_auth_end_date"` + MobileHome *MobileHome `json:"mobile_home" has_one:"mobile_home" fk_id:"shipment_id"` + MarketCode MarketCode `json:"market_code" db:"market_code"` } // TableName overrides the table name used by Pop. diff --git a/pkg/models/order.go b/pkg/models/order.go index 2b0601f17c7..a9120c9579f 100644 --- a/pkg/models/order.go +++ b/pkg/models/order.go @@ -70,14 +70,14 @@ type Order struct { CreatedAt time.Time `json:"created_at" db:"created_at"` UpdatedAt time.Time `json:"updated_at" db:"updated_at"` ServiceMemberID uuid.UUID `json:"service_member_id" db:"service_member_id"` - ServiceMember ServiceMember `belongs_to:"service_members" fk_id:"service_member_id"` + ServiceMember ServiceMember `json:"service_member" belongs_to:"service_members" fk_id:"service_member_id"` IssueDate time.Time `json:"issue_date" db:"issue_date"` ReportByDate time.Time `json:"report_by_date" db:"report_by_date"` OrdersType internalmessages.OrdersType `json:"orders_type" db:"orders_type"` OrdersTypeDetail *internalmessages.OrdersTypeDetail `json:"orders_type_detail" db:"orders_type_detail"` HasDependents bool `json:"has_dependents" db:"has_dependents"` SpouseHasProGear bool `json:"spouse_has_pro_gear" db:"spouse_has_pro_gear"` - OriginDutyLocation *DutyLocation `belongs_to:"duty_locations" fk_id:"origin_duty_location_id"` + OriginDutyLocation *DutyLocation `json:"origin_duty_location" belongs_to:"duty_locations" fk_id:"origin_duty_location_id"` OriginDutyLocationID *uuid.UUID `json:"origin_duty_location_id" db:"origin_duty_location_id"` NewDutyLocationID uuid.UUID `json:"new_duty_location_id" db:"new_duty_location_id"` NewDutyLocation DutyLocation `belongs_to:"duty_locations" fk_id:"new_duty_location_id"` diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 1a7d097eb6d..53478c9860d 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -2,6 +2,7 @@ package order import ( "database/sql" + "encoding/json" "fmt" "regexp" "strings" @@ -9,6 +10,8 @@ import ( "github.com/gobuffalo/pop/v6" "github.com/gofrs/uuid" + "github.com/jinzhu/copier" + "github.com/lib/pq" "go.uber.org/zap" "github.com/transcom/mymove/pkg/appcontext" @@ -307,9 +310,31 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid return moves, count, nil } +type MoveWithCount struct { + models.Move + OrdersRaw json.RawMessage `json:"orders" db:"orders"` + Orders *models.Order `json:"-"` + MTOShipmentsRaw json.RawMessage `json:"mto_shipments" db:"mto_shipments"` + MTOShipments *models.MTOShipments `json:"-"` + CounselingOfficeRaw json.RawMessage `json:"counseling_transportation_office" db:"counseling_transportation_office"` + CounselingOffice *models.TransportationOffice `json:"-"` + TOOAssignedRaw json.RawMessage `json:"too_assigned" db:"too_assigned"` + TOOAssignedUser *models.OfficeUser `json:"-"` + TotalCount int64 `json:"total_count" db:"total_count"` +} + +type JSONB []byte + +func (j *JSONB) UnmarshalJSON(data []byte) error { + *j = data + return nil +} + func (f orderFetcher) ListDestinationRequestsOrders(appCtx appcontext.AppContext, officeUserID uuid.UUID, role roles.RoleType, params *services.ListOrderParams) ([]models.Move, int, error) { var moves []models.Move + var movesWithCount []MoveWithCount + // getting the office user's GBLOC var officeUserGbloc string if params.ViewAsGBLOC != nil { officeUserGbloc = *params.ViewAsGBLOC @@ -322,136 +347,81 @@ func (f orderFetcher) ListDestinationRequestsOrders(appCtx appcontext.AppContext } } - ppmCloseoutGblocs := officeUserGbloc == "NAVY" || officeUserGbloc == "TVCB" || officeUserGbloc == "USCG" + // calling the database function with all passed in parameters + err := appCtx.DB().RawQuery("SELECT * FROM get_destination_queue($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)", + officeUserGbloc, + params.CustomerName, + params.Edipi, + params.Emplid, + pq.Array(params.Status), + params.Locator, + params.RequestedMoveDate, + params.SubmittedAt, + params.Branch, + strings.Join(params.OriginDutyLocation, " "), + params.CounselingOffice, + params.TOOAssignedUser, + params.Page, + params.PerPage). + All(&movesWithCount) - branchQuery := branchFilter(params.Branch, false, ppmCloseoutGblocs) + if err != nil { + return []models.Move{}, 0, err + } - // If the user is associated with the USMC GBLOC we want to show them ALL the USMC moves, so let's override here. - // We also only want to do the gbloc filtering thing if we aren't a USMC user, which we cover with the else. - // var gblocQuery QueryOption - var gblocToFilterBy *string - if officeUserGbloc == "USMC" { - branchQuery = branchFilter(models.StringPointer(string(models.AffiliationMARINES)), false, ppmCloseoutGblocs) - gblocToFilterBy = params.OriginGBLOC + // each row is sent back with the total count, so we will take the value from the first one + var count int64 + if len(movesWithCount) > 0 { + count = movesWithCount[0].TotalCount } else { - gblocToFilterBy = &officeUserGbloc + count = 0 } - gblocQuery := gblocFilterForTOO(gblocToFilterBy) - - locatorQuery := locatorFilter(params.Locator) - dodIDQuery := dodIDFilter(params.Edipi) - emplidQuery := emplidFilter(params.Emplid) - customerNameQuery := customerNameFilter(params.CustomerName) - originDutyLocationQuery := originDutyLocationFilter(params.OriginDutyLocation) - destinationDutyLocationQuery := destinationDutyLocationFilter(params.DestinationDutyLocation) - moveStatusQuery := moveStatusFilter(params.Status) - submittedAtQuery := submittedAtFilter(params.SubmittedAt) - appearedInTOOAtQuery := appearedInTOOAtFilter(params.AppearedInTOOAt) - requestedMoveDateQuery := requestedMoveDateFilter(params.RequestedMoveDate) - closeoutInitiatedQuery := closeoutInitiatedFilter(params.CloseoutInitiated) - closeoutLocationQuery := closeoutLocationFilter(params.CloseoutLocation, ppmCloseoutGblocs) - ppmTypeQuery := ppmTypeFilter(params.PPMType) - ppmStatusQuery := ppmStatusFilter(params.PPMStatus) - scAssignedUserQuery := scAssignedUserFilter(params.SCAssignedUser) - tooAssignedUserQuery := tooAssignedUserFilter(params.TOOAssignedUser) - sortOrderQuery := sortOrder(params.Sort, params.Order, ppmCloseoutGblocs) - counselingQuery := counselingOfficeFilter(params.CounselingOffice) - - // Adding to an array so we can iterate over them and apply the filters after the query structure is set below - options := [20]QueryOption{branchQuery, locatorQuery, dodIDQuery, emplidQuery, customerNameQuery, originDutyLocationQuery, destinationDutyLocationQuery, moveStatusQuery, gblocQuery, submittedAtQuery, appearedInTOOAtQuery, requestedMoveDateQuery, ppmTypeQuery, closeoutInitiatedQuery, closeoutLocationQuery, ppmStatusQuery, sortOrderQuery, scAssignedUserQuery, tooAssignedUserQuery, counselingQuery} - - // we want to set the query up to where it only shows moves that have orders.destination_gbloc that are in the office user's GBLOC (some exclusions apply) - query := appCtx.DB().Q().Scope(utilities.ExcludeDeletedScope(models.MTOShipment{})).EagerPreload( - "Orders.ServiceMember", - "Orders.NewDutyLocation.Address", - "Orders.OriginDutyLocation.Address", - "Orders.Entitlement", - "MTOShipments.DeliveryAddressUpdate", - "MTOServiceItems.ReService.Code", - "ShipmentGBLOC", - "MTOShipments.PPMShipment", - "CloseoutOffice", - "LockedByOfficeUser", - "CounselingOffice", - "SCAssignedUser", - "TOOAssignedUser", - ).InnerJoin("orders", "orders.id = moves.orders_id"). - InnerJoin("service_members", "orders.service_member_id = service_members.id"). - InnerJoin("mto_shipments", "moves.id = mto_shipments.move_id"). - InnerJoin("mto_service_items", "mto_shipments.id = mto_service_items.mto_shipment_id"). - InnerJoin("re_services", "mto_service_items.re_service_id = re_services.id"). - InnerJoin("duty_locations as origin_dl", "orders.origin_duty_location_id = origin_dl.id"). - LeftJoin("transportation_offices as origin_to", "origin_dl.transportation_office_id = origin_to.id"). - LeftJoin("move_to_gbloc", "move_to_gbloc.move_id = moves.id"). - LeftJoin("duty_locations as dest_dl", "dest_dl.id = orders.new_duty_location_id"). - LeftJoin("office_users", "office_users.id = moves.locked_by"). - LeftJoin("transportation_offices", "moves.counseling_transportation_office_id = transportation_offices.id"). - LeftJoin("office_users as assigned_user", "moves.too_assigned_id = assigned_user.id"). - LeftJoin("ppm_shipments", "ppm_shipments.shipment_id = mto_shipments.id"). - LeftJoin("shipment_address_updates", "shipment_address_updates.shipment_id = mto_shipments.id"). - Where("moves.status = 'APPROVALS REQUESTED' "+ - "AND mto_service_items.status = 'SUBMITTED' "+ - "AND re_services.code IN ('DDFSIT', 'DDASIT', 'DDDSIT', 'DDSHUT', 'DDSFSC') "+ - "OR shipment_address_updates.status = 'REQUESTED'"). - Where("orders.destination_gbloc = ?", officeUserGbloc). - Where("moves.show = ?", models.BoolPointer(true)) - - for _, option := range options { - if option != nil { - option(query) + // we have to manually loop through each move and populate the nested objects that the queue uses/needs + for i := range movesWithCount { + // populating Move.Orders struct + var order models.Order + if err := json.Unmarshal(movesWithCount[i].OrdersRaw, &order); err != nil { + return nil, 0, fmt.Errorf("error unmarshaling orders JSON: %w", err) } - } - - // Pass zeros into paginate in this case. Which will give us 1 page and 20 per page respectively - if params.Page == nil { - params.Page = models.Int64Pointer(0) - } - if params.PerPage == nil { - params.PerPage = models.Int64Pointer(0) - } + movesWithCount[i].OrdersRaw = nil + movesWithCount[i].Orders = &order - var groupByColumms []string - groupByColumms = append(groupByColumms, "service_members.id", "orders.id", "origin_dl.id") - - if params.Sort != nil && *params.Sort == "originDutyLocation" { - groupByColumms = append(groupByColumms, "origin_dl.name") - } - if params.Sort != nil && *params.Sort == "destinationDutyLocation" { - groupByColumms = append(groupByColumms, "dest_dl.name") - } - if params.Sort != nil && *params.Sort == "originGBLOC" { - groupByColumms = append(groupByColumms, "origin_to.id") - } - if params.Sort != nil && *params.Sort == "counselingOffice" { - groupByColumms = append(groupByColumms, "transportation_offices.id") - } - if params.Sort != nil && *params.Sort == "assignedTo" { - groupByColumms = append(groupByColumms, "assigned_user.last_name", "assigned_user.first_name") - } - - err := query.GroupBy("moves.id", groupByColumms...).Paginate(int(*params.Page), int(*params.PerPage)).All(&moves) - if err != nil { - return []models.Move{}, 0, err - } + // populating Move.MTOShipments array + var shipments models.MTOShipments + if err := json.Unmarshal(movesWithCount[i].MTOShipmentsRaw, &shipments); err != nil { + return nil, 0, fmt.Errorf("error unmarshaling shipments JSON: %w", err) + } + movesWithCount[i].MTOShipmentsRaw = nil + movesWithCount[i].MTOShipments = &shipments - count := query.Paginator.TotalEntriesSize + // populating Moves.CounselingOffice struct + var counselingTransportationOffice models.TransportationOffice + if err := json.Unmarshal(movesWithCount[i].CounselingOfficeRaw, &counselingTransportationOffice); err != nil { + return nil, 0, fmt.Errorf("error unmarshaling counseling_transportation_office JSON: %w", err) + } + movesWithCount[i].CounselingOfficeRaw = nil + movesWithCount[i].CounselingOffice = &counselingTransportationOffice - for i := range moves { - if moves[i].Orders.OriginDutyLocation != nil { - loadErr := appCtx.DB().Load(moves[i].Orders.OriginDutyLocation, "TransportationOffice") - if loadErr != nil { - return []models.Move{}, 0, err - } + // populating Moves.TOOAssigned struct + var tooAssigned models.OfficeUser + if err := json.Unmarshal(movesWithCount[i].TOOAssignedRaw, &tooAssigned); err != nil { + return nil, 0, fmt.Errorf("error unmarshaling too_assigned JSON: %w", err) } + movesWithCount[i].TOOAssignedRaw = nil + movesWithCount[i].TOOAssignedUser = &tooAssigned + } - err := appCtx.DB().Load(&moves[i].Orders.ServiceMember, "BackupContacts") - if err != nil { - return []models.Move{}, 0, err + // the handler consumes a Move object, so we have to copy our custom struct into the Move struct + for _, moveWithCount := range movesWithCount { + var move models.Move + if err := copier.Copy(&move, &moveWithCount); err != nil { + return nil, 0, fmt.Errorf("error copying movesWithCount into Moves: %w", err) } + moves = append(moves, move) } - return moves, count, nil + return moves, int(count), nil } func (f orderFetcher) ListAllOrderLocations(appCtx appcontext.AppContext, officeUserID uuid.UUID, params *services.ListOrderParams) ([]models.Move, error) { diff --git a/swagger-def/ghc.yaml b/swagger-def/ghc.yaml index 1ff32d5e3da..bf20d749e57 100644 --- a/swagger-def/ghc.yaml +++ b/swagger-def/ghc.yaml @@ -3873,6 +3873,8 @@ paths: items: type: string enum: + - SUBMITTED + - SERVICE COUNSELING COMPLETED - APPROVALS REQUESTED - in: query name: orderType diff --git a/swagger/ghc.yaml b/swagger/ghc.yaml index b20bf2e167d..943339b625c 100644 --- a/swagger/ghc.yaml +++ b/swagger/ghc.yaml @@ -4036,6 +4036,8 @@ paths: items: type: string enum: + - SUBMITTED + - SERVICE COUNSELING COMPLETED - APPROVALS REQUESTED - in: query name: orderType From cf559cfd4f086ebd45abcf8e8b96c85a5d8a9718 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Mon, 27 Jan 2025 15:00:26 +0000 Subject: [PATCH 224/260] refactoring using USING, need to add USMC logic and refine --- ...73216_add_destination_queue_db_func.up.sql | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql b/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql index f6c40773200..fad30b87d29 100644 --- a/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql +++ b/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql @@ -112,8 +112,7 @@ BEGIN WHERE moves.show = TRUE '; - -- adding conditionals for destination queue - -- we only want to see moves that have destination requests (shipment address updates, destination service items in SUBMITTED status) + -- add destination queue-specific filters (pending dest address requests, dest SIT & shuttle service items) sql_query := sql_query || ' AND ( shipment_address_updates.status = ''REQUESTED'' @@ -124,60 +123,59 @@ BEGIN ) '; - -- this should always be passed in from the service object, but will nil check it anyway IF user_gbloc IS NOT NULL THEN - sql_query := sql_query || ' AND move_to_gbloc.gbloc = ''%' || user_gbloc || '%'' '; + sql_query := sql_query || ' AND move_to_gbloc.gbloc = $1 '; END IF; - IF customer_name IS NOT NULL AND customer_name <> '' THEN + IF customer_name IS NOT NULL THEN sql_query := sql_query || ' AND ( - service_members.first_name || '' '' || service_members.last_name ILIKE ''%' || customer_name || '%'' - OR service_members.last_name || '' '' || service_members.first_name ILIKE ''%' || customer_name || '%'' - ) '; + service_members.first_name || '' '' || service_members.last_name ILIKE ''%'' || $2 || ''%'' + OR service_members.last_name || '' '' || service_members.first_name ILIKE ''%'' || $2 || ''%'' + )'; END IF; IF edipi IS NOT NULL THEN - sql_query := sql_query || ' AND service_members.edipi ILIKE ''%' || edipi || '%'' '; + sql_query := sql_query || ' AND service_members.edipi ILIKE ''%'' || $3 || ''%'' '; END IF; IF emplid IS NOT NULL THEN - sql_query := sql_query || ' AND service_members.emplid ILIKE ''%' || emplid || '%'' '; + sql_query := sql_query || ' AND service_members.emplid ILIKE ''%'' || $4 || ''%'' '; END IF; IF m_status IS NOT NULL THEN - sql_query := sql_query || ' AND moves.status IN (SELECT unnest($1)) '; + sql_query := sql_query || ' AND moves.status = ANY($5) '; END IF; IF move_code IS NOT NULL THEN - sql_query := sql_query || ' AND moves.locator ILIKE ''%' || UPPER(move_code) || '%'' '; + sql_query := sql_query || ' AND moves.locator ILIKE ''%'' || $6 || ''%'' '; END IF; IF requested_move_date IS NOT NULL THEN sql_query := sql_query || ' AND ( - mto_shipments.requested_pickup_date::DATE = ' || quote_literal(requested_move_date) || '::DATE - OR ppm_shipments.expected_departure_date::DATE = ' || quote_literal(requested_move_date) || '::DATE - OR (mto_shipments.shipment_type = ''HHG_OUTOF_NTS'' AND mto_shipments.requested_delivery_date::DATE = ' || quote_literal(requested_move_date) || '::DATE) + mto_shipments.requested_pickup_date::DATE = $7::DATE + OR ppm_shipments.expected_departure_date::DATE = $7::DATE + OR (mto_shipments.shipment_type = ''HHG_OUTOF_NTS'' AND mto_shipments.requested_delivery_date::DATE = $7::DATE) )'; END IF; IF date_submitted IS NOT NULL THEN - sql_query := sql_query || ' AND moves.submitted_at = ' || quote_literal(date_submitted) || ' '; + sql_query := sql_query || ' AND moves.submitted_at::DATE = $8::DATE '; END IF; IF branch IS NOT NULL THEN - sql_query := sql_query || ' AND service_members.affiliation ILIKE ''%' || branch || '%'' '; + sql_query := sql_query || ' AND service_members.affiliation ILIKE ''%'' || $9 || ''%'' '; END IF; - IF origin_duty_location IS NOT NULL AND origin_duty_location <> '' THEN - sql_query := sql_query || ' AND origin_duty_locations.name ILIKE ''%' || origin_duty_location || '%'' '; + IF origin_duty_location IS NOT NULL THEN + sql_query := sql_query || ' AND origin_duty_locations.name ILIKE ''%'' || $10 || ''%'' '; END IF; IF counseling_office IS NOT NULL THEN - sql_query := sql_query || ' AND counseling_offices.name ILIKE ''%' || counseling_office || '%'' '; + sql_query := sql_query || ' AND counseling_offices.name ILIKE ''%'' || $11 || ''%'' '; END IF; IF too_assigned_user IS NOT NULL THEN - sql_query := sql_query || ' AND (too_user.first_name || '' '' || too_user.last_name) ILIKE ''%' || quote_literal(too_assigned_user) || '%'' '; + sql_query := sql_query || ' AND (too_user.first_name || '' '' || too_user.last_name) ILIKE ''%'' || $12 || ''%'' '; END IF; sql_query := sql_query || ' @@ -202,11 +200,11 @@ BEGIN too_user.first_name, too_user.last_name'; sql_query := sql_query || ' ORDER BY moves.id ASC '; - sql_query := sql_query || ' LIMIT ' || per_page || ' OFFSET ' || offset_value || ' '; - - RAISE NOTICE 'Query: %', sql_query; + sql_query := sql_query || ' LIMIT $13 OFFSET $14 '; - RETURN QUERY EXECUTE sql_query USING m_status; + RETURN QUERY EXECUTE sql_query + USING user_gbloc, customer_name, edipi, emplid, m_status, move_code, requested_move_date, date_submitted, + branch, origin_duty_location, counseling_office, too_assigned_user, per_page, offset_value; END; $$ LANGUAGE plpgsql; From 3c15c9025ce5a45a5e6347f46062ec6f08c40c3c Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Tue, 28 Jan 2025 15:41:55 +0000 Subject: [PATCH 225/260] added move to dest gbloc view --- migrations/app/migrations_manifest.txt | 2 +- ...ation_queue_db_func_and_gbloc_view.up.sql} | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) rename migrations/app/schema/{20250123173216_add_destination_queue_db_func.up.sql => 20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql} (78%) diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt index a14296a57cf..050c43ffb45 100644 --- a/migrations/app/migrations_manifest.txt +++ b/migrations/app/migrations_manifest.txt @@ -1089,4 +1089,4 @@ 20250120214107_add_international_ntsr_service_items.up.sql 20250121153007_update_pricing_proc_to_handle_international_shuttle.up.sql 20250121184450_upd_duty_loc_B-22242.up.sql -20250123173216_add_destination_queue_db_func.up.sql +20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql diff --git a/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql similarity index 78% rename from migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql rename to migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql index fad30b87d29..f6d740023d1 100644 --- a/migrations/app/schema/20250123173216_add_destination_queue_db_func.up.sql +++ b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql @@ -1,3 +1,43 @@ +CREATE OR REPLACE VIEW move_to_dest_gbloc +AS +SELECT distinct move_id, gbloc FROM ( + SELECT sh.move_id, s.affiliation, + COALESCE(pctg.gbloc, coalesce(pctg_oconus_bos.gbloc, coalesce(pctg_oconus.gbloc, pctg_ppm.gbloc))) AS gbloc + FROM mto_shipments sh + JOIN moves m ON sh.move_id = m.id + JOIN orders o on m.orders_id = o.id + JOIN service_members s on o.service_member_id = s.id + LEFT JOIN ( SELECT a.id AS address_id, + pctg_1.gbloc, pctg_1.postal_code + FROM addresses a + JOIN postal_code_to_gblocs pctg_1 ON a.postal_code::text = pctg_1.postal_code::text) pctg ON pctg.address_id = sh.destination_address_id + LEFT JOIN ( SELECT ppm.shipment_id, + pctg_1.gbloc + FROM ppm_shipments ppm + JOIN addresses ppm_address ON ppm.destination_postal_address_id = ppm_address.id + JOIN postal_code_to_gblocs pctg_1 ON ppm_address.postal_code::text = pctg_1.postal_code::text) pctg_ppm ON pctg_ppm.shipment_id = sh.id + LEFT JOIN ( SELECT a.id AS address_id, + cast(jr.code as varchar) AS gbloc, ga.department_indicator + FROM addresses a + JOIN re_oconus_rate_areas ora ON a.us_post_region_cities_id = ora.us_post_region_cities_id + JOIN gbloc_aors ga ON ora.id = ga.oconus_rate_area_id + JOIN jppso_regions jr ON ga.jppso_regions_id = jr.id + ) pctg_oconus_bos ON pctg_oconus_bos.address_id = sh.destination_address_id + and case when s.affiliation = 'AIR_FORCE' THEN 'AIR_AND_SPACE_FORCE' + when s.affiliation = 'SPACE_FORCE' THEN 'AIR_AND_SPACE_FORCE' + when s.affiliation = 'NAVY' THEN 'NAVY_AND_MARINES' + when s.affiliation = 'MARINES' THEN 'NAVY_AND_MARINES' + else s.affiliation + end = pctg_oconus_bos.department_indicator + LEFT JOIN ( SELECT a.id AS address_id, + cast(pctg_1.code as varchar) AS gbloc, ga.department_indicator + FROM addresses a + JOIN re_oconus_rate_areas ora ON a.us_post_region_cities_id = ora.us_post_region_cities_id + JOIN gbloc_aors ga ON ora.id = ga.oconus_rate_area_id + JOIN jppso_regions pctg_1 ON ga.jppso_regions_id = pctg_1.id + ) pctg_oconus ON pctg_oconus.address_id = sh.destination_address_id and pctg_oconus.department_indicator is null + WHERE sh.deleted_at IS NULL) as m; + -- database function that returns a list of moves that have destination requests -- this includes shipment address update requests & destination service items CREATE OR REPLACE FUNCTION get_destination_queue( From 87cd50c267b3a0562c8a04baea7b50afeb6ac199 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Wed, 29 Jan 2025 16:05:52 +0000 Subject: [PATCH 226/260] updating move_to_gbloc to move_to_dest_gbloc --- ...23173216_add_destination_queue_db_func_and_gbloc_view.up.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql index f6d740023d1..bda0e93ab39 100644 --- a/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql +++ b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql @@ -148,7 +148,7 @@ BEGIN LEFT JOIN transportation_offices AS counseling_offices ON moves.counseling_transportation_office_id = counseling_offices.id LEFT JOIN shipment_address_updates ON shipment_address_updates.shipment_id = mto_shipments.id - LEFT JOIN move_to_gbloc ON move_to_gbloc.move_id = moves.id + LEFT JOIN move_to_dest_gbloc ON move_to_dest_gbloc.move_id = moves.id WHERE moves.show = TRUE '; From 39052daf767b25fcd83ea691713e8bd747c7db03 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Fri, 31 Jan 2025 14:15:23 +0000 Subject: [PATCH 227/260] adding things, awaiting db funcs from beth for USMC logic --- ...nation_queue_db_func_and_gbloc_view.up.sql | 261 ++++++++++++++++-- .../ServicesCounselingQueue.jsx | 2 +- 2 files changed, 237 insertions(+), 26 deletions(-) diff --git a/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql index bda0e93ab39..bd09ad533c4 100644 --- a/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql +++ b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql @@ -1,3 +1,210 @@ +--insert USMC gbloc +insert into jppso_regions values ('85b324ae-1a0d-4f7d-971f-ea509dcc73d7', 'USMC','USMC',now(),now()); + +--insert USMC AORs +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('a8eb35e2-275e-490b-9945-1971b954b958'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'e418be11-2b6f-4714-b026-e293528c50bd'::uuid,'MARINES',NULL,true,now(),now()), + ('ada1b48d-d2e0-481a-8a2e-a265a824647d'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'b41c5636-96dd-4f0d-a18e-eebb17f97ea5'::uuid,'MARINES',NULL,true,now(),now()), + ('588af482-7cd7-42ea-8e05-49dce645ecbe'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'02f32a6a-0338-4545-8437-059862892d2c'::uuid,'MARINES',NULL,true,now(),now()), + ('1ff3bed7-bbf3-432d-9da3-d76264d72913'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'0f128476-d52a-418c-8ba0-c8bfd1c32629'::uuid,'MARINES',NULL,true,now(),now()), + ('0853a854-98b2-4363-a2b1-db14c44dde2f'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'081f84c3-17ec-4ff6-97ce-d5c44a8e4a28'::uuid,'MARINES',NULL,true,now(),now()), + ('21c1ba40-2533-4196-9eb5-6ffddff3a794'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'ce7cdd91-e323-43a6-a604-daaa6bf8be06'::uuid,'MARINES',NULL,true,now(),now()), + ('19ca4073-8736-453e-bb0d-9b13e3b557b0'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'655050d4-711a-43b7-b06d-828ec990c35e'::uuid,'MARINES',NULL,true,now(),now()), + ('a9c2131e-09c3-480d-ba3e-0c144de18aa5'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'455a34af-30a8-4a98-a62b-6f40fd7f047b'::uuid,'MARINES',NULL,true,now(),now()), + ('649e72f8-cac8-483f-a9ed-c9659e37545b'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'1bf1daee-51bb-4c28-aac8-a126ef596486'::uuid,'MARINES',NULL,true,now(),now()), + ('7173f871-f948-4eed-86ae-5e977b16c426'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'15b1d852-0dde-4e1b-b3c6-e08bbc714db3'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('4f626e2a-cad0-4b4d-baa8-3101275bac23'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'d63de5bb-379b-4f3b-b4c1-554b9746d311'::uuid,'MARINES',NULL,true,now(),now()), + ('de59c604-9119-48fc-bf3f-883de17b7ee6'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'95d142f8-b50a-4108-b5e2-fbd3b7022d3b'::uuid,'MARINES',NULL,true,now(),now()), + ('1cec884c-9e34-42fe-8887-1e8b8fa1cd2e'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'922bb7da-d0e9-431c-a493-95a861dca929'::uuid,'MARINES',NULL,true,now(),now()), + ('0f24b453-e3bc-47ec-86b5-8d8937f65504'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'79aef0ca-9065-4c0e-a134-2889b250cc38'::uuid,'MARINES',NULL,true,now(),now()), + ('2d55560a-7d0a-474f-a0f9-b31c5be8d80e'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'1f181025-e410-41ac-935b-4b5147353f84'::uuid,'MARINES',NULL,true,now(),now()), + ('abcc37f6-9209-4639-8fa1-c8d5f6e4e77d'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'d9ede620-c3f1-4f8d-b60b-eb93664382f7'::uuid,'MARINES',NULL,true,now(),now()), + ('3ac990d2-5df4-4889-a943-2710f818e75a'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'bd27700b-3094-46cc-807b-f18472cbfaf0'::uuid,'MARINES',NULL,true,now(),now()), + ('f3084090-680f-4656-947a-eb2e773e4076'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'2f4a1689-ee65-45fa-9d0c-debd9344f8b9'::uuid,'MARINES',NULL,true,now(),now()), + ('a35ac50b-09a1-46ef-969e-17569717ee10'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'20c52934-2588-4d8f-b3ed-c046d771f4e9'::uuid,'MARINES',NULL,true,now(),now()), + ('107c1479-e6d9-44cb-8342-ac934055074d'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'15fe364b-add5-4ade-bdd9-38fe442616fb'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('843db089-67cb-463d-a255-1d198f4f7aaa'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'e5a1248e-3870-4a4c-9c9d-2056234eb64a'::uuid,'MARINES',NULL,true,now(),now()), + ('ac820ac9-d380-4c11-9103-172795658e1f'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'efc92db1-4b06-49ab-a295-a98f3f6c9c04'::uuid,'MARINES',NULL,true,now(),now()), + ('dca7ccd2-e438-4f82-8b76-9b61fbf2a593'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'13474ce5-8839-4af7-b975-c3f70ccdab7b'::uuid,'MARINES',NULL,true,now(),now()), + ('def1095b-2a5c-4f7c-8889-9fde15a7ec06'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'d3b05c5e-6faa-4fa9-b725-0904f8a4f3d7'::uuid,'MARINES',NULL,true,now(),now()), + ('d5fbc738-ee31-4c51-8fd4-bbb8db941dc1'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'e5f849fe-5672-4d0d-881c-078e56eea33d'::uuid,'MARINES',NULL,true,now(),now()), + ('ac8c75fe-f637-429d-80fa-913321a65372'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'fca7c60e-fbd9-4885-afdb-ae41c521b560'::uuid,'MARINES',NULL,true,now(),now()), + ('c33eb1f8-b0fc-4670-af5e-5bd423eca6e7'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'0d52a0f0-f39c-4d34-9387-2df45a5810d4'::uuid,'MARINES',NULL,true,now(),now()), + ('188ea995-b8b7-4ce0-97a9-f553f3b72c2f'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'af008e75-81d5-4211-8204-4964c78e70d9'::uuid,'MARINES',NULL,true,now(),now()), + ('4f13c1a6-059b-4aa2-9250-4316e60da2a7'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'dd689e55-af29-4c76-b7e0-c2429ea4833c'::uuid,'MARINES',NULL,true,now(),now()), + ('67e1ff6f-b79b-45cf-b250-3d4ec89bebae'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'60e08330-6869-4586-8198-35f7a4ae9ea7'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('3a7c679c-0439-4030-8f7e-f6d8e92720d7'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'f7478e79-dbfe-46c8-b337-1e7c46df79dc'::uuid,'MARINES',NULL,true,now(),now()), + ('db91f133-a301-4c87-af9f-6c10584063e6'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'486d7dd4-f51f-4b13-88fc-830b5b15f0a8'::uuid,'MARINES',NULL,true,now(),now()), + ('6b83cc22-36a9-470e-9f43-e65ade5e8a66'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'f66edf62-ba5e-47f8-8264-b6dc9e7dd9ba'::uuid,'MARINES',NULL,true,now(),now()), + ('3df30221-acd3-4428-890c-3a5ef5296cb1'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'0052c55a-d9d7-46b0-9328-58d3911f61b4'::uuid,'MARINES',NULL,true,now(),now()), + ('bae4c9c6-94d8-4ad0-bfc0-7642f5353199'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'16a51fd1-04ed-432a-a8d7-9f17c1de095d'::uuid,'MARINES',NULL,true,now(),now()), + ('1cd873ff-d170-4f48-8f5b-5c5146052d68'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'64b4756f-437d-4aa5-a95e-c396f0cafcbb'::uuid,'MARINES',NULL,true,now(),now()), + ('eb4d870b-8d66-4135-b294-8992e56ad76f'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'f2de1da5-a737-4493-b3f7-7700944a5b62'::uuid,'MARINES',NULL,true,now(),now()), + ('e8c0709c-1f08-4d3e-b848-72ab5b524677'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'7a9c2adb-0562-42c1-a5f1-81710dd19590'::uuid,'MARINES',NULL,true,now(),now()), + ('3c53df36-ee6b-4bc0-a5ca-cedc1dc3c32e'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'e713eed6-35a6-456d-bfb2-0e0646078ab8'::uuid,'MARINES',NULL,true,now(),now()), + ('7cbc7e6c-4da7-47a1-ac93-171b89dba1e0'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'a4594957-0ec6-4edc-85c2-68871f4f6359'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('d22cb1d2-79b4-45c9-bb6f-8acef54a67b0'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'acd4d2f9-9a49-4a73-be14-3515f19ba0d1'::uuid,'MARINES',NULL,true,now(),now()), + ('5b5e7a5a-d027-44f2-9b4f-f25c1a91bc00'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'c8300ab6-519c-4bef-9b81-25e7334773ca'::uuid,'MARINES',NULL,true,now(),now()), + ('21307477-912d-40ca-a399-6dfebcc322ea'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'67eca2ce-9d88-44ca-bb17-615f3199415c'::uuid,'MARINES',NULL,true,now(),now()), + ('82282efb-7fef-4a6d-a260-a18d2f21fa8d'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'149c3a94-abb1-4af0-aabf-3af019d5e243'::uuid,'MARINES',NULL,true,now(),now()), + ('3bdad313-d414-4842-8e6e-3675e20d78eb'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'87c09b47-058e-47ea-9684-37a8ac1f7120'::uuid,'MARINES',NULL,true,now(),now()), + ('db80b591-045d-4907-9b77-6694fe34e3ed'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'0ba81e85-f175-435a-a7c2-a22d0c44cc7b'::uuid,'MARINES',NULL,true,now(),now()), + ('05970a8a-28aa-454f-a28e-31327a2415dd'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'946256dc-1572-4201-b5ff-464da876f5ff'::uuid,'MARINES',NULL,true,now(),now()), + ('c1b3e0be-0463-4dfc-ab22-016037b41a05'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'5d381518-6beb-422e-8c57-4682b87ff1fe'::uuid,'MARINES',NULL,true,now(),now()), + ('1a92f4b0-4060-4f1b-9b45-b3fc47c5f08d'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'b07fb701-2c9b-4847-a459-76b1f47aa872'::uuid,'MARINES',NULL,true,now(),now()), + ('73794c53-a915-41af-b93d-5ada2e174409'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'b6c51584-f3e8-4c9e-9bdf-f7cac0433319'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('c03994c2-9e2a-4888-a5c2-c81ee05eba31'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'6097d01d-78ef-40d5-8699-7f8a8e48f4e7'::uuid,'MARINES',NULL,true,now(),now()), + ('ae6a55fd-2171-425a-9716-56d3fb9452e3'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'e48a3602-7fdd-4527-a8a7-f244fb331228'::uuid,'MARINES',NULL,true,now(),now()), + ('f052acf4-7d4a-4061-a2f4-ba19ff17ec4d'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'df47ef29-e902-4bd3-a32d-88d6187399b3'::uuid,'MARINES',NULL,true,now(),now()), + ('10b47428-bef7-4cfe-8564-2ccb654d514a'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'0f4eddf9-b727-4725-848e-3d9329553823'::uuid,'MARINES',NULL,true,now(),now()), + ('4a547501-6aae-4886-be5c-e5a0fad05441'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'d16ebe80-2195-48cf-ba61-b5efb8212754'::uuid,'MARINES',NULL,true,now(),now()), + ('d99cbe3a-84a0-4a2c-8e05-41ce066570ea'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'093268d0-597b-40bd-882a-8f385480bc68'::uuid,'MARINES',NULL,true,now(),now()), + ('ad09f13c-9dd9-468b-ab92-ad3e2d77c905'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'edb8b022-9534-44e7-87ea-e93f5451f057'::uuid,'MARINES',NULL,true,now(),now()), + ('362482c6-7770-49f4-86c9-89e2990e5345'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'4c62bb35-4d2a-4995-9c4f-8c665f2f6d3e'::uuid,'MARINES',NULL,true,now(),now()), + ('45994e2f-1aa4-4aa1-8631-a347a4463bc2'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'58ccfcc5-ded6-4f91-8cb7-8687bc56c4c6'::uuid,'MARINES',NULL,true,now(),now()), + ('b4fd2bf2-05b2-4429-afcb-ebbae512fd2b'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'dbc839c6-7b56-45b0-ab36-a0e77b0d538c'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('5aa5f596-a9bb-4f37-af0b-6e0cfbfbc711'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'c77e434a-1bf9-44c6-92aa-d377d72d1d44'::uuid,'MARINES',NULL,true,now(),now()), + ('c7bc79d4-525e-496d-93bd-2ea76b32baf4'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'89533190-e613-4c36-99df-7ee3871bb071'::uuid,'MARINES',NULL,true,now(),now()), + ('5bc99ccb-7010-4d2f-99a0-9277eda982ba'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'c86cb50a-99f6-41ed-8e9d-f096bd5cadca'::uuid,'MARINES',NULL,true,now(),now()), + ('dc97dd55-213b-4212-8c1a-aaee7b92fc55'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'b65bd7c4-6251-4682-aa07-77f761c363af'::uuid,'MARINES',NULL,true,now(),now()), + ('3a4daddc-a377-440f-bb5f-d33024374e3e'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'88df8618-798a-4a12-9b14-a7267a6cfd7f'::uuid,'MARINES',NULL,true,now(),now()), + ('e729c30a-0bec-424a-919a-45cbe31998e9'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'15894c4f-eb1a-4b6b-8b3f-e3abc4eeee8d'::uuid,'MARINES',NULL,true,now(),now()), + ('74b6df4f-08ea-48fb-9628-15c3f47f3a27'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'83fd3eb7-6269-46e2-84e1-f6180f40b9e8'::uuid,'MARINES',NULL,true,now(),now()), + ('643112a7-71a9-41d1-97f6-92aee969478a'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'b0f95e07-e3d1-4403-a402-50be9a542cf9'::uuid,'MARINES',NULL,true,now(),now()), + ('73b35029-077b-4d30-8f5a-34c3785f6e96'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'cef18ff2-8f48-47c0-8062-a40f9dec641c'::uuid,'MARINES',NULL,true,now(),now()), + ('9d8862ec-4358-497a-8154-65a83c676261'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'15eefe71-55ae-40b0-8bb5-f1952fcf45c8'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('8d5591d4-fcc4-44a9-babd-b575672ad6a9'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'d3c5d0a7-0477-44f6-8279-f6b9fa7b3436'::uuid,'MARINES',NULL,true,now(),now()), + ('c1057fc7-1c8b-44e2-a175-131ff0d7429f'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'8b89e7d7-cb36-40bd-ba14-699f1e4b1806'::uuid,'MARINES',NULL,true,now(),now()), + ('ae7949e2-9504-4874-92be-98460e8126da'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'5b833661-8fda-4f2a-9f2b-e1f4c21749a4'::uuid,'MARINES',NULL,true,now(),now()), + ('acf2cacd-0d4f-4de1-afdc-2eb1e72eeb80'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'38bed277-7990-460d-ad27-a69559638f42'::uuid,'MARINES',NULL,true,now(),now()), + ('c66c3d59-def9-4e08-8bee-5b2bacfc5cfd'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'67081e66-7e84-4bac-9c31-aa3e45bbba23'::uuid,'MARINES',NULL,true,now(),now()), + ('1f8cd63a-8dfe-4357-9ac5-2bef71f9d564'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'99e3f894-595f-403a-83f5-f7e035dd1f20'::uuid,'MARINES',NULL,true,now(),now()), + ('3e8030da-8316-4330-abea-35452e39fa61'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'1c0a5988-492f-4bc2-8409-9a143a494248'::uuid,'MARINES',NULL,true,now(),now()), + ('ce3c740a-b0a2-4a55-9abe-c2426fb8d821'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'63e10b54-5348-4362-932e-6613a8db4d42'::uuid,'MARINES',NULL,true,now(),now()), + ('9e913f22-287f-4e42-9544-46d9c6741db7'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'437e9930-0625-4448-938d-ba93a0a98ab5'::uuid,'MARINES',NULL,true,now(),now()), + ('d0ae21fe-07c0-40ee-9aa3-877d6d6a6bb9'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'87d3cb47-1026-4f42-bff6-899ff0fa7660'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('6f8d7c90-7682-41b7-b5cc-9d4aeb2e22ef'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'0115586e-be8c-4808-b65a-d417fad19238'::uuid,'MARINES',NULL,true,now(),now()), + ('cf7f39c0-8f6b-4598-85db-f465241e66f4'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'6638a77d-4b91-48f6-8241-c87fbdddacd1'::uuid,'MARINES',NULL,true,now(),now()), + ('296a8951-19b1-4868-9937-aef61bb73106'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'97c16bc3-e174-410b-9a09-a0db31420dbc'::uuid,'MARINES',NULL,true,now(),now()), + ('cdcec10e-5300-443f-9aae-7d8ce07142b0'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'3c6c5e35-1281-45fc-83ee-e6d656e155b6'::uuid,'MARINES',NULL,true,now(),now()), + ('e638701f-f8fc-48c0-b2e0-db134b9ece1f'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'6af248be-e5a8-49e9-a9e2-516748279ab5'::uuid,'MARINES',NULL,true,now(),now()), + ('ed4f4905-b1cf-4e57-beac-bc0a2d167c71'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'3580abe3-84da-4b46-af7b-d4379e6cff46'::uuid,'MARINES',NULL,true,now(),now()), + ('2a8b16c9-99f8-43ca-a759-c4884f8f7b24'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'f3bb397e-04e6-4b37-9bf3-b3ebab79a9b6'::uuid,'MARINES',NULL,true,now(),now()), + ('70530105-a4ab-4af3-ba02-9e4cf81237fa'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'f9bfe297-4ee0-4f76-a4bd-64b3a514af5d'::uuid,'MARINES',NULL,true,now(),now()), + ('61e17c04-ed7b-4da9-816a-1b6343086d94'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'70f11a71-667b-422d-ae37-8f25539f7782'::uuid,'MARINES',NULL,true,now(),now()), + ('19d5158f-96a6-48ef-8dd9-b831c582c9c4'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'baf66a9a-3c8a-49e7-83ea-841b9960e184'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('91043072-657f-4b2a-b5d1-42d8f6a7ba38'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'e96d46b1-3ab7-4b29-b798-ec3b728dd6a1'::uuid,'MARINES',NULL,true,now(),now()), + ('a3dc835e-3989-4476-b560-006745a884bc'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'e4171b5b-d26c-43b3-b41c-68b43bcbb079'::uuid,'MARINES',NULL,true,now(),now()), + ('0cf1dc14-0c9a-4262-9cab-db73c64f6e36'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'a0651bec-1258-4e36-9c76-155247e42c0a'::uuid,'MARINES',NULL,true,now(),now()), + ('e03b53cb-386f-4e1e-ac93-cd1a9260c6b4'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'737a8e63-af19-4902-a4b5-8f80e2268e4b'::uuid,'MARINES',NULL,true,now(),now()), + ('8b3f1142-f6d4-4c2d-9e75-9ab3568742f7'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'870df26e-2c50-4512-aa2e-61094cfbc3e1'::uuid,'MARINES',NULL,true,now(),now()), + ('5f5383b8-f29e-4b9f-8798-99575440c888'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'09dc6547-d346-40c3-93fb-fb7be1fa1b3e'::uuid,'MARINES',NULL,true,now(),now()), + ('1f7a198c-5f62-4f8c-bf91-19d7cdef9bae'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'43d7d081-bb32-4544-84f1-419fe0cb76e1'::uuid,'MARINES',NULL,true,now(),now()), + ('56c17bab-a124-4710-a047-0d67d30a9610'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'d7e57942-9c83-4138-baa0-70e8b5f08598'::uuid,'MARINES',NULL,true,now(),now()), + ('aad1440d-acaf-4ba8-9564-da97ab9ba651'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'c2f06691-5989-41a3-a848-19c9f0fec5df'::uuid,'MARINES',NULL,true,now(),now()), + ('6cc24224-2298-4023-888f-5e624e585171'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'5263a9ed-ff4d-42cc-91d5-dbdefeef54d1'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('88cd8184-7e3a-48cf-bb72-a9e1c3666cc4'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'54ab3a49-6d78-4922-bac1-94a722b9859a'::uuid,'MARINES',NULL,true,now(),now()), + ('11fdac1c-7ae9-49ea-bee4-90d4582f7c6d'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'3b6fe2e9-9116-4a70-8eef-96205205b0e3'::uuid,'MARINES',NULL,true,now(),now()), + ('83c88ffb-5182-42b3-93f4-635556d8caaf'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'ba0017c8-5d48-4efe-8802-361d2f2bc16d'::uuid,'MARINES',NULL,true,now(),now()), + ('802f7a5f-8ce3-4c40-975a-83cf0ec502fc'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'af65234a-8577-4f6d-a346-7d486e963287'::uuid,'MARINES',NULL,true,now(),now()), + ('5197eed4-f6ae-4f70-b640-b67714b73f87'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'25f62695-ba9b-40c3-a7e4-0c078731123d'::uuid,'MARINES',NULL,true,now(),now()), + ('50d675ab-4064-4edb-8f1d-5739b0318ed9'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'b0422b13-4afe-443e-901f-fe652cde23a4'::uuid,'MARINES',NULL,true,now(),now()), + ('a3733567-2b57-4f12-9390-967e04bc1453'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'ecbc1d89-9cf6-4f52-b453-3ba473a0ff4e'::uuid,'MARINES',NULL,true,now(),now()), + ('6a321494-cdd8-4372-90a1-6a6c67f4e220'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'4e85cb86-e9dd-4c7c-9677-e0a327ac895c'::uuid,'MARINES',NULL,true,now(),now()), + ('99d37d3c-be31-4d3e-9c5e-c9d816a46014'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'7f9dd10d-100e-4252-9786-706349f456ca'::uuid,'MARINES',NULL,true,now(),now()), + ('e9b4c884-ad7f-4c1a-8815-05353834f5c3'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'5451f8d7-60c5-4e22-bbf6-d9af8e6ace54'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('cfaa046e-6be5-4178-a451-d368317ecb86'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'9e9cba85-7c39-4836-809d-70b54baf392e'::uuid,'MARINES',NULL,true,now(),now()), + ('9b509efb-12d9-42aa-a85a-ffb026866b56'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'f7470914-cf48-43be-b431-a3ca2fe5b290'::uuid,'MARINES',NULL,true,now(),now()), + ('7e54d995-b7bd-457c-bd97-0fd76891402e'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'5a0d3cc1-b866-4bde-b67f-78d565facf3e'::uuid,'MARINES',NULL,true,now(),now()), + ('1357aadd-b420-42c4-8a39-bab8027fa910'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'e629b95a-ec5b-4fc4-897f-e0d1050e1ec6'::uuid,'MARINES',NULL,true,now(),now()), + ('56fbbf0f-e819-41dd-802d-4e677aecd1c9'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'d68a626f-935a-4eb1-ba9b-6829feeff91c'::uuid,'MARINES',NULL,true,now(),now()), + ('bfc2dc53-896f-4f29-92c7-9a7a392b22f2'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'ed496f6e-fd34-48d1-8586-63a1d305c49c'::uuid,'MARINES',NULL,true,now(),now()), + ('d015e8b1-86ea-489f-979d-458ae35ae8d6'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'153b62b2-b1b8-4b9d-afa5-53df4150aba4'::uuid,'MARINES',NULL,true,now(),now()), + ('1f32e712-8b5e-4ae4-b409-c5c92337aed8'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'0020441b-bc0c-436e-be05-b997ca6a853c'::uuid,'MARINES',NULL,true,now(),now()), + ('a8a85e00-e657-41a2-8f32-84bdd9c92ec8'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'a8ae9bb9-e9ac-49b4-81dc-336b8a0dcb54'::uuid,'MARINES',NULL,true,now(),now()), + ('4ad1a57f-0e9e-4405-9a08-0ffa211fc8ce'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'1aa43046-8d6b-4249-88dc-b259d86c0cb8'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('dd765820-ffa5-4673-a347-fbe3464cd2d8'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'84b50723-95fc-41d1-8115-a734c7e53f66'::uuid,'MARINES',NULL,true,now(),now()), + ('6eff7586-59bd-4638-809b-5cc346646dc9'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'63dc3f78-235e-4b1c-b1db-459d7f5ae25f'::uuid,'MARINES',NULL,true,now(),now()), + ('428b0d7a-3848-4882-a5cc-80d5ae3500d6'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'4bd4c579-c163-4b1b-925a-d852d5a12642'::uuid,'MARINES',NULL,true,now(),now()), + ('9f8311f3-e191-4383-8fb8-2b58cd545dd4'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'ce7f1fc9-5b94-43cb-b398-b31cb6350d6a'::uuid,'MARINES',NULL,true,now(),now()), + ('81e3e6fe-7db3-49ff-b18c-8b078e3d129e'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'4a6a3260-e1ec-4d78-8c07-d89f1405ca16'::uuid,'MARINES',NULL,true,now(),now()), + ('4cf1c40f-60f0-4a47-a351-471720ba0fd3'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'658274b5-720c-4a70-ba9d-249614d85ebc'::uuid,'MARINES',NULL,true,now(),now()), + ('0754978b-d11e-4f2c-b59c-3252d2735b26'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'41f0736c-6d26-4e93-9668-860e9f0e222a'::uuid,'MARINES',NULL,true,now(),now()), + ('c9b8305d-2e16-46a7-9b7c-b3edeb6f8e93'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'c2a8e8c3-dddc-4c0f-a23a-0b4e2c20af0d'::uuid,'MARINES',NULL,true,now(),now()), + ('a8768e6d-1a6d-449a-9f2e-2e198dcd6e00'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'0f1e1c87-0497-4ee2-970d-21ac2d2155db'::uuid,'MARINES',NULL,true,now(),now()), + ('cf292129-d543-4632-9cb3-b074279e42be'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'e40b411d-55f0-4470-83d0-0bbe11fa77dd'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('3f07cedf-ad90-465e-95a5-ce44a2f088b8'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'2632b4e5-c6cb-4e64-8924-0b7e4b1115ec'::uuid,'MARINES',NULL,true,now(),now()), + ('42a2d93b-9dea-4c63-b0a7-c39364aacf75'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'1336deb9-5c87-409d-8051-4ab9f211eb29'::uuid,'MARINES',NULL,true,now(),now()), + ('64fe0d14-98f7-4f73-9aa3-a19617b2d8c3'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'7a6d3b5b-81a6-4db5-b2ab-ecbfd6bd7941'::uuid,'MARINES',NULL,true,now(),now()), + ('3ab04740-9f13-47f8-a80e-b63ab5b67590'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'91b69254-5976-4839-a31d-972e9958d9cf'::uuid,'MARINES',NULL,true,now(),now()), + ('3be8e483-6bce-4a7d-a3bd-fc1485e79818'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'166f3629-79b9-451a-90a3-c43680929a2f'::uuid,'MARINES',NULL,true,now(),now()), + ('ddf69dcb-345e-47c1-a585-ce24d0854de5'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'4fe05eb4-1b1c-4d4a-a185-0b039ac64835'::uuid,'MARINES',NULL,true,now(),now()), + ('fe9e365f-98a5-4658-a58d-5f8279ff3e5a'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'ca8aecda-4642-45c7-96ed-309c35c4b78f'::uuid,'MARINES',NULL,true,now(),now()), + ('2051a441-f4d0-4b6e-8614-74761de505e6'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'e4bc9404-5466-4a41-993e-09474266afc3'::uuid,'MARINES',NULL,true,now(),now()), + ('6797daed-f002-431c-829b-dab7c1b16ff2'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'d4a51d90-3945-4ad3-9cba-a18d8d7b34d7'::uuid,'MARINES',NULL,true,now(),now()), + ('2398bf11-1986-4914-8e47-6afac423283a'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'a5a60d63-d9a8-4bde-9081-f011784b2d31'::uuid,'MARINES',NULL,true,now(),now()); +INSERT INTO gbloc_aors (id,jppso_regions_id,oconus_rate_area_id,department_indicator,shipment_type,is_active,created_at,updated_at) VALUES + ('f3a6c247-4c4c-4f45-9162-50307d4711f5'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'93842d74-1f3e-46cd-aca9-9f0dafbd20a1'::uuid,'MARINES',NULL,true,now(),now()), + ('0a82b196-7c24-4214-9155-05f0c5c2d7e9'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'1bc0dbda-f0ce-4b76-a551-78dbaaa9e3ec'::uuid,'MARINES',NULL,true,now(),now()), + ('af0a2db3-2e2e-4a78-804b-9a8b89b96e12'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'f1a7ef90-cfa6-4e0c-92c3-f8d70c07ba4d'::uuid,'MARINES',NULL,true,now(),now()), + ('5205a965-d424-469a-9526-17ef551685e6'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'9c5b4c4d-e05c-42ca-bd77-b61f5d8c7afc'::uuid,'MARINES',NULL,true,now(),now()), + ('f263fdb0-933b-42a7-925e-a9852c5804fa'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'27ec2576-78dd-4605-b1a8-0b9ca207fc26'::uuid,'MARINES',NULL,true,now(),now()), + ('b03c7ae3-4d6d-445c-b94a-73af723e5226'::uuid,'85b324ae-1a0d-4f7d-971f-ea509dcc73d7'::uuid,'12396ebc-59e9-430a-8475-759a38af6b7a'::uuid,'MARINES',NULL,true,now(),now()); + + +drop view move_to_gbloc; +CREATE OR REPLACE VIEW move_to_gbloc AS +SELECT move_id, gbloc FROM ( + SELECT DISTINCT ON (sh.move_id) sh.move_id, s.affiliation, + COALESCE(pctg.gbloc, coalesce(pctg_oconus_bos.gbloc, coalesce(pctg_oconus.gbloc, pctg_ppm.gbloc))) AS gbloc + FROM mto_shipments sh + JOIN moves m ON sh.move_id = m.id + JOIN orders o on m.orders_id = o.id + JOIN service_members s on o.service_member_id = s.id + LEFT JOIN ( SELECT a.id AS address_id, + pctg_1.gbloc, pctg_1.postal_code + FROM addresses a + JOIN postal_code_to_gblocs pctg_1 ON a.postal_code::text = pctg_1.postal_code::text) pctg ON pctg.address_id = sh.pickup_address_id + LEFT JOIN ( SELECT ppm.shipment_id, + pctg_1.gbloc + FROM ppm_shipments ppm + JOIN addresses ppm_address ON ppm.pickup_postal_address_id = ppm_address.id + JOIN postal_code_to_gblocs pctg_1 ON ppm_address.postal_code::text = pctg_1.postal_code::text) pctg_ppm ON pctg_ppm.shipment_id = sh.id + LEFT JOIN ( SELECT a.id AS address_id, + cast(jr.code as varchar) AS gbloc, ga.department_indicator + FROM addresses a + JOIN re_oconus_rate_areas ora ON a.us_post_region_cities_id = ora.us_post_region_cities_id + JOIN gbloc_aors ga ON ora.id = ga.oconus_rate_area_id + JOIN jppso_regions jr ON ga.jppso_regions_id = jr.id + ) pctg_oconus_bos ON pctg_oconus_bos.address_id = sh.pickup_address_id + and case when s.affiliation = 'AIR_FORCE' THEN 'AIR_AND_SPACE_FORCE' + when s.affiliation = 'SPACE_FORCE' THEN 'AIR_AND_SPACE_FORCE' + else s.affiliation + end = pctg_oconus_bos.department_indicator + LEFT JOIN ( SELECT a.id AS address_id, + cast(pctg_1.code as varchar) AS gbloc, ga.department_indicator + FROM addresses a + JOIN re_oconus_rate_areas ora ON a.us_post_region_cities_id = ora.us_post_region_cities_id + JOIN gbloc_aors ga ON ora.id = ga.oconus_rate_area_id + JOIN jppso_regions pctg_1 ON ga.jppso_regions_id = pctg_1.id + ) pctg_oconus ON pctg_oconus.address_id = sh.pickup_address_id and pctg_oconus.department_indicator is null + WHERE sh.deleted_at IS NULL + ORDER BY sh.move_id, sh.created_at) as m; + + CREATE OR REPLACE VIEW move_to_dest_gbloc AS SELECT distinct move_id, gbloc FROM ( @@ -25,8 +232,6 @@ SELECT distinct move_id, gbloc FROM ( ) pctg_oconus_bos ON pctg_oconus_bos.address_id = sh.destination_address_id and case when s.affiliation = 'AIR_FORCE' THEN 'AIR_AND_SPACE_FORCE' when s.affiliation = 'SPACE_FORCE' THEN 'AIR_AND_SPACE_FORCE' - when s.affiliation = 'NAVY' THEN 'NAVY_AND_MARINES' - when s.affiliation = 'MARINES' THEN 'NAVY_AND_MARINES' else s.affiliation end = pctg_oconus_bos.department_indicator LEFT JOIN ( SELECT a.id AS address_id, @@ -112,18 +317,24 @@ BEGIN ) )::JSONB AS orders, COALESCE( - json_agg( - json_build_object( - ''id'', mto_shipments.id, - ''shipment_type'', mto_shipments.shipment_type, - ''status'', mto_shipments.status, - ''requested_pickup_date'', TO_CHAR(mto_shipments.requested_pickup_date, ''YYYY-MM-DD"T00:00:00Z"''), - ''scheduled_pickup_date'', TO_CHAR(mto_shipments.scheduled_pickup_date, ''YYYY-MM-DD"T00:00:00Z"''), - ''requested_delivery_date'', TO_CHAR(mto_shipments.requested_delivery_date, ''YYYY-MM-DD"T00:00:00Z"''), - ''approved_date'', TO_CHAR(mto_shipments.approved_date, ''YYYY-MM-DD"T00:00:00Z"''), - ''prime_estimated_weight'', mto_shipments.prime_estimated_weight + ( + SELECT json_agg( + json_build_object( + ''id'', ms.id, + ''shipment_type'', ms.shipment_type, + ''status'', ms.status, + ''requested_pickup_date'', TO_CHAR(ms.requested_pickup_date, ''YYYY-MM-DD"T00:00:00Z"''), + ''scheduled_pickup_date'', TO_CHAR(ms.scheduled_pickup_date, ''YYYY-MM-DD"T00:00:00Z"''), + ''approved_date'', TO_CHAR(ms.approved_date, ''YYYY-MM-DD"T00:00:00Z"''), + ''prime_estimated_weight'', ms.prime_estimated_weight + ) ) - ) FILTER (WHERE mto_shipments.id IS NOT NULL), + FROM ( + SELECT DISTINCT ON (mto_shipments.id) mto_shipments.* + FROM mto_shipments + WHERE mto_shipments.move_id = moves.id + ) AS ms + ), ''[]'' )::JSONB AS mto_shipments, json_build_object( @@ -152,19 +363,8 @@ BEGIN WHERE moves.show = TRUE '; - -- add destination queue-specific filters (pending dest address requests, dest SIT & shuttle service items) - sql_query := sql_query || ' - AND ( - shipment_address_updates.status = ''REQUESTED'' - OR ( - mto_service_items.status = ''SUBMITTED'' - AND re_services.code IN (''DDFSIT'', ''DDASIT'', ''DDDSIT'', ''DDSHUT'', ''DDSFSC'', ''IDFSIT'', ''IDASIT'', ''IDDSIT'', ''IDSHUT'') - ) - ) - '; - IF user_gbloc IS NOT NULL THEN - sql_query := sql_query || ' AND move_to_gbloc.gbloc = $1 '; + sql_query := sql_query || ' AND move_to_dest_gbloc.gbloc = $1 '; END IF; IF customer_name IS NOT NULL THEN @@ -218,6 +418,17 @@ BEGIN sql_query := sql_query || ' AND (too_user.first_name || '' '' || too_user.last_name) ILIKE ''%'' || $12 || ''%'' '; END IF; + -- add destination queue-specific filters (pending dest address requests, dest SIT & shuttle service items) + sql_query := sql_query || ' + AND ( + shipment_address_updates.status = ''REQUESTED'' + OR ( + mto_service_items.status = ''SUBMITTED'' + AND re_services.code IN (''DDFSIT'', ''DDASIT'', ''DDDSIT'', ''DDSHUT'', ''DDSFSC'', ''IDFSIT'', ''IDASIT'', ''IDDSIT'', ''IDSHUT'') + ) + ) + '; + sql_query := sql_query || ' GROUP BY moves.id, diff --git a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx index 5ba55412a60..53dfe475033 100644 --- a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx +++ b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx @@ -610,7 +610,7 @@ const ServicesCounselingQueue = ({ return ; }; - if (queueType === 'Search') { + if (queueType === 'search') { return (
{renderNavBar()} From 8e9074ff0a52126a0002b584b992e38e29804cc4 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Tue, 4 Feb 2025 22:19:22 +0000 Subject: [PATCH 228/260] dear gawd I think I have it working - need tests --- ...nation_queue_db_func_and_gbloc_view.up.sql | 48 +++++++++++++++++-- pkg/services/order/order_fetcher.go | 8 ++-- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql index bd09ad533c4..8aabdaeddf0 100644 --- a/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql +++ b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql @@ -205,11 +205,12 @@ SELECT move_id, gbloc FROM ( ORDER BY sh.move_id, sh.created_at) as m; +-- used for the destination queue CREATE OR REPLACE VIEW move_to_dest_gbloc AS SELECT distinct move_id, gbloc FROM ( SELECT sh.move_id, s.affiliation, - COALESCE(pctg.gbloc, coalesce(pctg_oconus_bos.gbloc, coalesce(pctg_oconus.gbloc, pctg_ppm.gbloc))) AS gbloc + COALESCE(case when s.affiliation = 'MARINES' then 'USMC' else pctg.gbloc end, coalesce(pctg_oconus_bos.gbloc, coalesce(pctg_oconus.gbloc, pctg_ppm.gbloc))) AS gbloc FROM mto_shipments sh JOIN moves m ON sh.move_id = m.id JOIN orders o on m.orders_id = o.id @@ -244,7 +245,7 @@ SELECT distinct move_id, gbloc FROM ( WHERE sh.deleted_at IS NULL) as m; -- database function that returns a list of moves that have destination requests --- this includes shipment address update requests & destination service items +-- this includes shipment address update requests, destination SIT, & destination shuttle CREATE OR REPLACE FUNCTION get_destination_queue( user_gbloc TEXT DEFAULT NULL, customer_name TEXT DEFAULT NULL, @@ -259,7 +260,9 @@ CREATE OR REPLACE FUNCTION get_destination_queue( counseling_office TEXT DEFAULT NULL, too_assigned_user TEXT DEFAULT NULL, page INTEGER DEFAULT 1, - per_page INTEGER DEFAULT 20 + per_page INTEGER DEFAULT 20, + sort TEXT DEFAULT NULL, + sort_direction TEXT DEFAULT NULL ) RETURNS TABLE ( id UUID, @@ -279,6 +282,8 @@ RETURNS TABLE ( DECLARE sql_query TEXT; offset_value INTEGER; + sort_column TEXT; + sort_order TEXT; BEGIN IF page < 1 THEN page := 1; @@ -418,7 +423,7 @@ BEGIN sql_query := sql_query || ' AND (too_user.first_name || '' '' || too_user.last_name) ILIKE ''%'' || $12 || ''%'' '; END IF; - -- add destination queue-specific filters (pending dest address requests, dest SIT & shuttle service items) + -- add destination queue-specific filters (pending dest address requests, dest SIT & dest shuttle service items) sql_query := sql_query || ' AND ( shipment_address_updates.status = ''REQUESTED'' @@ -429,6 +434,36 @@ BEGIN ) '; + -- default sorting values if none are provided (move.id) + sort_column := 'id'; + sort_order := 'ASC'; + + IF sort IS NOT NULL THEN + CASE sort + WHEN 'locator' THEN sort_column := 'moves.locator'; + WHEN 'status' THEN sort_column := 'moves.status'; + WHEN 'customerName' THEN sort_column := 'service_members.last_name'; + WHEN 'edipi' THEN sort_column := 'service_members.edipi'; + WHEN 'emplid' THEN sort_column := 'service_members.emplid'; + WHEN 'requestedMoveDate' THEN sort_column := 'COALESCE(mto_shipments.requested_pickup_date, ppm_shipments.expected_departure_date, mto_shipments.requested_delivery_date)'; + WHEN 'appearedInTooAt' THEN sort_column := 'COALESCE(moves.submitted_at, moves.approvals_requested_at)'; + WHEN 'branch' THEN sort_column := 'service_members.affiliation'; + WHEN 'originDutyLocation' THEN sort_column := 'origin_duty_locations.name'; + WHEN 'counselingOffice' THEN sort_column := 'counseling_offices.name'; + WHEN 'assignedTo' THEN sort_column := 'too_user.last_name'; + ELSE + sort_column := 'moves.id'; + END CASE; + END IF; + + IF sort_direction IS NOT NULL THEN + IF LOWER(sort_direction) = 'desc' THEN + sort_order := 'DESC'; + ELSE + sort_order := 'ASC'; + END IF; + END IF; + sql_query := sql_query || ' GROUP BY moves.id, @@ -439,6 +474,9 @@ BEGIN moves.locked_by, moves.too_assigned_id, moves.counseling_transportation_office_id, + mto_shipments.requested_pickup_date, + mto_shipments.requested_delivery_date, + ppm_shipments.expected_departure_date, orders.id, service_members.id, service_members.first_name, @@ -450,7 +488,7 @@ BEGIN counseling_offices.name, too_user.first_name, too_user.last_name'; - sql_query := sql_query || ' ORDER BY moves.id ASC '; + sql_query := sql_query || format(' ORDER BY %s %s ', sort_column, sort_order); sql_query := sql_query || ' LIMIT $13 OFFSET $14 '; RETURN QUERY EXECUTE sql_query diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index 53478c9860d..b0e59912f39 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -348,7 +348,7 @@ func (f orderFetcher) ListDestinationRequestsOrders(appCtx appcontext.AppContext } // calling the database function with all passed in parameters - err := appCtx.DB().RawQuery("SELECT * FROM get_destination_queue($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)", + err := appCtx.DB().RawQuery("SELECT * FROM get_destination_queue($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16)", officeUserGbloc, params.CustomerName, params.Edipi, @@ -356,13 +356,15 @@ func (f orderFetcher) ListDestinationRequestsOrders(appCtx appcontext.AppContext pq.Array(params.Status), params.Locator, params.RequestedMoveDate, - params.SubmittedAt, + params.AppearedInTOOAt, params.Branch, strings.Join(params.OriginDutyLocation, " "), params.CounselingOffice, params.TOOAssignedUser, params.Page, - params.PerPage). + params.PerPage, + params.Sort, + params.Order). All(&movesWithCount) if err != nil { From 176c010c8ba14c9576921e0350cc48e99e9ffbec Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Tue, 4 Feb 2025 22:48:25 +0000 Subject: [PATCH 229/260] cleanup before adding tests --- pkg/gen/ghcapi/embedded_spec.go | 32 ++--------- .../queues/get_destination_requests_queue.go | 4 +- ...t_destination_requests_queue_parameters.go | 55 ------------------- ...t_destination_requests_queue_urlbuilder.go | 18 ------ pkg/handlers/ghcapi/queues.go | 18 ++---- pkg/services/order/order_fetcher.go | 22 +++----- src/pages/Office/MoveQueue/MoveQueue.test.jsx | 3 +- .../ServicesCounselingQueue.jsx | 2 +- swagger-def/ghc.yaml | 13 +---- swagger/ghc.yaml | 22 ++------ 10 files changed, 32 insertions(+), 157 deletions(-) diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go index 3ccbc457cf5..0c1b2a5ea9d 100644 --- a/pkg/gen/ghcapi/embedded_spec.go +++ b/pkg/gen/ghcapi/embedded_spec.go @@ -4684,14 +4684,14 @@ func init() { }, "/queues/destination-requests": { "get": { - "description": "A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items (including shuttle) and destination address requests that are not approved.\n", + "description": "A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items, destination shuttle service items and destination address requests that are not yet approved by the TOO.\n", "produces": [ "application/json" ], "tags": [ "queues" ], - "summary": "Gets queued list of all customer moves by GBLOC that have destination requests (destination SIT, shuttle, address requests)", + "summary": "Gets queued list of all customer moves by GBLOC that have both CONUS \u0026 OCONUS destination requests (destination SIT, destination shuttle, address requests)", "operationId": "getDestinationRequestsQueue", "parameters": [ { @@ -4803,18 +4803,6 @@ func init() { "name": "status", "in": "query" }, - { - "type": "string", - "description": "order type", - "name": "orderType", - "in": "query" - }, - { - "type": "string", - "description": "Used to return a queue for a GBLOC other than the default of the current user. Requires the HQ role. The parameter is ignored if the requesting user does not have the necessary role.\n", - "name": "viewAsGBLOC", - "in": "query" - }, { "type": "string", "description": "Used to illustrate which user is assigned to this move.\n", @@ -21735,14 +21723,14 @@ func init() { }, "/queues/destination-requests": { "get": { - "description": "A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items (including shuttle) and destination address requests that are not approved.\n", + "description": "A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items, destination shuttle service items and destination address requests that are not yet approved by the TOO.\n", "produces": [ "application/json" ], "tags": [ "queues" ], - "summary": "Gets queued list of all customer moves by GBLOC that have destination requests (destination SIT, shuttle, address requests)", + "summary": "Gets queued list of all customer moves by GBLOC that have both CONUS \u0026 OCONUS destination requests (destination SIT, destination shuttle, address requests)", "operationId": "getDestinationRequestsQueue", "parameters": [ { @@ -21854,18 +21842,6 @@ func init() { "name": "status", "in": "query" }, - { - "type": "string", - "description": "order type", - "name": "orderType", - "in": "query" - }, - { - "type": "string", - "description": "Used to return a queue for a GBLOC other than the default of the current user. Requires the HQ role. The parameter is ignored if the requesting user does not have the necessary role.\n", - "name": "viewAsGBLOC", - "in": "query" - }, { "type": "string", "description": "Used to illustrate which user is assigned to this move.\n", diff --git a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue.go b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue.go index f4fdf4135d3..0bc440cf200 100644 --- a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue.go +++ b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue.go @@ -32,9 +32,9 @@ func NewGetDestinationRequestsQueue(ctx *middleware.Context, handler GetDestinat /* GetDestinationRequestsQueue swagger:route GET /queues/destination-requests queues getDestinationRequestsQueue -Gets queued list of all customer moves by GBLOC that have destination requests (destination SIT, shuttle, address requests) +Gets queued list of all customer moves by GBLOC that have both CONUS & OCONUS destination requests (destination SIT, destination shuttle, address requests) -A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items (including shuttle) and destination address requests that are not approved. +A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items, destination shuttle service items and destination address requests that are not yet approved by the TOO. */ type GetDestinationRequestsQueue struct { Context *middleware.Context diff --git a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go index 86930ef5fab..dac60111a5d 100644 --- a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go +++ b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_parameters.go @@ -75,10 +75,6 @@ type GetDestinationRequestsQueueParams struct { In: query */ Order *string - /*order type - In: query - */ - OrderType *string /* Unique: true In: query @@ -106,11 +102,6 @@ type GetDestinationRequestsQueueParams struct { In: query */ Status []string - /*Used to return a queue for a GBLOC other than the default of the current user. Requires the HQ role. The parameter is ignored if the requesting user does not have the necessary role. - - In: query - */ - ViewAsGBLOC *string } // BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface @@ -174,11 +165,6 @@ func (o *GetDestinationRequestsQueueParams) BindRequest(r *http.Request, route * res = append(res, err) } - qOrderType, qhkOrderType, _ := qs.GetOK("orderType") - if err := o.bindOrderType(qOrderType, qhkOrderType, route.Formats); err != nil { - res = append(res, err) - } - qOriginDutyLocation, qhkOriginDutyLocation, _ := qs.GetOK("originDutyLocation") if err := o.bindOriginDutyLocation(qOriginDutyLocation, qhkOriginDutyLocation, route.Formats); err != nil { res = append(res, err) @@ -208,11 +194,6 @@ func (o *GetDestinationRequestsQueueParams) BindRequest(r *http.Request, route * if err := o.bindStatus(qStatus, qhkStatus, route.Formats); err != nil { res = append(res, err) } - - qViewAsGBLOC, qhkViewAsGBLOC, _ := qs.GetOK("viewAsGBLOC") - if err := o.bindViewAsGBLOC(qViewAsGBLOC, qhkViewAsGBLOC, route.Formats); err != nil { - res = append(res, err) - } if len(res) > 0 { return errors.CompositeValidationError(res...) } @@ -432,24 +413,6 @@ func (o *GetDestinationRequestsQueueParams) validateOrder(formats strfmt.Registr return nil } -// bindOrderType binds and validates parameter OrderType from query. -func (o *GetDestinationRequestsQueueParams) bindOrderType(rawData []string, hasKey bool, formats strfmt.Registry) error { - var raw string - if len(rawData) > 0 { - raw = rawData[len(rawData)-1] - } - - // Required: false - // AllowEmptyValue: false - - if raw == "" { // empty values pass all other validations - return nil - } - o.OrderType = &raw - - return nil -} - // bindOriginDutyLocation binds and validates array parameter OriginDutyLocation from query. // // Arrays are parsed according to CollectionFormat: "multi" (defaults to "csv" when empty). @@ -624,21 +587,3 @@ func (o *GetDestinationRequestsQueueParams) validateStatus(formats strfmt.Regist } return nil } - -// bindViewAsGBLOC binds and validates parameter ViewAsGBLOC from query. -func (o *GetDestinationRequestsQueueParams) bindViewAsGBLOC(rawData []string, hasKey bool, formats strfmt.Registry) error { - var raw string - if len(rawData) > 0 { - raw = rawData[len(rawData)-1] - } - - // Required: false - // AllowEmptyValue: false - - if raw == "" { // empty values pass all other validations - return nil - } - o.ViewAsGBLOC = &raw - - return nil -} diff --git a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_urlbuilder.go b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_urlbuilder.go index c267cfe2aa8..c8b86e869dc 100644 --- a/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_urlbuilder.go +++ b/pkg/gen/ghcapi/ghcoperations/queues/get_destination_requests_queue_urlbuilder.go @@ -26,14 +26,12 @@ type GetDestinationRequestsQueueURL struct { Emplid *string Locator *string Order *string - OrderType *string OriginDutyLocation []string Page *int64 PerPage *int64 RequestedMoveDate *string Sort *string Status []string - ViewAsGBLOC *string _basePath string // avoid unkeyed usage @@ -149,14 +147,6 @@ func (o *GetDestinationRequestsQueueURL) Build() (*url.URL, error) { qs.Set("order", orderQ) } - var orderTypeQ string - if o.OrderType != nil { - orderTypeQ = *o.OrderType - } - if orderTypeQ != "" { - qs.Set("orderType", orderTypeQ) - } - var originDutyLocationIR []string for _, originDutyLocationI := range o.OriginDutyLocation { originDutyLocationIS := originDutyLocationI @@ -220,14 +210,6 @@ func (o *GetDestinationRequestsQueueURL) Build() (*url.URL, error) { } } - var viewAsGBLOCQ string - if o.ViewAsGBLOC != nil { - viewAsGBLOCQ = *o.ViewAsGBLOC - } - if viewAsGBLOCQ != "" { - qs.Set("viewAsGBLOC", viewAsGBLOCQ) - } - _result.RawQuery = qs.Encode() return &_result, nil diff --git a/pkg/handlers/ghcapi/queues.go b/pkg/handlers/ghcapi/queues.go index 7db44c4df4a..4d708d415b4 100644 --- a/pkg/handlers/ghcapi/queues.go +++ b/pkg/handlers/ghcapi/queues.go @@ -196,9 +196,9 @@ func (h GetDestinationRequestsQueueHandler) Handle(params queues.GetDestinationR return h.AuditableAppContextFromRequestWithErrors(params.HTTPRequest, func(appCtx appcontext.AppContext) (middleware.Responder, error) { if !appCtx.Session().IsOfficeUser() || - (!appCtx.Session().Roles.HasRole(roles.RoleTypeTOO) && !appCtx.Session().Roles.HasRole(roles.RoleTypeHQ)) { + (!appCtx.Session().Roles.HasRole(roles.RoleTypeTOO)) { forbiddenErr := apperror.NewForbiddenError( - "user is not authenticated with TOO or HQ office role", + "user is not authenticated with TOO role", ) appCtx.Logger().Error(forbiddenErr.Error()) return queues.NewGetDestinationRequestsQueueForbidden(), forbiddenErr @@ -219,28 +219,23 @@ func (h GetDestinationRequestsQueueHandler) Handle(params queues.GetDestinationR PerPage: params.PerPage, Sort: params.Sort, Order: params.Order, - OrderType: params.OrderType, TOOAssignedUser: params.AssignedTo, CounselingOffice: params.CounselingOffice, } + // we only care about moves in APPROVALS REQUESTED status if params.Status == nil { ListOrderParams.Status = []string{string(models.MoveStatusAPPROVALSREQUESTED)} } - // Let's set default values for page and perPage if we don't get arguments for them. We'll use 1 for page and 20 for perPage. + // default pagination values if params.Page == nil { ListOrderParams.Page = models.Int64Pointer(1) } - // Same for perPage if params.PerPage == nil { ListOrderParams.PerPage = models.Int64Pointer(20) } - if params.ViewAsGBLOC != nil && appCtx.Session().Roles.HasRole(roles.RoleTypeHQ) { - ListOrderParams.ViewAsGBLOC = params.ViewAsGBLOC - } - moves, count, err := h.OrderFetcher.ListDestinationRequestsOrders( appCtx, appCtx.Session().OfficeUserID, @@ -249,7 +244,7 @@ func (h GetDestinationRequestsQueueHandler) Handle(params queues.GetDestinationR ) if err != nil { appCtx.Logger(). - Error("error fetching list of moves for office user", zap.Error(err)) + Error("error fetching destinaton queue for office user", zap.Error(err)) return queues.NewGetDestinationRequestsQueueInternalServerError(), err } @@ -274,7 +269,7 @@ func (h GetDestinationRequestsQueueHandler) Handle(params queues.GetDestinationR return queues.NewGetDestinationRequestsQueueInternalServerError(), err } - // if the TOO/office user is accessing the queue, we need to unlock move/moves they have locked + // if the TOO is accessing the queue, we need to unlock move/moves they have locked if appCtx.Session().IsOfficeUser() { officeUserID := appCtx.Session().OfficeUserID for i, move := range moves { @@ -288,7 +283,6 @@ func (h GetDestinationRequestsQueueHandler) Handle(params queues.GetDestinationR moves[i] = *unlockedMove } } - // checking if moves that are NOT in their queue are locked by the user (using search, etc) err := h.CheckForLockedMovesAndUnlock(appCtx, officeUserID) if err != nil { appCtx.Logger().Error(fmt.Sprintf("failed to unlock moves for office user ID: %s", officeUserID), zap.Error(err)) diff --git a/pkg/services/order/order_fetcher.go b/pkg/services/order/order_fetcher.go index b0e59912f39..500cdbad41f 100644 --- a/pkg/services/order/order_fetcher.go +++ b/pkg/services/order/order_fetcher.go @@ -310,6 +310,7 @@ func (f orderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uuid return moves, count, nil } +// this is a custom/temporary struct used in the below service object to get destination queue moves type MoveWithCount struct { models.Move OrdersRaw json.RawMessage `json:"orders" db:"orders"` @@ -335,16 +336,10 @@ func (f orderFetcher) ListDestinationRequestsOrders(appCtx appcontext.AppContext var movesWithCount []MoveWithCount // getting the office user's GBLOC - var officeUserGbloc string - if params.ViewAsGBLOC != nil { - officeUserGbloc = *params.ViewAsGBLOC - } else { - var gblocErr error - gblocFetcher := officeuser.NewOfficeUserGblocFetcher() - officeUserGbloc, gblocErr = gblocFetcher.FetchGblocForOfficeUser(appCtx, officeUserID) - if gblocErr != nil { - return []models.Move{}, 0, gblocErr - } + gblocFetcher := officeuser.NewOfficeUserGblocFetcher() + officeUserGbloc, gblocErr := gblocFetcher.FetchGblocForOfficeUser(appCtx, officeUserID) + if gblocErr != nil { + return []models.Move{}, 0, gblocErr } // calling the database function with all passed in parameters @@ -371,7 +366,7 @@ func (f orderFetcher) ListDestinationRequestsOrders(appCtx appcontext.AppContext return []models.Move{}, 0, err } - // each row is sent back with the total count, so we will take the value from the first one + // each row is sent back with the total count from the db func, so we will take the value from the first one var count int64 if len(movesWithCount) > 0 { count = movesWithCount[0].TotalCount @@ -414,11 +409,12 @@ func (f orderFetcher) ListDestinationRequestsOrders(appCtx appcontext.AppContext movesWithCount[i].TOOAssignedUser = &tooAssigned } - // the handler consumes a Move object, so we have to copy our custom struct into the Move struct + // the handler consumes a Move object and NOT the MoveWithCount struct used in this func + // so we have to copy our custom struct into the Move struct for _, moveWithCount := range movesWithCount { var move models.Move if err := copier.Copy(&move, &moveWithCount); err != nil { - return nil, 0, fmt.Errorf("error copying movesWithCount into Moves: %w", err) + return nil, 0, fmt.Errorf("error copying movesWithCount into Moves struct: %w", err) } moves = append(moves, move) } diff --git a/src/pages/Office/MoveQueue/MoveQueue.test.jsx b/src/pages/Office/MoveQueue/MoveQueue.test.jsx index 4e5ec01cd33..87defd030a8 100644 --- a/src/pages/Office/MoveQueue/MoveQueue.test.jsx +++ b/src/pages/Office/MoveQueue/MoveQueue.test.jsx @@ -328,7 +328,7 @@ describe('MoveQueue', () => { wrapper.update(); expect(wrapper.find('[data-testid="multi-value-container"]').text()).toEqual('New move'); }); - it('renders Search and Move Queue tabs', () => { + it('renders Search, Destination Queue and Move Queue tabs', () => { reactRouterDom.useParams.mockReturnValue({ queueType: generalRoutes.QUEUE_SEARCH_PATH }); render( @@ -338,6 +338,7 @@ describe('MoveQueue', () => { expect(screen.getByTestId('closeout-tab-link')).toBeInTheDocument(); expect(screen.getByTestId('search-tab-link')).toBeInTheDocument(); expect(screen.getByText('Task Order Queue', { selector: 'span' })).toBeInTheDocument(); + expect(screen.getByText('Destination Requests Queue', { selector: 'span' })).toBeInTheDocument(); expect(screen.getByText('Search', { selector: 'span' })).toBeInTheDocument(); }); it('renders TableQueue when Search tab is selected', () => { diff --git a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx index 53dfe475033..5cb23df55aa 100644 --- a/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx +++ b/src/pages/Office/ServicesCounselingQueue/ServicesCounselingQueue.jsx @@ -610,7 +610,7 @@ const ServicesCounselingQueue = ({ return ; }; - if (queueType === 'search') { + if (queueType === generalRoutes.QUEUE_SEARCH_PATH) { return (
{renderNavBar()} diff --git a/swagger-def/ghc.yaml b/swagger-def/ghc.yaml index bf20d749e57..bb0a0d9a987 100644 --- a/swagger-def/ghc.yaml +++ b/swagger-def/ghc.yaml @@ -3793,9 +3793,9 @@ paths: get: produces: - application/json - summary: Gets queued list of all customer moves by GBLOC that have destination requests (destination SIT, shuttle, address requests) + summary: Gets queued list of all customer moves by GBLOC that have both CONUS & OCONUS destination requests (destination SIT, destination shuttle, address requests) description: > - A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items (including shuttle) and destination address requests that are not approved. + A TOO will view this queue when they have destination requests tied to their GBLOC. This includes unapproved destination SIT service items, destination shuttle service items and destination address requests that are not yet approved by the TOO. operationId: getDestinationRequestsQueue tags: - queues @@ -3876,15 +3876,6 @@ paths: - SUBMITTED - SERVICE COUNSELING COMPLETED - APPROVALS REQUESTED - - in: query - name: orderType - type: string - description: order type - - in: query - name: viewAsGBLOC - type: string - description: | - Used to return a queue for a GBLOC other than the default of the current user. Requires the HQ role. The parameter is ignored if the requesting user does not have the necessary role. - in: query name: assignedTo type: string diff --git a/swagger/ghc.yaml b/swagger/ghc.yaml index 943339b625c..4876d5bbea5 100644 --- a/swagger/ghc.yaml +++ b/swagger/ghc.yaml @@ -3952,13 +3952,14 @@ paths: produces: - application/json summary: >- - Gets queued list of all customer moves by GBLOC that have destination - requests (destination SIT, shuttle, address requests) + Gets queued list of all customer moves by GBLOC that have both CONUS & + OCONUS destination requests (destination SIT, destination shuttle, + address requests) description: > A TOO will view this queue when they have destination requests tied to - their GBLOC. This includes unapproved destination SIT service items - (including shuttle) and destination address requests that are not - approved. + their GBLOC. This includes unapproved destination SIT service items, + destination shuttle service items and destination address requests that + are not yet approved by the TOO. operationId: getDestinationRequestsQueue tags: - queues @@ -4039,17 +4040,6 @@ paths: - SUBMITTED - SERVICE COUNSELING COMPLETED - APPROVALS REQUESTED - - in: query - name: orderType - type: string - description: order type - - in: query - name: viewAsGBLOC - type: string - description: > - Used to return a queue for a GBLOC other than the default of the - current user. Requires the HQ role. The parameter is ignored if the - requesting user does not have the necessary role. - in: query name: assignedTo type: string From 7e2efe2cb30a7081d31b3d6e24b2f634f43d02d8 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Tue, 4 Feb 2025 22:52:59 +0000 Subject: [PATCH 230/260] are you mocking me? From 0fa03b26827d6848848473b922abbfe9caf3d304 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Wed, 5 Feb 2025 15:33:00 +0000 Subject: [PATCH 231/260] added order_fetcher tests --- pkg/services/order/order_fetcher_test.go | 404 +++++++++++++++++++++++ 1 file changed, 404 insertions(+) diff --git a/pkg/services/order/order_fetcher_test.go b/pkg/services/order/order_fetcher_test.go index 57e85401246..653d6d7d129 100644 --- a/pkg/services/order/order_fetcher_test.go +++ b/pkg/services/order/order_fetcher_test.go @@ -5,6 +5,7 @@ import ( "time" "github.com/gofrs/uuid" + "github.com/stretchr/testify/mock" "github.com/transcom/mymove/pkg/auth" "github.com/transcom/mymove/pkg/factory" @@ -12,6 +13,7 @@ import ( "github.com/transcom/mymove/pkg/models/roles" "github.com/transcom/mymove/pkg/services" "github.com/transcom/mymove/pkg/services/entitlements" + "github.com/transcom/mymove/pkg/services/mocks" moveservice "github.com/transcom/mymove/pkg/services/move" officeuserservice "github.com/transcom/mymove/pkg/services/office_user" "github.com/transcom/mymove/pkg/testdatagen" @@ -2307,3 +2309,405 @@ func (suite *OrderServiceSuite) TestOriginDutyLocationFilter() { suite.Equal(locationName, string(expectedMoves[0].Orders.OriginDutyLocation.Name)) }) } + +func (suite *OrderServiceSuite) TestListDestinationRequestsOrders() { + army := models.AffiliationARMY + airForce := models.AffiliationAIRFORCE + spaceForce := models.AffiliationSPACEFORCE + usmc := models.AffiliationMARINES + + setupTestData := func(officeUserGBLOC string) (models.OfficeUser, auth.Session) { + + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), []factory.Customization{ + { + Model: models.TransportationOffice{ + Gbloc: officeUserGBLOC, + }, + }, + }, []roles.RoleType{roles.RoleTypeTOO}) + + factory.FetchOrBuildPostalCodeToGBLOC(suite.DB(), "99501", officeUser.TransportationOffice.Gbloc) + + fetcher := &mocks.OfficeUserGblocFetcher{} + fetcher.On("FetchGblocForOfficeUser", + mock.AnythingOfType("*appcontext.appContext"), + officeUser.ID, + ).Return(officeUserGBLOC, nil) + + session := auth.Session{ + ApplicationName: auth.OfficeApp, + Roles: officeUser.User.Roles, + OfficeUserID: officeUser.ID, + IDToken: "fake_token", + AccessToken: "fakeAccessToken", + } + + return officeUser, session + } + + buildMoveKKFA := func() (models.Move, models.MTOShipment) { + postalCode := "90210" + factory.FetchOrBuildPostalCodeToGBLOC(suite.DB(), "90210", "KKFA") + + // setting up two moves, each with requested destination SIT service items + destinationAddress := factory.BuildAddress(suite.DB(), []factory.Customization{ + { + Model: models.Address{PostalCode: postalCode}, + }, + }, nil) + + move := factory.BuildAvailableToPrimeMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + Status: models.MTOShipmentStatusApproved, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: destinationAddress, + LinkOnly: true, + }, + }, nil) + + return move, shipment + } + + buildMoveZone2AK := func(branch models.ServiceMemberAffiliation) (models.Move, models.MTOShipment) { + // Create a USAF move in Alaska Zone II + // this is a hard coded uuid that is a us_post_region_cities_id within AK Zone II + zone2UUID, err := uuid.FromString("66768964-e0de-41f3-b9be-7ef32e4ae2b4") + suite.FatalNoError(err) + destinationAddress := factory.BuildAddress(suite.DB(), []factory.Customization{ + { + Model: models.Address{ + City: "Anchorage", + State: "AK", + PostalCode: "99501", + UsPostRegionCityID: &zone2UUID, + }, + }, + }, nil) + + // setting up two moves, each with requested destination SIT service items + move := factory.BuildAvailableToPrimeMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }, + { + Model: models.ServiceMember{ + Affiliation: &branch, + }, + }, + }, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + Status: models.MTOShipmentStatusApproved, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: destinationAddress, + LinkOnly: true, + }, + }, nil) + + return move, shipment + } + + buildMoveZone4AK := func(branch models.ServiceMemberAffiliation) (models.Move, models.MTOShipment) { + // Create a USAF move in Alaska Zone II + // this is a hard coded uuid that is a us_post_region_cities_id within AK Zone II + zone4UUID, err := uuid.FromString("78a6f230-9a3a-46ed-aa48-2e3decfe70ff") + suite.FatalNoError(err) + destinationAddress := factory.BuildAddress(suite.DB(), []factory.Customization{ + { + Model: models.Address{ + City: "Anchorage", + State: "AK", + PostalCode: "99501", + UsPostRegionCityID: &zone4UUID, + }, + }, + }, nil) + // setting up two moves, each with requested destination SIT service items + move := factory.BuildAvailableToPrimeMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }, + { + Model: models.ServiceMember{ + Affiliation: &branch, + }, + }, + }, nil) + + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + Status: models.MTOShipmentStatusApproved, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: destinationAddress, + LinkOnly: true, + }, + }, nil) + + return move, shipment + } + + waf := entitlements.NewWeightAllotmentFetcher() + orderFetcher := NewOrderFetcher(waf) + + suite.Run("returns moves for KKFA GBLOC when destination address is in KKFA GBLOC", func() { + officeUser, session := setupTestData("KKFA") + // setting up two moves, each with requested destination SIT service items + move, shipment := buildMoveKKFA() + + // destination service item in SUBMITTED status + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeDDFSIT, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + }, nil) + + move2, shipment2 := buildMoveKKFA() + + // destination shuttle + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeDDSHUT, + }, + }, + { + Model: move2, + LinkOnly: true, + }, + { + Model: shipment2, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + }, nil) + + moves, moveCount, err := orderFetcher.ListDestinationRequestsOrders( + suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}, + ) + + suite.FatalNoError(err) + suite.Equal(2, moveCount) + suite.Len(moves, 2) + }) + + suite.Run("returns moves for MBFL GBLOC including USAF/SF in Alaska Zone II", func() { + officeUser, session := setupTestData("MBFL") + + // setting up two moves, each with requested destination SIT service items + // a move associated with an air force customer containing AK Zone II shipment + move, shipment := buildMoveZone2AK(airForce) + + // destination service item in SUBMITTED status + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeDDFSIT, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + }, nil) + + // Create a move outside Alaska Zone II (Zone IV in this case) + move2, shipment2 := buildMoveZone4AK(spaceForce) + + // destination service item in SUBMITTED status + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeDDFSIT, + }, + }, + { + Model: move2, + LinkOnly: true, + }, + { + Model: shipment2, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + }, nil) + + params := services.ListOrderParams{Status: []string{string(models.MoveStatusAPPROVALSREQUESTED)}} + moves, moveCount, err := orderFetcher.ListDestinationRequestsOrders( + suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, ¶ms, + ) + + // we should get both moves back because one is in Zone II & the other is within the postal code GBLOC + suite.FatalNoError(err) + suite.Equal(2, moveCount) + suite.Len(moves, 2) + }) + + suite.Run("returns moves for JEAT GBLOC excluding USAF/SF in Alaska Zone II", func() { + officeUser, session := setupTestData("JEAT") + + // Create a move in Zone II, but not an air force or space force service member + move, shipment := buildMoveZone4AK(army) + + // destination service item in SUBMITTED status + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeDDFSIT, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + }, nil) + + moves, moveCount, err := orderFetcher.ListDestinationRequestsOrders( + suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}, + ) + + suite.FatalNoError(err) + suite.Equal(1, moveCount) + suite.Len(moves, 1) + }) + + suite.Run("returns moves for USMC GBLOC when moves belong to USMC servicemembers", func() { + officeUser, session := setupTestData("USMC") + + // setting up two moves, each with requested destination SIT service items + // both will be USMC moves, one in Zone II AK and the other not + move, shipment := buildMoveZone2AK(usmc) + + // destination service item in SUBMITTED status + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeDDFSIT, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + }, nil) + + // this one won't be in Zone II + move2, shipment2 := buildMoveZone4AK(usmc) + + // destination shuttle + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeDDSHUT, + }, + }, + { + Model: move2, + LinkOnly: true, + }, + { + Model: shipment2, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + }, nil) + + moves, moveCount, err := orderFetcher.ListDestinationRequestsOrders( + suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}, + ) + + // we should get both moves back since they're USMC moves and zone doesn't matter + suite.FatalNoError(err) + suite.Equal(2, moveCount) + suite.Len(moves, 2) + }) +} From 1940a97f6af5b89b37c1ba84fbb04a5535c37c2b Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Wed, 5 Feb 2025 20:28:35 +0000 Subject: [PATCH 232/260] added test for handler --- pkg/handlers/ghcapi/queues_test.go | 141 +++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/pkg/handlers/ghcapi/queues_test.go b/pkg/handlers/ghcapi/queues_test.go index 6a658d6c2aa..90088cf2ec0 100644 --- a/pkg/handlers/ghcapi/queues_test.go +++ b/pkg/handlers/ghcapi/queues_test.go @@ -2249,3 +2249,144 @@ func (suite *HandlerSuite) TestAvailableOfficeUsers() { }) } + +func (suite *HandlerSuite) TestGetDestinationRequestsQueuesHandler() { + waf := entitlements.NewWeightAllotmentFetcher() + // default GBLOC is KKFA + officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitActiveOfficeUser(), []roles.RoleType{roles.RoleTypeTOO}) + officeUser.User.Roles = append(officeUser.User.Roles, roles.Role{ + RoleType: roles.RoleTypeTOO, + }) + + postalCode := "90210" + postalCode2 := "73064" + factory.FetchOrBuildPostalCodeToGBLOC(suite.DB(), "90210", "KKFA") + factory.FetchOrBuildPostalCodeToGBLOC(suite.DB(), "73064", "JEAT") + + // setting up two moves, one we will see and the other we won't + move := factory.BuildAvailableToPrimeMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + destinationAddress := factory.BuildAddress(suite.DB(), []factory.Customization{ + { + Model: models.Address{PostalCode: postalCode}, + }, + }, nil) + shipment := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + Status: models.MTOShipmentStatusApproved, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: destinationAddress, + LinkOnly: true, + }, + }, nil) + + // destination service item in SUBMITTED status + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeDDFSIT, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + }, nil) + + move2 := factory.BuildAvailableToPrimeMove(suite.DB(), []factory.Customization{ + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + Show: models.BoolPointer(true), + }, + }}, nil) + + destinationAddress2 := factory.BuildAddress(suite.DB(), []factory.Customization{ + { + Model: models.Address{PostalCode: postalCode2}, + }, + }, nil) + shipment2 := factory.BuildMTOShipment(suite.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + Status: models.MTOShipmentStatusApproved, + }, + }, + { + Model: move2, + LinkOnly: true, + }, + { + Model: destinationAddress2, + LinkOnly: true, + }, + }, nil) + + // destination shuttle + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeDDSHUT, + }, + }, + { + Model: move2, + LinkOnly: true, + }, + { + Model: shipment2, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + }, nil) + + request := httptest.NewRequest("GET", "/queues/destination-requests", nil) + request = suite.AuthenticateOfficeRequest(request, officeUser) + params := queues.GetDestinationRequestsQueueParams{ + HTTPRequest: request, + } + handlerConfig := suite.HandlerConfig() + mockUnlocker := movelocker.NewMoveUnlocker() + handler := GetDestinationRequestsQueueHandler{ + handlerConfig, + order.NewOrderFetcher(waf), + mockUnlocker, + officeusercreator.NewOfficeUserFetcherPop(), + } + + response := handler.Handle(params) + suite.IsNotErrResponse(response) + suite.IsType(&queues.GetDestinationRequestsQueueOK{}, response) + payload := response.(*queues.GetDestinationRequestsQueueOK).Payload + + // should only have one move + result := payload.QueueMoves[0] + suite.Len(payload.QueueMoves, 1) + suite.Equal(move.ID.String(), result.ID.String()) +} From bb2d9457cb33d79349042409b631eb0d5c69df29 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Thu, 6 Feb 2025 16:07:25 +0000 Subject: [PATCH 233/260] added address update to test --- pkg/services/order/order_fetcher_test.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkg/services/order/order_fetcher_test.go b/pkg/services/order/order_fetcher_test.go index 653d6d7d129..0e4a26b72bd 100644 --- a/pkg/services/order/order_fetcher_test.go +++ b/pkg/services/order/order_fetcher_test.go @@ -2536,13 +2536,25 @@ func (suite *OrderServiceSuite) TestListDestinationRequestsOrders() { }, }, nil) + move3, shipment3 := buildMoveKKFA() + factory.BuildShipmentAddressUpdate(suite.DB(), []factory.Customization{ + { + Model: shipment3, + LinkOnly: true, + }, + { + Model: move3, + LinkOnly: true, + }, + }, []factory.Trait{factory.GetTraitShipmentAddressUpdateRequested}) + moves, moveCount, err := orderFetcher.ListDestinationRequestsOrders( suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}, ) suite.FatalNoError(err) - suite.Equal(2, moveCount) - suite.Len(moves, 2) + suite.Equal(3, moveCount) + suite.Len(moves, 3) }) suite.Run("returns moves for MBFL GBLOC including USAF/SF in Alaska Zone II", func() { From fdd078d47a764b9c2904d3117fc858090e9d2f7c Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Fri, 7 Feb 2025 15:27:22 +0000 Subject: [PATCH 234/260] query improvements, updating csv file name prefix --- ...stination_queue_db_func_and_gbloc_view.up.sql | 16 ++++++++-------- src/pages/Office/MoveQueue/MoveQueue.jsx | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql index 8aabdaeddf0..a17a02d5644 100644 --- a/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql +++ b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql @@ -351,20 +351,20 @@ BEGIN )::JSONB AS too_assigned, COUNT(*) OVER() AS total_count FROM moves - INNER JOIN orders ON moves.orders_id = orders.id - LEFT JOIN mto_shipments ON mto_shipments.move_id = moves.id + JOIN orders ON moves.orders_id = orders.id + JOIN mto_shipments ON mto_shipments.move_id = moves.id LEFT JOIN ppm_shipments ON ppm_shipments.shipment_id = mto_shipments.id - LEFT JOIN mto_service_items ON mto_shipments.id = mto_service_items.mto_shipment_id - LEFT JOIN re_services ON mto_service_items.re_service_id = re_services.id - LEFT JOIN service_members ON orders.service_member_id = service_members.id - LEFT JOIN duty_locations AS new_duty_locations ON orders.new_duty_location_id = new_duty_locations.id - LEFT JOIN duty_locations AS origin_duty_locations ON orders.origin_duty_location_id = origin_duty_locations.id + JOIN mto_service_items ON mto_shipments.id = mto_service_items.mto_shipment_id + JOIN re_services ON mto_service_items.re_service_id = re_services.id + JOIN service_members ON orders.service_member_id = service_members.id + JOIN duty_locations AS new_duty_locations ON orders.new_duty_location_id = new_duty_locations.id + JOIN duty_locations AS origin_duty_locations ON orders.origin_duty_location_id = origin_duty_locations.id LEFT JOIN office_users AS too_user ON moves.too_assigned_id = too_user.id LEFT JOIN office_users AS locked_user ON moves.locked_by = locked_user.id LEFT JOIN transportation_offices AS counseling_offices ON moves.counseling_transportation_office_id = counseling_offices.id LEFT JOIN shipment_address_updates ON shipment_address_updates.shipment_id = mto_shipments.id - LEFT JOIN move_to_dest_gbloc ON move_to_dest_gbloc.move_id = moves.id + JOIN move_to_dest_gbloc ON move_to_dest_gbloc.move_id = moves.id WHERE moves.show = TRUE '; diff --git a/src/pages/Office/MoveQueue/MoveQueue.jsx b/src/pages/Office/MoveQueue/MoveQueue.jsx index e88766c2443..8e327ee61e5 100644 --- a/src/pages/Office/MoveQueue/MoveQueue.jsx +++ b/src/pages/Office/MoveQueue/MoveQueue.jsx @@ -370,9 +370,9 @@ const MoveQueue = ({ isQueueManagementFFEnabled, userPrivileges, isBulkAssignmen handleClick={handleClick} useQueries={useDestinationRequestsQueueQueries} showCSVExport - csvExportFileNamePrefix="Task-Order-Queue" + csvExportFileNamePrefix="Destination-Requests-Queue" csvExportQueueFetcher={getDestinationRequestsQueue} - csvExportQueueFetcherKey="queueMoves" + csvExportQueueFetcherKey="destinationQueueMoves" sessionStorageKey={queueType} key={queueType} /> From 683a7802767608fc76c3a5cf81e4ed38481f01aa Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Fri, 7 Feb 2025 16:09:22 +0000 Subject: [PATCH 235/260] test adjustments --- pkg/services/order/order_fetcher_test.go | 60 ++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/pkg/services/order/order_fetcher_test.go b/pkg/services/order/order_fetcher_test.go index 0e4a26b72bd..f597146e48e 100644 --- a/pkg/services/order/order_fetcher_test.go +++ b/pkg/services/order/order_fetcher_test.go @@ -2537,6 +2537,26 @@ func (suite *OrderServiceSuite) TestListDestinationRequestsOrders() { }, nil) move3, shipment3 := buildMoveKKFA() + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeMS, + }, + }, + { + Model: move3, + LinkOnly: true, + }, + { + Model: shipment3, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + }, + }, + }, nil) factory.BuildShipmentAddressUpdate(suite.DB(), []factory.Customization{ { Model: shipment3, @@ -2713,13 +2733,47 @@ func (suite *OrderServiceSuite) TestListDestinationRequestsOrders() { }, }, nil) + move3, shipment3 := buildMoveZone4AK(usmc) + // we need to create a service item and attach it to the move/shipment + // else the query will exclude the move since it doesn't use LEFT JOINs + factory.BuildMTOServiceItem(suite.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeMS, + }, + }, + { + Model: move3, + LinkOnly: true, + }, + { + Model: shipment3, + LinkOnly: true, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + }, + }, + }, nil) + factory.BuildShipmentAddressUpdate(suite.DB(), []factory.Customization{ + { + Model: shipment3, + LinkOnly: true, + }, + { + Model: move3, + LinkOnly: true, + }, + }, []factory.Trait{factory.GetTraitShipmentAddressUpdateRequested}) + moves, moveCount, err := orderFetcher.ListDestinationRequestsOrders( suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}, ) - // we should get both moves back since they're USMC moves and zone doesn't matter + // we should get three moves back since they're USMC moves and zone doesn't matter suite.FatalNoError(err) - suite.Equal(2, moveCount) - suite.Len(moves, 2) + suite.Equal(3, moveCount) + suite.Len(moves, 3) }) } From 4920e7426bf35a8f4702fad634e9a3a6b4751e8e Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Fri, 7 Feb 2025 18:09:16 +0000 Subject: [PATCH 236/260] updating to include moves.show in return --- ...3173216_add_destination_queue_db_func_and_gbloc_view.up.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql index a17a02d5644..5148f0f57d7 100644 --- a/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql +++ b/migrations/app/schema/20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql @@ -266,6 +266,7 @@ CREATE OR REPLACE FUNCTION get_destination_queue( ) RETURNS TABLE ( id UUID, + show BOOLEAN, locator TEXT, submitted_at TIMESTAMP WITH TIME ZONE, orders_id UUID, @@ -299,6 +300,7 @@ BEGIN sql_query := ' SELECT moves.id AS id, + moves.show AS show, moves.locator::TEXT AS locator, moves.submitted_at::TIMESTAMP WITH TIME ZONE AS submitted_at, moves.orders_id AS orders_id, @@ -467,6 +469,7 @@ BEGIN sql_query := sql_query || ' GROUP BY moves.id, + moves.show, moves.locator, moves.submitted_at, moves.orders_id, From 0dec814feb38bd1d846b82128075e6b56f1743c9 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Mon, 10 Feb 2025 19:27:06 +0000 Subject: [PATCH 237/260] one big ole fat commit, migration added, testharnesses added --- migrations/app/migrations_manifest.txt | 1 + ...st_queue_to_consider_sit_extensions.up.sql | 256 +++ pkg/factory/mto_service_item_factory.go | 484 +++-- pkg/factory/mto_service_item_factory_test.go | 62 + pkg/models/re_service.go | 4 + pkg/services/order/order_fetcher_test.go | 27 +- pkg/testdatagen/testharness/dispatch.go | 264 +++ pkg/testdatagen/testharness/make_move.go | 1606 +++++++++++++++++ playwright/tests/utils/testharness.js | 228 +++ 9 files changed, 2796 insertions(+), 136 deletions(-) create mode 100644 migrations/app/schema/20250210175754_B22451_update_dest_queue_to_consider_sit_extensions.up.sql diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt index c3e1e2d1e86..eb8aa1d8fa8 100644 --- a/migrations/app/migrations_manifest.txt +++ b/migrations/app/migrations_manifest.txt @@ -1093,3 +1093,4 @@ 20250123173216_add_destination_queue_db_func_and_gbloc_view.up.sql 20250204162411_updating_create_accessorial_service_item_proc_for_crating.up.sql 20250206173204_add_hawaii_data.up.sql +20250210175754_B22451_update_dest_queue_to_consider_sit_extensions.up.sql diff --git a/migrations/app/schema/20250210175754_B22451_update_dest_queue_to_consider_sit_extensions.up.sql b/migrations/app/schema/20250210175754_B22451_update_dest_queue_to_consider_sit_extensions.up.sql new file mode 100644 index 00000000000..bcfc96ada46 --- /dev/null +++ b/migrations/app/schema/20250210175754_B22451_update_dest_queue_to_consider_sit_extensions.up.sql @@ -0,0 +1,256 @@ +-- updating to consider sit extensions in PENDING status +CREATE OR REPLACE FUNCTION get_destination_queue( + user_gbloc TEXT DEFAULT NULL, + customer_name TEXT DEFAULT NULL, + edipi TEXT DEFAULT NULL, + emplid TEXT DEFAULT NULL, + m_status TEXT[] DEFAULT NULL, + move_code TEXT DEFAULT NULL, + requested_move_date TIMESTAMP DEFAULT NULL, + date_submitted TIMESTAMP DEFAULT NULL, + branch TEXT DEFAULT NULL, + origin_duty_location TEXT DEFAULT NULL, + counseling_office TEXT DEFAULT NULL, + too_assigned_user TEXT DEFAULT NULL, + page INTEGER DEFAULT 1, + per_page INTEGER DEFAULT 20, + sort TEXT DEFAULT NULL, + sort_direction TEXT DEFAULT NULL +) +RETURNS TABLE ( + id UUID, + show BOOLEAN, + locator TEXT, + submitted_at TIMESTAMP WITH TIME ZONE, + orders_id UUID, + status TEXT, + locked_by UUID, + too_assigned_id UUID, + counseling_transportation_office_id UUID, + orders JSONB, + mto_shipments JSONB, + counseling_transportation_office JSONB, + too_assigned JSONB, + total_count BIGINT +) AS $$ +DECLARE + sql_query TEXT; + offset_value INTEGER; + sort_column TEXT; + sort_order TEXT; +BEGIN + IF page < 1 THEN + page := 1; + END IF; + + IF per_page < 1 THEN + per_page := 20; + END IF; + + offset_value := (page - 1) * per_page; + + sql_query := ' + SELECT + moves.id AS id, + moves.show AS show, + moves.locator::TEXT AS locator, + moves.submitted_at::TIMESTAMP WITH TIME ZONE AS submitted_at, + moves.orders_id AS orders_id, + moves.status::TEXT AS status, + moves.locked_by AS locked_by, + moves.too_assigned_id AS too_assigned_id, + moves.counseling_transportation_office_id AS counseling_transportation_office_id, + json_build_object( + ''id'', orders.id, + ''origin_duty_location_gbloc'', orders.gbloc, + ''service_member'', json_build_object( + ''id'', service_members.id, + ''first_name'', service_members.first_name, + ''last_name'', service_members.last_name, + ''edipi'', service_members.edipi, + ''emplid'', service_members.emplid, + ''affiliation'', service_members.affiliation + ), + ''origin_duty_location'', json_build_object( + ''name'', origin_duty_locations.name + ) + )::JSONB AS orders, + COALESCE( + ( + SELECT json_agg( + json_build_object( + ''id'', ms.id, + ''shipment_type'', ms.shipment_type, + ''status'', ms.status, + ''requested_pickup_date'', TO_CHAR(ms.requested_pickup_date, ''YYYY-MM-DD"T00:00:00Z"''), + ''scheduled_pickup_date'', TO_CHAR(ms.scheduled_pickup_date, ''YYYY-MM-DD"T00:00:00Z"''), + ''approved_date'', TO_CHAR(ms.approved_date, ''YYYY-MM-DD"T00:00:00Z"''), + ''prime_estimated_weight'', ms.prime_estimated_weight + ) + ) + FROM ( + SELECT DISTINCT ON (mto_shipments.id) mto_shipments.* + FROM mto_shipments + WHERE mto_shipments.move_id = moves.id + ) AS ms + ), + ''[]'' + )::JSONB AS mto_shipments, + json_build_object( + ''name'', counseling_offices.name + )::JSONB AS counseling_transportation_office, + json_build_object( + ''first_name'', too_user.first_name, + ''last_name'', too_user.last_name + )::JSONB AS too_assigned, + COUNT(*) OVER() AS total_count + FROM moves + JOIN orders ON moves.orders_id = orders.id + JOIN mto_shipments ON mto_shipments.move_id = moves.id + LEFT JOIN ppm_shipments ON ppm_shipments.shipment_id = mto_shipments.id + JOIN mto_service_items ON mto_shipments.id = mto_service_items.mto_shipment_id + JOIN re_services ON mto_service_items.re_service_id = re_services.id + JOIN service_members ON orders.service_member_id = service_members.id + JOIN duty_locations AS new_duty_locations ON orders.new_duty_location_id = new_duty_locations.id + JOIN duty_locations AS origin_duty_locations ON orders.origin_duty_location_id = origin_duty_locations.id + LEFT JOIN office_users AS too_user ON moves.too_assigned_id = too_user.id + LEFT JOIN office_users AS locked_user ON moves.locked_by = locked_user.id + LEFT JOIN transportation_offices AS counseling_offices + ON moves.counseling_transportation_office_id = counseling_offices.id + LEFT JOIN shipment_address_updates ON shipment_address_updates.shipment_id = mto_shipments.id + LEFT JOIN sit_extensions ON sit_extensions.mto_shipment_id = mto_shipments.id + JOIN move_to_dest_gbloc ON move_to_dest_gbloc.move_id = moves.id + WHERE moves.show = TRUE + '; + + IF user_gbloc IS NOT NULL THEN + sql_query := sql_query || ' AND move_to_dest_gbloc.gbloc = $1 '; + END IF; + + IF customer_name IS NOT NULL THEN + sql_query := sql_query || ' AND ( + service_members.first_name || '' '' || service_members.last_name ILIKE ''%'' || $2 || ''%'' + OR service_members.last_name || '' '' || service_members.first_name ILIKE ''%'' || $2 || ''%'' + )'; + END IF; + + IF edipi IS NOT NULL THEN + sql_query := sql_query || ' AND service_members.edipi ILIKE ''%'' || $3 || ''%'' '; + END IF; + + IF emplid IS NOT NULL THEN + sql_query := sql_query || ' AND service_members.emplid ILIKE ''%'' || $4 || ''%'' '; + END IF; + + IF m_status IS NOT NULL THEN + sql_query := sql_query || ' AND moves.status = ANY($5) '; + END IF; + + IF move_code IS NOT NULL THEN + sql_query := sql_query || ' AND moves.locator ILIKE ''%'' || $6 || ''%'' '; + END IF; + + IF requested_move_date IS NOT NULL THEN + sql_query := sql_query || ' AND ( + mto_shipments.requested_pickup_date::DATE = $7::DATE + OR ppm_shipments.expected_departure_date::DATE = $7::DATE + OR (mto_shipments.shipment_type = ''HHG_OUTOF_NTS'' AND mto_shipments.requested_delivery_date::DATE = $7::DATE) + )'; + END IF; + + IF date_submitted IS NOT NULL THEN + sql_query := sql_query || ' AND moves.submitted_at::DATE = $8::DATE '; + END IF; + + IF branch IS NOT NULL THEN + sql_query := sql_query || ' AND service_members.affiliation ILIKE ''%'' || $9 || ''%'' '; + END IF; + + IF origin_duty_location IS NOT NULL THEN + sql_query := sql_query || ' AND origin_duty_locations.name ILIKE ''%'' || $10 || ''%'' '; + END IF; + + IF counseling_office IS NOT NULL THEN + sql_query := sql_query || ' AND counseling_offices.name ILIKE ''%'' || $11 || ''%'' '; + END IF; + + IF too_assigned_user IS NOT NULL THEN + sql_query := sql_query || ' AND (too_user.first_name || '' '' || too_user.last_name) ILIKE ''%'' || $12 || ''%'' '; + END IF; + + -- add destination queue-specific filters (pending dest address requests, pending dest SIT extension requests, dest SIT & dest shuttle service items) + sql_query := sql_query || ' + AND ( + shipment_address_updates.status = ''REQUESTED'' + OR sit_extensions.status = ''PENDING'' + OR ( + mto_service_items.status = ''SUBMITTED'' + AND re_services.code IN (''DDFSIT'', ''DDASIT'', ''DDDSIT'', ''DDSFSC'', ''DDSHUT'', ''IDFSIT'', ''IDASIT'', ''IDDSIT'', ''IDSFSC'', ''IDSHUT'') + ) + ) + '; + + -- default sorting values if none are provided (move.id) + sort_column := 'id'; + sort_order := 'ASC'; + + IF sort IS NOT NULL THEN + CASE sort + WHEN 'locator' THEN sort_column := 'moves.locator'; + WHEN 'status' THEN sort_column := 'moves.status'; + WHEN 'customerName' THEN sort_column := 'service_members.last_name'; + WHEN 'edipi' THEN sort_column := 'service_members.edipi'; + WHEN 'emplid' THEN sort_column := 'service_members.emplid'; + WHEN 'requestedMoveDate' THEN sort_column := 'COALESCE(mto_shipments.requested_pickup_date, ppm_shipments.expected_departure_date, mto_shipments.requested_delivery_date)'; + WHEN 'appearedInTooAt' THEN sort_column := 'COALESCE(moves.submitted_at, moves.approvals_requested_at)'; + WHEN 'branch' THEN sort_column := 'service_members.affiliation'; + WHEN 'originDutyLocation' THEN sort_column := 'origin_duty_locations.name'; + WHEN 'counselingOffice' THEN sort_column := 'counseling_offices.name'; + WHEN 'assignedTo' THEN sort_column := 'too_user.last_name'; + ELSE + sort_column := 'moves.id'; + END CASE; + END IF; + + IF sort_direction IS NOT NULL THEN + IF LOWER(sort_direction) = 'desc' THEN + sort_order := 'DESC'; + ELSE + sort_order := 'ASC'; + END IF; + END IF; + + sql_query := sql_query || ' + GROUP BY + moves.id, + moves.show, + moves.locator, + moves.submitted_at, + moves.orders_id, + moves.status, + moves.locked_by, + moves.too_assigned_id, + moves.counseling_transportation_office_id, + mto_shipments.requested_pickup_date, + mto_shipments.requested_delivery_date, + ppm_shipments.expected_departure_date, + orders.id, + service_members.id, + service_members.first_name, + service_members.last_name, + service_members.edipi, + service_members.emplid, + service_members.affiliation, + origin_duty_locations.name, + counseling_offices.name, + too_user.first_name, + too_user.last_name'; + sql_query := sql_query || format(' ORDER BY %s %s ', sort_column, sort_order); + sql_query := sql_query || ' LIMIT $13 OFFSET $14 '; + + RETURN QUERY EXECUTE sql_query + USING user_gbloc, customer_name, edipi, emplid, m_status, move_code, requested_move_date, date_submitted, + branch, origin_duty_location, counseling_office, too_assigned_user, per_page, offset_value; + +END; +$$ LANGUAGE plpgsql; diff --git a/pkg/factory/mto_service_item_factory.go b/pkg/factory/mto_service_item_factory.go index 2bc9c236f4d..623b3a2c583 100644 --- a/pkg/factory/mto_service_item_factory.go +++ b/pkg/factory/mto_service_item_factory.go @@ -747,7 +747,7 @@ func BuildFullOriginMTOServiceItems(db *pop.Connection, customs []Customization, // are required params, and entryDate and departureDate can be specificed // optionally. func BuildOriginSITServiceItems(db *pop.Connection, move models.Move, shipment models.MTOShipment, entryDate *time.Time, departureDate *time.Time) models.MTOServiceItems { - postalCode := "90210" + postalCode := shipment.PickupAddress.PostalCode reason := "peak season all trucks in use" defaultEntryDate := time.Now().AddDate(0, 0, -45) defaultApprovedAtDate := time.Now() @@ -759,87 +759,193 @@ func BuildOriginSITServiceItems(db *pop.Connection, move models.Move, shipment m defaultDepartureDate = departureDate } - dofsit := BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDOFSIT, move, shipment, []Customization{ - { - Model: models.MTOServiceItem{ - Status: models.MTOServiceItemStatusApproved, - ApprovedAt: &defaultApprovedAtDate, - SITEntryDate: &defaultEntryDate, - SITPostalCode: &postalCode, - Reason: &reason, + var firstDaySit, addlDaySit, pickupSit, fuelSurchargeSit models.MTOServiceItem + + if shipment.MarketCode != models.MarketCodeInternational { + firstDaySit = BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDOFSIT, move, shipment, []Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, }, - }, - { - Model: models.Address{}, - Type: &Addresses.SITOriginHHGActualAddress, - }, - { - Model: models.Address{}, - Type: &Addresses.SITOriginHHGOriginalAddress, - }, - }, nil) + { + Model: models.Address{}, + Type: &Addresses.SITOriginHHGActualAddress, + }, + { + Model: models.Address{}, + Type: &Addresses.SITOriginHHGOriginalAddress, + }, + }, nil) - doasit := BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDOASIT, move, shipment, []Customization{ - { - Model: models.MTOServiceItem{ - Status: models.MTOServiceItemStatusApproved, - ApprovedAt: &defaultApprovedAtDate, - SITEntryDate: &defaultEntryDate, - SITPostalCode: &postalCode, - Reason: &reason, + addlDaySit = BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDOASIT, move, shipment, []Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, }, - }, - { - Model: models.Address{}, - Type: &Addresses.SITOriginHHGActualAddress, - }, - { - Model: models.Address{}, - Type: &Addresses.SITOriginHHGOriginalAddress, - }, - }, nil) + { + Model: models.Address{}, + Type: &Addresses.SITOriginHHGActualAddress, + }, + { + Model: models.Address{}, + Type: &Addresses.SITOriginHHGOriginalAddress, + }, + }, nil) - dopsit := BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDOPSIT, move, shipment, []Customization{ - { - Model: models.MTOServiceItem{ - Status: models.MTOServiceItemStatusApproved, - ApprovedAt: &defaultApprovedAtDate, - SITEntryDate: &defaultEntryDate, - SITDepartureDate: defaultDepartureDate, - SITPostalCode: &postalCode, - Reason: &reason, + pickupSit = BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDOPSIT, move, shipment, []Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITDepartureDate: defaultDepartureDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, }, - }, - { - Model: models.Address{}, - Type: &Addresses.SITOriginHHGActualAddress, - }, - { - Model: models.Address{}, - Type: &Addresses.SITOriginHHGOriginalAddress, - }, - }, nil) + { + Model: models.Address{}, + Type: &Addresses.SITOriginHHGActualAddress, + }, + { + Model: models.Address{}, + Type: &Addresses.SITOriginHHGOriginalAddress, + }, + }, nil) - dosfsc := BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDOSFSC, move, shipment, []Customization{ - { - Model: models.MTOServiceItem{ - Status: models.MTOServiceItemStatusApproved, - ApprovedAt: &defaultApprovedAtDate, - SITEntryDate: &defaultEntryDate, - SITPostalCode: &postalCode, - Reason: &reason, + fuelSurchargeSit = BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDOSFSC, move, shipment, []Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, }, - }, - { - Model: models.Address{}, - Type: &Addresses.SITOriginHHGActualAddress, - }, - { - Model: models.Address{}, - Type: &Addresses.SITOriginHHGOriginalAddress, - }, - }, nil) - return []models.MTOServiceItem{dofsit, doasit, dopsit, dosfsc} + { + Model: models.Address{}, + Type: &Addresses.SITOriginHHGActualAddress, + }, + { + Model: models.Address{}, + Type: &Addresses.SITOriginHHGOriginalAddress, + }, + }, nil) + } else { + firstDaySit = BuildMTOServiceItem(db, []Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIOFSIT, + }, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + + addlDaySit = BuildMTOServiceItem(db, []Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIOASIT, + }, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + + pickupSit = BuildMTOServiceItem(db, []Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIOPSIT, + }, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITDepartureDate: defaultDepartureDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + + fuelSurchargeSit = BuildMTOServiceItem(db, []Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIOSFSC, + }, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + } + + return []models.MTOServiceItem{firstDaySit, addlDaySit, pickupSit, fuelSurchargeSit} } // BuildDestSITServiceItems makes all of the service items that are @@ -847,7 +953,7 @@ func BuildOriginSITServiceItems(db *pop.Connection, move models.Move, shipment m // are required params, and entryDate and departureDate can be specificed // optionally. func BuildDestSITServiceItems(db *pop.Connection, move models.Move, shipment models.MTOShipment, entryDate *time.Time, departureDate *time.Time) models.MTOServiceItems { - postalCode := "90210" + postalCode := shipment.DestinationAddress.PostalCode reason := "peak season all trucks in use" defaultEntryDate := time.Now().AddDate(0, 0, -45) defaultApprovedAtDate := time.Now() @@ -859,71 +965,181 @@ func BuildDestSITServiceItems(db *pop.Connection, move models.Move, shipment mod defaultDepartureDate = departureDate } - ddfsit := BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDDFSIT, move, shipment, []Customization{ - { - Model: models.MTOServiceItem{ - Status: models.MTOServiceItemStatusApproved, - ApprovedAt: &defaultApprovedAtDate, - SITEntryDate: &defaultEntryDate, - SITPostalCode: &postalCode, - Reason: &reason, + var firstDaySit models.MTOServiceItem + var addlDaySit models.MTOServiceItem + var deliverySit models.MTOServiceItem + var fuelSurchargeSit models.MTOServiceItem + + // handling domestic SIT service item creation vs international + if shipment.MarketCode != models.MarketCodeInternational { + firstDaySit = BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDDFSIT, move, shipment, []Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, }, - }, - }, nil) + }, nil) - ddasit := BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDDASIT, move, shipment, []Customization{ - { - Model: models.MTOServiceItem{ - Status: models.MTOServiceItemStatusApproved, - ApprovedAt: &defaultApprovedAtDate, - SITEntryDate: &defaultEntryDate, - SITPostalCode: &postalCode, - Reason: &reason, + addlDaySit = BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDDASIT, move, shipment, []Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, }, - }, - }, nil) + }, nil) - dddsit := BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDDDSIT, move, shipment, []Customization{ - { - Model: models.MTOServiceItem{ - Status: models.MTOServiceItemStatusApproved, - ApprovedAt: &defaultApprovedAtDate, - SITEntryDate: &defaultEntryDate, - SITDepartureDate: defaultDepartureDate, - SITPostalCode: &postalCode, - Reason: &reason, + deliverySit = BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDDDSIT, move, shipment, []Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITDepartureDate: defaultDepartureDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, }, - }, - { - Model: models.Address{}, - Type: &Addresses.SITDestinationFinalAddress, - }, - { - Model: models.Address{}, - Type: &Addresses.SITDestinationOriginalAddress, - }, - }, nil) + { + Model: models.Address{}, + Type: &Addresses.SITDestinationFinalAddress, + }, + { + Model: models.Address{}, + Type: &Addresses.SITDestinationOriginalAddress, + }, + }, nil) - ddsfsc := BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDDSFSC, move, shipment, []Customization{ - { - Model: models.MTOServiceItem{ - Status: models.MTOServiceItemStatusApproved, - ApprovedAt: &defaultApprovedAtDate, - SITEntryDate: &defaultEntryDate, - SITPostalCode: &postalCode, - Reason: &reason, + fuelSurchargeSit = BuildRealMTOServiceItemWithAllDeps(db, models.ReServiceCodeDDSFSC, move, shipment, []Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, }, - }, - { - Model: models.Address{}, - Type: &Addresses.SITDestinationFinalAddress, - }, - { - Model: models.Address{}, - Type: &Addresses.SITDestinationOriginalAddress, - }, - }, nil) - return []models.MTOServiceItem{ddfsit, ddasit, dddsit, ddsfsc} + { + Model: models.Address{}, + Type: &Addresses.SITDestinationFinalAddress, + }, + { + Model: models.Address{}, + Type: &Addresses.SITDestinationOriginalAddress, + }, + }, nil) + } else { + firstDaySit = BuildMTOServiceItem(db, []Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIDFSIT, + }, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + + addlDaySit = BuildMTOServiceItem(db, []Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIDASIT, + }, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + + deliverySit = BuildMTOServiceItem(db, []Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIDDSIT, + }, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITDepartureDate: defaultDepartureDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + + fuelSurchargeSit = BuildMTOServiceItem(db, []Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIDSFSC, + }, + }, + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + ApprovedAt: &defaultApprovedAtDate, + SITEntryDate: &defaultEntryDate, + SITPostalCode: &postalCode, + Reason: &reason, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + } + + return []models.MTOServiceItem{firstDaySit, addlDaySit, deliverySit, fuelSurchargeSit} } func BuildDestSITServiceItemsNoSITDepartureDate(db *pop.Connection, move models.Move, shipment models.MTOShipment, entryDate *time.Time) models.MTOServiceItems { diff --git a/pkg/factory/mto_service_item_factory_test.go b/pkg/factory/mto_service_item_factory_test.go index 6287381e981..fe98c4ddba0 100644 --- a/pkg/factory/mto_service_item_factory_test.go +++ b/pkg/factory/mto_service_item_factory_test.go @@ -346,6 +346,68 @@ func (suite *FactorySuite) TestBuildMTOServiceItem() { suite.Equal(expectedCodes, reServiceCodes) }) + suite.Run("Build SIT service items for international shipment - origin SIT", func() { + + customMove := BuildMove(suite.DB(), nil, nil) + customMTOShipment := BuildMTOShipment(suite.DB(), []Customization{ + { + Model: customMove, + LinkOnly: true, + }, + { + Model: models.MTOShipment{ + MarketCode: models.MarketCodeInternational, + }, + }, + }, nil) + + oneMonthLater := time.Now().AddDate(0, 1, 0) + sitServiceItems := BuildOriginSITServiceItems(suite.DB(), customMove, customMTOShipment, &oneMonthLater, nil) + reServiceCodes := []models.ReServiceCode{} + + for i := range sitServiceItems { + reServiceCodes = append(reServiceCodes, sitServiceItems[i].ReService.Code) + } + expectedCodes := []models.ReServiceCode{ + models.ReServiceCodeIOFSIT, + models.ReServiceCodeIOASIT, + models.ReServiceCodeIOPSIT, + models.ReServiceCodeIOSFSC, + } + suite.Equal(expectedCodes, reServiceCodes) + }) + + suite.Run("Build SIT service items for international shipment - destination SIT", func() { + + customMove := BuildMove(suite.DB(), nil, nil) + customMTOShipment := BuildMTOShipment(suite.DB(), []Customization{ + { + Model: customMove, + LinkOnly: true, + }, + { + Model: models.MTOShipment{ + MarketCode: models.MarketCodeInternational, + }, + }, + }, nil) + + oneMonthLater := time.Now().AddDate(0, 1, 0) + sitServiceItems := BuildDestSITServiceItems(suite.DB(), customMove, customMTOShipment, &oneMonthLater, nil) + reServiceCodes := []models.ReServiceCode{} + + for i := range sitServiceItems { + reServiceCodes = append(reServiceCodes, sitServiceItems[i].ReService.Code) + } + expectedCodes := []models.ReServiceCode{ + models.ReServiceCodeIDFSIT, + models.ReServiceCodeIDASIT, + models.ReServiceCodeIDDSIT, + models.ReServiceCodeIDSFSC, + } + suite.Equal(expectedCodes, reServiceCodes) + }) + suite.Run("Port Locations not populated by default", func() { serviceItem := BuildMTOServiceItem(suite.DB(), nil, nil) diff --git a/pkg/models/re_service.go b/pkg/models/re_service.go index 85136a4705a..70f78ccea2b 100644 --- a/pkg/models/re_service.go +++ b/pkg/models/re_service.go @@ -86,6 +86,8 @@ const ( ReServiceCodeIDDSIT ReServiceCode = "IDDSIT" // ReServiceCodeIDFSIT International destination 1st day SIT ReServiceCodeIDFSIT ReServiceCode = "IDFSIT" + // ReServiceCodeIDSFSC International destination SIT FSC + ReServiceCodeIDSFSC ReServiceCode = "IDSFSC" // ReServiceCodeIDSHUT International destination shuttle service ReServiceCodeIDSHUT ReServiceCode = "IDSHUT" // ReServiceCodeIHPK International HHG pack @@ -108,6 +110,8 @@ const ( ReServiceCodeIOOUB ReServiceCode = "IOOUB" // ReServiceCodeIOPSIT International origin SIT pickup ReServiceCodeIOPSIT ReServiceCode = "IOPSIT" + // ReServiceCodeIOSFSC International origin SIT FSC + ReServiceCodeIOSFSC ReServiceCode = "IOSFSC" // ReServiceCodeIOSHUT International origin shuttle service ReServiceCodeIOSHUT ReServiceCode = "IOSHUT" // ReServiceCodeIUBPK International UB pack diff --git a/pkg/services/order/order_fetcher_test.go b/pkg/services/order/order_fetcher_test.go index f597146e48e..8e0e6eec9e3 100644 --- a/pkg/services/order/order_fetcher_test.go +++ b/pkg/services/order/order_fetcher_test.go @@ -2568,13 +2568,36 @@ func (suite *OrderServiceSuite) TestListDestinationRequestsOrders() { }, }, []factory.Trait{factory.GetTraitShipmentAddressUpdateRequested}) + move4, shipment4 := buildMoveKKFA() + // build the destination SIT service items and update their status to SUBMITTED + oneMonthLater := time.Now().AddDate(0, 1, 0) + factory.BuildDestSITServiceItems(suite.DB(), move4, shipment4, &oneMonthLater, nil) + + // build the SIT extension update + factory.BuildSITDurationUpdate(suite.DB(), []factory.Customization{ + { + Model: move4, + LinkOnly: true, + }, + { + Model: shipment4, + LinkOnly: true, + }, + { + Model: models.SITDurationUpdate{ + Status: models.SITExtensionStatusPending, + ContractorRemarks: models.StringPointer("gimme some more plz"), + }, + }, + }, nil) + moves, moveCount, err := orderFetcher.ListDestinationRequestsOrders( suite.AppContextWithSessionForTest(&session), officeUser.ID, roles.RoleTypeTOO, &services.ListOrderParams{}, ) suite.FatalNoError(err) - suite.Equal(3, moveCount) - suite.Len(moves, 3) + suite.Equal(4, moveCount) + suite.Len(moves, 4) }) suite.Run("returns moves for MBFL GBLOC including USAF/SF in Alaska Zone II", func() { diff --git a/pkg/testdatagen/testharness/dispatch.go b/pkg/testdatagen/testharness/dispatch.go index d86597d175d..b4b19164d42 100644 --- a/pkg/testdatagen/testharness/dispatch.go +++ b/pkg/testdatagen/testharness/dispatch.go @@ -275,6 +275,270 @@ var actionDispatcher = map[string]actionFunc{ "InternationalHHGMoveWithServiceItemsandPaymentRequestsForTIO": func(appCtx appcontext.AppContext) testHarnessResponse { return MakeBasicInternationalHHGMoveWithServiceItemsandPaymentRequestsForTIO(appCtx) }, + // basic iHHG move with CONUS -> AK needing TOO approval + "IntlHHGMoveDestAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAKZone1Army(appCtx) + }, + "IntlHHGMoveDestAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAKZone2Army(appCtx) + }, + "IntlHHGMoveDestAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAKZone1AirForce(appCtx) + }, + "IntlHHGMoveDestAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAKZone2AirForce(appCtx) + }, + "IntlHHGMoveDestAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAKZone1SpaceForce(appCtx) + }, + "IntlHHGMoveDestAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAKZone2SpaceForce(appCtx) + }, + "IntlHHGMoveDestAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAKZone1USMC(appCtx) + }, + "IntlHHGMoveDestAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAKZone2USMC(appCtx) + }, + // basic iHHG move with AK -> CONUS needing TOO approval + "IntlHHGMovePickupAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMovePickupAKZone1Army(appCtx) + }, + "IntlHHGMovePickupAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMovePickupAKZone2Army(appCtx) + }, + "IntlHHGMovePickupAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMovePickupAKZone1AirForce(appCtx) + }, + "IntlHHGMovePickupAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMovePickupAKZone2AirForce(appCtx) + }, + "IntlHHGMovePickupAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMovePickupAKZone1SpaceForce(appCtx) + }, + "IntlHHGMovePickupAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMovePickupAKZone2SpaceForce(appCtx) + }, + "IntlHHGMovePickupAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMovePickupAKZone1USMC(appCtx) + }, + "IntlHHGMovePickupAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMovePickupAKZone2USMC(appCtx) + }, + // iHHG with international origin SIT in SUBMITTED status + "IntlHHGMoveOriginSITRequestedAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITRequestedAKZone1Army(appCtx) + }, + "IntlHHGMoveOriginSITRequestedAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITRequestedAKZone2Army(appCtx) + }, + "IntlHHGMoveOriginSITRequestedAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITRequestedAKZone1AirForce(appCtx) + }, + "IntlHHGMoveOriginSITRequestedAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITRequestedAKZone2AirForce(appCtx) + }, + "IntlHHGMoveOriginSITRequestedAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITRequestedAKZone1SpaceForce(appCtx) + }, + "IntlHHGMoveOriginSITRequestedAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITRequestedAKZone2SpaceForce(appCtx) + }, + "IntlHHGMoveOriginSITRequestedAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITRequestedAKZone1USMC(appCtx) + }, + "IntlHHGMoveOriginSITRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITRequestedAKZone2USMC(appCtx) + }, + // iHHG with international destination SIT in SUBMITTED status + "IntlHHGMoveDestSITRequestedAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITRequestedAKZone1Army(appCtx) + }, + "IntlHHGMoveDestSITRequestedAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITRequestedAKZone2Army(appCtx) + }, + "IntlHHGMoveDestSITRequestedAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITRequestedAKZone1AirForce(appCtx) + }, + "IntlHHGMoveDestSITRequestedAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITRequestedAKZone2AirForce(appCtx) + }, + "IntlHHGMoveDestSITRequestedAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITRequestedAKZone1SpaceForce(appCtx) + }, + "IntlHHGMoveDestSITRequestedAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITRequestedAKZone2SpaceForce(appCtx) + }, + "IntlHHGMoveDestSITRequestedAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITRequestedAKZone1USMC(appCtx) + }, + "IntlHHGMoveDestSITRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITRequestedAKZone2USMC(appCtx) + }, + // iHHG with BOTH international origin & destination SIT in SUBMITTED status + "IntlHHGMoveBothSITRequestedAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothSITRequestedAKZone1Army(appCtx) + }, + "IntlHHGMoveBothSITRequestedAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothSITRequestedAKZone2Army(appCtx) + }, + "IntlHHGMoveBothSITRequestedAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothSITRequestedAKZone1AirForce(appCtx) + }, + "IntlHHGMoveBothSITRequestedAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothSITRequestedAKZone2AirForce(appCtx) + }, + "IntlHHGMoveBothSITRequestedAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothSITRequestedAKZone1SpaceForce(appCtx) + }, + "IntlHHGMoveBothSITRequestedAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothSITRequestedAKZone2SpaceForce(appCtx) + }, + "IntlHHGMoveBothSITRequestedAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothSITRequestedAKZone1USMC(appCtx) + }, + "IntlHHGMoveBothSITRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothSITRequestedAKZone2USMC(appCtx) + }, + // iHHG with international origin shuttle in SUBMITTED status + "IntlHHGMoveOriginShuttleRequestedAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginShuttleRequestedAKZone1Army(appCtx) + }, + "IntlHHGMoveOriginShuttleRequestedAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginShuttleRequestedAKZone2Army(appCtx) + }, + "IntlHHGMoveOriginShuttleRequestedAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginShuttleRequestedAKZone1AirForce(appCtx) + }, + "IntlHHGMoveOriginShuttleRequestedAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginShuttleRequestedAKZone2AirForce(appCtx) + }, + "IntlHHGMoveOriginShuttleRequestedAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginShuttleRequestedAKZone1SpaceForce(appCtx) + }, + "IntlHHGMoveOriginShuttleRequestedAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginShuttleRequestedAKZone2SpaceForce(appCtx) + }, + "IntlHHGMoveOriginShuttleRequestedAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginShuttleRequestedAKZone1USMC(appCtx) + }, + "IntlHHGMoveOriginShuttleRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginShuttleRequestedAKZone2USMC(appCtx) + }, + // iHHG with international destination shuttle in SUBMITTED status + "IntlHHGMoveDestShuttleRequestedAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestShuttleRequestedAKZone1Army(appCtx) + }, + "IntlHHGMoveDestShuttleRequestedAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestShuttleRequestedAKZone2Army(appCtx) + }, + "IntlHHGMoveDestShuttleRequestedAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestShuttleRequestedAKZone1AirForce(appCtx) + }, + "IntlHHGMoveDestShuttleRequestedAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestShuttleRequestedAKZone2AirForce(appCtx) + }, + "IntlHHGMoveDestShuttleRequestedAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestShuttleRequestedAKZone1SpaceForce(appCtx) + }, + "IntlHHGMoveDestShuttleRequestedAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestShuttleRequestedAKZone2SpaceForce(appCtx) + }, + "IntlHHGMoveDestShuttleRequestedAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestShuttleRequestedAKZone1USMC(appCtx) + }, + "IntlHHGMoveDestShuttleRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestShuttleRequestedAKZone2USMC(appCtx) + }, + // iHHG with BOTH international origin & destination shuttle in SUBMITTED status + "IntlHHGMoveBothShuttleRequestedAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothShuttleRequestedAKZone1Army(appCtx) + }, + "IntlHHGMoveBothShuttleRequestedAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothShuttleRequestedAKZone2Army(appCtx) + }, + "IntlHHGMoveBothShuttleRequestedAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothShuttleRequestedAKZone1AirForce(appCtx) + }, + "IntlHHGMoveBothShuttleRequestedAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothShuttleRequestedAKZone2AirForce(appCtx) + }, + "IntlHHGMoveBothShuttleRequestedAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothShuttleRequestedAKZone1SpaceForce(appCtx) + }, + "IntlHHGMoveBothShuttleRequestedAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothShuttleRequestedAKZone2SpaceForce(appCtx) + }, + "IntlHHGMoveBothShuttleRequestedAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothShuttleRequestedAKZone1USMC(appCtx) + }, + "IntlHHGMoveBothShuttleRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveBothShuttleRequestedAKZone2USMC(appCtx) + }, + // iHHG with a destination address request in REQUESTED status + "IntlHHGMoveDestAddressRequestedAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAddressRequestedAKZone1Army(appCtx) + }, + "IntlHHGMoveDestAddressRequestedAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAddressRequestedAKZone2Army(appCtx) + }, + "IntlHHGMoveDestAddressRequestedAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAddressRequestedAKZone1AirForce(appCtx) + }, + "IntlHHGMoveDestAddressRequestedAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAddressRequestedAKZone2AirForce(appCtx) + }, + "IntlHHGMoveDestAddressRequestedAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAddressRequestedAKZone1SpaceForce(appCtx) + }, + "IntlHHGMoveDestAddressRequestedAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAddressRequestedAKZone2SpaceForce(appCtx) + }, + "IntlHHGMoveDestAddressRequestedAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAddressRequestedAKZone1USMC(appCtx) + }, + "IntlHHGMoveDestAddressRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestAddressRequestedAKZone2USMC(appCtx) + }, + // iHHG with a PENDING SIT extension request + "IntlHHGMoveSITExtensionRequestedAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveSITExtensionRequestedAKZone1Army(appCtx) + }, + "IntlHHGMoveSITExtensionRequestedAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveSITExtensionRequestedAKZone2Army(appCtx) + }, + "IntlHHGMoveSITExtensionRequestedAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveSITExtensionRequestedAKZone1AirForce(appCtx) + }, + "IntlHHGMoveSITExtensionRequestedAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveSITExtensionRequestedAKZone2AirForce(appCtx) + }, + "IntlHHGMoveSITExtensionRequestedAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveSITExtensionRequestedAKZone1SpaceForce(appCtx) + }, + "IntlHHGMoveSITExtensionRequestedAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveSITExtensionRequestedAKZone2SpaceForce(appCtx) + }, + "IntlHHGMoveSITExtensionRequestedAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveSITExtensionRequestedAKZone1USMC(appCtx) + }, + "IntlHHGMoveSITExtensionRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveSITExtensionRequestedAKZone2USMC(appCtx) + }, + // iHHG with a PENDING excess weight notification + "IntlHHGMoveExcessWeightAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveExcessWeightAKZone1Army(appCtx) + }, + "IntlHHGMoveExcessWeightAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveExcessWeightAKZone2Army(appCtx) + }, + // iUB with a PENDING excess UB weight notification + "IntlUBMoveExcessWeightAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlUBMoveExcessWeightAKZone1Army(appCtx) + }, + "IntlUBMoveExcessWeightAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlUBMoveExcessWeightAKZone2Army(appCtx) + }, } func Actions() []string { diff --git a/pkg/testdatagen/testharness/make_move.go b/pkg/testdatagen/testharness/make_move.go index 6a846830c6a..4bfe1ecb32f 100644 --- a/pkg/testdatagen/testharness/make_move.go +++ b/pkg/testdatagen/testharness/make_move.go @@ -9571,3 +9571,1609 @@ func MakeBasicInternationalHHGMoveWithServiceItemsandPaymentRequestsForTIO(appCt return *newmove } + +// makeIntlHHGMoveAKToCONUSSubmitted creates an international HHG move +// with the given affiliation and destination address +// basic iHHG move that will require TOO approval +func makeIntlHHGMoveCONUSToAKSubmitted( + appCtx appcontext.AppContext, + affiliation models.ServiceMemberAffiliation, + streetAddress, city, state, postalCode string, +) models.Move { + userUploader := newUserUploader(appCtx) + userInfo := newUserInfo("customer") + + user := factory.BuildUser(appCtx.DB(), []factory.Customization{ + { + Model: models.User{ + OktaEmail: userInfo.email, + Active: true, + }, + }, + }, nil) + + customer := factory.BuildExtendedServiceMember(appCtx.DB(), []factory.Customization{ + { + Model: models.ServiceMember{ + PersonalEmail: &userInfo.email, + FirstName: &userInfo.firstName, + LastName: &userInfo.lastName, + CacValidated: true, + Affiliation: &affiliation, + }, + }, + { + Model: user, + LinkOnly: true, + }, + }, nil) + + dependentsAuthorized := true + sitDaysAllowance := 90 + entitlements := factory.BuildEntitlement(appCtx.DB(), []factory.Customization{ + { + Model: models.Entitlement{ + DependentsAuthorized: &dependentsAuthorized, + StorageInTransit: &sitDaysAllowance, + }, + }, + }, nil) + + orders := factory.BuildOrder(appCtx.DB(), []factory.Customization{ + { + Model: customer, + LinkOnly: true, + }, + { + Model: entitlements, + LinkOnly: true, + }, + { + Model: models.UserUpload{}, + ExtendedParams: &factory.UserUploadExtendedParams{ + UserUploader: userUploader, + AppContext: appCtx, + }, + }, + }, nil) + + now := time.Now() + move := factory.BuildMove(appCtx.DB(), []factory.Customization{ + { + Model: orders, + LinkOnly: true, + }, + { + Model: models.Move{ + Status: models.MoveStatusServiceCounselingCompleted, + AvailableToPrimeAt: &now, + }, + }, + }, nil) + + requestedPickupDate := now.AddDate(0, 3, 0) + requestedDeliveryDate := requestedPickupDate.AddDate(0, 1, 0) + + // build the destination address using the passed-in parameters. + address := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: streetAddress, + City: city, + State: state, + PostalCode: postalCode, + IsOconus: models.BoolPointer(true), + }, + }, + }, nil) + + shipment := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + ShipmentType: models.MTOShipmentTypeHHG, + Status: models.MTOShipmentStatusSubmitted, + RequestedPickupDate: &requestedPickupDate, + RequestedDeliveryDate: &requestedDeliveryDate, + SITDaysAllowance: &sitDaysAllowance, + DestinationAddressID: &address.ID, + MarketCode: models.MarketCodeInternational, + }, + }, + { + Model: move, + LinkOnly: true, + }, + }, nil) + + agentUserInfo := newUserInfo("agent") + factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOAgent{ + FirstName: &agentUserInfo.firstName, + LastName: &agentUserInfo.lastName, + Email: &agentUserInfo.email, + MTOAgentType: models.MTOAgentReleasing, + }, + }, + }, nil) + + return move +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// contains an HHG shipment in SUBMITTED status that requires TOO approval +func MakeIntlHHGMoveDestAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveCONUSToAKSubmitted(appCtx, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveCONUSToAKSubmitted(appCtx, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveCONUSToAKSubmitted(appCtx, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveCONUSToAKSubmitted(appCtx, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveCONUSToAKSubmitted(appCtx, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveCONUSToAKSubmitted(appCtx, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveCONUSToAKSubmitted(appCtx, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveCONUSToAKSubmitted(appCtx, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// makeIntlHHGMoveAKToCONUSSubmitted creates an international HHG move +// with the given affiliation and pickup address +// basic iHHG move that will require TOO approval +func makeIntlHHGMoveAKToCONUSSubmitted( + appCtx appcontext.AppContext, + affiliation models.ServiceMemberAffiliation, + streetAddress, city, state, postalCode string, +) models.Move { + userUploader := newUserUploader(appCtx) + userInfo := newUserInfo("customer") + + user := factory.BuildUser(appCtx.DB(), []factory.Customization{ + { + Model: models.User{ + OktaEmail: userInfo.email, + Active: true, + }, + }, + }, nil) + + customer := factory.BuildExtendedServiceMember(appCtx.DB(), []factory.Customization{ + { + Model: models.ServiceMember{ + PersonalEmail: &userInfo.email, + FirstName: &userInfo.firstName, + LastName: &userInfo.lastName, + CacValidated: true, + Affiliation: &affiliation, + }, + }, + { + Model: user, + LinkOnly: true, + }, + }, nil) + + dependentsAuthorized := true + sitDaysAllowance := 90 + entitlements := factory.BuildEntitlement(appCtx.DB(), []factory.Customization{ + { + Model: models.Entitlement{ + DependentsAuthorized: &dependentsAuthorized, + StorageInTransit: &sitDaysAllowance, + }, + }, + }, nil) + + orders := factory.BuildOrder(appCtx.DB(), []factory.Customization{ + { + Model: customer, + LinkOnly: true, + }, + { + Model: entitlements, + LinkOnly: true, + }, + { + Model: models.UserUpload{}, + ExtendedParams: &factory.UserUploadExtendedParams{ + UserUploader: userUploader, + AppContext: appCtx, + }, + }, + }, nil) + + now := time.Now() + move := factory.BuildMove(appCtx.DB(), []factory.Customization{ + { + Model: orders, + LinkOnly: true, + }, + { + Model: models.Move{ + Status: models.MoveStatusServiceCounselingCompleted, + AvailableToPrimeAt: &now, + }, + }, + }, nil) + + requestedPickupDate := now.AddDate(0, 3, 0) + requestedDeliveryDate := requestedPickupDate.AddDate(0, 1, 0) + + // build the pickup address using the passed-in parameters. + address := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: streetAddress, + City: city, + State: state, + PostalCode: postalCode, + IsOconus: models.BoolPointer(true), + }, + }, + }, nil) + + shipment := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + ShipmentType: models.MTOShipmentTypeHHG, + Status: models.MTOShipmentStatusSubmitted, + RequestedPickupDate: &requestedPickupDate, + RequestedDeliveryDate: &requestedDeliveryDate, + SITDaysAllowance: &sitDaysAllowance, + PickupAddressID: &address.ID, + MarketCode: models.MarketCodeInternational, + }, + }, + { + Model: move, + LinkOnly: true, + }, + }, nil) + + agentUserInfo := newUserInfo("agent") + factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOAgent{ + FirstName: &agentUserInfo.firstName, + LastName: &agentUserInfo.lastName, + Email: &agentUserInfo.email, + MTOAgentType: models.MTOAgentReleasing, + }, + }, + }, nil) + + return move +} + +// these create an iHHG move with selected affiliation, pickup of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// contains an HHG shipment in SUBMITTED status that requires TOO approval +func MakeIntlHHGMovePickupAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveAKToCONUSSubmitted(appCtx, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMovePickupAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveAKToCONUSSubmitted(appCtx, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMovePickupAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveAKToCONUSSubmitted(appCtx, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMovePickupAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveAKToCONUSSubmitted(appCtx, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMovePickupAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveAKToCONUSSubmitted(appCtx, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMovePickupAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveAKToCONUSSubmitted(appCtx, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMovePickupAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveAKToCONUSSubmitted(appCtx, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMovePickupAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveAKToCONUSSubmitted(appCtx, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// makeIntlHHGMoveDestSITRequested creates an international HHG move +// with the given affiliation and destination address +// parameters determine if ONLY origin or ONLY dest SIT service items are created +// or BOTH origin & dest are created +func makeIntlHHGMoveWithSITRequested( + appCtx appcontext.AppContext, + isOrigin bool, + isBoth bool, + affiliation models.ServiceMemberAffiliation, + streetAddress, city, state, postalCode string, +) models.Move { + userUploader := newUserUploader(appCtx) + userInfo := newUserInfo("customer") + + user := factory.BuildUser(appCtx.DB(), []factory.Customization{ + { + Model: models.User{ + OktaEmail: userInfo.email, + Active: true, + }, + }, + }, nil) + + customer := factory.BuildExtendedServiceMember(appCtx.DB(), []factory.Customization{ + { + Model: models.ServiceMember{ + PersonalEmail: &userInfo.email, + FirstName: &userInfo.firstName, + LastName: &userInfo.lastName, + CacValidated: true, + Affiliation: &affiliation, + }, + }, + { + Model: user, + LinkOnly: true, + }, + }, nil) + + dependentsAuthorized := true + sitDaysAllowance := 90 + entitlements := factory.BuildEntitlement(appCtx.DB(), []factory.Customization{ + { + Model: models.Entitlement{ + DependentsAuthorized: &dependentsAuthorized, + StorageInTransit: &sitDaysAllowance, + }, + }, + }, nil) + + orders := factory.BuildOrder(appCtx.DB(), []factory.Customization{ + { + Model: customer, + LinkOnly: true, + }, + { + Model: entitlements, + LinkOnly: true, + }, + { + Model: models.UserUpload{}, + ExtendedParams: &factory.UserUploadExtendedParams{ + UserUploader: userUploader, + AppContext: appCtx, + }, + }, + }, nil) + + now := time.Now() + move := factory.BuildMove(appCtx.DB(), []factory.Customization{ + { + Model: orders, + LinkOnly: true, + }, + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + AvailableToPrimeAt: &now, + }, + }, + }, nil) + + estimatedWeight := unit.Pound(2000) + actualWeight := unit.Pound(2000) + requestedPickupDate := now.AddDate(0, 3, 0) + requestedDeliveryDate := requestedPickupDate.AddDate(0, 1, 0) + + // build the destination address using the passed-in parameters. + address := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: streetAddress, + City: city, + State: state, + PostalCode: postalCode, + IsOconus: models.BoolPointer(true), + }, + }, + }, nil) + + shipment := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: &estimatedWeight, + PrimeActualWeight: &actualWeight, + ShipmentType: models.MTOShipmentTypeHHG, + Status: models.MTOShipmentStatusApproved, + RequestedPickupDate: &requestedPickupDate, + RequestedDeliveryDate: &requestedDeliveryDate, + SITDaysAllowance: &sitDaysAllowance, + DestinationAddressID: &address.ID, + MarketCode: models.MarketCodeInternational, + }, + }, + { + Model: move, + LinkOnly: true, + }, + }, nil) + + agentUserInfo := newUserInfo("agent") + factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOAgent{ + FirstName: &agentUserInfo.firstName, + LastName: &agentUserInfo.lastName, + Email: &agentUserInfo.email, + MTOAgentType: models.MTOAgentReleasing, + }, + }, + }, nil) + + // build the origin/destination SIT service items and update their status to SUBMITTED + oneMonthLater := now.AddDate(0, 1, 0) + var sitItems models.MTOServiceItems + if isBoth { + sitItems = factory.BuildOriginSITServiceItems(appCtx.DB(), move, shipment, &oneMonthLater, nil) + destSitItems := factory.BuildDestSITServiceItems(appCtx.DB(), move, shipment, &oneMonthLater, nil) + sitItems = append(sitItems, destSitItems...) + } else if isOrigin { + sitItems = factory.BuildOriginSITServiceItems(appCtx.DB(), move, shipment, &oneMonthLater, nil) + } else { + sitItems = factory.BuildDestSITServiceItems(appCtx.DB(), move, shipment, &oneMonthLater, nil) + } + for i := range sitItems { + sitItems[i].Status = models.MTOServiceItemStatusSubmitted + if err := appCtx.DB().Update(&sitItems[i]); err != nil { + log.Panic(fmt.Errorf("failed to update sit service item: %w", err)) + } + } + + return move +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// containing all 4 international origin SIT service items in SUBMITTED status +func MakeIntlHHGMoveOriginSITRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginSITRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveOriginSITRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginSITRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveOriginSITRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginSITRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveOriginSITRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginSITRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// containing all 4 international destination SIT service items in SUBMITTED status +func MakeIntlHHGMoveDestSITRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, false, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestSITRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, false, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestSITRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, false, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestSITRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, false, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestSITRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, false, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestSITRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, false, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestSITRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, false, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestSITRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, false, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// containing all 4 international destination SIT service items AND all 4 origin SIT service items in SUBMITTED status +func MakeIntlHHGMoveBothSITRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, true, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveBothSITRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, true, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveBothSITRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, true, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveBothSITRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, true, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveBothSITRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, true, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveBothSITRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, true, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveBothSITRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, true, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveBothSITRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveWithSITRequested(appCtx, false, true, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// makeIntlHHGMoveDestShuttleRequested creates an international HHG move +// with the given affiliation and destination address +// contains either origin, destination, or BOTH origin/destination shuttle in SUBMITTED status +func makeIntlHHGMoveShuttleRequested( + appCtx appcontext.AppContext, + isOrigin bool, + isBoth bool, + affiliation models.ServiceMemberAffiliation, + streetAddress, city, state, postalCode string, +) models.Move { + userUploader := newUserUploader(appCtx) + userInfo := newUserInfo("customer") + + user := factory.BuildUser(appCtx.DB(), []factory.Customization{ + { + Model: models.User{ + OktaEmail: userInfo.email, + Active: true, + }, + }, + }, nil) + + customer := factory.BuildExtendedServiceMember(appCtx.DB(), []factory.Customization{ + { + Model: models.ServiceMember{ + PersonalEmail: &userInfo.email, + FirstName: &userInfo.firstName, + LastName: &userInfo.lastName, + CacValidated: true, + Affiliation: &affiliation, + }, + }, + { + Model: user, + LinkOnly: true, + }, + }, nil) + + dependentsAuthorized := true + sitDaysAllowance := 90 + entitlements := factory.BuildEntitlement(appCtx.DB(), []factory.Customization{ + { + Model: models.Entitlement{ + DependentsAuthorized: &dependentsAuthorized, + StorageInTransit: &sitDaysAllowance, + }, + }, + }, nil) + + orders := factory.BuildOrder(appCtx.DB(), []factory.Customization{ + { + Model: customer, + LinkOnly: true, + }, + { + Model: entitlements, + LinkOnly: true, + }, + { + Model: models.UserUpload{}, + ExtendedParams: &factory.UserUploadExtendedParams{ + UserUploader: userUploader, + AppContext: appCtx, + }, + }, + }, nil) + + now := time.Now() + move := factory.BuildMove(appCtx.DB(), []factory.Customization{ + { + Model: orders, + LinkOnly: true, + }, + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + AvailableToPrimeAt: &now, + }, + }, + }, nil) + + estimatedWeight := unit.Pound(2000) + actualWeight := unit.Pound(2000) + requestedPickupDate := now.AddDate(0, 3, 0) + requestedDeliveryDate := requestedPickupDate.AddDate(0, 1, 0) + + // build the destination address using the passed-in parameters. + address := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: streetAddress, + City: city, + State: state, + PostalCode: postalCode, + IsOconus: models.BoolPointer(true), + }, + }, + }, nil) + + shipment := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: &estimatedWeight, + PrimeActualWeight: &actualWeight, + ShipmentType: models.MTOShipmentTypeHHG, + Status: models.MTOShipmentStatusApproved, + RequestedPickupDate: &requestedPickupDate, + RequestedDeliveryDate: &requestedDeliveryDate, + SITDaysAllowance: &sitDaysAllowance, + DestinationAddressID: &address.ID, + MarketCode: models.MarketCodeInternational, + }, + }, + { + Model: move, + LinkOnly: true, + }, + }, nil) + + agentUserInfo := newUserInfo("agent") + factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOAgent{ + FirstName: &agentUserInfo.firstName, + LastName: &agentUserInfo.lastName, + Email: &agentUserInfo.email, + MTOAgentType: models.MTOAgentReleasing, + }, + }, + }, nil) + + // build the destination shuttle service item in SUBMITTED status + if isBoth { + factory.BuildMTOServiceItem(appCtx.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIOSHUT, + }, + }, + { + Model: models.MTOServiceItem{ + Reason: models.StringPointer("internatioanl destination shuttle"), + EstimatedWeight: models.PoundPointer(1000), + ActualWeight: models.PoundPointer(1000), + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + + factory.BuildMTOServiceItem(appCtx.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIDSHUT, + }, + }, + { + Model: models.MTOServiceItem{ + Reason: models.StringPointer("internatioanl destination shuttle"), + EstimatedWeight: models.PoundPointer(1000), + ActualWeight: models.PoundPointer(1000), + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + } else if isOrigin { + factory.BuildMTOServiceItem(appCtx.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIOSHUT, + }, + }, + { + Model: models.MTOServiceItem{ + Reason: models.StringPointer("internatioanl destination shuttle"), + EstimatedWeight: models.PoundPointer(1000), + ActualWeight: models.PoundPointer(1000), + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + } else { + factory.BuildMTOServiceItem(appCtx.DB(), []factory.Customization{ + { + Model: models.ReService{ + Code: models.ReServiceCodeIDSHUT, + }, + }, + { + Model: models.MTOServiceItem{ + Reason: models.StringPointer("internatioanl destination shuttle"), + EstimatedWeight: models.PoundPointer(1000), + ActualWeight: models.PoundPointer(1000), + Status: models.MTOServiceItemStatusSubmitted, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: shipment, + LinkOnly: true, + }, + }, nil) + } + + return move +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// containing an international origin shuttle request in SUBMITTED status +func MakeIntlHHGMoveOriginShuttleRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginShuttleRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveOriginShuttleRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginShuttleRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveOriginShuttleRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginShuttleRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveOriginShuttleRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginShuttleRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// containing an international destination shuttle request in SUBMITTED status +func MakeIntlHHGMoveDestShuttleRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestShuttleRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestShuttleRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestShuttleRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestShuttleRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestShuttleRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestShuttleRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestShuttleRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// containing BOTH international origin & destination shuttle requests in SUBMITTED status +func MakeIntlHHGMoveBothShuttleRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveBothShuttleRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveBothShuttleRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveBothShuttleRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveBothShuttleRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveBothShuttleRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveBothShuttleRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveBothShuttleRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// makeIntlHHGMoveDestShuttleRequested creates an international HHG move +// with the given affiliation and destination address +// contains international destination shuttle in SUBMITTED status +func makeIntlHHGMoveDestAddressRequested( + appCtx appcontext.AppContext, + affiliation models.ServiceMemberAffiliation, + streetAddress, city, state, postalCode string, +) models.Move { + userUploader := newUserUploader(appCtx) + userInfo := newUserInfo("customer") + + user := factory.BuildUser(appCtx.DB(), []factory.Customization{ + { + Model: models.User{ + OktaEmail: userInfo.email, + Active: true, + }, + }, + }, nil) + + customer := factory.BuildExtendedServiceMember(appCtx.DB(), []factory.Customization{ + { + Model: models.ServiceMember{ + PersonalEmail: &userInfo.email, + FirstName: &userInfo.firstName, + LastName: &userInfo.lastName, + CacValidated: true, + Affiliation: &affiliation, + }, + }, + { + Model: user, + LinkOnly: true, + }, + }, nil) + + dependentsAuthorized := true + sitDaysAllowance := 90 + entitlements := factory.BuildEntitlement(appCtx.DB(), []factory.Customization{ + { + Model: models.Entitlement{ + DependentsAuthorized: &dependentsAuthorized, + StorageInTransit: &sitDaysAllowance, + }, + }, + }, nil) + + orders := factory.BuildOrder(appCtx.DB(), []factory.Customization{ + { + Model: customer, + LinkOnly: true, + }, + { + Model: entitlements, + LinkOnly: true, + }, + { + Model: models.UserUpload{}, + ExtendedParams: &factory.UserUploadExtendedParams{ + UserUploader: userUploader, + AppContext: appCtx, + }, + }, + }, nil) + + now := time.Now() + move := factory.BuildMove(appCtx.DB(), []factory.Customization{ + { + Model: orders, + LinkOnly: true, + }, + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + AvailableToPrimeAt: &now, + }, + }, + }, nil) + + estimatedWeight := unit.Pound(2000) + actualWeight := unit.Pound(2000) + requestedPickupDate := now.AddDate(0, 3, 0) + requestedDeliveryDate := requestedPickupDate.AddDate(0, 1, 0) + + // build the destination address using the passed-in parameters. + address := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: streetAddress, + City: city, + State: state, + PostalCode: postalCode, + IsOconus: models.BoolPointer(true), + }, + }, + }, nil) + + shipment := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: &estimatedWeight, + PrimeActualWeight: &actualWeight, + ShipmentType: models.MTOShipmentTypeHHG, + Status: models.MTOShipmentStatusApproved, + RequestedPickupDate: &requestedPickupDate, + RequestedDeliveryDate: &requestedDeliveryDate, + SITDaysAllowance: &sitDaysAllowance, + DestinationAddressID: &address.ID, + MarketCode: models.MarketCodeInternational, + }, + }, + { + Model: move, + LinkOnly: true, + }, + }, nil) + + agentUserInfo := newUserInfo("agent") + factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOAgent{ + FirstName: &agentUserInfo.firstName, + LastName: &agentUserInfo.lastName, + Email: &agentUserInfo.email, + MTOAgentType: models.MTOAgentReleasing, + }, + }, + }, nil) + + newDeliveryAddress := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: "Another Cold St.", + City: "Juneau", + State: "AK", + PostalCode: "99811", + }, + }, + }, nil) + + // build the shipment destination address update + factory.BuildShipmentAddressUpdate(appCtx.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: models.ShipmentAddressUpdate{ + Status: models.ShipmentAddressUpdateStatusRequested, + OriginalAddressID: *shipment.DestinationAddressID, + NewAddressID: newDeliveryAddress.ID, + ContractorRemarks: *models.StringPointer("let's move this to another really cold place"), + }, + }, + }, nil) + + return move +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// containing a destination address request that the TOO will be required to review +func MakeIntlHHGMoveDestAddressRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveDestAddressRequested(appCtx, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestAddressRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveDestAddressRequested(appCtx, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestAddressRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveDestAddressRequested(appCtx, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestAddressRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveDestAddressRequested(appCtx, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestAddressRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveDestAddressRequested(appCtx, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestAddressRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveDestAddressRequested(appCtx, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveDestAddressRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveDestAddressRequested(appCtx, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveDestAddressRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveDestAddressRequested(appCtx, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// makeIntlHHGMoveSITExtensionRequested creates an international HHG move +// with the given affiliation and destination address +// contains a SIT extension request requiring TOO action +func makeIntlHHGMoveSITExtensionRequested( + appCtx appcontext.AppContext, + affiliation models.ServiceMemberAffiliation, + streetAddress, city, state, postalCode string, +) models.Move { + userUploader := newUserUploader(appCtx) + userInfo := newUserInfo("customer") + + user := factory.BuildUser(appCtx.DB(), []factory.Customization{ + { + Model: models.User{ + OktaEmail: userInfo.email, + Active: true, + }, + }, + }, nil) + + customer := factory.BuildExtendedServiceMember(appCtx.DB(), []factory.Customization{ + { + Model: models.ServiceMember{ + PersonalEmail: &userInfo.email, + FirstName: &userInfo.firstName, + LastName: &userInfo.lastName, + CacValidated: true, + Affiliation: &affiliation, + }, + }, + { + Model: user, + LinkOnly: true, + }, + }, nil) + + dependentsAuthorized := true + sitDaysAllowance := 90 + entitlements := factory.BuildEntitlement(appCtx.DB(), []factory.Customization{ + { + Model: models.Entitlement{ + DependentsAuthorized: &dependentsAuthorized, + StorageInTransit: &sitDaysAllowance, + }, + }, + }, nil) + + orders := factory.BuildOrder(appCtx.DB(), []factory.Customization{ + { + Model: customer, + LinkOnly: true, + }, + { + Model: entitlements, + LinkOnly: true, + }, + { + Model: models.UserUpload{}, + ExtendedParams: &factory.UserUploadExtendedParams{ + UserUploader: userUploader, + AppContext: appCtx, + }, + }, + }, nil) + + now := time.Now() + move := factory.BuildMove(appCtx.DB(), []factory.Customization{ + { + Model: orders, + LinkOnly: true, + }, + { + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + AvailableToPrimeAt: &now, + }, + }, + }, nil) + + estimatedWeight := unit.Pound(2000) + actualWeight := unit.Pound(2000) + requestedPickupDate := now.AddDate(0, 3, 0) + requestedDeliveryDate := requestedPickupDate.AddDate(0, 1, 0) + + // build the destination address using the passed-in parameters. + address := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: streetAddress, + City: city, + State: state, + PostalCode: postalCode, + IsOconus: models.BoolPointer(true), + }, + }, + }, nil) + + shipment := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: &estimatedWeight, + PrimeActualWeight: &actualWeight, + ShipmentType: models.MTOShipmentTypeHHG, + Status: models.MTOShipmentStatusApproved, + RequestedPickupDate: &requestedPickupDate, + RequestedDeliveryDate: &requestedDeliveryDate, + SITDaysAllowance: &sitDaysAllowance, + DestinationAddressID: &address.ID, + MarketCode: models.MarketCodeInternational, + }, + }, + { + Model: move, + LinkOnly: true, + }, + }, nil) + + agentUserInfo := newUserInfo("agent") + factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOAgent{ + FirstName: &agentUserInfo.firstName, + LastName: &agentUserInfo.lastName, + Email: &agentUserInfo.email, + MTOAgentType: models.MTOAgentReleasing, + }, + }, + }, nil) + + // build the destination SIT service items and update their status to SUBMITTED + oneMonthLater := now.AddDate(0, 1, 0) + factory.BuildDestSITServiceItems(appCtx.DB(), move, shipment, &oneMonthLater, nil) + + // build the SIT extension update + factory.BuildSITDurationUpdate(appCtx.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.SITDurationUpdate{ + Status: models.SITExtensionStatusPending, + ContractorRemarks: models.StringPointer("gimme some more plz"), + }, + }, + }, nil) + + return move +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// containing a destination address request that the TOO will be required to review +func MakeIntlHHGMoveSITExtensionRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveSITExtensionRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveSITExtensionRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveSITExtensionRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveSITExtensionRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveSITExtensionRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveSITExtensionRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveSITExtensionRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// makeIntlHHGMoveCONUSToAKWithExcessWeight creates an international HHG move +// with the given affiliation and destination address +// contains one approved shipment and an pending at-risk excess weight +func makeIntlHHGMoveCONUSToAKWithExcessWeight( + appCtx appcontext.AppContext, + affiliation models.ServiceMemberAffiliation, + streetAddress, city, state, postalCode string, +) models.Move { + userUploader := newUserUploader(appCtx) + userInfo := newUserInfo("customer") + + user := factory.BuildUser(appCtx.DB(), []factory.Customization{ + { + Model: models.User{ + OktaEmail: userInfo.email, + Active: true, + }, + }, + }, nil) + + customer := factory.BuildExtendedServiceMember(appCtx.DB(), []factory.Customization{ + { + Model: models.ServiceMember{ + PersonalEmail: &userInfo.email, + FirstName: &userInfo.firstName, + LastName: &userInfo.lastName, + CacValidated: true, + Affiliation: &affiliation, + }, + }, + { + Model: user, + LinkOnly: true, + }, + }, nil) + + dependentsAuthorized := true + sitDaysAllowance := 90 + entitlements := factory.BuildEntitlement(appCtx.DB(), []factory.Customization{ + { + Model: models.Entitlement{ + DependentsAuthorized: &dependentsAuthorized, + StorageInTransit: &sitDaysAllowance, + }, + }, + }, nil) + + orders := factory.BuildOrder(appCtx.DB(), []factory.Customization{ + { + Model: customer, + LinkOnly: true, + }, + { + Model: entitlements, + LinkOnly: true, + }, + { + Model: models.UserUpload{}, + ExtendedParams: &factory.UserUploadExtendedParams{ + UserUploader: userUploader, + AppContext: appCtx, + }, + }, + }, nil) + + now := time.Now() + move := factory.BuildApprovalsRequestedMove(appCtx.DB(), []factory.Customization{ + { + Model: orders, + LinkOnly: true, + }, + { + Model: models.Move{ + ExcessWeightQualifiedAt: &now, + AvailableToPrimeAt: &now, + }, + }, + }, nil) + + requestedPickupDate := now.AddDate(0, 3, 0) + requestedDeliveryDate := requestedPickupDate.AddDate(0, 1, 0) + + // build the destination address using the passed-in parameters. + address := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: streetAddress, + City: city, + State: state, + PostalCode: postalCode, + IsOconus: models.BoolPointer(true), + }, + }, + }, nil) + + shipment := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: models.PoundPointer(8000), + ShipmentType: models.MTOShipmentTypeHHG, + Status: models.MTOShipmentStatusApproved, + RequestedPickupDate: &requestedPickupDate, + RequestedDeliveryDate: &requestedDeliveryDate, + SITDaysAllowance: &sitDaysAllowance, + DestinationAddressID: &address.ID, + MarketCode: models.MarketCodeInternational, + }, + }, + { + Model: move, + LinkOnly: true, + }, + }, nil) + + agentUserInfo := newUserInfo("agent") + factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOAgent{ + FirstName: &agentUserInfo.firstName, + LastName: &agentUserInfo.lastName, + Email: &agentUserInfo.email, + MTOAgentType: models.MTOAgentReleasing, + }, + }, + }, nil) + + return move +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// containing an excess weight alert that requires action from TOO +func MakeIntlHHGMoveExcessWeightAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveCONUSToAKWithExcessWeight(appCtx, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveExcessWeightAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveCONUSToAKWithExcessWeight(appCtx, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// makeIntlUBMoveCONUSToAKWithExcessWeight creates an international UB move +// with the given affiliation and destination address +// contains one approved shipment and an pending at-risk excess weight +func makeIntlUBMoveCONUSToAKWithExcessWeight( + appCtx appcontext.AppContext, + affiliation models.ServiceMemberAffiliation, + streetAddress, city, state, postalCode string, +) models.Move { + userUploader := newUserUploader(appCtx) + userInfo := newUserInfo("customer") + + user := factory.BuildUser(appCtx.DB(), []factory.Customization{ + { + Model: models.User{ + OktaEmail: userInfo.email, + Active: true, + }, + }, + }, nil) + + customer := factory.BuildExtendedServiceMember(appCtx.DB(), []factory.Customization{ + { + Model: models.ServiceMember{ + PersonalEmail: &userInfo.email, + FirstName: &userInfo.firstName, + LastName: &userInfo.lastName, + CacValidated: true, + Affiliation: &affiliation, + }, + }, + { + Model: user, + LinkOnly: true, + }, + }, nil) + + dependentsAuthorized := true + sitDaysAllowance := 90 + entitlements := factory.BuildEntitlement(appCtx.DB(), []factory.Customization{ + { + Model: models.Entitlement{ + DependentsAuthorized: &dependentsAuthorized, + StorageInTransit: &sitDaysAllowance, + }, + }, + }, nil) + + orders := factory.BuildOrder(appCtx.DB(), []factory.Customization{ + { + Model: customer, + LinkOnly: true, + }, + { + Model: entitlements, + LinkOnly: true, + }, + { + Model: models.UserUpload{}, + ExtendedParams: &factory.UserUploadExtendedParams{ + UserUploader: userUploader, + AppContext: appCtx, + }, + }, + }, nil) + + now := time.Now() + move := factory.BuildApprovalsRequestedMove(appCtx.DB(), []factory.Customization{ + { + Model: orders, + LinkOnly: true, + }, + { + Model: models.Move{ + ExcessUnaccompaniedBaggageWeightQualifiedAt: &now, + AvailableToPrimeAt: &now, + }, + }, + }, nil) + + requestedPickupDate := now.AddDate(0, 3, 0) + requestedDeliveryDate := requestedPickupDate.AddDate(0, 1, 0) + + // build the destination address using the passed-in parameters. + address := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: streetAddress, + City: city, + State: state, + PostalCode: postalCode, + IsOconus: models.BoolPointer(true), + }, + }, + }, nil) + + shipment := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOShipment{ + PrimeEstimatedWeight: models.PoundPointer(2000), + ShipmentType: models.MTOShipmentTypeUnaccompaniedBaggage, + Status: models.MTOShipmentStatusApproved, + RequestedPickupDate: &requestedPickupDate, + RequestedDeliveryDate: &requestedDeliveryDate, + SITDaysAllowance: &sitDaysAllowance, + DestinationAddressID: &address.ID, + MarketCode: models.MarketCodeInternational, + }, + }, + { + Model: move, + LinkOnly: true, + }, + }, nil) + + agentUserInfo := newUserInfo("agent") + factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ + { + Model: shipment, + LinkOnly: true, + }, + { + Model: models.MTOAgent{ + FirstName: &agentUserInfo.firstName, + LastName: &agentUserInfo.lastName, + Email: &agentUserInfo.email, + MTOAgentType: models.MTOAgentReleasing, + }, + }, + }, nil) + + return move +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// containing an excess weight alert that requires action from TOO +func MakeIntlUBMoveExcessWeightAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlUBMoveCONUSToAKWithExcessWeight(appCtx, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlUBMoveExcessWeightAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlUBMoveCONUSToAKWithExcessWeight(appCtx, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} diff --git a/playwright/tests/utils/testharness.js b/playwright/tests/utils/testharness.js index 05055e73787..804472a485c 100644 --- a/playwright/tests/utils/testharness.js +++ b/playwright/tests/utils/testharness.js @@ -702,5 +702,233 @@ export class TestHarness { async buildOfficeUserWithGSR() { return this.buildDefault('OfficeUserWithGSR'); } + + /** + * Use testharness to build international move with requested origin SIT + * @returns {Promise} + */ + async buildIntlHHGMoveOriginSITRequestedAKZone1Army() { + return this.buildDefault('IntlHHGMoveOriginSITRequestedAKZone1Army'); + } + + async buildIntlHHGMoveOriginSITRequestedAKZone2Army() { + return this.buildDefault('IntlHHGMoveOriginSITRequestedAKZone2Army'); + } + + async buildIntlHHGMoveOriginSITRequestedAKZone1AirForce() { + return this.buildDefault('IntlHHGMoveOriginSITRequestedAKZone1AirForce'); + } + + async buildIntlHHGMoveOriginSITRequestedAKZone2AirForce() { + return this.buildDefault('IntlHHGMoveOriginSITRequestedAKZone2AirForce'); + } + + async buildIntlHHGMoveOriginSITRequestedAKZone1SpaceForce() { + return this.buildDefault('IntlHHGMoveOriginSITRequestedAKZone1SpaceForce'); + } + + async buildIntlHHGMoveOriginSITRequestedAKZone2SpaceForce() { + return this.buildDefault('IntlHHGMoveOriginSITRequestedAKZone2SpaceForce'); + } + + async buildIntlHHGMoveOriginSITRequestedAKZone1USMC() { + return this.buildDefault('IntlHHGMoveOriginSITRequestedAKZone1USMC'); + } + + async buildIntlHHGMoveOriginSITRequestedAKZone2USMC() { + return this.buildDefault('IntlHHGMoveOriginSITRequestedAKZone2USMC'); + } + + /** + * Use testharness to build international move with requested destination SIT + * @returns {Promise} + */ + async buildIntlHHGMoveDestSITRequestedAKZone1Army() { + return this.buildDefault('IntlHHGMoveDestSITRequestedAKZone1Army'); + } + + async buildIntlHHGMoveDestSITRequestedAKZone2Army() { + return this.buildDefault('IntlHHGMoveDestSITRequestedAKZone2Army'); + } + + async buildIntlHHGMoveDestSITRequestedAKZone1AirForce() { + return this.buildDefault('IntlHHGMoveDestSITRequestedAKZone1AirForce'); + } + + async buildIntlHHGMoveDestSITRequestedAKZone2AirForce() { + return this.buildDefault('IntlHHGMoveDestSITRequestedAKZone2AirForce'); + } + + async buildIntlHHGMoveDestSITRequestedAKZone1SpaceForce() { + return this.buildDefault('IntlHHGMoveDestSITRequestedAKZone1SpaceForce'); + } + + async buildIntlHHGMoveDestSITRequestedAKZone2SpaceForce() { + return this.buildDefault('IntlHHGMoveDestSITRequestedAKZone2SpaceForce'); + } + + async buildIntlHHGMoveDestSITRequestedAKZone1USMC() { + return this.buildDefault('IntlHHGMoveDestSITRequestedAKZone1USMC'); + } + + async buildIntlHHGMoveDestSITRequestedAKZone2USMC() { + return this.buildDefault('IntlHHGMoveDestSITRequestedAKZone2USMC'); + } + + /** + * Use testharness to build international move with both requested origin & destination SIT + * @returns {Promise} + */ + async buildIntlHHGMoveBothSITRequestedAKZone1Army() { + return this.buildDefault('IntlHHGMoveBothSITRequestedAKZone1Army'); + } + + async buildIntlHHGMoveBothSITRequestedAKZone2Army() { + return this.buildDefault('IntlHHGMoveBothSITRequestedAKZone2Army'); + } + + async buildIntlHHGMoveBothSITRequestedAKZone1AirForce() { + return this.buildDefault('IntlHHGMoveBothSITRequestedAKZone1AirForce'); + } + + async buildIntlHHGMoveBothSITRequestedAKZone2AirForce() { + return this.buildDefault('IntlHHGMoveBothSITRequestedAKZone2AirForce'); + } + + async buildIntlHHGMoveBothSITRequestedAKZone1SpaceForce() { + return this.buildDefault('IntlHHGMoveBothSITRequestedAKZone1SpaceForce'); + } + + async buildIntlHHGMoveBothSITRequestedAKZone2SpaceForce() { + return this.buildDefault('IntlHHGMoveBothSITRequestedAKZone2SpaceForce'); + } + + async buildIntlHHGMoveBothSITRequestedAKZone1USMC() { + return this.buildDefault('IntlHHGMoveBothSITRequestedAKZone1USMC'); + } + + async buildIntlHHGMoveBothSITRequestedAKZone2USMC() { + return this.buildDefault('IntlHHGMoveBothSITRequestedAKZone2USMC'); + } + + /** + * Use testharness to build international move with requested destination shuttle service + * @returns {Promise} + */ + async buildIntlHHGMoveDestShuttleRequestedAKZone1Army() { + return this.buildDefault('IntlHHGMoveDestShuttleRequestedAKZone1Army'); + } + + async buildIntlHHGMoveDestShuttleRequestedAKZone2Army() { + return this.buildDefault('IntlHHGMoveDestShuttleRequestedAKZone2Army'); + } + + async buildIntlHHGMoveDestShuttleRequestedAKZone1AirForce() { + return this.buildDefault('IntlHHGMoveDestShuttleRequestedAKZone1AirForce'); + } + + async buildIntlHHGMoveDestShuttleRequestedAKZone2AirForce() { + return this.buildDefault('IntlHHGMoveDestShuttleRequestedAKZone2AirForce'); + } + + async buildIntlHHGMoveDestShuttleRequestedAKZone1SpaceForce() { + return this.buildDefault('IntlHHGMoveDestShuttleRequestedAKZone1SpaceForce'); + } + + async buildIntlHHGMoveDestShuttleRequestedAKZone2SpaceForce() { + return this.buildDefault('IntlHHGMoveDestShuttleRequestedAKZone2SpaceForce'); + } + + async buildIntlHHGMoveDestShuttleRequestedAKZone1USMC() { + return this.buildDefault('IntlHHGMoveDestShuttleRequestedAKZone1USMC'); + } + + async buildIntlHHGMoveDestShuttleRequestedAKZone2USMC() { + return this.buildDefault('IntlHHGMoveDestShuttleRequestedAKZone2USMC'); + } + + /** + * Use testharness to build international move with requested destination address request + * @returns {Promise} + */ + async buildIntlHHGMoveDestAddressRequestedAKZone1Army() { + return this.buildDefault('IntlHHGMoveDestAddressRequestedAKZone1Army'); + } + + async buildIntlHHGMoveDestAddressRequestedAKZone2Army() { + return this.buildDefault('IntlHHGMoveDestAddressRequestedAKZone2Army'); + } + + async buildIntlHHGMoveDestAddressRequestedAKZone1AirForce() { + return this.buildDefault('IntlHHGMoveDestAddressRequestedAKZone1AirForce'); + } + + async buildIntlHHGMoveDestAddressRequestedAKZone2AirForce() { + return this.buildDefault('IntlHHGMoveDestAddressRequestedAKZone2AirForce'); + } + + async buildIntlHHGMoveDestAddressRequestedAKZone1SpaceForce() { + return this.buildDefault('IntlHHGMoveDestAddressRequestedAKZone1SpaceForce'); + } + + async buildIntlHHGMoveDestAddressRequestedAKZone2SpaceForce() { + return this.buildDefault('IntlHHGMoveDestAddressRequestedAKZone2SpaceForce'); + } + + async buildIntlHHGMoveDestAddressRequestedAKZone1USMC() { + return this.buildDefault('IntlHHGMoveDestAddressRequestedAKZone1USMC'); + } + + async buildIntlHHGMoveDestAddressRequestedAKZone2USMC() { + return this.buildDefault('IntlHHGMoveDestAddressRequestedAKZone2USMC'); + } + + /** + * Use testharness to build international move with a pending SIT extension request + * @returns {Promise} + */ + async buildIntlHHGMoveSITExtensionRequestedAKZone1Army() { + return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone1Army'); + } + + async buildIntlHHGMoveSITExtensionRequestedAKZone2Army() { + return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone2Army'); + } + + async buildIntlHHGMoveSITExtensionRequestedAKZone1AirForce() { + return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone1AirForce'); + } + + async buildIntlHHGMoveSITExtensionRequestedAKZone2AirForce() { + return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone2AirForce'); + } + + async buildIntlHHGMoveSITExtensionRequestedAKZone1SpaceForce() { + return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone1SpaceForce'); + } + + async buildIntlHHGMoveSITExtensionRequestedAKZone2SpaceForce() { + return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone2SpaceForce'); + } + + async buildIntlHHGMoveSITExtensionRequestedAKZone1USMC() { + return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone1USMC'); + } + + async buildIntlHHGMoveSITExtensionRequestedAKZone2USMC() { + return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone2USMC'); + } + + /** + * Use testharness to build international move with an at risk of excess weight + * @returns {Promise} + */ + async buildIntlHHGMoveExcessWeightAKZone1Army() { + return this.buildDefault('IntlHHGMoveExcessWeightAKZone1Army'); + } + + async buildIntlHHGMoveExcessWeightAKZone2Army() { + return this.buildDefault('IntlHHGMoveExcessWeightAKZone2Army'); + } } export default TestHarness; From e4fb0303c1e2a1ae350c1fd6c52f25efe18aa9ee Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Mon, 10 Feb 2025 19:51:59 +0000 Subject: [PATCH 238/260] adding origin SIT extension --- ...st_queue_to_consider_sit_extensions.up.sql | 28 ++++++- pkg/testdatagen/testharness/dispatch.go | 59 +++++++++---- pkg/testdatagen/testharness/make_move.go | 79 +++++++++++++----- playwright/tests/utils/testharness.js | 82 +++++++++++++++---- .../ShipmentServiceItemsTable.test.jsx | 22 ++--- ...pdateServiceItemPricingAndWeights.test.jsx | 6 +- 6 files changed, 206 insertions(+), 70 deletions(-) diff --git a/migrations/app/schema/20250210175754_B22451_update_dest_queue_to_consider_sit_extensions.up.sql b/migrations/app/schema/20250210175754_B22451_update_dest_queue_to_consider_sit_extensions.up.sql index bcfc96ada46..1c3d1ceced6 100644 --- a/migrations/app/schema/20250210175754_B22451_update_dest_queue_to_consider_sit_extensions.up.sql +++ b/migrations/app/schema/20250210175754_B22451_update_dest_queue_to_consider_sit_extensions.up.sql @@ -178,11 +178,14 @@ BEGIN sql_query := sql_query || ' AND (too_user.first_name || '' '' || too_user.last_name) ILIKE ''%'' || $12 || ''%'' '; END IF; - -- add destination queue-specific filters (pending dest address requests, pending dest SIT extension requests, dest SIT & dest shuttle service items) + -- add destination queue-specific filters (pending dest address requests, pending dest SIT extension requests when there are dest SIT service items, submitted dest SIT & dest shuttle service items) sql_query := sql_query || ' AND ( shipment_address_updates.status = ''REQUESTED'' - OR sit_extensions.status = ''PENDING'' + OR ( + sit_extensions.status = ''PENDING'' + AND re_services.code IN (''DDFSIT'', ''DDASIT'', ''DDDSIT'', ''DDSFSC'', ''DDSHUT'', ''IDFSIT'', ''IDASIT'', ''IDDSIT'', ''IDSFSC'', ''IDSHUT'') + ) OR ( mto_service_items.status = ''SUBMITTED'' AND re_services.code IN (''DDFSIT'', ''DDASIT'', ''DDDSIT'', ''DDSFSC'', ''DDSHUT'', ''IDFSIT'', ''IDASIT'', ''IDDSIT'', ''IDSFSC'', ''IDSHUT'') @@ -254,3 +257,24 @@ BEGIN END; $$ LANGUAGE plpgsql; + +-- fixing some capitalization discrepencies for consistency +UPDATE re_services +SET name = 'International POE fuel surcharge' +WHERE name = 'International POE Fuel Surcharge'; + +UPDATE re_services +SET name = 'International POD fuel surcharge' +WHERE name = 'International POD Fuel Surcharge'; + +UPDATE re_services +SET name = 'International destination SIT fuel surcharge' +WHERE name = 'International Destination SIT Fuel Surcharge'; + +UPDATE re_services +SET name = 'International origin SIT fuel surcharge' +WHERE name = 'International Origin SIT Fuel Surcharge'; + +UPDATE re_services +SET name = 'International shipping & linehaul' +WHERE name = 'International Shipping & Linehaul'; \ No newline at end of file diff --git a/pkg/testdatagen/testharness/dispatch.go b/pkg/testdatagen/testharness/dispatch.go index b4b19164d42..7186ca5a5bc 100644 --- a/pkg/testdatagen/testharness/dispatch.go +++ b/pkg/testdatagen/testharness/dispatch.go @@ -500,30 +500,55 @@ var actionDispatcher = map[string]actionFunc{ "IntlHHGMoveDestAddressRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { return MakeIntlHHGMoveDestAddressRequestedAKZone2USMC(appCtx) }, - // iHHG with a PENDING SIT extension request - "IntlHHGMoveSITExtensionRequestedAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { - return MakeIntlHHGMoveSITExtensionRequestedAKZone1Army(appCtx) + // iHHG with a PENDING SIT extension request containing origin SIT + "IntlHHGMoveOriginSITExtensionRequestedAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITExtensionRequestedAKZone1Army(appCtx) }, - "IntlHHGMoveSITExtensionRequestedAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { - return MakeIntlHHGMoveSITExtensionRequestedAKZone2Army(appCtx) + "IntlHHGMoveOriginSITExtensionRequestedAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITExtensionRequestedAKZone2Army(appCtx) }, - "IntlHHGMoveSITExtensionRequestedAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { - return MakeIntlHHGMoveSITExtensionRequestedAKZone1AirForce(appCtx) + "IntlHHGMoveOriginSITExtensionRequestedAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITExtensionRequestedAKZone1AirForce(appCtx) }, - "IntlHHGMoveSITExtensionRequestedAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { - return MakeIntlHHGMoveSITExtensionRequestedAKZone2AirForce(appCtx) + "IntlHHGMoveOriginSITExtensionRequestedAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITExtensionRequestedAKZone2AirForce(appCtx) }, - "IntlHHGMoveSITExtensionRequestedAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { - return MakeIntlHHGMoveSITExtensionRequestedAKZone1SpaceForce(appCtx) + "IntlHHGMoveOriginSITExtensionRequestedAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITExtensionRequestedAKZone1SpaceForce(appCtx) }, - "IntlHHGMoveSITExtensionRequestedAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { - return MakeIntlHHGMoveSITExtensionRequestedAKZone2SpaceForce(appCtx) + "IntlHHGMoveOriginSITExtensionRequestedAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITExtensionRequestedAKZone2SpaceForce(appCtx) }, - "IntlHHGMoveSITExtensionRequestedAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { - return MakeIntlHHGMoveSITExtensionRequestedAKZone1USMC(appCtx) + "IntlHHGMoveOriginSITExtensionRequestedAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITExtensionRequestedAKZone1USMC(appCtx) }, - "IntlHHGMoveSITExtensionRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { - return MakeIntlHHGMoveSITExtensionRequestedAKZone2USMC(appCtx) + "IntlHHGMoveOriginSITExtensionRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveOriginSITExtensionRequestedAKZone2USMC(appCtx) + }, + // iHHG with a PENDING SIT extension request containing destination SIT + "IntlHHGMoveDestSITExtensionRequestedAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITExtensionRequestedAKZone1Army(appCtx) + }, + "IntlHHGMoveDestSITExtensionRequestedAKZone2Army": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITExtensionRequestedAKZone2Army(appCtx) + }, + "IntlHHGMoveDestSITExtensionRequestedAKZone1AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITExtensionRequestedAKZone1AirForce(appCtx) + }, + "IntlHHGMoveDestSITExtensionRequestedAKZone2AirForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITExtensionRequestedAKZone2AirForce(appCtx) + }, + "IntlHHGMoveDestSITExtensionRequestedAKZone1SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITExtensionRequestedAKZone1SpaceForce(appCtx) + }, + "IntlHHGMoveDestSITExtensionRequestedAKZone2SpaceForce": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITExtensionRequestedAKZone2SpaceForce(appCtx) + }, + "IntlHHGMoveDestSITExtensionRequestedAKZone1USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITExtensionRequestedAKZone1USMC(appCtx) + }, + "IntlHHGMoveDestSITExtensionRequestedAKZone2USMC": func(appCtx appcontext.AppContext) testHarnessResponse { + return MakeIntlHHGMoveDestSITExtensionRequestedAKZone2USMC(appCtx) }, // iHHG with a PENDING excess weight notification "IntlHHGMoveExcessWeightAKZone1Army": func(appCtx appcontext.AppContext) testHarnessResponse { diff --git a/pkg/testdatagen/testharness/make_move.go b/pkg/testdatagen/testharness/make_move.go index 4bfe1ecb32f..d88afd7bcc0 100644 --- a/pkg/testdatagen/testharness/make_move.go +++ b/pkg/testdatagen/testharness/make_move.go @@ -10709,6 +10709,7 @@ func MakeIntlHHGMoveDestAddressRequestedAKZone2USMC(appCtx appcontext.AppContext // contains a SIT extension request requiring TOO action func makeIntlHHGMoveSITExtensionRequested( appCtx appcontext.AppContext, + isOrigin bool, affiliation models.ServiceMemberAffiliation, streetAddress, city, state, postalCode string, ) models.Move { @@ -10837,11 +10838,15 @@ func makeIntlHHGMoveSITExtensionRequested( }, }, nil) - // build the destination SIT service items and update their status to SUBMITTED + // build the origin/destination SIT service items oneMonthLater := now.AddDate(0, 1, 0) - factory.BuildDestSITServiceItems(appCtx.DB(), move, shipment, &oneMonthLater, nil) + if isOrigin { + factory.BuildOriginSITServiceItems(appCtx.DB(), move, shipment, &oneMonthLater, nil) + } else { + factory.BuildDestSITServiceItems(appCtx.DB(), move, shipment, &oneMonthLater, nil) + } - // build the SIT extension update + // build the SIT extension update in PENDING status factory.BuildSITDurationUpdate(appCtx.DB(), []factory.Customization{ { Model: shipment, @@ -10859,37 +10864,71 @@ func makeIntlHHGMoveSITExtensionRequested( } // these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) -// containing a destination address request that the TOO will be required to review -func MakeIntlHHGMoveSITExtensionRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +// containing a SIT extension request for a shipment containing origin SIT only +func MakeIntlHHGMoveOriginSITExtensionRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, true, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginSITExtensionRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, true, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveOriginSITExtensionRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, true, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginSITExtensionRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, true, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveOriginSITExtensionRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, true, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginSITExtensionRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, true, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +func MakeIntlHHGMoveOriginSITExtensionRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, true, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +} + +func MakeIntlHHGMoveOriginSITExtensionRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, true, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +} + +// these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) +// containing a SIT extension request for a shipment containing destination SIT only +func MakeIntlHHGMoveDestSITExtensionRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, false, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } -func MakeIntlHHGMoveSITExtensionRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") +func MakeIntlHHGMoveDestSITExtensionRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, false, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") } -func MakeIntlHHGMoveSITExtensionRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +func MakeIntlHHGMoveDestSITExtensionRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, false, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } -func MakeIntlHHGMoveSITExtensionRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +func MakeIntlHHGMoveDestSITExtensionRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, false, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") } -func MakeIntlHHGMoveSITExtensionRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +func MakeIntlHHGMoveDestSITExtensionRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, false, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } -func MakeIntlHHGMoveSITExtensionRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") +func MakeIntlHHGMoveDestSITExtensionRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, false, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") } -func MakeIntlHHGMoveSITExtensionRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") +func MakeIntlHHGMoveDestSITExtensionRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, false, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } -func MakeIntlHHGMoveSITExtensionRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveSITExtensionRequested(appCtx, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") +func MakeIntlHHGMoveDestSITExtensionRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { + return makeIntlHHGMoveSITExtensionRequested(appCtx, false, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") } // makeIntlHHGMoveCONUSToAKWithExcessWeight creates an international HHG move diff --git a/playwright/tests/utils/testharness.js b/playwright/tests/utils/testharness.js index 804472a485c..50782d6ccb5 100644 --- a/playwright/tests/utils/testharness.js +++ b/playwright/tests/utils/testharness.js @@ -884,39 +884,75 @@ export class TestHarness { } /** - * Use testharness to build international move with a pending SIT extension request + * Use testharness to build international move with a pending SIT extension request with origin SIT * @returns {Promise} */ - async buildIntlHHGMoveSITExtensionRequestedAKZone1Army() { - return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone1Army'); + async buildIntlHHGMoveOriginSITExtensionRequestedAKZone1Army() { + return this.buildDefault('IntlHHGMoveOriginSITExtensionRequestedAKZone1Army'); } - async buildIntlHHGMoveSITExtensionRequestedAKZone2Army() { - return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone2Army'); + async buildIntlHHGMoveOriginSITExtensionRequestedAKZone2Army() { + return this.buildDefault('IntlHHGMoveOriginSITExtensionRequestedAKZone2Army'); } - async buildIntlHHGMoveSITExtensionRequestedAKZone1AirForce() { - return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone1AirForce'); + async buildIntlHHGMoveOriginSITExtensionRequestedAKZone1AirForce() { + return this.buildDefault('IntlHHGMoveOriginSITExtensionRequestedAKZone1AirForce'); } - async buildIntlHHGMoveSITExtensionRequestedAKZone2AirForce() { - return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone2AirForce'); + async buildIntlHHGMoveOriginSITExtensionRequestedAKZone2AirForce() { + return this.buildDefault('IntlHHGMoveOriginSITExtensionRequestedAKZone2AirForce'); } - async buildIntlHHGMoveSITExtensionRequestedAKZone1SpaceForce() { - return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone1SpaceForce'); + async buildIntlHHGMoveOriginSITExtensionRequestedAKZone1SpaceForce() { + return this.buildDefault('IntlHHGMoveOriginSITExtensionRequestedAKZone1SpaceForce'); } - async buildIntlHHGMoveSITExtensionRequestedAKZone2SpaceForce() { - return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone2SpaceForce'); + async buildIntlHHGMoveOriginSITExtensionRequestedAKZone2SpaceForce() { + return this.buildDefault('IntlHHGMoveOriginSITExtensionRequestedAKZone2SpaceForce'); } - async buildIntlHHGMoveSITExtensionRequestedAKZone1USMC() { - return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone1USMC'); + async buildIntlHHGMoveOriginSITExtensionRequestedAKZone1USMC() { + return this.buildDefault('IntlHHGMoveOriginSITExtensionRequestedAKZone1USMC'); } - async buildIntlHHGMoveSITExtensionRequestedAKZone2USMC() { - return this.buildDefault('IntlHHGMoveSITExtensionRequestedAKZone2USMC'); + async buildIntlHHGMoveOriginSITExtensionRequestedAKZone2USMC() { + return this.buildDefault('IntlHHGMoveOriginSITExtensionRequestedAKZone2USMC'); + } + + /** + * Use testharness to build international move with a pending SIT extension request with destination SIT + * @returns {Promise} + */ + async buildIntlHHGMoveDestSITExtensionRequestedAKZone1Army() { + return this.buildDefault('IntlHHGMoveDestSITExtensionRequestedAKZone1Army'); + } + + async buildIntlHHGMoveDestSITExtensionRequestedAKZone2Army() { + return this.buildDefault('IntlHHGMoveDestSITExtensionRequestedAKZone2Army'); + } + + async buildIntlHHGMoveDestSITExtensionRequestedAKZone1AirForce() { + return this.buildDefault('IntlHHGMoveDestSITExtensionRequestedAKZone1AirForce'); + } + + async buildIntlHHGMoveDestSITExtensionRequestedAKZone2AirForce() { + return this.buildDefault('IntlHHGMoveDestSITExtensionRequestedAKZone2AirForce'); + } + + async buildIntlHHGMoveDestSITExtensionRequestedAKZone1SpaceForce() { + return this.buildDefault('IntlHHGMoveDestSITExtensionRequestedAKZone1SpaceForce'); + } + + async buildIntlHHGMoveDestSITExtensionRequestedAKZone2SpaceForce() { + return this.buildDefault('IntlHHGMoveDestSITExtensionRequestedAKZone2SpaceForce'); + } + + async buildIntlHHGMoveDestSITExtensionRequestedAKZone1USMC() { + return this.buildDefault('IntlHHGMoveDestSITExtensionRequestedAKZone1USMC'); + } + + async buildIntlHHGMoveDestSITExtensionRequestedAKZone2USMC() { + return this.buildDefault('IntlHHGMoveDestSITExtensionRequestedAKZone2USMC'); } /** @@ -930,5 +966,17 @@ export class TestHarness { async buildIntlHHGMoveExcessWeightAKZone2Army() { return this.buildDefault('IntlHHGMoveExcessWeightAKZone2Army'); } + + /** + * Use testharness to build international move with an at risk of UB excess weight + * @returns {Promise} + */ + async buildIntlUBMoveExcessWeightAKZone1Army() { + return this.buildDefault('IntlUBMoveExcessWeightAKZone1Army'); + } + + async buildIntlUBMoveExcessWeightAKZone2Army() { + return this.buildDefault('IntlUBMoveExcessWeightAKZone2Army'); + } } export default TestHarness; diff --git a/src/components/Office/ShipmentServiceItemsTable/ShipmentServiceItemsTable.test.jsx b/src/components/Office/ShipmentServiceItemsTable/ShipmentServiceItemsTable.test.jsx index 592ae52467a..d896ad62a6f 100644 --- a/src/components/Office/ShipmentServiceItemsTable/ShipmentServiceItemsTable.test.jsx +++ b/src/components/Office/ShipmentServiceItemsTable/ShipmentServiceItemsTable.test.jsx @@ -11,14 +11,14 @@ const reServiceItemResponse = [ isAutoApproved: true, marketCode: 'i', serviceCode: 'POEFSC', - serviceName: 'International POE Fuel Surcharge', + serviceName: 'International POE fuel surcharge', shipmentType: 'UNACCOMPANIED_BAGGAGE', }, { isAutoApproved: true, marketCode: 'i', serviceCode: 'PODFSC', - serviceName: 'International POD Fuel Surcharge', + serviceName: 'International POD fuel surcharge', shipmentType: 'UNACCOMPANIED_BAGGAGE', }, { @@ -46,21 +46,21 @@ const reServiceItemResponse = [ isAutoApproved: true, marketCode: 'i', serviceCode: 'POEFSC', - serviceName: 'International POE Fuel Surcharge', + serviceName: 'International POE fuel surcharge', shipmentType: 'HHG', }, { isAutoApproved: true, marketCode: 'i', serviceCode: 'PODFSC', - serviceName: 'International POD Fuel Surcharge', + serviceName: 'International POD fuel surcharge', shipmentType: 'HHG', }, { isAutoApproved: true, marketCode: 'i', serviceCode: 'ISLH', - serviceName: 'International Shipping & Linehaul', + serviceName: 'International shipping & linehaul', shipmentType: 'HHG', }, { @@ -200,25 +200,25 @@ const reServiceItemResponse = [ { marketCode: 'i', serviceCode: 'IOSFSC', - serviceName: 'International Origin SIT Fuel Surcharge', + serviceName: 'International origin SIT fuel surcharge', shipmentType: 'HHG', }, { marketCode: 'i', serviceCode: 'IDSFSC', - serviceName: 'International Destination SIT Fuel Surcharge', + serviceName: 'International destination SIT fuel surcharge', shipmentType: 'HHG', }, { marketCode: 'i', serviceCode: 'IOSFSC', - serviceName: 'International Origin SIT Fuel Surcharge', + serviceName: 'International origin SIT fuel surcharge', shipmentType: 'UNACCOMPANIED_BAGGAGE', }, { marketCode: 'i', serviceCode: 'IDSFSC', - serviceName: 'International Destination SIT Fuel Surcharge', + serviceName: 'International destination SIT fuel furcharge', shipmentType: 'UNACCOMPANIED_BAGGAGE', }, ]; @@ -371,7 +371,7 @@ describe('Shipment Service Items Table', () => { describe('renders the intl UB shipment type (CONUS -> OCONUS) with service items', () => { it.each([ ['International UB price'], - ['International POE Fuel Surcharge'], + ['International POE fuel surcharge'], ['International UB pack'], ['International UB unpack'], ])('expects %s to be in the document', async (serviceItem) => { @@ -386,7 +386,7 @@ describe('Shipment Service Items Table', () => { describe('renders the intl UB shipment type (OCONUS -> CONUS) with service items', () => { it.each([ ['International UB price'], - ['International POD Fuel Surcharge'], + ['International POD fuel surcharge'], ['International UB pack'], ['International UB unpack'], ])('expects %s to be in the document', async (serviceItem) => { diff --git a/src/constants/MoveHistory/EventTemplates/UpdateMTOServiceItem/updateServiceItemPricingAndWeights.test.jsx b/src/constants/MoveHistory/EventTemplates/UpdateMTOServiceItem/updateServiceItemPricingAndWeights.test.jsx index eae1e8fe630..cfc63966876 100644 --- a/src/constants/MoveHistory/EventTemplates/UpdateMTOServiceItem/updateServiceItemPricingAndWeights.test.jsx +++ b/src/constants/MoveHistory/EventTemplates/UpdateMTOServiceItem/updateServiceItemPricingAndWeights.test.jsx @@ -8,7 +8,7 @@ import t from 'constants/MoveHistory/Database/Tables'; describe('when given an UpdateMTOServiceItem history record with pricing/weight changes', () => { const context = [ { - name: 'International Shipping & Linehaul', + name: 'International shipping & linehaul', shipment_type: 'HHG', shipment_locator: 'RQ38D4-01', shipment_id_abbr: 'a1b2c', @@ -31,7 +31,7 @@ describe('when given an UpdateMTOServiceItem history record with pricing/weight render(template.getDetails(historyRecord)); expect(screen.getByText('Service item')).toBeInTheDocument(); - expect(screen.getByText(/International Shipping & Linehaul/)).toBeInTheDocument(); + expect(screen.getByText(/International shipping & linehaul/)).toBeInTheDocument(); expect(screen.getByText('Estimated Price')).toBeInTheDocument(); expect(screen.getByText(/\$1,500\.00/)).toBeInTheDocument(); }); @@ -52,7 +52,7 @@ describe('when given an UpdateMTOServiceItem history record with pricing/weight render(template.getDetails(historyRecord)); expect(screen.getByText('Service item')).toBeInTheDocument(); - expect(screen.getByText(/International Shipping & Linehaul/)).toBeInTheDocument(); + expect(screen.getByText(/International shipping & linehaul/)).toBeInTheDocument(); expect(screen.getByText('Estimated weight')).toBeInTheDocument(); expect(screen.getByText(/1,000 lbs/)).toBeInTheDocument(); }); From 9b6ba8a64fd2435f0b3eef6746b61a38cafc623c Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Tue, 11 Feb 2025 14:56:30 +0000 Subject: [PATCH 239/260] adding origin and both shuttle to testharness - whoops --- playwright/tests/utils/testharness.js | 72 +++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/playwright/tests/utils/testharness.js b/playwright/tests/utils/testharness.js index 50782d6ccb5..9dd745238ee 100644 --- a/playwright/tests/utils/testharness.js +++ b/playwright/tests/utils/testharness.js @@ -811,6 +811,42 @@ export class TestHarness { return this.buildDefault('IntlHHGMoveBothSITRequestedAKZone2USMC'); } + /** + * Use testharness to build international move with requested origin shuttle service + * @returns {Promise} + */ + async buildIntlHHGMoveOriginShuttleRequestedAKZone1Army() { + return this.buildDefault('IntlHHGMoveOriginShuttleRequestedAKZone1Army'); + } + + async buildIntlHHGMoveOriginShuttleRequestedAKZone2Army() { + return this.buildDefault('IntlHHGMoveOriginShuttleRequestedAKZone2Army'); + } + + async buildIntlHHGMoveOriginShuttleRequestedAKZone1AirForce() { + return this.buildDefault('IntlHHGMoveOriginShuttleRequestedAKZone1AirForce'); + } + + async buildIntlHHGMoveOriginShuttleRequestedAKZone2AirForce() { + return this.buildDefault('IntlHHGMoveOriginShuttleRequestedAKZone2AirForce'); + } + + async buildIntlHHGMoveOriginShuttleRequestedAKZone1SpaceForce() { + return this.buildDefault('IntlHHGMoveOriginShuttleRequestedAKZone1SpaceForce'); + } + + async buildIntlHHGMoveOriginShuttleRequestedAKZone2SpaceForce() { + return this.buildDefault('IntlHHGMoveOriginShuttleRequestedAKZone2SpaceForce'); + } + + async buildIntlHHGMoveOriginShuttleRequestedAKZone1USMC() { + return this.buildDefault('IntlHHGMoveOriginShuttleRequestedAKZone1USMC'); + } + + async buildIntlHHGMoveOriginShuttleRequestedAKZone2USMC() { + return this.buildDefault('IntlHHGMoveOriginShuttleRequestedAKZone2USMC'); + } + /** * Use testharness to build international move with requested destination shuttle service * @returns {Promise} @@ -847,6 +883,42 @@ export class TestHarness { return this.buildDefault('IntlHHGMoveDestShuttleRequestedAKZone2USMC'); } + /** + * Use testharness to build international move with both requested origin & destination shuttle service + * @returns {Promise} + */ + async buildIntlHHGMoveBothShuttleRequestedAKZone1Army() { + return this.buildDefault('IntlHHGMoveBothShuttleRequestedAKZone1Army'); + } + + async buildIntlHHGMoveBothShuttleRequestedAKZone2Army() { + return this.buildDefault('IntlHHGMoveBothShuttleRequestedAKZone2Army'); + } + + async buildIntlHHGMoveBothShuttleRequestedAKZone1AirForce() { + return this.buildDefault('IntlHHGMoveBothShuttleRequestedAKZone1AirForce'); + } + + async buildIntlHHGMoveBothShuttleRequestedAKZone2AirForce() { + return this.buildDefault('IntlHHGMoveBothShuttleRequestedAKZone2AirForce'); + } + + async buildIntlHHGMoveBothShuttleRequestedAKZone1SpaceForce() { + return this.buildDefault('IntlHHGMoveBothShuttleRequestedAKZone1SpaceForce'); + } + + async buildIntlHHGMoveBothShuttleRequestedAKZone2SpaceForce() { + return this.buildDefault('IntlHHGMoveBothShuttleRequestedAKZone2SpaceForce'); + } + + async buildIntlHHGMoveBothShuttleRequestedAKZone1USMC() { + return this.buildDefault('IntlHHGMoveBothShuttleRequestedAKZone1USMC'); + } + + async buildIntlHHGMoveBothShuttleRequestedAKZone2USMC() { + return this.buildDefault('IntlHHGMoveBothShuttleRequestedAKZone2USMC'); + } + /** * Use testharness to build international move with requested destination address request * @returns {Promise} From dce4ccb6bf03e2781ca445213e4957f318e78891 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Tue, 11 Feb 2025 16:07:24 +0000 Subject: [PATCH 240/260] updating comments --- pkg/testdatagen/testharness/make_move.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/testdatagen/testharness/make_move.go b/pkg/testdatagen/testharness/make_move.go index d88afd7bcc0..77a152ca278 100644 --- a/pkg/testdatagen/testharness/make_move.go +++ b/pkg/testdatagen/testharness/make_move.go @@ -9572,7 +9572,7 @@ func MakeBasicInternationalHHGMoveWithServiceItemsandPaymentRequestsForTIO(appCt return *newmove } -// makeIntlHHGMoveAKToCONUSSubmitted creates an international HHG move +// makeIntlHHGMoveCONUSToAKSubmitted creates an international HHG move // with the given affiliation and destination address // basic iHHG move that will require TOO approval func makeIntlHHGMoveCONUSToAKSubmitted( @@ -9904,7 +9904,7 @@ func MakeIntlHHGMovePickupAKZone2USMC(appCtx appcontext.AppContext) models.Move return makeIntlHHGMoveAKToCONUSSubmitted(appCtx, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") } -// makeIntlHHGMoveDestSITRequested creates an international HHG move +// makeIntlHHGMoveWithSITRequested creates an international HHG move // with the given affiliation and destination address // parameters determine if ONLY origin or ONLY dest SIT service items are created // or BOTH origin & dest are created @@ -10164,7 +10164,7 @@ func MakeIntlHHGMoveBothSITRequestedAKZone2USMC(appCtx appcontext.AppContext) mo return makeIntlHHGMoveWithSITRequested(appCtx, false, true, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") } -// makeIntlHHGMoveDestShuttleRequested creates an international HHG move +// makeIntlHHGMoveShuttleRequested creates an international HHG move // with the given affiliation and destination address // contains either origin, destination, or BOTH origin/destination shuttle in SUBMITTED status func makeIntlHHGMoveShuttleRequested( @@ -10503,9 +10503,9 @@ func MakeIntlHHGMoveBothShuttleRequestedAKZone2USMC(appCtx appcontext.AppContext return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") } -// makeIntlHHGMoveDestShuttleRequested creates an international HHG move +// makeIntlHHGMoveDestAddressRequested creates an international HHG move // with the given affiliation and destination address -// contains international destination shuttle in SUBMITTED status +// contains a pending destination address request func makeIntlHHGMoveDestAddressRequested( appCtx appcontext.AppContext, affiliation models.ServiceMemberAffiliation, From 3eae016a4d218197c1c5de4fd717d2f8158d4a14 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Wed, 12 Feb 2025 19:28:19 +0000 Subject: [PATCH 241/260] test fixes --- .../ghcapi/internal/payloads/model_to_payload_test.go | 6 +++--- pkg/services/mto_shipment/shipment_approver_test.go | 4 ++-- src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx | 4 ++-- .../PrimeUIUpdateInternationalFuelSurchargeForm.test.jsx | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go b/pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go index e1f22b64ee8..5ffd6055a9c 100644 --- a/pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go +++ b/pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go @@ -905,7 +905,7 @@ func (suite *PayloadsSuite) TestReServiceItem() { isAutoApproved := true marketCodeInternational := models.MarketCodeInternational reServiceCode := models.ReServiceCodePOEFSC - poefscServiceName := "International POE Fuel Surcharge" + poefscServiceName := "International POE fuel surcharge" reService := models.ReService{ Code: reServiceCode, Name: poefscServiceName, @@ -937,8 +937,8 @@ func (suite *PayloadsSuite) TestReServiceItems() { marketCodeDomestic := models.MarketCodeDomestic poefscReServiceCode := models.ReServiceCodePOEFSC podfscReServiceCode := models.ReServiceCodePODFSC - poefscServiceName := "International POE Fuel Surcharge" - podfscServiceName := "International POD Fuel Surcharge" + poefscServiceName := "International POE fuel surcharge" + podfscServiceName := "International POD fuel surcharge" poefscService := models.ReService{ Code: poefscReServiceCode, Name: poefscServiceName, diff --git a/pkg/services/mto_shipment/shipment_approver_test.go b/pkg/services/mto_shipment/shipment_approver_test.go index 492f0862bad..e84fe0fb282 100644 --- a/pkg/services/mto_shipment/shipment_approver_test.go +++ b/pkg/services/mto_shipment/shipment_approver_test.go @@ -1290,7 +1290,7 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() { } expectedReServiceNames := []string{ "International UB price", - "International POE Fuel Surcharge", + "International POE fuel surcharge", "International UB pack", "International UB unpack", } @@ -1358,7 +1358,7 @@ func (suite *MTOShipmentServiceSuite) TestApproveShipment() { } expectedReServiceNames := []string{ "International UB price", - "International POD Fuel Surcharge", + "International POD fuel surcharge", "International UB pack", "International UB unpack", } diff --git a/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx b/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx index 3a9e0e5885e..ebb408609c2 100644 --- a/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx +++ b/src/pages/PrimeUI/MoveTaskOrder/MoveDetails.test.jsx @@ -179,7 +179,7 @@ const moveTaskOrder = { id: 'serviceItemPOEFSC', moveTaskOrderID: 'aa8dfe13-266a-4956-ac60-01c2355c06d3', mtoShipmentID: '6', - reServiceName: 'International POD Fuel Surcharge', + reServiceName: 'International POD fuel surcharge', status: 'APPROVED', }, { @@ -188,7 +188,7 @@ const moveTaskOrder = { id: 'serviceItemPOEFSC', moveTaskOrderID: 'aa8dfe13-266a-4956-ac60-01c2355c06d3', mtoShipmentID: '5', - reServiceName: 'International POE Fuel Surcharge', + reServiceName: 'International POE fuel surcharge', status: 'APPROVED', }, ], diff --git a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateInternationalFuelSurchargeForm.test.jsx b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateInternationalFuelSurchargeForm.test.jsx index 78461a6e840..7a92ae361d2 100644 --- a/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateInternationalFuelSurchargeForm.test.jsx +++ b/src/pages/PrimeUI/UpdateServiceItems/PrimeUIUpdateInternationalFuelSurchargeForm.test.jsx @@ -12,7 +12,7 @@ const mtoServiceItemID = '38569958-2889-41e5-8101-82c56ec48430'; const serviceItem = { id: mtoServiceItemID, reServiceCode: 'POEFSC', - reServiceName: 'International POE Fuel Surcharge', + reServiceName: 'International POE fuel surcharge', status: 'APPROVED', mtoShipmentID: '38569958-2889-41e5-8102-82c56ec48430', }; @@ -64,7 +64,7 @@ describe('PrimeUIUpdateInternationalFuelSurchargeForm', () => { screen.getByRole('heading', { name: 'Update International Fuel Surcharge Service Item', level: 2 }), ).toBeInTheDocument(); expect( - screen.getByRole('heading', { name: 'POEFSC - International POE Fuel Surcharge', level: 3 }), + screen.getByRole('heading', { name: 'POEFSC - International POE fuel surcharge', level: 3 }), ).toBeInTheDocument(); expect(screen.getByText('Port:')).toBeInTheDocument(); expect(screen.getByText('SEATTLE TACOMA INTL')).toBeInTheDocument(); From 0e706edb90578d9751f3596706b960ae1d422193 Mon Sep 17 00:00:00 2001 From: Daniel Jordan Date: Thu, 13 Feb 2025 20:59:05 +0000 Subject: [PATCH 242/260] updating testharnesses with forgotten mistakes --- pkg/testdatagen/testharness/make_move.go | 180 +++++++++++++++-------- 1 file changed, 117 insertions(+), 63 deletions(-) diff --git a/pkg/testdatagen/testharness/make_move.go b/pkg/testdatagen/testharness/make_move.go index 77a152ca278..fd90060d500 100644 --- a/pkg/testdatagen/testharness/make_move.go +++ b/pkg/testdatagen/testharness/make_move.go @@ -10438,69 +10438,69 @@ func MakeIntlHHGMoveOriginShuttleRequestedAKZone2USMC(appCtx appcontext.AppConte // these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) // containing an international destination shuttle request in SUBMITTED status func MakeIntlHHGMoveDestShuttleRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") + return makeIntlHHGMoveShuttleRequested(appCtx, false, false, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } func MakeIntlHHGMoveDestShuttleRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") + return makeIntlHHGMoveShuttleRequested(appCtx, false, false, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") } func MakeIntlHHGMoveDestShuttleRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") + return makeIntlHHGMoveShuttleRequested(appCtx, false, false, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } func MakeIntlHHGMoveDestShuttleRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") + return makeIntlHHGMoveShuttleRequested(appCtx, false, false, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") } func MakeIntlHHGMoveDestShuttleRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") + return makeIntlHHGMoveShuttleRequested(appCtx, false, false, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } func MakeIntlHHGMoveDestShuttleRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") + return makeIntlHHGMoveShuttleRequested(appCtx, false, false, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") } func MakeIntlHHGMoveDestShuttleRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") + return makeIntlHHGMoveShuttleRequested(appCtx, false, false, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } func MakeIntlHHGMoveDestShuttleRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") + return makeIntlHHGMoveShuttleRequested(appCtx, false, false, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") } // these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) // containing BOTH international origin & destination shuttle requests in SUBMITTED status func MakeIntlHHGMoveBothShuttleRequestedAKZone1Army(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") + return makeIntlHHGMoveShuttleRequested(appCtx, false, true, models.AffiliationARMY, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } func MakeIntlHHGMoveBothShuttleRequestedAKZone2Army(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") + return makeIntlHHGMoveShuttleRequested(appCtx, false, true, models.AffiliationARMY, "Alaska Zone II St.", "North Pole", "AK", "99705") } func MakeIntlHHGMoveBothShuttleRequestedAKZone1AirForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") + return makeIntlHHGMoveShuttleRequested(appCtx, false, true, models.AffiliationAIRFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } func MakeIntlHHGMoveBothShuttleRequestedAKZone2AirForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") + return makeIntlHHGMoveShuttleRequested(appCtx, false, true, models.AffiliationAIRFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") } func MakeIntlHHGMoveBothShuttleRequestedAKZone1SpaceForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") + return makeIntlHHGMoveShuttleRequested(appCtx, false, true, models.AffiliationSPACEFORCE, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } func MakeIntlHHGMoveBothShuttleRequestedAKZone2SpaceForce(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") + return makeIntlHHGMoveShuttleRequested(appCtx, false, true, models.AffiliationSPACEFORCE, "Alaska Zone II St.", "North Pole", "AK", "99705") } func MakeIntlHHGMoveBothShuttleRequestedAKZone1USMC(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") + return makeIntlHHGMoveShuttleRequested(appCtx, false, true, models.AffiliationMARINES, "Alaska Zone I Ave.", "Anchorage", "AK", "99505") } func MakeIntlHHGMoveBothShuttleRequestedAKZone2USMC(appCtx appcontext.AppContext) models.Move { - return makeIntlHHGMoveShuttleRequested(appCtx, true, false, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") + return makeIntlHHGMoveShuttleRequested(appCtx, false, true, models.AffiliationMARINES, "Alaska Zone II St.", "North Pole", "AK", "99705") } // makeIntlHHGMoveDestAddressRequested creates an international HHG move @@ -10550,7 +10550,23 @@ func makeIntlHHGMoveDestAddressRequested( }, }, nil) + var departmentIndicator *string = nil + if affiliation == models.AffiliationAIRFORCE || affiliation == models.AffiliationSPACEFORCE { + departmentIndicator = models.StringPointer(models.DepartmentIndicatorAIRANDSPACEFORCE.String()) + } else if affiliation == models.AffiliationNAVY || affiliation == models.AffiliationMARINES { + departmentIndicator = models.StringPointer(models.DepartmentIndicatorNAVYANDMARINES.String()) + } else if affiliation == models.AffiliationARMY { + departmentIndicator = models.StringPointer(models.DepartmentIndicatorARMY.String()) + } else if affiliation == models.AffiliationCOASTGUARD { + departmentIndicator = models.StringPointer(models.DepartmentIndicatorCOASTGUARD.String()) + } + orders := factory.BuildOrder(appCtx.DB(), []factory.Customization{ + { + Model: models.Order{ + DepartmentIndicator: departmentIndicator, + }, + }, { Model: customer, LinkOnly: true, @@ -10569,18 +10585,6 @@ func makeIntlHHGMoveDestAddressRequested( }, nil) now := time.Now() - move := factory.BuildMove(appCtx.DB(), []factory.Customization{ - { - Model: orders, - LinkOnly: true, - }, - { - Model: models.Move{ - Status: models.MoveStatusAPPROVALSREQUESTED, - AvailableToPrimeAt: &now, - }, - }, - }, nil) estimatedWeight := unit.Pound(2000) actualWeight := unit.Pound(2000) @@ -10600,7 +10604,19 @@ func makeIntlHHGMoveDestAddressRequested( }, }, nil) - shipment := factory.BuildMTOShipment(appCtx.DB(), []factory.Customization{ + newDeliveryAddress := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + { + Model: models.Address{ + StreetAddress1: "Another Cold St.", + City: "Juneau", + State: "AK", + PostalCode: "99811", + }, + }, + }, nil) + + // build the shipment destination address update + shipmentAddressUpdate := factory.BuildShipmentAddressUpdate(appCtx.DB(), []factory.Customization{ { Model: models.MTOShipment{ PrimeEstimatedWeight: &estimatedWeight, @@ -10615,59 +10631,61 @@ func makeIntlHHGMoveDestAddressRequested( }, }, { - Model: move, - LinkOnly: true, + Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, + AvailableToPrimeAt: &now, + Show: models.BoolPointer(true), + }, }, - }, nil) - - agentUserInfo := newUserInfo("agent") - factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ { - Model: shipment, - LinkOnly: true, + Model: models.ShipmentAddressUpdate{ + Status: models.ShipmentAddressUpdateStatusRequested, + OriginalAddressID: address.ID, + NewAddressID: newDeliveryAddress.ID, + ContractorRemarks: *models.StringPointer("let's move this to another really cold place"), + }, }, { - Model: models.MTOAgent{ - FirstName: &agentUserInfo.firstName, - LastName: &agentUserInfo.lastName, - Email: &agentUserInfo.email, - MTOAgentType: models.MTOAgentReleasing, - }, + Model: orders, + LinkOnly: true, }, }, nil) - newDeliveryAddress := factory.BuildAddress(appCtx.DB(), []factory.Customization{ + factory.BuildMTOServiceItemBasic(appCtx.DB(), []factory.Customization{ { - Model: models.Address{ - StreetAddress1: "Another Cold St.", - City: "Juneau", - State: "AK", - PostalCode: "99811", + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + MTOShipmentID: &shipmentAddressUpdate.Shipment.ID, }, }, - }, nil) - - // build the shipment destination address update - factory.BuildShipmentAddressUpdate(appCtx.DB(), []factory.Customization{ { - Model: shipment, + Model: shipmentAddressUpdate.Shipment.MoveTaskOrder, LinkOnly: true, }, { - Model: move, + Model: models.ReService{ + Code: models.ReServiceCodeMS, + }, + }, + }, nil) + + agentUserInfo := newUserInfo("agent") + factory.BuildMTOAgent(appCtx.DB(), []factory.Customization{ + { + Model: shipmentAddressUpdate.Shipment, LinkOnly: true, }, { - Model: models.ShipmentAddressUpdate{ - Status: models.ShipmentAddressUpdateStatusRequested, - OriginalAddressID: *shipment.DestinationAddressID, - NewAddressID: newDeliveryAddress.ID, - ContractorRemarks: *models.StringPointer("let's move this to another really cold place"), + Model: models.MTOAgent{ + FirstName: &agentUserInfo.firstName, + LastName: &agentUserInfo.lastName, + Email: &agentUserInfo.email, + MTOAgentType: models.MTOAgentReleasing, }, }, }, nil) - return move + return shipmentAddressUpdate.Shipment.MoveTaskOrder } // these create an iHHG move with selected affiliation, destination of either Anchorage, AK (Zone I) or Fairbanks, AK (Zone II) @@ -10997,15 +11015,15 @@ func makeIntlHHGMoveCONUSToAKWithExcessWeight( }, nil) now := time.Now() - move := factory.BuildApprovalsRequestedMove(appCtx.DB(), []factory.Customization{ + move := factory.BuildAvailableToPrimeMove(appCtx.DB(), []factory.Customization{ { Model: orders, LinkOnly: true, }, { Model: models.Move{ + Status: models.MoveStatusAPPROVALSREQUESTED, ExcessWeightQualifiedAt: &now, - AvailableToPrimeAt: &now, }, }, }, nil) @@ -11061,6 +11079,24 @@ func makeIntlHHGMoveCONUSToAKWithExcessWeight( }, }, nil) + factory.BuildMTOServiceItemBasic(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + MTOShipmentID: &shipment.ID, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeMS, + }, + }, + }, nil) + return move } @@ -11204,6 +11240,24 @@ func makeIntlUBMoveCONUSToAKWithExcessWeight( }, }, nil) + factory.BuildMTOServiceItemBasic(appCtx.DB(), []factory.Customization{ + { + Model: models.MTOServiceItem{ + Status: models.MTOServiceItemStatusApproved, + MTOShipmentID: &shipment.ID, + }, + }, + { + Model: move, + LinkOnly: true, + }, + { + Model: models.ReService{ + Code: models.ReServiceCodeMS, + }, + }, + }, nil) + return move } From 87be48feb16a064f11a407a36b85f6e760c9c53e Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 19 Feb 2025 12:48:29 -0600 Subject: [PATCH 243/260] fingers crossed --- Dockerfile.migrations | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.migrations b/Dockerfile.migrations index a1e8f21dc60..d083933d967 100644 --- a/Dockerfile.migrations +++ b/Dockerfile.migrations @@ -30,5 +30,5 @@ COPY migrations/app/ddl_types_migrations_manifest.txt /migrate/ddl_types_migrati COPY migrations/app/ddl_tables_migrations_manifest.txt /migrate/ddl_tables_migrations_manifest.txt COPY migrations/app/ddl_views_migrations_manifest.txt /migrate/ddl_views_migrations_manifest.txt COPY migrations/app/ddl_functions_migrations_manifest.txt /migrate/ddl_functions_migrations_manifest.txt - -ENTRYPOINT ["/bin/milmove", "migrate", "-p", "file:///migrate/migrations", "-m", "/migrate/migrations_manifest.txt"] \ No newline at end of file +# hadolint ignore=DL3025 +ENTRYPOINT ["/bin/milmove", "migrate", "-p", "file:///migrate/migrations", "-m", "/migrate/migrations_manifest.txt", '-d', 'file:///migrate/dml_migrations_manifest.txt', '-t', 'file:///migrate/ddl_types_migrations_manifest.txt', '-T', 'file:///migrate/ddl_tables_migrations_manifest.txt', '-V', 'file:///migrate/ddl_views_migrations_manifest.txt', '-F', 'file:///migrate/ddl_functions_migrations_manifest.txt'] \ No newline at end of file From 8273374200ae7dc6db1e9c7a1fb3c2054acbd622 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 19 Feb 2025 13:32:34 -0600 Subject: [PATCH 244/260] corrections --- Dockerfile.migrations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.migrations b/Dockerfile.migrations index d083933d967..b7d6006dbfc 100644 --- a/Dockerfile.migrations +++ b/Dockerfile.migrations @@ -31,4 +31,4 @@ COPY migrations/app/ddl_tables_migrations_manifest.txt /migrate/ddl_tables_migra COPY migrations/app/ddl_views_migrations_manifest.txt /migrate/ddl_views_migrations_manifest.txt COPY migrations/app/ddl_functions_migrations_manifest.txt /migrate/ddl_functions_migrations_manifest.txt # hadolint ignore=DL3025 -ENTRYPOINT ["/bin/milmove", "migrate", "-p", "file:///migrate/migrations", "-m", "/migrate/migrations_manifest.txt", '-d', 'file:///migrate/dml_migrations_manifest.txt', '-t', 'file:///migrate/ddl_types_migrations_manifest.txt', '-T', 'file:///migrate/ddl_tables_migrations_manifest.txt', '-V', 'file:///migrate/ddl_views_migrations_manifest.txt', '-F', 'file:///migrate/ddl_functions_migrations_manifest.txt'] \ No newline at end of file +ENTRYPOINT ["/bin/milmove", "migrate", "-p", "file:///migrate/migrations", "-m", "/migrate/migrations_manifest.txt", '-d', 'file:///migrate/dml_migrations_manifest.txt', '-t', 'file:///migrate/ddl_types_manifest.txt', '-T', 'file:///migrate/ddl_tables_manifest.txt', '-V', 'file:///migrate/ddl_views_manifest.txt', '-F', 'file:///migrate/ddl_functions_manifest.txt'] \ No newline at end of file From a1a82f181e40d8e7fb38179001ac5836658add6e Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 19 Feb 2025 13:45:55 -0600 Subject: [PATCH 245/260] more --- Dockerfile.migrations | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.migrations b/Dockerfile.migrations index b7d6006dbfc..d5fa6ca1ee1 100644 --- a/Dockerfile.migrations +++ b/Dockerfile.migrations @@ -26,9 +26,9 @@ COPY migrations/app/ddl_migrations/ddl_views /migrate/ddl_migrations/ddl_views COPY migrations/app/ddl_migrations/ddl_functions /migrate/ddl_migrations/ddl_functions COPY migrations/app/migrations_manifest.txt /migrate/migrations_manifest.txt COPY migrations/app/dml_migrations_manifest.txt /migrate/dml_migrations_manifest.txt -COPY migrations/app/ddl_types_migrations_manifest.txt /migrate/ddl_types_migrations_manifest.txt -COPY migrations/app/ddl_tables_migrations_manifest.txt /migrate/ddl_tables_migrations_manifest.txt -COPY migrations/app/ddl_views_migrations_manifest.txt /migrate/ddl_views_migrations_manifest.txt -COPY migrations/app/ddl_functions_migrations_manifest.txt /migrate/ddl_functions_migrations_manifest.txt +COPY migrations/app/ddl_types_manifest.txt /migrate/ddl_types_manifest.txt +COPY migrations/app/ddl_tables_manifest.txt /migrate/ddl_tables_manifest.txt +COPY migrations/app/ddl_views_manifest.txt /migrate/ddl_views_manifest.txt +COPY migrations/app/ddl_functions_manifest.txt /migrate/ddl_functions_manifest.txt # hadolint ignore=DL3025 ENTRYPOINT ["/bin/milmove", "migrate", "-p", "file:///migrate/migrations", "-m", "/migrate/migrations_manifest.txt", '-d', 'file:///migrate/dml_migrations_manifest.txt', '-t', 'file:///migrate/ddl_types_manifest.txt', '-T', 'file:///migrate/ddl_tables_manifest.txt', '-V', 'file:///migrate/ddl_views_manifest.txt', '-F', 'file:///migrate/ddl_functions_manifest.txt'] \ No newline at end of file From 5417e78da0abd9d401f4073985ba6afbb07c306c Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 19 Feb 2025 14:44:12 -0600 Subject: [PATCH 246/260] i hate things --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47b682bde16..685b5aadaa6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,10 +221,10 @@ stages: export DB_PORT=5432 export MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/migrations_manifest.txt' export DML_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' - export DDL_TYPES_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' - export DDL_TABLES_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' - export DDL_VIEWS_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' - export DDL_FUNCTIONS_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' + export DDL_TYPES_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_manifest.txt' + export DDL_TABLES_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_manifest.txt' + export DDL_VIEWS_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_manifest.txt' + export DDL_FUNCTIONS_MIGRATION_MANIFEST='/builds/milmove/mymove/migrations/app/ddl_types_manifest.txt' export MIGRATION_PATH='file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' export DDL_TYPES_MIGRATION_PATH='file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' export DDL_TABLES_MIGRATION_PATH='file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' @@ -967,10 +967,10 @@ integration_test_devseed: DB_NAME_DEV: dev_db MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' - DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' - DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' - DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' - DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' From bb075d5543c6557c394843b2c2e2fe53106e9f19 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Wed, 19 Feb 2025 15:44:57 -0600 Subject: [PATCH 247/260] logging for visibility --- .gitlab-ci.yml | 40 ++++++++++++++++++++-------------------- cmd/milmove/migrate.go | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 685b5aadaa6..50436ea7430 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -799,10 +799,10 @@ server_test: DTOD_USE_MOCK: 'true' MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' - DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' - DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' - DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' - DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' @@ -1051,10 +1051,10 @@ integration_test_mtls: DB_NAME_DEV: dev_db MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' - DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' - DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' - DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' - DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' @@ -1113,10 +1113,10 @@ integration_test_admin: DB_NAME_DEV: dev_db MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' - DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' - DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' - DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' - DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' @@ -1180,10 +1180,10 @@ integration_test_my: DB_NAME_DEV: dev_db MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' - DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' - DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' - DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' - DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' @@ -1248,10 +1248,10 @@ integration_test_office: DB_NAME_DEV: dev_db MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/migrations_manifest.txt' DML_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/dml_migrations_manifest.txt' - DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_migrations_manifest.txt' - DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_migrations_manifest.txt' - DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_migrations_manifest.txt' - DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_migrations_manifest.txt' + DDL_TYPES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_types_manifest.txt' + DDL_TABLES_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_tables_manifest.txt' + DDL_VIEWS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_views_manifest.txt' + DDL_FUNCTIONS_MIGRATION_MANIFEST: '/builds/milmove/mymove/migrations/app/ddl_functions_manifest.txt' MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/schema;file:///builds/milmove/mymove/migrations/app/secure' DDL_TYPES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_types' DDL_TABLES_MIGRATION_PATH: 'file:///builds/milmove/mymove/migrations/app/ddl_migrations/ddl_tables' diff --git a/cmd/milmove/migrate.go b/cmd/milmove/migrate.go index 265b4ac396b..8e3abb98e78 100644 --- a/cmd/milmove/migrate.go +++ b/cmd/milmove/migrate.go @@ -333,7 +333,7 @@ func migrateFunction(cmd *cobra.Command, args []string) error { for _, ddlObj := range ddlObjects { logger.Info(fmt.Sprintf("=== Processing %s ===", ddlObj.name)) - + logger.Info(fmt.Sprintf("Using manifest %q", ddlObj.manifest)) filenames, errListFiles := fileHelper.ListFiles(ddlObj.path, s3Client) if errListFiles != nil { logger.Fatal(fmt.Sprintf("Error listing %s directory %s", ddlObj.name, ddlObj.path), zap.Error(errListFiles)) From 17ecd21945a93003646de43094291777d5102c1b Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 20 Feb 2025 08:44:22 -0600 Subject: [PATCH 248/260] fix entry point --- Dockerfile.migrations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.migrations b/Dockerfile.migrations index d5fa6ca1ee1..f6d81bfd325 100644 --- a/Dockerfile.migrations +++ b/Dockerfile.migrations @@ -31,4 +31,4 @@ COPY migrations/app/ddl_tables_manifest.txt /migrate/ddl_tables_manifest.txt COPY migrations/app/ddl_views_manifest.txt /migrate/ddl_views_manifest.txt COPY migrations/app/ddl_functions_manifest.txt /migrate/ddl_functions_manifest.txt # hadolint ignore=DL3025 -ENTRYPOINT ["/bin/milmove", "migrate", "-p", "file:///migrate/migrations", "-m", "/migrate/migrations_manifest.txt", '-d', 'file:///migrate/dml_migrations_manifest.txt', '-t', 'file:///migrate/ddl_types_manifest.txt', '-T', 'file:///migrate/ddl_tables_manifest.txt', '-V', 'file:///migrate/ddl_views_manifest.txt', '-F', 'file:///migrate/ddl_functions_manifest.txt'] \ No newline at end of file +ENTRYPOINT ["/bin/milmove", "migrate", "-p", "file:///migrate/migrations", "-m", "/migrate/migrations_manifest.txt", '-d', '/migrate/dml_migrations_manifest.txt', '-t', '/migrate/ddl_types_manifest.txt', '-T', '/migrate/ddl_tables_manifest.txt', '-V', '/migrate/ddl_views_manifest.txt', '-F', '/migrate/ddl_functions_manifest.txt'] \ No newline at end of file From 35d6a1396c30fe8656cd7d5a8e4ceffff2def4bb Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 20 Feb 2025 10:05:28 -0600 Subject: [PATCH 249/260] ADD VARS --- config/env/exp.migrations.env | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/env/exp.migrations.env b/config/env/exp.migrations.env index 346e85f8d21..0e87f4ae461 100644 --- a/config/env/exp.migrations.env +++ b/config/env/exp.migrations.env @@ -6,3 +6,8 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt +DDM_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt +DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt +DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt +DDL_FUNCTIONS_MIGRATION_MANIFEST=/migrate/ddl_functions_manifest.txt From 6799a3f7f114f9b5e4a14e09fc72758c11506fe7 Mon Sep 17 00:00:00 2001 From: Cory Kleinjan Date: Thu, 20 Feb 2025 16:23:45 +0000 Subject: [PATCH 250/260] Adding in line removed by merge --- .../shipment_address_update_requester.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b4ccbf82b8f..0cb8ba3c123 100644 --- a/pkg/services/shipment_address_update/shipment_address_update_requester.go +++ b/pkg/services/shipment_address_update/shipment_address_update_requester.go @@ -534,7 +534,7 @@ func (f *shipmentAddressUpdateRequester) ReviewShipmentAddressChange(appCtx appc shipmentHasApprovedDestSIT := f.doesShipmentContainApprovedDestinationSIT(shipmentDetails) for i, serviceItem := range shipmentDetails.MTOServiceItems { - if shipment.PrimeEstimatedWeight != nil || shipment.PrimeActualWeight != nil { + if shipment.MarketCode != models.MarketCodeInternational && shipment.PrimeEstimatedWeight != nil || shipment.MarketCode != models.MarketCodeInternational && shipment.PrimeActualWeight != nil { var updatedServiceItem *models.MTOServiceItem if serviceItem.ReService.Code == models.ReServiceCodeDDP || serviceItem.ReService.Code == models.ReServiceCodeDUPK { updatedServiceItem, err = serviceItemUpdater.UpdateMTOServiceItemPricingEstimate(appCtx, &serviceItem, shipment, etag.GenerateEtag(serviceItem.UpdatedAt)) From 6815b692ba23a09041f15fe0dc8cc85413efa646 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 20 Feb 2025 11:08:01 -0600 Subject: [PATCH 251/260] add other env vars --- config/env/demo.migrations.env | 5 +++++ config/env/loadtest.migrations.env | 5 +++++ config/env/prd.migrations.env | 5 +++++ config/env/stg.migrations.env | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/config/env/demo.migrations.env b/config/env/demo.migrations.env index 346e85f8d21..06edb920012 100644 --- a/config/env/demo.migrations.env +++ b/config/env/demo.migrations.env @@ -6,3 +6,8 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt +DDM_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt +DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt +DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt +DDL_FUNCTIONS_MIGRATION_MANIFEST=/migrate/ddl_functions_manifest.txt \ No newline at end of file diff --git a/config/env/loadtest.migrations.env b/config/env/loadtest.migrations.env index 346e85f8d21..06edb920012 100644 --- a/config/env/loadtest.migrations.env +++ b/config/env/loadtest.migrations.env @@ -6,3 +6,8 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt +DDM_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt +DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt +DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt +DDL_FUNCTIONS_MIGRATION_MANIFEST=/migrate/ddl_functions_manifest.txt \ No newline at end of file diff --git a/config/env/prd.migrations.env b/config/env/prd.migrations.env index 346e85f8d21..06edb920012 100644 --- a/config/env/prd.migrations.env +++ b/config/env/prd.migrations.env @@ -6,3 +6,8 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt +DDM_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt +DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt +DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt +DDL_FUNCTIONS_MIGRATION_MANIFEST=/migrate/ddl_functions_manifest.txt \ No newline at end of file diff --git a/config/env/stg.migrations.env b/config/env/stg.migrations.env index 346e85f8d21..06edb920012 100644 --- a/config/env/stg.migrations.env +++ b/config/env/stg.migrations.env @@ -6,3 +6,8 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt +DDM_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt +DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt +DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt +DDL_FUNCTIONS_MIGRATION_MANIFEST=/migrate/ddl_functions_manifest.txt \ No newline at end of file From 1613ef428b7b541b2d7aacf1df2a0b98858a81b4 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 20 Feb 2025 11:58:24 -0600 Subject: [PATCH 252/260] fix dml var --- config/env/demo.migrations.env | 2 +- config/env/exp.migrations.env | 2 +- config/env/loadtest.migrations.env | 2 +- config/env/prd.migrations.env | 2 +- config/env/stg.migrations.env | 2 +- scripts/generate-ddl-migration | 20 ++++++++++---------- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/env/demo.migrations.env b/config/env/demo.migrations.env index 06edb920012..07b7f700de0 100644 --- a/config/env/demo.migrations.env +++ b/config/env/demo.migrations.env @@ -6,7 +6,7 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt -DDM_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DML_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt diff --git a/config/env/exp.migrations.env b/config/env/exp.migrations.env index 0e87f4ae461..d306b4de46b 100644 --- a/config/env/exp.migrations.env +++ b/config/env/exp.migrations.env @@ -6,7 +6,7 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt -DDM_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DML_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt diff --git a/config/env/loadtest.migrations.env b/config/env/loadtest.migrations.env index 06edb920012..07b7f700de0 100644 --- a/config/env/loadtest.migrations.env +++ b/config/env/loadtest.migrations.env @@ -6,7 +6,7 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt -DDM_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DML_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt diff --git a/config/env/prd.migrations.env b/config/env/prd.migrations.env index 06edb920012..07b7f700de0 100644 --- a/config/env/prd.migrations.env +++ b/config/env/prd.migrations.env @@ -6,7 +6,7 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt -DDM_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DML_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt diff --git a/config/env/stg.migrations.env b/config/env/stg.migrations.env index 06edb920012..07b7f700de0 100644 --- a/config/env/stg.migrations.env +++ b/config/env/stg.migrations.env @@ -6,7 +6,7 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt -DDM_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DML_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt diff --git a/scripts/generate-ddl-migration b/scripts/generate-ddl-migration index 794f4904157..06a297168c2 100755 --- a/scripts/generate-ddl-migration +++ b/scripts/generate-ddl-migration @@ -1,22 +1,22 @@ #!/bin/bash dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -version=$(date +"%Y%m%d%H%M%S") +#version=$(date +"%Y%m%d%H%M%S") filename=$1 type=$2 if [ "$type" == "functions" ]; then - echo "${version}_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_functions_manifest.txt" - touch "${dir}/../migrations/app/ddl_migrations/ddl_functions/${version}_${filename}.up.sql" + echo "fn_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_functions_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_functions/fn_${filename}.up.sql" elif [ "$type" == "tables" ]; then - echo "${version}_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_tables_manifest.txt" - touch "${dir}/../migrations/app/ddl_migrations/ddl_tables/${version}_${filename}.up.sql" + echo "tbl_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_tables_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_tables/tbl_${filename}.up.sql" elif [ "$type" == "types" ]; then - echo "${version}_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_types_manifest.txt" - touch "${dir}/../migrations/app/ddl_migrations/ddl_types/${version}_${filename}.up.sql" + echo "ty_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_types_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_types/ty_${filename}.up.sql" elif [ "$type" == "views" ]; then - echo "${version}_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_views_manifest.txt" - touch "${dir}/../migrations/app/ddl_migrations/ddl_views/${version}_${filename}.up.sql" + echo "vw_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_views_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_views/vw_${filename}.up.sql" else - touch "${dir}/../migrations/app/ddl_migrations/${version}_${filename}.up.sql" + echo "Invalid type" fi From c618fdb4db2e9a3137885713b5d2920292cb4400 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 20 Feb 2025 13:14:48 -0600 Subject: [PATCH 253/260] dml typo --- pkg/cli/migration.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cli/migration.go b/pkg/cli/migration.go index 60f7b0a8419..bf54e72ab55 100644 --- a/pkg/cli/migration.go +++ b/pkg/cli/migration.go @@ -35,7 +35,7 @@ var ( // InitMigrationFlags initializes the Migration command line flags func InitMigrationFlags(flag *pflag.FlagSet) { flag.StringP(MigrationManifestFlag, "m", "migrations/app/migrations_manifest.txt", "Path to the manifest") - flag.StringP(DMLMigrationManifestFlag, "d", "migrations/app/migrations_manifest.txt", "Path to the manifest") + flag.StringP(DMLMigrationManifestFlag, "d", "migrations/app/dml_migrations_manifest.txt", "Path to the manifest") flag.DurationP(MigrationWaitFlag, "w", time.Millisecond*10, "duration to wait when polling for new data from migration file") flag.String(DDLTablesMigrationPathFlag, "", "Path to DDL tables migrations directory") flag.String(DDLTablesMigrationManifestFlag, "", "Path to DDL tables migrations manifest") From d427255b72224f7c41f0433c2a28e91e3e308b5c Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 20 Feb 2025 14:18:39 -0600 Subject: [PATCH 254/260] dml_migration_manifest --- config/env/demo.migrations.env | 2 +- config/env/exp.migrations.env | 2 +- config/env/loadtest.migrations.env | 2 +- config/env/prd.migrations.env | 2 +- config/env/stg.migrations.env | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/env/demo.migrations.env b/config/env/demo.migrations.env index 07b7f700de0..b407f1c498c 100644 --- a/config/env/demo.migrations.env +++ b/config/env/demo.migrations.env @@ -6,7 +6,7 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt -DML_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DML_MIGRATION_MANIFEST=/migrate/dml_migrations_manifest.txt DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt diff --git a/config/env/exp.migrations.env b/config/env/exp.migrations.env index d306b4de46b..d215d9e7797 100644 --- a/config/env/exp.migrations.env +++ b/config/env/exp.migrations.env @@ -6,7 +6,7 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt -DML_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DML_MIGRATION_MANIFEST=/migrate/dml_migrations_manifest.txt DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt diff --git a/config/env/loadtest.migrations.env b/config/env/loadtest.migrations.env index 07b7f700de0..b407f1c498c 100644 --- a/config/env/loadtest.migrations.env +++ b/config/env/loadtest.migrations.env @@ -6,7 +6,7 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt -DML_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DML_MIGRATION_MANIFEST=/migrate/dml_migrations_manifest.txt DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt diff --git a/config/env/prd.migrations.env b/config/env/prd.migrations.env index 07b7f700de0..b407f1c498c 100644 --- a/config/env/prd.migrations.env +++ b/config/env/prd.migrations.env @@ -6,7 +6,7 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt -DML_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DML_MIGRATION_MANIFEST=/migrate/dml_migrations_manifest.txt DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt diff --git a/config/env/stg.migrations.env b/config/env/stg.migrations.env index 07b7f700de0..b407f1c498c 100644 --- a/config/env/stg.migrations.env +++ b/config/env/stg.migrations.env @@ -6,7 +6,7 @@ DB_SSL_MODE=verify-full DB_SSL_ROOT_CERT=/bin/rds-ca-rsa4096-g1.pem DB_USER=ecs_user MIGRATION_MANIFEST=/migrate/migrations_manifest.txt -DML_MIGRATIONS_MANIFEST=/migrate/dml_migrations_manifest.txt +DML_MIGRATION_MANIFEST=/migrate/dml_migrations_manifest.txt DDL_TYPES_MIGRATION_MANIFEST=/migrate/ddl_types_manifest.txt DDL_TABLES_MIGRATION_MANIFEST=/migrate/ddl_tables_manifest.txt DDL_VIEWS_MIGRATION_MANIFEST=/migrate/ddl_views_manifest.txt From 668dfdd08557ec98ccc35d1cb6d6e7076b39f265 Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 20 Feb 2025 16:09:48 -0600 Subject: [PATCH 255/260] remove test files add instructions to each manifest and naming convention --- migrations/app/ddl_functions_manifest.txt | 4 +++- .../ddl_functions/0001_create_test_procedures.up.sql | 6 ------ .../ddl_migrations/ddl_tables/01_create_test_table.up.sql | 7 ------- .../ddl_migrations/ddl_types/01_create_tesT_type.up.sql | 7 ------- .../ddl_migrations/ddl_views/01_create_test_view.up.sql | 2 -- migrations/app/ddl_tables_manifest.txt | 4 +++- migrations/app/ddl_types_manifest.txt | 4 +++- migrations/app/ddl_views_manifest.txt | 4 +++- migrations/app/dml_migrations_manifest.txt | 5 +---- .../app/schema/20250217221228_testing_testing.up.sql | 1 - migrations/app/secure/20250217221926_test_secure.up.sql | 5 ----- .../app/secure/20250218143934_test_secure_1234.up.sql | 4 ---- .../app/secure/20250218150110_test_secure_12345252.up.sql | 4 ---- 13 files changed, 13 insertions(+), 44 deletions(-) delete mode 100644 migrations/app/ddl_migrations/ddl_functions/0001_create_test_procedures.up.sql delete mode 100644 migrations/app/ddl_migrations/ddl_tables/01_create_test_table.up.sql delete mode 100644 migrations/app/ddl_migrations/ddl_types/01_create_tesT_type.up.sql delete mode 100644 migrations/app/ddl_migrations/ddl_views/01_create_test_view.up.sql delete mode 100644 migrations/app/schema/20250217221228_testing_testing.up.sql delete mode 100644 migrations/app/secure/20250217221926_test_secure.up.sql delete mode 100644 migrations/app/secure/20250218143934_test_secure_1234.up.sql delete mode 100644 migrations/app/secure/20250218150110_test_secure_12345252.up.sql diff --git a/migrations/app/ddl_functions_manifest.txt b/migrations/app/ddl_functions_manifest.txt index 779e70c4e96..237796e829e 100644 --- a/migrations/app/ddl_functions_manifest.txt +++ b/migrations/app/ddl_functions_manifest.txt @@ -1 +1,3 @@ -0001_create_test_procedures.up.sql \ No newline at end of file +# This is the functions(procedures) migrations manifest. +# If a migration is not recorded here, then it will error. +# Naming convention: fn_some_function.up.sql running will create this file. diff --git a/migrations/app/ddl_migrations/ddl_functions/0001_create_test_procedures.up.sql b/migrations/app/ddl_migrations/ddl_functions/0001_create_test_procedures.up.sql deleted file mode 100644 index ed5ae1f6004..00000000000 --- a/migrations/app/ddl_migrations/ddl_functions/0001_create_test_procedures.up.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE OR REPLACE FUNCTION square_number(input_num numeric) -RETURNS numeric AS $$ -BEGIN - RETURN input_num * input_num +15 *75; -END; -$$ LANGUAGE plpgsql; diff --git a/migrations/app/ddl_migrations/ddl_tables/01_create_test_table.up.sql b/migrations/app/ddl_migrations/ddl_tables/01_create_test_table.up.sql deleted file mode 100644 index f071d40d4b1..00000000000 --- a/migrations/app/ddl_migrations/ddl_tables/01_create_test_table.up.sql +++ /dev/null @@ -1,7 +0,0 @@ -create table if not exists test_table ( - id uuid not null, - created_at timestamp without time zone not null, - updated_at timestamp without time zone not null, - deleted_at timestamp without time zone, - primary key (id) - ); \ No newline at end of file diff --git a/migrations/app/ddl_migrations/ddl_types/01_create_tesT_type.up.sql b/migrations/app/ddl_migrations/ddl_types/01_create_tesT_type.up.sql deleted file mode 100644 index 533b9304e10..00000000000 --- a/migrations/app/ddl_migrations/ddl_types/01_create_tesT_type.up.sql +++ /dev/null @@ -1,7 +0,0 @@ - -Drop type if exists test_type; -CREATE TYPE test_type AS ENUM ( - 'YES', - 'NO', - 'NOT SURE' - ); diff --git a/migrations/app/ddl_migrations/ddl_views/01_create_test_view.up.sql b/migrations/app/ddl_migrations/ddl_views/01_create_test_view.up.sql deleted file mode 100644 index cd120e7467d..00000000000 --- a/migrations/app/ddl_migrations/ddl_views/01_create_test_view.up.sql +++ /dev/null @@ -1,2 +0,0 @@ -drop view if exists test_view; -create view test_view as select * from office_users; \ No newline at end of file diff --git a/migrations/app/ddl_tables_manifest.txt b/migrations/app/ddl_tables_manifest.txt index b8449b3cfb5..8fd6841c337 100644 --- a/migrations/app/ddl_tables_manifest.txt +++ b/migrations/app/ddl_tables_manifest.txt @@ -1 +1,3 @@ -01_create_test_table.up.sql +# This is the tables migrations manifest. +# If a migration is not recorded here, then it will error. +# Naming convention: tbl_some_table.up.sql running will create this file. diff --git a/migrations/app/ddl_types_manifest.txt b/migrations/app/ddl_types_manifest.txt index 66edc0ec7c1..9229c96f599 100644 --- a/migrations/app/ddl_types_manifest.txt +++ b/migrations/app/ddl_types_manifest.txt @@ -1 +1,3 @@ -01_create_tesT_type.up.sql +# This is the types migrations manifest. +# If a migration is not recorded here, then it will error. +# Naming convention: ty_some_type.up.sql running will create this file. diff --git a/migrations/app/ddl_views_manifest.txt b/migrations/app/ddl_views_manifest.txt index c970b9b345c..939945b6618 100644 --- a/migrations/app/ddl_views_manifest.txt +++ b/migrations/app/ddl_views_manifest.txt @@ -1 +1,3 @@ -01_create_test_view.up.sql +# This is the views migrations manifest. +# If a migration is not recorded here, then it will error. +# Naming convention: vw_some_view.up.sql running will create this file. diff --git a/migrations/app/dml_migrations_manifest.txt b/migrations/app/dml_migrations_manifest.txt index f58df2fc3b0..570749e1cfa 100644 --- a/migrations/app/dml_migrations_manifest.txt +++ b/migrations/app/dml_migrations_manifest.txt @@ -1,6 +1,3 @@ # This is the migrations manifest. # If a migration is not recorded here, then it will error. -20250217221228_testing_testing.up.sql -20250217221926_test_secure.up.sql -20250218143934_test_secure_1234.up.sql -20250218150110_test_secure_12345252.up.sql +# Naming convention: 202502201325_B-123456_update_some_table.up.sql running will create this file. diff --git a/migrations/app/schema/20250217221228_testing_testing.up.sql b/migrations/app/schema/20250217221228_testing_testing.up.sql deleted file mode 100644 index 298fddfa298..00000000000 --- a/migrations/app/schema/20250217221228_testing_testing.up.sql +++ /dev/null @@ -1 +0,0 @@ -update office_users set status = 'APPROVED' where active = true; \ No newline at end of file diff --git a/migrations/app/secure/20250217221926_test_secure.up.sql b/migrations/app/secure/20250217221926_test_secure.up.sql deleted file mode 100644 index 9e3650d17e6..00000000000 --- a/migrations/app/secure/20250217221926_test_secure.up.sql +++ /dev/null @@ -1,5 +0,0 @@ --- Local test migration. --- This will be run on development environments. --- It should mirror what you intend to apply on loadtest/demo/exp/stg/prd --- DO NOT include any sensitive data. -update office_users set status = 'APPROVED' where active = true; \ No newline at end of file diff --git a/migrations/app/secure/20250218143934_test_secure_1234.up.sql b/migrations/app/secure/20250218143934_test_secure_1234.up.sql deleted file mode 100644 index c389c370433..00000000000 --- a/migrations/app/secure/20250218143934_test_secure_1234.up.sql +++ /dev/null @@ -1,4 +0,0 @@ --- Local test migration. --- This will be run on development environments. --- It should mirror what you intend to apply on loadtest/demo/exp/stg/prd --- DO NOT include any sensitive data. diff --git a/migrations/app/secure/20250218150110_test_secure_12345252.up.sql b/migrations/app/secure/20250218150110_test_secure_12345252.up.sql deleted file mode 100644 index c389c370433..00000000000 --- a/migrations/app/secure/20250218150110_test_secure_12345252.up.sql +++ /dev/null @@ -1,4 +0,0 @@ --- Local test migration. --- This will be run on development environments. --- It should mirror what you intend to apply on loadtest/demo/exp/stg/prd --- DO NOT include any sensitive data. From 4f5c6f23247dddc29236438e2ac1ab1933c96aeb Mon Sep 17 00:00:00 2001 From: deandreJones Date: Thu, 20 Feb 2025 16:10:38 -0600 Subject: [PATCH 256/260] no longer need exp --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50436ea7430..38013700a29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,16 +30,16 @@ variables: GOLANGCI_LINT_VERBOSE: "-v" # Specify the environment: loadtest, demo, exp - DP3_ENV: &dp3_env exp + DP3_ENV: &dp3_env placeholder_env # Specify the branch to deploy TODO: this might be not needed. So far useless - DP3_BRANCH: &dp3_branch ddl_migrations + DP3_BRANCH: &dp3_branch placeholder_branch_name # Ignore branches for integration tests - INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch ddl_migrations - INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch ddl_migrations - CLIENT_IGNORE_BRANCH: &client_ignore_branch ddl_migrations - SERVER_IGNORE_BRANCH: &server_ignore_branch ddl_migrations + INTEGRATION_IGNORE_BRANCH: &integration_ignore_branch placeholder_branch_name + INTEGRATION_MTLS_IGNORE_BRANCH: &integration_mtls_ignore_branch placeholder_branch_name + CLIENT_IGNORE_BRANCH: &client_ignore_branch placeholder_branch_name + SERVER_IGNORE_BRANCH: &server_ignore_branch placeholder_branch_name OTEL_IMAGE_TAG: &otel_image_tag "git-$OTEL_VERSION-$CI_COMMIT_SHORT_SHA" From 14e3e19f8890cbd310257190bdbd2bf93d3d75cb Mon Sep 17 00:00:00 2001 From: deandreJones Date: Fri, 21 Feb 2025 10:12:31 -0600 Subject: [PATCH 257/260] add blank files to generate the folders --- migrations/app/ddl_migrations/ddl_functions/README.md | 0 migrations/app/ddl_migrations/ddl_functions/test.sql | 8 ++++++++ migrations/app/ddl_migrations/ddl_tables/README.md | 0 migrations/app/ddl_migrations/ddl_types/README.md | 0 migrations/app/ddl_migrations/ddl_views/README.md | 0 5 files changed, 8 insertions(+) create mode 100644 migrations/app/ddl_migrations/ddl_functions/README.md create mode 100644 migrations/app/ddl_migrations/ddl_functions/test.sql create mode 100644 migrations/app/ddl_migrations/ddl_tables/README.md create mode 100644 migrations/app/ddl_migrations/ddl_types/README.md create mode 100644 migrations/app/ddl_migrations/ddl_views/README.md diff --git a/migrations/app/ddl_migrations/ddl_functions/README.md b/migrations/app/ddl_migrations/ddl_functions/README.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/migrations/app/ddl_migrations/ddl_functions/test.sql b/migrations/app/ddl_migrations/ddl_functions/test.sql new file mode 100644 index 00000000000..5e3b5832591 --- /dev/null +++ b/migrations/app/ddl_migrations/ddl_functions/test.sql @@ -0,0 +1,8 @@ +UPDATE moves m +SET m.cancel_reason = 'Terminated for Cause (TCN-0001)', + mto.status = 'CANCELED' +FROM mto_shipments mto +WHERE m.id = mto.move_id +and moves.locator in ( + +); \ No newline at end of file diff --git a/migrations/app/ddl_migrations/ddl_tables/README.md b/migrations/app/ddl_migrations/ddl_tables/README.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/migrations/app/ddl_migrations/ddl_types/README.md b/migrations/app/ddl_migrations/ddl_types/README.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/migrations/app/ddl_migrations/ddl_views/README.md b/migrations/app/ddl_migrations/ddl_views/README.md new file mode 100644 index 00000000000..e69de29bb2d From 288f207963e307cedeac86d8ceca71260dee611d Mon Sep 17 00:00:00 2001 From: deandreJones Date: Fri, 21 Feb 2025 10:13:37 -0600 Subject: [PATCH 258/260] nope --- migrations/app/ddl_migrations/ddl_functions/test.sql | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 migrations/app/ddl_migrations/ddl_functions/test.sql diff --git a/migrations/app/ddl_migrations/ddl_functions/test.sql b/migrations/app/ddl_migrations/ddl_functions/test.sql deleted file mode 100644 index 5e3b5832591..00000000000 --- a/migrations/app/ddl_migrations/ddl_functions/test.sql +++ /dev/null @@ -1,8 +0,0 @@ -UPDATE moves m -SET m.cancel_reason = 'Terminated for Cause (TCN-0001)', - mto.status = 'CANCELED' -FROM mto_shipments mto -WHERE m.id = mto.move_id -and moves.locator in ( - -); \ No newline at end of file From eada48546ca71a9b30ed9d8fc111b5d735745109 Mon Sep 17 00:00:00 2001 From: josiahzimmerman-caci Date: Fri, 21 Feb 2025 16:51:59 +0000 Subject: [PATCH 259/260] clean up whitespace --- .../20250106202424_update_duty_locs.up.sql | 8 ++-- ...20250121184450_upd_duty_loc_B-22242.up.sql | 46 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/migrations/app/schema/20250106202424_update_duty_locs.up.sql b/migrations/app/schema/20250106202424_update_duty_locs.up.sql index d3bc09560e5..2ecfaf6a399 100644 --- a/migrations/app/schema/20250106202424_update_duty_locs.up.sql +++ b/migrations/app/schema/20250106202424_update_duty_locs.up.sql @@ -24,11 +24,11 @@ BEGIN SELECT '8d613f71-b80e-4ad4-95e7-00781b084c7c'::uuid, 'n/a', NULL, 'NAS NORTH ISLAND', 'CA', '39125', now(), now(), NULL, 'SAN DIEGO', false, '791899e6-cd77-46f2-981b-176ecb8d7098'::uuid, '191165db-d30a-414d-862b-54afdfc7aeb9'::uuid WHERE NOT EXISTS (select * from addresses where id = '8d613f71-b80e-4ad4-95e7-00781b084c7c'); - INSERT INTO duty_locations (id,"name",affiliation,address_id,created_at,updated_at,transportation_office_id,provides_services_counseling) + INSERT INTO duty_locations (id,"name",affiliation,address_id,created_at,updated_at,transportation_office_id,provides_services_counseling) SELECT '56255626-bbbe-4834-8324-1c08f011f2f6'::uuid,'NAS N Island, CA 92135',NULL,'3d617fab-bf6f-4f07-8ab5-f7652b8e7f3e'::uuid,now(),now(),null,true WHERE NOT EXISTS (select * from duty_locations where id = '56255626-bbbe-4834-8324-1c08f011f2f6'); - - INSERT INTO duty_locations (id,"name",affiliation,address_id,created_at,updated_at,transportation_office_id,provides_services_counseling) + + INSERT INTO duty_locations (id,"name",affiliation,address_id,created_at,updated_at,transportation_office_id,provides_services_counseling) SELECT '7156098f-13cf-4455-bcd5-eb829d57c714'::uuid,'NAS North Island, CA 92135',NULL,'8d613f71-b80e-4ad4-95e7-00781b084c7c'::uuid,now(),now(),null,true WHERE NOT EXISTS (select * from duty_locations where id = '7156098f-13cf-4455-bcd5-eb829d57c714'); END $$; @@ -42,7 +42,7 @@ BEGIN SELECT 'fb90a7df-6494-4974-a0ce-4bdbcaff80c0'::uuid, 'n/a', NULL, 'CANNON AFB', 'NM', '88101', now(), now(), NULL, 'CURRY', false, '791899e6-cd77-46f2-981b-176ecb8d7098'::uuid, '68393e10-1aed-4a51-85a0-559a0a5b0e3f'::uuid WHERE NOT EXISTS (select * from addresses where id = 'fb90a7df-6494-4974-a0ce-4bdbcaff80c0'); - INSERT INTO duty_locations (id,"name",affiliation,address_id,created_at,updated_at,transportation_office_id,provides_services_counseling) + INSERT INTO duty_locations (id,"name",affiliation,address_id,created_at,updated_at,transportation_office_id,provides_services_counseling) SELECT '98beab3c-f8ce-4e3c-b78e-8db614721621'::uuid, 'Cannon AFB, NM 88101',null, 'fb90a7df-6494-4974-a0ce-4bdbcaff80c0'::uuid,now(),now(),'80796bc4-e494-4b19-bb16-cdcdba187829',true WHERE NOT EXISTS (select * from duty_locations where id = '98beab3c-f8ce-4e3c-b78e-8db614721621'); END $$; diff --git a/migrations/app/schema/20250121184450_upd_duty_loc_B-22242.up.sql b/migrations/app/schema/20250121184450_upd_duty_loc_B-22242.up.sql index c21c04f6a81..70928fff219 100644 --- a/migrations/app/schema/20250121184450_upd_duty_loc_B-22242.up.sql +++ b/migrations/app/schema/20250121184450_upd_duty_loc_B-22242.up.sql @@ -1,30 +1,30 @@ DO $$ BEGIN - + --remove duty loc Johnston City, TN 37602 IF EXISTS (SELECT 1 FROM duty_locations WHERE id = 'd3a1be10-dcd7-4720-bcbe-7ba76d243687') THEN - - + + update orders set origin_duty_location_id = 'cd0c7325-15bb-45c7-a690-26c56c903ed7' where origin_duty_location_id = 'd3a1be10-dcd7-4720-bcbe-7ba76d243687'; update orders set new_duty_location_id = 'cd0c7325-15bb-45c7-a690-26c56c903ed7' where new_duty_location_id = 'd3a1be10-dcd7-4720-bcbe-7ba76d243687'; - + delete from duty_locations where id = 'd3a1be10-dcd7-4720-bcbe-7ba76d243687'; - + END IF; END $$; DO $$ BEGIN - + --remove duty loc Oceanside, CA 92052 IF EXISTS (SELECT 1 FROM duty_locations WHERE id = '54ca99b7-3c2a-42b0-aa1a-ad071ac580de') THEN - + update orders set origin_duty_location_id = 'a6993e7b-4600-44b9-b288-04ca011143f0' where origin_duty_location_id = '54ca99b7-3c2a-42b0-aa1a-ad071ac580de'; update orders set new_duty_location_id = 'a6993e7b-4600-44b9-b288-04ca011143f0' where new_duty_location_id = '54ca99b7-3c2a-42b0-aa1a-ad071ac580de'; - + delete from duty_locations where id = '54ca99b7-3c2a-42b0-aa1a-ad071ac580de'; - + END IF; END $$; @@ -34,9 +34,9 @@ BEGIN --remove duty loc Albuquerque, NM 87103 IF EXISTS (SELECT 1 FROM duty_locations WHERE id = '2cc57072-19fa-438b-a44b-e349dff11763') THEN - + update orders set new_duty_location_id = '54acfb0e-222b-49eb-b94b-ccb00c6f529c' where new_duty_location_id = '2cc57072-19fa-438b-a44b-e349dff11763'; - + delete from duty_locations where id = '2cc57072-19fa-438b-a44b-e349dff11763'; END IF; @@ -45,45 +45,45 @@ END $$; DO $$ BEGIN - + --remove duty loc August, GA 30917 IF EXISTS (SELECT 1 FROM duty_locations WHERE id = '109ac405-47fb-4e1e-9efb-58290453ac09') THEN - + update orders set origin_duty_location_id = '595363c2-14ee-48e0-b318-e76ab0016453' where origin_duty_location_id = '109ac405-47fb-4e1e-9efb-58290453ac09'; update orders set new_duty_location_id = '595363c2-14ee-48e0-b318-e76ab0016453' where new_duty_location_id = '109ac405-47fb-4e1e-9efb-58290453ac09'; - + delete from duty_locations where id = '109ac405-47fb-4e1e-9efb-58290453ac09'; - + END IF; END $$; DO $$ BEGIN - + --remove duty loc Frankfort, KY 40602 IF EXISTS (SELECT 1 FROM duty_locations WHERE id = 'c7fadaa2-902f-4302-a7cd-108c525b96d4') THEN - + update orders set origin_duty_location_id = '1a973257-cd15-42a9-86be-a14796c014bc' where origin_duty_location_id = 'c7fadaa2-902f-4302-a7cd-108c525b96d4'; update orders set new_duty_location_id = '1a973257-cd15-42a9-86be-a14796c014bc' where new_duty_location_id = 'c7fadaa2-902f-4302-a7cd-108c525b96d4'; - + delete from duty_locations where id = 'c7fadaa2-902f-4302-a7cd-108c525b96d4'; - + END IF; END $$; DO $$ BEGIN - + --remove duty loc Seattle, WA 98111 IF EXISTS (SELECT 1 FROM duty_locations WHERE id = '2fb3e898-d6de-4be7-8576-7c7b10c2a706') THEN - + update orders set origin_duty_location_id = 'e7fdae4f-6be7-4264-99f8-03ee8541499c' where origin_duty_location_id = '2fb3e898-d6de-4be7-8576-7c7b10c2a706'; update orders set new_duty_location_id = 'e7fdae4f-6be7-4264-99f8-03ee8541499c' where new_duty_location_id = '2fb3e898-d6de-4be7-8576-7c7b10c2a706'; - + delete from duty_locations where id = '2fb3e898-d6de-4be7-8576-7c7b10c2a706'; - + END IF; END $$; From 54e7f7b0a32ef40d6d154a47b72ab2c22251333d Mon Sep 17 00:00:00 2001 From: deandreJones Date: Fri, 21 Feb 2025 13:47:54 -0600 Subject: [PATCH 260/260] put back the version- sorry beth --- scripts/generate-ddl-migration | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/generate-ddl-migration b/scripts/generate-ddl-migration index 06a297168c2..345d712c2cc 100755 --- a/scripts/generate-ddl-migration +++ b/scripts/generate-ddl-migration @@ -1,22 +1,22 @@ #!/bin/bash dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -#version=$(date +"%Y%m%d%H%M%S") +version=$(date +"%Y%m%d%H%M%S") filename=$1 type=$2 if [ "$type" == "functions" ]; then - echo "fn_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_functions_manifest.txt" - touch "${dir}/../migrations/app/ddl_migrations/ddl_functions/fn_${filename}.up.sql" + echo "${version}_fn_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_functions_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_functions/${version}_fn_${filename}.up.sql" elif [ "$type" == "tables" ]; then - echo "tbl_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_tables_manifest.txt" - touch "${dir}/../migrations/app/ddl_migrations/ddl_tables/tbl_${filename}.up.sql" + echo "${version}_tbl_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_tables_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_tables/${version}_tbl_${filename}.up.sql" elif [ "$type" == "types" ]; then - echo "ty_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_types_manifest.txt" - touch "${dir}/../migrations/app/ddl_migrations/ddl_types/ty_${filename}.up.sql" + echo "${version}_ty_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_types_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_types/${version}_ty_${filename}.up.sql" elif [ "$type" == "views" ]; then - echo "vw_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_views_manifest.txt" - touch "${dir}/../migrations/app/ddl_migrations/ddl_views/vw_${filename}.up.sql" + echo "${version}_vw_${filename}.up.sql" >> "${dir}/../migrations/app/ddl_views_manifest.txt" + touch "${dir}/../migrations/app/ddl_migrations/ddl_views/${version}_vw_${filename}.up.sql" else echo "Invalid type" fi