Merge branch 'integrationTesting' into B-18896-Redefine-order-audit-t…

…able-ignored-columns-INT-2

migrations/app/migrations_manifest.txt

@@ -900,3 +900,4 @@
 20240212150834_20240212_disable_homesafe_stg_cert.up.sql
 20240214213247_updateTransportationOfficesGbloc.up.sql
 20240222144140_redefine_order_audit_table_grade_col.up.sql
+20240223200739_updateDutyLocationsZip.up.sql

migrations/app/schema/20240223200739_updateDutyLocationsZip.up.sql

@@ -0,0 +1,6 @@
+update duty_locations set name = 'PPPO West Point/ USMA - USA 10996' where id ='9f7a1c83-26ad-4ba3-b30f-1a2e62f250f6';
+update duty_location_names set name = 'PPPO West Point/ USMA - USA 10996' where duty_location_id ='9f7a1c83-26ad-4ba3-b30f-1a2e62f250f6';
+
+
+update duty_locations set name = 'PPPO USAG Miami, FL - USA 33177' where id = '0f420f7b-72ac-43cf-bc93-f24d44ba8f93';
+update duty_location_names set name ='PPPO USAG Miami, FL - USA 33177' where duty_location_id = '0f420f7b-72ac-43cf-bc93-f24d44ba8f93';

pkg/edi/invoice/generator.go

