Merge branch 'main' into B-19713-v2

migrations/app/migrations_manifest.txt

@@ -943,6 +943,7 @@
 20240522124339_add_csr_to_roles.up.sql
 20240524214247_add_sit_location_moving_expenses.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

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';

pkg/factory/role_factory.go

@@ -97,12 +97,12 @@ func GetTraitTOORole() []Customization {
 	}
 }
 
-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

@@ -120,17 +120,17 @@ func (suite *FactorySuite) TestBuildRoleTraits() {
 		suite.Equal(roles.RoleTypeTOO, 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}),
 		}
 	}
 

pkg/handlers/adminapi/requested_office_users_test.go

@@ -29,8 +29,8 @@ func (suite *HandlerSuite) TestIndexRequestedOfficeUsersHandler() {
 	suite.Run("requested users result in ok response", func() {
 		// building two office user with requested status
 		requestedOfficeUsers := models.OfficeUsers{
-			factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitRequestedOfficeUser(), []roles.RoleType{roles.RoleTypeQaeCsr}),
-			factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitRequestedOfficeUser(), []roles.RoleType{roles.RoleTypeQaeCsr})}
+			factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitRequestedOfficeUser(), []roles.RoleType{roles.RoleTypeQae}),
+			factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitRequestedOfficeUser(), []roles.RoleType{roles.RoleTypeQae})}
 		params := requestedofficeuserop.IndexRequestedOfficeUsersParams{
 			HTTPRequest: suite.setupAuthenticatedRequest("GET", "/requested_office_users"),
 		}
@@ -56,7 +56,7 @@ func (suite *HandlerSuite) TestIndexRequestedOfficeUsersHandler() {
 func (suite *HandlerSuite) TestGetRequestedOfficeUserHandler() {
 	// test that everything is wired up
 	suite.Run("integration test ok response", func() {
-		requestedOfficeUser := factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitRequestedOfficeUser(), []roles.RoleType{roles.RoleTypeQaeCsr})
+		requestedOfficeUser := factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitRequestedOfficeUser(), []roles.RoleType{roles.RoleTypeQae})
 		params := requestedofficeuserop.GetRequestedOfficeUserParams{
 			HTTPRequest:  suite.setupAuthenticatedRequest("GET", fmt.Sprintf("/requested_office_users/%s", requestedOfficeUser.ID)),
 			OfficeUserID: strfmt.UUID(requestedOfficeUser.ID.String()),
@@ -94,7 +94,7 @@ func (suite *HandlerSuite) TestGetRequestedOfficeUserHandler() {
 	})
 
 	suite.Run("successful response", func() {
-		requestedOfficeUser := factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitRequestedOfficeUser(), []roles.RoleType{roles.RoleTypeQaeCsr})
+		requestedOfficeUser := factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitRequestedOfficeUser(), []roles.RoleType{roles.RoleTypeQae})
 		params := requestedofficeuserop.GetRequestedOfficeUserParams{
 			HTTPRequest:  suite.setupAuthenticatedRequest("GET", fmt.Sprintf("/requested_office_users/%s", requestedOfficeUser.ID)),
 			OfficeUserID: strfmt.UUID(requestedOfficeUser.ID.String()),
@@ -135,7 +135,7 @@ func (suite *HandlerSuite) TestGetRequestedOfficeUserHandler() {
 	})
 
 	suite.Run("unsuccessful response when fetch fails", func() {
-		requestedOfficeUser := factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitRequestedOfficeUser(), []roles.RoleType{roles.RoleTypeQaeCsr})
+		requestedOfficeUser := factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitRequestedOfficeUser(), []roles.RoleType{roles.RoleTypeQae})
 		params := requestedofficeuserop.GetRequestedOfficeUserParams{
 			HTTPRequest:  suite.setupAuthenticatedRequest("GET", fmt.Sprintf("/requested_office_users/%s", requestedOfficeUser.ID)),
 			OfficeUserID: strfmt.UUID(requestedOfficeUser.ID.String()),

pkg/handlers/authentication/auth_test.go

@@ -429,10 +429,10 @@ func (suite *AuthSuite) TestRequirePermissionsMiddlewareAuthorized() {
 // Test permissions middleware with a user who will be DENIED POST access on the endpoint: ghc/v1/shipments/:shipmentID/approve
 // role must NOT have update.shipment permissions
 func (suite *AuthSuite) TestRequirePermissionsMiddlewareUnauthorized() {
-	// QAECSR users will be denied access as they lack the proper permissions for our test - update.shipment
-	qaeCsrOfficeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQaeCsr})
+	// QAE users will be denied access as they lack the proper permissions for our test - update.shipment
+	qaeOfficeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQae})
 
-	identity, err := models.FetchUserIdentity(suite.DB(), qaeCsrOfficeUser.User.OktaID)
+	identity, err := models.FetchUserIdentity(suite.DB(), qaeOfficeUser.User.OktaID)
 
 	suite.NoError(err)
 
@@ -442,7 +442,7 @@ func (suite *AuthSuite) TestRequirePermissionsMiddlewareUnauthorized() {
 
 	// And: the context contains the auth values
 	handlerSession := auth.Session{
-		UserID:          qaeCsrOfficeUser.User.ID,
+		UserID:          qaeOfficeUser.User.ID,
 		IDToken:         "fake Token",
 		ApplicationName: "mil",
 	}
@@ -465,7 +465,7 @@ func (suite *AuthSuite) TestRequirePermissionsMiddlewareUnauthorized() {
 	middleware(handler).ServeHTTP(rr, req)
 
 	suite.Equal(http.StatusUnauthorized, rr.Code, "handler returned wrong status code")
-	suite.Equal(handlerSession.UserID, qaeCsrOfficeUser.User.ID, "the authenticated user is different from expected")
+	suite.Equal(handlerSession.UserID, qaeOfficeUser.User.ID, "the authenticated user is different from expected")
 }
 
 func (suite *AuthSuite) TestIsLoggedInWhenNoUserLoggedIn() {
@@ -1424,7 +1424,7 @@ func (suite *AuthSuite) TestAuthorizeUnknownUserOfficeLogsInWithPermissions() {
 			Model:    user,
 			LinkOnly: true,
 		},
-	}, []roles.RoleType{roles.RoleTypeQaeCsr})
+	}, []roles.RoleType{roles.RoleTypeQae})
 
 	handlerConfig := suite.HandlerConfig()
 	appnames := handlerConfig.AppNames()
