fix: add missing enum to string parsing in several places (#813)

box · Mar 31, 2022 · e370282 · e370282
1 parent 7c73025
commit e370282
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 1 deletion.
diff --git a/Box.V2.Test/BoxFileRequestsManagerTest.cs b/Box.V2.Test/BoxFileRequestsManagerTest.cs
@@ -3,6 +3,7 @@
 using Box.V2.Managers;
 using Box.V2.Models;
 using Box.V2.Models.Request;
+using Box.V2.Test.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 
@@ -146,6 +147,7 @@ public async Task UpdateFileRequest_Success()
             Assert.IsNotNull(boxRequest);
             Assert.AreEqual(RequestMethod.Put, boxRequest.Method);
             Assert.AreEqual(new Uri("https://api.box.com/2.0/file_requests/42037322"), boxRequest.AbsoluteUri);
+            Assert.IsTrue(boxRequest.Payload.ContainsKeyValue("status", "inactive"));
 
             // Response check
             Assert.AreEqual("42037322", response.Id);

diff --git a/Box.V2.Test/BoxSignRequestsManagerTest.cs b/Box.V2.Test/BoxSignRequestsManagerTest.cs
@@ -4,8 +4,10 @@
 using Box.V2.Managers;
 using Box.V2.Models;
 using Box.V2.Models.Request;
+using Box.V2.Test.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Newtonsoft.Json.Linq;
 
 namespace Box.V2.Test
 {
@@ -45,7 +47,8 @@ public async Task CreateSignRequest_RequiredParams_Success()
             {
                 new BoxSignRequestSignerCreate()
                 {
-                    Email = "example@gmail.com"
+                    Email = "example@gmail.com",
+                    Role = BoxSignRequestSignerRole.signer,
                 }
             };
 
@@ -70,6 +73,7 @@ public async Task CreateSignRequest_RequiredParams_Success()
             Assert.IsNotNull(boxRequest);
             Assert.AreEqual(RequestMethod.Post, boxRequest.Method);
             Assert.AreEqual(new Uri("https://api.box.com/2.0/sign_requests"), boxRequest.AbsoluteUri);
+            Assert.IsTrue(boxRequest.Payload.ContainsKeyValue("signers[0].role", "signer"));
 
             // Response check
             Assert.AreEqual(1, response.SourceFiles.Count);

diff --git a/Box.V2.Test/BoxTasksManagerTest.cs b/Box.V2.Test/BoxTasksManagerTest.cs
@@ -4,6 +4,7 @@
 using Box.V2.Managers;
 using Box.V2.Models;
 using Box.V2.Models.Request;
+using Box.V2.Test.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Newtonsoft.Json;
@@ -483,6 +484,7 @@ public async Task CreateTask_WithCompletionRule()
             Assert.AreEqual(taskCreateRequest.Item.Type, payload.Item.Type);
             Assert.AreEqual(taskCreateRequest.Message, payload.Message);
             Assert.AreEqual(taskCreateRequest.CompletionRule, payload.CompletionRule);
+            Assert.IsTrue(boxRequest.Payload.ContainsKeyValue("completion_rule", "any_assignee"));
 
             //Response check
             Assert.AreEqual(BoxCompletionRule.any_assignee, result.CompletionRule);

diff --git a/Box.V2.Test/Extensions/DictionaryExtensions.cs b/Box.V2.Test/Extensions/DictionaryExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
 
 namespace Box.V2.Test.Extensions
 {
@@ -10,5 +11,13 @@ public static class DictionaryExtensions
         {
             return dictionary.TryGetValue(expectedKey, out T actualValue) && EqualityComparer<T>.Default.Equals(actualValue, expectedValue);
         }
+
+        public static bool ContainsKeyValue(this string json,
+             string expectedKey, string expectedValue)
+        {
+            var jObject = JObject.Parse(json);
+            var token = jObject.SelectToken(expectedKey);
+            return expectedValue == token.ToString();
+        }
     }
 }
diff --git a/Box.V2/Models/BoxFileRequestObject.cs b/Box.V2/Models/BoxFileRequestObject.cs
@@ -1,5 +1,6 @@
 using System;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Box.V2.Models
 {
@@ -80,6 +81,7 @@ public class BoxFileRequestObject : BoxEntity
         /// Describes the status of the sign request.
         /// </summary>
         [JsonProperty(PropertyName = FieldStatus)]
+        [JsonConverter(typeof(StringEnumConverter))]
         public virtual BoxFileRequestStatus Status { get; private set; }
 
         /// <summary>

diff --git a/Box.V2/Models/BoxSignRequest.cs b/Box.V2/Models/BoxSignRequest.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Box.V2.Models
 {
@@ -125,6 +126,7 @@ public class BoxSignRequest : BoxEntity
         /// Describes the status of the sign request.
         /// </summary>
         [JsonProperty(PropertyName = FieldStatus)]
+        [JsonConverter(typeof(StringEnumConverter))]
         public virtual BoxSignRequestStatus Status { get; private set; }
     }
 

diff --git a/Box.V2/Models/BoxSignRequestSigner.cs b/Box.V2/Models/BoxSignRequestSigner.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Box.V2.Models
 {
@@ -67,6 +68,7 @@ public class BoxSignRequestSigner
         /// Value is one of signer,approver,final_copy_reader
         /// </summary>
         [JsonProperty(PropertyName = FieldRole)]
+        [JsonConverter(typeof(StringEnumConverter))]
         public virtual BoxSignRequestSignerRole Role { get; private set; }
 
         /// <summary>
@@ -103,6 +105,7 @@ public class BoxSignRequestSignerInput
         /// Type of input.
         /// </summary>
         [JsonProperty(PropertyName = FieldType)]
+        [JsonConverter(typeof(StringEnumConverter))]
         public virtual BoxSignRequestSingerInputType Type { get; private set; }
 
         /// <summary>
@@ -159,6 +162,7 @@ public class BoxSignRequestSignerDecision
         /// Type of decision made by the signer.
         /// </summary>
         [JsonProperty(PropertyName = FieldType)]
+        [JsonConverter(typeof(StringEnumConverter))]
         public virtual BoxSignRequestSingerDecisionType Type { get; private set; }
 
         /// <summary>

diff --git a/Box.V2/Models/BoxSortOrder.cs b/Box.V2/Models/BoxSortOrder.cs
@@ -1,16 +1,19 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Box.V2.Models
 {
     public class BoxSortOrder
     {
         [JsonProperty(PropertyName = "by")]
+        [JsonConverter(typeof(StringEnumConverter))]
         public virtual BoxSortBy By { get; private set; }
 
         [JsonProperty(PropertyName = "sort")]
         public virtual string Sort { get; private set; }
 
         [JsonProperty(PropertyName = "direction")]
+        [JsonConverter(typeof(StringEnumConverter))]
         public virtual BoxSortDirection Direction { get; private set; }
     }
 

diff --git a/Box.V2/Models/BoxTask.cs b/Box.V2/Models/BoxTask.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Box.V2.Models
 {
@@ -59,6 +60,7 @@ public class BoxTask : BoxEntity
         /// Gets value indicating which assignees need to complete this task before the task is considered completed.
         /// </summary>
         [JsonProperty(PropertyName = FieldCompletionRule)]
+        [JsonConverter(typeof(StringEnumConverter))]
         public virtual BoxCompletionRule CompletionRule { get; private set; }
     }
 }
diff --git a/Box.V2/Models/Request/BoxFileRequestCopyRequest.cs b/Box.V2/Models/Request/BoxFileRequestCopyRequest.cs
@@ -1,5 +1,6 @@
 using System;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Box.V2.Models.Request
 {
@@ -51,6 +52,7 @@ public class BoxFileRequestCopyRequest
         /// This will default to the value on the existing file request.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
+        [JsonConverter(typeof(StringEnumConverter))]
         public BoxFileRequestStatus? Status { get; set; }
 
         /// <summary>

diff --git a/Box.V2/Models/Request/BoxFileRequestUpdateRequest.cs b/Box.V2/Models/Request/BoxFileRequestUpdateRequest.cs
@@ -1,5 +1,6 @@
 using System;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Box.V2.Models.Request
 {
@@ -45,6 +46,7 @@ public class BoxFileRequestUpdateRequest
         /// This will default to the value on the existing file request.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
+        [JsonConverter(typeof(StringEnumConverter))]
         public BoxFileRequestStatus? Status { get; set; }
 
         /// <summary>

diff --git a/Box.V2/Models/Request/BoxSignRequestCreateRequest.cs b/Box.V2/Models/Request/BoxSignRequestCreateRequest.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Box.V2.Models.Request
 {
@@ -156,6 +157,7 @@ public class BoxSignRequestSignerCreate
         /// Value is one of signer,approver,final_copy_reader
         /// </summary>
         [JsonProperty(PropertyName = "role")]
+        [JsonConverter(typeof(StringEnumConverter))]
         public BoxSignRequestSignerRole? Role { get; set; }
     }
 }
diff --git a/Box.V2/Models/Request/BoxTaskCreateRequest.cs b/Box.V2/Models/Request/BoxTaskCreateRequest.cs
@@ -1,5 +1,6 @@
 using System;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Box.V2.Models
 {
@@ -42,6 +43,7 @@ public string Action
         /// Defines which assignees need to complete this task before the task is considered completed.
         /// </summary>
         [JsonProperty(PropertyName = "completion_rule")]
+        [JsonConverter(typeof(StringEnumConverter))]
         public BoxCompletionRule? CompletionRule { get; set; }
     }
 }