Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi

Assets/Scripts/DatabaseClasses/Question.cs

@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 
@@ -8,6 +9,10 @@ public class Question
 {
     public int index;
     public string promptId;
+
+    [JsonConverter(typeof(ArrayToDictionaryConverter<Proposition>))]
     public Dictionary<int, Proposition> propositions;
+
     public double creationDate;
 }
+

Assets/Scripts/DatabaseClasses/Room.cs

@@ -2,12 +2,15 @@
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 [Serializable]
 [JsonObject]
 public class Room
 {
     public string code;
+
+    [JsonConverter(typeof(ArrayToDictionaryConverter<Question>))]
     public Dictionary<int, Question> questions;
     public Dictionary<string, Player> players;
     public string currentQuestionId;
@@ -92,3 +95,43 @@ public List<Proposition> GetPropositionsByPlayer(Player player)
     }
 }
 
+public class ArrayToDictionaryConverter<T> : JsonConverter<Dictionary<int, T>>
+{
+    public override Dictionary<int, T> ReadJson(JsonReader reader, Type objectType, Dictionary<int, T> existingValue, bool hasExistingValue, JsonSerializer serializer)
+    {
+        if (reader.TokenType == JsonToken.StartArray)
+        {
+            var jsonArray = JArray.Load(reader);
+            var dictionary = new Dictionary<int, T>();
+
+            for (int i = 0; i < jsonArray.Count; i++)
+            {
+                var item = jsonArray[i].ToObject<T>(serializer);
+                dictionary.Add(i, item);
+            }
+
+            return dictionary;
+        }
+
+        return null;
+    }
+
+    public override void WriteJson(JsonWriter writer, Dictionary<int, T> value, JsonSerializer serializer)
+    {
+        if (value != null)
+        {
+            var jsonArray = new JArray();
+
+            foreach (var kvp in value)
+            {
+                var itemJson = JToken.FromObject(kvp.Value, serializer);
+                jsonArray.Add(itemJson);
+            }
+
+            jsonArray.WriteTo(writer);
+        }
+    }
+}
+
+
+