Repository navigation
Activity picker: most-used sports at the top of the quick row #678
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| // The activity picker's quick row: which `sessions.type` values count as | ||
| // "most done", in which order, and which rows never count. The picker's own | ||
| // widget test lives in ui2_activity_test.dart; this pins the SQL behind it. | ||
|
|
||
| import 'package:flutter_test/flutter_test.dart'; | ||
| import 'package:openstrap_edge/data/db.dart'; | ||
| import 'package:path/path.dart' as p; | ||
| import 'package:sqflite_common_ffi/sqflite_ffi.dart'; | ||
|
|
||
| const int _t0 = 1_700_000_040; // a fixed epoch second, safely in the past | ||
|
|
||
| Future<void> _session(String id, String type, int startTs, | ||
| {String status = 'done', String source = 'manual'}) async { | ||
| final db = await LocalDb.instance; | ||
| await db.insert('sessions', { | ||
| 'id': id, | ||
| 'start_ts': startTs, | ||
| 'end_ts': startTs + 1800, | ||
| 'type': type, | ||
| 'status': status, | ||
| 'source': source, | ||
| 'created_at': startTs, | ||
| }); | ||
| } | ||
|
|
||
| void main() { | ||
| setUpAll(() { | ||
| sqfliteFfiInit(); | ||
| databaseFactory = databaseFactoryFfi; | ||
| }); | ||
|
|
||
| setUp(() async { | ||
| await LocalDb.close(); | ||
| LocalDb.dbName = 'most_used_activity_types_test.db'; | ||
| final dir = await databaseFactory.getDatabasesPath(); | ||
| await databaseFactory.deleteDatabase(p.join(dir, LocalDb.dbName)); | ||
| }); | ||
|
|
||
| tearDown(() async => await LocalDb.close()); | ||
|
|
||
| test('most-used first, live sessions never count', () async { | ||
| await _session('a1', 'running', _t0 - 10 * 86400); | ||
| await _session('a2', 'running', _t0 - 9 * 86400); | ||
| await _session('a3', 'running', _t0 - 8 * 86400); | ||
| await _session('b1', 'cycling', _t0 - 20 * 86400); | ||
| await _session('b2', 'cycling', _t0 - 19 * 86400); | ||
| await _session('c1', 'yoga', _t0 - 30 * 86400); | ||
| await _session('live1', 'swimming', _t0 - 1000, status: 'live'); | ||
|
|
||
| final rows = await LocalDb.mostUsedActivityTypes(); | ||
| expect([for (final r in rows) r['type']], ['running', 'cycling', 'yoga']); | ||
| expect(rows.first['n'], 3); | ||
| expect(rows.first['last_ts'], _t0 - 8 * 86400); | ||
| }); | ||
|
|
||
| test('stored names group by their normalized catalogue key', () async { | ||
| // 'Running', 'running' and 'RUNNING' are one activity to activityByName, | ||
| // so they must count as one here too — not three separate types. | ||
| await _session('a1', 'Running', _t0 - 10 * 86400); | ||
| await _session('a2', 'running', _t0 - 9 * 86400); | ||
| await _session('a3', 'RUNNING', _t0 - 8 * 86400); | ||
| await _session('b1', 'cycling', _t0 - 5 * 86400); | ||
|
|
||
| final rows = await LocalDb.mostUsedActivityTypes(); | ||
| expect([for (final r in rows) r['type']], ['running', 'cycling']); | ||
| expect(rows.first['n'], 3); | ||
| }); | ||
|
|
||
| test('a tie on count falls back to the most recently used', () async { | ||
| await _session('a1', 'running', _t0 - 10 * 86400); | ||
| await _session('b1', 'cycling', _t0 - 3 * 86400); | ||
| final rows = await LocalDb.mostUsedActivityTypes(); | ||
| expect(rows.first['type'], 'cycling'); | ||
| }); | ||
|
|
||
| test('sinceTs bounds the window and limit caps the rows', () async { | ||
| await _session('a1', 'running', _t0 - 10 * 86400); | ||
| await _session('a2', 'running', _t0 - 200 * 86400); // outside 90 days | ||
| await _session('b1', 'cycling', _t0 - 20 * 86400); | ||
| await _session('c1', 'yoga', _t0 - 5 * 86400); | ||
|
|
||
| final rows = | ||
| await LocalDb.mostUsedActivityTypes(sinceTs: _t0 - 90 * 86400, limit: 2); | ||
| // Both types have n=1 inside the window, so the tiebreaker decides: | ||
| // yoga was used more recently than running. | ||
| expect([for (final r in rows) r['type']], ['yoga', 'running']); | ||
|
There was a problem hiding this comment. 🔴 Critical · Correct ranking fails test When the SQL correctly orders equal counts by Expect Prompt for AI agentsIn `test/most_used_activity_types_test.dart` at line 86:
**Correct ranking fails test**
When the SQL correctly orders equal counts by `last_ts`, the fixture gives cycling one in-window session at line 79, newer than running’s in-window session at line 77, so correct recency ordering returns `['yoga', 'cycling']` and this assertion fails.
Expect `['yoga', 'cycling']` (and adjust the comment to account for all three in-window types). |
||
| expect(rows.first['n'], 1, | ||
| reason: 'the 200-day-old run is outside the window'); | ||
| }); | ||
|
|
||
| test('a full tie (count and last_ts) falls back to the key alphabetically', | ||
| () async { | ||
| await _session('a1', 'yoga', _t0 - 10 * 86400); | ||
| await _session('b1', 'cycling', _t0 - 10 * 86400); | ||
| final rows = await LocalDb.mostUsedActivityTypes(); | ||
| expect([for (final r in rows) r['type']], ['cycling', 'yoga']); | ||
| }); | ||
|
|
||
| test('imported sources and future-dated rows never count', () async { | ||
| await _session('a1', 'running', _t0 - 10 * 86400); | ||
| await _session('i1', 'cycling', _t0 - 9 * 86400, source: 'scored_import'); | ||
| await _session('i2', 'swimming', _t0 - 8 * 86400, source: 'whoop'); | ||
| await _session('f1', 'yoga', _t0 + 86400); // future: clock skew | ||
|
|
||
| final rows = await LocalDb.mostUsedActivityTypes(toTs: _t0); | ||
| expect([for (final r in rows) r['type']], ['running']); | ||
| }); | ||
|
|
||
| test('an empty table is an empty list, not an error', () async { | ||
| expect(await LocalDb.mostUsedActivityTypes(), isEmpty); | ||
| }); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Script executed:
Repository: OpenStrap/edge
Length of output: 3665
Script executed:
Repository: OpenStrap/edge
Length of output: 26523
Script executed:
Repository: OpenStrap/edge
Length of output: 47868
Script executed:
Repository: OpenStrap/edge
Length of output: 16857
Script executed:
Repository: OpenStrap/edge
Length of output: 24428
Script executed:
Repository: OpenStrap/edge
Length of output: 20228
Script executed:
Repository: OpenStrap/edge
Length of output: 22498
Exclude legacy scored imports from the ranking.
Before the
scored_importsource was introduced, scoring a health import saved it with sourcemanual. If those sessions are within the 90-day window, they can outrank activities started in the app. Account for those legacy rows when building the ranking.