Merge branch 'integrationTesting' into B-21524-Update-Counselor-Appro…

…ved-Email-INT

migrations/app/migrations_manifest.txt

@@ -1025,3 +1025,4 @@
 20241009210749_create_view_v_locations.up.sql
 20241011201326_changes_for_actual_expense_reimbursement_field.up.sql
 20241024114748_create_gbloc_aors.up.sql
+20241029144404_hdt-614-adjust-accomack-county.up.sql

migrations/app/schema/20241029144404_hdt-614-adjust-accomack-county.up.sql

@@ -0,0 +1,8 @@
+-- Set temp timeout due to large file modification
+-- Time is 5 minutes in milliseconds
+SET statement_timeout = 300000;
+SET lock_timeout = 300000;
+SET idle_in_transaction_session_timeout = 300000;
+
+-- Adjust postal code to GBLOC per MMHDT 582
+update postal_code_to_gblocs pctg SET gbloc = 'BGNC' FROM us_post_region_cities usprc where pctg.postal_code = usprc.uspr_zip_id and usprc.usprc_county_nm = 'ACCOMACK'

pkg/handlers/internalapi/internal/payloads/model_to_payload_test.go

@@ -7,28 +7,6 @@ import (
 	"github.com/transcom/mymove/pkg/models"
 )
 
-func (suite *PayloadsSuite) TestMarketCode() {
-	suite.Run("returns nil when marketCode is nil", func() {
-		var marketCode *models.MarketCode = nil
-		result := MarketCode(marketCode)
-		suite.Equal(result, "")
-	})
-
-	suite.Run("returns string when marketCode is not nil", func() {
-		marketCodeDomestic := models.MarketCodeDomestic
-		result := MarketCode(&marketCodeDomestic)
-		suite.NotNil(result, "Expected result to not be nil when marketCode is not nil")
-		suite.Equal("d", result, "Expected result to be 'd' for domestic market code")
-	})
-
-	suite.Run("returns string when marketCode is international", func() {
-		marketCodeInternational := models.MarketCodeInternational
-		result := MarketCode(&marketCodeInternational)
-		suite.NotNil(result, "Expected result to not be nil when marketCode is not nil")
-		suite.Equal("i", result, "Expected result to be 'i' for international market code")
-	})
-}
-
 func (suite *PayloadsSuite) TestFetchPPMShipment() {
 
 	ppmShipmentID, _ := uuid.NewV4()
@@ -88,3 +66,25 @@ func (suite *PayloadsSuite) TestFetchPPMShipment() {
 		suite.True(*returnedPPMShipment.IsActualExpenseReimbursement)
 	})
 }
+
+func (suite *PayloadsSuite) TestMarketCode() {
+	suite.Run("returns nil when marketCode is nil", func() {
+		var marketCode *models.MarketCode = nil
+		result := MarketCode(marketCode)
+		suite.Equal(result, "")
+	})
+
+	suite.Run("returns string when marketCode is not nil", func() {
+		marketCodeDomestic := models.MarketCodeDomestic
+		result := MarketCode(&marketCodeDomestic)
+		suite.NotNil(result, "Expected result to not be nil when marketCode is not nil")
+		suite.Equal("d", result, "Expected result to be 'd' for domestic market code")
+	})
+
+	suite.Run("returns string when marketCode is international", func() {
+		marketCodeInternational := models.MarketCodeInternational
+		result := MarketCode(&marketCodeInternational)
+		suite.NotNil(result, "Expected result to not be nil when marketCode is not nil")
+		suite.Equal("i", result, "Expected result to be 'i' for international market code")
+	})
+}

pkg/handlers/internalapi/internal/payloads/payload_to_model_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/transcom/mymove/pkg/gen/internalmessages"
 	"github.com/transcom/mymove/pkg/handlers"
 	"github.com/transcom/mymove/pkg/models"
