Merge pull request #700 from Ferlab-Ste-Justine/fix/update-provider

fix: CLIN-73 Update provider
Ferlab-Ste-Justine · Jun 17, 2021 · f9b90a6 · f9b90a6
2 parents 84df612 + 74fe3c3
commit f9b90a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/client/src/helpers/providers/extractor.ts b/client/src/helpers/providers/extractor.ts
@@ -104,12 +104,11 @@ export class DataExtractor {
   }
 
   public extractResource<T>(data: any, resourceType: ResourceType): T {
-    return data.entry.find((entry: any) => entry.resource.resourceType === resourceType).resource as T;
+    return data.entry?.find((entry: any) => entry.resource.resourceType === resourceType).resource as T;
   }
 
   public extractResources<T>(data: any, resourceType: ResourceType): T[] {
-    return data.entry
-      .filter((entry: any) => entry.resource.resourceType === resourceType)
+    return data.entry?.filter((entry: any) => entry.resource.resourceType === resourceType)
       .map((entry: any) => entry.resource as T) as T[];
   }
 

diff --git a/client/src/helpers/providers/patient/index.ts b/client/src/helpers/providers/patient/index.ts
@@ -104,7 +104,7 @@ export class PatientProvider extends Provider<Patient, ParsedPatientData> {
           ? bloodRelationshipExt.valueCoding.display
           : 'N/A',
       familyId: get(familyIdExt, 'valueReference.reference', '').split('/')[1],
-      familyType: group.type,
+      familyType: get(group, 'type', 'solo'),
       proband: probandExt != null && probandExt.valueBoolean ? 'Proband' : 'Parent',
       isFetus: fetusExt != null && fetusExt.valueBoolean,
       familyRelation: familyRelationExt?.extension[0].valueReference.reference.split('/')[1],