Merge branch 'main' into MAIN-B-21942

migrations/app/migrations_manifest.txt

@@ -1059,6 +1059,7 @@
 20241218201833_add_PPPO_BASE_ELIZABETH.up.sql
 20241220171035_add_additional_AK_zips_to_zip3_distances.up.sql
 20241220213134_add_destination_gbloc_db_function.up.sql
+20241226173330_add_intl_param_values_to_service_params_table.up.sql
 20241227153723_remove_empty_string_emplid_values.up.sql
 20241227202424_insert_transportation_offices_camp_pendelton.up.sql
 20241230190638_remove_AK_zips_from_zip3.up.sql

pkg/factory/address_factory.go

@@ -1,7 +1,10 @@
 package factory
 
 import (
+	"database/sql"
+
 	"github.com/gobuffalo/pop/v6"
+	"github.com/gofrs/uuid"
 
 	"github.com/transcom/mymove/pkg/models"
 	"github.com/transcom/mymove/pkg/testdatagen"
@@ -24,15 +27,17 @@ func BuildAddress(db *pop.Connection, customs []Customization, traits []Trait) m
 	}
 
 	// Create default Address
+	beverlyHillsUsprc := uuid.FromStringOrNil("3b9f0ae6-3b2b-44a6-9fcd-8ead346648c4")
 	address := models.Address{
-		StreetAddress1: "123 Any Street",
-		StreetAddress2: models.StringPointer("P.O. Box 12345"),
-		StreetAddress3: models.StringPointer("c/o Some Person"),
-		City:           "Beverly Hills",
-		State:          "CA",
-		PostalCode:     "90210",
-		County:         models.StringPointer("LOS ANGELES"),
-		IsOconus:       models.BoolPointer(false),
+		StreetAddress1:     "123 Any Street",
+		StreetAddress2:     models.StringPointer("P.O. Box 12345"),
+		StreetAddress3:     models.StringPointer("c/o Some Person"),
+		City:               "Beverly Hills",
+		State:              "CA",
+		PostalCode:         "90210",
+		County:             models.StringPointer("LOS ANGELES"),
+		IsOconus:           models.BoolPointer(false),
+		UsPostRegionCityID: &beverlyHillsUsprc,
 	}
 
 	// Find/create the Country if customization is provided
@@ -56,7 +61,7 @@ func BuildAddress(db *pop.Connection, customs []Customization, traits []Trait) m
 	// Overwrite values with those from customizations
 	testdatagen.MergeModels(&address, cAddress)
 
-	// This helps assign counties when the factory is called for seed data or tests
+	// This helps assign counties & us_post_region_cities_id values when the factory is called for seed data or tests
 	// Additionally, also only run if not 90210. 90210's county is by default populated
 	if db != nil && address.PostalCode != "90210" {
 		county, err := models.FindCountyByZipCode(db, address.PostalCode)
@@ -72,6 +77,17 @@ func BuildAddress(db *pop.Connection, customs []Customization, traits []Trait) m
 		address.County = models.StringPointer("db nil when created")
 	}
 
+	if db != nil && address.PostalCode != "90210" && cAddress.UsPostRegionCityID == nil {
+		usprc, err := models.FindByZipCode(db, address.PostalCode)
+		if err != nil && err != sql.ErrNoRows {
+			address.UsPostRegionCityID = nil
+			address.UsPostRegionCity = nil
+		} else if usprc.ID != uuid.Nil {
+			address.UsPostRegionCityID = &usprc.ID
+			address.UsPostRegionCity = usprc
+		}
+	}
+
 	// If db is false, it's a stub. No need to create in database.
 	if db != nil {
 		mustCreate(db, &address)

pkg/factory/address_factory_test.go

@@ -40,6 +40,7 @@ func (suite *FactorySuite) TestBuildAddress() {
 		suite.Equal(defaultPostalCode, address.PostalCode)
 		suite.Equal(country.ID, *address.CountryId)
 		suite.Equal(defaultCounty, *address.County)
+		suite.NotNil(*address.UsPostRegionCityID)
 	})
 
 	suite.Run("Successful creation of an address with customization", func() {