Merge branch '10434-story' into 10434-test

ustaxcourt · Dec 9, 2024 · adda41d · adda41d
2 parents 32e2d6a + d48c875
commit adda41d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/shared/src/business/utilities/documentGenerators/trialSessionPlanningReport.test.ts b/shared/src/business/utilities/documentGenerators/trialSessionPlanningReport.test.ts
@@ -1,3 +1,7 @@
+import {
+  PreviousTerm,
+  TrialLocationData,
+} from '@web-api/business/useCases/trialSessions/getTrialSessionPlanningReportDataInteractor';
 import { applicationContext } from '../../test/createTestApplicationContext';
 import { generateAndVerifyPdfDiff } from './generateAndVerifyPdfDiff';
 import { trialSessionPlanningReport } from './trialSessionPlanningReport';
@@ -13,38 +17,42 @@ describe('trialSessionPlanningReport', () => {
           locationData: [
             {
               allCaseCount: 5,
+              blockedCaseCount: 0,
               previousTermsData: [['(S) Buch', '(R) Cohen'], [], []],
               regularCaseCount: 3,
               smallCaseCount: 2,
+              specialCaseCount: 0,
               stateAbbreviation: 'AR',
               trialCityState: 'Little Rock, AR',
             },
             {
               allCaseCount: 2,
+              blockedCaseCount: 0,
               previousTermsData: [[], ['(HS) Colvin'], ['(H) Guy']],
               regularCaseCount: 1,
               smallCaseCount: 1,
+              specialCaseCount: 0,
               stateAbbreviation: 'AL',
               trialCityState: 'Mobile, AL',
             },
-          ],
+          ] as TrialLocationData[],
           previousTerms: [
             {
-              name: 'fall',
+              term: 'fall',
               termDisplay: 'Fall 2019',
-              year: '2019',
+              year: 2019,
             },
             {
-              name: 'spring',
+              term: 'spring',
               termDisplay: 'Spring 2019',
-              year: '2019',
+              year: 2019,
             },
             {
-              name: 'winter',
+              term: 'winter',
               termDisplay: 'Winter 2019',
-              year: '2019',
+              year: 2019,
             },
-          ],
+          ] as PreviousTerm[],
           term: 'Winter 2020',
         },
       }),

diff --git a/shared/src/proxies/trialSessions/getTrialSessionPlanningReportProxy.ts b/shared/src/proxies/trialSessions/getTrialSessionPlanningReportProxy.ts
@@ -2,7 +2,7 @@ import { ClientApplicationContext } from '@web-client/applicationContext';
 import {
   PreviousTerm,
   TrialLocationData,
-} from '@web-api/business/useCases/trialSessions/runTrialSessionPlanningReportInteractor';
+} from '@web-api/business/useCases/trialSessions/getTrialSessionPlanningReportDataInteractor';
 import { get } from '../requests';
 
 export const getTrialSessionPlanningReportDataInteractor = (

diff --git a/web-client/src/presenter/state.ts b/web-client/src/presenter/state.ts
@@ -13,12 +13,14 @@ import {
 import { IrsNoticeForm } from '@shared/business/entities/startCase/IrsNoticeForm';
 import { JudgeActivityReportState } from '@web-client/ustc-ui/Utils/types';
 import { JudgeChambersInfo } from '@web-client/presenter/actions/getJudgesChambersAction';
-import { PreviousTerm } from '@web-api/business/useCases/trialSessions/runTrialSessionPlanningReportInteractor';
+import {
+  PreviousTerm,
+  TrialLocationData,
+} from '@web-api/business/useCases/trialSessions/getTrialSessionPlanningReportDataInteractor';
 import { RawCaseDeadline } from '@shared/business/entities/CaseDeadline';
 import { RawMessage } from '@shared/business/entities/Message';
 import { RawUser, UserContact } from '@shared/business/entities/User';
 import { TAssociatedCase } from '@shared/business/useCases/getCasesForUserInteractor';
-import { TrialLocationData } from '@web-api/business/useCases/trialSessions/getTrialSessionPlanningReportDataInteractor';
 import { TroubleshootingLinkInfo } from '@web-client/presenter/sequences/showFileUploadErrorModalSequence';
 import { addCourtIssuedDocketEntryHelper } from './computeds/addCourtIssuedDocketEntryHelper';
 import { addCourtIssuedDocketEntryNonstandardHelper } from './computeds/addCourtIssuedDocketEntryNonstandardHelper';