Merge branch 'release/yellow-boring-sponge' into bug/CE-1150-Multiple…

…-Action-taken-saved-to-the-same-complaint
bcgov · Nov 26, 2024 · 012aaef · 012aaef
2 parents 71b93e6 + 1eb94ff
commit 012aaef
Show file tree

Hide file tree

Showing 22 changed files with 617 additions and 63 deletions.
diff --git a/backend/src/external_api/case_management.ts b/backend/src/external_api/case_management.ts
@@ -83,6 +83,7 @@ export const caseFileQueryFields: string = `
   equipment {
     id
     typeCode
+    typeDescription
     activeIndicator
     address
     xCoordinate
@@ -100,28 +101,32 @@ export const caseFileQueryFields: string = `
     id
     species
     sex
+    sexDescription
     age
+    ageDescription
     categoryLevel
+    categoryLevelDescription
     identifyingFeatures
     outcome
+    outcomeDescription
     tags { 
       id
       ear
+      earDescription
       identifier
-
       order
     }
     drugs { 
       id
-
       vial
       drug
+      drugDescription
       amountUsed
       injectionMethod
-    
+      injectionMethodDescription
       remainingUse
+      remainingUseDescription
       additionalComments
-
       order
     }
     actions { 

diff --git a/backend/src/middleware/maps/automapper-entity-to-dto-maps.ts b/backend/src/middleware/maps/automapper-entity-to-dto-maps.ts
@@ -1456,6 +1456,15 @@ export const mapWildlifeReport = (mapper: Mapper, tz: string = "America/Vancouve
       (destination) => destination.referenceNumber,
       mapFrom((source) => source.complaint_identifier.reference_number),
     ),
+    forMember(
+      (destination) => destination.linkedComplaintIdentifier,
+      mapFrom((source) => {
+        const {
+          complaint_identifier: { linked_complaint_xref: linkedComplaints },
+        } = source;
+        return linkedComplaints[0]?.complaint_id;
+      }),
+    ),
     forMember(
       (destination) => destination.complaintMethodReceivedCode,
       mapFrom((source) => {

diff --git a/backend/src/types/models/reports/complaints/complaint-report-data.ts b/backend/src/types/models/reports/complaints/complaint-report-data.ts
@@ -37,4 +37,6 @@ export interface ComplaintReportData {
   reportedBy: string;
 
   updates: Array<ComplaintUpdateDto>;
+
+  linkedComplaintIdentifier: string;
 }