Add creation, read and update methods for drafts (Basically everything for drafts)

Author: Suiram1701

API.Test/MessagesTests.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using WebUntisAPI.Client.Models;
+using WebUntisAPI.Client.Models.Messages;
 using static API.Test.AuthentificationTests;
 
 namespace API.Test;
@@ -15,7 +15,7 @@ public void GetUnreadMessages()
     {
         Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
 
-        Task<int> messages = Client.MessageClient.GetUnreadMessagesCountAsync();
+        Task<int> messages = Client.GetUnreadMessagesCountAsync();
         messages.Wait();
         if (messages.Result == 0)
             Assert.Pass();
@@ -28,7 +28,7 @@ public void GetMessagePermissions()
     {
         Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
 
-        Task<MessagePermissions> permissions = Client.MessageClient.GetMessagePermissionsAsync();
+        Task<MessagePermissions> permissions = Client.GetMessagePermissionsAsync();
         permissions.Wait();
         if (permissions.Result != null)
             Assert.Pass();
@@ -41,7 +41,7 @@ public void GetMessageInbox()
     {
         Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
 
-        Task<MessagePreview[]> messages = Client.MessageClient.GetMessageInboxAsync();
+        Task<MessagePreview[]> messages = Client.GetMessageInboxAsync();
         messages.Wait();
         if (messages.Result.Length > 0)
             Assert.Pass();
@@ -54,7 +54,7 @@ public void GetFullMessage()
     {
         Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
 
-        Task<MessagePreview[]> messages = Client.MessageClient.GetMessageInboxAsync();
+        Task<MessagePreview[]> messages = Client.GetMessageInboxAsync();
         messages.Wait();
         Task<Message> msg = messages.Result.First(msg => msg.Subject == "Test").GetFullMessageAsync(Client);
         msg.Wait();
@@ -67,11 +67,24 @@ public void GetReceptionPeople()
     {
         Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
 
-        Task<KeyValuePair<string, MessagePerson[]>[]> people = Client.MessageClient.GetMessagePeopleAsync();
+        Task<KeyValuePair<string, MessagePerson[]>[]> people = Client.GetMessagePeopleAsync();
         people.Wait();
         if (people.Result.Length > 0)
             Assert.Pass();
         else
             Assert.Fail();
     }
+
+    [Test]
+    public void GetDrafts()
+    {
+        Client.LoginAsync(s_Server, s_LoginName, s_UserName, s_Password).Wait();
+
+        Task<DraftPreview[]> drafts = Client.GetSavedDraftsAsync();
+        drafts.Wait();
+        if (drafts.Result != null)
+            Assert.Pass();
+        else
+            Assert.Fail();
+    }
 }

WebUntisAPI.Client/MessageClient.cs

@@ -13,7 +13,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace WebUntisAPI.Client.Models
+namespace WebUntisAPI.Client.Models.Messages
 {
     /// <summary>
     /// An attachment from a message
@@ -31,7 +31,7 @@ public struct Attachment
         /// The attachment id
         /// </summary>
         [JsonProperty("id")]
-        private readonly string _id;
+        public string Id { get; set; }
 
         /// <summary>
         /// Get the content of the attachment as stream
@@ -45,11 +45,11 @@ public struct Attachment
         /// <exception cref="HttpRequestException">Thrown when an error happened while the http request</exception>
         public async Task<MemoryStream> DownloadContentAsStreamAsync(WebUntisClient client, int timeout = 2000, CancellationToken ct = default)
         {
-            string storageResponseString = await client.MakeAPIGetRequestAsync($"/WebUntis/api/rest/view/v1/messages/{_id}/attachmentstorageurl", ct);
+            string storageResponseString = await client.MakeAPIGetRequestAsync($"/WebUntis/api/rest/view/v1/messages/{Id}/attachmentstorageurl", ct);
 
             JObject data = JObject.Parse(storageResponseString);
             JArray headerArray = data.Value<JArray>("additionalHeaders");
-            
+
             HttpRequestMessage request = new HttpRequestMessage()
             {
                 Method = HttpMethod.Get,
@@ -80,7 +80,6 @@ public async Task<MemoryStream> DownloadContentAsStreamAsync(WebUntisClient clie
 
                 if (response.StatusCode == HttpStatusCode.Unauthorized || response.StatusCode == HttpStatusCode.Forbidden)
                 {
-
                     string detail = Regex.Match(await response.Content.ReadAsStringAsync(), @"<Message>([a-zA-z0-9\s]+)</Message>").Groups[1].Value;     // Get the error message
                     throw new UnauthorizedAccessException($"Invalid authentication. Detail: {detail}");
                 }

WebUntisAPI.Client/Models/Attachment.cs …API.Client/Models/Messages/Attachment.csWebUntisAPI.Client/Models/Attachment.cs renamed to WebUntisAPI.Client/Models/Messages/Attachment.cs WebUntisAPI.Client/Models/Attachment.cs renamed to WebUntisAPI.Client/Models/Messages/Attachment.cs

@@ -0,0 +1,106 @@
+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.Messages
+{
+    /// <summary>
+    /// A draft
+    /// </summary>
+    [DebuggerDisplay("Subject: {Subject, nq}, Sender: {Sender, nq}, Send time: {SentTime, nq}")]
+    public class Draft
+    {
+        /// <summary>
+        /// The id of the message
+        /// </summary>
+        [JsonProperty("id")]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// The subject of the message
+        /// </summary>
+        [JsonProperty("subject")]
+        public string Subject { get; set; }
+
+        /// <summary>
+        /// The sender of the message (only for messages in the inbox)
+        /// </summary>
+        [JsonProperty("sender")]
+        public MessagePerson Sender { get; set; } = null;
+
+        /// <summary>
+        /// Is the message a reply
+        /// </summary>
+        [JsonProperty("isReply")]
+        public bool IsReply { get; set; }
+
+        /// <summary>
+        /// Can you reply the message
+        /// </summary>
+        [JsonProperty("isReplyAllowed")]
+        public bool IsReplyAllowed { get; set; }
+
+        /// <summary>
+        /// The send time of the message
+        /// </summary>
+        [JsonProperty("sentDateTime")]
+        [JsonConverter(typeof(APIDateTimeJsonConverter))]
+        DateTime SentTime { get; set; }
+
+        /// <summary>
+        /// Is allowed to delete the message
+        /// </summary>
+        [JsonProperty("allowMessageDeletion")]
+        public bool AllowMessageDeletion { get; set; }
+
+        /// <summary>
+        /// Idk
+        /// </summary>
+        [JsonProperty("recipientGroups")]
+        public List<object> RecipientGroups { get; set; }
+
+        /// <summary>
+        /// All the recipients for a message (only for self-sends messages)
+        /// </summary>
+        /// <remarks>
+        /// When its <see langword="null"/> is the recipient the current user
+        /// </remarks>
+        [JsonProperty("recipientPersons")]
+        public List<MessagePerson> Recipients { get; set; } = null;
+
+        /// <summary>
+        /// The full content of the draft
+        /// </summary>
+        [JsonProperty("content")]
+        public string Content { get; set; }
+
+        /// <summary>
+        /// The file attachments of the draft
+        /// </summary>
+        [JsonProperty("storageAttachments")]
+        public List<Attachment> Attachments { get; set; }
+
+        /// <summary>
+        /// The option for the recipient
+        /// </summary>
+        [JsonProperty("recipientOption")]
+        public string RecipientOption { get; set; }
+
+        /// <summary>
+        /// Forbid the reply (you need the permission)
+        /// </summary>
+        [JsonProperty("forbidReply")]
+        public bool ForbidReply { get; set; }
+
+        /// <summary>
+        /// Idk
+        /// </summary>
+        [JsonProperty("copyToStudents")]
+        public bool CopyToStudents { get; set; }
+    }
+}