B 21445 too bulk data

pkg/factory/move_factory.go

@@ -35,6 +35,22 @@ func BuildMove(db *pop.Connection, customs []Customization, traits []Trait) mode
 		closeoutOffice = BuildTransportationOffice(db, tempCloseoutOfficeCustoms, nil)
 	}
 
+	var counselingOffice models.TransportationOffice
+	tempCounselingOfficeCustoms := customs
+	counselingOfficeResult := findValidCustomization(customs, TransportationOffices.CounselingOffice)
+	if counselingOfficeResult != nil {
+		tempCounselingOfficeCustoms = convertCustomizationInList(tempCounselingOfficeCustoms, TransportationOffices.CounselingOffice, TransportationOffice)
+		counselingOffice = BuildTransportationOffice(db, tempCounselingOfficeCustoms, nil)
+	}
+
+	var scAssignedUser models.OfficeUser
+	tempSCAssignedUserCustoms := customs
+	scAssignedUserResult := findValidCustomization(customs, OfficeUsers.SCAssignedUser)
+	if scAssignedUserResult != nil {
+		tempSCAssignedUserCustoms = convertCustomizationInList(tempSCAssignedUserCustoms, OfficeUsers.SCAssignedUser, OfficeUser)
+		scAssignedUser = BuildOfficeUser(db, tempSCAssignedUserCustoms, nil)
+	}
+
 	var defaultReferenceID string
 	var err error
 	if db != nil {
@@ -73,6 +89,16 @@ func BuildMove(db *pop.Connection, customs []Customization, traits []Trait) mode
 		move.CloseoutOfficeID = &closeoutOffice.ID
 	}
 
+	if counselingOfficeResult != nil {
+		move.CounselingOffice = &counselingOffice
+		move.CounselingOfficeID = &counselingOffice.ID
+	}
+
+	if scAssignedUserResult != nil {
+		move.SCAssignedUser = &scAssignedUser
+		move.SCAssignedID = &scAssignedUser.ID
+	}
+
 	// Overwrite values with those from assertions
 	testdatagen.MergeModels(&move, cMove)
 
