10502-dxox: fix message sorting error (both message and case have cre…

…atedAt, so our queries for messages needed to specify message.createdAt); remove duplicate upsertPractitionersOnCase; fix broken createTestApplicationContext
ustaxcourt · Jan 11, 2025 · adcddd4 · adcddd4
1 parent 7c332b0
commit adcddd4
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 64 deletions.
diff --git a/__TODO-10502.md b/__TODO-10502.md
@@ -7,7 +7,6 @@
   - Can we remove formatWorkItemResult and formatMessageResult? What about formatDocketEntryResult?
 
 - if we use the trigram search, run on the db CREATE EXTENSION IF NOT EXISTS pg_trgm;
-- upsertPractitionersOnCase: we have two versions
 - Some TODOs are marked with "10502 TODO", so search for this (without the quotes) as needed. (solo, meetup as needed)
 - Make sure that report data for case-mapping reports (above) is correct, and make sure indices are added for efficiency as needed for all case-based reports (pair)
 - Make sure getCasesMetadataByUserId (previously called getCasesForUser) is working. It relies on processPractitionerMappingEntries streaming things into PractitionerOnCaseTable (pair)

diff --git a/shared/src/business/test/createTestApplicationContext.ts b/shared/src/business/test/createTestApplicationContext.ts
@@ -68,6 +68,7 @@ import { formatPendingItem } from '@shared/business/utilities/formatPendingItem'
 import { formatPhoneNumber } from '@shared/business/utilities/formatPhoneNumber';
 import { generateAndServeDocketEntry } from '@web-api/business/useCaseHelper/service/createChangeItems';
 import { generateChangeOfAddressHelper } from '@web-api/business/useCaseHelper/generateChangeOfAddressHelper';
