Skip to content

Feat: build 18 #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
destucr merged 7 commits into from
Dec 1, 2025
Merged

Feat: build 18 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7927732
feat: loading screens when syncing to firebase
benedictusyoga Dec 1, 2025
17d97d9
Merge remote-tracking branch 'refs/remotes/origin/development'
benedictusyoga Dec 1, 2025
7ed0ee2
fix: delete logic for mom and dad
benedictusyoga Dec 1, 2025
f079e52
Merge remote-tracking branch 'refs/remotes/origin/development'
benedictusyoga Dec 1, 2025
892e9b5
feat: delete account loading
benedictusyoga Dec 1, 2025
ae2e58e
Merge remote-tracking branch 'refs/remotes/origin/development'
benedictusyoga Dec 1, 2025
828286f
fix: swiftlint ignore
destucr Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion Tiny/Core/Services/Audio/HeartbeatSoundManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,15 @@ enum HeartbeatFilterMode {
class HeartbeatSoundManager: NSObject, ObservableObject {
var currentUserRole: UserRole? // Add this after currentRoomCode

var syncManager: HeartbeatSyncManager?
var syncManager: HeartbeatSyncManager? {
didSet {
cancellables.removeAll()
syncManager?.$isSyncing
.receive(on: DispatchQueue.main)
.assign(to: \.isSyncing, on: self)
.store(in: &cancellables)
}
}
var currentUserId: String?
var currentRoomCode: String?

Expand All @@ -84,6 +92,7 @@ class HeartbeatSoundManager: NSObject, ObservableObject {
@Published var isPlaying = false
@Published var isRunning = false
@Published var isRecording = false
@Published var isSyncing = false
@Published var lastRecording: Recording?
@Published var savedRecordings: [Recording] = []
@Published var savedMoments: [Moment] = []
Expand All @@ -106,6 +115,7 @@ class HeartbeatSoundManager: NSObject, ObservableObject {

private let heartbeatDetector = HeartbeatDetector()
private var syncTimer: Timer?
private var cancellables = Set<AnyCancellable>()

override init() {
super.init()
Expand All @@ -131,6 +141,12 @@ class HeartbeatSoundManager: NSObject, ObservableObject {
// Stop any existing timer
syncTimer?.invalidate()

print("🔍 Checking periodic sync requirements:")
print(" - Role: \(currentUserRole?.rawValue ?? "nil")")
print(" - Room Code: \(currentRoomCode ?? "nil")")
print(" - SyncManager: \(syncManager == nil ? "nil" : "present")")
print(" - ModelContext: \(modelContext == nil ? "nil" : "present")")

// Only start periodic sync for fathers (moms upload directly)
guard currentUserRole == .father,
let roomCode = currentRoomCode,
Expand Down
225 changes: 145 additions & 80 deletions Tiny/Core/Services/Authentication/AuthenticationService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ import AuthenticationServices
import CryptoKit
internal import Combine

// swiftlint:disable type_body_length
@MainActor
class AuthenticationService: ObservableObject {
@Published var currentUser: User?
@Published var isAuthenticated = false
@Published var isLoading = false
@Published var partnerPregnancyWeeks: Int?

private let auth = Auth.auth()
private let database = Firestore.firestore()
Expand All @@ -34,6 +37,9 @@ class AuthenticationService: ObservableObject {
}

func signInWithApple(authorization: ASAuthorization) async throws {
isLoading = true
defer { isLoading = false }

guard let appleIDCredential = authorization.credential as? ASAuthorizationAppleIDCredential else {
throw NSError(domain: "AuthError", code: -1, userInfo: [NSLocalizedDescriptionKey: "Invalid Credentials"])
}
Expand Down Expand Up @@ -92,6 +98,9 @@ class AuthenticationService: ObservableObject {
}

func updateUserRole(role: UserRole, pregnancyWeeks: Int? = nil, roomCode: String? = nil) async throws {
isLoading = true
defer { isLoading = false }

guard let userId = auth.currentUser?.uid else {
return
}
Expand All @@ -111,6 +120,9 @@ class AuthenticationService: ObservableObject {
}

func updateUserName(name: String) async throws {
isLoading = true
defer { isLoading = false }

guard let userId = auth.currentUser?.uid else {
return
}
Expand All @@ -120,6 +132,9 @@ class AuthenticationService: ObservableObject {
}

func createRoom() async throws -> String {
isLoading = true
defer { isLoading = false }

guard let userId = auth.currentUser?.uid,
currentUser?.role == .mother else {
throw NSError(domain: "AuthError", code: -1, userInfo: [NSLocalizedDescriptionKey: "Only mothers can create rooms!"])
Expand Down Expand Up @@ -147,8 +162,11 @@ class AuthenticationService: ObservableObject {
currentUser = nil
isAuthenticated = false
}

// swiftlint:disable cyclomatic_complexity
func deleteAccount() async throws {
isLoading = true
defer { isLoading = false }

guard let user = auth.currentUser else {
throw NSError(domain: "AuthError", code: -1, userInfo: [NSLocalizedDescriptionKey: "No user is currently signed in"])
}
Expand All @@ -158,94 +176,99 @@ class AuthenticationService: ObservableObject {
do {
print("🗑️ Starting account deletion for user: \(userId)")

// 1. Delete all heartbeat recordings from Firestore and Storage
print("🗑️ Deleting heartbeat recordings...")

// Query by motherUserId (the field used in your schema)
var heartbeatsSnapshot = try await database.collection("heartbeats")
.whereField("motherUserId", isEqualTo: userId)
.getDocuments()

print(" Found \(heartbeatsSnapshot.documents.count) heartbeats by motherUserId")

// Also check for any heartbeats with userId field (legacy/fallback)
let legacyHeartbeats = try await database.collection("heartbeats")
.whereField("userId", isEqualTo: userId)
.getDocuments()

if !legacyHeartbeats.documents.isEmpty {
print(" Found \(legacyHeartbeats.documents.count) heartbeats by userId (legacy)")
}

// Combine both results
var allHeartbeatDocs = heartbeatsSnapshot.documents
allHeartbeatDocs.append(contentsOf: legacyHeartbeats.documents)

for document in allHeartbeatDocs {
let data = document.data()
// Only delete shared data (heartbeats/moments) if user is NOT a father
if currentUser?.role != .father {
// 1. Delete all heartbeat recordings from Firestore and Storage
print("🗑️ Deleting heartbeat recordings...")

// Query by motherUserId (the field used in your schema)
var heartbeatsSnapshot = try await database.collection("heartbeats")
.whereField("motherUserId", isEqualTo: userId)
.getDocuments()

print(" Found \(heartbeatsSnapshot.documents.count) heartbeats by motherUserId")

// Delete from Firebase Storage if audioURL exists
if let audioURL = data["firebaseStorageURL"] as? String, !audioURL.isEmpty {
do {
let storageRef = Storage.storage().reference(forURL: audioURL)
try await storageRef.delete()
print(" ✅ Deleted audio file from Storage: \(document.documentID)")
} catch {
print(" ⚠️ Failed to delete audio file \(document.documentID): \(error.localizedDescription)")
// Also check for any heartbeats with userId field (legacy/fallback)
let legacyHeartbeats = try await database.collection("heartbeats")
.whereField("userId", isEqualTo: userId)
.getDocuments()

if !legacyHeartbeats.documents.isEmpty {
print(" Found \(legacyHeartbeats.documents.count) heartbeats by userId (legacy)")
}

// Combine both results
var allHeartbeatDocs = heartbeatsSnapshot.documents
allHeartbeatDocs.append(contentsOf: legacyHeartbeats.documents)

for document in allHeartbeatDocs {
let data = document.data()

// Delete from Firebase Storage if audioURL exists
if let audioURL = data["firebaseStorageURL"] as? String, !audioURL.isEmpty {
do {
let storageRef = Storage.storage().reference(forURL: audioURL)
try await storageRef.delete()
print(" ✅ Deleted audio file from Storage: \(document.documentID)")
} catch {
print(" ⚠️ Failed to delete audio file \(document.documentID): \(error.localizedDescription)")
}
}

// Delete from Firestore
try await database.collection("heartbeats").document(document.documentID).delete()
print(" ✅ Deleted heartbeat document: \(document.documentID)")
}

// Delete from Firestore
try await database.collection("heartbeats").document(document.documentID).delete()
print(" ✅ Deleted heartbeat document: \(document.documentID)")
}

print("🗑️ Deleted \(allHeartbeatDocs.count) heartbeat recordings")

// 2. Delete all moments from Firestore and Storage
print("🗑️ Deleting moments...")

// Query by motherUserId (the field used in your schema)
var momentsSnapshot = try await database.collection("moments")
.whereField("motherUserId", isEqualTo: userId)
.getDocuments()

print(" Found \(momentsSnapshot.documents.count) moments by motherUserId")

// Also check for any moments with userId field (legacy/fallback)
let legacyMoments = try await database.collection("moments")
.whereField("userId", isEqualTo: userId)
.getDocuments()

if !legacyMoments.documents.isEmpty {
print(" Found \(legacyMoments.documents.count) moments by userId (legacy)")
}

// Combine both results
var allMomentDocs = momentsSnapshot.documents
allMomentDocs.append(contentsOf: legacyMoments.documents)

for document in allMomentDocs {
let data = document.data()
print("🗑️ Deleted \(allHeartbeatDocs.count) heartbeat recordings")

// 2. Delete all moments from Firestore and Storage
print("🗑️ Deleting moments...")

// Query by motherUserId (the field used in your schema)
var momentsSnapshot = try await database.collection("moments")
.whereField("motherUserId", isEqualTo: userId)
.getDocuments()

print(" Found \(momentsSnapshot.documents.count) moments by motherUserId")

// Also check for any moments with userId field (legacy/fallback)
let legacyMoments = try await database.collection("moments")
.whereField("userId", isEqualTo: userId)
.getDocuments()

if !legacyMoments.documents.isEmpty {
print(" Found \(legacyMoments.documents.count) moments by userId (legacy)")
}

// Combine both results
var allMomentDocs = momentsSnapshot.documents
allMomentDocs.append(contentsOf: legacyMoments.documents)

// Delete from Firebase Storage if imageURL exists
if let imageURL = data["firebaseStorageURL"] as? String, !imageURL.isEmpty {
do {
let storageRef = Storage.storage().reference(forURL: imageURL)
try await storageRef.delete()
print(" ✅ Deleted moment image from Storage: \(document.documentID)")
} catch {
print(" ⚠️ Failed to delete moment image \(document.documentID): \(error.localizedDescription)")
for document in allMomentDocs {
let data = document.data()

// Delete from Firebase Storage if imageURL exists
if let imageURL = data["firebaseStorageURL"] as? String, !imageURL.isEmpty {
do {
let storageRef = Storage.storage().reference(forURL: imageURL)
try await storageRef.delete()
print(" ✅ Deleted moment image from Storage: \(document.documentID)")
} catch {
print(" ⚠️ Failed to delete moment image \(document.documentID): \(error.localizedDescription)")
}
}

// Delete from Firestore
try await database.collection("moments").document(document.documentID).delete()
print(" ✅ Deleted moment document: \(document.documentID)")
}

// Delete from Firestore
try await database.collection("moments").document(document.documentID).delete()
print(" ✅ Deleted moment document: \(document.documentID)")
print("🗑️ Deleted \(allMomentDocs.count) moments")
} else {
print("ℹ️ User is father, skipping deletion of shared heartbeats and moments")
}

print("🗑️ Deleted \(allMomentDocs.count) moments")

// 3. Handle room cleanup
if let roomCode = currentUser?.roomCode {
print("🗑️ Cleaning up room: \(roomCode)")
Expand Down Expand Up @@ -303,7 +326,8 @@ class AuthenticationService: ObservableObject {
throw error
}
}

// swiftlint:enable cyclomatic_complexity

private func fetchUserData(userId: String) {
database.collection("users").document(userId).addSnapshotListener { [weak self] snapshot, error in
guard let snapshot = snapshot, snapshot.exists, let data = snapshot.data() else {
Expand All @@ -323,6 +347,43 @@ class AuthenticationService: ObservableObject {
)

self?.currentUser = user

// If user is a father, fetch the mother's pregnancy weeks via the room
if user.role == .father, let roomCode = user.roomCode {
self?.fetchPartnerPregnancyWeeks(roomCode: roomCode)
}
}
}

private func fetchPartnerPregnancyWeeks(roomCode: String) {
Task {
do {
// 1. Find the room
let roomSnapshot = try await database.collection("rooms")
.whereField("code", isEqualTo: roomCode)
.limit(to: 1)
.getDocuments()

guard let roomDoc = roomSnapshot.documents.first else { return }
let roomData = roomDoc.data()

// 2. Get mother's ID
guard let motherUserId = roomData["motherUserId"] as? String else { return }

// 3. Fetch mother's user doc
let motherDoc = try await database.collection("users").document(motherUserId).getDocument()
guard let motherData = motherDoc.data() else { return }

// 4. Get pregnancy weeks
if let weeks = motherData["pregnancyWeeks"] as? Int {
await MainActor.run {
self.partnerPregnancyWeeks = weeks
print("✅ Fetched partner's pregnancy weeks: \(weeks)")
}
}
} catch {
print("❌ Error fetching partner pregnancy weeks: \(error)")
}
}
}

Expand Down Expand Up @@ -357,6 +418,9 @@ class AuthenticationService: ObservableObject {
}

func joinRoom(roomCode: String) async throws {
isLoading = true
defer { isLoading = false }

guard let userId = auth.currentUser?.uid else {
throw NSError(domain: "AuthError", code: -1, userInfo: [NSLocalizedDescriptionKey: "User not authenticated"])
}
Expand Down Expand Up @@ -391,3 +455,4 @@ class AuthenticationService: ObservableObject {
}

}
// swiftlint:enable type_body_length
Loading