Resolve WES-117 "Persistent data handling"

Assets/Accounts/Scripts/User.cs

@@ -2,40 +2,45 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
+using static PersistentDataController;
 
 /// <summary>
 /// A class holding all information of a user
 /// </summary>
-[Serializable]
 public class User
 {
     /// <summary>
-    /// User nickname
+    /// Reference to the user stored data record
     /// </summary>
-    public string username;
+    private SavedUserData storedUserData;
 
     /// <summary>
-    /// The avatar of the user
+    /// Constructor
     /// </summary>
-    public Sprite avatar;
+    /// <param name="data">Reference to the user stored data record</param>
+    public User(SavedUserData data)
+    {
+        this.storedUserData = data;
+    }
 
     /// <summary>
-    /// The total playtime of the user
+    /// Get the username
     /// </summary>
-    /// <remarks>TODO: needs to be implemented</remarks>
-    public double playtime;
+    /// <returns></returns>
+    public string GetUsername() { return storedUserData.username; }
 
     /// <summary>
-    /// List of courses a user started/completed
+    /// Get the total playtime
     /// </summary>
-    [SerializeField]
-    public List<Progress> courses = new List<Progress>();
+    /// <returns></returns>
+    public double GetPlaytime() { return storedUserData.playtime; }
 
     /// <summary>
-    /// List of minigames a user played
+    /// Get the avatar
     /// </summary>
-    [SerializeField]
-    public List<Progress> minigames = new List<Progress>();
+    /// <returns></returns>
+    public Sprite GetAvatar() { return UserList.AVATARS[storedUserData.avatarIndex]; }
+
 
     /// <summary>
     /// Get a list of all recently started courses
@@ -46,10 +51,10 @@ public class User
     {
         // TODO: return better results (for now only return all courses)
         List<Tuple<CourseIndex, float>> recentCourses = new List<Tuple<CourseIndex, float>>();
-        foreach (Progress courseProgress in courses)
+        foreach (var courseProgress in storedUserData.courses)
         {
-            CourseIndex idx = courseProgress.Get<CourseIndex>("courseIndex");
-            float progress = courseProgress.Get<float>("courseProgress");
+            CourseIndex idx = courseProgress.courseIndex;
+            float progress = courseProgress.progress;
             recentCourses.Add(Tuple.Create<CourseIndex, float>(idx, progress));
         }
         return recentCourses.Take(3).ToList();
@@ -63,31 +68,58 @@ public class User
     public List<Tuple<CourseIndex, float>> GetRecommendedCourses()
     {
         List<Tuple<CourseIndex, float>> recommenedCourses = new List<Tuple<CourseIndex, float>>();
-        if (courses.Count == 0)
+        if (storedUserData.courses.Count == 0)
         {
             recommenedCourses.Add(Tuple.Create<CourseIndex, float>(CourseIndex.FINGERSPELLING, 0.0f));
         }
         else
         {
             // TODO: return better results (for now only return all courses)
-            foreach (Progress courseProgress in courses)
+            foreach (var courseProgress in storedUserData.courses)
             {
-                CourseIndex idx = courseProgress.Get<CourseIndex>("courseIndex");
-                float progress = courseProgress.Get<float>("courseProgress");
+                CourseIndex idx = courseProgress.courseIndex;
+                float progress = courseProgress.progress;
                 recommenedCourses.Add(Tuple.Create<CourseIndex, float>(idx, progress));
             }
         }
         return recommenedCourses.Take(3).ToList();
     }
 
+    /// <summary>
+    /// Get the progress of all courses the user did
+    /// </summary>
+    /// <returns></returns>
+    public List<SavedCourseProgress> GetCourses()
+    {
+        return storedUserData.courses;
+    }
+
     /// <summary>
     /// Get the progress of a certain course
     /// </summary>
     /// <param name="courseIndex">Index of course</param>
     /// <returns><c>Progress</c> belonging to the <c>courseIndex</c>, <c>null</c> if course was not found</returns>
-    public Progress GetCourseProgress(CourseIndex courseIndex)
+    public SavedCourseProgress GetCourseProgress(CourseIndex courseIndex)
     {
-        return courses.Find((p) => p.Get<CourseIndex>("courseIndex") == courseIndex);
+        return storedUserData.courses.Find((p) => p.courseIndex == courseIndex);
+    }
+
+    /// <summary>
+    /// Add new progress of a course
+    /// </summary>
+    /// <param name="progress">SavedCourseProgress data record</param>
+    public void AddCourseProgress(SavedCourseProgress progress)
+    {
+        storedUserData.courses.Add(progress);
+    }
+
+    /// <summary>
+    /// Get the progress of all minigames the user did
+    /// </summary>
+    /// <returns></returns>
+    public List<SavedMinigameProgress> GetMinigames()
+    {
+        return storedUserData.minigames;
     }
 
     /// <summary>
@@ -95,8 +127,17 @@ public class User
     /// </summary>
     /// <param name="minigameIndex">Index of the minigame</param>
     /// <returns><c>Progress</c> belonging to the <c>minigameIndex</c>, <c>null</c> if minigame was not found</returns>
-    public Progress GetMinigameProgress(MinigameIndex minigameIndex)
+    public SavedMinigameProgress GetMinigameProgress(MinigameIndex minigameIndex)
     {
-        return minigames.Find((p) => p.Get<MinigameIndex>("minigameIndex") == minigameIndex);
+        return storedUserData.minigames.Find((p) => p.minigameIndex == minigameIndex);
+    }
+
+    /// <summary>
+    /// Add new progress of a minigame
+    /// </summary>
+    /// <param name="progress">SavedMinigameProgress data record</param>
+    public void AddMinigameProgress(SavedMinigameProgress progress)
+    {
+        storedUserData.minigames.Add(progress);
     }
 }