@@ -40,7 +40,7 @@ type InvoiceHeader struct {
 	PaymentRequestNumber     edisegment.N9
 	ContractCode             edisegment.N9
 	ServiceMemberName        edisegment.N9
-	ServiceMemberRank        edisegment.N9
+	OrderPayGrade            edisegment.N9
 	ServiceMemberBranch      edisegment.N9
 	ServiceMemberDodID       edisegment.N9
 	MoveCode                 edisegment.N9
@@ -92,7 +92,7 @@ func (ih *InvoiceHeader) NonEmptySegments() []edisegment.Segment {
 		&ih.PaymentRequestNumber,
 		&ih.ContractCode,
 		&ih.ServiceMemberName,
-		&ih.ServiceMemberRank,
+		&ih.OrderPayGrade,
 		&ih.ServiceMemberBranch,
 		&ih.ServiceMemberDodID,
 		&ih.MoveCode,

pkg/edi/invoice/generator_test.go

@@ -124,7 +124,7 @@ func MakeValidEdi() Invoice858C {
 			ReferenceIdentificationQualifier: "1W",
 			ReferenceIdentification:          "Leo, Spacemen",
 		},
-		ServiceMemberRank: edisegment.N9{
+		OrderPayGrade: edisegment.N9{
 			ReferenceIdentificationQualifier: "ML",
 			ReferenceIdentification:          "E_1",
 		},

pkg/factory/entitlement_factory.go

@@ -3,6 +3,7 @@ package factory
 import (
 	"github.com/gobuffalo/pop/v6"
 
+	"github.com/transcom/mymove/pkg/gen/internalmessages"
 	"github.com/transcom/mymove/pkg/models"
 	"github.com/transcom/mymove/pkg/testdatagen"
 )
@@ -27,15 +28,16 @@ func BuildEntitlement(db *pop.Connection, customs []Customization, traits []Trai
 	// At this point, Entitlement may exist or be blank. Depending on if customization was provided.
 
 	// Find an Orders customization if available - to extract the grade
-	var grade *string
+	var grade *internalmessages.OrderPayGrade
+	defaultGrade := models.ServiceMemberGradeE1
 	var order models.Order
 	result := findValidCustomization(customs, Order)
 	if result != nil {
 		order = result.Model.(models.Order)
 		grade = order.Grade // extract grade
 	}
 	if grade == nil || *grade == "" {
-		grade = models.StringPointer("E_1")
+		grade = &defaultGrade
 	}
 
 	dependents := 0
@@ -58,7 +60,7 @@ func BuildEntitlement(db *pop.Connection, customs []Customization, traits []Trai
 		OrganizationalClothingAndIndividualEquipment: ocie,
 	}
 	// Set default calculated values
-	entitlement.SetWeightAllotment(*grade)
+	entitlement.SetWeightAllotment(string(*grade))
 	entitlement.DBAuthorizedWeight = entitlement.AuthorizedWeight()
 
 	// Overwrite default values with those from custom Entitlement

pkg/factory/entitlement_factory_test.go

@@ -3,6 +3,7 @@ package factory
 import (
 	"github.com/gofrs/uuid"
 
+	"github.com/transcom/mymove/pkg/gen/internalmessages"
 	"github.com/transcom/mymove/pkg/models"
 )
 
@@ -133,9 +134,10 @@ func (suite *FactorySuite) TestBuildEntitlement() {
 		// Now DBAuthorizedWeight should be appropriate for O_9 grade
 
 		// FUNCTION UNDER TEST
+		grade := internalmessages.OrderPayGrade(models.ServiceMemberGradeO9)
 		entitlement := BuildEntitlement(suite.DB(), []Customization{
 			{Model: models.Order{
-				Grade: models.StringPointer("O_9"),
+				Grade: &grade,
 			}},
 		}, nil)
 

pkg/factory/order_factory.go

@@ -198,7 +198,7 @@ func buildOrderWithBuildType(db *pop.Connection, customs []Customization, traits
 	defaultOrdersNumber := "ORDER3"
 	defaultTACNumber := "F8E1"
 	defaultDepartmentIndicator := "AIR_AND_SPACE_FORCE"
-	defaultGrade := "E_1"
+	defaultGrade := models.ServiceMemberGradeE1
 	defaultHasDependents := false
 	defaultSpouseHasProGear := false
 	defaultOrdersType := internalmessages.OrdersTypePERMANENTCHANGEOFSTATION
@@ -304,3 +304,18 @@ func BuildOrder(db *pop.Connection, customs []Customization, traits []Trait) mod
 func BuildOrderWithoutDefaults(db *pop.Connection, customs []Customization, traits []Trait) models.Order {
 	return buildOrderWithBuildType(db, customs, traits, orderBuildWithoutDefaults)
 }
+
+// ------------------------
+//      TRAITS
+// ------------------------
+
+// GetTraitHasDependents returns a customization to enable dependents on an order
+func GetTraitHasDependents() []Customization {
+	return []Customization{
+		{
+			Model: models.Order{
+				HasDependents: true,
+			},
+		},
+	}
+}

pkg/factory/order_factory_test.go

@@ -39,7 +39,7 @@ func (suite *FactorySuite) TestBuildOrder() {
 		suite.Equal(defaultOrdersNumber, *order.OrdersNumber)
 		suite.Equal(defaultTACNumber, *order.TAC)
 		suite.Equal(defaultDepartmentIndicator, *order.DepartmentIndicator)
-		suite.Equal(defaultGrade, *order.Grade)
+		suite.Equal(defaultGrade, string(*order.Grade))
 		suite.Equal(defaultHasDependents, order.HasDependents)
 		suite.Equal(defaultSpouseHasProGear, order.SpouseHasProGear)
 		suite.Equal(defaultOrdersType, order.OrdersType)
@@ -52,16 +52,12 @@ func (suite *FactorySuite) TestBuildOrder() {
 		// extended service members have backup contacts
 		suite.False(order.ServiceMemberID.IsNil())
 		suite.False(order.ServiceMember.ID.IsNil())
-		suite.False(order.ServiceMember.DutyLocationID.IsNil())
+		suite.False(order.OriginDutyLocationID.IsNil())
 		suite.NotEmpty(order.ServiceMember.BackupContacts)
 		serviceMemberCountInDB, err := suite.DB().Count(models.ServiceMember{})
 		suite.NoError(err)
 		suite.Equal(1, serviceMemberCountInDB)
 
-		// uses the same duty location name for service member and
-		// orders OriginDutyLocation
-		suite.Equal(order.ServiceMember.DutyLocation.Name, order.OriginDutyLocation.Name)
-
 		// uses the default orders NewDutyLocation
 		suite.Equal(order.NewDutyLocation.Name, "Fort Eisenhower, GA 30813")
 
@@ -139,9 +135,7 @@ func (suite *FactorySuite) TestBuildOrder() {
 		order := BuildOrder(suite.DB(), customs, nil)
 
 		suite.Equal(originDutyLocation.Name, order.OriginDutyLocation.Name)
-		suite.Equal(originDutyLocation.Name, order.ServiceMember.DutyLocation.Name)
 		suite.Equal(originDutyLocationTOName, order.OriginDutyLocation.TransportationOffice.Name)
-		suite.Equal(originDutyLocationTOName, order.ServiceMember.DutyLocation.TransportationOffice.Name)
 		suite.Equal(*serviceMember.FirstName, *order.ServiceMember.FirstName)
 		suite.Equal(*serviceMember.LastName, *order.ServiceMember.LastName)
 		suite.Equal(uploadedOrders.ID, order.UploadedOrdersID)
@@ -187,7 +181,7 @@ func (suite *FactorySuite) TestBuildOrder() {
 		suite.Equal(defaultOrdersNumber, *order.OrdersNumber)
 		suite.Equal(defaultTACNumber, *order.TAC)
 		suite.Equal(defaultDepartmentIndicator, *order.DepartmentIndicator)
-		suite.Equal(defaultGrade, *order.Grade)
+		suite.Equal(defaultGrade, string(*order.Grade))
 		suite.Equal(defaultHasDependents, order.HasDependents)
 		suite.Equal(defaultSpouseHasProGear, order.SpouseHasProGear)
 		suite.Equal(defaultOrdersType, order.OrdersType)
@@ -212,7 +206,7 @@ func (suite *FactorySuite) TestBuildOrder() {
 		suite.Nil(order.TAC)
 		suite.Nil(order.DepartmentIndicator)
 		suite.Nil(order.OrdersTypeDetail)
-		suite.Equal(defaultGrade, *order.Grade)
+		suite.Equal(defaultGrade, string(*order.Grade))
 		suite.Equal(defaultHasDependents, order.HasDependents)
 		suite.Equal(defaultSpouseHasProGear, order.SpouseHasProGear)
 		suite.Equal(defaultOrdersType, order.OrdersType)
@@ -233,7 +227,7 @@ func (suite *FactorySuite) TestBuildOrder() {
 		suite.Nil(order.TAC)
 		suite.Nil(order.DepartmentIndicator)
 		suite.Nil(order.OrdersTypeDetail)
-		suite.Equal(defaultGrade, *order.Grade)
+		suite.Equal(defaultGrade, string(*order.Grade))
 		suite.Equal(defaultHasDependents, order.HasDependents)
 		suite.Equal(defaultSpouseHasProGear, order.SpouseHasProGear)
 		suite.Equal(defaultOrdersType, order.OrdersType)

pkg/factory/service_member_factory.go

@@ -58,7 +58,6 @@ func buildServiceMemberWithBuildType(db *pop.Connection, customs []Customization
 
 	email := "leo_spaceman_sm@example.com"
 	agency := models.AffiliationARMY
-	rank := models.ServiceMemberRankE1
 
 	// Create random edipi
 	randomEdipi := RandomEdipi()
@@ -74,7 +73,6 @@ func buildServiceMemberWithBuildType(db *pop.Connection, customs []Customization
 		PersonalEmail:        &email,
 		ResidentialAddressID: &resAddress.ID,
 		ResidentialAddress:   &resAddress,
-		Rank:                 &rank,
 	}
 
 	backupAddressResult := findValidCustomization(customs, Addresses.BackupMailingAddress)
@@ -88,15 +86,6 @@ func buildServiceMemberWithBuildType(db *pop.Connection, customs []Customization
 		serviceMember.BackupMailingAddress = &backupAddress
 	}
 
-	dutyLocationResult := findValidCustomization(customs, DutyLocation)
-	// Find/create the DutyLocation if customization is
-	// provided
-	if dutyLocationResult != nil {
-		dutyLocation := BuildDutyLocation(db, customs, traits)
-		serviceMember.DutyLocationID = &dutyLocation.ID
-		serviceMember.DutyLocation = dutyLocation
-	}
-
 	if buildType == serviceMemberBuildExtended {
 		serviceMember.EmailIsPreferred = models.BoolPointer(true)
 
@@ -107,14 +96,6 @@ func buildServiceMemberWithBuildType(db *pop.Connection, customs []Customization
 			serviceMember.BackupMailingAddressID = &backupAddress.ID
 			serviceMember.BackupMailingAddress = &backupAddress
 		}
-
-		// ensure extended service member has duty location,
-		// even if customization is not provided
-		if serviceMember.DutyLocationID == nil {
-			dutyLocation := FetchOrBuildCurrentDutyLocation(db)
-			serviceMember.DutyLocationID = &dutyLocation.ID
-			serviceMember.DutyLocation = dutyLocation
-		}
 	}
 
 	// Overwrite values with those from customizations

pkg/factory/service_member_factory_test.go

@@ -9,7 +9,6 @@ import (
 func (suite *FactorySuite) TestBuildServiceMember() {
 	defaultEmail := "leo_spaceman_sm@example.com"
 	defaultAgency := models.AffiliationARMY
-	defaultRank := models.ServiceMemberRankE1
 	suite.Run("Successful creation of default ServiceMember", func() {
 		// Under test:      BuildServiceMember
 		// Mocked:          None
@@ -21,7 +20,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 			FirstName:     models.StringPointer("Leo"),
 			LastName:      models.StringPointer("Spacemen"),
 			Telephone:     models.StringPointer("212-123-4567"),
-			Rank:          &defaultRank,
 			PersonalEmail: &defaultEmail,
 			Affiliation:   &defaultAgency,
 		}
@@ -42,7 +40,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 		// VALIDATE RESULTS
 		suite.Equal(defaultServiceMember.FirstName, serviceMember.FirstName)
 		suite.Equal(defaultServiceMember.LastName, serviceMember.LastName)
-		suite.Equal(defaultServiceMember.Rank, serviceMember.Rank)
 		suite.Equal(defaultServiceMember.PersonalEmail, serviceMember.PersonalEmail)
 		suite.Equal(defaultServiceMember.Telephone, serviceMember.Telephone)
 		suite.Equal(defaultServiceMember.Affiliation, serviceMember.Affiliation)
@@ -60,7 +57,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 		// Set up:          Create a Service Member and pass custom fields
 		// Expected outcome:serviceMember should be created with custom fields
 		// SETUP
-		customRank := models.ServiceMemberRankE3
 		customAffiliation := models.AffiliationAIRFORCE
 
 		customServiceMember := models.ServiceMember{
@@ -69,7 +65,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 			Telephone:          models.StringPointer("999-999-9999"),
 			SecondaryTelephone: models.StringPointer("123-555-9999"),
 			PersonalEmail:      models.StringPointer("peyton@example.com"),
-			Rank:               &customRank,
 			Edipi:              models.StringPointer("1000011111"),
 			Affiliation:        &customAffiliation,
 			Suffix:             models.StringPointer("Random suffix string"),
@@ -98,7 +93,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 		suite.Equal(customServiceMember.Telephone, serviceMember.Telephone)
 		suite.Equal(customServiceMember.SecondaryTelephone, serviceMember.SecondaryTelephone)
 		suite.Equal(customServiceMember.PersonalEmail, serviceMember.PersonalEmail)
-		suite.Equal(customServiceMember.Rank, serviceMember.Rank)
 		suite.Equal(customServiceMember.Edipi, serviceMember.Edipi)
 		suite.Equal(customServiceMember.Affiliation, serviceMember.Affiliation)
 		suite.Equal(customServiceMember.Suffix, serviceMember.Suffix)
@@ -118,7 +112,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 		// Expected outcome:serviceMember should be created with custom residential address different from address attached backup mailing address
 
 		// SETUP
-		customRank := models.ServiceMemberRankE3
 		customAffiliation := models.AffiliationAIRFORCE
 
 		customResidentialAddress := models.Address{
@@ -135,7 +128,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 			Telephone:          models.StringPointer("999-999-9999"),
 			SecondaryTelephone: models.StringPointer("123-555-9999"),
 			PersonalEmail:      models.StringPointer("peyton@example.com"),
-			Rank:               &customRank,
 			Edipi:              models.StringPointer("1000011111"),
 			Affiliation:        &customAffiliation,
 			Suffix:             models.StringPointer("Random suffix string"),
@@ -156,7 +148,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 		suite.Equal(customServiceMember.Telephone, serviceMember.Telephone)
 		suite.Equal(customServiceMember.SecondaryTelephone, serviceMember.SecondaryTelephone)
 		suite.Equal(customServiceMember.PersonalEmail, serviceMember.PersonalEmail)
-		suite.Equal(customServiceMember.Rank, serviceMember.Rank)
 		suite.Equal(customServiceMember.Edipi, serviceMember.Edipi)
 		suite.Equal(customServiceMember.Affiliation, serviceMember.Affiliation)
 		suite.Equal(customServiceMember.Suffix, serviceMember.Suffix)
@@ -242,7 +233,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 		// members and a backupContact should be created
 
 		// SETUP
-		customRank := models.ServiceMemberRankE3
 		customAffiliation := models.AffiliationAIRFORCE
 
 		customServiceMember := models.ServiceMember{
@@ -251,7 +241,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 			Telephone:          models.StringPointer("999-999-9999"),
 			SecondaryTelephone: models.StringPointer("123-555-9999"),
 			PersonalEmail:      models.StringPointer("peyton@example.com"),
-			Rank:               &customRank,
 			Edipi:              models.StringPointer("1000011111"),
 			Affiliation:        &customAffiliation,
 			Suffix:             models.StringPointer("Random suffix string"),
@@ -288,7 +277,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 		suite.Equal(customServiceMember.Telephone, serviceMember.Telephone)
 		suite.Equal(customServiceMember.SecondaryTelephone, serviceMember.SecondaryTelephone)
 		suite.Equal(customServiceMember.PersonalEmail, serviceMember.PersonalEmail)
-		suite.Equal(customServiceMember.Rank, serviceMember.Rank)
 		suite.Equal(customServiceMember.Edipi, serviceMember.Edipi)
 		suite.Equal(customServiceMember.Affiliation, serviceMember.Affiliation)
 		suite.Equal(customServiceMember.Suffix, serviceMember.Suffix)
@@ -328,10 +316,6 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 		suite.Equal(customBackupAddress.PostalCode,
 			serviceMember.BackupMailingAddress.PostalCode)
 
-		ordersDutyLocation := FetchOrBuildCurrentDutyLocation(suite.DB())
-		suite.Equal(ordersDutyLocation.ID, serviceMember.DutyLocation.ID)
-		suite.Equal(ordersDutyLocation.Name, serviceMember.DutyLocation.Name)
-
 		// Check that backup contact was made and appended to service member
 		suite.Equal(1, len(serviceMember.BackupContacts))
 		suite.Equal(models.BackupContactPermissionEDIT, serviceMember.BackupContacts[0].Permission)
@@ -345,8 +329,7 @@ func (suite *FactorySuite) TestBuildServiceMember() {
 		precount, err := suite.DB().Count(&models.ServiceMember{})
 		suite.NoError(err)
 
-		serviceMember := BuildExtendedServiceMember(nil, nil, nil)
-		suite.Equal("Yuma AFB", serviceMember.DutyLocation.Name)
+		BuildExtendedServiceMember(nil, nil, nil)
 
 		count, err := suite.DB().Count(&models.ServiceMember{})
 		suite.Equal(precount, count)

pkg/factory/shared_test.go

@@ -332,7 +332,6 @@ func (suite *FactorySuite) TestNestedModelsCheck() {
 		testid := uuid.Must(uuid.NewV4())
 		edipi := RandomEdipi()
 		timestamp := time.Now()
-		rank := models.ServiceMemberRankE4
 		name := "Riley Baker"
 		phone := "555-777-9929"
 
@@ -344,7 +343,6 @@ func (suite *FactorySuite) TestNestedModelsCheck() {
 				UserID:                 testid,
 				Edipi:                  &edipi,
 				Affiliation:            &navy,
-				Rank:                   &rank,
 				FirstName:              &name,
 				MiddleName:             &name,
 				LastName:               &name,
@@ -356,7 +354,6 @@ func (suite *FactorySuite) TestNestedModelsCheck() {
 				EmailIsPreferred:       models.BoolPointer(false),
 				ResidentialAddressID:   &testid,
 				BackupMailingAddressID: &testid,
-				DutyLocationID:         &testid,
 			},
 			Type: &ServiceMember,
 		}