Skip to content

Commit

Permalink
feat(fitbit): update sleep data model and sleep fetch
Browse files Browse the repository at this point in the history
- Replace dateOfSleep with entryDateTime in FitbitSleepData
- Modify _fetchSleepData to accommodate new structure
- Update question construction to handle list of FitbitData
  • Loading branch information
ibrahimozkn committed Jan 12, 2025
1 parent c3b9251 commit 2de99c5
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 11 deletions.
32 changes: 32 additions & 0 deletions app/lib/util/fitbit_handler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,38 @@ class FitbitHandler {
.toList();
}

static Future<List<FitbitSleepData>> _fetchSleepData(
FitbitCredentials studyCredentials,
fitbitter.FitbitCredentials credentials,
DateTime date,
) async {
final fitbitter.FitbitSleepDataManager fitbitSleepDataManager =
fitbitter.FitbitSleepDataManager(
clientID: studyCredentials.clientId,
clientSecret: studyCredentials.clientSecret,
);

final fitbitter.FitbitSleepAPIURL fitbitSleepAPIURL =
fitbitter.FitbitSleepAPIURL.listAndAfterDate(
afterDate: date,
fitbitCredentials: credentials,
);

final List<fitbitter.FitbitSleepData> fitbitSleepData =
await fitbitSleepDataManager.fetch(fitbitSleepAPIURL)
as List<fitbitter.FitbitSleepData>;

return fitbitSleepData
.map(
(data) => FitbitSleepData(
data.level!,
data.entryDateTime!,
data.dateOfSleep!,
),
)
.toList();
}

static Future<List<FitbitData>> syncFitbitData(
Study study,
FitbitQuestion question,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ class _FitbitQuestionWidgetState extends State<FitbitQuestionWidget> {
'Synced Fitbit Data: ${(data as FitbitHeartData).value}');
}
StudyULogger.info('Synced Fitbit Data');

widget.onDone!(widget.question.constructAnswer(success));
}

@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ part 'fitbit_sleep_data.g.dart';
@JsonSerializable()
class FitbitSleepData extends FitbitData {
static const String dataType = 'steps';
DateTime dateOfSleep;
String level;
DateTime entryDateTime;

FitbitSleepData(
this.dateOfSleep,
this.level,
this.entryDateTime,
DateTime dateTime,
) : super(dataType, dateTime);

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ class FitbitQuestion extends Question<FitbitQuestion> {
@override
Map<String, dynamic> toJson() => _$FitbitQuestionToJson(this);

Answer<FitbitData> constructAnswer(FitbitData data) => Answer.forQuestion(
Answer<List<FitbitData>> constructAnswer(List<FitbitData> data) =>
Answer.forQuestion(
this,
data,
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -670,23 +670,23 @@ class FitbitQuestionFormData extends QuestionFormData {
return data;
}

FitbitData _buildQuestionValue(String value) {
final FitbitQuestionType fitbitType = FitbitQuestionType.fromJson(value);
List<FitbitData> _buildQuestionValue(String value) {
final fitbitType = FitbitQuestionType.fromJson(value);

switch (fitbitType) {
case FitbitQuestionType.heartrate:
return FitbitHeartData(0, DateTime.now());
return [FitbitHeartData(0, DateTime.now())];
case FitbitQuestionType.steps:
return FitbitStepData(0, DateTime.now());
return [FitbitStepData(0, DateTime.now())];
case FitbitQuestionType.sleep:
return FitbitSleepData(DateTime.now(), 'deep', DateTime.now());
return [FitbitSleepData('deep', DateTime.now(), DateTime.now())];
}
}

@override
Answer constructAnswerFor(dynamic responseOption) {
final question = toQuestion() as FitbitQuestion;
final fitbitData = _buildQuestionValue(responseOption);
final fitbitData = _buildQuestionValue(responseOption as String);

return question.constructAnswer(fitbitData);
}
Expand Down

0 comments on commit 2de99c5

Please sign in to comment.