Merge pull request #4158 from flexion/10191-critical-bug

10191: critical bug: consolidated case practitioner association

Author: jtdevos

shared/src/business/useCaseHelper/caseAssociation/updateCaseAndAssociations.test.ts

@@ -663,11 +663,37 @@ describe('updateCaseAndAssociations', () => {
         userId: practitionerId,
       });
     });
+
+    it('calls updateIrsPractitionerOnCase to update gsi1pk for unchanged irsPractitioners when the case is part of a consolidated group', async () => {
+      await updateCaseAndAssociations({
+        applicationContext,
+        caseToUpdate: {
+          ...mockCaseWithIrsPractitioners,
+          leadDocketNumber: '101-23',
+        },
+      });
+
+      expect(
+        applicationContext.getPersistenceGateway()
+          .removePrivatePractitionerOnCase,
+      ).not.toHaveBeenCalled();
+      expect(
+        applicationContext.getPersistenceGateway().updateIrsPractitionerOnCase,
+      ).toHaveBeenCalled();
+      expect(
+        applicationContext.getPersistenceGateway().updateIrsPractitionerOnCase
+          .mock.calls[0][0],
+      ).toMatchObject({
+        docketNumber: validMockCase.docketNumber,
+        practitioner: mockCaseWithIrsPractitioners.irsPractitioners![0],
+        userId: practitionerId,
+      });
+    });
   });
 
   describe('Private practitioners', () => {
     const practitionerId = applicationContext.getUniqueId();
-    const mockCaseWithIrsPractitioners = new Case(
+    const mockCaseWithIrsAndPrivatePractitioners = new Case(
       {
         ...MOCK_CASE,
         privatePractitioners: [
@@ -685,13 +711,15 @@ describe('updateCaseAndAssociations', () => {
     beforeAll(() => {
       applicationContext
         .getPersistenceGateway()
-        .getCaseByDocketNumber.mockReturnValue(mockCaseWithIrsPractitioners);
+        .getCaseByDocketNumber.mockReturnValue(
+          mockCaseWithIrsAndPrivatePractitioners,
+        );
     });
 
     it('does not call updatePrivatePractitionerOnCase or removePrivatePractitionerOnCase if all private practitioners are unchanged', async () => {
       await updateCaseAndAssociations({
         applicationContext,
-        caseToUpdate: mockCaseWithIrsPractitioners,
+        caseToUpdate: mockCaseWithIrsAndPrivatePractitioners,
       });
       expect(
         applicationContext.getPersistenceGateway()
@@ -713,7 +741,7 @@ describe('updateCaseAndAssociations', () => {
       await updateCaseAndAssociations({
         applicationContext,
         caseToUpdate: {
-          ...mockCaseWithIrsPractitioners,
+          ...mockCaseWithIrsAndPrivatePractitioners,
           privatePractitioners: [updatedPractitioner],
         },
       });
@@ -736,11 +764,39 @@ describe('updateCaseAndAssociations', () => {
       });
     });
 
+    it('calls updatePrivatePractitionerOnCase to update gsi1pk for unchanged privatePractitioners when the case is part of a consolidated group', async () => {
+      await updateCaseAndAssociations({
+        applicationContext,
+        caseToUpdate: {
+          ...mockCaseWithIrsAndPrivatePractitioners,
+          leadDocketNumber: '101-23',
+        },
+      });
+
+      expect(
+        applicationContext.getPersistenceGateway()
+          .removePrivatePractitionerOnCase,
+      ).not.toHaveBeenCalled();
+      expect(
+        applicationContext.getPersistenceGateway()
+          .updatePrivatePractitionerOnCase,
+      ).toHaveBeenCalled();
+      expect(
+        applicationContext.getPersistenceGateway()
+          .updatePrivatePractitionerOnCase.mock.calls[0][0],
+      ).toMatchObject({
+        docketNumber: validMockCase.docketNumber,
+        practitioner:
+          mockCaseWithIrsAndPrivatePractitioners.privatePractitioners![0],
+        userId: practitionerId,
+      });
+    });
+
     it('removes an privatePractitioner from a case with existing privatePractitioners', async () => {
       await updateCaseAndAssociations({
         applicationContext,
         caseToUpdate: {
-          ...mockCaseWithIrsPractitioners,
+          ...mockCaseWithIrsAndPrivatePractitioners,
           privatePractitioners: [],
         },
       });

shared/src/business/useCaseHelper/caseAssociation/updateCaseAndAssociations.ts

@@ -213,11 +213,21 @@ const updateIrsPractitioners = ({
   const {
     added: addedIrsPractitioners,
     removed: deletedIrsPractitioners,
+    same: unchangedIrsPractitioners,
     updated: updatedIrsPractitioners,
   } = diff(oldCase.irsPractitioners, caseToUpdate.irsPractitioners, 'userId');
 
+  const currentIrsPractitioners = [
+    ...addedIrsPractitioners,
+    ...updatedIrsPractitioners,
+  ];
+
+  if (caseToUpdate.leadDocketNumber && unchangedIrsPractitioners.length) {
+    currentIrsPractitioners.push(...unchangedIrsPractitioners);
+  }
+
   const validIrsPractitioners = IrsPractitioner.validateRawCollection(
-    [...addedIrsPractitioners, ...updatedIrsPractitioners],
+    currentIrsPractitioners,
     { applicationContext },
   );
 
@@ -269,15 +279,25 @@ const updatePrivatePractitioners = ({
   const {
     added: addedPrivatePractitioners,
     removed: deletedPrivatePractitioners,
+    same: unchangedPrivatePractitioners,
     updated: updatedPrivatePractitioners,
   } = diff(
     oldCase.privatePractitioners,
     caseToUpdate.privatePractitioners,
     'userId',
   );
 
+  const currentPrivatePractitioners = [
+    ...addedPrivatePractitioners,
+    ...updatedPrivatePractitioners,
+  ];
+
+  if (caseToUpdate.leadDocketNumber && unchangedPrivatePractitioners.length) {
+    currentPrivatePractitioners.push(...unchangedPrivatePractitioners);
+  }
+
   const validPrivatePractitioners = PrivatePractitioner.validateRawCollection(
-    [...addedPrivatePractitioners, ...updatedPrivatePractitioners],
+    currentPrivatePractitioners,
     { applicationContext },
   );
 

web-client/integration-tests/journey/docketClerkConsolidatesCases.ts

@@ -12,6 +12,9 @@ export const docketClerkConsolidatesCases = (
     expect(
       cerebralTest.getState('caseDetail.consolidatedCases').length,
     ).toEqual(expectedNumberOfConsolidatedCases);
+    expect(cerebralTest.getState('alertSuccess')).toEqual({
+      message: 'Selected cases consolidated.',
+    });
     expect(cerebralTest.getState('modal.showModal')).toBeUndefined();
   });
 };

web-client/integration-tests/practitionerAssociationJourney.test.ts

@@ -0,0 +1,49 @@
+import { docketClerkConsolidatesCases } from './journey/docketClerkConsolidatesCases';
+import { docketClerkOpensCaseConsolidateModal } from './journey/docketClerkOpensCaseConsolidateModal';
+import { docketClerkSearchesForCaseToConsolidateWith } from './journey/docketClerkSearchesForCaseToConsolidateWith';
+import { docketClerkUpdatesCaseStatusToReadyForTrial } from './journey/docketClerkUpdatesCaseStatusToReadyForTrial';
+import { loginAs, setupTest, viewCaseDetail } from './helpers';
+import { petitionsClerkAddsPractitionersToCase } from './journey/petitionsClerkAddsPractitionersToCase';
+import { petitionsClerkCreatesNewCase } from './journey/petitionsClerkCreatesNewCase';
+
+describe('Practitioner case association journey', () => {
+  const cerebralTest = setupTest();
+
+  afterAll(() => {
+    cerebralTest.closeSocket();
+  });
+
+  loginAs(cerebralTest, 'petitionsclerk@example.com');
+  petitionsClerkCreatesNewCase(cerebralTest, { shouldServe: true });
+  it('sets the lead docket number in state', () => {
+    cerebralTest.leadDocketNumber = cerebralTest.docketNumber;
+  });
+
+  petitionsClerkAddsPractitionersToCase(cerebralTest, true);
+
+  loginAs(cerebralTest, 'docketclerk@example.com');
+  docketClerkUpdatesCaseStatusToReadyForTrial(cerebralTest);
+
+  loginAs(cerebralTest, 'petitionsclerk@example.com');
+  petitionsClerkCreatesNewCase(cerebralTest, { shouldServe: true });
+
+  loginAs(cerebralTest, 'docketclerk@example.com');
+  docketClerkUpdatesCaseStatusToReadyForTrial(cerebralTest);
+  docketClerkOpensCaseConsolidateModal(cerebralTest);
+  docketClerkSearchesForCaseToConsolidateWith(cerebralTest);
+  docketClerkConsolidatesCases(cerebralTest, 2);
+
+  loginAs(cerebralTest, 'privatepractitioner@example.com');
+  it('navigates to case detail and checks for case association', async () => {
+    await viewCaseDetail({
+      cerebralTest,
+      docketNumber: cerebralTest.docketNumber,
+    });
+
+    expect(cerebralTest.getState('currentPage')).toEqual('CaseDetail');
+    expect(cerebralTest.getState('screenMetadata.isAssociated')).toBe(true);
+    expect(cerebralTest.getState('screenMetadata.isDirectlyAssociated')).toBe(
+      false,
+    );
+  });
+});