+	"github.com/transcom/mymove/pkg/unit"
 )
 
 func (suite *PayloadsSuite) TestAddressModel() {
@@ -328,3 +329,124 @@ func (suite *PayloadsSuite) TestPPMShipmentModelWithOptionalDestinationStreet1Fr
 	model3 := UpdatePPMShipmentModel(&ppmShipmentValidDestAddress1)
 	suite.Equal(model3.DestinationAddress.StreetAddress1, streetAddress1)
 }
+
+func (suite *PayloadsSuite) TestPPMShipmentModelFromUpdate() {
+	time := time.Now()
+	expectedDepartureDate := handlers.FmtDatePtr(&time)
+	estimatedWeight := int64(5000)
+	proGearWeight := int64(500)
+	spouseProGearWeight := int64(50)
+
+	address := models.Address{
+		StreetAddress1: "some address",
+		City:           "city",
+		State:          "state",
+		PostalCode:     "12345",
+		Country:        &models.Country{Country: "US"},
+	}
+	address2 := models.Address{
+		StreetAddress1: "some address",
+		City:           "city",
+		State:          "state",
+		PostalCode:     "11111",
+	}
+	address3 := models.Address{
+		StreetAddress1: "some address",
+		City:           "city",
+		State:          "state",
+		PostalCode:     "54321",
+	}
+
+	var pickupAddress internalmessages.Address
+	var secondaryPickupAddress internalmessages.Address
+	var tertiaryPickupAddress internalmessages.Address
+	var destinationAddress internalmessages.PPMDestinationAddress
+	var secondaryDestinationAddress internalmessages.Address
+	var tertiaryDestinationAddress internalmessages.Address
+
+	pickupAddress = internalmessages.Address{
+		City:           &address.City,
+		Country:        &address.Country.Country,
+		PostalCode:     &address.PostalCode,
+		State:          &address.State,
+		StreetAddress1: &address.StreetAddress1,
+		StreetAddress2: address.StreetAddress2,
+		StreetAddress3: address.StreetAddress3,
+	}
+	destinationAddress = internalmessages.PPMDestinationAddress{
+		City:           &address.City,
+		Country:        &address.Country.Country,
+		PostalCode:     &address.PostalCode,
+		State:          &address.State,
+		StreetAddress1: &address.StreetAddress1,
+		StreetAddress2: address.StreetAddress2,
+		StreetAddress3: address.StreetAddress3,
+	}
+	secondaryPickupAddress = internalmessages.Address{
+		City:           &address2.City,
+		Country:        &address.Country.Country,
+		PostalCode:     &address2.PostalCode,
+		State:          &address2.State,
+		StreetAddress1: &address2.StreetAddress1,
+		StreetAddress2: address2.StreetAddress2,
+		StreetAddress3: address2.StreetAddress3,
+	}
+	secondaryDestinationAddress = internalmessages.Address{
+		City:           &address2.City,
+		Country:        &address.Country.Country,
+		PostalCode:     &address2.PostalCode,
+		State:          &address2.State,
+		StreetAddress1: &address2.StreetAddress1,
+		StreetAddress2: address2.StreetAddress2,
+		StreetAddress3: address2.StreetAddress3,
+	}
+	tertiaryPickupAddress = internalmessages.Address{
+		City:           &address3.City,
+		Country:        &address.Country.Country,
+		PostalCode:     &address3.PostalCode,
+		State:          &address3.State,
+		StreetAddress1: &address3.StreetAddress1,
+		StreetAddress2: address3.StreetAddress2,
+		StreetAddress3: address3.StreetAddress3,
+	}
+	tertiaryDestinationAddress = internalmessages.Address{
+		City:           &address3.City,
+		Country:        &address.Country.Country,
+		PostalCode:     &address3.PostalCode,
+		State:          &address3.State,
+		StreetAddress1: &address3.StreetAddress1,
+		StreetAddress2: address3.StreetAddress2,
+		StreetAddress3: address3.StreetAddress3,
+	}
+
+	ppmShipment := internalmessages.UpdatePPMShipment{
+		ExpectedDepartureDate:        expectedDepartureDate,
+		PickupAddress:                &pickupAddress,
+		SecondaryPickupAddress:       &secondaryPickupAddress,
+		TertiaryPickupAddress:        &tertiaryPickupAddress,
+		DestinationAddress:           &destinationAddress,
+		SecondaryDestinationAddress:  &secondaryDestinationAddress,
+		TertiaryDestinationAddress:   &tertiaryDestinationAddress,
+		SitExpected:                  models.BoolPointer(true),
+		EstimatedWeight:              &estimatedWeight,
+		HasProGear:                   models.BoolPointer(true),
+		ProGearWeight:                &proGearWeight,
+		SpouseProGearWeight:          &spouseProGearWeight,
+		IsActualExpenseReimbursement: models.BoolPointer(true),
+	}
+
+	model := UpdatePPMShipmentModel(&ppmShipment)
+
+	suite.NotNil(model)
+	suite.True(*model.SITExpected)
+	suite.Equal(unit.Pound(estimatedWeight), *model.EstimatedWeight)
+	suite.True(*model.HasProGear)
+	suite.Equal(unit.Pound(proGearWeight), *model.ProGearWeight)
+	suite.Equal(unit.Pound(spouseProGearWeight), *model.SpouseProGearWeight)
+	suite.Nil(model.HasSecondaryPickupAddress)
+	suite.Nil(model.HasSecondaryDestinationAddress)
+	suite.Nil(model.HasTertiaryPickupAddress)
+	suite.Nil(model.HasTertiaryDestinationAddress)
+	suite.True(*model.IsActualExpenseReimbursement)
+	suite.NotNil(model)
+}

