Merge pull request #10148 from flexion/10049-judge-activity-report-Ju…

…dgeActivityReportFilters-refactor

10049 judge activity report judge activity report filters refactor

shared/src/business/useCases/judgeActivityReport/getCasesByStatusAndByJudgeInteractor.ts

@@ -9,7 +9,6 @@ import {
   isAuthorized,
 } from '../../../authorization/authorizationClientService';
 import { RawCaseWorksheet } from '@shared/business/entities/caseWorksheet/CaseWorksheet';
-import { getCountOfConsolidedCases } from '@web-api/persistence/elasticsearch/getCountOfConsolidedCases';
 
 export type JudgeActivityReportCavAndSubmittedCasesRequest = {
   statuses: string[];
@@ -38,7 +37,7 @@ export type CavAndSubmittedFilteredCasesType = {
 };
 
 export const getCasesByStatusAndByJudgeInteractor = async (
-  applicationContext,
+  applicationContext: IApplicationContext,
   params: JudgeActivityReportCavAndSubmittedCasesRequest,
 ): Promise<{
   cases: CavAndSubmittedFilteredCasesType[];
@@ -189,8 +188,10 @@ const calculateNumberOfConsolidatedCases = async (
     return 0;
   }
 
-  return await getCountOfConsolidedCases({
-    applicationContext,
-    leadDocketNumber: caseInfo.leadDocketNumber,
-  });
+  return await applicationContext
+    .getPersistenceGateway()
+    .getCountOfConsolidedCases({
+      applicationContext,
+      leadDocketNumber: caseInfo.leadDocketNumber,
+    });
 };

shared/src/business/useCases/judgeActivityReport/getCasesClosedByJudgeInteractor.ts

@@ -13,12 +13,12 @@ export type CasesClosedType = {
 };
 
 export type CasesClosedReturnType = {
-  aggregations: CasesClosedType;
+  aggregations: CasesClosedType | {};
   total: number | undefined;
 };
 
 export const getCasesClosedByJudgeInteractor = async (
-  applicationContext,
+  applicationContext: IApplicationContext,
   params: JudgeActivityReportFilters,
 ): Promise<CasesClosedReturnType> => {
   const authorizedUser = applicationContext.getCurrentUser();

shared/src/business/useCases/judgeActivityReport/getCountOfCaseDocumentsFiledByJudgesInteractor.ts

@@ -16,14 +16,11 @@ export type CaseDocumentsAggregationReturnType = {
   opinions: AggregatedEventCodesType;
 };
 
-// TODO: refactor JudgeActivityReportFilters to be only types for request to BE
 export type JudgeActivityReportFilters = {
   endDate: string;
   startDate: string;
-  judgeName?: string;
   judgeId?: string;
-  judges?: string[];
-  judgeNameToDisplayForHeader?: string;
+  judges: string[];
 };
 
 export const getCountOfCaseDocumentsFiledByJudgesInteractor = async (

shared/src/proxies/reports/getCasesByStatusAndByJudgeProxy.ts

@@ -1,16 +1,9 @@
+import { ClientApplicationContext } from '@web-client/applicationContext';
 import { JudgeActivityReportCavAndSubmittedCasesRequest } from '@shared/business/useCases/judgeActivityReport/getCasesByStatusAndByJudgeInteractor';
 import { post } from '../requests';
 
-/**
- * getCasesByStatusAndByJudgeInteractor
- * @param {object} applicationContext the application context
- * @param {object} providers the providers object
- * @param {string} providers.judgeName the judge name for the report query
- * @param {string} providers.statuses case statuses array for the report query
- * @returns {Promise<*>} the promise of the api call
- */
 export const getCasesByStatusAndByJudgeInteractor = (
-  applicationContext,
+  applicationContext: ClientApplicationContext,
   params: JudgeActivityReportCavAndSubmittedCasesRequest,
 ): Promise<{
   cases: RawCase[];

shared/src/proxies/reports/getCasesClosedByJudgeProxy.ts

@@ -1,18 +1,10 @@
 import { CasesClosedType } from '@shared/business/useCases/judgeActivityReport/getCasesClosedByJudgeInteractor';
+import { ClientApplicationContext } from '@web-client/applicationContext';
 import { JudgeActivityReportFilters } from '@shared/business/useCases/judgeActivityReport/getCountOfCaseDocumentsFiledByJudgesInteractor';
 import { post } from '../requests';
 
-/**
- * getCasesClosedByJudgeInteractor
- * @param {object} applicationContext the application context
- * @param {object} providers the providers object
- * @param {string} providers.endDate the end date for the report query
- * @param {string} providers.judgeName the judge name for the report query
- * @param {string} providers.startDate the start date for the report query
- * @returns {Promise<CasesClosedType>} the promise of the api call
- */
 export const getCasesClosedByJudgeInteractor = (
-  applicationContext,
+  applicationContext: ClientApplicationContext,
   params: JudgeActivityReportFilters,
 ): Promise<CasesClosedType> => {
   return post({

shared/src/proxies/reports/getTrialSessionsForJudgeActivityReportProxy.ts

@@ -1,9 +1,10 @@
+import { ClientApplicationContext } from '@web-client/applicationContext';
 import { JudgeActivityReportFilters } from '@shared/business/useCases/judgeActivityReport/getCountOfCaseDocumentsFiledByJudgesInteractor';
 import { TrialSessionTypes } from '@shared/business/useCases/judgeActivityReport/getTrialSessionsForJudgeActivityReportInteractor';
 import { post } from '../requests';
 
 export const getTrialSessionsForJudgeActivityReportInteractor = (
-  applicationContext,
+  applicationContext: ClientApplicationContext,
   { endDate, judgeId, startDate }: JudgeActivityReportFilters,
 ): Promise<TrialSessionTypes> =>
   post({

web-api/src/getPersistenceGateway.ts

@@ -76,6 +76,7 @@ import { getCognitoUserIdByEmail } from './persistence/cognito/getCognitoUserIdB
 import { getCompletedSectionInboxMessages } from './persistence/elasticsearch/messages/getCompletedSectionInboxMessages';
 import { getCompletedUserInboxMessages } from './persistence/elasticsearch/messages/getCompletedUserInboxMessages';
 import { getConfigurationItemValue } from './persistence/dynamo/deployTable/getConfigurationItemValue';
+import { getCountOfConsolidedCases } from '@web-api/persistence/elasticsearch/getCountOfConsolidedCases';
 import { getDeployTableStatus } from './persistence/dynamo/getDeployTableStatus';
 import { getDispatchNotification } from './persistence/dynamo/notifications/getDispatchNotification';
 import { getDocketEntriesServedWithinTimeframe } from './persistence/elasticsearch/getDocketEntriesServedWithinTimeframe';
@@ -329,6 +330,7 @@ const gatewayMethods = {
   getCognitoUserIdByEmail,
   getCompletedSectionInboxMessages,
   getCompletedUserInboxMessages,
+  getCountOfConsolidedCases,
   getDeployTableStatus,
   getDispatchNotification,
   getDocketEntriesServedWithinTimeframe,

web-api/src/persistence/elasticsearch/getCasesClosedCountByJudge.ts

@@ -1,4 +1,5 @@
 import { CASE_STATUS_TYPES } from '@shared/business/entities/EntityConstants';
+import { CasesClosedReturnType } from '@shared/business/useCases/judgeActivityReport/getCasesClosedByJudgeInteractor';
 import { QueryDslQueryContainer } from '@opensearch-project/opensearch/api/types';
 import { search } from './searchClient';
 
@@ -12,7 +13,7 @@ export const getCasesClosedCountByJudge = async ({
   endDate: string;
   judges: string[];
   startDate: string;
-}) => {
+}): Promise<CasesClosedReturnType> => {
   const source = ['status'];
 
   const shouldFilters: QueryDslQueryContainer[] = [];

web-api/src/persistence/elasticsearch/getCountOfConsolidedCases.ts

@@ -20,6 +20,5 @@ export const getCountOfConsolidedCases = async ({
       index: 'efcms-case',
     },
   });
-
   return results;
 };

web-client/src/presenter/actions/JudgeActivityReport/getSubmittedAndCavCasesByJudgeAction.ts

@@ -1,13 +1,6 @@
 import { CAV_AND_SUBMITTED_CASES_PAGE_SIZE } from '../../../../../shared/src/business/entities/EntityConstants';
 import { state } from '@web-client/presenter/app.cerebral';
 
-/**
- * Retrieves the cases with a status of CAV or Submitted by judge
- * @param {object} providers the providers object
- * @param {object} providers.applicationContext the application context
- * @param {object} providers.get the cerebral get function
- * @returns {object} an array of case entities and a map containing consolidated cases group counts
- */
 export const getSubmittedAndCavCasesByJudgeAction = async ({
   applicationContext,
   get,

web-client/src/presenter/actions/JudgeActivityReport/getTrialSessionsForJudgeActivityReportAction.test.ts

@@ -31,7 +31,7 @@ describe('getTrialSessionsForJudgeActivityReportAction', () => {
       );
   });
 
-  it('should call the interactor to set state.judgeActivityReport.judgeActivityReportData.trialSessions with the trialSessions types based on the selected judge id', async () => {
+  it('should retrieve trialSessions types based on a selected judges id', async () => {
     const { output } = await runAction(
       getTrialSessionsForJudgeActivityReportAction,
       {
@@ -43,9 +43,9 @@ describe('getTrialSessionsForJudgeActivityReportAction', () => {
           judgeActivityReport: {
             filters: {
               endDate: mockEndDate,
-              judgeName,
               startDate: mockStartDate,
             },
+            judgeName,
           },
           judges: mockJudges,
         },
@@ -64,28 +64,24 @@ describe('getTrialSessionsForJudgeActivityReportAction', () => {
     expect(output.trialSessions).toMatchObject(trialSessionTypesResult);
   });
 
-  it('should set state.judgeActivityReport.judgeActivityReportData.trialSessions with the trialSessions types for all judges if no selected judge id is prescribed', async () => {
-    const { output } = await runAction(
-      getTrialSessionsForJudgeActivityReportAction,
-      {
-        modules: {
-          presenter,
-        },
-        props: {},
-        state: {
-          judgeActivityReport: {
-            filters: {
-              endDate: mockEndDate,
-              judgeName: 'All Judges',
-              startDate: mockStartDate,
-            },
+  it('should retrieve ALL trialSession types if no selected judge id is prescribed', async () => {
+    await runAction(getTrialSessionsForJudgeActivityReportAction, {
+      modules: {
+        presenter,
+      },
+      props: {},
+      state: {
+        judgeActivityReport: {
+          filters: {
+            endDate: mockEndDate,
+            startDate: mockStartDate,
           },
-          judges: mockJudges,
+          judgeName: 'All Judges',
         },
+        judges: mockJudges,
       },
-    );
+    });
 
-    expect(output.trialSessions).toMatchObject(trialSessionTypesResult);
     expect(
       applicationContext.getUseCases()
         .getTrialSessionsForJudgeActivityReportInteractor.mock.calls[0][1],

web-client/src/presenter/actions/JudgeActivityReport/getTrialSessionsForJudgeActivityReportAction.ts

@@ -5,9 +5,9 @@ export const getTrialSessionsForJudgeActivityReportAction = async ({
   applicationContext,
   get,
 }: ActionProps) => {
-  const { endDate, judgeName, startDate } = get(
-    state.judgeActivityReport.filters,
-  );
+  const { endDate, startDate } = get(state.judgeActivityReport.filters);
+
+  const { judgeName } = get(state.judgeActivityReport);
 
   let judgeIdForRequest: string = ID_FOR_ALL_JUDGES;
 

web-client/src/presenter/actions/JudgeActivityReport/setJudgeActivityReportFiltersAction.test.ts

@@ -7,14 +7,11 @@ import { setJudgeActivityReportFiltersAction } from './setJudgeActivityReportFil
 presenter.providers.applicationContext = applicationContextForClient;
 
 describe('setJudgeActivityReportFiltersAction', () => {
-  let filters;
-  beforeEach(() => {
-    filters = {
-      endDate: '',
-      judgeName: '',
-      startDate: '',
-    };
-  });
+  const filters = {
+    endDate: '',
+    startDate: '',
+  };
+
   const testEndDate = '2019-05-17';
   const testStartDate = '2019-05-14';
 
@@ -56,7 +53,7 @@ describe('setJudgeActivityReportFiltersAction', () => {
     expect(result.state.judgeActivityReport.filters.endDate).toEqual('');
   });
 
-  it('sets state.judgeActivityReport.filters.startDate to the formatted props.startDate', async () => {
+  it('sets state.judgeActivityReport.filters.startDate to props.startDate', async () => {
     const result = await runAction(setJudgeActivityReportFiltersAction, {
       modules: { presenter },
       props: {
@@ -73,7 +70,8 @@ describe('setJudgeActivityReportFiltersAction', () => {
       testStartDate,
     );
   });
-  it('sets state.judgeActivityReport.filters.endDate to the formatted props.endDate', async () => {
+
+  it('sets state.judgeActivityReport.filters.endDate to props.endDate', async () => {
     const result = await runAction(setJudgeActivityReportFiltersAction, {
       modules: { presenter },
       props: {
@@ -91,7 +89,7 @@ describe('setJudgeActivityReportFiltersAction', () => {
     );
   });
 
-  it('should set state.judgeActivityReport.filters.judgeName to props.judgeName', async () => {
+  it('should set state.judgeActivityReport.judgeName to props.judgeName', async () => {
     const result = await runAction(setJudgeActivityReportFiltersAction, {
       modules: { presenter },
       props: {
@@ -104,8 +102,6 @@ describe('setJudgeActivityReportFiltersAction', () => {
       },
     });
 
-    expect(result.state.judgeActivityReport.filters.judgeName).toEqual(
-      judgeUser.name,
-    );
+    expect(result.state.judgeActivityReport.judgeName).toEqual(judgeUser.name);
   });
 });

web-client/src/presenter/actions/JudgeActivityReport/setJudgeActivityReportFiltersAction.ts

@@ -9,7 +9,7 @@ export const setJudgeActivityReportFiltersAction = ({
   const selectedJudge: string = props.judgeName;
 
   if (selectedJudge) {
-    store.set(state.judgeActivityReport.filters.judgeName, selectedJudge);
+    store.set(state.judgeActivityReport.judgeName, selectedJudge);
   }
   if (filterStartDate || filterStartDate === '') {
     store.set(state.judgeActivityReport.filters.startDate, filterStartDate);

web-client/src/presenter/actions/JudgeActivityReport/setJudgeLastNameOnJudgeActivityReportAction.test.ts

@@ -1,9 +1,6 @@
 import { applicationContextForClient as applicationContext } from '@web-client/test/createClientTestApplicationContext';
-import {
-  colvinsChambersUser,
-  judgeUser,
-} from '../../../../../shared/src/test/mockUsers';
-import { presenter } from '../../presenter-mock';
+import { colvinsChambersUser, judgeUser } from '@shared/test/mockUsers';
+import { presenter } from '@web-client/presenter/presenter-mock';
 import { runAction } from '@web-client/presenter/test.cerebral';
 import { setJudgeLastNameOnJudgeActivityReportAction } from './setJudgeLastNameOnJudgeActivityReportAction';
 
@@ -22,8 +19,8 @@ describe('setJudgeLastNameOnJudgeActivityReportAction', () => {
       },
     );
 
-    expect(state.judgeActivityReport.filters.judgeName).toBe(judgeUser.name);
-    expect(state.judgeActivityReport.filters.judgeNameToDisplayForHeader).toBe(
+    expect(state.judgeActivityReport.judgeName).toBe(judgeUser.name);
+    expect(state.judgeActivityReport.judgeNameToDisplayForHeader).toBe(
       judgeUser.name,
     );
   });
@@ -40,9 +37,9 @@ describe('setJudgeLastNameOnJudgeActivityReportAction', () => {
       },
     );
 
-    expect(state.judgeActivityReport.filters.judgeNameToDisplayForHeader).toBe(
+    expect(state.judgeActivityReport.judgeNameToDisplayForHeader).toBe(
       'Colvin',
     );
-    expect(state.judgeActivityReport.filters.judgeName).toBe('Colvin');
+    expect(state.judgeActivityReport.judgeName).toBe('Colvin');
   });
 });

web-client/src/presenter/actions/JudgeActivityReport/setJudgeLastNameOnJudgeActivityReportAction.ts

@@ -20,14 +20,11 @@ export const setJudgeLastNameOnJudgeActivityReportAction = ({
 
     judgeName = applicationContext
       .getUtilities()
-      .getJudgeLastName(userSectionInfo.judgeFullName);
+      .getJudgeLastName(userSectionInfo!.judgeFullName);
   } else {
     judgeName = user.name;
   }
 
-  store.set(state.judgeActivityReport.filters.judgeName, judgeName);
-  store.set(
-    state.judgeActivityReport.filters.judgeNameToDisplayForHeader,
-    judgeName,
-  );
+  store.set(state.judgeActivityReport.judgeName, judgeName);
+  store.set(state.judgeActivityReport.judgeNameToDisplayForHeader, judgeName);
 };