refactor: Update CustomLinearCareTaskProgress

[luimillan3]

changed the title of OCKEventAggregator.swift to CareTaskProgressStrategy+Math

• removed struct CustomLinearCareTaskProgress
• removed all appearances of CustomLinearCareTaskProgress to LinearCareTaskProgress

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 8.30%. Comparing base (094cf72) to head (6057e77).

Additional details and impacted files

@@           Coverage Diff            @@
##            main     #15      +/-   ##
========================================
+ Coverage   2.44%   8.30%   +5.86%     
========================================
  Files         35      34       -1     
  Lines       1352    1313      -39     
========================================
+ Hits          33     109      +76     
+ Misses      1319    1204     -115     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[cbaker6]

Thanks for working on this @luimillan3 can you add test cases for: computeProgressByAveragingOutcomeValues, computeProgressByMedianOutcomeValues, computeProgressByStreakOutcomeValuessimilar to

CareKitEssentials/Tests/CareKitEssentialsTests/OCKOutcomeExtensionsTests.swift

Lines 7 to 55 in 094cf72

	func testSortedNewestToOldestOptionalKeyPath() async throws {
	let firstDate = Date()
	let secondDate = firstDate + 1
	let taskUUID = UUID()
	var firstOutcome = OCKOutcome(
	taskUUID: taskUUID,
	taskOccurrenceIndex: 0,
	values: []
	)
	firstOutcome.createdDate = firstDate
	var secondOutcome = OCKOutcome(
	taskUUID: taskUUID,
	taskOccurrenceIndex: 1,
	values: []
	)
	secondOutcome.createdDate = secondDate
	let outcomes = [firstOutcome, secondOutcome]
	// Test sorted properly
	XCTAssertNotEqual(firstOutcome, secondOutcome)
	let sortedByCreatedDate = try outcomes.sortedByGreatest(
	\.createdDate
	)
	XCTAssertEqual(sortedByCreatedDate.count, 2)
	XCTAssertEqual(sortedByCreatedDate.first, secondOutcome)
	XCTAssertEqual(sortedByCreatedDate.last, firstOutcome)
	// Test lessThanKeyPath
	let sortedByCreatedDate2 = try outcomes.sortedByGreatest(
	\.createdDate,
	lessThanEqualTo: firstDate
	)
	XCTAssertEqual(sortedByCreatedDate2.count, 1)
	XCTAssertEqual(sortedByCreatedDate2.first, firstOutcome)
	let sortedByCreatedDate3 = try outcomes.sortedByGreatest(
	\.createdDate,
	lessThanEqualTo: secondDate
	)
	XCTAssertEqual(sortedByCreatedDate3.count, 2)
	XCTAssertEqual(sortedByCreatedDate3.first, secondOutcome)
	XCTAssertEqual(sortedByCreatedDate3.last, firstOutcome)
	// Test KeyPath of nil should throw error
	XCTAssertThrowsError(try outcomes.sortedByGreatest(
	\.updatedDate
	))
	}

[cbaker6]

You can use something like the code below to make a dummy event:

let scheduleElement = OCKScheduleElement(start: Date(), end: nil, interval: DateComponents(day: 1))
let schedule = OCKSchedule(composing: [scheduleElement])
        let task = OCKTask(id: "test", title: nil, carePlanUUID: nil, schedule: schedule)
        let value1 = OCKOutcomeValue(2)
        let value2 = OCKOutcomeValue(4)
        let outcome = OCKOutcome(taskUUID: task.uuid, taskOccurrenceIndex: 0, values: [value1, value2])
        guard let scheduleEvent = task.schedule.event(forOccurrenceIndex: 0) else {
            XCFail("Should have a schedule event")
            return
        }
        let event = OCKAnyEvent(task: task, outcome: outcome, scheduleEvent: scheduleEvent)

Or better, copy this private extension, https://github.com/carekit-apple/CareKit/blob/7416cce107875e58d0dbfd54afb16e007ef79033/CareKit/CareKitTests/Task/TestTaskEvents.swift#L309-L329, to your new test file and add an argument that takes values: [OCKOutcomeValue] and pass it to the OCKOutcome instance. Then we can reuse the function for other tests

[cbaker6]

Looking great so far. I just provided some initial feedback.

Keep up the good work!

[lmillan1]

Some minor style and formatting changes. Also removed all instance of force unwrapping to prevent potential crashes.

[cbaker6]

looks good, some nits

[cbaker6]

@lmillan1 be sure to use GitHub to re-request me for review (top right of the PR) when this is ready:

[cbaker6]

Looking good, some nits and suggestions

[cbaker6]

Nits, be sure to look at the similar cod I didn’t comment on, those are done with the right amount of indenting

[cbaker6]

LGTM!