@@ -165,6 +191,8 @@ func BuildMoveWithShipment(db *pop.Connection, customs []Customization, traits [
 	return move
 }
 func BuildMoveWithPPMShipment(db *pop.Connection, customs []Customization, traits []Trait) models.Move {
+	// Please note this function runs BuildMove 3 times
+	// Once here, once in buildMTOShipmentWithBuildType, and once in BuildPPMShipment
 	move := BuildMove(db, customs, traits)
 
 	mtoShipment := buildMTOShipmentWithBuildType(db, customs, traits, mtoShipmentPPM)

pkg/factory/move_factory_test.go

@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/transcom/mymove/pkg/models"
+	"github.com/transcom/mymove/pkg/models/roles"
 )
 
 func (suite *FactorySuite) TestBuildMove() {
@@ -258,6 +259,23 @@ func (suite *FactorySuite) TestBuildMove() {
 		suite.NotNil(move.AvailableToPrimeAt)
 		suite.NotNil(move.ApprovedAt)
 	})
+	suite.Run("Successful creation of a move with an assigned SC", func() {
+		officeUser := BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeServicesCounselor})
+
+		move := BuildMoveWithShipment(suite.DB(), []Customization{
+			{
+				Model: models.Move{
+					Status: models.MoveStatusNeedsServiceCounseling,
+				},
+			},
+			{
+				Model:    officeUser,
+				LinkOnly: true,
+				Type:     &OfficeUsers.SCAssignedUser,
+			},
+		}, nil)
+		suite.Equal(officeUser.ID, *move.SCAssignedID)
+	})
 	suite.Run("Successful creation of move with shipment", func() {
 		// Under test:      BuildMoveWithShipment
 		// Set up:          Create a move using BuildMoveWithShipment

pkg/factory/office_user_factory.go

@@ -37,8 +37,25 @@ func BuildOfficeUser(db *pop.Connection, customs []Customization, traits []Trait
 	// Find/create the user model
 	user := BuildUserAndUsersRoles(db, customs, nil)
 
-	// Find/create the TransportationOffice model
-	transportationOffice := BuildTransportationOffice(db, customs, nil)
+	var transportationOffice models.TransportationOffice
+
+	tempCloseoutOfficeCustoms := customs
+	closeoutOfficeResult := findValidCustomization(customs, TransportationOffices.CloseoutOffice)
+	if closeoutOfficeResult != nil {
+		tempCloseoutOfficeCustoms = convertCustomizationInList(tempCloseoutOfficeCustoms, TransportationOffices.CloseoutOffice, TransportationOffice)
+		transportationOffice = BuildTransportationOffice(db, tempCloseoutOfficeCustoms, nil)
+	}
+
+	tempCounselingOfficeCustoms := customs
+	counselingOfficeResult := findValidCustomization(customs, TransportationOffices.CounselingOffice)
+	if counselingOfficeResult != nil {
+		tempCounselingOfficeCustoms = convertCustomizationInList(tempCounselingOfficeCustoms, TransportationOffices.CounselingOffice, TransportationOffice)
+		transportationOffice = BuildTransportationOffice(db, tempCounselingOfficeCustoms, nil)
+	}
+
+	if closeoutOfficeResult == nil && counselingOfficeResult == nil {
+		transportationOffice = BuildTransportationOffice(db, customs, nil)
+	}
 
 	// create officeuser
 	officeUser := models.OfficeUser{
@@ -51,6 +68,7 @@ func BuildOfficeUser(db *pop.Connection, customs []Customization, traits []Trait
 		TransportationOffice:   transportationOffice,
 		TransportationOfficeID: transportationOffice.ID,
 	}
+
 	// Overwrite values with those from assertions
 	testdatagen.MergeModels(&officeUser, cOfficeUser)
 
@@ -200,7 +218,25 @@ func BuildOfficeUserWithPrivileges(db *pop.Connection, customs []Customization,
 	user := BuildUserAndUsersRolesAndUsersPrivileges(db, customs, nil)
 
 	// Find/create the TransportationOffice model
-	transportationOffice := BuildTransportationOffice(db, customs, nil)
+	var transportationOffice models.TransportationOffice
+
+	tempCloseoutOfficeCustoms := customs
+	closeoutOfficeResult := findValidCustomization(customs, TransportationOffices.CloseoutOffice)
+	if closeoutOfficeResult != nil {
+		tempCloseoutOfficeCustoms = convertCustomizationInList(tempCloseoutOfficeCustoms, TransportationOffices.CloseoutOffice, TransportationOffice)
+		transportationOffice = BuildTransportationOffice(db, tempCloseoutOfficeCustoms, nil)
+	}
+
+	tempCounselingOfficeCustoms := customs
+	counselingOfficeResult := findValidCustomization(customs, TransportationOffices.CounselingOffice)
+	if counselingOfficeResult != nil {
+		tempCounselingOfficeCustoms = convertCustomizationInList(tempCounselingOfficeCustoms, TransportationOffices.CounselingOffice, TransportationOffice)
+		transportationOffice = BuildTransportationOffice(db, tempCounselingOfficeCustoms, nil)
+	}
+
+	if closeoutOfficeResult == nil && counselingOfficeResult == nil {
+		transportationOffice = BuildTransportationOffice(db, customs, nil)
+	}
 
 	// create officeuser
 	officeUser := models.OfficeUser{
@@ -213,6 +249,7 @@ func BuildOfficeUserWithPrivileges(db *pop.Connection, customs []Customization,
 		TransportationOffice:   transportationOffice,
 		TransportationOfficeID: transportationOffice.ID,
 	}
+
 	// Overwrite values with those from assertions
 	testdatagen.MergeModels(&officeUser, cOfficeUser)
 

pkg/factory/office_user_factory_test.go

@@ -303,4 +303,54 @@ func (suite *FactorySuite) TestBuildOfficeUserExtra() {
 		suite.NoError(err)
 		suite.Equal(precountUsersRoles, countUsersRoles)
 	})
+
+	suite.Run("Successful creation of OfficeUser using BuildOfficeUserWithPrivileges with customizations", func() {
+		email := "[email protected]"
+		transportationOffice := BuildTransportationOffice(suite.DB(), []Customization{
+			{
+				Model: models.TransportationOffice{
+					ProvidesCloseout: true,
+				},
+			},
+		}, nil)
+		officeUser := BuildOfficeUserWithPrivileges(suite.DB(), []Customization{
+			{
+				Model: models.OfficeUser{
+					FirstName: "Riley",
+					Email:     email,
+				},
+			},
+			{
+				Model:    transportationOffice,
+				LinkOnly: true,
+				Type:     &TransportationOffices.CloseoutOffice,
+			},
+			{
+				Model: models.User{
+					OktaEmail: email,
+					Privileges: []models.Privilege{
+						{
+							PrivilegeType: models.PrivilegeTypeSupervisor,
+						},
+					},
+					Roles: []roles.Role{
+						{
+							RoleType: roles.RoleTypeServicesCounselor,
+						},
+					},
+				},
+			},
+		}, nil)
+
+		// Check that the user has the office user role
+		_, hasRole := officeUser.User.Roles.GetRole(roles.RoleTypeServicesCounselor)
+		_, hasPrivilege := officeUser.User.Privileges.GetPrivilege(models.PrivilegeTypeSupervisor)
+		suite.True(hasRole)
+		suite.True(hasPrivilege)
+		// Check customizations
+		suite.Equal(email, officeUser.User.OktaEmail)
+		suite.Equal(email, officeUser.Email)
+		suite.Equal("Riley", officeUser.FirstName)
+		suite.Equal(transportationOffice.ID, officeUser.TransportationOfficeID)
+	})
 }

pkg/factory/shared.go

@@ -258,13 +258,23 @@ type transportationOfficeGroup struct {
 	OriginDutyLocation CustomType
 	NewDutyLocation    CustomType
 	CloseoutOffice     CustomType
+	CounselingOffice   CustomType
 }
 
 // TransportationOffices is the struct to access the fields externally
 var TransportationOffices = transportationOfficeGroup{
 	OriginDutyLocation: "OriginDutyLocationTransportationOffice",
 	NewDutyLocation:    "NewDutyLocationTransportationOffice",
 	CloseoutOffice:     "CloseoutOffice",
+	CounselingOffice:   "CounselingOffice",
+}
+
+type officeUserGroup struct {
+	SCAssignedUser CustomType
+}
+
+var OfficeUsers = officeUserGroup{
+	SCAssignedUser: "SCAssignedUser",
 }
 
 // uploadGroup is a grouping of all the upload related fields

pkg/gen/ghcapi/configure_mymove.go

@@ -222,6 +222,11 @@ func configureAPI(api *ghcoperations.MymoveAPI) http.Handler {
 			return middleware.NotImplemented("operation re_service_items.GetAllReServiceItems has not yet been implemented")
 		})
 	}
+	if api.QueuesGetBulkAssignmentDataHandler == nil {
+		api.QueuesGetBulkAssignmentDataHandler = queues.GetBulkAssignmentDataHandlerFunc(func(params queues.GetBulkAssignmentDataParams) middleware.Responder {
+			return middleware.NotImplemented("operation queues.GetBulkAssignmentData has not yet been implemented")
+		})
+	}
 	if api.CustomerGetCustomerHandler == nil {
 		api.CustomerGetCustomerHandler = customer.GetCustomerHandlerFunc(func(params customer.GetCustomerParams) middleware.Responder {
 			return middleware.NotImplemented("operation customer.GetCustomer has not yet been implemented")