Merge branch 'release/v1.1.0'

Author: Suiram1701

API.Test/AuthentificationTests.cs

@@ -11,7 +11,7 @@ namespace API.Test;
 [TestFixture]
 internal class AuthentificationTests
 {
-    public static WebUntisClient Client { get; set; } = new("WebUntisAPI_TEST", 1000);
+    public static WebUntisClient Client { get; set; } = new("WebUntisAPI_TEST", TimeSpan.FromSeconds(2));
 
     static AuthentificationTests()
     {
@@ -34,7 +34,7 @@ public void Authentification()
     {
         try
         {
-            using WebUntisClient client = new("WebUntisAPI_TEST");
+            using WebUntisClient client = new("WebUntisAPI_TEST", TimeSpan.FromSeconds(2));
             client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
             client.LogoutAsync().Wait();
         }

API.Test/MessagesTests.cs

@@ -41,9 +41,22 @@ public void GetMessageInbox()
     {
         Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
 
-        Task<MessagePreview[]> messages = Client.GetMessageInboxAsync();
+        Task<(MessagePreview[], MessagePreview[])> messages = Client.GetMessageInboxAsync();
         messages.Wait();
-        if (messages.Result.Length > 0)
+        if (messages.Result.Item1.Length > 0)
+            Assert.Pass();
+        else
+            Assert.Fail();
+    }
+
+    [Test]
+    public void GetSentMessages()
+    {
+        Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
+
+        Task<MessagePreview[]> messages = Client.GetSentMessagesAsync();
+        messages.Wait();
+        if (messages.Result != null)
             Assert.Pass();
         else
             Assert.Fail();
@@ -54,9 +67,9 @@ public void GetFullMessage()
     {
         Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
 
-        Task<MessagePreview[]> messages = Client.GetMessageInboxAsync();
+        Task<(MessagePreview[], MessagePreview[])> messages = Client.GetMessageInboxAsync();
         messages.Wait();
-        Task<Message> msg = messages.Result.First(msg => msg.Subject == "Test").GetFullMessageAsync(Client);
+        Task<Message> msg = messages.Result.Item1.First(msg => msg.Subject == "Test").GetFullMessageAsync(Client);
         msg.Wait();
         _ = msg.Result;
         return;
@@ -87,4 +100,20 @@ public void GetDrafts()
         else
             Assert.Fail();
     }
+
+    [Test]
+    public void GetReplyForm()
+    {
+        Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
+
+        Task<(MessagePreview[], MessagePreview[])> messages = Client.GetMessageInboxAsync();
+        messages.Wait();
+
+        Task<Message> drafts = Client.GetReplyFormAsync(messages.Result.Item1[0]);
+        drafts.Wait();
+        if (drafts.Result != null)
+            Assert.Pass();
+        else
+            Assert.Fail();
+    }
 }

API.Test/TeachingTests.cs

@@ -77,12 +77,25 @@ public void GetLatestImportTime()
             Assert.Fail();
     }
 
+    [Test]
+    public void GetUnreadNews()
+    {
+        Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
+
+        Task<int> unread = Client.GetUnreadNewsCountAsync();
+        unread.Wait();
+        if (unread.Result == 0)
+            Assert.Pass();
+        else
+            Assert.Fail();
+    }
+
     [Test]
     public void GetNewsFeed()
     {
         Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
 
-        Task<News> news = Client.GetNewsFeedAsync(new DateTime(2023, 06, 23));
+        Task<News> news = Client.GetNewsFeedAsync(new DateTime(2023, 07, 10));
         news.Wait();
         if (news.Result != null)
             Assert.Pass();

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/Converter/TimegridJsonConverter.cs

@@ -30,16 +30,16 @@ public override Timegrid ReadJson(JsonReader reader, Type objectType, Timegrid e
         public override void WriteJson(JsonWriter writer, Timegrid value, JsonSerializer serializer)
         {
             writer.WriteStartArray();     // Write the diferent days
-            foreach ((Day day, SchoolHour[] schoolHours) in value)
+            foreach (KeyValuePair<Day, SchoolHour[]> day in value)
             {
                 writer.WriteStartObject();
 
                 writer.WritePropertyName("day");
-                writer.WriteValue((int)day);
+                writer.WriteValue((int)day.Key);
 
                 writer.WritePropertyName("timeUnits");
                 writer.WriteStartArray();     // Write all school hours
-                foreach (SchoolHour hour in schoolHours)
+                foreach (SchoolHour hour in day.Value)
                     serializer.Serialize(writer, hour);
 
                 writer.WriteEndArray();

WebUntisAPI.Client/Converter/TimetableRequestModelJsonConverter.cs

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