pkg/handlers/primeapi/payloads/payload_to_model_test.go

@@ -501,12 +501,13 @@ func (suite *PayloadsSuite) TestPPMShipmentModelFromCreate() {
 	spouseProGearWeight := int64(50)
 
 	ppmShipment := primemessages.CreatePPMShipment{
-		ExpectedDepartureDate: expectedDepartureDate,
-		SitExpected:           &sitExpected,
-		EstimatedWeight:       &estimatedWeight,
-		HasProGear:            &hasProGear,
-		ProGearWeight:         &proGearWeight,
-		SpouseProGearWeight:   &spouseProGearWeight,
+		ExpectedDepartureDate:        expectedDepartureDate,
+		SitExpected:                  &sitExpected,
+		EstimatedWeight:              &estimatedWeight,
+		HasProGear:                   &hasProGear,
+		ProGearWeight:                &proGearWeight,
+		SpouseProGearWeight:          &spouseProGearWeight,
+		IsActualExpenseReimbursement: models.BoolPointer(true),
 	}
 
 	model := PPMShipmentModelFromCreate(&ppmShipment)
@@ -518,6 +519,36 @@ func (suite *PayloadsSuite) TestPPMShipmentModelFromCreate() {
 	suite.True(*model.HasProGear)
 	suite.Equal(unit.Pound(proGearWeight), *model.ProGearWeight)
 	suite.Equal(unit.Pound(spouseProGearWeight), *model.SpouseProGearWeight)
+	suite.True(*model.IsActualExpenseReimbursement)
+}
+
+func (suite *PayloadsSuite) TestPPMShipmentModelFromUpdate() {
+	time := time.Now()
+	expectedDepartureDate := handlers.FmtDatePtr(&time)
+	estimatedWeight := int64(5000)
+	proGearWeight := int64(500)
+	spouseProGearWeight := int64(50)
+
+	ppmShipment := primemessages.UpdatePPMShipment{
+		ExpectedDepartureDate:        expectedDepartureDate,
+		SitExpected:                  models.BoolPointer(true),
+		EstimatedWeight:              &estimatedWeight,
+		HasProGear:                   models.BoolPointer(true),
+		ProGearWeight:                &proGearWeight,
+		SpouseProGearWeight:          &spouseProGearWeight,
+		IsActualExpenseReimbursement: models.BoolPointer(true),
+	}
+
+	model := PPMShipmentModelFromUpdate(&ppmShipment)
+
+	suite.NotNil(model)
+	suite.True(*model.SITExpected)
+	suite.Equal(unit.Pound(estimatedWeight), *model.EstimatedWeight)
+	suite.True(*model.HasProGear)
+	suite.Equal(unit.Pound(proGearWeight), *model.ProGearWeight)
+	suite.Equal(unit.Pound(spouseProGearWeight), *model.SpouseProGearWeight)
+	suite.True(*model.IsActualExpenseReimbursement)
+	suite.NotNil(model)
 }
 
 func (suite *PayloadsSuite) TestCountryModel_WithValidCountry() {

pkg/handlers/primeapiv2/payloads/payload_to_model_test.go

@@ -469,12 +469,13 @@ func (suite *PayloadsSuite) TestPPMShipmentModelFromCreate() {
 	spouseProGearWeight := int64(50)
 
 	ppmShipment := primev2messages.CreatePPMShipment{
-		ExpectedDepartureDate: expectedDepartureDate,
-		SitExpected:           &sitExpected,
-		EstimatedWeight:       &estimatedWeight,
-		HasProGear:            &hasProGear,
-		ProGearWeight:         &proGearWeight,
-		SpouseProGearWeight:   &spouseProGearWeight,
+		ExpectedDepartureDate:        expectedDepartureDate,
+		SitExpected:                  &sitExpected,
+		EstimatedWeight:              &estimatedWeight,
+		HasProGear:                   &hasProGear,
+		ProGearWeight:                &proGearWeight,
+		SpouseProGearWeight:          &spouseProGearWeight,
+		IsActualExpenseReimbursement: models.BoolPointer(true),
 	}
 
 	model := PPMShipmentModelFromCreate(&ppmShipment)
@@ -486,6 +487,36 @@ func (suite *PayloadsSuite) TestPPMShipmentModelFromCreate() {
 	suite.True(*model.HasProGear)
 	suite.Equal(unit.Pound(proGearWeight), *model.ProGearWeight)
 	suite.Equal(unit.Pound(spouseProGearWeight), *model.SpouseProGearWeight)
+	suite.True(*model.IsActualExpenseReimbursement)
+}
+
+func (suite *PayloadsSuite) TestPPMShipmentModelFromUpdate() {
+	time := time.Now()
+	expectedDepartureDate := handlers.FmtDatePtr(&time)
+	estimatedWeight := int64(5000)
+	proGearWeight := int64(500)
+	spouseProGearWeight := int64(50)
+
+	ppmShipment := primev2messages.UpdatePPMShipment{
+		ExpectedDepartureDate:        expectedDepartureDate,
+		SitExpected:                  models.BoolPointer(true),
+		EstimatedWeight:              &estimatedWeight,
+		HasProGear:                   models.BoolPointer(true),
+		ProGearWeight:                &proGearWeight,
+		SpouseProGearWeight:          &spouseProGearWeight,
+		IsActualExpenseReimbursement: models.BoolPointer(true),
+	}
+
+	model := PPMShipmentModelFromUpdate(&ppmShipment)
+
+	suite.NotNil(model)
+	suite.True(*model.SITExpected)
+	suite.Equal(unit.Pound(estimatedWeight), *model.EstimatedWeight)
+	suite.True(*model.HasProGear)
+	suite.Equal(unit.Pound(proGearWeight), *model.ProGearWeight)
+	suite.Equal(unit.Pound(spouseProGearWeight), *model.SpouseProGearWeight)
+	suite.True(*model.IsActualExpenseReimbursement)
+	suite.NotNil(model)
 }
 
 func (suite *PayloadsSuite) TestCountryModel_WithValidCountry() {