Merge branch 'main' into B-21966-Add-Rejected-Admin-MAIN

transcom · Mar 6, 2025 · bd51614 · bd51614
2 parents c93dee2 + bfb5a52
commit bd51614
Show file tree

Hide file tree

Showing 25 changed files with 31 additions and 1,969 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -834,8 +834,8 @@ server_test:
     - make bin/swagger
     - echo "server test -- build gotestsum and run scripts for report"
     - make -j 2 bin/milmove bin/gotestsum
-    - make server_test for app
-  allow_failure: true #leaving true until 5 tests failing tests are working
+    - make server_test
+  allow_failure: false
   artifacts:
     paths:
       - /builds/milmove/mymove/bin/gotestsum

diff --git a/pkg/handlers/internalapi/service_members.go b/pkg/handlers/internalapi/service_members.go
@@ -148,7 +148,7 @@ type PatchServiceMemberHandler struct {
 // Check to see if a move is in draft state. If there are no orders, then the
 // move still counts as in draft state.
 func (h PatchServiceMemberHandler) isDraftMove(serviceMember *models.ServiceMember) bool {
-	if serviceMember.Orders == nil || len(serviceMember.Orders) <= 0 {
+	if len(serviceMember.Orders) == 0 {
 		return true
 	}
 

diff --git a/pkg/handlers/primeapiv3/move_task_order_test.go b/pkg/handlers/primeapiv3/move_task_order_test.go
@@ -32,8 +32,12 @@ func (suite *HandlerSuite) TestGetMoveTaskOrder() {
 	verifyAddressFields := func(address *models.Address, payload *primev3messages.Address) {
 		suite.Equal(address.ID.String(), payload.ID.String())
 		suite.Equal(address.StreetAddress1, *payload.StreetAddress1)
-		suite.Equal(*address.StreetAddress2, *payload.StreetAddress2)
-		suite.Equal(*address.StreetAddress3, *payload.StreetAddress3)
+		if address.StreetAddress2 != nil {
+			suite.Equal(*address.StreetAddress2, *payload.StreetAddress2)
+		}
+		if address.StreetAddress3 != nil {
+			suite.Equal(*address.StreetAddress3, *payload.StreetAddress3)
+		}
 		suite.Equal(address.City, *payload.City)
 		suite.Equal(address.State, *payload.State)
 		suite.Equal(address.PostalCode, *payload.PostalCode)
@@ -1494,6 +1498,7 @@ func (suite *HandlerSuite) TestGetMoveTaskOrder() {
 					PrimeEstimatedWeightRecordedDate: &aWeekAgo,
 					RequiredDeliveryDate:             &nowDate,
 					ScheduledDeliveryDate:            &nowDate,
+					MarketCode:                       models.MarketCodeInternational,
 				},
 			},
 			{

diff --git a/pkg/services/ghcimport/ghc_rateengine_importer_test.go b/pkg/services/ghcimport/ghc_rateengine_importer_test.go
diff --git a/pkg/services/ghcimport/import_re_contract_test.go b/pkg/services/ghcimport/import_re_contract_test.go
diff --git a/pkg/services/ghcimport/import_re_contract_years_test.go b/pkg/services/ghcimport/import_re_contract_years_test.go
diff --git a/pkg/services/ghcimport/import_re_domestic_accessorial_prices_test.go b/pkg/services/ghcimport/import_re_domestic_accessorial_prices_test.go