chore(case management)!: CE-579 Refactor (#418)

Co-authored-by: Mike <[email protected]>
bcgov · May 14, 2024 · aba8b1f · aba8b1f
1 parent faebdd8
commit aba8b1f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/backend/src/v1/case_file/case_file.service.ts b/backend/src/v1/case_file/case_file.service.ts
@@ -26,7 +26,7 @@ export class CaseFileService {
       actionJustificationLongDescription
       actionJustificationActiveIndicator
       actions {
-        actionGuid
+        actionId
         actor
         date
         actionCode
@@ -43,7 +43,7 @@ export class CaseFileService {
     }
     preventionDetails {
       actions {
-        actionGuid
+        actionId
         actor
         date
         actionCode
@@ -58,7 +58,8 @@ export class CaseFileService {
         actor
         actionCode
         date,
-        actionGuid
+        actionId,
+        activeIndicator
       }
     }
     equipment {
@@ -70,7 +71,7 @@ export class CaseFileService {
       yCoordinate
       createDate
       actions { 
-        actionGuid
+        actionId
         actor
         actionCode
         date
@@ -84,12 +85,17 @@ export class CaseFileService {
   }
 
   find = async (complaint_id: string, token: string): Promise<CaseFileDto> => {
-    const { data } = await get(token, {
+    const { data, errors } = await get(token, {
       query: `{getCaseFileByLeadId (leadIdentifier: "${complaint_id}")
         ${this.caseFileQueryFields}
       }`,
     });
 
+    if (errors) {
+      this.logger.error("GraphQL errors:", errors);
+      throw new Error("GraphQL errors occurred");
+    }
+
     if (data?.getCaseFileByLeadId?.caseIdentifier) {
       const caseFileDto = data.getCaseFileByLeadId as CaseFileDto;
       return caseFileDto;
@@ -233,7 +239,7 @@ export class CaseFileService {
       query: `mutation CreateNote($input: CreateSupplementalNoteInput!) {
         createNote(input: $input) {
           caseIdentifier
-          note { note, action { actor,date,actionCode, actionGuid } }
+          note { note, action { actor,date,actionCode, actionId } }
         }
       }`,
       variables: { input: model },
@@ -248,7 +254,7 @@ export class CaseFileService {
       query: `mutation UpdateNote($input: UpdateSupplementalNoteInput!) {
         updateNote(input: $input) {
           caseIdentifier
-          note { note, action { actor,date,actionCode,actionGuid } }
+          note { note, action { actor,date,actionCode, actionId } }
         }
       }`,
       variables: { input: model },
@@ -263,7 +269,7 @@ export class CaseFileService {
       query: `mutation DeleteNote($input: DeleteSupplementalNoteInput!) {
         deleteNote(input: $input) {
           caseIdentifier
-          note { note, action { actor,date,actionCode,actionGuid } }
+          note { note, action { actor,date,actionCode, actionId } }
         }
       }`,
       variables: { input: model },

diff --git a/frontend/src/app/components/containers/complaints/outcomes/hwcr-supplemental-notes.tsx b/frontend/src/app/components/containers/complaints/outcomes/hwcr-supplemental-notes.tsx
@@ -42,8 +42,7 @@ export const HWCRSupplementalNotes: FC = () => {
 
   const renderNote = useMemo(() => {
     const { action, note } = !supplementalNote ? { action: undefined, note: "" } : supplementalNote;
-
-    if (action && !showInput) {
+    if (action?.activeIndicator && !showInput) {
       return (
         <SupplementalNotesItem
           notes={note}

diff --git a/frontend/src/app/store/reducers/case-thunks.ts b/frontend/src/app/store/reducers/case-thunks.ts
@@ -522,9 +522,9 @@ export const upsertNote =
       }
     } else {
       const {
-        action: { actionGuid },
+        action: { actionId },
       } = currentNote;
-      result = await dispatch(_updateNote(id as UUID, note, officer ? officer.officer_guid : "", idir, actionGuid));
+      result = await dispatch(_updateNote(id as UUID, note, officer ? officer.officer_guid : "", idir, actionId));
 
       if (result !== null) {
         dispatch(setCaseId(result.caseIdentifier));
@@ -572,11 +572,11 @@ export const deleteNote =
 
     if (currentNote?.action) {
       const {
-        action: { actionGuid },
+        action: { actionId },
       } = currentNote;
 
       const officer = officers.find((item) => item.user_id === idir);
-      const result = await dispatch(_deleteNote(caseId as UUID, officer ? officer.officer_guid : "", idir, actionGuid));
+      const result = await dispatch(_deleteNote(caseId as UUID, officer ? officer.officer_guid : "", idir, actionId));
 
       if (result !== null) {
         ToggleSuccess("Supplemental note deleted");
@@ -672,7 +672,7 @@ export const deleteEquipment =
       id: id,
       updateUserId: profile.idir_username,
     };
-
+    
     const parameters = generateApiParameters(`${config.API_BASE_URL}/v1/case/equipment`, deleteEquipmentInput);
     await deleteMethod<boolean>(dispatch, parameters).then(async (res) => {
       if (res) {

diff --git a/frontend/src/app/types/outcomes/case-action.ts b/frontend/src/app/types/outcomes/case-action.ts
@@ -2,5 +2,6 @@ export interface CaseAction {
   actor: string;
   date: Date;
   action: string;
-  actionGuid: string;
+  actionId: string;
+  activeIndicator: boolean;
 }