Test FHIRStore (#30)

StanfordSpezi · Feb 3, 2025 · 9e275f8 · 9e275f8
1 parent 0f89a3d
commit 9e275f8
Show file tree

Hide file tree

Showing 9 changed files with 997 additions and 514 deletions.
diff --git a/Sources/SpeziFHIR/FHIRStore.swift b/Sources/SpeziFHIR/FHIRStore.swift
@@ -20,7 +20,13 @@ public final class FHIRStore: Module,
                              EnvironmentAccessible,
                              DefaultInitializable,
                              Sendable {
-    @MainActor private var _resources: [FHIRResource] = []
+    // The `_resources` array needs to be marked with `@ObservationIgnored` to prevent changes to this array
+    // from triggering updates to all computed properties.
+    // Instead, we explicitly control change notifications through `willSet`/`didSet` calls
+    // with specific keyPaths in the `insert`, `remove`, and other mutation methods. This ensures that
+    // only observers of the relevant category (e.g., observations, conditions) are notified when
+    // resources of that category are modified.
+    @ObservationIgnored @MainActor private var _resources: [FHIRResource] = []
 
 
     /// `FHIRResource`s with category `allergyIntolerance`.

diff --git a/Tests/SpeziFHIRTests/FHIRResourceTests/FHIRResourceCategoryTests.swift b/Tests/SpeziFHIRTests/FHIRResourceTests/FHIRResourceCategoryTests.swift
@@ -17,25 +17,25 @@ extension FHIRResourceTests {
         // Define test cases as tuples of (resource creator function, expected category)
         let testCases: [(resource: () throws -> ModelsR4.Resource, category: FHIRResource.FHIRResourceCategory)] = [
             // Observation cases
-            ({ try ModelsR4Mocks.createObservation(date: self.testDate) }, .observation),
+            ({ try ModelsR4Mocks.createObservation() }, .observation),
             ({ ModelsR4Mocks.createObservationDefinition() }, .observation),
 
             // Single resource cases
-            ({ try ModelsR4Mocks.createEncounter(date: self.testDate) }, .encounter),
-            ({ try ModelsR4Mocks.createCondition(date: self.testDate) }, .condition),
-            ({ try ModelsR4Mocks.createDiagnosticReport(date: self.testDate) }, .diagnostic),
-            ({ try ModelsR4Mocks.createProcedure(date: self.testDate) }, .procedure),
+            ({ try ModelsR4Mocks.createEncounter() }, .encounter),
+            ({ try ModelsR4Mocks.createCondition() }, .condition),
+            ({ try ModelsR4Mocks.createDiagnosticReport() }, .diagnostic),
+            ({ try ModelsR4Mocks.createProcedure() }, .procedure),
             ({ ModelsR4Mocks.createAllergyIntolerance() }, .allergyIntolerance),
 
             // Immunization cases
-            ({ try ModelsR4Mocks.createImmunization(date: self.testDate) }, .immunization),
+            ({ try ModelsR4Mocks.createImmunization() }, .immunization),
             ({ ModelsR4Mocks.createImmunizationEvaluation() }, .immunization),
-            ({ try ModelsR4Mocks.createImmunizationRecommendation(date: self.testDate) }, .immunization),
+            ({ try ModelsR4Mocks.createImmunizationRecommendation(date: Self.testDate) }, .immunization),
 
             // Medication cases
             ({ ModelsR4Mocks.createMedication() }, .medication),
-            ({ try ModelsR4Mocks.createMedicationRequest(date: self.testDate) }, .medication),
-            ({ try ModelsR4Mocks.createMedicationAdministration(date: self.testDate) }, .medication),
+            ({ try ModelsR4Mocks.createMedicationRequest() }, .medication),
+            ({ try ModelsR4Mocks.createMedicationAdministration() }, .medication),
             ({ ModelsR4Mocks.createMedicationDispense() }, .medication),
             ({ ModelsR4Mocks.createMedicationKnowledge() }, .medication),
             ({ ModelsR4Mocks.createMedicationStatement() }, .medication)
@@ -53,27 +53,27 @@ extension FHIRResourceTests {
             // Single resource cases
             ({ ModelsDSTU2Mocks.createAllergyIntolerance() }, .allergyIntolerance),
             ({ ModelsDSTU2Mocks.createEncounter() }, .encounter),
-            ({ try ModelsDSTU2Mocks.createObservation(date: self.testDate) }, .observation),
-            ({ try ModelsDSTU2Mocks.createCondition(date: self.testDate) }, .condition),
+            ({ try ModelsDSTU2Mocks.createObservation() }, .observation),
+            ({ try ModelsDSTU2Mocks.createCondition() }, .condition),
 
             // Diagnostic cases
-            ({ try ModelsDSTU2Mocks.createDiagnosticReport(date: self.testDate) }, .diagnostic),
-            ({ try ModelsDSTU2Mocks.createDiagnosticOrder(date: self.testDate) }, .diagnostic),
+            ({ try ModelsDSTU2Mocks.createDiagnosticReport() }, .diagnostic),
+            ({ ModelsDSTU2Mocks.createDiagnosticOrder() }, .diagnostic),
 
             // Procedure cases
-            ({ try ModelsDSTU2Mocks.createProcedure(date: self.testDate) }, .procedure),
+            ({ try ModelsDSTU2Mocks.createProcedure() }, .procedure),
             ({ ModelsDSTU2Mocks.createProcedureRequest() }, .procedure),
 
             // Immunization cases
-            ({ try ModelsDSTU2Mocks.createImmunization(date: self.testDate) }, .immunization),
+            ({ ModelsDSTU2Mocks.createImmunization() }, .immunization),
             ({ ModelsDSTU2Mocks.createImmunizationRecommendation() }, .immunization),
 
             // Medication cases
             ({ ModelsDSTU2Mocks.createMedication() }, .medication),
-            ({ try ModelsDSTU2Mocks.createMedicationOrder(date: self.testDate) }, .medication),
-            ({ try ModelsDSTU2Mocks.createMedicationAdministration(date: self.testDate) }, .medication),
+            ({ try ModelsDSTU2Mocks.createMedicationOrder() }, .medication),
+            ({ try ModelsDSTU2Mocks.createMedicationAdministration() }, .medication),
             ({ ModelsDSTU2Mocks.createMedicationDispense() }, .medication),
-            ({ try ModelsDSTU2Mocks.createMedicationStatement(date: self.testDate) }, .medication)
+            ({ try ModelsDSTU2Mocks.createMedicationStatement() }, .medication)
         ]
 
         try testCases.forEach { creator, expectedCategory in