Added symptoms survey, data type, and symptom manager; warnings for severe symptoms (#37)

viraj28m · web-flow · commit 13f807c27e3b · 2025-03-11T23:54:19.000-07:00
# Added symptoms survey, data type, and symptom manager; warnings for severe symptoms ## ♻️ Current situation & Problem *Per discussion with the TUM team, an ideal early warning system for febrile neutropenia would also take into account self-reported patient symptoms for signs of impending infection, including nausea, vomiting, diarrhea, chills, cough, and pain. ## ⚙️ Release Notes *Added tab to add symptom information *Added view for symptom checker for nausea, vomiting, diarrhea, chills, cough, and pain. If one of these symptoms is selected, a pain rating scale will appear. *Created new SymptomManager class to add and save symptom entries to SpeziLocalStorage and Firestore *Generate a warning for any symptoms rated between 4-6 for moderate severity and any symptoms rated 7+ for high severity notifying patient to contact their provider ## 📚 Documentation *Please ensure that you properly document any additions in conformance to [Spezi Documentation Guide](https://github.com/StanfordSpezi/.github/blob/main/DOCUMENTATIONGUIDE.md).* *You can use this section to describe your solution, but we encourage contributors to document your reasoning and changes using in-line documentation.* ## ✅ Testing *Added tests to ensure data errors are successfully triggered for invalid types *Added UI tests for addSymptoms view ## 📝 Code of Conduct & Contributing Guidelines By submitting creating this pull request, you agree to follow our [Code of Conduct](https://github.com/CS342/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/CS342/.github/blob/main/CONTRIBUTING.md): - [x] I agree to follow the [Code of Conduct](https://github.com/CS342/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/CS342/.github/blob/main/CONTRIBUTING.md).
diff --git a/NeutroFeverGuard.xcodeproj/project.pbxproj b/NeutroFeverGuard.xcodeproj/project.pbxproj
@@ -96,6 +96,7 @@
 		C4C8A3B32D71204200F313AE /* HelperFuncTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4C8A3B22D71204200F313AE /* HelperFuncTests.swift */; };
 		EB02C6612D5D52E90035AA89 /* NeutroFeverGuardTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 653A256128338800005D4D48 /* NeutroFeverGuardTests.swift */; };
 		F223937A2D5D4095006C8EB4 /* DataError.swift in Sources */ = {isa = PBXBuildFile; fileRef = F22393792D5D4092006C8EB4 /* DataError.swift */; };
+		F268C4562D7F928C0020026F /* SymptomManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F268C4552D7F928B0020026F /* SymptomManager.swift */; };
 		F279F70C2D780462005C2927 /* FirebaseCore in Frameworks */ = {isa = PBXBuildFile; productRef = F2A54D362D5DE24400A20113 /* FirebaseCore */; };
 		F279F70D2D780462005C2927 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = F2A54D382D5DE24E00A20113 /* FirebaseFirestore */; };
 		F2E6898F2D52ED8600869C4F /* HealthKitService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2E6898E2D52ED8500869C4F /* HealthKitService.swift */; };
@@ -178,6 +179,7 @@
 		C4C8A3672D6F9E1A00F313AE /* LabViewUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabViewUITests.swift; sourceTree = "<group>"; };
 		C4C8A3B22D71204200F313AE /* HelperFuncTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelperFuncTests.swift; sourceTree = "<group>"; };
 		F22393792D5D4092006C8EB4 /* DataError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataError.swift; sourceTree = "<group>"; };
+		F268C4552D7F928B0020026F /* SymptomManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymptomManager.swift; sourceTree = "<group>"; };
 		F2E6898E2D52ED8500869C4F /* HealthKitService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HealthKitService.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -344,6 +346,7 @@
 			children = (
 				B00991CB2D7FD86F00D9CBD5 /* BluetoothRelated */,
 				B0DF8DFB2D7C114900581A00 /* HealthDataFetchable.swift */,
