Skip to content

fix: update SleepSessionRecords #4

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: update SleepSessionRecords #4

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
24 changes: 14 additions & 10 deletions lib/src/records/sleep_session_record.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,16 @@ class SleepSessionRecord extends IntervalRecord {
}) : metadata = metadata ?? Metadata.empty(),
assert(startTime.isBefore(endTime)) {
if (stages.isNotEmpty) {
final List<SleepStage> sortedStages = stages
final List<SleepStage> sortedStages = List.from(stages)
..sort((a, b) => a.startTime.compareTo(b.startTime));
for (int i = 0; i < sortedStages.length - 1; i++) {
assert(sortedStages[i].endTime.isAfter(sortedStages[i + 1].startTime));
assert(sortedStages[i].endTime.compareTo(sortedStages[i + 1].startTime) <= 0,
'Sleep stages cannot overlap');
}
assert(!sortedStages.first.startTime.isBefore(startTime));
assert(!sortedStages.last.endTime.isAfter(endTime));
assert(sortedStages.first.startTime.compareTo(startTime) >= 0,
'First stage cannot start before session start');
assert(sortedStages.last.endTime.compareTo(endTime) <= 0,
'Last stage cannot end after session end');
}
}

Expand Down Expand Up @@ -133,13 +136,14 @@ class SleepStage {
};
}

static SleepStage fromMap(Map<String, dynamic> map) {
static SleepStage fromMap(dynamic mapData) {
final map = Map<String, dynamic>.from(mapData);
return SleepStage(
startTime: DateTime.fromMillisecondsSinceEpoch(map['startTime']),
endTime: DateTime.fromMillisecondsSinceEpoch(map['endTime']),
type: (map['type'] != null &&
map['type'] as int < SleepStageType.values.length)
? SleepStageType.values[map['type'] as int]
startTime: DateTime.parse(map['startTime']),
endTime: DateTime.parse(map['endTime']),
type: (map['stage'] != null &&
map['stage'] as int < SleepStageType.values.length)
? SleepStageType.values[map['stage'] as int]
: SleepStageType.unknown,
);
}
Expand Down