Implement profile fetching/updating (#21)

Co-authored-by: Athanasios Lagopoulos <sakrifor@gmail.com>

Author: din0s

lib/DataFetcher.dart

@@ -4,17 +4,16 @@ import 'dart:io';
 
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
+import 'package:grade_plus_plus/entities/course/PassedCourse.dart';
 
 import 'LocalKeyValuePersistence.dart';
 import 'entities/course/BaseCourseData.dart';
 import 'entities/course/Course.dart';
 import 'entities/course/CourseDifficulty.dart';
-import 'entities/course/PassedCourseData.dart';
 import 'entities/course/PredictedCourse.dart';
 import 'entities/course/SuggestedCourseData.dart';
 import 'entities/user/FormData.dart' as UserFD;
 import 'entities/user/SchoolData.dart';
-import 'entities/user/SemesterData.dart';
 import 'entities/user/Teacher.dart';
 import 'entities/user/UserData.dart';
 
@@ -84,14 +83,13 @@ class DataFetcher {
     }
   }
 
-  static UserData fetchUserData() {
-    // To be implemented for data fetching
-    return new UserData(
-        estYear: null,
-        schoolData: null,
-        favSubjects: null,
-        favTeachers: null,
-        semesterDataList: null);
+  static Future<UserData> fetchUserData() async {
+    try {
+      var res = await dio.get("user/profile/");
+      return UserData.fromJson(res.data);
+    } on DioError catch (_) {
+      return LocalKeyValuePersistence.getUserData();
+    }
   }
 
   static List<SuggestedCourseData> fetchSuggestedCourses() {
@@ -123,6 +121,36 @@ class DataFetcher {
     }
   }
 
+  static Future<bool> updateName(String name) async {
+    try {
+      await dio.patch(
+        "user/profile/",
+        data: {"name": name},
+      );
+      return true;
+    } on DioError catch (_) {
+      return false;
+    }
+  }
+
+  static Future<bool> updateFavorites(
+    Set<String> courses,
+    Set<String> teachers,
+  ) async {
+    try {
+      await dio.post(
+        "user/favorites",
+        data: json.encode({
+          "courses": courses.toList(),
+          "teachers": teachers.toList(),
+        }),
+      );
+      return true;
+    } on DioError catch (_) {
+      return false;
+    }
+  }
+
   static List<PredictedCourse> fetchDefaultPredictedCourses() {
     return <PredictedCourse>[
       PredictedCourse(
@@ -136,10 +164,8 @@ class DataFetcher {
     return UserData(
       name: 'Test Subject',
       schoolData: SchoolData(
-        department: 'Computer Science',
-        semester: 5,
+        school: 'Computer Science',
       ),
-      estYear: 2021,
       favSubjects: <String>[
         "astronomy",
         "object oriented programming",
@@ -150,49 +176,16 @@ class DataFetcher {
         "mr bean",
         "the janitor",
       ],
-      semesterDataList: <SemesterData>[
-        SemesterData(
-          id: 1,
-          courseDataList: <PassedCourseData>[
-            PassedCourseData(
-              baseData: BaseCourseData(
-                title: 'My course title',
-                code: 'ABC-01-234',
-                teacher: 'John Smith',
-                averageGrade: 9.9,
-                difficulty: CourseDifficulty.EASY,
-              ),
-              grade: 9,
-              year: '2013-2014',
-            ),
-            PassedCourseData(
-              baseData: BaseCourseData(
-                title: 'Some subject',
-                code: 'ABC-91-114',
-                teacher: 'Dr Jeff',
-                averageGrade: 7.5,
-                difficulty: CourseDifficulty.MEDIUM,
-              ),
-              grade: 10,
-              year: '2013-2014',
-            ),
-          ],
+      passedCourses: <PassedCourse>[
+        PassedCourse(
+          courseID: "40002935",
+          grade: 9,
+          year: '2013-2014',
         ),
-        SemesterData(
-          id: 2,
-          courseDataList: <PassedCourseData>[
-            PassedCourseData(
-              baseData: BaseCourseData(
-                title: 'My new course title',
-                code: 'XYZ-01-234',
-                teacher: 'Hello World',
-                averageGrade: 4.5,
-                difficulty: CourseDifficulty.HARD,
-              ),
-              grade: 2,
-              year: '2013-2014',
-            ),
-          ],
+        PassedCourse(
+          courseID: "40002933",
+          grade: 10,
+          year: '2013-2014',
         ),
       ],
     );

lib/entities/course/PassedCourse.dart

@@ -0,0 +1,23 @@
+import 'package:meta/meta.dart';
+
+class PassedCourse {
+  PassedCourse({
+    @required this.courseID,
+    @required this.grade,
+    @required this.year,
+  });
+
+  final String courseID;
+  final double grade;
+  final String year;
+
+  factory PassedCourse.fromJson(Map<String, dynamic> json) {
+    return PassedCourse(
+        courseID: json['_id'] as String,
+        grade: json['grade'].toDouble() as double,
+        year: json['year_passed'] as String);
+  }
+
+  Map<String, dynamic> toJson() =>
+      <String, dynamic>{'_id': courseID, 'grade': grade, 'year_passed': year};
+}

lib/entities/user/FormData.dart

@@ -1,8 +1,3 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'FormData.g.dart';
-
-@JsonSerializable(explicitToJson: true)
 
 
 class FormData {
@@ -20,7 +15,6 @@ class FormData {
     this.hobbies,
   });
 
-
   String name;
   String school;
   int semester;
@@ -33,8 +27,33 @@ class FormData {
   String distance;
   List<String> hobbies;
 
-  factory FormData.fromJson(Map<String, dynamic> json) => _$FormDataFromJson(json);
-
-  Map<String, dynamic> toJson() => _$FormDataToJson(this);
-
+  factory FormData.fromJson(Map<String, dynamic> json) {
+    return FormData(
+      name: json['name'] as String,
+      school: json['school'] as String,
+      semester: json['semester'] as int,
+      reason: json['reason'] as String,
+      studyTime: json['study_time'] as int,
+      lectures: json['lectures'] as String,
+      privateLessons: json['privateLessons'] as bool,
+      postgraduate: json['postgraduate'] as String,
+      roomates: json['roomates'] as String,
+      distance: json['distance'] as String,
+      hobbies: (json['hobbies'] as List)?.map((e) => e as String)?.toList(),
+    );
+  }
+
+  Map<String, dynamic> toJson() => <String, dynamic>{
+    'name': name,
+    'school': school,
+    'semester': semester,
+    'reason': reason,
+    'study_time': studyTime,
+    'lectures': lectures,
+    'privateLessons': privateLessons.toString(),
+    'postgraduate': postgraduate,
+    'roomates': roomates,
+    'distance': distance,
+    'hobbies': hobbies,
+  };
 }

lib/entities/user/FormData.g.dart

@@ -4,15 +4,12 @@ import 'package:meta/meta.dart';
 part 'SchoolData.g.dart';
 
 @JsonSerializable(explicitToJson: true)
-
 class SchoolData {
   const SchoolData({
-    @required this.department,
-    @required this.semester,
+    @required this.school,
   });
 
-  final String department;
-  final int semester;
+  final String school;
 
   factory SchoolData.fromJson(Map<String, dynamic> json) =>
       _$SchoolDataFromJson(json);

lib/entities/user/SchoolData.dart

@@ -1,18 +1,23 @@
-import 'package:json_annotation/json_annotation.dart';
 import 'package:meta/meta.dart';
 
-part 'Teacher.g.dart';
-
-@JsonSerializable(explicitToJson: true)
 class Teacher {
   Teacher({@required this.id, @required this.name, @required this.courses});
 
   final String id;
   final String name;
   final List<String> courses;
 
-  factory Teacher.fromJson(Map<String, dynamic> json) =>
-      _$TeacherFromJson(json);
+  factory Teacher.fromJson(Map<String, dynamic> json) {
+    return Teacher(
+      id: json['_id'] as String,
+      name: json['name'] as String,
+      courses: (json['courses'] as List)?.map((e) => e as String)?.toList(),
+    );
+  }
 
-  Map<String, dynamic> toJson() => _$TeacherToJson(this);
+  Map<String, dynamic> toJson() => <String, dynamic>{
+        'id': id,
+        'name': name,
+        'courses': courses,
+      };
 }