add FieldValue to RequestFieldValues

lvermeulen · Aug 5, 2018 · 9121ba3 · 9121ba3
1 parent 964e8f9
commit 9121ba3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/...ls/Common/StringOrStringArrayConverter.cs → ....Net/Models/Common/FieldValueConverter.cs b/...ls/Common/StringOrStringArrayConverter.cs → ....Net/Models/Common/FieldValueConverter.cs
@@ -1,38 +1,37 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JiraServiceDesk.Net.Models.Request;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace JiraServiceDesk.Net.Models.Common
 {
-    public class StringOrStringArrayConverter : JsonConverter
+    public class FieldValueConverter : JsonConverter
     {
-        private static readonly List<Type> s_types = new List<Type> { typeof(string), typeof(IEnumerable<string>) };
+        private static readonly List<Type> s_types = new List<Type> { typeof(FieldValue), typeof(IEnumerable<FieldValue>) };
 
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            throw new NotImplementedException();
-        }
+        { }
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
             if (reader.TokenType == JsonToken.String)
             {
                 var item = JToken.Load(reader);
-                return new List<string>(Enumerable.Repeat(item.Value<string>(), 1));
+                return new List<FieldValue> { new FieldValue { Value = item.Value<string>() } };
             }
 
             if (reader.TokenType == JsonToken.StartArray)
             {
                 var item = JArray.Load(reader);
-                return new List<string>(item.Select(x => x.ToString()));
+                return new List<FieldValue>(item.Select(x => JsonConvert.DeserializeObject<FieldValue>(x.ToString())));
             }
 
             if (reader.TokenType == JsonToken.StartObject)
             {
                 var item = JObject.Load(reader);
-                return new List<string>(Enumerable.Repeat(item.ToString(), 1));
+                return new List<FieldValue> { JsonConvert.DeserializeObject<FieldValue>(item.ToString()) };
             }
 
             return null;

diff --git a/...eDesk.Net/Models/Request/RenderedValue.cs → ...viceDesk.Net/Models/Request/FieldValue.cs b/...eDesk.Net/Models/Request/RenderedValue.cs → ...viceDesk.Net/Models/Request/FieldValue.cs
@@ -2,7 +2,7 @@
 
 namespace JiraServiceDesk.Net.Models.Request
 {
-    public class RenderedValue
+    public class FieldValue
     {
         public string Self { get; set; }
         public string Id { get; set; }

diff --git a/src/JiraServiceDesk.Net/Models/Request/RequestFieldValue.cs b/src/JiraServiceDesk.Net/Models/Request/RequestFieldValue.cs
@@ -8,8 +8,9 @@ public class RequestFieldValue
     {
         public string FieldId { get; set; }
         public string Label { get; set; }
-        [JsonConverter(typeof(StringOrStringArrayConverter))]
-        public List<string> Value { get; set; }
-        public List<RenderedValue> RenderedValue { get; set; }
+        [JsonConverter(typeof(FieldValueConverter))]
+        public List<FieldValue> Value { get; set; }
+        [JsonConverter(typeof(FieldValueConverter))]
+        public List<FieldValue> RenderedValue { get; set; }
     }
 }