Remove some unused references to the codes context.

Update migration to combine queries into one pieces of sql.

api/src/paths/user/add.test.ts

@@ -8,7 +8,7 @@ import { SystemUser } from '../../repositories/user-repository';
 import { UserService } from '../../services/user-service';
 import * as keycloakUtils from '../../utils/keycloak-utils';
 import { getMockDBConnection, getRequestHandlerMocks } from '../../__mocks__/db';
-import * as user from './add';
+import { addSystemRoleUser } from './add';
 
 chai.use(sinonChai);
 
@@ -56,7 +56,7 @@ describe('user', () => {
 
       const adduserSystemRolesStub = sinon.stub(UserService.prototype, 'addUserSystemRoles');
 
-      const requestHandler = user.addSystemRoleUser();
+      const requestHandler = addSystemRoleUser();
 
       await requestHandler(mockReq, mockRes, mockNext);
 
@@ -102,7 +102,7 @@ describe('user', () => {
 
       const adduserSystemRolesStub = sinon.stub(UserService.prototype, 'addUserSystemRoles');
 
-      const requestHandler = user.addSystemRoleUser();
+      const requestHandler = addSystemRoleUser();
 
       await requestHandler(mockReq, mockRes, mockNext);
       expect(getUserByIdentifierStub).to.have.been.calledOnce;

api/src/paths/user/add.ts

@@ -3,6 +3,7 @@ import { Operation } from 'express-openapi';
 import { SOURCE_SYSTEM, SYSTEM_IDENTITY_SOURCE } from '../../constants/database';
 import { SYSTEM_ROLE } from '../../constants/roles';
 import { getDBConnection, getServiceClientDBConnection } from '../../database/db';
+import { HTTP409 } from '../../errors/http-error';
 import { authorizeRequestHandler } from '../../request-handlers/security/authorization';
 import { UserService } from '../../services/user-service';
 import { getKeycloakSource } from '../../utils/keycloak-utils';
@@ -104,6 +105,9 @@ POST.apiDoc = {
     403: {
       $ref: '#/components/responses/403'
     },
+    409: {
+      $ref: '#/components/responses/409'
+    },
     500: {
       $ref: '#/components/responses/500'
     },
@@ -145,9 +149,9 @@ export function addSystemRoleUser(): RequestHandler {
 
       // If user already exists, do nothing and return early
       const user = await userService.getUserByIdentifier(userIdentifier, identitySource);
+
       if (user) {
-        await connection.commit();
-        return res.status(400).send('That user has already been added.');
+        throw new HTTP409('Failed to add user. User with matching identifier already exists.');
       }
 
       // This function also verifies that the user exists, but we explicitly check above to return a useful error message.
@@ -173,7 +177,7 @@ export function addSystemRoleUser(): RequestHandler {
 
       return res.status(200).send();
     } catch (error) {
-      defaultLog.error({ label: 'getUser', message: 'error', error });
+      defaultLog.error({ label: 'addSystemRoleUser', message: 'error', error });
       await connection.rollback();
       throw error;
     } finally {

app/src/features/admin/users/AccessRequestList.test.tsx

@@ -235,8 +235,8 @@ describe('AccessRequestList', () => {
       expect(mockUseApi.admin.approveAccessRequest).toHaveBeenCalledWith(1, {
         displayName: 'test user',
         email: 'email@email.com',
-        roleIds: [],
         identitySource: 'IDIR',
+        roleIds: [],
         userGuid: 'aaaa',
         userIdentifier: 'testusername'
       });

app/src/features/admin/users/AccessRequestList.tsx

@@ -241,10 +241,7 @@ const AccessRequestList = (props: IAccessRequestListProps) => {
         onDeny={handleReviewDialogDeny}
         onApprove={handleReviewDialogApprove}
         component={{
-          initialValues: {
-            ...ReviewAccessRequestFormInitialValues,
-            system_role: ''
-          },
+          initialValues: ReviewAccessRequestFormInitialValues,
           validationSchema: ReviewAccessRequestFormYupSchema,
           element: activeReview ? (
             <ReviewAccessRequestForm

app/src/features/admin/users/ActiveUsersList.tsx

@@ -304,10 +304,10 @@ const ActiveUsersList = (props: IActiveUsersListProps) => {
     } catch (error) {
       const apiError = error as APIError;
 
-      if (apiError.status === 400) {
+      if (apiError.status === 409) {
         dialogContext.setErrorDialog({
           open: true,
-          dialogTitle: 'User already exists',
+          dialogTitle: 'Failed to create users',
           dialogText: 'One of the users you added already exists.',
           onClose: () => {
             dialogContext.setErrorDialog({ open: false });

app/src/pages/access/AccessRequestPage.test.tsx

@@ -15,9 +15,6 @@ jest.mock('../../hooks/useBioHubApi');
 const mockBiohubApi = useBiohubApi as jest.Mock;
 
 const mockUseApi = {
-  codes: {
-    getAllCodeSets: jest.fn<Promise<object>, []>()
-  },
   admin: {
     createAdministrativeActivity: jest.fn()
   }
@@ -42,7 +39,6 @@ const renderContainer = () => {
 describe('AccessRequestPage', () => {
   beforeEach(() => {
     mockBiohubApi.mockImplementation(() => mockUseApi);
-    mockUseApi.codes.getAllCodeSets.mockClear();
     mockUseApi.admin.createAdministrativeActivity.mockClear();
   });
 
@@ -54,10 +50,6 @@ describe('AccessRequestPage', () => {
     const history = createMemoryHistory();
 
     it('should call the auth signoutRedirect function', async () => {
-      mockUseApi.codes.getAllCodeSets.mockResolvedValue({
-        system_roles: [{ id: 1, name: 'Creator' }]
-      });
-
       const signoutRedirectStub = jest.fn();
 
       const authState = getMockAuthState({
@@ -90,10 +82,6 @@ describe('AccessRequestPage', () => {
   });
 
   it.skip('processes a successful request submission', async () => {
-    mockUseApi.codes.getAllCodeSets.mockResolvedValue({
-      system_roles: [{ id: 1, name: 'Creator' }]
-    });
-
     mockUseApi.admin.createAdministrativeActivity.mockResolvedValue({
       id: 1
     });
@@ -118,10 +106,6 @@ describe('AccessRequestPage', () => {
   });
 
   it.skip('takes the user to the request-submitted page immediately if they already have an access request', async () => {
-    mockUseApi.codes.getAllCodeSets.mockResolvedValue({
-      system_roles: [{ id: 1, name: 'Creator' }]
-    });
-
     const authState = getMockAuthState({ base: SystemAdminAuthState });
 
     render(
@@ -140,10 +124,6 @@ describe('AccessRequestPage', () => {
   });
 
   it.skip('shows error dialog with api error message when submission fails', async () => {
-    mockUseApi.codes.getAllCodeSets.mockResolvedValue({
-      system_roles: [{ id: 1, name: 'Creator' }]
-    });
-
     mockUseApi.admin.createAdministrativeActivity = jest.fn(() => Promise.reject(new Error('API Error is Here')));
 
     const { getByText, getAllByRole, getByRole, queryByText } = renderContainer();
@@ -172,10 +152,6 @@ describe('AccessRequestPage', () => {
   });
 
   it.skip('shows error dialog with default error message when response from createAdministrativeActivity is invalid', async () => {
-    mockUseApi.codes.getAllCodeSets.mockResolvedValue({
-      system_roles: [{ id: 1, name: 'Creator' }]
-    });
-
     mockUseApi.admin.createAdministrativeActivity.mockResolvedValue({
       id: null
     });

app/src/pages/access/AccessRequestPage.tsx

@@ -12,7 +12,6 @@ import { Formik } from 'formik';
 import { APIError } from 'hooks/api/useAxios';
 import { useAuthStateContext } from 'hooks/useAuthStateContext';
 import { useBiohubApi } from 'hooks/useBioHubApi';
-import useDataLoader from 'hooks/useDataLoader';
 import {
   IBCeIDBasicAccessRequestDataObject,
   IBCeIDBusinessAccessRequestDataObject,
@@ -67,9 +66,6 @@ export const AccessRequestPage: React.FC = () => {
 
   const [isSubmittingRequest, setIsSubmittingRequest] = useState(false);
 
-  const codesDataLoader = useDataLoader(() => biohubApi.codes.getAllCodeSets());
-  codesDataLoader.load();
-
   const showAccessRequestErrorDialog = (textDialogProps?: Partial<IErrorDialogProps>) => {
     dialogContext.setErrorDialog({
       ...defaultErrorDialogProps,