fix examination property in the status datajson converter

Author: Suiram1701

WebUntisAPI.Client/Converter/ClassJsonConverter.cs

@@ -6,9 +6,6 @@
 
 namespace WebUntisAPI.Client.Converter
 {
-    /// <summary>
-    /// Convert the teachers in webuntis get classes response to int array
-    /// </summary>
     internal class ClassJsonConverter : JsonConverter<Class>
     {
         /// <inheritdoc/>

WebUntisAPI.Client/Converter/StatusDataJsonConverter.cs

@@ -25,6 +25,7 @@ public override StatusData ReadJson(JsonReader reader, Type objectType, StatusDa
                 OhColors = lessonTypes.First(obj => obj.ContainsKey("oh"))["oh"].ToObject<ForeBackColors>(),
                 SbColors = lessonTypes.First(obj => obj.ContainsKey("sb"))["sb"].ToObject<ForeBackColors>(),
                 BsColors = lessonTypes.First(obj => obj.ContainsKey("bs"))["bs"].ToObject<ForeBackColors>(),
+                ExColors = lessonTypes.First(obj => obj.ContainsKey("ex"))["ex"].ToObject<ForeBackColors>(),
                 CancelledLessonColors = codes.First(obj => obj.ContainsKey("cancelled"))["cancelled"].ToObject<ForeBackColors>(),
                 IrregularLessonColors = codes.First(obj => obj.ContainsKey("irregular"))["irregular"].ToObject<ForeBackColors>()
             };
@@ -57,6 +58,11 @@ public override void WriteJson(JsonWriter writer, StatusData value, JsonSerializ
             serializer.Serialize(writer, value.BsColors);
             writer.WriteEndObject();
 
+            writer.WriteStartObject();
+            writer.WritePropertyName("ex");
+            serializer.Serialize(writer, value.ExColors);
+            writer.WriteEndObject();
+
             writer.WriteEndArray();
 
             writer.WritePropertyName("codes");

WebUntisAPI.Client/Enums.cs

@@ -117,7 +117,7 @@ public enum LessonType
     public enum Code
     {
         /// <summary>
-        /// No code
+        /// No code (normal lesson)
         /// </summary>
         [JsonProperty("")]
         None = 0,

WebUntisAPI.Client/SchoolSearch.cs

@@ -36,57 +36,12 @@ public static class SchoolSearch
         /// <exception cref="HttpRequestException">Throws when an error happend while request</exception>
         public static async Task<School[]> SearchAsync(string name, string id = "searchForSchool", CancellationToken ct = default)
         {
-            StringWriter sw = new StringWriter();
-            using (JsonWriter writer = new JsonTextWriter(sw))
+            Action<JsonWriter> paramAction = new Action<JsonWriter>(writer =>
             {
-                writer.WriteStartObject();
-
-                writer.WritePropertyName("id");
-                writer.WriteValue(id);
-
-                writer.WritePropertyName("method");
-                writer.WriteValue("searchSchool");
-
-                writer.WritePropertyName("params");
-                writer.WriteStartArray();
-                writer.WriteStartObject();
                 writer.WritePropertyName("search");
                 writer.WriteValue(name);
-                writer.WriteEndObject();
-                writer.WriteEndArray();
-
-                writer.WritePropertyName("jsonrpc");
-                writer.WriteValue("2.0");
-
-                writer.WriteEndObject();
-            }
-
-            StringContent requestContent = new StringContent(sw.ToString(), Encoding.UTF8, "application/json");
-
-            // Send request
-            HttpResponseMessage response;
-            using (HttpClient client = new HttpClient())
-                response = await client.PostAsync(s_API_Url, requestContent, ct);
-
-            if (ct.IsCancellationRequested)
-                return Array.Empty<School>();
-
-            // Verify response
-            if (response.StatusCode != HttpStatusCode.OK)
-                throw new HttpRequestException($"The request had an error (Code: {response.StatusCode}).");
-
-            JObject responseObject = JObject.Parse(await response.Content.ReadAsStringAsync());
-
-            // Check for WebUntis error
-            if (responseObject["error"]?.ToObject<WebUntisException>() is WebUntisException error)
-            {
-                if (error.Code == (int)WebUntisException.Codes.TooManyResults)
-                    return null;
-
-                throw error;
-            }
-
-            return responseObject["result"]["schools"].ToObject<School[]>();
+            });
+            return await SearchForSchoolAsync(paramAction, id, ct);
         }
 
         /// <summary>