fix: add fitbit question json type to question model

hpi-studyu · Dec 11, 2024 · da5b18d · da5b18d
1 parent ef46183
commit da5b18d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/core/lib/src/models/questionnaire/question.dart b/core/lib/src/models/questionnaire/question.dart
@@ -35,6 +35,7 @@ abstract class Question<V> {
         AudioRecordingQuestion.questionType =>
           AudioRecordingQuestion.fromJson(data),
         FreeTextQuestion.questionType => FreeTextQuestion.fromJson(data),
+        FitbitQuestion.questionType => FitbitQuestion.fromJson(data),
         _ => throw UnknownJsonTypeError(data[keyType]),
       } as Question<V>;
 

diff --git a/core/lib/src/models/questionnaire/questions/fitbit_question.dart b/core/lib/src/models/questionnaire/questions/fitbit_question.dart
@@ -8,6 +8,7 @@ part 'fitbit_question.g.dart';
 class FitbitQuestion extends Question<FitbitQuestion> {
   static const String questionType = 'FitbitQuestion';
 
+  @JsonKey(name: 'types')
   List<FitbitQuestionType> types;
 
   FitbitQuestion({
@@ -25,7 +26,7 @@ class FitbitQuestion extends Question<FitbitQuestion> {
   @override
   Map<String, dynamic> toJson() => _$FitbitQuestionToJson(this);
 
-  Answer<List<FitbitData>> constructAnswer(List<FitbitData> data) =>
+  Answer<FitbitQuestionType> constructAnswer(FitbitQuestionType data) =>
       Answer.forQuestion(
         this,
         data,

diff --git a/designer_v2/lib/features/design/shared/questionnaire/question/question_form_data.dart b/designer_v2/lib/features/design/shared/questionnaire/question/question_form_data.dart
@@ -637,7 +637,7 @@ class FitbitQuestionFormData extends QuestionFormData {
   ) {
     final data = FitbitQuestionFormData(
       questionId: question.id,
-      questionType: SurveyQuestionType.freeText,
+      questionType: SurveyQuestionType.fitbit,
       questionText: question.prompt ?? '',
       questionInfoText: question.rationale ?? '',
       types: question.types,
@@ -670,10 +670,14 @@ class FitbitQuestionFormData extends QuestionFormData {
     return data;
   }
 
+  FitbitQuestionType _buildQuestionValue(String value) {
+    return FitbitQuestionType.fromJson(value);
+  }
+
   @override
   Answer constructAnswerFor(dynamic responseOption) {
     final question = toQuestion() as FitbitQuestion;
-    final value = responseOption as List<FitbitData>;
+    final value = _buildQuestionValue(responseOption as String);
     return question.constructAnswer(value);
   }
 }