Merge branch integrationTesting into B-19728-2-INT

migrations/app/migrations_manifest.txt

@@ -945,9 +945,11 @@
 20240524214247_add_sit_location_moving_expenses.up.sql
 20240529181303_add_additional_documents_id_col_to_moves.up.sql
 20240530020648_adding_standalone_crate_service_param.up.sql
+20240530084720_rename_qae_csr_to_just_qae.up.sql
 20240531050324_adding_standalone_crate_cap.up.sql
 20240531152430_migrate_data_to_new_ppm_statuses.up.sql
 20240531152526_remove_ppm_statuses_no_longer_used.up.sql
 20240531153321_update_tio_role_name.up.sql
 20240531154303_add_more_submitted_columns_to_ppm_document_tables.up.sql
 20240603040207_add_submitted_cols_to_moving_expenses.up.sql
+20240603152949_update_too_role_name.up.sql

migrations/app/schema/20240530084720_rename_qae_csr_to_just_qae.up.sql

@@ -0,0 +1,6 @@
+-- Rename QAE/CSR to just QAE per E-05337
+UPDATE roles
+SET role_name = 'Quality Assurance Evaluator',
+    role_type = 'qae',
+    updated_at = now()
+WHERE id = 'a2af3cc0-d0cd-4a29-8092-70ad45723090';

migrations/app/schema/20240603152949_update_too_role_name.up.sql

@@ -0,0 +1,12 @@
+UPDATE
+    roles
+SET
+    role_name = 'Task Ordering Officer', role_type = 'task_ordering_officer'
+WHERE
+    role_name = 'Transportation Ordering Officer';
+
+COMMENT ON COLUMN mto_shipments.rejection_reason IS 'Not currently used, until the "reject" or "cancel" a shipment feature is implemented. When the Task Ordering Officer rejects or cancels a shipment, they will explain why';
+COMMENT ON COLUMN mto_shipments.approved_date IS 'The date when the Task Ordering Officer approves the shipment, and it is added to the Move Task Order for the Prime contractor';
+COMMENT ON COLUMN orders.tac IS '(For HHG shipments) Lines of accounting are specified on the customer''s move orders, issued by their branch of service, and indicate the exact accounting codes the service will use to pay for the move. The Task Ordering Officer adds this information to the MTO.';
+COMMENT ON COLUMN orders.nts_tac IS '(For NTS shipments) Lines of accounting are specified on the customer''s move orders, issued by their branch of service, and indicate the exact accounting codes the service will use to pay for the move. The Task Ordering Officer adds this information to the MTO.';
+COMMENT ON COLUMN roles.role_type IS 'The name of the role in snake case. Current values are: ''task_ordering_officer'', ''transportation_invoicing_officer'', ''customer'', ''ppm_office_users'', ''contracting_officer''.';

pkg/factory/role_factory.go

@@ -91,18 +91,18 @@ func GetTraitTOORole() []Customization {
 		{
 			Model: roles.Role{
 				RoleType: roles.RoleTypeTOO,
-				RoleName: "Transportation Ordering Officer",
+				RoleName: "Task Ordering Officer",
 			},
 		},
 	}
 }
 
-func GetTraitQaeCsrRole() []Customization {
+func GetTraitQaeRole() []Customization {
 	return []Customization{
 		{
 			Model: roles.Role{
-				RoleType: roles.RoleTypeQaeCsr,
-				RoleName: "Quality Assurance and Customer Service",
+				RoleType: roles.RoleTypeQae,
+				RoleName: "Quality Assurance Evaluator",
 			},
 		},
 	}

pkg/factory/role_factory_test.go

@@ -116,7 +116,7 @@ func (suite *FactorySuite) TestBuildRoleTraits() {
 			[]Trait{
 				GetTraitTOORole,
 			})
-		suite.Equal(roles.RoleName("Transportation Ordering Officer"), role.RoleName)
+		suite.Equal(roles.RoleName("Task Ordering Officer"), role.RoleName)
 		suite.Equal(roles.RoleTypeTOO, role.RoleType)
 	})
 
@@ -133,17 +133,17 @@ func (suite *FactorySuite) TestBuildRoleTraits() {
 		suite.Equal(roles.RoleTypeHQ, role.RoleType)
 	})
 
-	suite.Run("Successful creation of role with QaeCsr trait", func() {
+	suite.Run("Successful creation of role with Qae trait", func() {
 		// Under test:      BuildRole
-		// Set up:          Create a Role with a trait (GetTraitQaeCsrRole)
+		// Set up:          Create a Role with a trait (GetTraitQaeRole)
 		// Expected outcome:Role should be created with TIO RoleType and RoleName
 
 		role := BuildRole(suite.DB(), nil,
 			[]Trait{
-				GetTraitQaeCsrRole,
+				GetTraitQaeRole,
 			})
-		suite.Equal(roles.RoleName("Quality Assurance and Customer Service"), role.RoleName)
-		suite.Equal(roles.RoleTypeQaeCsr, role.RoleType)
+		suite.Equal(roles.RoleName("Quality Assurance Evaluator"), role.RoleName)
+		suite.Equal(roles.RoleTypeQae, role.RoleType)
 	})
 
 	suite.Run("Successful creation of role with Contracting Officer trait", func() {

pkg/handlers/adminapi/office_users_test.go

@@ -29,8 +29,8 @@ import (
 func (suite *HandlerSuite) TestIndexOfficeUsersHandler() {
 	setupTestData := func() models.OfficeUsers {
 		return models.OfficeUsers{
-			factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitApprovedOfficeUser(), []roles.RoleType{roles.RoleTypeQaeCsr}),
-			factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitApprovedOfficeUser(), []roles.RoleType{roles.RoleTypeQaeCsr}),
+			factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitApprovedOfficeUser(), []roles.RoleType{roles.RoleTypeQae}),
+			factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitApprovedOfficeUser(), []roles.RoleType{roles.RoleTypeQae}),
 		}
 	}
 
@@ -137,7 +137,7 @@ func (suite *HandlerSuite) TestGetOfficeUserHandler() {
 }
 
 func (suite *HandlerSuite) TestCreateOfficeUserHandler() {
-	tooRoleName := "Transportation Ordering Officer"
+	tooRoleName := "Task Ordering Officer"
 	tooRoleType := string(roles.RoleTypeTOO)
 
 	tioRoleName := "Task Invoicing Officer"