refactor: streamline property conversion logic in PropertyBag

Author: mpartipilo

src/Weaviate.Client/ObjectHelper.cs

@@ -165,31 +165,6 @@ public static IDictionary<string, string>[] MakeBeacons(IEnumerable<Guid> guids)
             return ConvertValue(value, underlyingType);
         }
 
-        if (targetType == typeof(GeoCoordinate) && value is Rest.Dto.GeoCoordinates geo)
-        {
-            return geo.ToModel();
-        }
-
-        if (targetType == typeof(Models.PhoneNumber) && value is Rest.Dto.PhoneNumber phoneNumber)
-        {
-            return phoneNumber.ToModel();
-        }
-
-        if (targetType == typeof(byte[]) && value is string base64String)
-        {
-            return Convert.FromBase64String(base64String);
-        }
-
-        if (targetType == typeof(DateTime) && value is string dateString)
-        {
-            return DateTime.SpecifyKind(DateTime.Parse(dateString), DateTimeKind.Utc);
-        }
-
-        if (targetType == typeof(DateTime) && value is DateTime dateTime)
-        {
-            return DateTime.SpecifyKind(dateTime, DateTimeKind.Utc);
-        }
-
         // Handle nested objects (dictionaries -> custom types)
         if (
             value is IDictionary<string, object?> nestedDict

src/Weaviate.Client/Serialization/PropertyBag.cs

@@ -98,12 +98,8 @@ public PropertyBag(IDictionary<string, object?> properties)
         if (!TryGetValue(name, out var value) || value is null)
             return null;
 
-        return value switch
-        {
-            DateTime dt => dt,
-            string s => DateTime.Parse(s),
-            _ => null,
-        };
+        var converter = PropertyConverterRegistry.Default.GetConverterForType(typeof(DateTime));
+        return (DateTime?)converter?.FromRest(value, typeof(DateTime));
     }
 
     /// <summary>
@@ -130,17 +126,10 @@ public PropertyBag(IDictionary<string, object?> properties)
         if (!TryGetValue(name, out var value) || value is null)
             return null;
 
-        if (value is GeoCoordinate geo)
-            return geo;
-
-        if (value is IDictionary<string, object?> dict)
-        {
-            var lat = dict.TryGetValue("latitude", out var latVal) ? Convert.ToSingle(latVal) : 0f;
-            var lon = dict.TryGetValue("longitude", out var lonVal) ? Convert.ToSingle(lonVal) : 0f;
-            return new GeoCoordinate(lat, lon);
-        }
-
-        return null;
+        var converter = PropertyConverterRegistry.Default.GetConverterForType(
+            typeof(GeoCoordinate)
+        );
+        return (GeoCoordinate?)converter?.FromRest(value, typeof(GeoCoordinate));
     }
 
     /// <summary>
@@ -151,23 +140,8 @@ public PropertyBag(IDictionary<string, object?> properties)
         if (!TryGetValue(name, out var value) || value is null)
             return null;
 
-        if (value is PhoneNumber phone)
-            return phone;
-
-        if (value is IDictionary<string, object?> dict)
-        {
-            var input = dict.TryGetValue("input", out var inputVal)
-                ? inputVal?.ToString() ?? ""
-                : "";
-            return new PhoneNumber(input)
-            {
-                DefaultCountry = dict.TryGetValue("defaultCountry", out var dc)
-                    ? dc?.ToString()
-                    : null,
-            };
-        }
-
-        return null;
+        var converter = PropertyConverterRegistry.Default.GetConverterForType(typeof(PhoneNumber));
+        return (PhoneNumber?)converter?.FromRest(value, typeof(PhoneNumber));
     }
 
     /// <summary>
@@ -178,12 +152,8 @@ public PropertyBag(IDictionary<string, object?> properties)
         if (!TryGetValue(name, out var value) || value is null)
             return null;
 
-        return value switch
-        {
-            byte[] bytes => bytes,
-            string s => Convert.FromBase64String(s),
-            _ => null,
-        };
+        var converter = PropertyConverterRegistry.Default.GetConverterForType(typeof(byte[]));
+        return (byte[]?)converter?.FromRest(value, typeof(byte[]));
     }
 
     /// <summary>