alexandrev/InvestmentTrackerApp
1
0
Fork 0
Code Issues 23 Pull Requests Packages Projects Releases Wiki Activity

Primera build enviada

Browse Source
This commit is contained in:
Alexandre
2026-01-19 14:40:43 +01:00
parent c6be398e5a
commit b03d35194f
36 changed files with 1641 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.DS_Store
Vendored
BIN
View File
Binary file not shown.
PortfolioJournal.xcodeproj/project.xcworkspace/xcuserdata/alexandrev.xcuserdatad/UserInterfaceState.xcuserstate
Generated
BIN
View File
Binary file not shown.
PortfolioJournal/.DS_Store
Vendored
BIN
View File
Binary file not shown.
PortfolioJournal/App/ContentView.swift
+28 -16
View File
@@ -60,15 +60,8 @@ struct ContentView: View {
isUnlocked = false
}
}
.onAppear {
if coreDataStack.isLoaded {
syncOnboardingState()
}
}
.onChange(of: coreDataStack.isLoaded) { _, loaded in
if loaded {
syncOnboardingState()
}
.task {
await waitForDataAndResolveOnboarding()
}
.onChange(of: onboardingCompleted) { _, completed in
resolvedOnboardingCompleted = completed
@@ -79,12 +72,28 @@ struct ContentView: View {
coreDataStack.isLoaded && resolvedOnboardingCompleted != nil
}
private func waitForDataAndResolveOnboarding() async {
// Wait for Core Data to be loaded
while !coreDataStack.isLoaded {
try? await Task.sleep(nanoseconds: 50_000_000) // 50ms
}
// Resolve onboarding state on main thread
await MainActor.run {
syncOnboardingState()
}
}
private func syncOnboardingState() {
let settings = AppSettings.getOrCreate(in: coreDataStack.viewContext)
var resolved = settings.onboardingCompleted || onboardingCompleted
// If user has existing data, skip onboarding
if !resolved && hasExistingData() {
resolved = true
}
// Persist the resolved state
if settings.onboardingCompleted != resolved {
settings.onboardingCompleted = resolved
CoreDataStack.shared.save()
@@ -92,6 +101,7 @@ struct ContentView: View {
if onboardingCompleted != resolved {
onboardingCompleted = resolved
}
resolvedOnboardingCompleted = resolved
}
@@ -121,39 +131,41 @@ struct ContentView: View {
private var mainContent: some View {
ZStack {
TabView(selection: $tabSelection.selectedTab) {
DashboardView()
bannerInsetView(DashboardView())
.tabItem {
Label("Home", systemImage: "house.fill")
}
.tag(0)
SourceListView(iapService: iapService)
bannerInsetView(SourceListView(iapService: iapService))
.tabItem {
Label("Sources", systemImage: "list.bullet")
}
.tag(1)
ChartsContainerView(iapService: iapService)
bannerInsetView(ChartsContainerView(iapService: iapService))
.tabItem {
Label("Charts", systemImage: "chart.xyaxis.line")
}
.tag(2)
JournalView()
bannerInsetView(JournalView())
.tabItem {
Label("Journal", systemImage: "book.closed")
}
.tag(3)
SettingsView(iapService: iapService)
bannerInsetView(SettingsView(iapService: iapService))
.tabItem {
Label("Settings", systemImage: "gearshape.fill")
}
.tag(4)
}
}
// Banner ad at bottom for free users
.safeAreaInset(edge: .bottom, spacing: 0) {
}
private func bannerInsetView<Content: View>(_ content: Content) -> some View {
content.safeAreaInset(edge: .bottom, spacing: 0) {
if !iapService.isPremium {
BannerAdView()
.frame(height: AppConstants.UI.bannerAdHeight)
PortfolioJournal/App/PortfolioJournalApp.swift
+3
View File
@@ -12,6 +12,9 @@ struct PortfolioJournalApp: App {
let coreDataStack = CoreDataStack.shared
init() {
// Clean up any duplicate objects from previous bugs before initializing stores
CoreDataStack.shared.cleanupDuplicateObjects()
let iap = IAPService()
_iapService = StateObject(wrappedValue: iap)
_adMobService = StateObject(wrappedValue: AdMobService())
PortfolioJournal/Models/CoreData/Account+CoreDataClass.swift
+10
View File
@@ -30,6 +30,12 @@ public class Account: NSManagedObject, Identifiable {
}
}
// MARK: - Constants
extension Account {
static let defaultAccountName = "Default"
}
// MARK: - Computed Properties
extension Account {
@@ -50,5 +56,9 @@ extension Account {
var currencyCode: String? {
currency?.isEmpty == false ? currency : nil
}
var isDefaultAccount: Bool {
name == Account.defaultAccountName
}
}
PortfolioJournal/Models/CoreData/Category+CoreDataClass.swift
+5 -5
View File
@@ -69,13 +69,13 @@ extension Category {
extension Category {
static let defaultCategories: [(name: String, colorHex: String, icon: String)] = [
("Stocks", "#10B981", "chart.line.uptrend.xyaxis"),
("Bonds", "#3B82F6", "building.columns.fill"),
("Real Estate", "#F59E0B", "house.fill"),
("Crypto", "#8B5CF6", "bitcoinsign.circle.fill"),
("Cash", "#6B7280", "banknote.fill"),
("ETFs", "#EC4899", "chart.bar.fill"),
("Crypto", "#8B5CF6", "bitcoinsign.circle.fill"),
("Real Estate", "#F59E0B", "house.fill"),
("Bonds", "#3B82F6", "building.columns.fill"),
("Retirement", "#14B8A6", "person.fill"),
("Other", "#64748B", "ellipsis.circle.fill")
("Other", "#64748B", "ellipsis.circle.fill"),
("ETFs", "#EC4899", "chart.bar.fill")
]
static func createDefaultCategories(in context: NSManagedObjectContext) {
PortfolioJournal/Models/CoreDataStack.swift
+53 -6
View File
@@ -179,6 +179,55 @@ class CoreDataStack: ObservableObject {
private init() {}
// MARK: - Cleanup Duplicates
/// Removes duplicate objects that have the same UUID, keeping only the oldest one.
/// This fixes data corruption from race conditions during object creation.
func cleanupDuplicateObjects() {
let context = viewContext
context.performAndWait {
// Clean up duplicate Goals
cleanupDuplicates(entityName: "Goal", idKey: "id", context: context)
// Clean up duplicate Accounts (already handled in AccountRepository but added here for safety)
cleanupDuplicates(entityName: "Account", idKey: "id", context: context)
// Clean up duplicate InvestmentSources
cleanupDuplicates(entityName: "InvestmentSource", idKey: "id", context: context)
// Clean up duplicate Categories
cleanupDuplicates(entityName: "Category", idKey: "id", context: context)
if context.hasChanges {
try? context.save()
}
}
}
private func cleanupDuplicates(entityName: String, idKey: String, context: NSManagedObjectContext) {
let request = NSFetchRequest<NSManagedObject>(entityName: entityName)
request.sortDescriptors = [NSSortDescriptor(key: "createdAt", ascending: true)]
guard let objects = try? context.fetch(request) else { return }
var seenIds = Set<UUID>()
var objectsToDelete: [NSManagedObject] = []
for object in objects {
guard let objectId = object.value(forKey: idKey) as? UUID else { continue }
if seenIds.contains(objectId) {
objectsToDelete.append(object)
} else {
seenIds.insert(objectId)
}
}
if !objectsToDelete.isEmpty {
print("Cleaning up \(objectsToDelete.count) duplicate \(entityName) objects")
for object in objectsToDelete {
context.delete(object)
}
}
}
// MARK: - Save Context
func save() {
@@ -232,12 +281,10 @@ class CoreDataStack: ObservableObject {
/// Forces SQLite to checkpoint the WAL file, ensuring all changes are written to the main database file.
/// This is necessary for the widget to see changes, as it opens the database read-only.
private func checkpointWAL() {
if viewContext.hasChanges {
try? viewContext.save()
}
let coordinator = persistentContainer.persistentStoreCoordinator
coordinator.performAndWait {
viewContext.performAndWait {
if viewContext.hasChanges {
try? viewContext.save()
}
viewContext.refreshAllObjects()
}
}
PortfolioJournal/Models/InvestmentMetrics.swift
+46
View File
@@ -201,3 +201,49 @@ struct PortfolioSummary {
)
}
}
// MARK: - Portfolio Forecast
struct PortfolioForecast {
let currentValue: Decimal
let forecastValue: Decimal
let forecastDate: Date
let confidenceLower: Decimal
let confidenceUpper: Decimal
let monthlyGrowthRate: Decimal
let annualizedGrowthRate: Decimal
var formattedForecastValue: String {
CurrencyFormatter.format(forecastValue, style: .currency, maximumFractionDigits: 0)
}
var formattedCurrentValue: String {
CurrencyFormatter.format(currentValue, style: .currency, maximumFractionDigits: 0)
}
var formattedConfidenceRange: String {
let lower = CurrencyFormatter.format(confidenceLower, style: .currency, maximumFractionDigits: 0)
let upper = CurrencyFormatter.format(confidenceUpper, style: .currency, maximumFractionDigits: 0)
return "\(lower) – \(upper)"
}
var formattedForecastDate: String {
forecastDate.monthYearString
}
var formattedGrowthPercentage: String {
guard currentValue > 0 else { return "+0%" }
let growthPct = ((forecastValue - currentValue) / currentValue) * 100
let prefix = growthPct >= 0 ? "+" : ""
return String(format: "\(prefix)%.1f%%", NSDecimalNumber(decimal: growthPct).doubleValue)
}
var formattedAnnualizedGrowthRate: String {
let prefix = annualizedGrowthRate >= 0 ? "+" : ""
return String(format: "\(prefix)%.1f%%", NSDecimalNumber(decimal: annualizedGrowthRate * 100).doubleValue)
}
var isPositiveGrowth: Bool {
forecastValue >= currentValue
}
}
PortfolioJournal/Repositories/AccountRepository.swift
+96 -39
View File
@@ -2,11 +2,14 @@ import Foundation
import CoreData
import Combine
@MainActor
class AccountRepository: ObservableObject {
private let context: NSManagedObjectContext
@Published private(set) var accounts: [Account] = []
private var cancellables = Set<AnyCancellable>()
init(context: NSManagedObjectContext = CoreDataStack.shared.viewContext) {
self.context = context
fetchAccounts()
@@ -14,40 +17,30 @@ class AccountRepository: ObservableObject {
}
private func setupNotificationObserver() {
NotificationCenter.default.addObserver(
self,
selector: #selector(contextDidChange),
name: .NSManagedObjectContextObjectsDidChange,
object: context
)
}
@objc private func contextDidChange(_ notification: Notification) {
fetchAccounts()
NotificationCenter.default.publisher(for: .NSManagedObjectContextObjectsDidChange, object: context)
.receive(on: DispatchQueue.main)
.sink { [weak self] _ in
self?.fetchAccounts()
}
.store(in: &cancellables)
}
// MARK: - Fetch
func fetchAccounts() {
context.perform { [weak self] in
guard let self else { return }
let request: NSFetchRequest<Account> = Account.fetchRequest()
request.sortDescriptors = [
NSSortDescriptor(keyPath: \Account.sortOrder, ascending: true),
NSSortDescriptor(keyPath: \Account.createdAt, ascending: true)
]
let request: NSFetchRequest<Account> = Account.fetchRequest()
request.sortDescriptors = [
NSSortDescriptor(keyPath: \Account.sortOrder, ascending: true),
NSSortDescriptor(keyPath: \Account.createdAt, ascending: true)
]
// Performance: Add batch size for fetches
request.fetchBatchSize = 50
do {
let fetched = try self.context.fetch(request)
DispatchQueue.main.async {
self.accounts = fetched
}
} catch {
print("Failed to fetch accounts: \(error)")
DispatchQueue.main.async {
self.accounts = []
}
}
do {
accounts = try context.fetch(request)
} catch {
print("Failed to fetch accounts: \(error)")
accounts = []
}
}
@@ -80,30 +73,85 @@ class AccountRepository: ObservableObject {
}
func createDefaultAccountIfNeeded() -> Account {
if let existing = accounts.first {
// Fetch accounts directly from database to avoid race condition with async fetch
let request: NSFetchRequest<Account> = Account.fetchRequest()
request.sortDescriptors = [
NSSortDescriptor(keyPath: \Account.sortOrder, ascending: true),
NSSortDescriptor(keyPath: \Account.createdAt, ascending: true)
]
let existingAccounts = (try? context.fetch(request)) ?? []
// Check if Default account already exists
if let defaultAccount = existingAccounts.first(where: { $0.isDefaultAccount }) {
return defaultAccount
}
// If no Default account but other accounts exist, return first one
if let existing = existingAccounts.first {
return existing
}
// No accounts exist, create Default account
let defaultCurrency = AppSettings.getOrCreate(in: context).currency
let account = createAccount(
name: "Personal",
currency: defaultCurrency,
inputMode: .simple,
notificationFrequency: .monthly
)
let account = Account(context: context)
account.name = Account.defaultAccountName
account.currency = defaultCurrency
account.inputMode = InputMode.simple.rawValue
account.notificationFrequency = NotificationFrequency.monthly.rawValue
account.customFrequencyMonths = 1
account.sortOrder = 0
// Attach existing sources to the default account
let request: NSFetchRequest<InvestmentSource> = InvestmentSource.fetchRequest()
if let sources = try? context.fetch(request) {
let sourceRequest: NSFetchRequest<InvestmentSource> = InvestmentSource.fetchRequest()
if let sources = try? context.fetch(sourceRequest) {
for source in sources where source.account == nil {
source.account = account
}
save()
}
save()
return account
}
/// Removes duplicate Default accounts, keeping only the oldest one.
/// Call this once to clean up any duplicates created by the race condition bug.
func cleanupDuplicateDefaultAccounts() {
let request: NSFetchRequest<Account> = Account.fetchRequest()
request.predicate = NSPredicate(format: "name == %@", Account.defaultAccountName)
request.sortDescriptors = [NSSortDescriptor(keyPath: \Account.createdAt, ascending: true)]
guard let defaultAccounts = try? context.fetch(request), defaultAccounts.count > 1 else {
return
}
// Keep the first (oldest) Default account, delete the rest
let accountsToDelete = defaultAccounts.dropFirst()
for account in accountsToDelete {
// Move sources to the kept Default account before deleting
if let keptAccount = defaultAccounts.first {
for source in account.sourcesArray {
source.account = keptAccount
}
}
context.delete(account)
}
save()
}
// MARK: - Validation
func isNameAvailable(_ name: String, excludingAccountId: UUID? = nil) -> Bool {
let trimmed = name.trimmingCharacters(in: .whitespacesAndNewlines)
let normalized = trimmed.lowercased()
return !accounts.contains { account in
if let excludeId = excludingAccountId, account.safeId == excludeId {
return false
}
return account.name.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() == normalized
}
}
// MARK: - Update
func updateAccount(
@@ -134,7 +182,15 @@ class AccountRepository: ObservableObject {
// MARK: - Delete
func canDeleteAccount(_ account: Account) -> Bool {
// Cannot delete the Default account
guard !account.isDefaultAccount else { return false }
// Must keep at least one account
return accounts.count > 1
}
func deleteAccount(_ account: Account) {
guard canDeleteAccount(account) else { return }
context.delete(account)
save()
}
@@ -145,7 +201,8 @@ class AccountRepository: ObservableObject {
guard context.hasChanges else { return }
do {
try context.save()
fetchAccounts()
// Note: Removed redundant fetchAccounts() call - the NotificationCenter observer
// in setupNotificationObserver() already handles refetching on context changes
} catch {
print("Failed to save accounts: \(error)")
}
PortfolioJournal/Repositories/CategoryRepository.swift
+68 -33
View File
@@ -2,53 +2,47 @@ import Foundation
import CoreData
import Combine
@MainActor
class CategoryRepository: ObservableObject {
private let context: NSManagedObjectContext
@Published private(set) var categories: [Category] = []
private var cancellables = Set<AnyCancellable>()
init(context: NSManagedObjectContext = CoreDataStack.shared.viewContext) {
self.context = context
fetchCategories()
ensureDefaultCategoriesExist()
setupNotificationObserver()
}
private func setupNotificationObserver() {
NotificationCenter.default.addObserver(
self,
selector: #selector(contextDidChange),
name: .NSManagedObjectContextObjectsDidChange,
object: context
)
}
@objc private func contextDidChange(_ notification: Notification) {
guard isRelevantChange(notification) else { return }
fetchCategories()
NotificationCenter.default.publisher(for: .NSManagedObjectContextObjectsDidChange, object: context)
.receive(on: DispatchQueue.main)
.sink { [weak self] notification in
guard let self, self.isRelevantChange(notification) else { return }
self.fetchCategories()
}
.store(in: &cancellables)
}
// MARK: - Fetch
func fetchCategories() {
context.perform { [weak self] in
guard let self else { return }
let request: NSFetchRequest<Category> = Category.fetchRequest()
request.sortDescriptors = [
NSSortDescriptor(keyPath: \Category.sortOrder, ascending: true),
NSSortDescriptor(keyPath: \Category.name, ascending: true)
]
let request: NSFetchRequest<Category> = Category.fetchRequest()
request.sortDescriptors = [
NSSortDescriptor(keyPath: \Category.sortOrder, ascending: true),
NSSortDescriptor(keyPath: \Category.name, ascending: true)
]
// Performance: Add batch size for fetches
request.fetchBatchSize = 50
do {
let fetched = try self.context.fetch(request)
DispatchQueue.main.async {
self.categories = fetched
}
} catch {
print("Failed to fetch categories: \(error)")
DispatchQueue.main.async {
self.categories = []
}
}
do {
categories = try context.fetch(request)
} catch {
print("Failed to fetch categories: \(error)")
categories = []
}
}
@@ -61,14 +55,33 @@ class CategoryRepository: ObservableObject {
// MARK: - Create
/// Check if a category with the given name already exists (case-insensitive)
func categoryExists(name: String) -> Bool {
let trimmed = name.trimmingCharacters(in: .whitespacesAndNewlines)
let normalized = trimmed.lowercased()
return categories.contains { $0.name.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() == normalized }
}
/// Find an existing category by name (case-insensitive)
func findCategory(byName name: String) -> Category? {
let trimmed = name.trimmingCharacters(in: .whitespacesAndNewlines)
let normalized = trimmed.lowercased()
return categories.first { $0.name.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() == normalized }
}
@discardableResult
func createCategory(
name: String,
colorHex: String,
icon: String
) -> Category {
// Check if category with same name already exists
if let existing = findCategory(byName: name) {
return existing
}
let category = Category(context: context)
category.name = name
category.name = name.trimmingCharacters(in: .whitespacesAndNewlines)
category.colorHex = colorHex
category.icon = icon
category.sortOrder = Int16(categories.count)
@@ -78,8 +91,29 @@ class CategoryRepository: ObservableObject {
}
func createDefaultCategoriesIfNeeded() {
guard categories.isEmpty else { return }
Category.createDefaultCategories(in: context)
ensureDefaultCategoriesExist()
}
func ensureDefaultCategoriesExist() {
var addedCount = 0
var nextSortOrder = categories.count
for categoryData in Category.defaultCategories {
if categoryExists(name: categoryData.name) {
continue
}
let category = Category(context: context)
category.name = categoryData.name
category.colorHex = categoryData.colorHex
category.icon = categoryData.icon
category.sortOrder = Int16(nextSortOrder)
nextSortOrder += 1
addedCount += 1
}
guard addedCount > 0 else { return }
save()
fetchCategories()
}
@@ -148,7 +182,8 @@ class CategoryRepository: ObservableObject {
guard context.hasChanges else { return }
do {
try context.save()
fetchCategories()
// Note: Removed redundant fetchCategories() call - the NotificationCenter observer
// in setupNotificationObserver() already handles refetching on context changes
CoreDataStack.shared.refreshWidgetData()
} catch {
print("Failed to save context: \(error)")
PortfolioJournal/Repositories/GoalRepository.swift
+53 -32
View File
@@ -2,11 +2,14 @@ import Foundation
import CoreData
import Combine
@MainActor
class GoalRepository: ObservableObject {
private let context: NSManagedObjectContext
@Published private(set) var goals: [Goal] = []
private var cancellables = Set<AnyCancellable>()
init(context: NSManagedObjectContext = CoreDataStack.shared.viewContext) {
self.context = context
fetchGoals()
@@ -14,47 +17,59 @@ class GoalRepository: ObservableObject {
}
private func setupNotificationObserver() {
NotificationCenter.default.addObserver(
self,
selector: #selector(contextDidChange),
name: .NSManagedObjectContextObjectsDidChange,
object: context
)
}
@objc private func contextDidChange(_ notification: Notification) {
fetchGoals()
NotificationCenter.default.publisher(for: .NSManagedObjectContextObjectsDidChange, object: context)
.receive(on: DispatchQueue.main)
.sink { [weak self] _ in
self?.fetchGoals()
}
.store(in: &cancellables)
}
// MARK: - Fetch
func fetchGoals(for account: Account? = nil) {
context.perform { [weak self] in
guard let self else { return }
let request: NSFetchRequest<Goal> = Goal.fetchRequest()
if let account = account {
request.predicate = NSPredicate(format: "account == %@", account)
}
request.sortDescriptors = [
NSSortDescriptor(keyPath: \Goal.createdAt, ascending: true)
]
let request: NSFetchRequest<Goal> = Goal.fetchRequest()
if let account = account {
request.predicate = NSPredicate(format: "account == %@", account)
}
request.sortDescriptors = [
NSSortDescriptor(keyPath: \Goal.createdAt, ascending: true)
]
// Performance: Add batch size for fetches
request.fetchBatchSize = 50
do {
let fetched = try self.context.fetch(request)
DispatchQueue.main.async {
self.goals = fetched
}
} catch {
print("Failed to fetch goals: \(error)")
DispatchQueue.main.async {
self.goals = []
}
}
do {
goals = try context.fetch(request)
} catch {
print("Failed to fetch goals: \(error)")
goals = []
}
}
// MARK: - Create
/// Check if a goal with the given name already exists in the account (case-insensitive)
func goalExists(name: String, in account: Account?) -> Bool {
let trimmed = name.trimmingCharacters(in: .whitespacesAndNewlines)
let normalized = trimmed.lowercased()
return goals.contains { goal in
let nameMatches = goal.name.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() == normalized
let accountMatches = goal.account?.id == account?.id
return nameMatches && accountMatches
}
}
/// Find an existing goal by name (case-insensitive) within the same account
func findGoal(byName name: String, in account: Account?) -> Goal? {
let trimmed = name.trimmingCharacters(in: .whitespacesAndNewlines)
let normalized = trimmed.lowercased()
return goals.first { goal in
let nameMatches = goal.name.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() == normalized
let accountMatches = goal.account?.id == account?.id
return nameMatches && accountMatches
}
}
@discardableResult
func createGoal(
name: String,
@@ -62,8 +77,13 @@ class GoalRepository: ObservableObject {
targetDate: Date? = nil,
account: Account?
) -> Goal {
// Check if goal with same name already exists in this account
if let existing = findGoal(byName: name, in: account) {
return existing
}
let goal = Goal(context: context)
goal.name = name
goal.name = name.trimmingCharacters(in: .whitespacesAndNewlines)
goal.targetAmount = NSDecimalNumber(decimal: targetAmount)
goal.targetDate = targetDate
goal.account = account
@@ -109,7 +129,8 @@ class GoalRepository: ObservableObject {
guard context.hasChanges else { return }
do {
try context.save()
fetchGoals()
// Note: Removed redundant fetchGoals() call - the NotificationCenter observer
// in setupNotificationObserver() already handles refetching on context changes
} catch {
print("Failed to save goals: \(error)")
}
PortfolioJournal/Repositories/InvestmentSourceRepository.swift
+54 -33
View File
@@ -2,11 +2,14 @@ import Foundation
import CoreData
import Combine
@MainActor
class InvestmentSourceRepository: ObservableObject {
private let context: NSManagedObjectContext
@Published private(set) var sources: [InvestmentSource] = []
private var cancellables = Set<AnyCancellable>()
init(context: NSManagedObjectContext = CoreDataStack.shared.viewContext) {
self.context = context
fetchSources()
@@ -14,43 +17,33 @@ class InvestmentSourceRepository: ObservableObject {
}
private func setupNotificationObserver() {
NotificationCenter.default.addObserver(
self,
selector: #selector(contextDidChange),
name: .NSManagedObjectContextObjectsDidChange,
object: context
)
}
@objc private func contextDidChange(_ notification: Notification) {
guard isRelevantChange(notification) else { return }
fetchSources()
NotificationCenter.default.publisher(for: .NSManagedObjectContextObjectsDidChange, object: context)
.receive(on: DispatchQueue.main)
.sink { [weak self] notification in
guard let self, self.isRelevantChange(notification) else { return }
self.fetchSources()
}
.store(in: &cancellables)
}
// MARK: - Fetch
func fetchSources(account: Account? = nil) {
context.perform { [weak self] in
guard let self else { return }
let request: NSFetchRequest<InvestmentSource> = InvestmentSource.fetchRequest()
if let account = account {
request.predicate = NSPredicate(format: "account == %@", account)
}
request.sortDescriptors = [
NSSortDescriptor(keyPath: \InvestmentSource.name, ascending: true)
]
let request: NSFetchRequest<InvestmentSource> = InvestmentSource.fetchRequest()
if let account = account {
request.predicate = NSPredicate(format: "account == %@", account)
}
request.sortDescriptors = [
NSSortDescriptor(keyPath: \InvestmentSource.name, ascending: true)
]
// Performance: Add batch size for large datasets
request.fetchBatchSize = 100
do {
let fetched = try self.context.fetch(request)
DispatchQueue.main.async {
self.sources = fetched
}
} catch {
print("Failed to fetch sources: \(error)")
DispatchQueue.main.async {
self.sources = []
}
}
do {
sources = try context.fetch(request)
} catch {
print("Failed to fetch sources: \(error)")
sources = []
}
}
@@ -82,6 +75,28 @@ class InvestmentSourceRepository: ObservableObject {
// MARK: - Create
/// Check if a source with the given name already exists in the account (case-insensitive)
func sourceExists(name: String, in account: Account?) -> Bool {
let trimmed = name.trimmingCharacters(in: .whitespacesAndNewlines)
let normalized = trimmed.lowercased()
return sources.contains { source in
let nameMatches = source.name.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() == normalized
let accountMatches = source.account?.id == account?.id
return nameMatches && accountMatches
}
}
/// Find an existing source by name (case-insensitive) within the same account
func findSource(byName name: String, in account: Account?) -> InvestmentSource? {
let trimmed = name.trimmingCharacters(in: .whitespacesAndNewlines)
let normalized = trimmed.lowercased()
return sources.first { source in
let nameMatches = source.name.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() == normalized
let accountMatches = source.account?.id == account?.id
return nameMatches && accountMatches
}
}
@discardableResult
func createSource(
name: String,
@@ -90,8 +105,13 @@ class InvestmentSourceRepository: ObservableObject {
customFrequencyMonths: Int = 1,
account: Account? = nil
) -> InvestmentSource {
// Check if source with same name already exists in this account
if let existing = findSource(byName: name, in: account) {
return existing
}
let source = InvestmentSource(context: context)
source.name = name
source.name = name.trimmingCharacters(in: .whitespacesAndNewlines)
source.category = category
source.notificationFrequency = notificationFrequency.rawValue
source.customFrequencyMonths = Int16(customFrequencyMonths)
@@ -188,7 +208,8 @@ class InvestmentSourceRepository: ObservableObject {
guard context.hasChanges else { return }
do {
try context.save()
fetchSources()
// Note: Removed redundant fetchSources() call - the NotificationCenter observer
// in setupNotificationObserver() already handles refetching on context changes
CoreDataStack.shared.refreshWidgetData()
} catch {
print("Failed to save context: \(error)")
PortfolioJournal/Repositories/SnapshotRepository.swift
+13 -9
View File
@@ -2,6 +2,7 @@ import Foundation
import CoreData
import Combine
@MainActor
class SnapshotRepository: ObservableObject {
private let context: NSManagedObjectContext
private let cache = NSCache<NSString, NSArray>()
@@ -9,6 +10,8 @@ class SnapshotRepository: ObservableObject {
@Published private(set) var snapshots: [Snapshot] = []
private var cancellables = Set<AnyCancellable>()
// MARK: - Performance: Shared DateFormatter
private static let monthYearFormatter: DateFormatter = {
let formatter = DateFormatter()
@@ -301,16 +304,17 @@ class SnapshotRepository: ObservableObject {
cacheVersion &+= 1
}
private func setupNotificationObserver() {
NotificationCenter.default.addObserver(
self,
selector: #selector(contextDidChange),
name: .NSManagedObjectContextObjectsDidChange,
object: context
)
/// Clear cache on memory pressure - call from AppDelegate's didReceiveMemoryWarning
func clearCacheOnMemoryPressure() {
cache.removeAllObjects()
}
@objc private func contextDidChange(_ notification: Notification) {
invalidateCache()
private func setupNotificationObserver() {
NotificationCenter.default.publisher(for: .NSManagedObjectContextObjectsDidChange, object: context)
.receive(on: DispatchQueue.main)
.sink { [weak self] _ in
self?.invalidateCache()
}
.store(in: &cancellables)
}
}
PortfolioJournal/Services/AccountStore.swift
+32 -4
View File
@@ -19,8 +19,14 @@ class AccountStore: ObservableObject {
self.accountRepository = accountRepository ?? AccountRepository()
self.iapService = iapService
self.accountRepository.fetchAccounts()
// Clean up any duplicate Default accounts from previous bug
self.accountRepository.cleanupDuplicateDefaultAccounts()
// Create default account if needed (now fetches directly from DB)
let defaultAccount = self.accountRepository.createDefaultAccountIfNeeded()
// Trigger async fetch to populate the published accounts array
self.accountRepository.fetchAccounts()
accounts = self.accountRepository.accounts
selectedAccount = defaultAccount
@@ -33,9 +39,23 @@ class AccountStore: ObservableObject {
.receive(on: DispatchQueue.main)
.sink { [weak self] accounts in
self?.accounts = accounts
if let selected = self?.selectedAccount, selected.isDeleted {
self?.selectedAccount = nil
}
self?.syncSelectedAccount()
}
.store(in: &cancellables)
NotificationCenter.default.publisher(for: .didResetData)
.receive(on: DispatchQueue.main)
.sink { [weak self] _ in
guard let self else { return }
self.accountRepository.fetchAccounts()
self.selectedAccount = nil
self.showAllAccounts = true
self.persistSelection()
}
.store(in: &cancellables)
}
private func loadSelection() {
@@ -53,8 +73,8 @@ class AccountStore: ObservableObject {
private func syncSelectedAccount() {
if showAllAccounts { return }
if let selected = selectedAccount,
accounts.contains(where: { $0.id == selected.id }) {
if let selectedId = selectedAccount?.safeId,
accounts.contains(where: { $0.safeId == selectedId }) {
return
}
selectedAccount = accounts.first
@@ -62,6 +82,7 @@ class AccountStore: ObservableObject {
func selectAllAccounts() {
showAllAccounts = true
selectedAccount = nil
persistSelection()
}
@@ -75,7 +96,7 @@ class AccountStore: ObservableObject {
let context = CoreDataStack.shared.viewContext
let settings = AppSettings.getOrCreate(in: context)
settings.showAllAccounts = showAllAccounts
settings.selectedAccountId = showAllAccounts ? nil : selectedAccount?.id
settings.selectedAccountId = showAllAccounts ? nil : selectedAccount?.safeId
CoreDataStack.shared.save()
}
@@ -83,3 +104,10 @@ class AccountStore: ObservableObject {
iapService.isPremium || accounts.count < 1
}
}
extension Account {
var safeId: UUID? {
guard !isDeleted else { return nil }
return value(forKey: "id") as? UUID
}
}
PortfolioJournal/Services/CalculationService.swift
+29 -44
View File
@@ -43,9 +43,15 @@ class CalculationService {
let monthChange = calculatePeriodChange(sources: sources, from: monthAgo)
let yearChange = calculatePeriodChange(sources: sources, from: yearAgo)
let allTimeReturn = totalValue - totalContributions
let allTimeReturnPercentage = totalContributions > 0
? NSDecimalNumber(decimal: allTimeReturn / totalContributions).doubleValue * 100
let baselineTotal = sources.reduce(Decimal.zero) { partial, source in
if let firstSnapshot = source.sortedSnapshotsByDateAscending.first {
return partial + firstSnapshot.decimalValue
}
return partial + source.latestValue
}
let allTimeReturn = totalValue - baselineTotal
let allTimeReturnPercentage = baselineTotal > 0
? NSDecimalNumber(decimal: allTimeReturn / baselineTotal).doubleValue * 100
: 0
let lastUpdated = snapshots.map { $0.date }.max()
@@ -458,57 +464,36 @@ class CalculationService {
private func buildCategorySeries(from snapshots: [Snapshot]) -> [SeriesPoint] {
let sortedSnapshots = snapshots.sorted { $0.date < $1.date }
let uniqueDates = Array(Set(sortedSnapshots.map { Calendar.current.startOfDay(for: $0.date) }))
.sorted()
guard !uniqueDates.isEmpty else { return [] }
var snapshotsBySource: [UUID: [(date: Date, value: Decimal)]] = [:]
var contributionsByDate: [Date: Decimal] = [:]
for snapshot in sortedSnapshots {
guard let sourceId = snapshot.source?.id else { continue }
snapshotsBySource[sourceId, default: []].append(
(date: snapshot.date, value: snapshot.decimalValue)
)
let day = Calendar.current.startOfDay(for: snapshot.date)
contributionsByDate[day, default: 0] += snapshot.decimalContribution
let groupedByMonth = Dictionary(grouping: sortedSnapshots) { snapshot -> DateComponents in
let components = Calendar.current.dateComponents([.year, .month], from: snapshot.date)
return DateComponents(year: components.year, month: components.month)
}
var indices: [UUID: Int] = [:]
var series: [SeriesPoint] = []
series.reserveCapacity(groupedByMonth.count)
for (index, date) in uniqueDates.enumerated() {
let nextDate = index + 1 < uniqueDates.count
? uniqueDates[index + 1]
: Date.distantFuture
var total: Decimal = 0
for (key, monthSnapshots) in groupedByMonth {
var latestBySource: [UUID: Snapshot] = [:]
var contributions: Decimal = 0
for (sourceId, sourceSnapshots) in snapshotsBySource {
var currentIndex = indices[sourceId] ?? 0
var latest: (date: Date, value: Decimal)?
while currentIndex < sourceSnapshots.count && sourceSnapshots[currentIndex].date < nextDate {
latest = sourceSnapshots[currentIndex]
currentIndex += 1
}
indices[sourceId] = currentIndex
if let latest {
total += latest.value
for snapshot in monthSnapshots {
contributions += snapshot.decimalContribution
guard let sourceId = snapshot.source?.id else { continue }
if let existing = latestBySource[sourceId] {
if snapshot.date > existing.date {
latestBySource[sourceId] = snapshot
}
} else {
latestBySource[sourceId] = snapshot
}
}
series.append(
SeriesPoint(
date: date,
value: total,
contribution: contributionsByDate[date] ?? 0
)
)
let total = latestBySource.values.reduce(Decimal.zero) { $0 + $1.decimalValue }
let date = Calendar.current.date(from: key) ?? Date()
series.append(SeriesPoint(date: date, value: total, contribution: contributions))
}
return series
return series.sorted { $0.date < $1.date }
}
private func calculateMonthlyReturns(from series: [SeriesPoint]) -> [InvestmentMetrics.MonthlyReturn] {
PortfolioJournal/Services/ImportService.swift
+92 -22
View File
@@ -11,6 +11,7 @@ class ImportService {
let accountsCreated: Int
let sourcesCreated: Int
let snapshotsCreated: Int
let snapshotsUpdated: Int
let errors: [String]
}
@@ -385,11 +386,13 @@ Personal,Real Estate,Rental Property,2024-01-01,82000,80000,Estimated value
var accountsCreated = 0
var sourcesCreated = 0
var snapshotsCreated = 0
var snapshotsUpdated = 0
var errors: [String] = []
var categoryLookup = buildCategoryLookup(from: categoryRepository.categories)
let otherCategory = resolveExistingCategory(named: "Other", lookup: categoryLookup) ??
categoryRepository.createCategory(
let existingCategories = fetchCategories(in: context)
var categoryLookup = buildCategoryLookup(from: existingCategories)
let otherCategory = resolveExistingCategory(named: "Other", lookup: categoryLookup)
?? categoryRepository.createCategory(
name: "Other",
colorHex: "#64748B",
icon: "ellipsis.circle.fill"
@@ -398,17 +401,22 @@ Personal,Real Estate,Rental Property,2024-01-01,82000,80000,Estimated value
var completionDatesByMonth: [String: Date] = [:]
for importedAccount in accounts {
let existingAccount = accountRepository.accounts.first(where: { $0.name == importedAccount.name })
let account = existingAccount ?? accountRepository.createAccount(
name: importedAccount.name,
currency: importedAccount.currency,
inputMode: importedAccount.inputMode,
notificationFrequency: importedAccount.notificationFrequency,
customFrequencyMonths: importedAccount.customFrequencyMonths
)
// Build lookup of existing accounts by fetching directly from database
let existingAccountsLookup = fetchAccountsLookup(in: context)
if existingAccount == nil {
for importedAccount in accounts {
let existingAccount = existingAccountsLookup[importedAccount.name]
let account: Account
if let existing = existingAccount {
account = existing
} else {
account = accountRepository.createAccount(
name: importedAccount.name,
currency: importedAccount.currency,
inputMode: importedAccount.inputMode,
notificationFrequency: importedAccount.notificationFrequency,
customFrequencyMonths: importedAccount.customFrequencyMonths
)
accountsCreated += 1
}
@@ -431,8 +439,9 @@ Personal,Real Estate,Rental Property,2024-01-01,82000,80000,Estimated value
categoryLookup[normalizedCategoryName(category.name)] = category
for importedSource in importedCategory.sources {
let accountId = account.safeId
let existingSource = sourceRepository.sources.first(where: {
$0.name == importedSource.name && $0.account?.id == account.id
$0.name == importedSource.name && $0.account?.id == accountId
})
let source = existingSource ?? sourceRepository.createSource(
name: importedSource.name,
@@ -446,14 +455,30 @@ Personal,Real Estate,Rental Property,2024-01-01,82000,80000,Estimated value
}
for snapshot in importedSource.snapshots {
snapshotRepository.createSnapshot(
for: source,
date: snapshot.date,
value: snapshot.value,
contribution: snapshot.contribution,
notes: snapshot.notes
)
snapshotsCreated += 1
// Check if a snapshot with the same date already exists for this source
let existingSnapshot = fetchSnapshot(for: source, date: snapshot.date, in: context)
if let existing = existingSnapshot {
// Update existing snapshot instead of creating a duplicate
existing.value = NSDecimalNumber(decimal: snapshot.value)
if let contribution = snapshot.contribution {
existing.contribution = NSDecimalNumber(decimal: contribution)
}
if let notes = snapshot.notes, !notes.isEmpty {
existing.notes = notes
}
snapshotsUpdated += 1
} else {
// Create new snapshot
snapshotRepository.createSnapshot(
for: source,
date: snapshot.date,
value: snapshot.value,
contribution: snapshot.contribution,
notes: snapshot.notes
)
snapshotsCreated += 1
}
snapshotProgress?(snapshotsCreated)
let monthKey = MonthlyCheckInStore.monthKey(for: snapshot.date)
@@ -491,6 +516,7 @@ Personal,Real Estate,Rental Property,2024-01-01,82000,80000,Estimated value
accountsCreated: accountsCreated,
sourcesCreated: sourcesCreated,
snapshotsCreated: snapshotsCreated,
snapshotsUpdated: snapshotsUpdated,
errors: errors
)
}
@@ -516,6 +542,50 @@ Personal,Real Estate,Rental Property,2024-01-01,82000,80000,Estimated value
return lookup
}
private func fetchCategories(in context: NSManagedObjectContext) -> [Category] {
let request: NSFetchRequest<Category> = Category.fetchRequest()
request.sortDescriptors = [
NSSortDescriptor(keyPath: \Category.sortOrder, ascending: true),
NSSortDescriptor(keyPath: \Category.name, ascending: true)
]
return (try? context.fetch(request)) ?? []
}
private func fetchAccountsLookup(in context: NSManagedObjectContext) -> [String: Account] {
let request: NSFetchRequest<Account> = Account.fetchRequest()
request.sortDescriptors = [NSSortDescriptor(keyPath: \Account.createdAt, ascending: true)]
let accounts = (try? context.fetch(request)) ?? []
var lookup: [String: Account] = [:]
for account in accounts {
lookup[account.name] = account
}
return lookup
}
/// Fetch a snapshot for a given source and date (same day)
private func fetchSnapshot(
for source: InvestmentSource,
date: Date,
in context: NSManagedObjectContext
) -> Snapshot? {
let request: NSFetchRequest<Snapshot> = Snapshot.fetchRequest()
// Match snapshots on the same day (ignore time component)
let calendar = Calendar.current
let startOfDay = calendar.startOfDay(for: date)
let endOfDay = calendar.date(byAdding: .day, value: 1, to: startOfDay)!
request.predicate = NSPredicate(
format: "source == %@ AND date >= %@ AND date < %@",
source,
startOfDay as NSDate,
endOfDay as NSDate
)
request.fetchLimit = 1
return try? context.fetch(request).first
}
private func canonicalCategoryName(for rawName: String) -> String? {
let normalized = normalizedCategoryName(rawName)
for mapping in categoryAliasMappings {
PortfolioJournal/Services/NotificationService.swift
+1
View File
@@ -173,6 +173,7 @@ extension NotificationService {
extension Notification.Name {
static let openSourceDetail = Notification.Name("openSourceDetail")
static let didResetData = Notification.Name("didResetData")
}
// MARK: - Background Refresh
PortfolioJournal/Services/SampleDataService.swift
+51 -4
View File
@@ -1,4 +1,5 @@
import Foundation
import CoreData
class SampleDataService {
static let shared = SampleDataService()
@@ -20,10 +21,32 @@ class SampleDataService {
let goalRepository = GoalRepository(context: context)
let transactionRepository = TransactionRepository(context: context)
let categories = categoryRepository.categories
let stocksCategory = categories.first { $0.name == "Stocks" } ?? categories.first!
let cryptoCategory = categories.first { $0.name == "Crypto" } ?? categories.first!
let realEstateCategory = categories.first { $0.name == "Real Estate" } ?? categories.first!
let categories = fetchCategories(in: context)
guard let fallbackCategory = categories.first else { return }
let stocksCategory = resolveCategory(
named: "Stocks",
fallback: fallbackCategory,
colorHex: "#3B82F6",
icon: "chart.line.uptrend.xyaxis",
repository: categoryRepository,
context: context
)
let cryptoCategory = resolveCategory(
named: "Crypto",
fallback: fallbackCategory,
colorHex: "#10B981",
icon: "bitcoinsign.circle.fill",
repository: categoryRepository,
context: context
)
let realEstateCategory = resolveCategory(
named: "Real Estate",
fallback: fallbackCategory,
colorHex: "#F59E0B",
icon: "house.fill",
repository: categoryRepository,
context: context
)
let stocks = sourceRepository.createSource(
name: "Index Fund",
@@ -98,4 +121,28 @@ class SampleDataService {
MonthlyCheckInStore.setNote(note, for: date)
}
}
private func fetchCategories(in context: NSManagedObjectContext) -> [Category] {
let request: NSFetchRequest<Category> = Category.fetchRequest()
request.sortDescriptors = [
NSSortDescriptor(keyPath: \Category.sortOrder, ascending: true),
NSSortDescriptor(keyPath: \Category.name, ascending: true)
]
return (try? context.fetch(request)) ?? []
}
private func resolveCategory(
named name: String,
fallback: Category,
colorHex: String,
icon: String,
repository: CategoryRepository,
context: NSManagedObjectContext
) -> Category {
if let existing = fetchCategories(in: context)
.first(where: { $0.name == name }) {
return existing
}
return repository.createCategory(name: name, colorHex: colorHex, icon: icon)
}
}
PortfolioJournal/Utilities/MonthlyCheckInStore.swift
+8
View File
@@ -174,6 +174,14 @@ enum MonthlyCheckInStore {
return achievementStatuses(for: stats)
}
static func clearAll() {
let defaults = UserDefaults.standard
defaults.removeObject(forKey: notesKey)
defaults.removeObject(forKey: completionsKey)
defaults.removeObject(forKey: entriesKey)
defaults.removeObject(forKey: legacyLastCheckInKey)
}
// MARK: - Private Helpers
private static func updateEntry(for date: Date, mutate: (inout MonthlyCheckInEntry) -> Void) {
PortfolioJournal/ViewModels/ChartsViewModel.swift
+201 -44
View File
@@ -1,5 +1,6 @@
import Foundation
import Combine
import CoreData
@MainActor
class ChartsViewModel: ObservableObject {
@@ -149,7 +150,6 @@ class ChartsViewModel: ObservableObject {
private var lastAccountId: UUID?
private var lastShowAllAccounts: Bool = true
private var cachedSnapshots: [Snapshot]?
private var cachedSnapshotsBySource: [UUID: [Snapshot]]?
private var isUpdateInProgress = false
// MARK: - Initialization
@@ -186,20 +186,20 @@ class ChartsViewModel: ObservableObject {
let (chartType, category, timeRange, _) = combined
// Performance: Skip update if nothing meaningful changed
let safeSelectedAccountId = self.safeSelectedAccountId
let hasChanges = self.lastChartType != chartType ||
self.lastTimeRange != timeRange ||
self.lastCategoryId != category?.id ||
self.lastAccountId != self.selectedAccount?.id ||
self.lastAccountId != safeSelectedAccountId ||
self.lastShowAllAccounts != showAll
if hasChanges {
self.lastChartType = chartType
self.lastTimeRange = timeRange
self.lastCategoryId = category?.id
self.lastAccountId = self.selectedAccount?.id
self.lastAccountId = safeSelectedAccountId
self.lastShowAllAccounts = showAll
self.cachedSnapshots = nil // Invalidate cache on meaningful changes
self.cachedSnapshotsBySource = nil
self.updateChartData(chartType: chartType, category: category, timeRange: timeRange)
}
}
@@ -266,48 +266,40 @@ class ChartsViewModel: ObservableObject {
cachedSnapshots = snapshots
}
// Performance: Cache snapshotsBySource
let snapshotsBySource: [UUID: [Snapshot]]
if let cached = cachedSnapshotsBySource {
snapshotsBySource = cached
} else {
var grouped: [UUID: [Snapshot]] = [:]
grouped.reserveCapacity(sources.count)
for snapshot in snapshots {
guard let id = snapshot.source?.id else { continue }
grouped[id, default: []].append(snapshot)
}
snapshotsBySource = grouped
cachedSnapshotsBySource = grouped
}
let completedSnapshots = filterSnapshotsForCharts(
sources: sources,
snapshots: snapshots
)
// Performance: Only calculate data for the selected chart type
switch chartType {
case .evolution:
calculateEvolutionData(from: snapshots)
calculateEvolutionData(from: completedSnapshots)
let categoriesForChart = categoriesForStackedChart(
sources: sources,
selectedCategory: selectedCategory
)
calculateCategoryEvolutionData(from: snapshots, categories: categoriesForChart)
calculateCategoryEvolutionData(from: completedSnapshots, categories: categoriesForChart)
case .allocation:
calculateAllocationData(for: sources)
case .performance:
calculatePerformanceData(for: sources, snapshotsBySource: snapshotsBySource)
let completedSnapshotsBySource = groupSnapshotsBySource(completedSnapshots)
calculatePerformanceData(for: sources, snapshotsBySource: completedSnapshotsBySource)
case .contributions:
calculateContributionsData(from: snapshots)
calculateContributionsData(from: completedSnapshots)
case .rollingReturn:
calculateRollingReturnData(from: snapshots)
calculateRollingReturnData(from: completedSnapshots)
case .riskReturn:
calculateRiskReturnData(for: sources, snapshotsBySource: snapshotsBySource)
let completedSnapshotsBySource = groupSnapshotsBySource(completedSnapshots)
calculateRiskReturnData(for: sources, snapshotsBySource: completedSnapshotsBySource)
case .cashflow:
calculateCashflowData(from: snapshots)
calculateCashflowData(from: completedSnapshots)
case .drawdown:
calculateDrawdownData(from: snapshots)
calculateDrawdownData(from: completedSnapshots)
case .volatility:
calculateVolatilityData(from: snapshots)
calculateVolatilityData(from: completedSnapshots)
case .prediction:
calculatePredictionData(from: snapshots)
calculatePredictionData(from: completedSnapshots)
}
if let selected = selectedCategory,
@@ -336,7 +328,17 @@ class ChartsViewModel: ObservableObject {
if showAllAccounts || selectedAccount == nil {
return true
}
return source.account?.id == selectedAccount?.id
guard let selectedId = safeSelectedAccountId else { return true }
return source.account?.id == selectedId
}
private var safeSelectedAccountId: UUID? {
guard !showAllAccounts,
let selected = selectedAccount,
!selected.isDeleted else {
return nil
}
return selected.id
}
private func categoriesForStackedChart(
@@ -406,17 +408,34 @@ class ChartsViewModel: ObservableObject {
private func calculateEvolutionData(from snapshots: [Snapshot]) {
let sortedSnapshots = snapshots.sorted { $0.date < $1.date }
var dateValues: [Date: Decimal] = [:]
for snapshot in sortedSnapshots {
let day = Calendar.current.startOfDay(for: snapshot.date)
dateValues[day, default: 0] += snapshot.decimalValue
let groupedByMonth = Dictionary(grouping: sortedSnapshots) { snapshot -> DateComponents in
let components = Calendar.current.dateComponents([.year, .month], from: snapshot.date)
return DateComponents(year: components.year, month: components.month)
}
let series = dateValues
.map { (date: $0.key, value: $0.value) }
.sorted { $0.date < $1.date }
var series: [(date: Date, value: Decimal)] = []
series.reserveCapacity(groupedByMonth.count)
for (key, monthSnapshots) in groupedByMonth {
var latestBySource: [UUID: Snapshot] = [:]
for snapshot in monthSnapshots {
guard let sourceId = snapshot.source?.id else { continue }
if let existing = latestBySource[sourceId] {
if snapshot.date > existing.date {
latestBySource[sourceId] = snapshot
}
} else {
latestBySource[sourceId] = snapshot
}
}
let total = latestBySource.values.reduce(Decimal.zero) { $0 + $1.decimalValue }
let date = Calendar.current.date(from: key) ?? Date()
series.append((date: date, value: total))
}
series.sort { $0.date < $1.date }
evolutionData = downsampleSeries(series, maxPoints: maxChartPoints)
}
@@ -477,6 +496,69 @@ class ChartsViewModel: ObservableObject {
}.sorted { $0.value > $1.value }
}
private func completedMonthKeys(
sources: [InvestmentSource],
snapshots: [Snapshot],
after cutoff: Date
) -> Set<DateComponents> {
let sourceIds = Set(sources.compactMap { $0.id })
guard !sourceIds.isEmpty else { return [] }
let groupedByMonth = Dictionary(grouping: snapshots) { snapshot -> DateComponents in
let components = Calendar.current.dateComponents([.year, .month], from: snapshot.date)
return DateComponents(year: components.year, month: components.month)
}
var completed: Set<DateComponents> = []
completed.reserveCapacity(groupedByMonth.count)
for (key, monthSnapshots) in groupedByMonth {
guard let monthDate = Calendar.current.date(from: key) else { continue }
guard monthDate > cutoff else { continue }
guard MonthlyCheckInStore.completionDate(for: monthDate) != nil else { continue }
let monthSourceIds = Set(monthSnapshots.compactMap { $0.source?.id })
if sourceIds.isSubset(of: monthSourceIds) {
completed.insert(key)
}
}
return completed
}
private func filterSnapshotsForCharts(
sources: [InvestmentSource],
snapshots: [Snapshot]
) -> [Snapshot] {
guard let lastCompleted = MonthlyCheckInStore.latestCompletionDate()?.startOfMonth else {
return []
}
let completedMonthsAfter = completedMonthKeys(
sources: sources,
snapshots: snapshots,
after: lastCompleted
)
return snapshots.filter { snapshot in
let monthDate = snapshot.date.startOfMonth
if monthDate <= lastCompleted {
return true
}
let components = Calendar.current.dateComponents([.year, .month], from: snapshot.date)
let key = DateComponents(year: components.year, month: components.month)
return completedMonthsAfter.contains(key)
}
}
private func groupSnapshotsBySource(_ snapshots: [Snapshot]) -> [UUID: [Snapshot]] {
var grouped: [UUID: [Snapshot]] = [:]
for snapshot in snapshots {
guard let id = snapshot.source?.id else { continue }
grouped[id, default: []].append(snapshot)
}
return grouped
}
private func calculatePerformanceData(
for sources: [InvestmentSource],
snapshotsBySource: [UUID: [Snapshot]]
@@ -492,11 +574,20 @@ class ChartsViewModel: ObservableObject {
}.flatMap { $0 }
guard snapshots.count >= 2 else { return nil }
let metrics = calculationService.calculateMetrics(for: snapshots)
let monthlyTotals = monthlyTotalsByMonthYear(from: snapshots)
guard let first = monthlyTotals.first,
let last = monthlyTotals.last,
first.totalValue > 0 else { return nil }
let cagr = calculationService.calculateCAGR(
startValue: first.totalValue,
endValue: last.totalValue,
startDate: first.date,
endDate: last.date
)
return (
category: category.name,
cagr: metrics.cagr,
cagr: cagr,
color: category.colorHex
)
}.sorted { $0.cagr > $1.cagr }
@@ -543,12 +634,23 @@ class ChartsViewModel: ObservableObject {
let id = source.id
return snapshotsBySource[id]
}.flatMap { $0 }
guard snapshots.count >= 3 else { return nil }
let metrics = calculationService.calculateMetrics(for: snapshots)
let monthlyTotals = monthlyTotalsByMonthYear(from: snapshots)
guard monthlyTotals.count >= 3,
let first = monthlyTotals.first,
let last = monthlyTotals.last,
first.totalValue > 0 else { return nil }
let cagr = calculationService.calculateCAGR(
startValue: first.totalValue,
endValue: last.totalValue,
startDate: first.date,
endDate: last.date
)
let monthlyReturns = monthlyReturnSeries(from: monthlyTotals)
let volatility = calculationService.calculateVolatility(monthlyReturns: monthlyReturns)
return (
category: category.name,
cagr: metrics.cagr,
volatility: metrics.volatility,
cagr: cagr,
volatility: volatility,
color: category.colorHex
)
}.sorted { $0.cagr > $1.cagr }
@@ -670,6 +772,61 @@ class ChartsViewModel: ObservableObject {
return totals
}
private func monthlyTotalsByMonthYear(from snapshots: [Snapshot]) -> [(date: Date, totalValue: Decimal)] {
let sortedSnapshots = snapshots.sorted { $0.date < $1.date }
let groupedByMonth = Dictionary(grouping: sortedSnapshots) { snapshot -> DateComponents in
let components = Calendar.current.dateComponents([.year, .month], from: snapshot.date)
return DateComponents(year: components.year, month: components.month)
}
var totals: [(date: Date, totalValue: Decimal)] = []
totals.reserveCapacity(groupedByMonth.count)
for (key, monthSnapshots) in groupedByMonth {
var latestBySource: [UUID: Snapshot] = [:]
for snapshot in monthSnapshots {
guard let sourceId = snapshot.source?.id else { continue }
if let existing = latestBySource[sourceId] {
if snapshot.date > existing.date {
latestBySource[sourceId] = snapshot
}
} else {
latestBySource[sourceId] = snapshot
}
}
let total = latestBySource.values.reduce(Decimal.zero) { $0 + $1.decimalValue }
let date = Calendar.current.date(from: key) ?? Date()
totals.append((date: date, totalValue: total))
}
return totals.sorted { $0.date < $1.date }
}
private func monthlyReturnSeries(
from monthlyTotals: [(date: Date, totalValue: Decimal)]
) -> [InvestmentMetrics.MonthlyReturn] {
guard monthlyTotals.count >= 2 else { return [] }
var returns: [InvestmentMetrics.MonthlyReturn] = []
returns.reserveCapacity(monthlyTotals.count - 1)
for index in 1..<monthlyTotals.count {
let previous = monthlyTotals[index - 1]
let current = monthlyTotals[index]
guard previous.totalValue > 0 else { continue }
let returnPercentage = NSDecimalNumber(
decimal: (current.totalValue - previous.totalValue) / previous.totalValue
).doubleValue * 100
returns.append(InvestmentMetrics.MonthlyReturn(
date: current.date,
returnPercentage: returnPercentage
))
}
return returns
}
func updatePredictionTargetDate(_ goals: [Goal]) {
let futureGoalDates = goals.compactMap { $0.targetDate }.filter { $0 > Date() }
guard let latestGoalDate = futureGoalDates.max(),
PortfolioJournal/ViewModels/DashboardViewModel.swift
+206 -65
View File
@@ -17,20 +17,27 @@ class DashboardViewModel: ObservableObject {
@Published var errorMessage: String?
@Published var selectedAccount: Account?
@Published var showAllAccounts = true
@Published var showingPaywall = false
// MARK: - Chart Data
@Published var evolutionData: [(date: Date, value: Decimal)] = []
// MARK: - Portfolio Forecast
@Published var portfolioForecast: PortfolioForecast?
// MARK: - Dependencies
private let categoryRepository: CategoryRepository
private let sourceRepository: InvestmentSourceRepository
private let snapshotRepository: SnapshotRepository
private let calculationService: CalculationService
private let predictionEngine: PredictionEngine
private var cancellables = Set<AnyCancellable>()
private var isRefreshing = false
private var refreshQueued = false
private var refreshTask: Task<Void, Never>?
private let maxHistoryMonths = 60
// MARK: - Performance: Caching
@@ -51,6 +58,7 @@ class DashboardViewModel: ObservableObject {
self.sourceRepository = sourceRepository ?? InvestmentSourceRepository()
self.snapshotRepository = snapshotRepository ?? SnapshotRepository()
self.calculationService = calculationService ?? .shared
self.predictionEngine = .shared
setupObservers()
loadData()
@@ -128,9 +136,13 @@ class DashboardViewModel: ObservableObject {
guard !isRefreshing else { return }
isRefreshing = true
Task { [weak self] in
// Cancel any previous refresh task to avoid stale updates
refreshTask?.cancel()
refreshTask = Task { [weak self] in
guard let self else { return }
while self.refreshQueued {
while self.refreshQueued && !Task.isCancelled {
self.refreshQueued = false
await self.refreshAllData()
}
@@ -141,6 +153,12 @@ class DashboardViewModel: ObservableObject {
}
}
/// Cancel any ongoing background tasks - call when view disappears
func cancelPendingTasks() {
refreshTask?.cancel()
refreshTask = nil
}
private func refreshAllData() async {
let categories = categoryRepository.categories
let sources = filteredSources()
@@ -171,31 +189,40 @@ class DashboardViewModel: ObservableObject {
let accountFilter = showAllAccounts ? nil : selectedAccount
sourcesNeedingUpdate = sourceRepository.fetchSourcesNeedingUpdate(for: accountFilter)
// Calculate evolution data for chart
updateEvolutionData(from: allSnapshots, categories: categories)
// Calculate evolution data for chart (only completed monthly check-ins)
let completedSnapshots = filterSnapshotsForCharts(
sources: sources,
snapshots: allSnapshots
)
updateEvolutionData(from: completedSnapshots, categories: categories)
latestPortfolioChange = calculateLatestChange(from: evolutionData)
// Calculate portfolio forecast
updatePortfolioForecast()
// Log screen view
FirebaseService.shared.logScreenView(screenName: "Dashboard")
}
private func filteredSources() -> [InvestmentSource] {
let safeSelectedAccountId = selectedAccount?.safeId
// Performance: Cache filtered sources to avoid repeated filtering
let currentHash = sourceRepository.sources.count
let accountChanged = lastAccountId != selectedAccount?.id || lastShowAllAccounts != showAllAccounts
let accountChanged = lastAccountId != safeSelectedAccountId || lastShowAllAccounts != showAllAccounts
if !accountChanged && cachedFilteredSources != nil && cachedSourcesHash == currentHash {
return cachedFilteredSources!
}
lastAccountId = selectedAccount?.id
lastAccountId = safeSelectedAccountId
lastShowAllAccounts = showAllAccounts
cachedSourcesHash = currentHash
if showAllAccounts || selectedAccount == nil {
if showAllAccounts || safeSelectedAccountId == nil {
cachedFilteredSources = sourceRepository.sources
} else {
cachedFilteredSources = sourceRepository.sources.filter { $0.account?.id == selectedAccount?.id }
cachedFilteredSources = sourceRepository.sources.filter { $0.account?.id == safeSelectedAccountId }
}
return cachedFilteredSources!
}
@@ -247,80 +274,51 @@ class DashboardViewModel: ObservableObject {
return EvolutionSummary(evolutionData: [], categorySeries: [], categoryTotals: [:])
}
// Performance: Pre-allocate capacity and use more efficient data structures
let sortedSnapshots = snapshots.sorted { $0.date < $1.date }
// Use dictionary to deduplicate dates more efficiently
var uniqueDateSet = Set<Date>()
uniqueDateSet.reserveCapacity(sortedSnapshots.count)
for snapshot in sortedSnapshots {
uniqueDateSet.insert(Calendar.current.startOfDay(for: snapshot.date))
}
let uniqueDates = uniqueDateSet.sorted()
guard !uniqueDates.isEmpty else {
return EvolutionSummary(evolutionData: [], categorySeries: [], categoryTotals: [:])
let groupedByMonth = Dictionary(grouping: sortedSnapshots) { snapshot -> DateComponents in
let components = Calendar.current.dateComponents([.year, .month], from: snapshot.date)
return DateComponents(year: components.year, month: components.month)
}
// Pre-allocate dictionaries with estimated capacity
var snapshotsBySource: [UUID: [(date: Date, value: Decimal, categoryId: UUID?)]] = [:]
snapshotsBySource.reserveCapacity(Set(sortedSnapshots.compactMap { $0.source?.id }).count)
var evolution: [(date: Date, value: Decimal)] = []
evolution.reserveCapacity(groupedByMonth.count)
var series: [(date: Date, valuesByCategory: [UUID: Decimal])] = []
series.reserveCapacity(groupedByMonth.count)
var categoryTotals: [UUID: Decimal] = [:]
for snapshot in sortedSnapshots {
guard let sourceId = snapshot.source?.id else { continue }
let categoryId = snapshot.source?.category?.id
snapshotsBySource[sourceId, default: []].append(
(date: snapshot.date, value: snapshot.decimalValue, categoryId: categoryId)
)
if let categoryId {
categoryTotals[categoryId, default: 0] += snapshot.decimalValue
for (key, monthSnapshots) in groupedByMonth {
var latestBySource: [UUID: Snapshot] = [:]
for snapshot in monthSnapshots {
guard let sourceId = snapshot.source?.id else { continue }
if let existing = latestBySource[sourceId] {
if snapshot.date > existing.date {
latestBySource[sourceId] = snapshot
}
} else {
latestBySource[sourceId] = snapshot
}
}
}
// Pre-allocate result arrays
var indices: [UUID: Int] = [:]
indices.reserveCapacity(snapshotsBySource.count)
var evolution: [(date: Date, value: Decimal)] = []
evolution.reserveCapacity(uniqueDates.count)
var series: [(date: Date, valuesByCategory: [UUID: Decimal])] = []
series.reserveCapacity(uniqueDates.count)
// Track last known value per source for carry-forward optimization
var lastValues: [UUID: (value: Decimal, categoryId: UUID?)] = [:]
lastValues.reserveCapacity(snapshotsBySource.count)
for (index, date) in uniqueDates.enumerated() {
let nextDate = index + 1 < uniqueDates.count
? uniqueDates[index + 1]
: Date.distantFuture
var total: Decimal = 0
var valuesByCategory: [UUID: Decimal] = [:]
for (sourceId, sourceSnapshots) in snapshotsBySource {
var currentIndex = indices[sourceId] ?? 0
while currentIndex < sourceSnapshots.count && sourceSnapshots[currentIndex].date < nextDate {
let snap = sourceSnapshots[currentIndex]
lastValues[sourceId] = (value: snap.value, categoryId: snap.categoryId)
currentIndex += 1
}
indices[sourceId] = currentIndex
// Use last known value (carry-forward)
if let lastValue = lastValues[sourceId] {
total += lastValue.value
if let categoryId = lastValue.categoryId {
valuesByCategory[categoryId, default: 0] += lastValue.value
}
for snapshot in latestBySource.values {
let value = snapshot.decimalValue
total += value
if let categoryId = snapshot.source?.category?.id {
valuesByCategory[categoryId, default: 0] += value
categoryTotals[categoryId, default: 0] += value
}
}
let date = Calendar.current.date(from: key) ?? Date()
evolution.append((date: date, value: total))
series.append((date: date, valuesByCategory: valuesByCategory))
}
evolution.sort { $0.date < $1.date }
series.sort { $0.date < $1.date }
return EvolutionSummary(
evolutionData: evolution,
categorySeries: series,
@@ -328,6 +326,60 @@ class DashboardViewModel: ObservableObject {
)
}
private func completedMonthKeys(
sources: [InvestmentSource],
snapshots: [Snapshot],
after cutoff: Date
) -> Set<DateComponents> {
let sourceIds = Set(sources.compactMap { $0.id })
guard !sourceIds.isEmpty else { return [] }
let groupedByMonth = Dictionary(grouping: snapshots) { snapshot -> DateComponents in
let components = Calendar.current.dateComponents([.year, .month], from: snapshot.date)
return DateComponents(year: components.year, month: components.month)
}
var completed: Set<DateComponents> = []
completed.reserveCapacity(groupedByMonth.count)
for (key, monthSnapshots) in groupedByMonth {
guard let monthDate = Calendar.current.date(from: key) else { continue }
guard monthDate > cutoff else { continue }
guard MonthlyCheckInStore.completionDate(for: monthDate) != nil else { continue }
let monthSourceIds = Set(monthSnapshots.compactMap { $0.source?.id })
if sourceIds.isSubset(of: monthSourceIds) {
completed.insert(key)
}
}
return completed
}
private func filterSnapshotsForCharts(
sources: [InvestmentSource],
snapshots: [Snapshot]
) -> [Snapshot] {
guard let lastCompleted = MonthlyCheckInStore.latestCompletionDate()?.startOfMonth else {
return []
}
let completedMonthsAfter = completedMonthKeys(
sources: sources,
snapshots: snapshots,
after: lastCompleted
)
return snapshots.filter { snapshot in
let monthDate = snapshot.date.startOfMonth
if monthDate <= lastCompleted {
return true
}
let components = Calendar.current.dateComponents([.year, .month], from: snapshot.date)
let key = DateComponents(year: components.year, month: components.month)
return completedMonthsAfter.contains(key)
}
}
private func calculateLatestChange(from data: [(date: Date, value: Decimal)]) -> PortfolioChange {
guard data.count >= 2 else {
return PortfolioChange(absolute: 0, percentage: 0, label: "since last update")
@@ -341,6 +393,95 @@ class DashboardViewModel: ObservableObject {
return PortfolioChange(absolute: absolute, percentage: percentage, label: "since last update")
}
private func updatePortfolioForecast() {
// Need at least 3 data points for meaningful forecast
guard evolutionData.count >= 3 else {
portfolioForecast = nil
return
}
let currentValue = evolutionData.last?.value ?? 0
// Use the evolution data to predict 12 months ahead
// Create "virtual snapshots" from evolution data for the prediction engine
let virtualSnapshots = evolutionData.map { dataPoint -> VirtualSnapshot in
VirtualSnapshot(date: dataPoint.date, value: dataPoint.value)
}
// Calculate using Holt-Winters or linear trend based on data volatility
let values = virtualSnapshots.map { NSDecimalNumber(decimal: $0.value).doubleValue }
guard values.count >= 3 else {
portfolioForecast = nil
return
}
// Calculate monthly growth rate from recent data
let recentData = Array(virtualSnapshots.suffix(min(12, virtualSnapshots.count)))
guard let firstPoint = recentData.first, let lastPoint = recentData.last,
firstPoint.value > 0 else {
portfolioForecast = nil
return
}
let monthsBetween = max(1, firstPoint.date.monthsBetween(lastPoint.date))
let totalGrowth = lastPoint.value - firstPoint.value
let monthlyGrowth = totalGrowth / Decimal(monthsBetween)
// Project 12 months ahead
let forecastValue = currentValue + (monthlyGrowth * 12)
// Calculate confidence interval based on volatility
let volatility = calculatePortfolioVolatility(from: values)
let confidenceWidth = NSDecimalNumber(decimal: currentValue).doubleValue * volatility * 0.5
portfolioForecast = PortfolioForecast(
currentValue: currentValue,
forecastValue: forecastValue,
forecastDate: Calendar.current.date(byAdding: .month, value: 12, to: Date()) ?? Date(),
confidenceLower: Decimal(max(0, NSDecimalNumber(decimal: forecastValue).doubleValue - confidenceWidth)),
confidenceUpper: forecastValue + Decimal(confidenceWidth),
monthlyGrowthRate: monthlyGrowth,
annualizedGrowthRate: calculateAnnualizedGrowth(from: virtualSnapshots)
)
}
private func calculatePortfolioVolatility(from values: [Double]) -> Double {
guard values.count >= 2 else { return 0 }
var returns: [Double] = []
for i in 1..<values.count {
guard values[i - 1] != 0 else { continue }
let periodReturn = (values[i] - values[i - 1]) / values[i - 1]
returns.append(periodReturn)
}
guard !returns.isEmpty else { return 0 }
let mean = returns.reduce(0, +) / Double(returns.count)
let squaredDiffs = returns.map { pow($0 - mean, 2) }
let variance = squaredDiffs.reduce(0, +) / Double(max(1, returns.count - 1))
return sqrt(variance)
}
private func calculateAnnualizedGrowth(from snapshots: [VirtualSnapshot]) -> Decimal {
guard let first = snapshots.first, let last = snapshots.last,
first.value > 0 else { return 0 }
let monthsBetween = max(1, first.date.monthsBetween(last.date))
let totalReturn = (last.value - first.value) / first.value
// Annualize: (1 + total_return)^(12/months) - 1
let monthlyReturn = totalReturn / Decimal(monthsBetween)
let annualized = monthlyReturn * 12
return annualized
}
// Virtual snapshot for forecast calculations
private struct VirtualSnapshot {
let date: Date
let value: Decimal
}
func goalEtaText(for goal: Goal, currentValue: Decimal) -> String? {
let target = goal.targetDecimal
let lastValue = evolutionData.last?.value ?? currentValue
PortfolioJournal/ViewModels/GoalsViewModel.swift
+21 -22
View File
@@ -21,13 +21,13 @@ class GoalsViewModel: ObservableObject {
private var lastSourcesHash: Int = 0
init(
goalRepository: GoalRepository = GoalRepository(),
sourceRepository: InvestmentSourceRepository = InvestmentSourceRepository(),
snapshotRepository: SnapshotRepository = SnapshotRepository()
goalRepository: GoalRepository? = nil,
sourceRepository: InvestmentSourceRepository? = nil,
snapshotRepository: SnapshotRepository? = nil
) {
self.goalRepository = goalRepository
self.sourceRepository = sourceRepository
self.snapshotRepository = snapshotRepository
self.goalRepository = goalRepository ?? GoalRepository()
self.sourceRepository = sourceRepository ?? InvestmentSourceRepository()
self.snapshotRepository = snapshotRepository ?? SnapshotRepository()
setupObservers()
refresh()
@@ -69,9 +69,9 @@ class GoalsViewModel: ObservableObject {
}
func totalValue(for goal: Goal) -> Decimal {
if let account = goal.account {
if let accountId = goal.account?.safeId {
return sourceRepository.sources
.filter { $0.account?.id == account.id }
.filter { $0.account?.id == accountId }
.reduce(Decimal.zero) { $0 + $1.latestValue }
}
return totalValue
@@ -143,8 +143,8 @@ class GoalsViewModel: ObservableObject {
}
let sources: [InvestmentSource]
if let account = goal.account {
sources = sourceRepository.sources.filter { $0.account?.id == account.id }
if let accountId = goal.account?.safeId {
sources = sourceRepository.sources.filter { $0.account?.id == accountId }
} else {
sources = sourceRepository.sources
}
@@ -155,7 +155,7 @@ class GoalsViewModel: ObservableObject {
}
// Performance: Use cached evolution data if available
let cacheKey = goal.account?.id ?? UUID(uuidString: "00000000-0000-0000-0000-000000000000")!
let cacheKey = goal.account?.safeId ?? UUID(uuidString: "00000000-0000-0000-0000-000000000000")!
let evolutionData: [(date: Date, value: Decimal)]
if let cached = cachedEvolutionData[cacheKey] {
evolutionData = cached
@@ -251,7 +251,8 @@ class GoalsViewModel: ObservableObject {
// MARK: - Private helpers
private func loadGoals() {
if showAllAccounts || selectedAccount == nil {
let selectedAccountId = selectedAccount?.safeId
if showAllAccounts || selectedAccountId == nil {
goalRepository.fetchGoals()
} else if let account = selectedAccount {
goalRepository.fetchGoals(for: account)
@@ -259,27 +260,25 @@ class GoalsViewModel: ObservableObject {
}
private func updateGoals(using repositoryGoals: [Goal]) {
if showAllAccounts || selectedAccount == nil {
let selectedAccountId = selectedAccount?.safeId
if showAllAccounts || selectedAccountId == nil {
goals = repositoryGoals
} else if let account = selectedAccount {
goals = repositoryGoals.filter { $0.account?.id == account.id }
} else {
goals = repositoryGoals
goals = repositoryGoals.filter { $0.account?.id == selectedAccountId }
}
updateTotalValue()
}
private func updateTotalValue() {
if showAllAccounts || selectedAccount == nil {
let selectedAccountId = selectedAccount?.safeId
if showAllAccounts || selectedAccountId == nil {
totalValue = sourceRepository.sources.reduce(Decimal.zero) { $0 + $1.latestValue }
return
}
if let account = selectedAccount {
totalValue = sourceRepository.sources
.filter { $0.account?.id == account.id }
.reduce(Decimal.zero) { $0 + $1.latestValue }
}
totalValue = sourceRepository.sources
.filter { $0.account?.id == selectedAccountId }
.reduce(Decimal.zero) { $0 + $1.latestValue }
}
}
PortfolioJournal/ViewModels/MonthlyCheckInViewModel.swift
+3 -2
View File
@@ -112,10 +112,11 @@ class MonthlyCheckInViewModel: ObservableObject {
}
private func filteredSources() -> [InvestmentSource] {
if showAllAccounts || selectedAccount == nil {
let selectedAccountId = selectedAccount?.safeId
if showAllAccounts || selectedAccountId == nil {
return sourceRepository.sources
}
return sourceRepository.sources.filter { $0.account?.id == selectedAccount?.id }
return sourceRepository.sources.filter { $0.account?.id == selectedAccountId }
}
private func filteredSnapshots(for sources: [InvestmentSource]) -> [Snapshot] {
PortfolioJournal/ViewModels/SettingsViewModel.swift
+162 -40
View File
@@ -83,14 +83,28 @@ class SettingsViewModel: ObservableObject {
currencyCode = settings.currency
inputMode = InputMode(rawValue: settings.inputMode) ?? .simple
// Load statistics
totalSources = sourceRepository.sourceCount
totalCategories = categoryRepository.categories.count
totalSnapshots = sourceRepository.sources.reduce(0) { $0 + $1.snapshotCount }
// Load statistics directly from database to avoid async race conditions
loadStatistics()
FirebaseService.shared.logScreenView(screenName: "Settings")
}
private func loadStatistics() {
let context = CoreDataStack.shared.viewContext
// Fetch source count directly
let sourceRequest: NSFetchRequest<InvestmentSource> = InvestmentSource.fetchRequest()
totalSources = (try? context.count(for: sourceRequest)) ?? 0
// Fetch category count directly
let categoryRequest: NSFetchRequest<Category> = Category.fetchRequest()
totalCategories = (try? context.count(for: categoryRequest)) ?? 0
// Fetch snapshot count directly
let snapshotRequest: NSFetchRequest<Snapshot> = Snapshot.fetchRequest()
totalSnapshots = (try? context.count(for: snapshotRequest)) ?? 0
}
// MARK: - Premium Actions
func upgradeToPremium() {
@@ -142,6 +156,16 @@ class SettingsViewModel: ObservableObject {
// MARK: - Export
@Published var isExporting = false
@Published var exportProgress: Double = 0
@Published var exportStatus = ""
@Published var shareItem: ShareItem?
struct ShareItem: Identifiable {
let id = UUID()
let url: URL
}
func exportData(format: ExportService.ExportFormat) {
guard freemiumValidator.canExport() else {
showingPaywall = true
@@ -149,19 +173,79 @@ class SettingsViewModel: ObservableObject {
return
}
guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
let viewController = windowScene.windows.first?.rootViewController else {
return
}
isExporting = true
exportProgress = 0
exportStatus = "Preparing export..."
ExportService.shared.share(
format: format,
sources: sourceRepository.sources,
categories: categoryRepository.categories,
from: viewController
)
Task {
// Fetch data directly from database
let context = CoreDataStack.shared.viewContext
let sources = fetchAllSources(in: context)
let categories = fetchAllCategories(in: context)
await MainActor.run {
exportProgress = 0.3
exportStatus = "Generating \(format.rawValue) file..."
}
let content: String
let fileName: String
switch format {
case .csv:
content = ExportService.shared.exportToCSV(sources: sources, categories: categories)
fileName = "investment_tracker_export.csv"
case .json:
content = ExportService.shared.exportToJSON(sources: sources, categories: categories)
fileName = "investment_tracker_export.json"
}
await MainActor.run {
exportProgress = 0.7
exportStatus = "Saving file..."
}
// Create temporary file
let tempURL = FileManager.default.temporaryDirectory
.appendingPathComponent(fileName)
do {
try content.write(to: tempURL, atomically: true, encoding: .utf8)
await MainActor.run {
exportProgress = 1.0
exportStatus = "Export complete"
isExporting = false
showingExportOptions = false
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
self?.shareItem = ShareItem(url: tempURL)
}
FirebaseService.shared.logExportAttempt(format: format.rawValue, success: true)
}
} catch {
await MainActor.run {
isExporting = false
errorMessage = "Export failed: \(error.localizedDescription)"
FirebaseService.shared.logExportAttempt(format: format.rawValue, success: false)
}
}
}
}
private func fetchAllSources(in context: NSManagedObjectContext) -> [InvestmentSource] {
let request: NSFetchRequest<InvestmentSource> = InvestmentSource.fetchRequest()
request.sortDescriptors = [NSSortDescriptor(keyPath: \InvestmentSource.name, ascending: true)]
return (try? context.fetch(request)) ?? []
}
private func fetchAllCategories(in context: NSManagedObjectContext) -> [Category] {
let request: NSFetchRequest<Category> = Category.fetchRequest()
request.sortDescriptors = [NSSortDescriptor(keyPath: \Category.name, ascending: true)]
return (try? context.fetch(request)) ?? []
}
// Share sheet is presented in SettingsView using shareItem.
var canExport: Bool {
freemiumValidator.canExport()
}
@@ -202,41 +286,79 @@ class SettingsViewModel: ObservableObject {
// MARK: - Data Management
func resetAllData() {
isLoading = true
errorMessage = nil
let context = CoreDataStack.shared.viewContext
let entityNames = [
"Snapshot",
"InvestmentSource",
"Category",
"Asset",
"Account",
"Goal",
"Transaction",
"PredictionCache"
]
// Delete all snapshots, sources, and categories
for source in sourceRepository.sources {
context.delete(source)
}
for category in categoryRepository.categories {
context.delete(category)
}
let assetRequest: NSFetchRequest<Asset> = Asset.fetchRequest()
let accountRequest: NSFetchRequest<Account> = Account.fetchRequest()
let goalRequest: NSFetchRequest<Goal> = Goal.fetchRequest()
if let assets = try? context.fetch(assetRequest) {
assets.forEach { context.delete($0) }
}
if let accounts = try? context.fetch(accountRequest) {
accounts.forEach { context.delete($0) }
}
if let goals = try? context.fetch(goalRequest) {
goals.forEach { context.delete($0) }
context.performAndWait {
var deletedObjectIDs: [NSManagedObjectID] = []
for name in entityNames {
let fetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: name)
let deleteRequest = NSBatchDeleteRequest(fetchRequest: fetchRequest)
deleteRequest.resultType = .resultTypeObjectIDs
if let result = try? context.execute(deleteRequest) as? NSBatchDeleteResult,
let objectIDs = result.result as? [NSManagedObjectID] {
deletedObjectIDs.append(contentsOf: objectIDs)
}
}
if !deletedObjectIDs.isEmpty {
NSManagedObjectContext.mergeChanges(
fromRemoteContextSave: [NSDeletedObjectsKey: deletedObjectIDs],
into: [context]
)
}
}
CoreDataStack.shared.save()
context.reset()
// Clear notifications
context.performAndWait {
// Recreate default categories
let categoryCount = (try? context.count(for: Category.fetchRequest())) ?? 0
if categoryCount == 0 {
Category.createDefaultCategories(in: context)
}
// Recreate default account
let accountCount = (try? context.count(for: Account.fetchRequest())) ?? 0
if accountCount == 0 {
let defaultCurrency = AppSettings.getOrCreate(in: context).currency
let account = Account(context: context)
account.name = Account.defaultAccountName
account.currency = defaultCurrency
account.inputMode = InputMode.simple.rawValue
account.notificationFrequency = NotificationFrequency.monthly.rawValue
account.customFrequencyMonths = 1
account.sortOrder = 0
}
let settings = AppSettings.getOrCreate(in: context)
settings.selectedAccountId = nil
settings.showAllAccounts = true
try? context.save()
}
// Clear notifications + monthly check-ins
notificationService.cancelAllReminders()
MonthlyCheckInStore.clearAll()
CoreDataStack.shared.refreshWidgetData()
// Recreate default categories
categoryRepository.createDefaultCategoriesIfNeeded()
_ = AccountRepository().createDefaultAccountIfNeeded()
// Reload data
loadSettings()
isLoading = false
successMessage = "All data has been reset"
NotificationCenter.default.post(name: .didResetData, object: nil)
}
// MARK: - Computed Properties
PortfolioJournal/ViewModels/SourceDetailViewModel.swift
+24 -10
View File
@@ -36,6 +36,7 @@ class SourceDetailViewModel: ObservableObject {
private var cancellables = Set<AnyCancellable>()
private var isRefreshing = false
private var refreshQueued = false
private var refreshTask: Task<Void, Never>?
// MARK: - Initialization
@@ -97,15 +98,21 @@ class SourceDetailViewModel: ObservableObject {
guard !isRefreshing else { return }
isRefreshing = true
Task { [weak self] in
// Cancel any previous refresh task to avoid stale updates
refreshTask?.cancel()
refreshTask = Task { [weak self] in
guard let self else { return }
while self.refreshQueued {
while self.refreshQueued && !Task.isCancelled {
self.refreshQueued = false
// Fetch snapshots (filtered by freemium limits)
let allSnapshots = snapshotRepository.fetchSnapshots(for: source)
let filteredSnapshots = freemiumValidator.filterSnapshots(allSnapshots)
// Check for cancellation before updating UI
guard !Task.isCancelled else { break }
// Performance: Only update if data actually changed
let snapshotsChanged = filteredSnapshots.count != self.snapshots.count ||
filteredSnapshots.first?.date != self.snapshots.first?.date
@@ -139,6 +146,12 @@ class SourceDetailViewModel: ObservableObject {
}
}
/// Cancel any ongoing background tasks - call when view disappears
func cancelPendingTasks() {
refreshTask?.cancel()
refreshTask = nil
}
// MARK: - Snapshot Actions
func addSnapshot(date: Date, value: Decimal, contribution: Decimal?, notes: String?) {
@@ -288,21 +301,22 @@ class SourceDetailViewModel: ObservableObject {
}
var isHistoryLimited: Bool {
!freemiumValidator.isPremium && hiddenSnapshotCount > 0
!freemiumValidator.isPremium
}
var hiddenSnapshotCount: Int {
guard let limit = snapshotDisplayLimit else { return 0 }
return max(0, snapshots.count - min(limit, snapshots.count))
}
// For free users, count how many snapshots are hidden due to the 12-month limit
guard !freemiumValidator.isPremium else { return 0 }
var snapshotDisplayLimit: Int? {
freemiumValidator.isPremium ? nil : 10
// Get all snapshots without the date filter
let allSnapshots = snapshotRepository.fetchSnapshots(for: source)
return max(0, allSnapshots.count - snapshots.count)
}
var visibleSnapshots: [Snapshot] {
guard let limit = snapshotDisplayLimit else { return snapshots }
return Array(snapshots.prefix(limit))
// Premium users see all snapshots (already filtered by freemiumValidator in refreshData)
// Free users also see all their filtered snapshots (limited to last 12 months)
snapshots
}
private func isRelevantChange(_ notification: Notification) -> Bool {
PortfolioJournal/ViewModels/SourceListViewModel.swift
+3 -2
View File
@@ -83,8 +83,9 @@ class SourceListViewModel: ObservableObject {
private func filterAndSortSources(_ allSources: [InvestmentSource]) {
var filtered = allSources
if !showAllAccounts, let account = selectedAccount {
filtered = filtered.filter { $0.account?.id == account.id }
let selectedAccountId = selectedAccount?.safeId
if !showAllAccounts, let selectedAccountId {
filtered = filtered.filter { $0.account?.id == selectedAccountId }
}
// Filter by category
PortfolioJournal/Views/Accounts/AccountEditorView.swift
+43 -14
View File
@@ -18,7 +18,18 @@ struct AccountEditorView: View {
NavigationStack {
Form {
Section {
TextField("Account name", text: $name)
if isEditingDefaultAccount {
HStack {
Text(Account.defaultAccountName)
.foregroundColor(.secondary)
Spacer()
Image(systemName: "lock.fill")
.font(.caption)
.foregroundColor(.secondary)
}
} else {
TextField("Account name", text: $name)
}
Picker("Currency", selection: $currencyCode) {
ForEach(CurrencyPicker.commonCodes, id: \.self) { code in
Text(code).tag(code)
@@ -30,6 +41,8 @@ struct AccountEditorView: View {
if let errorMessage {
Text(errorMessage)
.foregroundColor(.negativeRed)
} else if isEditingDefaultAccount {
Text("The Default account name cannot be changed.")
}
}
@@ -67,9 +80,16 @@ struct AccountEditorView: View {
.presentationDetents([.large])
}
private var isEditingDefaultAccount: Bool {
account?.isDefaultAccount == true
}
private var isValid: Bool {
if isEditingDefaultAccount {
return true // Can only edit currency/inputMode for Default account
}
let trimmed = name.trimmingCharacters(in: .whitespaces)
return !trimmed.isEmpty && !isDuplicateName(trimmed)
return !trimmed.isEmpty && errorMessage == nil
}
private func validateName() {
@@ -78,17 +98,24 @@ struct AccountEditorView: View {
errorMessage = nil
return
}
errorMessage = isDuplicateName(trimmed) ? "An account with this name already exists." : nil
}
private func isDuplicateName(_ trimmed: String) -> Bool {
let normalized = trimmed.lowercased()
return accountRepository.accounts.contains { existing in
if let account, existing.id == account.id {
return false
// Check if trying to use reserved "Default" name for a non-default account
if trimmed.lowercased() == Account.defaultAccountName.lowercased() {
let isCreatingNew = account == nil
let isEditingNonDefault = account != nil && !account!.isDefaultAccount
if isCreatingNew || isEditingNonDefault {
errorMessage = "The name '\(Account.defaultAccountName)' is reserved."
return
}
return (existing.name).trimmingCharacters(in: .whitespaces).lowercased() == normalized
}
// Check for duplicate names
if !accountRepository.isNameAvailable(trimmed, excludingAccountId: account?.safeId) {
errorMessage = "An account with this name already exists."
return
}
errorMessage = nil
}
private func loadAccount() {
@@ -102,15 +129,17 @@ struct AccountEditorView: View {
}
private func saveAccount() {
validateName()
guard errorMessage == nil else { return }
let trimmedName = name.trimmingCharacters(in: .whitespaces)
if !isEditingDefaultAccount {
validateName()
guard errorMessage == nil else { return }
}
let trimmedName = isEditingDefaultAccount ? Account.defaultAccountName : name.trimmingCharacters(in: .whitespaces)
let enforcedFrequency: NotificationFrequency = .monthly
let enforcedCustomMonths = 1
if let account {
accountRepository.updateAccount(
account,
name: trimmedName,
name: isEditingDefaultAccount ? nil : trimmedName, // Don't update name for Default account
currency: currencyCode,
inputMode: inputMode,
notificationFrequency: enforcedFrequency,
PortfolioJournal/Views/Accounts/AccountsView.swift
+34 -13
View File
@@ -8,6 +8,11 @@ struct AccountsView: View {
@State private var selectedAccount: Account?
@State private var showingPaywall = false
@State private var accountToDelete: Account?
@State private var showingDeleteBlocked = false
private var availableAccounts: [Account] {
accountRepository.accounts.filter { $0.safeId != nil }
}
var body: some View {
ZStack {
@@ -15,37 +20,47 @@ struct AccountsView: View {
List {
Section {
ForEach(accountRepository.accounts) { account in
ForEach(availableAccounts, id: \.objectID) { account in
let canDelete = accountRepository.canDeleteAccount(account)
Button {
selectedAccount = account
} label: {
HStack {
VStack(alignment: .leading) {
Text(account.name)
.font(.headline)
HStack(spacing: 4) {
Text(account.name)
.font(.headline)
if account.isDefaultAccount {
Image(systemName: "star.fill")
.font(.caption2)
.foregroundColor(.appWarning)
}
}
Text(account.currencyCode ?? AppSettings.getOrCreate(in: CoreDataStack.shared.viewContext).currency)
.font(.caption)
.foregroundColor(.secondary)
}
Spacer()
if accountStore.selectedAccount?.id == account.id && !accountStore.showAllAccounts {
if accountStore.selectedAccount?.safeId == account.safeId && !accountStore.showAllAccounts {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.appPrimary)
}
}
}
.swipeActions(edge: .trailing) {
Button(role: .destructive) {
accountToDelete = account
} label: {
Label("Delete", systemImage: "trash")
if canDelete {
Button(role: .destructive) {
accountToDelete = account
} label: {
Label("Delete", systemImage: "trash")
}
}
}
}
} header: {
Text("Accounts")
} footer: {
Text(iapService.isPremium ? "Create multiple accounts for business, family, or goals." : "Free users can create one account.")
Text(iapService.isPremium ? "Create multiple accounts for business, family, or goals. The Default account cannot be deleted." : "Free users can create one account.")
}
}
.scrollContentBackground(.hidden)
@@ -61,14 +76,20 @@ struct AccountsView: View {
) {
Button("Delete", role: .destructive) {
guard let accountToDelete else { return }
if accountStore.selectedAccount?.id == accountToDelete.id {
accountStore.selectAllAccounts()
if accountRepository.canDeleteAccount(accountToDelete) {
accountRepository.deleteAccount(accountToDelete)
} else {
showingDeleteBlocked = true
}
accountRepository.deleteAccount(accountToDelete)
self.accountToDelete = nil
}
} message: {
Text("This will remove the account and unlink its sources.")
Text("This will remove the account and all its sources and snapshots.")
}
.alert("Cannot Delete Account", isPresented: $showingDeleteBlocked) {
Button("OK") {}
} message: {
Text("The Default account cannot be deleted. You must keep at least one account.")
}
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
PortfolioJournal/Views/Charts/ChartsContainerView.swift
+6 -2
View File
@@ -260,13 +260,13 @@ struct ChartsContainerView: View {
Divider()
ForEach(accountStore.accounts) { account in
ForEach(availableAccounts, id: \.objectID) { account in
Button {
accountStore.selectAccount(account)
} label: {
HStack {
Text(account.name)
if accountStore.selectedAccount?.id == account.id && !accountStore.showAllAccounts {
if accountStore.selectedAccount?.safeId == account.safeId && !accountStore.showAllAccounts {
Image(systemName: "checkmark")
}
}
@@ -276,6 +276,10 @@ struct ChartsContainerView: View {
Image(systemName: "person.2.circle")
}
}
private var availableAccounts: [Account] {
accountStore.accounts.filter { $0.safeId != nil }
}
}
// MARK: - Chart Type Button
PortfolioJournal/Views/Dashboard/DashboardView.swift
+97 -3
View File
@@ -89,6 +89,9 @@ struct DashboardView: View {
.sheet(isPresented: $showingCustomize) {
DashboardCustomizeView(configs: $sectionConfigs)
}
.sheet(isPresented: $viewModel.showingPaywall) {
PaywallView()
}
}
}
@@ -107,13 +110,13 @@ struct DashboardView: View {
Divider()
ForEach(accountStore.accounts) { account in
ForEach(availableAccounts, id: \.objectID) { account in
Button {
accountStore.selectAccount(account)
} label: {
HStack {
Text(account.name)
if accountStore.selectedAccount?.id == account.id && !accountStore.showAllAccounts {
if accountStore.selectedAccount?.safeId == account.safeId && !accountStore.showAllAccounts {
Image(systemName: "checkmark")
}
}
@@ -124,6 +127,10 @@ struct DashboardView: View {
}
}
private var availableAccounts: [Account] {
accountStore.accounts.filter { $0.safeId != nil }
}
private var visibleSections: [DashboardSectionConfig] {
sectionConfigs.filter { $0.isVisible }
}
@@ -144,7 +151,16 @@ struct DashboardView: View {
changeLabel: calmModeEnabled ? "since last update" : "today",
isPositive: calmModeEnabled
? viewModel.latestPortfolioChange.absolute >= 0
: viewModel.isDayChangePositive
: viewModel.isDayChangePositive,
forecast: viewModel.portfolioForecast,
isPremium: iapService.isPremium,
onUnlockTap: {
viewModel.showingPaywall = true
},
yearChange: viewModel.portfolioSummary.formattedYearChange,
sinceInceptionChange: viewModel.portfolioSummary.formattedAllTimeReturn,
isYearPositive: viewModel.isYearChangePositive,
isSinceInceptionPositive: viewModel.portfolioSummary.allTimeReturn >= 0
)
}
case .monthlyCheckIn:
@@ -243,6 +259,13 @@ struct TotalValueCard: View {
let changeText: String
let changeLabel: String
let isPositive: Bool
var forecast: PortfolioForecast?
var isPremium: Bool = false
var onUnlockTap: (() -> Void)?
var yearChange: String?
var sinceInceptionChange: String?
var isYearPositive: Bool = true
var isSinceInceptionPositive: Bool = true
var body: some View {
VStack(spacing: 8) {
@@ -264,6 +287,77 @@ struct TotalValueCard: View {
.foregroundColor(.white.opacity(0.8))
}
.foregroundColor(.white)
// YoY and Since Inception returns
if yearChange != nil || sinceInceptionChange != nil {
HStack(spacing: 16) {
if let yearChange = yearChange {
VStack(spacing: 2) {
Text("YoY")
.font(.caption2)
.foregroundColor(.white.opacity(0.7))
Text(yearChange)
.font(.caption.weight(.semibold))
.foregroundColor(.white)
}
}
if let sinceInceptionChange = sinceInceptionChange {
VStack(spacing: 2) {
Text("Since inception")
.font(.caption2)
.foregroundColor(.white.opacity(0.7))
Text(sinceInceptionChange)
.font(.caption.weight(.semibold))
.foregroundColor(.white)
}
}
}
.padding(.top, 4)
}
// Forecast section
if let forecast = forecast {
Divider()
.background(Color.white.opacity(0.3))
.padding(.vertical, 8)
if isPremium {
VStack(spacing: 4) {
HStack(spacing: 4) {
Image(systemName: "wand.and.stars")
.font(.caption)
Text("12-month forecast")
.font(.caption)
}
.foregroundColor(.white.opacity(0.85))
Text(forecast.formattedForecastValue)
.font(.title2.weight(.bold))
.foregroundColor(.white)
Text(forecast.formattedGrowthPercentage)
.font(.caption.weight(.semibold))
.foregroundColor(forecast.isPositiveGrowth ? .white : .white.opacity(0.8))
}
} else {
Button {
onUnlockTap?()
} label: {
HStack(spacing: 6) {
Image(systemName: "lock.fill")
.font(.caption)
Text("Unlock 12-month forecast")
.font(.caption.weight(.semibold))
}
.foregroundColor(.white)
.padding(.horizontal, 12)
.padding(.vertical, 6)
.background(Color.white.opacity(0.2))
.cornerRadius(16)
}
}
}
}
.frame(maxWidth: .infinity)
.padding(.vertical, 24)
PortfolioJournal/Views/Settings/ImportDataView.swift
+40 -19
View File
@@ -36,6 +36,10 @@ struct ImportDataView: View {
private let accountRepository = AccountRepository()
private var availableAccounts: [Account] {
accountStore.accounts.filter { $0.safeId != nil }
}
init(importContext: ImportContext = .settings) {
self.importContext = importContext
}
@@ -146,8 +150,17 @@ struct ImportDataView: View {
Text(errorMessage ?? "")
}
.onAppear {
if selectedAccountId == nil {
selectedAccountId = accountStore.selectedAccount?.id ?? accountStore.accounts.first?.id
// Ensure selectedAccountId is valid and exists in availableAccounts
let validIds = Set(availableAccounts.compactMap { $0.safeId })
if selectedAccountId == nil || !validIds.contains(selectedAccountId!) {
selectedAccountId = accountStore.selectedAccount?.safeId ?? availableAccounts.first?.safeId
}
}
.onChange(of: availableAccounts) { _, newAccounts in
// Re-validate selectedAccountId when accounts change
let validIds = Set(newAccounts.compactMap { $0.safeId })
if let currentId = selectedAccountId, !validIds.contains(currentId) {
selectedAccountId = newAccounts.first?.safeId
}
}
.onChange(of: accountSelection) { _, _ in
@@ -219,18 +232,17 @@ Personal,Stocks,Index Fund,2024-01-01,15000,12000,Long-term
}
private var shouldShowAccountSelection: Bool {
importContext == .onboarding
// Show account selection when there are multiple accounts (Premium) or during onboarding
iapService.isPremium && availableAccounts.count > 1 || importContext == .onboarding
}
private var importFooterText: String {
if importContext == .onboarding {
if shouldShowAccountSelection {
return iapService.isPremium
? "Import will be added to the selected account."
: "Free users import into the existing account."
: "Free users import into the Default account."
}
return iapService.isPremium
? "Accounts are imported as provided."
: "Free users import into the selected account."
return "Data will be imported into your Default account."
}
private var accountSection: some View {
@@ -245,8 +257,8 @@ Personal,Stocks,Index Fund,2024-01-01,15000,12000,Long-term
if accountSelection == .existing {
Picker("Import into", selection: $selectedAccountId) {
ForEach(accountStore.accounts) { account in
Text(account.name).tag(Optional(account.id))
ForEach(availableAccounts, id: \.objectID) { account in
Text(account.name).tag(Optional(account.safeId))
}
}
.disabled(isImporting)
@@ -273,9 +285,9 @@ Personal,Stocks,Index Fund,2024-01-01,15000,12000,Long-term
}
private var selectedAccountName: String? {
accountStore.accounts.first { $0.id == selectedAccountId }?.name
availableAccounts.first { $0.safeId == selectedAccountId }?.name
?? accountStore.selectedAccount?.name
?? accountStore.accounts.first?.name
?? availableAccounts.first?.name
}
private func validateNewAccountName() -> String? {
@@ -355,12 +367,17 @@ Personal,Stocks,Index Fund,2024-01-01,15000,12000,Long-term
}
private func handleImportContent(_ content: String) {
let shouldForceSingleAccount = importContext == .onboarding
let allowMultipleAccounts = iapService.isPremium && !shouldForceSingleAccount
var defaultAccountName = accountStore.selectedAccount?.name
?? accountStore.accounts.first?.name
// For non-Premium users or when only one account exists, use the Default account
// For Premium users with multiple accounts, respect their selection
let useAccountSelection = shouldShowAccountSelection && iapService.isPremium
let allowMultipleAccounts = false // Always import into a single account
if shouldForceSingleAccount && iapService.isPremium {
var defaultAccountName = accountStore.accounts.first(where: { $0.isDefaultAccount })?.name
?? accountStore.selectedAccount?.name
?? accountStore.accounts.first?.name
?? Account.defaultAccountName
if useAccountSelection {
if accountSelection == .new {
accountErrorMessage = validateNewAccountName()
guard accountErrorMessage == nil else { return }
@@ -375,7 +392,7 @@ Personal,Stocks,Index Fund,2024-01-01,15000,12000,Long-term
)
defaultAccountName = account.name
} else {
defaultAccountName = selectedAccountName
defaultAccountName = selectedAccountName ?? defaultAccountName
}
}
@@ -397,7 +414,11 @@ Personal,Stocks,Index Fund,2024-01-01,15000,12000,Long-term
isImporting = false
if importResult.errors.isEmpty {
resultMessage = "Imported \(importResult.sourcesCreated) sources and \(importResult.snapshotsCreated) snapshots."
var message = "Imported \(importResult.sourcesCreated) sources and \(importResult.snapshotsCreated) snapshots."
if importResult.snapshotsUpdated > 0 {
message += " Updated \(importResult.snapshotsUpdated) existing snapshots."
}
resultMessage = message
tabSelection.selectedTab = 0
dismiss()
} else {
PortfolioJournal/Views/Settings/SettingsView.swift
+70 -34
View File
@@ -1,5 +1,6 @@
import SwiftUI
import StoreKit
import SwiftUI
import UIKit
struct SettingsView: View {
private let iapService: IAPService
@@ -67,6 +68,9 @@ struct SettingsView: View {
.sheet(isPresented: $viewModel.showingExportOptions) {
ExportOptionsSheet(viewModel: viewModel)
}
.sheet(item: $viewModel.shareItem) { shareItem in
ActivityView(activityItems: [shareItem.url])
}
.sheet(isPresented: $viewModel.showingImportSheet) {
ImportDataView()
}
@@ -578,6 +582,22 @@ struct SettingsView: View {
}
}
// MARK: - Activity View
struct ActivityView: UIViewControllerRepresentable {
let activityItems: [Any]
let applicationActivities: [UIActivity]? = nil
func makeUIViewController(context: Context) -> UIActivityViewController {
UIActivityViewController(
activityItems: activityItems,
applicationActivities: applicationActivities
)
}
func updateUIViewController(_ uiViewController: UIActivityViewController, context: Context) {}
}
// MARK: - Export Options Sheet
struct ExportOptionsSheet: View {
@@ -587,59 +607,75 @@ struct ExportOptionsSheet: View {
var body: some View {
NavigationStack {
List {
Section {
Button {
viewModel.exportData(format: .csv)
dismiss()
} label: {
HStack {
Image(systemName: "tablecells")
.foregroundColor(.positiveGreen)
.frame(width: 30)
if viewModel.isExporting {
Section {
VStack(alignment: .leading, spacing: 12) {
ProgressView(value: viewModel.exportProgress)
.progressViewStyle(.linear)
VStack(alignment: .leading) {
Text("CSV")
.font(.headline)
Text("Compatible with Excel, Google Sheets")
.font(.caption)
.foregroundColor(.secondary)
Text(viewModel.exportStatus)
.font(.caption)
.foregroundColor(.secondary)
}
.padding(.vertical, 8)
} header: {
Text("Exporting...")
}
} else {
Section {
Button {
viewModel.exportData(format: .csv)
} label: {
HStack {
Image(systemName: "tablecells")
.foregroundColor(.positiveGreen)
.frame(width: 30)
VStack(alignment: .leading) {
Text("CSV")
.font(.headline)
Text("Compatible with Excel, Google Sheets")
.font(.caption)
.foregroundColor(.secondary)
}
}
}
}
Button {
viewModel.exportData(format: .json)
dismiss()
} label: {
HStack {
Image(systemName: "doc.text")
.foregroundColor(.appPrimary)
.frame(width: 30)
Button {
viewModel.exportData(format: .json)
} label: {
HStack {
Image(systemName: "doc.text")
.foregroundColor(.appPrimary)
.frame(width: 30)
VStack(alignment: .leading) {
Text("JSON")
.font(.headline)
Text("Full data structure for backup")
.font(.caption)
.foregroundColor(.secondary)
VStack(alignment: .leading) {
Text("JSON")
.font(.headline)
Text("Full data structure for backup")
.font(.caption)
.foregroundColor(.secondary)
}
}
}
} header: {
Text("Select Format")
}
} header: {
Text("Select Format")
}
}
.navigationTitle("Export Data")
.navigationTitle(viewModel.isExporting ? "Exporting" : "Export Data")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .navigationBarTrailing) {
Button("Cancel") {
dismiss()
}
.disabled(viewModel.isExporting)
}
}
}
.presentationDetents([.medium])
.interactiveDismissDisabled(viewModel.isExporting)
}
}
PortfolioJournal/Views/Sources/AddSourceView.swift
+46 -11
View File
@@ -10,19 +10,28 @@ struct AddSourceView: View {
@State private var initialValue = ""
@State private var showingCategoryPicker = false
@State private var selectedAccountId: UUID?
@State private var duplicateError: String?
@StateObject private var categoryRepository = CategoryRepository()
@StateObject private var sourceRepository = InvestmentSourceRepository()
private var availableAccounts: [Account] {
accountStore.accounts.filter { $0.safeId != nil }
}
var body: some View {
NavigationStack {
Form {
if accountStore.accounts.count > 1 {
if availableAccounts.count > 1 {
Section {
Picker("Account", selection: $selectedAccountId) {
ForEach(accountStore.accounts) { account in
Text(account.name).tag(Optional(account.id))
ForEach(availableAccounts, id: \.objectID) { account in
Text(account.name).tag(Optional(account.safeId))
}
}
.onChange(of: selectedAccountId) { _, _ in
validateSourceName(name)
}
} header: {
Text("Account")
}
@@ -32,6 +41,9 @@ struct AddSourceView: View {
Section {
TextField("Source Name", text: $name)
.textContentType(.organizationName)
.onChange(of: name) { _, newValue in
validateSourceName(newValue)
}
Button {
showingCategoryPicker = true
@@ -61,6 +73,11 @@ struct AddSourceView: View {
}
} header: {
Text("Source Information")
} footer: {
if let error = duplicateError {
Text(error)
.foregroundColor(.negativeRed)
}
}
// Initial Value (Optional)
@@ -107,7 +124,7 @@ struct AddSourceView: View {
selectedCategory = categoryRepository.categories.first
}
if selectedAccountId == nil {
selectedAccountId = accountStore.selectedAccount?.id ?? accountStore.accounts.first?.id
selectedAccountId = accountStore.selectedAccount?.safeId ?? availableAccounts.first?.safeId
}
}
}
@@ -116,7 +133,21 @@ struct AddSourceView: View {
// MARK: - Validation
private var isValid: Bool {
!name.trimmingCharacters(in: .whitespaces).isEmpty && selectedCategory != nil
!name.trimmingCharacters(in: .whitespaces).isEmpty && selectedCategory != nil && duplicateError == nil
}
private func validateSourceName(_ newName: String) {
let trimmed = newName.trimmingCharacters(in: .whitespacesAndNewlines)
guard !trimmed.isEmpty else {
duplicateError = nil
return
}
if sourceRepository.sourceExists(name: trimmed, in: selectedAccount) {
duplicateError = "A source with this name already exists."
} else {
duplicateError = nil
}
}
// MARK: - Save
@@ -177,7 +208,7 @@ struct AddSourceView: View {
private var selectedAccount: Account? {
guard let id = selectedAccountId else { return nil }
return accountStore.accounts.first { $0.id == id }
return availableAccounts.first { $0.safeId == id }
}
}
@@ -248,17 +279,17 @@ struct EditSourceView: View {
self.source = source
_name = State(initialValue: source.name)
_selectedCategory = State(initialValue: source.category)
_selectedAccountId = State(initialValue: source.account?.id)
_selectedAccountId = State(initialValue: source.account?.safeId)
}
var body: some View {
NavigationStack {
Form {
if accountStore.accounts.count > 1 {
if availableAccounts.count > 1 {
Section {
Picker("Account", selection: $selectedAccountId) {
ForEach(accountStore.accounts) { account in
Text(account.name).tag(Optional(account.id))
ForEach(availableAccounts, id: \.objectID) { account in
Text(account.name).tag(Optional(account.safeId))
}
}
} header: {
@@ -320,6 +351,10 @@ struct EditSourceView: View {
}
}
private var availableAccounts: [Account] {
accountStore.accounts.filter { $0.safeId != nil }
}
private var isValid: Bool {
!name.trimmingCharacters(in: .whitespaces).isEmpty && selectedCategory != nil
}
@@ -343,7 +378,7 @@ struct EditSourceView: View {
private var selectedAccount: Account? {
guard let id = selectedAccountId else { return nil }
return accountStore.accounts.first { $0.id == id }
return availableAccounts.first { $0.safeId == id }
}
}
PortfolioJournal/Views/Sources/SourceDetailView.swift
+37 -31
View File
@@ -424,42 +424,48 @@ struct SourceDetailView: View {
.cornerRadius(AppConstants.UI.smallCornerRadius)
}
ForEach(viewModel.visibleSnapshots) { snapshot in
SnapshotRowView(snapshot: snapshot, onEdit: {
editingSnapshot = snapshot
})
.contentShape(Rectangle())
.onTapGesture {
editingSnapshot = snapshot
}
.contextMenu {
Button {
editingSnapshot = snapshot
} label: {
Label("Edit", systemImage: "pencil")
}
}
.swipeActions(edge: .trailing) {
Button {
editingSnapshot = snapshot
} label: {
Label("Edit", systemImage: "pencil")
}
// Use LazyVStack for better performance with many snapshots
LazyVStack(spacing: 0) {
ForEach(viewModel.visibleSnapshots) { snapshot in
VStack(spacing: 0) {
SnapshotRowView(snapshot: snapshot, onEdit: {
editingSnapshot = snapshot
})
.contentShape(Rectangle())
.onTapGesture {
editingSnapshot = snapshot
}
.contextMenu {
Button {
editingSnapshot = snapshot
} label: {
Label("Edit", systemImage: "pencil")
}
}
.swipeActions(edge: .trailing) {
Button {
editingSnapshot = snapshot
} label: {
Label("Edit", systemImage: "pencil")
}
Button(role: .destructive) {
viewModel.deleteSnapshot(snapshot)
} label: {
Label("Delete", systemImage: "trash")
}
}
Button(role: .destructive) {
viewModel.deleteSnapshot(snapshot)
} label: {
Label("Delete", systemImage: "trash")
}
}
if snapshot.id != viewModel.visibleSnapshots.last?.id {
Divider()
if snapshot.id != viewModel.visibleSnapshots.last?.id {
Divider()
}
}
}
}
if viewModel.snapshots.count > 10 {
Text("+ \(viewModel.snapshots.count - 10) more snapshots")
// Show "more snapshots" only for free users who have limited history
if viewModel.isHistoryLimited && viewModel.hiddenSnapshotCount > 0 {
Text("+ \(viewModel.hiddenSnapshotCount) older snapshots hidden")
.font(.caption)
.foregroundColor(.secondary)
}
PortfolioJournal/Views/Sources/SourceListView.swift
+6 -2
View File
@@ -234,13 +234,13 @@ struct SourceListView: View {
Divider()
ForEach(accountStore.accounts) { account in
ForEach(availableAccounts, id: \.objectID) { account in
Button {
accountStore.selectAccount(account)
} label: {
HStack {
Text(account.name)
if accountStore.selectedAccount?.id == account.id && !accountStore.showAllAccounts {
if accountStore.selectedAccount?.safeId == account.safeId && !accountStore.showAllAccounts {
Image(systemName: "checkmark")
}
}
@@ -257,6 +257,10 @@ struct SourceListView: View {
}
}
}
private var availableAccounts: [Account] {
accountStore.accounts.filter { $0.safeId != nil }
}
}
// MARK: - Source Row View