Updates

api/src/paths/user/{userId}/delete.test.ts

@@ -2,11 +2,10 @@ import chai, { expect } from 'chai';
 import { describe } from 'mocha';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
-import SQL from 'sql-template-strings';
 import * as db from '../../../database/db';
 import { HTTPError } from '../../../errors/http-error';
-import project_participation_queries from '../../../queries/project-participation';
 import user_queries from '../../../queries/users';
+import { ProjectParticipationService } from '../../../services/project-participation-service';
 import { UserService } from '../../../services/user-service';
 import { getMockDBConnection, getRequestHandlerMocks } from '../../../__mocks__/db';
 import * as delete_endpoint from './delete';
@@ -35,72 +34,43 @@ describe('removeSystemUser', () => {
     }
   });
 
-  it('should throw a 400 error when no sql statement returned from `getParticipantsFromAllSystemUsersProjectsSQL`', async () => {
+  it('should throw a 400 error if the user is the only Project Lead role on one or more projects', async () => {
     const dbConnectionObj = getMockDBConnection();
 
     const { mockReq, mockRes, mockNext } = getRequestHandlerMocks();
 
-    mockReq.params = { userId: '1' };
-    mockReq.body = { roles: [1, 2] };
-
     sinon.stub(db, 'getDBConnection').returns(dbConnectionObj);
 
-    sinon.stub(project_participation_queries, 'getParticipantsFromAllSystemUsersProjectsSQL').returns(null);
-
-    try {
-      const requestHandler = delete_endpoint.removeSystemUser();
-
-      await requestHandler(mockReq, mockRes, mockNext);
-      expect.fail();
-    } catch (actualError) {
-      expect((actualError as HTTPError).status).to.equal(400);
-      expect((actualError as HTTPError).message).to.equal('Failed to build SQL get statement');
-    }
-  });
-
-  it('should throw a 400 error if the user is the only Project Lead role on one or more projects', async () => {
-    const dbConnectionObj = getMockDBConnection();
-
-    const { mockReq, mockRes, mockNext } = getRequestHandlerMocks();
-
     mockReq.params = { userId: '33' };
     mockReq.body = { roles: [1, 2] };
 
-    const mockQuery = sinon.stub();
-
-    mockQuery.resolves({
-      rowCount: 2,
-      rows: [
-        {
-          project_participation_id: 47,
-          project_id: 3,
-          system_user_id: 33,
-          project_role_id: 1,
-          project_role_name: 'Project Lead'
-        },
-        {
-          project_participation_id: 57,
-          project_id: 1,
-          system_user_id: 33,
-          project_role_id: 3,
-          project_role_name: 'Viewer'
-        },
-        {
-          project_participation_id: 40,
-          project_id: 1,
-          system_user_id: 27,
-          project_role_id: 1,
-          project_role_name: 'Project Lead'
-        }
-      ]
-    });
-
-    sinon.stub(db, 'getDBConnection').returns({
-      ...dbConnectionObj,
-      query: mockQuery
-    });
+    const mockResponse = [
+      {
+        project_participation_id: 47,
+        project_id: 3,
+        system_user_id: 33,
+        project_role_id: 1,
+        project_role_name: 'Project Lead'
+      },
+      {
+        project_participation_id: 57,
+        project_id: 1,
+        system_user_id: 33,
+        project_role_id: 3,
+        project_role_name: 'Viewer'
+      },
+      {
+        project_participation_id: 40,
+        project_id: 1,
+        system_user_id: 27,
+        project_role_id: 1,
+        project_role_name: 'Project Lead'
+      }
+    ];
 
-    sinon.stub(project_participation_queries, 'getParticipantsFromAllSystemUsersProjectsSQL').returns(SQL`some query`);
+    sinon
+      .stub(ProjectParticipationService.prototype, 'getParticipantsFromAllProjectsBySystemUserId')
+      .resolves(mockResponse);
 
     try {
       const requestHandler = delete_endpoint.removeSystemUser();

api/src/paths/user/{userId}/delete.ts

@@ -5,6 +5,7 @@ import { getDBConnection, IDBConnection } from '../../../database/db';
 import { HTTP400 } from '../../../errors/http-error';
 import { queries } from '../../../queries/queries';
 import { authorizeRequestHandler } from '../../../request-handlers/security/authorization';
+import { ProjectParticipationService } from '../../../services/project-participation-service';
 import { UserService } from '../../../services/user-service';
 import { getLogger } from '../../../utils/logger';
 
@@ -113,7 +114,11 @@ export function removeSystemUser(): RequestHandler {
 }
 
 export const checkIfUserIsOnlyProjectLeadOnAnyProject = async (userId: number, connection: IDBConnection) => {
-  const getAllParticipantsResponse = await getAllParticipantsFromSystemUsersProjects(userId, connection);
+  const projectParticipationService = new ProjectParticipationService(connection);
+
+  const getAllParticipantsResponse = await projectParticipationService.getParticipantsFromAllProjectsBySystemUserId(
+    userId
+  );
 
   // No projects associated to user, skip Project Lead role check
   if (!getAllParticipantsResponse.length) {
@@ -137,33 +142,6 @@ export const deleteAllProjectRoles = async (userId: number, connection: IDBConne
   connection.query(sqlStatement.text, sqlStatement.values);
 };
 
-/**
- * collect all participants associated with user across all projects.
- *
- * @param {number} userId
- * @param {IDBConnection} connection
- * @return {*}  {Promise<any[]>}
- */
-export const getAllParticipantsFromSystemUsersProjects = async (
-  userId: number,
-  connection: IDBConnection
-): Promise<any[]> => {
-  const getParticipantsFromAllSystemUsersProjectsSQLStatment = queries.projectParticipation.getParticipantsFromAllSystemUsersProjectsSQL(
-    userId
-  );
-
-  if (!getParticipantsFromAllSystemUsersProjectsSQLStatment) {
-    throw new HTTP400('Failed to build SQL get statement');
-  }
-
-  const response = await connection.query(
-    getParticipantsFromAllSystemUsersProjectsSQLStatment.text,
-    getParticipantsFromAllSystemUsersProjectsSQLStatment.values
-  );
-
-  return response.rows || [];
-};
-
 /**
  * Given an array of project participation role objects, return false if any project has no Project Lead role. Return
  * true otherwise.

api/src/paths/user/{userId}/projects/get.test.ts

@@ -2,119 +2,74 @@ import chai, { expect } from 'chai';
 import { describe } from 'mocha';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
-import SQL from 'sql-template-strings';
 import * as db from '../../../../database/db';
 import { HTTPError } from '../../../../errors/http-error';
-import project_participation_queries from '../../../../queries/project-participation';
-import { getMockDBConnection } from '../../../../__mocks__/db';
+import { ProjectParticipationService } from '../../../../services/project-participation-service';
+import { getMockDBConnection, getRequestHandlerMocks } from '../../../../__mocks__/db';
 import * as projects from './get';
 
 chai.use(sinonChai);
 
 describe('projects', () => {
-  const dbConnectionObj = getMockDBConnection();
-
   describe('getAllUserProjects', () => {
     afterEach(() => {
       sinon.restore();
     });
 
-    const sampleReq = {
-      keycloak_token: {},
-      params: {
-        userId: 1
-      }
-    } as any;
+    it('finds user by Id and returns 200 and result on success', async () => {
+      const dbConnectionObj = getMockDBConnection();
+      sinon.stub(db, 'getDBConnection').returns(dbConnectionObj);
 
-    let actualResult: any = null;
+      const { mockReq, mockRes, mockNext } = getRequestHandlerMocks();
 
-    const sampleRes = {
-      status: () => {
-        return {
-          json: (result: any) => {
-            actualResult = result;
-          }
-        };
-      }
-    };
+      mockReq.params = {
+        userId: '1'
+      };
 
-    it('should throw a 400 error when no params are sent', async () => {
-      sinon.stub(db, 'getDBConnection').returns(dbConnectionObj);
+      const getProjectsBySystemUserIdStub = sinon
+        .stub(ProjectParticipationService.prototype, 'getProjectsBySystemUserId')
+        .resolves([
+          { project_id: 123, name: 'test', system_user_id: 12, project_role_id: 42, project_participation_id: 88 }
+        ]);
 
-      try {
-        const result = projects.getAllUserProjects();
+      const requestHandler = projects.getAllUserProjects();
 
-        await result({ ...(sampleReq as any), params: null }, (null as unknown) as any, (null as unknown) as any);
-        expect.fail();
-      } catch (actualError) {
-        expect((actualError as HTTPError).status).to.equal(400);
-        expect((actualError as HTTPError).message).to.equal('Missing required params');
-      }
+      await requestHandler(mockReq, mockRes, mockNext);
+
+      expect(getProjectsBySystemUserIdStub).to.have.been.calledOnceWith(1);
+
+      expect(mockRes.jsonValue).to.eql([
+        { project_id: 123, name: 'test', system_user_id: 12, project_role_id: 42, project_participation_id: 88 }
+      ]);
     });
 
-    it('should throw a 400 error when no user Id is sent', async () => {
+    it('catches error, calls rollback, and re-throws error', async () => {
+      const dbConnectionObj = getMockDBConnection();
       sinon.stub(db, 'getDBConnection').returns(dbConnectionObj);
 
-      try {
-        const result = projects.getAllUserProjects();
+      const { mockReq, mockRes, mockNext } = getRequestHandlerMocks();
 
-        await result(
-          { ...(sampleReq as any), params: { ...sampleReq.params, userId: null } },
-          (null as unknown) as any,
-          (null as unknown) as any
-        );
-        expect.fail();
-      } catch (actualError) {
-        expect((actualError as HTTPError).status).to.equal(400);
-        expect((actualError as HTTPError).message).to.equal('Missing required param: userId');
-      }
-    });
+      mockReq.params = {
+        userId: '1'
+      };
 
-    it('should throw a 400 error when no sql statement returned for getProjectSQL', async () => {
-      sinon.stub(db, 'getDBConnection').returns({
-        ...dbConnectionObj,
-        systemUserId: () => {
-          return 20;
-        }
-      });
+      const getProjectsBySystemUserIdStub = sinon
+        .stub(ProjectParticipationService.prototype, 'getProjectsBySystemUserId')
+        .resolves([
+          { project_id: 123, name: 'test', system_user_id: 12, project_role_id: 42, project_participation_id: 88 }
+        ]);
 
-      sinon.stub(project_participation_queries, 'getAllUserProjectsSQL').returns(null);
+      const requestHandler = projects.getAllUserProjects();
 
       try {
-        const result = projects.getAllUserProjects();
-
-        await result(sampleReq, (null as unknown) as any, (null as unknown) as any);
+        await requestHandler(mockReq, mockRes, mockNext);
         expect.fail();
       } catch (actualError) {
-        expect((actualError as HTTPError).status).to.equal(400);
-        expect((actualError as HTTPError).message).to.equal('Failed to build SQL get statement');
-      }
-    });
-
-    it('finds user by Id and returns 200 and result on success', async () => {
-      const mockQuery = sinon.stub();
+        expect(dbConnectionObj.release).to.have.been.called;
+        expect(getProjectsBySystemUserIdStub).not.to.have.been.called;
 
-      mockQuery.resolves({
-        rows: [{ project_id: 123, name: 'test', system_user_id: 12, project_role_id: 42, project_participation_id: 88 }]
-      });
-
-      sinon.stub(db, 'getDBConnection').returns({
-        ...dbConnectionObj,
-        systemUserId: () => {
-          return 20;
-        },
-        query: mockQuery
-      });
-
-      sinon.stub(project_participation_queries, 'getAllUserProjectsSQL').returns(SQL`something`);
-
-      const result = projects.getAllUserProjects();
-
-      await result(sampleReq, sampleRes as any, (null as unknown) as any);
-
-      expect(actualResult).to.eql([
-        { project_id: 123, name: 'test', system_user_id: 12, project_role_id: 42, project_participation_id: 88 }
-      ]);
+        expect((actualError as HTTPError).message).to.equal('a test error');
+      }
     });
   });
 });