Merge branch 'main' into B-21583-gbloc-AK-moves

transcom · Jan 9, 2025 · a15c927 · a15c927
2 parents 856b8ca + 5083c0f
commit a15c927
Show file tree

Hide file tree

Showing 90 changed files with 6,139 additions and 545 deletions.
diff --git a/migrations/app/migrations_manifest.txt b/migrations/app/migrations_manifest.txt
@@ -1060,6 +1060,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
+20241224172258_add_and_update_po_box_zip.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

diff --git a/migrations/app/schema/20241224172258_add_and_update_po_box_zip.up.sql b/migrations/app/schema/20241224172258_add_and_update_po_box_zip.up.sql
diff --git a/pkg/factory/order_factory.go b/pkg/factory/order_factory.go
@@ -203,8 +203,8 @@ func buildOrderWithBuildType(db *pop.Connection, customs []Customization, traits
 	defaultSpouseHasProGear := false
 	defaultOrdersType := internalmessages.OrdersTypePERMANENTCHANGEOFSTATION
 	defaultOrdersTypeDetail := internalmessages.OrdersTypeDetail("HHG_PERMITTED")
-	defaultDestinationDutyLocationGbloc := "AGFM"
-	destinationDutyLocationGbloc := &defaultDestinationDutyLocationGbloc
+	defaultDestinationGbloc := "AGFM"
+	destinationGbloc := &defaultDestinationGbloc
 	testYear := 2018
 	defaultIssueDate := time.Date(testYear, time.March, 15, 0, 0, 0, 0, time.UTC)
 	defaultReportByDate := time.Date(testYear, time.August, 1, 0, 0, 0, 0, time.UTC)
@@ -248,7 +248,7 @@ func buildOrderWithBuildType(db *pop.Connection, customs []Customization, traits
 				log.Panicf("Error loading duty location by id %s: %s\n", newDutyLocation.ID.String(), err)
 			}
 			destinationPostalCodeToGBLOC := FetchOrBuildPostalCodeToGBLOC(db, newDutyLocation.Address.PostalCode, "AGFM")
-			destinationDutyLocationGbloc = &destinationPostalCodeToGBLOC.GBLOC
+			destinationGbloc = &destinationPostalCodeToGBLOC.GBLOC
 		}
 	}
 
@@ -257,7 +257,7 @@ func buildOrderWithBuildType(db *pop.Connection, customs []Customization, traits
 		ServiceMemberID:                serviceMember.ID,
 		NewDutyLocation:                newDutyLocation,
 		NewDutyLocationID:              newDutyLocation.ID,
-		DestinationGBLOC:               destinationDutyLocationGbloc,
+		DestinationGBLOC:               destinationGbloc,
 		UploadedOrders:                 uploadedOrders,
 		UploadedOrdersID:               uploadedOrders.ID,
 		IssueDate:                      defaultIssueDate,

diff --git a/pkg/gen/ghcapi/embedded_spec.go b/pkg/gen/ghcapi/embedded_spec.go
diff --git a/pkg/gen/ghcmessages/list_prime_move.go b/pkg/gen/ghcmessages/list_prime_move.go
diff --git a/pkg/gen/ghcmessages/search_move.go b/pkg/gen/ghcmessages/search_move.go
diff --git a/pkg/gen/primeapi/embedded_spec.go b/pkg/gen/primeapi/embedded_spec.go
diff --git a/pkg/gen/primemessages/list_move.go b/pkg/gen/primemessages/list_move.go