From def5fee2f216beab3536459b960f24d121327d06 Mon Sep 17 00:00:00 2001 From: KonstanceH Date: Fri, 4 Oct 2024 05:33:14 +0000 Subject: [PATCH 1/2] added USMS infront of dest gbloc and added test --- .../internal/payloads/model_to_payload.go | 2 ++ .../payloads/model_to_payload_test.go | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go b/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go index 933d9431941..b95e74f90cf 100644 --- a/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go +++ b/pkg/handlers/ghcapi/internal/payloads/model_to_payload.go @@ -2291,6 +2291,8 @@ func SearchMoves(appCtx appcontext.AppContext, moves models.Moves) *ghcmessages. if err != nil { destinationGBLOC = *ghcmessages.NewGBLOC("") + } else if customer.Affiliation.String() == "MARINES" { + destinationGBLOC = ghcmessages.GBLOC("USMC/" + PostalCodeToGBLOC.GBLOC) } else { destinationGBLOC = ghcmessages.GBLOC(PostalCodeToGBLOC.GBLOC) } 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 071e410967f..e0292765e2f 100644 --- a/pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go +++ b/pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go @@ -6,6 +6,7 @@ import ( "github.com/gofrs/uuid" + "github.com/transcom/mymove/pkg/factory" "github.com/transcom/mymove/pkg/gen/ghcmessages" "github.com/transcom/mymove/pkg/handlers" "github.com/transcom/mymove/pkg/models" @@ -350,3 +351,24 @@ func (suite *PayloadsSuite) TestCreateCustomer() { suite.IsType(returnedShipmentAddressUpdate, &ghcmessages.CreatedCustomer{}) }) } + +func (suite *PayloadsSuite) TestSearchMoves() { + appCtx := suite.AppContextForTest() + + marines := models.AffiliationMARINES + moveUSMC := factory.BuildMove(suite.DB(), []factory.Customization{ + { + Model: models.ServiceMember{ + Affiliation: &marines, + }, + }, + }, nil) + + moves := models.Moves{moveUSMC} + suite.Run("Success - Returns a ghcmessages Upload payload from Upload Struct", func() { + payload := SearchMoves(appCtx, moves) + + suite.IsType(payload, &ghcmessages.SearchMoves{}) + suite.NotNil(payload) + }) +} From 799e63ce25c78b3809dc73c73495268b2338fcf8 Mon Sep 17 00:00:00 2001 From: KonstanceH Date: Wed, 16 Oct 2024 21:12:19 +0000 Subject: [PATCH 2/2] linter change --- .../ghcapi/internal/payloads/model_to_payload_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 e0292765e2f..5bb3db594b5 100644 --- a/pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go +++ b/pkg/handlers/ghcapi/internal/payloads/model_to_payload_test.go @@ -357,12 +357,12 @@ func (suite *PayloadsSuite) TestSearchMoves() { marines := models.AffiliationMARINES moveUSMC := factory.BuildMove(suite.DB(), []factory.Customization{ - { - Model: models.ServiceMember{ - Affiliation: &marines, - }, + { + Model: models.ServiceMember{ + Affiliation: &marines, }, - }, nil) + }, + }, nil) moves := models.Moves{moveUSMC} suite.Run("Success - Returns a ghcmessages Upload payload from Upload Struct", func() {