rzen/workouts
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Show only the day's docket on the Today board and add ad hoc Now workouts

Browse Source 
- Due-filter schedules: daily always, fixed days by weekday, one-offs on
  their date; rest days get an empty state
- Workouts with no due schedule row (ad hoc or off-day starts) now render
  as their own board rows
- The + sheet is now "New Workout" with a "When" picker; "Now" (offered
  when adding on today) skips the schedule and starts the workout directly
- Remove the times-per-week scheduling mode everywhere (enum, document,
  entity, mappers, planner, seeds, tests)
This commit is contained in:
rzen
2026-07-11 11:09:11 -04:00
parent 9dc9283b4c
commit 7cb2d6da26
14 changed files with 231 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WorkoutsTests/ScheduleDocumentTests.swift
+22 -50
View File
@@ -31,7 +31,6 @@ struct ScheduleDocumentTests {
goal: GoalKind.strength.rawValue,
recurrence: ScheduleRecurrence.fixedDays.rawValue,
weekdays: [2, 5],
timesPerWeek: nil,
order: 3,
createdAt: Self.created,
updatedAt: Self.updated
@@ -46,11 +45,10 @@ struct ScheduleDocumentTests {
#expect(decoded.isReadable)
#expect(decoded.goalKind == .strength)
#expect(decoded.recurrenceEnum == .fixedDays)
#expect(decoded.timesPerWeek == nil)
}
/// The nil-heavy cases round-trip too: a `.daily` schedule with no goal, no weekdays,
/// and no frequency count. Absent optionals decode back to nil (not phantom values).
/// The nil-heavy cases round-trip too: a `.daily` schedule with no goal and no
/// weekdays. Absent optionals decode back to nil (not phantom values).
@Test func encodeDecodeRoundTripDailyWithNils() throws {
let original = ScheduleDocument(
schemaVersion: ScheduleDocument.currentSchemaVersion,
@@ -60,7 +58,6 @@ struct ScheduleDocumentTests {
goal: nil,
recurrence: ScheduleRecurrence.daily.rawValue,
weekdays: nil,
timesPerWeek: nil,
order: 0,
createdAt: Self.created,
updatedAt: Self.updated
@@ -72,7 +69,6 @@ struct ScheduleDocumentTests {
// quoted key — "updatedAt" contains it as a substring.)
#expect(!json.contains("goal"))
#expect(!json.contains("weekdays"))
#expect(!json.contains("timesPerWeek"))
#expect(!json.contains("\"date\""))
let decoded = try DocumentCoder.decode(ScheduleDocument.self, from: data)
@@ -80,7 +76,6 @@ struct ScheduleDocumentTests {
#expect(decoded.goal == nil)
#expect(decoded.goalKind == nil)
#expect(decoded.weekdays == nil)
#expect(decoded.timesPerWeek == nil)
#expect(decoded.date == nil)
}
@@ -91,7 +86,7 @@ struct ScheduleDocumentTests {
id: ULID.make(), routineID: "R", routineName: "Trail Run",
goal: GoalKind.cardio.rawValue,
recurrence: ScheduleRecurrence.once.rawValue,
weekdays: nil, timesPerWeek: nil, date: Self.onceDay, order: 2,
weekdays: nil, date: Self.onceDay, order: 2,
createdAt: Self.created, updatedAt: Self.updated
)
let decoded = try DocumentCoder.decode(ScheduleDocument.self, from: try DocumentCoder.encode(original))
@@ -99,23 +94,6 @@ struct ScheduleDocumentTests {
#expect(decoded.recurrenceEnum == .once)
#expect(decoded.date == Self.onceDay)
#expect(decoded.weekdays == nil)
#expect(decoded.timesPerWeek == nil)
}
/// A `.frequency` schedule carries its count and drops weekdays.
@Test func encodeDecodeRoundTripFrequency() throws {
let original = ScheduleDocument(
schemaVersion: ScheduleDocument.currentSchemaVersion,
id: ULID.make(), routineID: "R", routineName: "Cardio",
goal: GoalKind.cardio.rawValue,
recurrence: ScheduleRecurrence.frequency.rawValue,
weekdays: nil, timesPerWeek: 3, order: 1,
createdAt: Self.created, updatedAt: Self.updated
)
let decoded = try DocumentCoder.decode(ScheduleDocument.self, from: try DocumentCoder.encode(original))
#expect(decoded == original)
#expect(decoded.recurrenceEnum == .frequency)
#expect(decoded.timesPerWeek == 3)
}
// MARK: - Forward-compatibility gate
@@ -127,7 +105,7 @@ struct ScheduleDocumentTests {
func doc(schema: Int) -> ScheduleDocument {
ScheduleDocument(schemaVersion: schema, id: "01X", routineID: "R", routineName: "N",
goal: nil, recurrence: ScheduleRecurrence.daily.rawValue,
weekdays: nil, timesPerWeek: nil, order: 0,
weekdays: nil, order: 0,
createdAt: Self.created, updatedAt: Self.updated)
}
#expect(doc(schema: ScheduleDocument.currentSchemaVersion).isReadable)
@@ -145,38 +123,34 @@ struct ScheduleDocumentTests {
// Once — the one-off day, medium-date formatted (routing check; the format
// itself is `Date.formatDate()`'s). Degenerate nil date → the display name.
#expect(summary(.once, weekdays: nil, timesPerWeek: nil, date: Self.onceDay) == Self.onceDay.formatDate())
#expect(summary(.once, weekdays: nil, timesPerWeek: nil) == "Once")
#expect(summary(.once, weekdays: nil, date: Self.onceDay) == Self.onceDay.formatDate())
#expect(summary(.once, weekdays: nil) == "Once")
// Daily.
#expect(summary(.daily, weekdays: nil, timesPerWeek: nil) == "Daily")
#expect(summary(.daily, weekdays: nil) == "Daily")
// Fixed days — sorted, joined with "&"; weekday 2 = Mon, 5 = Thu.
#expect(summary(.fixedDays, weekdays: [5, 2], timesPerWeek: nil) == "\(sym[1]) & \(sym[4])")
#expect(summary(.fixedDays, weekdays: [5, 2]) == "\(sym[1]) & \(sym[4])")
// Single day → just the name.
#expect(summary(.fixedDays, weekdays: [2], timesPerWeek: nil) == sym[1])
#expect(summary(.fixedDays, weekdays: [2]) == sym[1])
// Three days → Oxford-style "A, B & C".
#expect(summary(.fixedDays, weekdays: [2, 4, 6], timesPerWeek: nil) == "\(sym[1]), \(sym[3]) & \(sym[5])")
#expect(summary(.fixedDays, weekdays: [2, 4, 6]) == "\(sym[1]), \(sym[3]) & \(sym[5])")
// Degenerate (no weekdays) → falls back to the recurrence display name.
#expect(summary(.fixedDays, weekdays: [], timesPerWeek: nil) == "Fixed Days")
#expect(summary(.fixedDays, weekdays: nil, timesPerWeek: nil) == "Fixed Days")
#expect(summary(.fixedDays, weekdays: []) == "Fixed Days")
#expect(summary(.fixedDays, weekdays: nil) == "Fixed Days")
// Out-of-range weekday numbers are ignored.
#expect(summary(.fixedDays, weekdays: [0, 2, 9], timesPerWeek: nil) == sym[1])
// Frequency.
#expect(summary(.frequency, weekdays: nil, timesPerWeek: 2) == "2× per week")
#expect(summary(.frequency, weekdays: nil, timesPerWeek: nil) == "0× per week")
#expect(summary(.fixedDays, weekdays: [0, 2, 9]) == sym[1])
}
private func summary(_ r: ScheduleRecurrence, weekdays: [Int]?, timesPerWeek: Int?, date: Date? = nil) -> String {
private func summary(_ r: ScheduleRecurrence, weekdays: [Int]?, date: Date? = nil) -> String {
let doc = ScheduleDocument(
schemaVersion: ScheduleDocument.currentSchemaVersion, id: "X", routineID: "R", routineName: "N",
goal: nil, recurrence: r.rawValue, weekdays: weekdays, timesPerWeek: timesPerWeek,
goal: nil, recurrence: r.rawValue, weekdays: weekdays,
date: date, order: 0, createdAt: Self.created, updatedAt: Self.updated
)
// The entity must format identically to the document — this is the shared-logic check.
let entity = Schedule(id: "X", routineID: "R", routineName: "N", goalRaw: nil,
recurrenceRaw: r.rawValue, weekdays: weekdays, timesPerWeek: timesPerWeek,
recurrenceRaw: r.rawValue, weekdays: weekdays,
date: date, order: 0, createdAt: Self.created, updatedAt: Self.updated,
jsonRelativePath: "")
#expect(doc.recurrenceSummary == entity.recurrenceSummary)
@@ -205,7 +179,6 @@ struct ScheduleDocumentTests {
goal: GoalKind.mobility.rawValue,
recurrence: ScheduleRecurrence.fixedDays.rawValue,
weekdays: [2, 4, 6],
timesPerWeek: nil,
order: 7,
createdAt: Self.created,
updatedAt: Self.updated
@@ -222,7 +195,6 @@ struct ScheduleDocumentTests {
#expect(entity.recurrenceRaw == original.recurrence)
#expect(entity.recurrenceEnum == .fixedDays)
#expect(entity.weekdays == [2, 4, 6])
#expect(entity.timesPerWeek == nil)
#expect(entity.order == 7)
#expect(entity.jsonRelativePath == "Schedules/\(original.id).json")
@@ -240,7 +212,7 @@ struct ScheduleDocumentTests {
schemaVersion: ScheduleDocument.currentSchemaVersion,
id: "01SCHEDULEONCE000000000001", routineID: "R", routineName: "Trail Run",
goal: nil, recurrence: ScheduleRecurrence.once.rawValue,
weekdays: nil, timesPerWeek: nil, date: Self.onceDay, order: 0,
weekdays: nil, date: Self.onceDay, order: 0,
createdAt: Self.created, updatedAt: Self.updated
)
CacheMapper.upsertSchedule(original, relativePath: original.relativePath, into: context)
@@ -267,7 +239,7 @@ struct ScheduleDocumentTests {
schemaVersion: ScheduleDocument.currentSchemaVersion,
id: "01SCHEDULEREUPSERT0000001", routineID: "R", routineName: "Old Name",
goal: nil, recurrence: ScheduleRecurrence.daily.rawValue,
weekdays: nil, timesPerWeek: nil, order: 0,
weekdays: nil, order: 0,
createdAt: Self.created, updatedAt: Self.created
)
CacheMapper.upsertSchedule(first, relativePath: first.relativePath, into: context)
@@ -276,8 +248,8 @@ struct ScheduleDocumentTests {
var second = first
second.routineName = "New Name"
second.goal = GoalKind.strength.rawValue
second.recurrence = ScheduleRecurrence.frequency.rawValue
second.timesPerWeek = 4
second.recurrence = ScheduleRecurrence.fixedDays.rawValue
second.weekdays = [2, 4]
second.updatedAt = Self.updated
CacheMapper.upsertSchedule(second, relativePath: second.relativePath, into: context)
try context.save()
@@ -287,8 +259,8 @@ struct ScheduleDocumentTests {
let entity = try #require(all.first)
#expect(entity.routineName == "New Name")
#expect(entity.goalKind == .strength)
#expect(entity.recurrenceEnum == .frequency)
#expect(entity.timesPerWeek == 4)
#expect(entity.recurrenceEnum == .fixedDays)
#expect(entity.weekdays == [2, 4])
#expect(ScheduleDocument(from: entity) == second)
}
}