@@ -1460,13 +1460,13 @@ func (suite *AuthSuite) TestAuthorizeUnknownUserOfficeLogsInWithPermissions() {
 	suite.NotEqual("", foundUser.CurrentOfficeSessionID)
 	// Make sure session contains roles and permissions
 	suite.NotEmpty(session.Roles)
-	userRole, hasRole := officeUser.User.Roles.GetRole(roles.RoleTypeQaeCsr)
+	userRole, hasRole := officeUser.User.Roles.GetRole(roles.RoleTypeQae)
 	suite.True(hasRole)
-	sessionRole, hasRole := session.Roles.GetRole(roles.RoleTypeQaeCsr)
+	sessionRole, hasRole := session.Roles.GetRole(roles.RoleTypeQae)
 	suite.True(hasRole)
 	suite.Equal(userRole.ID, sessionRole.ID)
 	suite.NotEmpty(session.Permissions)
-	suite.ElementsMatch(QAECSR.Permissions, session.Permissions)
+	suite.ElementsMatch(QAE.Permissions, session.Permissions)
 }
 
 func (suite *AuthSuite) TestAuthorizeUnknownUserAdminDeactivated() {

pkg/handlers/authentication/devlocal.go

@@ -31,8 +31,8 @@ const (
 	ServicesCounselorOfficeUserType string = "Services Counselor office"
 	// PrimeSimulatorOfficeUserType is the type of user for an Office user
 	PrimeSimulatorOfficeUserType string = "Prime Simulator office"
-	// QaeCsrOfficeUserType is a type of user for an Office user
-	QaeCsrOfficeUserType string = "QAE/CSR office"
+	// QaeOfficeUserType is a type of user for an Office user
+	QaeOfficeUserType string = "QAE office"
 	// CustomerServiceRepresentativeOfficeUserType is the Customer Service Representative type of user for an Office user
 	CustomerServiceRepresentativeOfficeUserType string = "CSR office"
 	// MultiRoleOfficeUserType has all the Office user roles
@@ -105,7 +105,7 @@ func (h UserListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		TIOOfficeUserType                           string
 		ServicesCounselorOfficeUserType             string
 		PrimeSimulatorOfficeUserType                string
-		QaeCsrOfficeUserType                        string
+		QaeOfficeUserType                           string
 		CustomerServiceRepresentativeOfficeUserType string
 		MultiRoleOfficeUserType                     string
 		IsAdminApp                                  bool
@@ -125,7 +125,7 @@ func (h UserListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		TIOOfficeUserType:               TIOOfficeUserType,
 		ServicesCounselorOfficeUserType: ServicesCounselorOfficeUserType,
 		PrimeSimulatorOfficeUserType:    PrimeSimulatorOfficeUserType,
-		QaeCsrOfficeUserType:            QaeCsrOfficeUserType,
+		QaeOfficeUserType:               QaeOfficeUserType,
 		CustomerServiceRepresentativeOfficeUserType: CustomerServiceRepresentativeOfficeUserType,
 		MultiRoleOfficeUserType:                     MultiRoleOfficeUserType,
 		IsAdminApp:                                  auth.AdminApp == appCtx.Session().ApplicationName,
@@ -251,9 +251,9 @@ func (h UserListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				<form method="post" action="/devlocal-auth/new">
 					<p>
 					  <input type="hidden" name="gorilla.csrf.Token" value="{{.CsrfToken}}">
-					  <input type="hidden" name="userType" value="{{.QaeCsrOfficeUserType}}">
+					  <input type="hidden" name="userType" value="{{.QaeOfficeUserType}}">
 					  ` + gblocSelectHTML + `
-					  <button type="submit" data-hook="new-user-login-{{.QaeCsrOfficeUserType}}">Create a New {{.QaeCsrOfficeUserType}} User</button>
+					  <button type="submit" data-hook="new-user-login-{{.QaeOfficeUserType}}">Create a New {{.QaeOfficeUserType}} User</button>
 					</p>
 				  </form>
 
@@ -766,7 +766,7 @@ func createUser(h devlocalAuthHandler, w http.ResponseWriter, r *http.Request) (
 		if verrs.HasAny() {
 			appCtx.Logger().Error("validation errors creating office user", zap.Stringer("errors", verrs))
 		}
-	case QaeCsrOfficeUserType:
+	case QaeOfficeUserType:
 		// Now create the Truss JPPSO
 		address := models.Address{
 			StreetAddress1: "1333 Minna St",
@@ -785,9 +785,9 @@ func createUser(h devlocalAuthHandler, w http.ResponseWriter, r *http.Request) (
 		}
 
 		role := roles.Role{}
-		err = appCtx.DB().Where("role_type = $1", roles.RoleTypeQaeCsr).First(&role)
+		err = appCtx.DB().Where("role_type = $1", roles.RoleTypeQae).First(&role)
 		if err != nil {
-			appCtx.Logger().Error("could not fetch role qae_csr", zap.Error(err))
+			appCtx.Logger().Error("could not fetch role qae", zap.Error(err))
 		}
 
 		usersRole := models.UsersRoles{
@@ -1042,7 +1042,7 @@ func createSession(h devlocalAuthHandler, user *models.User, userType string, _
 
 	// Keep the logic for redirection separate from setting the session user ids
 	switch userType {
-	case TOOOfficeUserType, TIOOfficeUserType, ServicesCounselorOfficeUserType, PrimeSimulatorOfficeUserType, QaeCsrOfficeUserType, CustomerServiceRepresentativeOfficeUserType, MultiRoleOfficeUserType:
+	case TOOOfficeUserType, TIOOfficeUserType, ServicesCounselorOfficeUserType, PrimeSimulatorOfficeUserType, QaeOfficeUserType, CustomerServiceRepresentativeOfficeUserType, MultiRoleOfficeUserType:
 		session.ApplicationName = auth.OfficeApp
 		session.Hostname = h.AppNames().OfficeServername
 		active = userIdentity.Active || (userIdentity.OfficeActive != nil && *userIdentity.OfficeActive)
@@ -1130,7 +1130,7 @@ func loginUser(h devlocalAuthHandler, user *models.User, userType string, w http
 }
 
 func isOfficeUser(userType string) bool {
-	if userType == TOOOfficeUserType || userType == TIOOfficeUserType || userType == ServicesCounselorOfficeUserType || userType == QaeCsrOfficeUserType || userType == CustomerServiceRepresentativeOfficeUserType {
+	if userType == TOOOfficeUserType || userType == TIOOfficeUserType || userType == ServicesCounselorOfficeUserType || userType == QaeOfficeUserType || userType == CustomerServiceRepresentativeOfficeUserType {
 		return true
 	}
 	return false

pkg/handlers/authentication/devlocal_test.go

@@ -77,7 +77,7 @@ func (suite *AuthSuite) TestCreateUserHandlerOffice() {
 		factory.GetTraitServicesCounselorRole,
 	})
 	factory.BuildRole(suite.DB(), nil, []factory.Trait{
-		factory.GetTraitQaeCsrRole,
+		factory.GetTraitQaeRole,
 	})
 	factory.BuildRole(suite.DB(), nil, []factory.Trait{
 		factory.GetTraitCustomerServiceRepresentativeRole,
@@ -114,9 +114,9 @@ func (suite *AuthSuite) TestCreateUserHandlerOffice() {
 			email:     "[email protected]",
 		},
 		{
-			userType:  QaeCsrOfficeUserType,
-			roleTypes: []roles.RoleType{roles.RoleTypeQaeCsr},
-			email:     "qae_csr_office_user@example.com",
+			userType:  QaeOfficeUserType,
+			roleTypes: []roles.RoleType{roles.RoleTypeQae},
+			email:     "qae_office_user@example.com",
 		},
 		{
 			userType:  CustomerServiceRepresentativeOfficeUserType,

pkg/handlers/authentication/permissions.go

@@ -75,8 +75,8 @@ var ServicesCounselor = RolePermissions{
 	},
 }
 
-var QAECSR = RolePermissions{
-	RoleType: roles.RoleTypeQaeCsr,
+var QAE = RolePermissions{
+	RoleType: roles.RoleTypeQae,
 	Permissions: []string{
 		"create.reportViolation",
 		"create.evaluationReport",
@@ -97,7 +97,7 @@ var CustomerServiceRepresentative = RolePermissions{
 	},
 }
 
-var AllRolesPermissions = []RolePermissions{TOO, TIO, ServicesCounselor, QAECSR, CustomerServiceRepresentative}
+var AllRolesPermissions = []RolePermissions{TOO, TIO, ServicesCounselor, QAE, CustomerServiceRepresentative}
 
 // check if a [user.role] has permissions on a given object
 func checkUserPermission(appCtx appcontext.AppContext, session *auth.Session, permission string) (bool, error) {

pkg/handlers/ghcapi/mto_shipment_test.go

@@ -312,7 +312,7 @@ func (suite *HandlerSuite) TestListMTOShipmentsHandler() {
 
 func (suite *HandlerSuite) TestDeleteShipmentHandler() {
 	suite.Run("Returns a 403 when user is not a service counselor or TOO", func() {
-		officeUser := factory.BuildOfficeUserWithRoles(nil, nil, []roles.RoleType{roles.RoleTypeQaeCsr})
+		officeUser := factory.BuildOfficeUserWithRoles(nil, nil, []roles.RoleType{roles.RoleTypeQae})
 		uuid := uuid.Must(uuid.NewV4())
 		deleter := &mocks.ShipmentDeleter{}
 

pkg/handlers/ghcapi/office_users_test.go

@@ -34,15 +34,15 @@ func (suite *HandlerSuite) setupOfficeUserCreatorTestScenario() (*mocks.OfficeUs
 }
 
 // Services Counselor. Task Ordering Officer (TOO), Task Invoicing Officer (TIO),
-// and Quality Assurance Evaluator (QAE)/Customer Service Representative (CSR)
+// Quality Assurance Evaluator (QAE), and Customer Service Representative (CSR)
 // Are all roles allowed to request office user (They authenticate with AuthenticateOfficeRequest)
 func (suite *HandlerSuite) TestRequestOfficeUserHandler() {
 	suite.Run("Successfully requests the creation of an office user", func() {
 		mockCreator, mockRoleAssociator, mockRoleFetcher, handler := suite.setupOfficeUserCreatorTestScenario()
 
 		transportationOffice := factory.BuildTransportationOffice(suite.DB(), nil, nil)
 
-		officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO, roles.RoleTypeServicesCounselor, roles.RoleTypeTIO, roles.RoleTypeQaeCsr})
+		officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO, roles.RoleTypeServicesCounselor, roles.RoleTypeTIO, roles.RoleTypeQae})
 		request := httptest.NewRequest("POST", "/requested-office-users", nil)
 		request = suite.AuthenticateOfficeRequest(request, officeUser)
 		params := officeuserop.CreateRequestedOfficeUserParams{
@@ -231,7 +231,7 @@ func (suite *HandlerSuite) TestRequestOfficeUserHandler() {
 
 		transportationOffice := factory.BuildTransportationOffice(suite.DB(), nil, nil)
 
-		officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO, roles.RoleTypeServicesCounselor, roles.RoleTypeTIO, roles.RoleTypeQaeCsr})
+		officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO, roles.RoleTypeServicesCounselor, roles.RoleTypeTIO, roles.RoleTypeQae})
 		request := httptest.NewRequest("POST", "/requested-office-users", nil)
 		request = suite.AuthenticateOfficeRequest(request, officeUser)
 		// EDIPI and other unique ID missing

pkg/models/roles/roles.go

@@ -28,8 +28,8 @@ const (
 	RoleTypeServicesCounselor RoleType = "services_counselor"
 	// RoleTypePrimeSimulator is the PrimeSimulator Role
 	RoleTypePrimeSimulator RoleType = "prime_simulator"
-	// RoleTypeQaeCsr is the Quality Assurance and Customer Support Role
-	RoleTypeQaeCsr RoleType = "qae_csr"
+	// RoleTypeQae is the Quality Assurance Evaluator Role
+	RoleTypeQae RoleType = "qae"
 	// RoleTypeCustomerServiceRepresentative is the Customer Support Representative Role
 	RoleTypeCustomerServiceRepresentative RoleType = "customer_service_representative"
 	// RoleTypePrime is the Role associated with actions performed by the Prime

pkg/services/evaluation_report/evaluation_report_fetcher_test.go

@@ -203,7 +203,7 @@ func (suite *EvaluationReportSuite) TestFetchEvaluationReportByID() {
 	// successful fetch
 	suite.Run("fetch for a submitted evaluation report that exists should be successful", func() {
 		fetcher := NewEvaluationReportFetcher()
-		officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQaeCsr})
+		officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQae})
 		report := factory.BuildEvaluationReport(suite.DB(), []factory.Customization{
 			{
 				Model:    officeUser,
@@ -223,8 +223,8 @@ func (suite *EvaluationReportSuite) TestFetchEvaluationReportByID() {
 	// forbidden if they don't own the draft
 	suite.Run("fetch for a draft evaluation report should return a forbidden if the requester isn't the owner", func() {
 		fetcher := NewEvaluationReportFetcher()
-		officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQaeCsr})
-		officeUserOwner := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQaeCsr})
+		officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQae})
+		officeUserOwner := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQae})
 		report := factory.BuildEvaluationReport(suite.DB(), []factory.Customization{
 			{
 				Model:    officeUserOwner,
@@ -238,7 +238,7 @@ func (suite *EvaluationReportSuite) TestFetchEvaluationReportByID() {
 	// not found error if the ID is wrong
 	suite.Run("fetch should return a not found error if the reportID doesn't exist", func() {
 		fetcher := NewEvaluationReportFetcher()
-		officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQaeCsr})
+		officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQae})
 		factory.BuildEvaluationReport(suite.DB(), []factory.Customization{
 			{
 				Model:    officeUser,