+import { generateDocketNumber } from '@web-api/persistence/postgres/cases/generateDocketNumber';
 import { generateNoticesForCaseTrialSessionCalendarInteractor } from '@web-api/business/useCases/trialSessions/generateNoticesForCaseTrialSessionCalendarInteractor';
 import {
   getAddressPhoneDiff,
@@ -535,6 +536,10 @@ export const createTestApplicationContext = () => {
 
   const mockDocumentClient = createMockDocumentClient();
 
+  const mockCreateDocketNumberGenerator = {
+    createDocketNumber: jest.fn().mockImplementation(generateDocketNumber),
+  };
+
   const mockBroadcastGateway = {
     postMessage: jest.fn(),
   };

diff --git a/web-api/src/business/useCases/messages/createMessageInteractor.ts b/web-api/src/business/useCases/messages/createMessageInteractor.ts
@@ -1,14 +1,11 @@
-import { Case } from '../../../../../shared/src/business/entities/cases/Case';
-import {
-  Message,
-  RawMessage,
-} from '../../../../../shared/src/business/entities/Message';
+import { Case } from '@shared/business/entities/cases/Case';
+import { Message, RawMessage } from '@shared/business/entities/Message';
+import { NotFoundError, UnauthorizedError } from '@web-api/errors/errors';
 import {
   ROLE_PERMISSIONS,
   isAuthorized,
-} from '../../../../../shared/src/authorization/authorizationClientService';
+} from '@shared/authorization/authorizationClientService';
 import { ServerApplicationContext } from '@web-api/applicationContext';
-import { UnauthorizedError } from '@web-api/errors/errors';
 import { UnknownAuthUser } from '@shared/business/entities/authUser/AuthUser';
 import { createMessage } from '@web-api/persistence/postgres/messages/createMessage';
 import { getCaseByDocketNumber } from '@web-api/persistence/postgres/cases/getCaseByDocketNumber';
@@ -48,11 +45,17 @@ export const createMessageInteractor = async (
     throw new UnauthorizedError('Unauthorized');
   }
 
-  const { caseCaption, status } = await getCaseByDocketNumber({
+  const associatedCase = await getCaseByDocketNumber({
     applicationContext,
     docketNumber,
   });
 
+  if (!associatedCase) {
+    throw new NotFoundError(`Case ${docketNumber} not found`);
+  }
+
+  const { caseCaption, status } = associatedCase;
+
   const fromUser = await applicationContext
     .getPersistenceGateway()
     .getUserById({ applicationContext, userId: authorizedUser.userId });

diff --git a/web-api/src/business/useCases/messages/replyToMessageInteractor.ts b/web-api/src/business/useCases/messages/replyToMessageInteractor.ts
@@ -1,15 +1,12 @@
-import { Case } from '../../../../../shared/src/business/entities/cases/Case';
-import {
-  Message,
-  RawMessage,
-} from '../../../../../shared/src/business/entities/Message';
+import { Case } from '@shared/business/entities/cases/Case';
+import { Message, RawMessage } from '@shared/business/entities/Message';
+import { NotFoundError, UnauthorizedError } from '@web-api/errors/errors';
 import {
   ROLE_PERMISSIONS,
   isAuthorized,
-} from '../../../../../shared/src/authorization/authorizationClientService';
+} from '@shared/authorization/authorizationClientService';
 import { ReplyMessageType } from '@web-api/business/useCases/messages/createMessageInteractor';
 import { ServerApplicationContext } from '@web-api/applicationContext';
-import { UnauthorizedError } from '@web-api/errors/errors';
 import { UnknownAuthUser } from '@shared/business/entities/authUser/AuthUser';
 import { createMessageAsReply } from '@web-api/persistence/postgres/messages/createMessageAsReply';
 import { getCaseByDocketNumber } from '@web-api/persistence/postgres/cases/getCaseByDocketNumber';
@@ -31,8 +28,16 @@ export const replyToMessage = async (
     throw new UnauthorizedError('Unauthorized');
   }
 
-  const { caseCaption, docketNumberWithSuffix, status } =
-    await getCaseByDocketNumber({ applicationContext, docketNumber });
+  const associatedCase = await getCaseByDocketNumber({
+    applicationContext,
+    docketNumber,
+  });
+
+  if (!associatedCase) {
+    throw new NotFoundError(`Case ${docketNumber} not found`);
+  }
+
+  const { caseCaption, docketNumberWithSuffix, status } = associatedCase;
 
   const fromUser = await applicationContext
     .getPersistenceGateway()

diff --git a/web-api/src/persistence/postgres/cases/generateDocketNumber.ts b/web-api/src/persistence/postgres/cases/generateDocketNumber.ts
@@ -3,7 +3,7 @@ import {
   formatDateString,
   formatNow,
   getMonthDayYearInETObj,
-} from '../../../../../shared/src/business/utilities/DateHandler';
+} from '@shared/business/utilities/DateHandler';
 import { getCaseMetadataByDocketNumber } from '@web-api/persistence/postgres/cases/getCaseMetadataByDocketNumber';
 import { getDbWriter } from '@web-api/database';
 import { getLogger } from '@web-api/utilities/logger/getLogger';

diff --git a/web-api/src/persistence/postgres/cases/parties/upsertPractitionersOnCase.ts b/web-api/src/persistence/postgres/cases/parties/upsertPractitionersOnCase.ts
@@ -1,10 +1,11 @@
+import { RawPractitioner } from '@shared/business/entities/Practitioner';
 import { getDbWriter } from '@web-api/database';
 import { isEmpty } from 'lodash';
 
 export const upsertPractitionersOnCase = async ({
   practitionersWithDocketNumber,
 }: {
-  practitionersWithDocketNumber: any; // 10502 TODO
+  practitionersWithDocketNumber: (RawPractitioner & { docketNumber: string })[];
 }): Promise<void> => {
   if (isEmpty(practitionersWithDocketNumber)) {
     return;
@@ -15,7 +16,7 @@ export const upsertPractitionersOnCase = async ({
       .values(
         practitionersWithDocketNumber.map(p => ({
           docketNumber: p.docketNumber,
-          email: p.email,
+          email: p.email || '',
           userId: p.userId,
         })),
       )

diff --git a/web-api/src/persistence/postgres/messages/getCompletedSectionInboxMessages.ts b/web-api/src/persistence/postgres/messages/getCompletedSectionInboxMessages.ts
@@ -18,7 +18,7 @@ export const getCompletedSectionInboxMessages = async ({
       .where('m.isCompleted', '=', true)
       .where('m.createdAt', '>=', filterDate)
       .selectAll()
-      .select('m.docketNumber')
+      .select(['m.docketNumber', 'm.createdAt'])
       .limit(5000)
       .execute(),
   );

diff --git a/web-api/src/persistence/postgres/messages/getCompletedUserInboxMessages.ts b/web-api/src/persistence/postgres/messages/getCompletedUserInboxMessages.ts
@@ -18,7 +18,7 @@ export const getCompletedUserInboxMessages = async ({
       .where('m.isCompleted', '=', true)
       .where('m.completedAt', '>=', filterDate)
       .selectAll()
-      .select('m.docketNumber')
+      .select(['m.docketNumber', 'm.createdAt'])
       .limit(5000)
       .execute(),
   );

diff --git a/web-api/src/persistence/postgres/messages/getMessageById.ts b/web-api/src/persistence/postgres/messages/getMessageById.ts
@@ -13,7 +13,7 @@ export const getMessageById = async ({
       .leftJoin('dwCase as c', 'c.docketNumber', 'm.docketNumber')
       .where('messageId', '=', messageId)
       .selectAll()
-      .select('m.docketNumber')
+      .select(['m.docketNumber', 'm.createdAt'])
       .executeTakeFirst(),
   );
 

diff --git a/web-api/src/persistence/postgres/messages/getMessageThreadByParentId.ts b/web-api/src/persistence/postgres/messages/getMessageThreadByParentId.ts
@@ -13,7 +13,7 @@ export const getMessageThreadByParentId = async ({
       .leftJoin('dwCase as c', 'c.docketNumber', 'm.docketNumber')
       .where('m.parentMessageId', '=', parentMessageId)
       .selectAll()
-      .select('m.docketNumber')
+      .select(['m.docketNumber', 'm.createdAt'])
       .execute(),
   );
 

diff --git a/web-api/src/persistence/postgres/messages/getMessagesByDocketNumber.ts b/web-api/src/persistence/postgres/messages/getMessagesByDocketNumber.ts
@@ -13,7 +13,7 @@ export const getMessagesByDocketNumber = async ({
       .leftJoin('dwCase as c', 'c.docketNumber', 'm.docketNumber')
       .where('m.docketNumber', '=', docketNumber)
       .selectAll()
-      .select('m.docketNumber')
+      .select(['m.docketNumber', 'm.createdAt'])
       .execute(),
   );
 

diff --git a/web-api/src/persistence/postgres/messages/getSectionInboxMessages.ts b/web-api/src/persistence/postgres/messages/getSectionInboxMessages.ts
@@ -16,7 +16,7 @@ export const getSectionInboxMessages = async ({
       .where('m.isRepliedTo', '=', false)
       .where('m.isCompleted', '=', false)
       .selectAll()
-      .select('m.docketNumber')
+      .select(['m.docketNumber', 'm.createdAt'])
       .limit(5000)
       .execute(),
   );

diff --git a/web-api/src/persistence/postgres/messages/getSectionOutboxMessages.ts b/web-api/src/persistence/postgres/messages/getSectionOutboxMessages.ts
@@ -18,7 +18,7 @@ export const getSectionOutboxMessages = async ({
       .where('m.fromSection', '=', section)
       .where('m.createdAt', '>=', filterDate)
       .selectAll()
-      .select('m.docketNumber')
+      .select(['m.docketNumber', 'm.createdAt'])
       .execute(),
   );
 

diff --git a/web-api/src/persistence/postgres/messages/getUserInboxMessages.ts b/web-api/src/persistence/postgres/messages/getUserInboxMessages.ts
@@ -16,7 +16,7 @@ export const getUserInboxMessages = async ({
       .where('m.isRepliedTo', '=', false)
       .where('m.toUserId', '=', userId)
       .selectAll()
-      .select('m.docketNumber')
+      .select(['m.docketNumber', 'm.createdAt'])
       .execute(),
   );
 

diff --git a/web-api/src/persistence/postgres/messages/getUserOutboxMessages.ts b/web-api/src/persistence/postgres/messages/getUserOutboxMessages.ts
@@ -17,7 +17,7 @@ export const getUserOutboxMessages = async ({
       .where('m.fromUserId', '=', userId)
       .where('m.createdAt', '>=', filterDate)
       .selectAll()
-      .select('m.docketNumber')
+      .select(['m.docketNumber', 'm.createdAt'])
       .limit(5000)
       .execute(),
   );

diff --git a/web-api/src/persistence/postgres/users/upsertPractitionersOnCase.ts b/web-api/src/persistence/postgres/users/upsertPractitionersOnCase.ts
diff --git a/web-client/src/presenter/sequences/gotoCaseDetailSequence.ts b/web-client/src/presenter/sequences/gotoCaseDetailSequence.ts
@@ -84,14 +84,8 @@ export const gotoCaseDetailSequence = [
   closeMobileMenuAction,
   setDefaultCaseDetailTabAction,
   setIsPrimaryTabAction,
-  () => {
-    console.log('GETTING CASE');
-  },
   getCaseAction,
   setCaseAction,
-  () => {
-    console.log('SET THE CASE');
-  },
   setDefaultDocketRecordSortAction,
   setDefaultEditDocumentEntryPointAction,
   runPathForUserRoleAction,