Switch Bios

PAWS.xcodeproj/project.pbxproj

@@ -75,6 +75,8 @@
 		A9DFE8A92ABE551400428242 /* AccountButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9DFE8A82ABE551400428242 /* AccountButton.swift */; };
 		A9FE7AD02AA39BAB0077B045 /* AccountSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9FE7ACF2AA39BAB0077B045 /* AccountSheet.swift */; };
 		B28A0DDC2BA4AEDE0068258D /* Date+Bool.swift in Sources */ = {isa = PBXBuildFile; fileRef = B28A0DDB2BA4AEDE0068258D /* Date+Bool.swift */; };
+		B2CF6EC12BC63CEB00F85C61 /* StudyType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2CF6EC02BC63CEB00F85C61 /* StudyType.swift */; };
+		B2CF6EC42BC63D9B00F85C61 /* EnrollmentGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2CF6EC32BC63D9B00F85C61 /* EnrollmentGroup.swift */; };
 		B2DB1AD32BB4BCB100B0F49B /* AccountCreationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2DB1AD22BB4BCB100B0F49B /* AccountCreationTests.swift */; };
 		B2F7F1DC2BA53F6400BE93BE /* InvitationCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2F7F1DB2BA53F6400BE93BE /* InvitationCodeView.swift */; };
 		B2F7F1DF2BA540BB00BE93BE /* FirebaseFunctions in Frameworks */ = {isa = PBXBuildFile; productRef = B2F7F1DE2BA540BB00BE93BE /* FirebaseFunctions */; };
@@ -149,6 +151,8 @@
 		A9DFE8A82ABE551400428242 /* AccountButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountButton.swift; sourceTree = "<group>"; };
 		A9FE7ACF2AA39BAB0077B045 /* AccountSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSheet.swift; sourceTree = "<group>"; };
 		B28A0DDB2BA4AEDE0068258D /* Date+Bool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Bool.swift"; sourceTree = "<group>"; };
+		B2CF6EC02BC63CEB00F85C61 /* StudyType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudyType.swift; sourceTree = "<group>"; };
+		B2CF6EC32BC63D9B00F85C61 /* EnrollmentGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnrollmentGroup.swift; sourceTree = "<group>"; };
 		B2DB1AD22BB4BCB100B0F49B /* AccountCreationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountCreationTests.swift; sourceTree = "<group>"; };
 		B2F7F1DB2BA53F6400BE93BE /* InvitationCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitationCodeView.swift; sourceTree = "<group>"; };
 		B2F7F1E12BA549A900BE93BE /* InvitationCodeError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitationCodeError.swift; sourceTree = "<group>"; };
@@ -304,6 +308,8 @@
 				2FFD22FB2B59AED8005DD268 /* FAQ.swift */,
 				2FFD22FE2B59B158005DD268 /* StudyDescription.swift */,
 				2FFD23012B59B22C005DD268 /* StudyInformation.swift */,
+				B2CF6EC02BC63CEB00F85C61 /* StudyType.swift */,
+				B2CF6EC32BC63D9B00F85C61 /* EnrollmentGroup.swift */,
 			);
 			path = "Study Information";
 			sourceTree = "<group>";
@@ -588,6 +594,7 @@
 				2FE5DC3529EDD7CA004B9AB4 /* Consent.swift in Sources */,
 				2FE5DC4529EDD7F2004B9AB4 /* Binding+Negate.swift in Sources */,
 				2FFD23022B59B22C005DD268 /* StudyInformation.swift in Sources */,
+				B2CF6EC12BC63CEB00F85C61 /* StudyType.swift in Sources */,
 				2FCC1DBE2B6A1C9000C686BE /* ECGRecordingsList.swift in Sources */,
 				2FCC1DCB2B6A2B2700C686BE /* Date+RawRepresentable.swift in Sources */,
 				2FCC1DC12B6A1D4C00C686BE /* ECGModule.swift in Sources */,
