Add class model and add their converter, improve Color json converter and subject model

Author: Suiram1701

WebUntisAPI.Client/Converter/ClassJsonConverter.cs

@@ -0,0 +1,87 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.Serialization.Formatters;
+using System.Text;
+using System.Threading.Tasks;
+using WebUntisAPI.Client.Models;
+
+namespace WebUntisAPI.Client.Converter
+{
+    /// <summary>
+    /// Convert the teachers in webuntis get classes response to int array
+    /// </summary>
+    public sealed class ClassJsonConverter : JsonConverter<Class>
+    {
+        ///// <inheritdoc/>
+        //public override int[] ReadJson(JsonReader reader, Type objectType, int[] existingValue, bool hasExistingValue, JsonSerializer serializer)
+        //{
+        //    // Setup
+        //    JObject classObject = JObject.Load(reader);
+        //    List<int> teachers = new List<int>();
+
+        //    // Read values
+        //    int index = 1;
+        //    while (classObject["teacher" + index++]?.ToObject<int>() is int teacher)
+        //        teachers.Add(teacher);
+
+        //    return teachers.ToArray();
+        //}
+
+        ///// <inheritdoc/>
+        //public override void WriteJson(JsonWriter writer, int[] value, JsonSerializer serializer)
+        //{
+        //    JObject teacherObject = new JObject();
+
+        //    for (int i = 0; i < value.Length; i++)
+        //        teacherObject.Add("teacher" + (i + 1), value[i]);
+
+        //    teacherObject.WriteTo(writer);
+        //}
+
+        /// <inheritdoc/>
+        public override Class ReadJson(JsonReader reader, Type objectType, Class existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            JObject classObject = JObject.Load(reader);
+            Class @class = new Class()
+            {
+                Id = classObject["id"].Value<int>(),
+                Name = classObject["name"].Value<string>(),
+                LongName = classObject["longName"].Value<string>(),
+                Active = classObject["active"].Value<bool>()
+            };
+
+            int index = 0;
+            List<int> teachers = new List<int>();
+            while (classObject["teacher" + ++index] is JToken teacher)
+                teachers.Add(teacher.ToObject<int>());
+
+            @class.Teachers = teachers.ToArray();
+            return @class;
+        }
+
+        /// <inheritdoc/>
+        public override void WriteJson(JsonWriter writer, Class value, JsonSerializer serializer)
+        {
+            writer.WriteStartObject();
+            writer.WritePropertyName("id");     // Write Class.Id
+            writer.WriteValue(value.Id);
+            writer.WritePropertyName("name");     // Write Class.Name
+            writer.WriteValue(value.Name);
+            writer.WritePropertyName("longName");     // Wite Class.LongName
+            writer.WriteValue(value.LongName);
+            writer.WritePropertyName("active");     // Write Class.Active
+            writer.WriteValue(value.Active);
+
+            // Write teachers
+            for (int i = 0; i < value.Teachers.Length; i++)
+            {
+                writer.WritePropertyName("teacher" + (i + 1));
+                writer.WriteValue(value.Teachers[i]);
+            }
+        }
+    }
+}

WebUntisAPI.Client/Converter/ColorJsonConverter.cs

@@ -14,23 +14,20 @@ namespace WebUntisAPI.Client.Converter
     /// <summary>
     /// A json converter to convert a <see cref="Color"/> to the Hex color format (RRGGBB)
     /// </summary>
-    public sealed class ColorJsonConverter : JsonConverter
+    public sealed class ColorJsonConverter : JsonConverter<Color>
     {
         /// <inheritdoc/>
-        public override bool CanConvert(Type objectType) => objectType == typeof(Color) || objectType == typeof(string);
-
-        /// <inheritdoc/>
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        public override Color ReadJson(JsonReader reader, Type objectType, Color existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
             // Get value
             JToken jToken = JToken.Load(reader);
             string value = jToken.Value<string>();
 
             // Convert value
-            return new Color().FromHexColorFormat(value, false) ?? (object)value;
+            return new Color().FromHexColorFormat(value);
         }
 
         /// <inheritdoc/>
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => ((Color)value).ToHexColorFormat();
+        public override void WriteJson(JsonWriter writer, Color value, JsonSerializer serializer) => serializer.Serialize(writer, value.ToHexColorFormat());
     }
 }

WebUntisAPI.Client/Models/Class.cs

@@ -0,0 +1,45 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WebUntisAPI.Client.Converter;
+
+namespace WebUntisAPI.Client.Models
+{
+    /// <summary>
+    /// A class
+    /// </summary>
+    [DebuggerDisplay("Name = {LongName}")]
+    [JsonConverter(typeof(ClassJsonConverter))]
+    public struct Class
+    {
+        /// <summary>
+        /// Id of the class
+        /// </summary>
+        [JsonProperty("id")]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// Untis internal name of the class
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Name of the class
+        /// </summary>
+        public string LongName { get; set; }
+
+        /// <summary>
+        /// Is the class active
+        /// </summary>
+        public bool Active { get; set; }
+
+        /// <summary>
+        /// An array of all teachers of the class
+        /// </summary>
+        public int[] Teachers { get; set; }
+    }
+}

WebUntisAPI.Client/Models/Subject.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WebUntisAPI.Client.Converter;
 
 namespace WebUntisAPI.Client.Models
 {
@@ -49,12 +50,14 @@ public struct Subject
         /// Fore color of the subject
         /// </summary>
         [JsonProperty("foreColor")]
+        [JsonConverter(typeof(ColorJsonConverter))]
         public Color ForeColor { get; set; }
 
         /// <summary>
         /// Back color of the subject
         /// </summary>
         [JsonProperty("backColor")]
+        [JsonConverter(typeof(ColorJsonConverter))]
         public Color BackColor { get; set; }
     }
 }