Skip to content

refactor: refactor to improve clarity #5

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
theosementa merged 1 commit into from
Mar 31, 2026
Merged

refactor: refactor to improve clarity #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 25 additions & 34 deletions Modules/Models/Sources/Domain/FinancialGoalDetailedDomain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,43 +20,43 @@ public struct FinancialGoalDetailedDomain {

// MARK: - Computed Stats
public extension FinancialGoalDetailedDomain {

var remainingContributions: Double {
return goal.goalAmount - goal.currentAmount
}

var progressRatio: Double {
guard goal.goalAmount > 0 else { return 0 }
return min(goal.currentAmount / goal.goalAmount, 1.0)
}

var remainingDays: Int? {
guard let endDate = goal.endDate else { return nil }
let days = Calendar.current.dateComponents([.day], from: .now, to: endDate).day ?? 0
let days = Calendar.current.days(between: .now, and: goal.endDate) ?? 0
return max(0, days)
}

var monthlyRequired: Double? {
guard let endDate = goal.endDate else { return nil }

let remaining = goal.goalAmount - goal.currentAmount
guard remaining > 0 else { return 0 }

let months = Calendar.current.months(between: .now, and: endDate)

guard months > 0 else { return nil }
guard
let months = Calendar.current.months(between: .now, and: goal.endDate),
months > 0,
remainingContributions > 0
else { return nil }

return remaining / Double(months)
return remainingContributions / Double(months)
}

var projectedEndDate: Date? {
let remaining = goal.goalAmount - goal.currentAmount
guard remaining > 0 else { return .now }
let monthsElapsed = max(
1,
Calendar.current.dateComponents([.month], from: goal.startDate, to: .now).month ?? 1
)
let monthlyAverage = goal.currentAmount / Double(monthsElapsed)
guard monthlyAverage > 0 else { return nil }
let monthsNeeded = Int(ceil(remaining / monthlyAverage))
return Calendar.current.date(byAdding: .month, value: monthsNeeded, to: .now)
}
// var projectedEndDate: Date? {
// guard remainingContributions > 0 else { return .now }
//
// let monthsElapsed = max(
// 1,
// Calendar.current.dateComponents([.month], from: goal.startDate, to: .now).month ?? 1
// )
// let monthlyAverage = goal.currentAmount / Double(monthsElapsed)
// guard monthlyAverage > 0 else { return nil }
// let monthsNeeded = Int(ceil(remainingContributions / monthlyAverage))
// return Calendar.current.date(byAdding: .month, value: monthsNeeded, to: .now)
// }

}

Expand All @@ -66,21 +66,12 @@ public extension FinancialGoalDetailedDomain {
func toUIModel() -> FinancialGoalDetailedUIModel {
let calendar = Calendar.current

let elapsedDays = max(0, calendar.dateComponents([.day], from: goal.startDate, to: .now).day ?? 0)
let elapsedDays = max(0, calendar.days(between: goal.startDate, and: .now) ?? 0)

let monthlyTarget: Double? = {
guard let endDate = goal.endDate else { return nil }
let startMonth = calendar.dateComponents([.year, .month], from: goal.startDate)
let endMonth = calendar.dateComponents([.year, .month], from: endDate)

guard
let startMonthDate = calendar.date(from: startMonth),
let endMonthDate = calendar.date(from: endMonth)
guard let totalMonths = calendar.months(between: goal.startDate, and: goal.endDate), totalMonths > 0
else { return nil }

let totalMonths = calendar.months(between: startMonthDate, and: endMonthDate)
guard totalMonths > 0 else { return nil }

return goal.goalAmount / Double(totalMonths)
}()

Expand Down
13 changes: 11 additions & 2 deletions Modules/Utilities/Sources/Extensions/Calendar+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,20 @@ import Foundation

public extension Calendar {

func months(between startDate: Date, and endDate: Date) -> Int {
func months(between startDate: Date, and endDate: Date?) -> Int? {
guard let endDate else { return nil }

let startDateComponents = Calendar.current.dateComponents([.year, .month], from: startDate)
let endDateComponents = Calendar.current.dateComponents([.year, .month], from: endDate)
let diffInDate = Calendar.current.dateComponents([.month], from: startDateComponents, to: endDateComponents).month!
let diffInDate = Calendar.current.dateComponents([.month], from: startDateComponents, to: endDateComponents).month ?? 0
return diffInDate + 1 // +1 for include the current month
}

func days(between startDate: Date, and endDate: Date?) -> Int? {
guard let endDate else { return nil }

let days = Calendar.current.dateComponents([.day], from: startDate, to: endDate).day ?? 0
return days
}

}
Loading