Merge branch '9995-wip-case-worksheet' of https://github.com/flexion/…

…ef-cms into 10049-display-wip-cav-submitted-cases

shared/src/business/entities/EntityConstants.ts

@@ -132,7 +132,7 @@ export const SERVICE_INDICATOR_TYPES = {
 
 export const STATUS_OF_MATTER_OPTIONS = [
   'Awaiting Consideration',
-  'Awaiting Supplemental Briefs',
+  'Awaiting Briefs',
   'Drafting',
   'Reviewing Draft',
   'Submitted to Chief Judge',

shared/src/business/entities/caseWorksheet/CaseWorksheet.test.ts

@@ -2,16 +2,6 @@ import { CaseWorksheet } from './CaseWorksheet';
 
 describe('CaseWorksheet', () => {
   describe('validation', () => {
-    it('should be invalid when the primary issue is not a string', () => {
-      const worksheet = new CaseWorksheet({
-        primaryIssue: 1234567890,
-      });
-
-      expect(worksheet.getFormattedValidationErrors()!.primaryIssue).toEqual(
-        'Add primary issue',
-      );
-    });
-
     it('should be invalid when the final brief due date is NOT a date string', () => {
       const worksheet = new CaseWorksheet({
         finalBriefDueDate: 'abcdef',
@@ -32,18 +22,4 @@ describe('CaseWorksheet', () => {
       ).toBeDefined();
     });
   });
-
-  describe('deletePrimaryIssue', () => {
-    it('should delete the primary issue when deletePrimaryIssue method is called', () => {
-      const worksheet = new CaseWorksheet({
-        primaryIssue: 'TEST_PRIMARY_ISSUE',
-      });
-
-      expect(worksheet.primaryIssue).toBeDefined();
-
-      worksheet.deletePrimaryIssue();
-
-      expect(worksheet.primaryIssue).toBeUndefined();
-    });
-  });
 });

shared/src/business/entities/caseWorksheet/CaseWorksheet.ts

@@ -20,7 +20,7 @@ export class CaseWorksheet extends JoiValidationEntity {
   static VALIDATION_RULES = {
     docketNumber: JoiValidationConstants.DOCKET_NUMBER.required(),
     finalBriefDueDate: JoiValidationConstants.DATE.allow('').optional(),
-    primaryIssue: JoiValidationConstants.STRING.optional(),
+    primaryIssue: JoiValidationConstants.STRING.allow('').optional(),
     statusOfMatter: JoiValidationConstants.STRING.valid(
       ...STATUS_OF_MATTER_OPTIONS,
     )
@@ -30,13 +30,8 @@ export class CaseWorksheet extends JoiValidationEntity {
 
   static VALIDATION_ERROR_MESSAGES = {
     finalBriefDueDate: 'Enter a valid due date',
-    primaryIssue: 'Add primary issue',
   };
 
-  deletePrimaryIssue(): void {
-    delete this.primaryIssue;
-  }
-
   getValidationRules() {
     return CaseWorksheet.VALIDATION_RULES;
   }

shared/src/business/useCases/caseWorksheet/updateCaseWorksheetInteractor.test.ts

@@ -20,8 +20,7 @@ describe('updateCaseWorksheetInteractor', () => {
 
     await expect(
       updateCaseWorksheetInteractor(applicationContext, {
-        docketNumber: mockCaseWorksheet.docketNumber,
-        updatedProps: {},
+        worksheet: mockCaseWorksheet,
       }),
     ).rejects.toThrow(UnauthorizedError);
   });
@@ -34,8 +33,8 @@ describe('updateCaseWorksheetInteractor', () => {
 
     await expect(
       updateCaseWorksheetInteractor(applicationContext, {
-        docketNumber: mockCaseWorksheet.docketNumber,
-        updatedProps: {
+        worksheet: {
+          ...mockCaseWorksheet,
           finalBriefDueDate: 'abc', // finalBriefDueDate should be a date formatted as YYYY-MM-DD
         },
       }),
@@ -53,8 +52,8 @@ describe('updateCaseWorksheetInteractor', () => {
       .getCaseWorksheet.mockResolvedValue(mockCaseWorksheet);
 
     const result = await updateCaseWorksheetInteractor(applicationContext, {
-      docketNumber: mockCaseWorksheet.docketNumber,
-      updatedProps: {
+      worksheet: {
+        ...mockCaseWorksheet,
         finalBriefDueDate: mockFinalBriefDueDate,
       },
     });
@@ -90,8 +89,8 @@ describe('updateCaseWorksheetInteractor', () => {
       .getCaseWorksheet.mockResolvedValue(mockCaseWorksheet);
 
     const result = await updateCaseWorksheetInteractor(applicationContext, {
-      docketNumber: mockCaseWorksheet.docketNumber,
-      updatedProps: {
+      worksheet: {
+        ...mockCaseWorksheet,
         finalBriefDueDate: mockFinalBriefDueDate,
       },
     });

shared/src/business/useCases/caseWorksheet/updateCaseWorksheetInteractor.ts

@@ -12,11 +12,9 @@ import { User } from '@shared/business/entities/User';
 export const updateCaseWorksheetInteractor = async (
   applicationContext: IApplicationContext,
   {
-    docketNumber,
-    updatedProps,
+    worksheet,
   }: {
-    docketNumber: string;
-    updatedProps: Record<string, string | undefined>;
+    worksheet: RawCaseWorksheet;
   },
 ): Promise<RawCaseWorksheet> => {
   const user = applicationContext.getCurrentUser();
@@ -41,18 +39,7 @@ export const updateCaseWorksheetInteractor = async (
       });
   }
 
-  const caseWorksheet = await applicationContext
-    .getPersistenceGateway()
-    .getCaseWorksheet({
-      applicationContext,
-      docketNumber,
-    });
-
-  const caseWorksheetEntity = new CaseWorksheet({
-    ...caseWorksheet,
-    ...updatedProps,
-    docketNumber,
-  }).validate();
+  const caseWorksheetEntity = new CaseWorksheet(worksheet).validate();
 
   const rawCaseWorksheet = caseWorksheetEntity.toRawObject();
 

shared/src/proxies/caseWorksheet/updateCaseWorksheetProxy.ts

@@ -1,18 +1,17 @@
+import { RawCaseWorksheet } from '@shared/business/entities/caseWorksheet/CaseWorksheet';
 import { post } from '../requests';
 
 export const updateCaseWorksheetInteractor = (
   applicationContext,
   {
-    docketNumber,
-    updatedProps,
+    worksheet,
   }: {
-    docketNumber: string;
-    updatedProps: Record<string, string | undefined>;
+    worksheet: RawCaseWorksheet;
   },
 ) => {
   return post({
     applicationContext,
-    body: { docketNumber, updatedProps },
-    endpoint: `/cases/${docketNumber}/case-worksheet`,
+    body: { worksheet },
+    endpoint: `/cases/${worksheet.docketNumber}/case-worksheet`,
   });
 };

web-api/src/app.ts

@@ -38,7 +38,6 @@ import { deleteCaseNoteLambda } from './lambdas/caseNote/deleteCaseNoteLambda';
 import { deleteCounselFromCaseLambda } from './lambdas/cases/deleteCounselFromCaseLambda';
 import { deleteDeficiencyStatisticLambda } from './lambdas/cases/deleteDeficiencyStatisticLambda';
 import { deletePractitionerDocumentLambda } from './lambdas/practitioners/deletePractitionerDocumentLambda';
-import { deletePrimaryIssueLambda } from '@web-api/caseWorksheet/deletePrimaryIssueLambda';
 import { deleteTrialSessionLambda } from './lambdas/trialSessions/deleteTrialSessionLambda';
 import { deleteUserCaseNoteLambda } from './lambdas/caseNote/deleteUserCaseNoteLambda';
 import { dismissNOTTReminderForTrialLambda } from './lambdas/trialSessions/dismissNOTTReminderForTrialLambda';
@@ -68,7 +67,7 @@ import { getCaseDeadlinesLambda } from './lambdas/caseDeadline/getCaseDeadlinesL
 import { getCaseExistsLambda } from './lambdas/cases/getCaseExistsLambda';
 import { getCaseInventoryReportLambda } from './lambdas/reports/getCaseInventoryReportLambda';
 import { getCaseLambda } from './lambdas/cases/getCaseLambda';
-import { getCaseWorksheetsForJudgeLambda } from '@web-api/caseWorksheet/getCaseWorksheetsForJudgeLambda';
+import { getCaseWorksheetsForJudgeLambda } from '@web-api/lambdas/caseWorksheet/getCaseWorksheetsForJudgeLambda';
 import { getCasesByStatusAndByJudgeLambda } from './lambdas/reports/getCasesByStatusAndByJudgeLambda';
 import { getCasesClosedByJudgeLambda } from './lambdas/reports/getCasesClosedByJudgeLambda';
 import { getCasesForUserLambda } from './lambdas/cases/getCasesForUserLambda';
@@ -164,7 +163,7 @@ import { updateCaseContextLambda } from './lambdas/cases/updateCaseContextLambda
 import { updateCaseDeadlineLambda } from './lambdas/caseDeadline/updateCaseDeadlineLambda';
 import { updateCaseDetailsLambda } from './lambdas/cases/updateCaseDetailsLambda';
 import { updateCaseTrialSortTagsLambda } from './lambdas/cases/updateCaseTrialSortTagsLambda';
-import { updateCaseWorksheetLambda } from '@web-api/caseWorksheet/updateCaseWorksheetLambda';
+import { updateCaseWorksheetLambda } from '@web-api/lambdas/caseWorksheet/updateCaseWorksheetLambda';
 import { updateContactLambda } from './lambdas/cases/updateContactLambda';
 import { updateCorrespondenceDocumentLambda } from './lambdas/correspondence/updateCorrespondenceDocumentLambda';
 import { updateCounselOnCaseLambda } from './lambdas/cases/updateCounselOnCaseLambda';
@@ -621,10 +620,6 @@ app.use(logger());
  */
 {
   app.get('/case-worksheet', lambdaWrapper(getCaseWorksheetsForJudgeLambda));
-  app.post(
-    '/case-worksheet/:docketNumber/primary-issue/delete',
-    lambdaWrapper(deletePrimaryIssueLambda),
-  );
 }
 
 /**

web-api/src/getUseCases.ts

@@ -40,7 +40,6 @@ import { deleteCaseNoteInteractor } from '../../shared/src/business/useCases/cas
 import { deleteCounselFromCaseInteractor } from '../../shared/src/business/useCases/caseAssociation/deleteCounselFromCaseInteractor';
 import { deleteDeficiencyStatisticInteractor } from '../../shared/src/business/useCases/caseStatistics/deleteDeficiencyStatisticInteractor';
 import { deletePractitionerDocumentInteractor } from '../../shared/src/business/useCases/practitioners/deletePractitionerDocumentInteractor';
-import { deletePrimaryIssueInteractor } from '@shared/business/useCases/caseWorksheet/deletePrimaryIssueInteractor';
 import { deleteTrialSessionInteractor } from '../../shared/src/business/useCases/trialSessions/deleteTrialSessionInteractor';
 import { deleteUserCaseNoteInteractor } from '../../shared/src/business/useCases/caseNote/deleteUserCaseNoteInteractor';
 import { dismissNOTTReminderForTrialInteractor } from '../../shared/src/business/useCases/trialSessions/dismissNOTTReminderForTrialInteractor';
@@ -79,7 +78,7 @@ import { getCaseDeadlinesInteractor } from '../../shared/src/business/useCases/g
 import { getCaseExistsInteractor } from '../../shared/src/business/useCases/getCaseExistsInteractor';
 import { getCaseForPublicDocketSearchInteractor } from '../../shared/src/business/useCases/public/getCaseForPublicDocketSearchInteractor';
 import { getCaseInteractor } from '../../shared/src/business/useCases/getCaseInteractor';
-import { getCaseInventoryReportInteractor } from '@web-api/business/useCases/caseInventoryReport/getCaseInventoryReportInteractor';
+import { getCaseInventoryReportInteractor } from './business/useCases/caseInventoryReport/getCaseInventoryReportInteractor';
 import { getCaseWorksheetsForJudgeInteractor } from '@shared/business/useCases/caseWorksheet/getCaseWorksheetsForJudgeInteractor';
 import { getCasesByStatusAndByJudgeInteractor } from '../../shared/src/business/useCases/judgeActivityReport/getCasesByStatusAndByJudgeInteractor';
 import { getCasesClosedByJudgeInteractor } from '../../shared/src/business/useCases/judgeActivityReport/getCasesClosedByJudgeInteractor';
@@ -245,7 +244,6 @@ const useCases = {
   deleteCounselFromCaseInteractor,
   deleteDeficiencyStatisticInteractor,
   deletePractitionerDocumentInteractor,
-  deletePrimaryIssueInteractor,
   deleteTrialSessionInteractor,
   deleteUserCaseNoteInteractor,
   dismissNOTTReminderForTrialInteractor,

web-api/src/caseWorksheet/getCaseWorksheetsForJudgeLambda.ts → web-api/src/lambdas/caseWorksheet/getCaseWorksheetsForJudgeLambda.ts

@@ -1,7 +1,7 @@
-import { genericHandler } from '../genericHandler';
+import { genericHandler } from '../../genericHandler';
 
 export const getCaseWorksheetsForJudgeLambda = event =>
-  genericHandler(event, ({ applicationContext }) => {
+  genericHandler(event, async ({ applicationContext }) => {
     return applicationContext
       .getUseCases()
       .getCaseWorksheetsForJudgeInteractor(applicationContext);

web-api/src/caseWorksheet/updateCaseWorksheetLambda.ts → web-api/src/lambdas/caseWorksheet/updateCaseWorksheetLambda.ts

@@ -1,4 +1,4 @@
-import { genericHandler } from '../genericHandler';
+import { genericHandler } from '../../genericHandler';
 
 export const updateCaseWorksheetLambda = event =>
   genericHandler(event, async ({ applicationContext }) => {

web-api/src/persistence/dynamo/caseWorksheet/updateCaseWorksheet.ts

@@ -1,4 +1,5 @@
 import { RawCaseWorksheet } from '@shared/business/entities/caseWorksheet/CaseWorksheet';
+import { TDynamoRecord } from '@web-api/persistence/dynamo/dynamoTypes';
 import { put } from '../../dynamodbClientService';
 
 export const updateCaseWorksheet = async ({
@@ -9,8 +10,8 @@ export const updateCaseWorksheet = async ({
   applicationContext: IApplicationContext;
   caseWorksheet: RawCaseWorksheet;
   judgeUserId: string;
-}): Promise<void> => {
-  put({
+}): Promise<TDynamoRecord> => {
+  return await put({
     Item: {
       gsi1pk: `judge-case-worksheet|${judgeUserId}`,
       pk: `case|${caseWorksheet.docketNumber}`,