Merge pull request #5522 from flexion/10492-dxox-intermediate-branch-…

…to-test-1730910644 10492 dxox updates to test
ustaxcourt · Nov 8, 2024 · 8bfbf92 · 8bfbf92
2 parents 7b6bee4 + cecd10c
commit 8bfbf92
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 42 deletions.
diff --git a/types/TEntity.d.ts b/types/TEntity.d.ts
@@ -27,12 +27,6 @@ type TPetitioner = {
   hasConsentedToEService?: boolean;
 };
 
-type TCaseNote = {
-  userId: string;
-  docketNumber: string;
-  notes: string;
-};
-
 interface IValidateRawCollection<I> {
   (collection: I[], options: { applicationContext: IApplicationContext }): I[];
 }

diff --git a/web-api/src/business/useCases/caseNote/updateUserCaseNoteInteractor.test.ts b/web-api/src/business/useCases/caseNote/updateUserCaseNoteInteractor.test.ts
@@ -6,7 +6,7 @@ import { applicationContext } from '../../../../../shared/src/business/test/crea
 import { mockJudgeUser } from '@shared/test/mockAuthUsers';
 import { omit } from 'lodash';
 import { updateUserCaseNoteInteractor } from './updateUserCaseNoteInteractor';
-import { updateUserCaseNote as updateUserCaseNoteMock } from '@web-api/persistence/postgres/userCaseNotes/updateUserCaseNote';
+import { upsertUserCaseNote as upsertUserCaseNoteMock } from '@web-api/persistence/postgres/userCaseNotes/upsertUserCaseNote';
 
 describe('updateUserCaseNoteInteractor', () => {
   const mockCaseNote = {
@@ -15,7 +15,7 @@ describe('updateUserCaseNoteInteractor', () => {
     userId: '6805d1ab-18d0-43ec-bafb-654e83405416',
   };
 
-  const updateUserCaseNote = updateUserCaseNoteMock as jest.Mock;
+  const upsertUserCaseNote = upsertUserCaseNoteMock as jest.Mock;
 
   it('throws an error if the user is not valid or authorized', async () => {
     await expect(
@@ -38,7 +38,7 @@ describe('updateUserCaseNoteInteractor', () => {
     applicationContext
       .getPersistenceGateway()
       .getUserById.mockImplementation(() => mockUser);
-    updateUserCaseNote.mockImplementation(v => v.caseNoteToUpdate);
+    upsertUserCaseNote.mockImplementation(v => v.caseNoteToUpsert);
     applicationContext
       .getUseCaseHelpers()
       .getJudgeInSectionHelper.mockReturnValue({
@@ -82,7 +82,7 @@ describe('updateUserCaseNoteInteractor', () => {
       omit(mockUser, 'section'),
     );
 
-    expect(updateUserCaseNote.mock.calls[0][0].caseNoteToUpdate.userId).toEqual(
+    expect(upsertUserCaseNote.mock.calls[0][0].caseNoteToUpsert.userId).toEqual(
       userIdToExpect,
     );
   });

diff --git a/web-api/src/business/useCases/caseNote/updateUserCaseNoteInteractor.ts b/web-api/src/business/useCases/caseNote/updateUserCaseNoteInteractor.ts
@@ -5,7 +5,7 @@ import {
 import { UnauthorizedError } from '@web-api/errors/errors';
 import { UnknownAuthUser } from '@shared/business/entities/authUser/AuthUser';
 import { UserCaseNote } from '../../../../../shared/src/business/entities/notes/UserCaseNote';
-import { updateUserCaseNote } from '@web-api/persistence/postgres/userCaseNotes/updateUserCaseNote';
+import { upsertUserCaseNote } from '@web-api/persistence/postgres/userCaseNotes/upsertUserCaseNote';
 
 export const updateUserCaseNoteInteractor = async (
   applicationContext,
@@ -28,13 +28,11 @@ export const updateUserCaseNoteInteractor = async (
     docketNumber,
     notes,
     userId,
-  });
-
-  const caseNoteToUpdate = caseNoteEntity.validate().toRawObject();
+  }).validate();
 
-  await updateUserCaseNote({
-    caseNoteToUpdate,
+  await upsertUserCaseNote({
+    caseNoteToUpsert: caseNoteEntity,
   });
 
-  return caseNoteToUpdate;
+  return caseNoteEntity;
 };
diff --git a/web-api/src/persistence/postgres/userCaseNotes/mocks.jest.ts b/web-api/src/persistence/postgres/userCaseNotes/mocks.jest.ts
@@ -16,8 +16,8 @@ jest.mock(
 );
 
 jest.mock(
-  '@web-api/persistence/postgres/userCaseNotes/updateUserCaseNote.ts',
-  () => mockFactory('updateUserCaseNote'),
+  '@web-api/persistence/postgres/userCaseNotes/upsertUserCaseNote.ts',
+  () => mockFactory('upsertUserCaseNote'),
 );
 
 jest.mock(

diff --git a/web-api/src/persistence/postgres/userCaseNotes/updateUserCaseNote.ts b/web-api/src/persistence/postgres/userCaseNotes/updateUserCaseNote.ts
diff --git a/web-api/src/persistence/postgres/userCaseNotes/upsertUserCaseNote.ts b/web-api/src/persistence/postgres/userCaseNotes/upsertUserCaseNote.ts
@@ -0,0 +1,24 @@
+import { UserCaseNote } from '@shared/business/entities/notes/UserCaseNote';
+import { getDbWriter } from '@web-api/database';
+
+export const upsertUserCaseNote = async ({
+  caseNoteToUpsert,
+}: {
+  caseNoteToUpsert: UserCaseNote;
+}) => {
+  await getDbWriter(writer =>
+    writer
+      .insertInto('dwUserCaseNote')
+      .values({
+        docketNumber: caseNoteToUpsert.docketNumber,
+        notes: caseNoteToUpsert.notes,
+        userId: caseNoteToUpsert.userId,
+      })
+      .onConflict(oc =>
+        oc.columns(['docketNumber', 'userId']).doUpdateSet({
+          notes: caseNoteToUpsert.notes,
+        }),
+      )
+      .execute(),
+  );
+};