@@ -596,6 +603,7 @@
 				2FE5DC3729EDD7CA004B9AB4 /* OnboardingFlow.swift in Sources */,
 				B28A0DDC2BA4AEDE0068258D /* Date+Bool.swift in Sources */,
 				2FF53D8D2A8729D600042B76 /* PAWSStandard.swift in Sources */,
+				B2CF6EC42BC63D9B00F85C61 /* EnrollmentGroup.swift in Sources */,
 				2FE5DC4729EDD7F2004B9AB4 /* CodableArray+RawRepresentable.swift in Sources */,
 				A9720E432ABB68CC00872D23 /* AccountSetupHeader.swift in Sources */,
 				2FE5DC4029EDD7EE004B9AB4 /* FeatureFlags.swift in Sources */,

PAWS/Contacts/Contacts.swift

@@ -13,6 +13,7 @@ import SwiftUI
 
 /// Displays the contacts for the PAWS.
 struct Contacts: View {
+    @Environment(EnrollmentGroup.self) var enrollmentGroup
     let contacts = [
         Contact(
             name: PersonNameComponents(
@@ -39,7 +40,7 @@ struct Contacts: View {
                     title: "Website",
                     action: {
                         if let url = URL(string: "https://profiles.stanford.edu/scott-ceresnak?tab=bio") {
-                           UIApplication.shared.open(url)
+                            UIApplication.shared.open(url)
                         }
                     }
                 )
@@ -70,27 +71,41 @@ struct Contacts: View {
                     title: "Website",
                     action: {
                         if let url = URL(string: "https://profiles.stanford.edu/aydin-zahedivash?tab=bio") {
-                           UIApplication.shared.open(url)
+                            UIApplication.shared.open(url)
                         }
                     }
                 )
             ]
         )
     ]
 
+
     @Binding var presentingAccount: Bool
 
 
     var body: some View {
         NavigationStack {
             ScrollView {
                 VStack(spacing: 16) {
-                    ForEach(contacts, id: \.name) { contact in
-                        PAWSCard {
-                            ContactView(contact: contact)
-                                .buttonStyle(.plain) // ensure the whole list row doesn't render as a button
-                                .padding()
+                    switch enrollmentGroup.studyType {
+                    case .pediatric:
+                        ForEach(contacts, id: \.name) { contact in
+                            PAWSCard {
+                                ContactView(contact: contact)
+                                    .buttonStyle(.plain) // ensure the whole list row doesn't render as a button
+                                    .padding()
+                            }
+                        }
+                    case .adult:
+                        ForEach(contacts + [Contact(name: PersonNameComponents(givenName: "Brynne"))], id: \.name) { contact in
+                            PAWSCard {
+                                ContactView(contact: contact)
+                                    .buttonStyle(.plain)
+                                    .padding()
+                            }
                         }
+                    default:
+                        EmptyView()
                     }
                 }
                     .padding(.vertical)

PAWS/PAWSDelegate.swift

@@ -53,6 +53,7 @@ class PAWSDelegate: SpeziAppDelegate {
 
             PAWSScheduler()
             OnboardingDataSource()
+            EnrollmentGroup()
         }
     }
 

PAWS/Study Information/EnrollmentGroup.swift

@@ -0,0 +1,54 @@
+//
+// This source file is part of the PAWS application based on the Stanford Spezi Template Application project
+//
+// SPDX-FileCopyrightText: 2023 Stanford University
+//
+// SPDX-License-Identifier: MIT
+//
+
+import FirebaseAuth
+import FirebaseFirestore
+import Spezi
+import SpeziAccount
+import SpeziFirebaseConfiguration
+import SwiftUI
+
+
+@Observable
+class EnrollmentGroup: Module, EnvironmentAccessible {
+    @ObservationIgnored @Dependency private var configureFirebaseApp: ConfigureFirebaseApp
+    private var dateOfBirth: Date?
+    private var authStateDidChangeListenerHandle: AuthStateDidChangeListenerHandle?
+
+    var studyType: StudyType? {
+        guard let enrollmentDate = Auth.auth().currentUser?.metadata.creationDate,
+              let dateOfBirth,
+              let yearsOfAge = Calendar.current.dateComponents([.year], from: dateOfBirth, to: enrollmentDate).year else {
+            return nil
+        }
+        return yearsOfAge >= 18 ? .adult : .pediatric
+    }
+
+    func configure() {
+        authStateDidChangeListenerHandle = Auth.auth().addStateDidChangeListener { [weak self] _, user in
+            self?.registerSnapshotListener(user: user)
+        }
+        self.registerSnapshotListener(user: Auth.auth().currentUser)
+    }
+
+    func registerSnapshotListener(user: User?) {
+        guard let uid = user?.uid else {
+            return
+        }
+        Firestore
+            .firestore()
+            .collection("users")
+            .document(uid)
+            .addSnapshotListener { documentSnapshot, _ in
+                if let data = documentSnapshot?.data() {
+                    let dobTimestamp = data["DateOfBirthKey"] as? Timestamp
+                    self.dateOfBirth = dobTimestamp?.dateValue()
+                }
+            }
+    }
+}

PAWS/Study Information/StudyType.swift

@@ -0,0 +1,13 @@
+//
+// This source file is part of the PAWS application based on the Stanford Spezi Template Application project
+//
+// SPDX-FileCopyrightText: 2023 Stanford University
+//
+// SPDX-License-Identifier: MIT
+//
+
+
+enum StudyType {
+    case adult
+    case pediatric
+}

PAWSUITests/AccountCreationTests.swift

@@ -28,6 +28,7 @@ final class AccountCreationTests: XCTestCase {
         try app.navigateOnboardingFlow(email: email)
 
         app.assertOnboardingComplete()
+        app.assertStudyGroupAdult()
         try app.assertAccountInformation(email: email)
     }
 }
@@ -74,6 +75,8 @@ extension XCUIApplication {
         try textFields["Invitation Code"].enter(value: "gdxRWF6G")
         XCTAssertTrue(buttons["Redeem Invitation Code"].waitForExistence(timeout: 2))
         buttons["Redeem Invitation Code"].tap()
+
+        sleep(10)
     }
 
     private func navigateOnboardingAccount(email: String) throws {
@@ -91,9 +94,14 @@ extension XCUIApplication {
         try textFields["enter first name"].enter(value: "John")
         try textFields["enter last name"].enter(value: "Doe")
         let datePicker = datePickers.firstMatch
+        XCTAssertTrue(datePicker.waitForExistence(timeout: 2))
         datePicker.tap()
-        datePicker.buttons.firstMatch.tap()
-        datePicker.pickerWheels.element(boundBy: 1).adjust(toPickerWheelValue: "1970")
+        let dateButton = datePicker.buttons.firstMatch
+        XCTAssertTrue(dateButton.waitForExistence(timeout: 2))
+        dateButton.tap()
+        let dateWheel = datePicker.pickerWheels.element(boundBy: 1)
+        XCTAssertTrue(dateWheel.waitForExistence(timeout: 2))
+        dateWheel.adjust(toPickerWheelValue: "1970")
 
         XCTAssertTrue(collectionViews.buttons["Signup"].waitForExistence(timeout: 2))
         collectionViews.buttons["Signup"].tap()
@@ -160,6 +168,13 @@ extension XCUIApplication {
         XCTAssertTrue(tabBar.buttons["Infos"].waitForExistence(timeout: 2))
         XCTAssertTrue(tabBar.buttons["Contacts"].waitForExistence(timeout: 2))
     }
+
+    fileprivate func assertStudyGroupAdult() {
+        let tabBar = tabBars["Tab Bar"]
+        XCTAssertTrue(tabBar.buttons["Contacts"].waitForExistence(timeout: 2))
+        tabBar.buttons["Contacts"].tap()
+        XCTAssertTrue(staticTexts["Contact: Brynne"].waitForExistence(timeout: 10))
+    }
 
     fileprivate func assertAccountInformation(email: String) throws {
         XCTAssertTrue(navigationBars.buttons["Your PAWS Account"].waitForExistence(timeout: 2))