refactor(app): add null fallbacks

hpi-dhc · Jan 7, 2025 · 8aabaae · 8aabaae
1 parent 69b7bc0
commit 8aabaae
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/app/lib/common/utilities/drug_utils.dart b/app/lib/common/utilities/drug_utils.dart
@@ -16,8 +16,8 @@ List<GenotypeResult>? getGenotypeResultsForDrug(Drug drug) {
     return null;
   }
   return drug.guidelineGenotypes.map((genotypeKey) =>
-    UserData.instance.genotypeResults![genotypeKey] ??
-      // Should not be null but to be safe
+    // Should not be null but to be safe
+    UserData.instance.genotypeResults?[genotypeKey] ??
       GenotypeResult.missingResult(
         GenotypeKey.extractGene(genotypeKey),
         variant: GenotypeKey.maybeExtractVariant(genotypeKey),

diff --git a/app/lib/drug_selection/pages/drug_selection.dart b/app/lib/drug_selection/pages/drug_selection.dart
@@ -79,7 +79,7 @@ class DrugSelectionPage extends HookWidget {
   }
 
   Widget _buildDrugList(BuildContext context, DrugSelectionState state) {
-    if (DrugsWithGuidelines.instance.drugs!.isEmpty) {
+    if (DrugsWithGuidelines.instance.drugs?.isEmpty ?? true) {
       return Column(
         children: [
           Text(

diff --git a/app/lib/report/pages/report.dart b/app/lib/report/pages/report.dart
@@ -77,14 +77,16 @@ class ReportPage extends HookWidget {
     }
 
   Iterable<GenotypeResult> _getRelevantGenotypes(List<String>? drugSubset) {
-    return drugSubset != null
-      ? UserData.instance.genotypeResults!.values.filter((genotypeResult) =>
-          _getAffectedDrugs(
-                genotypeResult.key.value,
-                drugSubset: drugSubset,
-          ).isNotEmpty
-        )
-      : UserData.instance.genotypeResults!.values;
+    return UserData.instance.genotypeResults == null
+      ? []
+      : drugSubset != null
+        ? UserData.instance.genotypeResults!.values.filter((genotypeResult) =>
+            _getAffectedDrugs(
+                  genotypeResult.key.value,
+                  drugSubset: drugSubset,
+            ).isNotEmpty
+          )
+        : UserData.instance.genotypeResults!.values;
   }
 
   List<Widget> _buildGeneCards({