Remove not needed json converteres, and fix general some json attributes

Author: Suiram1701

WebUntisAPI.Client/Converter/SchoolYearJsonConverter.cs

@@ -22,12 +22,7 @@ public override Timegrid ReadJson(JsonReader reader, Type objectType, Timegrid e
             {
                 List<SchoolHour> hours = new List<SchoolHour>();
                 foreach (JObject hour in dayTimegrid["timeUnits"].Cast<JObject>())
-                    hours.Add(new SchoolHour()
-                    {
-                        Name = hour["name"].Value<string>(),
-                        StartTime = new DateTime().FromWebUntisTimeFormat("20200101", hour["startTime"].Value<string>()),
-                        EndTime = new DateTime().FromWebUntisTimeFormat("20200101", hour["endTime"].Value<string>())
-                    });
+                    hours.Add(serializer.Deserialize<SchoolHour>(hour.CreateReader()));
 
                 timegrid[(Day)dayTimegrid["day"].Value<int>()] = hours.ToArray();
             }
@@ -48,22 +43,8 @@ public override void WriteJson(JsonWriter writer, Timegrid value, JsonSerializer
                 writer.WritePropertyName("timeUnits");
                 writer.WriteStartArray();     // Write all school hours
                 foreach (SchoolHour hour in schoolHours)
-                {
-                    writer.WriteStartObject();
+                    serializer.Serialize(writer, hour);
 
-                    writer.WritePropertyName("name");
-                    writer.WriteValue(hour.Name);
-
-                    hour.StartTime.ToWebUntisTimeFormat(out string _, out string startTimeString);
-                    writer.WritePropertyName("startTime");
-                    writer.WriteValue(startTimeString);
-
-                    hour.EndTime.ToWebUntisTimeFormat(out string _, out string endTimeString);
-                    writer.WritePropertyName("endTime");
-                    writer.WriteValue(endTimeString);
-
-                    writer.WriteEndObject();
-                }
                 writer.WriteEndArray();
                 writer.WriteEndObject();
             }

WebUntisAPI.Client/Converter/TimegridJsonConverter.cs

@@ -22,7 +22,6 @@ public class Class
         /// <summary>
         /// Id of the class
         /// </summary>
-        [JsonProperty("id")]
         public int Id { get; set; }
 
         /// <summary>
@@ -44,21 +43,5 @@ public class Class
         /// An array of all teachers of the class
         /// </summary>
         public int[] Teachers { get; set; }
-
-        /// <summary>
-        /// Get all taechers of this class
-        /// </summary>
-        /// <param name="client">The client for the request (This should be the same client with that you requested the class)</param>
-        /// <param name="id">Identifier for the request</param>
-        /// <param name="ct">Cancellation token</param>
-        /// <returns>The teachers of the class</returns>
-        /// <exception cref="UnauthorizedAccessException">Thrown when the client aren't not logged in</exception>
-        /// <exception cref="HttpRequestException">Thrown when there was an error while the http request</exception>
-        /// <exception cref="WebUntisException">Thrown when the WebUntis API returned an error</exception>
-        public async Task<Teacher[]> GetTeachersAsync(WebUntisClient client, string id = "getClassTeachers", CancellationToken ct = default)
-        {
-            int[] classTeachers = Teachers;
-            return (await client.GetAllTeachersAsync(id, ct)).Where(t => classTeachers.Contains(t.Id)).ToArray();
-        }
     }
 }

WebUntisAPI.Client/Models/Class.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using WebUntisAPI.Client.Converter;
 
 namespace WebUntisAPI.Client.Models
 {
@@ -17,6 +18,7 @@ public class SchoolHour
         /// <summary>
         /// Name of the school hour
         /// </summary>
+        [JsonProperty("name")]
         public string Name { get; set; }
 
         /// <summary>
@@ -25,6 +27,8 @@ public class SchoolHour
         /// <remarks>
         /// Only <see cref="DateTime.Hour"/> and <see cref="DateTime.Minute"/> is set and the date is always set on the 1.1.2020
         /// </remarks>
+        [JsonProperty("startTime")]
+        [JsonConverter(typeof(TimeJsonConverter))]
         public DateTime StartTime { get; set; }
 
         /// <summary>
@@ -33,6 +37,8 @@ public class SchoolHour
         /// <remarks>
         /// Only <see cref="DateTime.Hour"/> and <see cref="DateTime.Minute"/> is set and the date is always set on the 1.1.2020
         /// </remarks>
+        [JsonProperty("endTime")]
+        [JsonConverter(typeof(TimeJsonConverter))]
         public DateTime EndTime { get; set; }
     }
 }

WebUntisAPI.Client/Models/SchoolHour.cs

@@ -19,29 +19,29 @@ public class SchoolYear : IEquatable<SchoolYear>, IComparable<SchoolYear>
         /// <summary>
         /// Id of the school year
         /// </summary>
+        [JsonProperty("id")]
         public int Id { get; set; }
 
         /// <summary>
         /// Name of the school year
         /// </summary>
-        /// <remarks>
-        /// Example value: 2022/2023
-        /// </remarks>
+        [JsonProperty("name")]
         public string Name { get; set; }
 
         /// <summary>
         /// The date where the school year begins
         /// </summary>
+        [JsonProperty("startDate")]
+        [JsonConverter(typeof(DateJsonConverter))]
         public DateTime StartDate { get; set; }
 
         /// <summary>
         /// The date where the school year ends
         /// </summary>
+        [JsonProperty("endDate")]
+        [JsonConverter(typeof(DateJsonConverter))]
         public DateTime EndDate { get; set; }
 
-        /// <inheritdoc/>
-        public override string ToString() => Name;
-
         #region IEquatable<SchoolYear>
         /// <inheritdoc/>
         public bool Equals(SchoolYear other) => Id.Equals(other.Id);