Add custom json converter

sierpinskid · sierpinskid · commit 055e43c969f9 · 2024-08-30T11:49:38.000+02:00
diff --git a/Assets/Plugins/StreamChat/Core/Helpers/ILoadableFromExt.cs b/Assets/Plugins/StreamChat/Core/Helpers/ILoadableFromExt.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using StreamChat.Core.LowLevelClient;
 
 namespace StreamChat.Core.Helpers
 {
diff --git a/Assets/Plugins/StreamChat/Core/ILoadableFrom.cs.meta b/Assets/Plugins/StreamChat/Core/ILoadableFrom.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/IEnumeratedStruct.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/IEnumeratedStruct.cs
@@ -0,0 +1,19 @@
+﻿namespace StreamChat.Core.LowLevelClient
+{
+    /// <summary>
+    /// <inheritdoc cref="IEnumeratedStruct"/>
+    /// </summary>
+    public interface IEnumeratedStruct<out TType> : IEnumeratedStruct
+        where TType : struct
+    {
+        TType Parse(string value);
+    }
+    
+    /// <summary>
+    /// Struct that is used to represent enumerated values
+    /// </summary>
+    public interface IEnumeratedStruct
+    {
+        string Value { get; }
+    }
+}
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/IEnumeratedStruct.cs.meta b/Assets/Plugins/StreamChat/Core/LowLevelClient/IEnumeratedStruct.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/ILoadableFrom.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/ILoadableFrom.cs
@@ -1,4 +1,4 @@
-﻿namespace StreamChat.Core
+﻿namespace StreamChat.Core.LowLevelClient
 {
     /// <summary>
     /// Supports loading object from DTO of a given type
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/ILoadableFrom.cs.meta b/Assets/Plugins/StreamChat/Core/LowLevelClient/ILoadableFrom.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/Responses/ChannelTypeUnreadCounts.cs b/Assets/Plugins/StreamChat/Core/Responses/ChannelTypeUnreadCounts.cs
@@ -1,4 +1,5 @@
 using StreamChat.Core.InternalDTO.Models;
+using StreamChat.Core.LowLevelClient;
 
 namespace StreamChat.Core.Responses
 {
diff --git a/Assets/Plugins/StreamChat/Core/Responses/ChannelUnreadCounts.cs b/Assets/Plugins/StreamChat/Core/Responses/ChannelUnreadCounts.cs
@@ -1,4 +1,5 @@
 using StreamChat.Core.InternalDTO.Models;
+using StreamChat.Core.LowLevelClient;
 
 namespace StreamChat.Core.Responses
 {
diff --git a/Assets/Plugins/StreamChat/Core/Responses/CurrentUnreadCounts.cs b/Assets/Plugins/StreamChat/Core/Responses/CurrentUnreadCounts.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using StreamChat.Core.Helpers;
 using StreamChat.Core.InternalDTO.Responses;
+using StreamChat.Core.LowLevelClient;
 
 namespace StreamChat.Core.Responses
 {
diff --git a/Assets/Plugins/StreamChat/Core/Responses/ListDevicesResponse.cs b/Assets/Plugins/StreamChat/Core/Responses/ListDevicesResponse.cs
@@ -1,5 +1,6 @@
 ﻿using StreamChat.Core.Helpers;
 using StreamChat.Core.InternalDTO.Responses;
+using StreamChat.Core.LowLevelClient;
 using StreamChat.Core.LowLevelClient.Models;
 using StreamChat.Core.LowLevelClient.Responses;
 
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamDeleteChannelsResponse.cs b/Assets/Plugins/StreamChat/Core/Responses/StreamDeleteChannelsResponse.cs
@@ -1,5 +1,6 @@
 ﻿using StreamChat.Core.Helpers;
 using StreamChat.Core.InternalDTO.Responses;
+using StreamChat.Core.LowLevelClient;
 
 namespace StreamChat.Core.Responses
 {
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamDeleteChannelsResult.cs b/Assets/Plugins/StreamChat/Core/Responses/StreamDeleteChannelsResult.cs
@@ -1,4 +1,5 @@
 ﻿using StreamChat.Core.InternalDTO.Responses;
+using StreamChat.Core.LowLevelClient;
 
 namespace StreamChat.Core.Responses
 {
diff --git a/Assets/Plugins/StreamChat/Core/Responses/ThreadUnreadCounts.cs b/Assets/Plugins/StreamChat/Core/Responses/ThreadUnreadCounts.cs
@@ -1,4 +1,5 @@
 using StreamChat.Core.InternalDTO.Models;
+using StreamChat.Core.LowLevelClient;
 
 namespace StreamChat.Core.Responses
 {
diff --git a/Assets/Plugins/StreamChat/Core/Serialization.meta b/Assets/Plugins/StreamChat/Core/Serialization.meta
diff --git a/Assets/Plugins/StreamChat/Core/Serialization/EnumeratedStructConverter.cs b/Assets/Plugins/StreamChat/Core/Serialization/EnumeratedStructConverter.cs
@@ -0,0 +1,48 @@
+﻿using System;
+using Newtonsoft.Json;
+using StreamChat.Core.LowLevelClient;
+
+namespace StreamChat.Core.Serialization
+{
+    /// <summary>
+    /// Json converter to serialize and deserialize <see cref="IEnumeratedStruct"/>
+    /// </summary>
+    /// <typeparam name="TType">Specific type of the struct. This should be provided in a decorator</typeparam>
+    public class EnumeratedStructConverter<TType> : JsonConverter 
+        where TType : struct, IEnumeratedStruct<TType>
+    {
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            switch (value)
+            {
+                case null:
+                    return;
+                case TType enumeratedStruct:
+                    writer.WriteValue(enumeratedStruct.ToString());
+                    break;
+                default:
+                    throw new JsonSerializationException($"Unexpected value type: {value.GetType()}");
+            }
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
+            JsonSerializer serializer)
+        {
+            switch (reader.TokenType)
+            {
+                case JsonToken.Null:
+                    return default;
+                case JsonToken.String:
+                {
+                    var str = reader.Value?.ToString();
+                    var instance = Activator.CreateInstance<TType>();
+                    return instance.Parse(str);
+                }
+                default:
+                    throw new JsonSerializationException($"Unexpected token or value when parsing {objectType.FullName}");
+            }
+        }
+
+        public override bool CanConvert(Type objectType) => typeof(IEnumeratedStruct).IsAssignableFrom(objectType);
+    }
+}
diff --git a/Assets/Plugins/StreamChat/Core/Serialization/EnumeratedStructConverter.cs.meta b/Assets/Plugins/StreamChat/Core/Serialization/EnumeratedStructConverter.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/State/IStateLoadableFrom.cs b/Assets/Plugins/StreamChat/Core/State/IStateLoadableFrom.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using StreamChat.Core.LowLevelClient;
 using StreamChat.Core.State.Caches;
 
 namespace StreamChat.Core.State
diff --git a/Assets/Plugins/StreamChat/Libs/Serialization/NewtonsoftJsonSerializer.cs b/Assets/Plugins/StreamChat/Libs/Serialization/NewtonsoftJsonSerializer.cs
@@ -9,6 +9,7 @@ namespace StreamChat.Libs.Serialization
     /// </summary>
     public class NewtonsoftJsonSerializer : ISerializer
     {
+        //StreamTodo: each serialize call create JsonSerializerSettings, it's better to create it once and reuse
         public string Serialize<TType>(TType obj)
             => JsonConvert.SerializeObject(obj, Formatting.None,
                 new JsonSerializerSettings
@@ -17,8 +18,7 @@ public string Serialize<TType>(TType obj)
                     MissingMemberHandling = MissingMemberHandling.Ignore,
                 });
 
-        public TType Deserialize<TType>(string serializedObj)
-            => JsonConvert.DeserializeObject<TType>(serializedObj);
+        public TType Deserialize<TType>(string serializedObj) => JsonConvert.DeserializeObject<TType>(serializedObj);
 
         public TTargetType TryConvertTo<TTargetType>(object serializedObj)
         {
@@ -44,16 +44,15 @@ public TTargetType TryConvertTo<TTargetType>(object serializedObj)
 
             try
             {
-                return (TTargetType) Convert.ChangeType(serializedObj, typeof(TTargetType));
+                return (TTargetType)Convert.ChangeType(serializedObj, typeof(TTargetType));
             }
             catch (InvalidCastException)
             {
                 return default;
             }
         }
 
-        public object DeserializeObject(string serializedObj)
-            => JsonConvert.DeserializeObject(serializedObj);
+        public object DeserializeObject(string serializedObj) => JsonConvert.DeserializeObject(serializedObj);
 
         public bool TryPeekValue<TValue>(string serializedObj, string key, out TValue value)
         {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using StreamChat.Core.LowLevelClient;`
`2`	`3`
`3`	`4`	`namespace StreamChat.Core.Helpers`
`4`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace StreamChat.Core`
	`1`	`+namespace StreamChat.Core.LowLevelClient`
`2`	`2`	`{`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Supports loading object from DTO of a given type`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using StreamChat.Core.InternalDTO.Models;`
	`2`	`+using StreamChat.Core.LowLevelClient;`
`2`	`3`
`3`	`4`	`namespace StreamChat.Core.Responses`
`4`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using StreamChat.Core.Helpers;`
`3`	`3`	`using StreamChat.Core.InternalDTO.Responses;`
	`4`	`+using StreamChat.Core.LowLevelClient;`
`4`	`5`
`5`	`6`	`namespace StreamChat.Core.Responses`
`6`	`7`	`{`