added more enum mapping and more robust int converter

stephanstapel · Jan 11, 2024 · d393aec · d393aec
1 parent 9fb503d
commit d393aec
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 7 deletions.
diff --git a/BrickOwlSharp.Client/BrickOwlSharp.Client.csproj b/BrickOwlSharp.Client/BrickOwlSharp.Client.csproj
@@ -19,7 +19,7 @@ With BrickOwlSharp, developers can easily integrate BrickOwl into their applicat
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="7.0.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/BrickOwlSharp.Client/CatalogItem.cs b/BrickOwlSharp.Client/CatalogItem.cs
@@ -59,9 +59,9 @@ public partial class CatalogItem
 
         [JsonPropertyName("color_name")]
         public string ColorName { get; set; }
-
+        
         [JsonPropertyName("color_id"), JsonConverter(typeof(IntStringConverter))]
-        public int ColorId { get; set; }
+        public int ColorId { get; set; }        
 
         [JsonPropertyName("color_hex")]
         public string ColorHex { get; set; }

diff --git a/...lSharp.Client/IBricklinkRequestHandler.cs → ...wlSharp.Client/IBrickOwlRequestHandler.cs b/...lSharp.Client/IBricklinkRequestHandler.cs → ...wlSharp.Client/IBrickOwlRequestHandler.cs
diff --git a/BrickOwlSharp.Client/IdType.cs b/BrickOwlSharp.Client/IdType.cs
@@ -35,7 +35,10 @@ public enum IdType
         LDraw,
         BOID,
         ItemNo,
-        SetNumber
+        SetNumber,
+        BLItemNo,
+        UPC,
+        EAN
     }
 
 
@@ -50,6 +53,9 @@ public static IdType FromString(this IdType _, string s)
                 case "boid": return IdType.BOID;
                 case "item_no": return IdType.ItemNo;
                 case "set_number": return IdType.SetNumber;
+                case "bl_item_no": return IdType.BLItemNo;
+                case "ean": return IdType.EAN;
+                case "upc": return IdType.UPC;
             }
 
             return IdType.Unknown;
@@ -65,6 +71,9 @@ public static string EnumToString(this IdType c)
                 case IdType.BOID: return "boid";
                 case IdType.ItemNo: return "item_no";
                 case IdType.SetNumber: return "set_number";
+                case IdType.BLItemNo: return "bl_item_no";
+                case IdType.EAN: return "ean";
+                case IdType.UPC: return "upc";
             }
 
             return "";

diff --git a/BrickOwlSharp.Client/Json/IntStringConverter.cs b/BrickOwlSharp.Client/Json/IntStringConverter.cs
@@ -34,10 +34,26 @@ internal class IntStringConverter : JsonConverter<int>
     {
         public override int Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            var stringValue = reader.GetString();
-            if (Int32.TryParse(stringValue, out int value))
+            try
             {
-                return value;
+                var stringValue = reader.GetString();
+                if (Int32.TryParse(stringValue, out int value))
+                {
+                    return value;
+                }
+            }
+            catch
+            {                
+            }
+
+            try
+            {
+                var intValue = reader.GetInt32();
+                return intValue;
+            }
+            catch
+            {
+
             }
             return default(Int32);
         }

diff --git a/BrickOwlSharp.Client/Json/ItemTypeStringConverter.cs b/BrickOwlSharp.Client/Json/ItemTypeStringConverter.cs
@@ -39,6 +39,13 @@ public override ItemType Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
             switch (stringValue)
             {
                 case "Part": return ItemType.Part;
+                case "Minibuild": return ItemType.Minibuild;
+                case "Packaging": return ItemType.Packaging;
+                case "Set": return ItemType.Set;
+                case "Instructions": return ItemType.Instructions;
+                case "Gear": return ItemType.Gear;
+                case "Minifigure": return ItemType.Minifigure;
+                case "Sticker": return ItemType.Sticker;
             }
 
             return ItemType.Unknown;
@@ -51,6 +58,13 @@ public override void Write(Utf8JsonWriter writer, ItemType value, JsonSerializer
             switch (value)
             {
                 case ItemType.Part: typeString = "Part"; break;
+                case ItemType.Minibuild: typeString = "Minibuild"; break;
+                case ItemType.Packaging: typeString = "Packaging"; break;
+                case ItemType.Set: typeString = "Set"; break;
+                case ItemType.Instructions: typeString = "Instructions"; break;
+                case ItemType.Gear: typeString = "Gear"; break;
+                case ItemType.Minifigure: typeString = "Minifigure"; break;
+                case ItemType.Sticker: typeString = "Sticker"; break;
             }