Serializing dimension values as strings

Author: StanleyGoldman

src/GitHub.Exports/Services/MetricsService.cs

@@ -102,33 +102,40 @@ public Task SendOptIn()
         static StringContent SerializeRequest(UsageModel model)
         {
             var serializer = new SimpleJsonSerializer();
-            var dictionary = ToModelDictionary(model);
+            var dictionary = new Dictionary<string, object>
+            {
+                {ToJsonPropertyName("Dimensions"), ToStringDictionary(model.Dimensions) },
+                {ToJsonPropertyName("Measures"), ToObjectDictionary(model.Measures) }
+            };
             return new StringContent(serializer.Serialize(dictionary), Encoding.UTF8, "application/json");
         }
 
-        static Dictionary<string, object> ToModelDictionary(object model)
+        static Dictionary<string, string> ToStringDictionary(object model)
         {
-            var dict = new Dictionary<string, object>();
+            var dict = new Dictionary<string, string>();
             var type = model.GetType();
 
             foreach (var prop in type.GetProperties())
             {
                 if (prop.PropertyType.IsValueType || prop.PropertyType == typeof(string))
                 {
-                    dict.Add(ToJsonPropertyName(prop.Name), prop.GetValue(model));
+                    dict.Add(ToJsonPropertyName(prop.Name), prop.GetValue(model).ToString());
                 }
-                else
+            }
+
+            return dict;
+        }
+
+        static Dictionary<string, object> ToObjectDictionary(object model)
+        {
+            var dict = new Dictionary<string, object>();
+            var type = model.GetType();
+
+            foreach (var prop in type.GetProperties())
+            {
+                if (prop.PropertyType.IsValueType || prop.PropertyType == typeof(string))
                 {
-                    var value = prop.GetValue(model);
-
-                    if (value == null)
-                    {
-                        dict.Add(ToJsonPropertyName(prop.Name), value);
-                    }
-                    else
-                    {
-                        dict.Add(ToJsonPropertyName(prop.Name), ToModelDictionary(value));
-                    }
+                    dict.Add(ToJsonPropertyName(prop.Name), prop.GetValue(model));
                 }
             }