+				F268C4552D7F928B0020026F /* SymptomManager.swift */,
 				B0FF4DD12D797FEA0076A043 /* NotificationManager.swift */,
 				B0D4C9372D790F5E000643C7 /* LabResultsManager.swift */,
 				C42C1C6A2D7A985B00EA417F /* MedicationManager.swift */,
@@ -639,6 +642,7 @@
 				C49EC8532D5038AC005C3495 /* DataInputForm.swift in Sources */,
 				2FE5DC4129EDD7EE004B9AB4 /* StorageKeys.swift in Sources */,
 				C42C1B312D782A7600EA417F /* MedicationView.swift in Sources */,
+				F268C4562D7F928C0020026F /* SymptomManager.swift in Sources */,
 				2FE5DCB129EE6107004B9AB4 /* AccountOnboarding.swift in Sources */,
 				2FE5DC3A29EDD7CA004B9AB4 /* Welcome.swift in Sources */,
 				2FE5DC3829EDD7CA004B9AB4 /* InterestingModules.swift in Sources */,
diff --git a/NeutroFeverGuard/AddDataView.swift b/NeutroFeverGuard/AddDataView.swift
@@ -16,6 +16,8 @@ struct DataTypeItem: Identifiable {
 
 struct AddDataView: View {
     @State private var selectedDataType: DataTypeItem?
+    @State private var showWarningAlert = false
+    @State private var warningMessage = ""
     
     @Environment(Account.self) private var account: Account?
     @Binding var presentingAccount: Bool
@@ -26,13 +28,16 @@ struct AddDataView: View {
         (name: "Oxygen Saturation", emoji: "🫁"),
         (name: "Blood Pressure", emoji: "🩸"),
         (name: "Lab Results", emoji: "🧪"),
-        (name: "Medication", emoji: "💊")
+        (name: "Medication", emoji: "💊"),
+        (name: "Symptoms", emoji: "😷")
     ]
     
     let columns = [GridItem(.flexible()), GridItem(.flexible())]
 
     var body: some View {
+        // swiftlint:disable closure_body_length
         NavigationStack {
+            // swiftlint:disable closure_body_length
             ZStack {
                 Color(.systemBackground).ignoresSafeArea()
                 VStack {
@@ -60,9 +65,22 @@ struct AddDataView: View {
                     .padding()
                 }
                 .sheet(item: $selectedDataType) { item in
-                    DataInputForm(dataType: item.name)
+                    DataInputForm(dataType: item.name) { warning in
+                        warningMessage = warning
+                        showWarningAlert = true
+                    }
+                }
+                .alert("Warning", isPresented: $showWarningAlert) {
+                    Button("Acknowledge") {
+                        showWarningAlert = false
+                    }
+                } message: {
+                    Text(warningMessage)
                 }
-                .toolbar {if account != nil {AccountButton(isPresented: $presentingAccount)}
+                .toolbar {
+                    if account != nil {
+                        AccountButton(isPresented: $presentingAccount)
+                    }
                 }
             }
         }
diff --git a/NeutroFeverGuard/DataError.swift b/NeutroFeverGuard/DataError.swift
@@ -10,6 +10,7 @@ enum DataError: Error, Equatable {
     case invalidDate
     case invalidPercentage
     case invalidBloodPressure
+    case invalidSeverity
     
     var errorMessage: String {
         switch self {
@@ -19,6 +20,8 @@ enum DataError: Error, Equatable {
             return "percentage must be between 0 and 100"
         case .invalidBloodPressure:
             return "blood pressure must be greater than 0"
+        case .invalidSeverity:
+            return "Severity must be between 1 and 10"
         }
     }
 }
diff --git a/NeutroFeverGuard/DataInputForm.swift b/NeutroFeverGuard/DataInputForm.swift
@@ -6,6 +6,7 @@
 // SPDX-License-Identifier: MIT
 //
 
+// swiftlint:disable file_length
 import SpeziLocalStorage
 import SpeziViews
 import SwiftUI
@@ -141,11 +142,59 @@ struct BloodPressureForm: View {
     }
 }
 
+struct SymptomForm: View {
+    @Binding var selectedSymptoms: Set<Symptom>
+    @Binding var symptomSeverity: [Symptom: String]
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            Text("Are you experiencing any of:")
+                .font(.headline)
+                .padding(.bottom, 4)
+            
+            ForEach(Symptom.allCases, id: \.self) { symptom in
+                VStack(alignment: .leading, spacing: 4) {
+                    Toggle(symptom.rawValue, isOn: Binding(
+                        get: { selectedSymptoms.contains(symptom) },
+                        set: { isSelected in
+                            if isSelected {
+                                selectedSymptoms.insert(symptom)
+                            } else {
+                                selectedSymptoms.remove(symptom)
+                                symptomSeverity.removeValue(forKey: symptom)
+                            }
+                        }
+                    ))
+                    
+                    if selectedSymptoms.contains(symptom) {
+                        HStack {
+                            Text("Rate your \(symptom.rawValue.lowercased()) (1-10):")
+                            TextField("1-10", text: Binding(
+                                get: { symptomSeverity[symptom] ?? "" },
+                                set: { symptomSeverity[symptom] = $0 }
+                            ))
+                            .keyboardType(.numberPad)
+                            .textFieldStyle(RoundedBorderTextFieldStyle())
+                            .frame(width: 80)
+                            .accessibilityIdentifier("severity-\(symptom.rawValue)")
+                        }
+                        .padding(.leading, 8)
+                    }
+                }
+                .padding(.vertical, 2)
+            }
+        }
+        .padding(8)
+    }
+}
+
+// swiftlint:disable type_body_length
 struct DataInputForm: View {
     let dataType: String
     @Environment(LabResultsManager.self) var labResultsManager
     @Environment(MedicationManager.self) private var medicationManager
     @Environment(HealthKitService.self) var healthKitService
+    @Environment(SymptomManager.self) private var symptomManager
     
     @State private var date = Date()
     @State private var time = Date()
@@ -160,6 +209,12 @@ struct DataInputForm: View {
     @State private var alertMessage: String = ""
     @Environment(\.dismiss) var dismiss
     @Environment(NeutroFeverGuardScheduler.self) private var scheduler
+    @State private var selectedSymptoms: Set<Symptom> = []
+    @State private var symptomSeverity: [Symptom: String] = [:]
+    @State private var showWarningAlert = false
+    @State private var warningMessage = ""
+    
+    var onDismissWithWarning: ((String) -> Void)?
     
     var isFormValid: Bool {
         switch dataType {
@@ -177,6 +232,14 @@ struct DataInputForm: View {
             }
         case "Medication":
             return !medicationName.isEmpty && !doseValue.isEmpty
+        case "Symptoms":
+            return !selectedSymptoms.isEmpty && selectedSymptoms.allSatisfy { symptom in
+                guard let severityStr = symptomSeverity[symptom],
+                      let severity = Int(severityStr) else {
+                    return false
+                }
+                return severity >= 1 && severity <= 10
+            }
         default:
             return false
         }
@@ -200,6 +263,8 @@ struct DataInputForm: View {
                     LabResultsForm(labValues: $labValues)
                 } else if dataType == "Medication" {
                     MedicationForm( medicationName: $medicationName, doseValue: $doseValue, doseUnit: $doseUnit)
+                } else if dataType == "Symptoms" {
+                    SymptomForm(selectedSymptoms: $selectedSymptoms, symptomSeverity: $symptomSeverity)
                 }
             }
             .navigationTitle(dataType)
@@ -212,14 +277,24 @@ struct DataInputForm: View {
                     } catch { print("Error requesting HealthKit authorization: \(error)") }
                 }.disabled(!isFormValid)
             )
-            .alert(isPresented: .constant(!alertMessage.isEmpty)) {
-                Alert( title: Text("Error"), message: Text(alertMessage), dismissButton: .default(Text("OK")) { alertMessage = "" })
+        }
+        .alert("Error", isPresented: .constant(!alertMessage.isEmpty)) {
+            Button("OK") { alertMessage = "" }
+        } message: {
+            Text(alertMessage)
+        }
+        .alert("Warning", isPresented: $showWarningAlert) {
+            Button("Acknowledge") {
+                showWarningAlert = false
             }
+        } message: {
+            Text(warningMessage)
         }
     }
     
-    init(dataType: String) {
+    init(dataType: String, onDismissWithWarning: ((String) -> Void)? = nil) {
         self.dataType = dataType
+        self.onDismissWithWarning = onDismissWithWarning
     }
     
     func addData() async {
@@ -236,6 +311,8 @@ struct DataInputForm: View {
             await addLabResult()
         case "Medication":
             await addMedication()
+        case "Symptoms":
+            await addSymptoms()
         default:
             alertMessage = "Unknown data type"
         }
@@ -355,6 +432,65 @@ struct DataInputForm: View {
             alertMessage = "Error: \(error)"
         }
     }
+
+    private func generateWarningMessage(from symptoms: [Symptom: Int]) -> String {
+        var warnings: [String] = []
+        
+        for (symptom, severity) in symptoms {
+            if severity >= 7 {
+                warnings.append("severe \(symptom.rawValue.lowercased())")
+            } else if severity >= 4 {
+                warnings.append("moderately severe \(symptom.rawValue.lowercased())")
+            }
+        }
+        
+        if warnings.isEmpty {
+            return ""
+        }
+        
+        let prefix = "You should see your provider for "
+        
+        if warnings.count == 1 {
+            return prefix + warnings[0]
+        } else if warnings.count == 2 {
+            return prefix + warnings.joined(separator: " and ")
+        } else {
+            // For 3 or more items, join all but the last with commas, then add "and" before the last
+            // swiftlint:disable force_unwrapping
+            let lastWarning = warnings.last!
+            let allButLast = warnings.dropLast()
+            return prefix + allButLast.joined(separator: ", ") + ", and " + lastWarning
+        }
+    }
+    
+    func addSymptoms() async {
+        var symptoms: [Symptom: Int] = [:]
+        
+        for symptom in selectedSymptoms {
+            if let severityStr = symptomSeverity[symptom],
+               let severity = Int(severityStr) {
+                symptoms[symptom] = severity
+            }
+        }
+        
+        do {
+            let symptomEntry = try SymptomEntry(
+                date: combineDateAndTime(date, time),
+                symptoms: symptoms
+            )
+            symptomManager.addSymptomEntry(symptomEntry)
+            
+            // Generate warning message if needed
+            let warning = generateWarningMessage(from: symptoms)
+            dismiss()
+            
+            if !warning.isEmpty {
+                onDismissWithWarning?(warning)
+            }
+        } catch {
+            alertMessage = "Error: \(error)"
+        }
+    }
 }
 
 #Preview {
diff --git a/NeutroFeverGuard/DataType.swift b/NeutroFeverGuard/DataType.swift
@@ -175,3 +175,31 @@ struct MedicationEntry: Codable {
         self.doseUnit = doseUnit
     }
 }
+
+enum Symptom: String, CaseIterable, Codable {
+    case nausea = "Nausea"
+    case vomiting = "Vomiting"
+    case diarrhea = "Diarrhea"
+    case chills = "Chills"
+    case cough = "Cough"
+    case pain = "Pain"
+}
+
+struct SymptomEntry: Codable {
+    // periphery:ignore
+    var date: Date
+    // periphery:ignore
+    var symptoms: [Symptom: Int]  // Maps symptoms to their severity (1-10)
+    
+    init(date: Date, symptoms: [Symptom: Int]) throws {
+        try isValidDate(date)
+        // Validate that all severity ratings are between 1 and 10
+        for (_, severity) in symptoms {
+            guard severity >= 1 && severity <= 10 else {
+                throw DataError.invalidSeverity
+            }
+        }
+        self.date = date
+        self.symptoms = symptoms
+    }
+}
diff --git a/NeutroFeverGuard/LabResultsManager.swift b/NeutroFeverGuard/LabResultsManager.swift
@@ -96,10 +96,16 @@ class LabResultsManager: Module, EnvironmentAccessible {
             try localStorage.store(labRecords, for: LocalStorageKey<[LabEntry]>("labResults"))
             // Save to Firestore
             if !FeatureFlags.disableFirebase {
-                try firebaseConfig.userDocumentReference
-                    .collection("LabResults")
-                    .document(UUID().uuidString)
-                    .setData(from: labRecords)
+                let dateFormatter = DateFormatter()
+                dateFormatter.dateFormat = "yyyy-MM-dd"
+                
+                for lab in labRecords {
+                    let dateString = dateFormatter.string(from: lab.date)
+                    try firebaseConfig.userDocumentReference
+                        .collection("LabResults")
+                        .document(dateString)
+                        .setData(from: lab)
+                }
             }
             refresh()
         } catch {
diff --git a/NeutroFeverGuard/MedicationManager.swift b/NeutroFeverGuard/MedicationManager.swift
@@ -79,12 +79,15 @@ class MedicationManager: Module, EnvironmentAccessible {
         }
         do {
             try localStorage.store(medications, for: LocalStorageKey<[MedicationEntry]>("medications"))
+            print(medications)
             // Save to Firestore
             if !FeatureFlags.disableFirebase {
-                try firebaseConfig.userDocumentReference
-                    .collection("Medications")
-                    .document(UUID().uuidString)
-                    .setData(from: medications)
+                for medication in medications {
+                    try firebaseConfig.userDocumentReference
+                        .collection("Medications")
+                        .document(medication.name)
+                        .setData(from: medication)
+                }
             }
             refresh()
         } catch {
diff --git a/NeutroFeverGuard/NeutroFeverGuard.swift b/NeutroFeverGuard/NeutroFeverGuard.swift
@@ -11,7 +11,6 @@ import SpeziFirebaseAccount
 import SpeziViews
 import SwiftUI
 
-
 @main
 struct NeutroFeverGuard: App {
     @UIApplicationDelegateAdaptor(NeutroFeverGuardDelegate.self) var appDelegate
diff --git a/NeutroFeverGuard/NeutroFeverGuardDelegate.swift b/NeutroFeverGuard/NeutroFeverGuardDelegate.swift
@@ -60,6 +60,7 @@ class NeutroFeverGuardDelegate: SpeziAppDelegate {
             NotificationManager()
             LabResultsManager()
             MedicationManager()
+            SymptomManager()
             HealthKitService()
             NoMeasurementWarningState()
             Bluetooth {
diff --git a/NeutroFeverGuard/Resources/Localizable.xcstrings b/NeutroFeverGuard/Resources/Localizable.xcstrings
diff --git a/NeutroFeverGuard/SymptomManager.swift b/NeutroFeverGuard/SymptomManager.swift
diff --git a/NeutroFeverGuardTests/DataTypeTest.swift b/NeutroFeverGuardTests/DataTypeTest.swift
diff --git a/NeutroFeverGuardUITests/AddDataViewTests.swift b/NeutroFeverGuardUITests/AddDataViewTests.swift

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ enum DataError: Error, Equatable {`
`10`	`10`	`case invalidDate`
`11`	`11`	`case invalidPercentage`
`12`	`12`	`case invalidBloodPressure`
	`13`	`+ case invalidSeverity`
`13`	`14`
`14`	`15`	`var errorMessage: String {`
`15`	`16`	`switch self {`
`@@ -19,6 +20,8 @@ enum DataError: Error, Equatable {`
`19`	`20`	`return "percentage must be between 0 and 100"`
`20`	`21`	`case .invalidBloodPressure:`
`21`	`22`	`return "blood pressure must be greater than 0"`
	`23`	`+ case .invalidSeverity:`
	`24`	`+ return "Severity must be between 1 and 10"`
`22`	`25`	`}`
`23`	`26`	`}`
`24`	`27`	`}`