Select fixes for JSON and value types. (#298)

Author: slorello89

src/Redis.OM/RedisObjectHandler.cs

@@ -47,7 +47,7 @@ internal static T FromHashSet<T>(IDictionary<string, string> hash)
 
             var attr = Attribute.GetCustomAttribute(typeof(T), typeof(DocumentAttribute)) as DocumentAttribute;
             string asJson;
-            if (attr != null && attr.StorageType == StorageType.Json)
+            if (attr != null && attr.StorageType == StorageType.Json && hash.ContainsKey("$"))
             {
                 asJson = hash["$"];
             }
@@ -398,6 +398,11 @@ internal static IDictionary<string, string> BuildHashSet(this object obj)
         private static string SendToJson(IDictionary<string, string> hash, Type t)
         {
             var properties = t.GetProperties();
+            if ((!properties.Any() || t == typeof(Ulid) || t == typeof(Ulid?)) && hash.Count == 1)
+            {
+                return $"\"{hash.First().Value}\"";
+            }
+
             var ret = "{";
             foreach (var property in properties)
             {
@@ -427,7 +432,7 @@ private static string SendToJson(IDictionary<string, string> hash, Type t)
 
                     ret += $"\"{propertyName}\":{hash[propertyName]},";
                 }
-                else if (type == typeof(string) || type == typeof(GeoLoc) || type == typeof(DateTime) || type == typeof(DateTime?) || type == typeof(DateTimeOffset))
+                else if (type == typeof(string) || type == typeof(GeoLoc) || type == typeof(DateTime) || type == typeof(DateTime?) || type == typeof(DateTimeOffset) || type == typeof(Guid) || type == typeof(Guid?) || type == typeof(Ulid) || type == typeof(Ulid?))
                 {
                     if (!hash.ContainsKey(propertyName))
                     {

test/Redis.OM.Unit.Tests/RediSearchTests/SearchFunctionalTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.VisualBasic;
 using Newtonsoft.Json.Linq;
@@ -969,5 +970,38 @@ public async Task TestListMultipleContains()
             Assert.Contains(people, x => x.Id == person1.Id);
             Assert.Contains(people, x => x.Id == person2.Id);
         }
+
+        [Fact]
+        public void TestGuidSelects()
+        {
+            var obj = new ObjectWithStringLikeValueTypes { Guid = Guid.NewGuid() };
+            var collection = new RedisCollection<ObjectWithStringLikeValueTypes>(_connection);
+            var key = collection.Insert(obj);
+            var res = collection.Where(x => x.Guid == obj.Guid).Select(x => x.Guid).ToList();
+            Assert.NotEmpty(res);
+            _connection.Unlink(key);
+        }
+
+        [Fact]
+        public void TestUlidSelects()
+        {
+            var obj = new ObjectWithStringLikeValueTypes { Ulid = Ulid.NewUlid() };
+            var collection = new RedisCollection<ObjectWithStringLikeValueTypes>(_connection);
+            var key = collection.Insert(obj);
+            var res = collection.Where(x => x.Ulid == obj.Ulid).Select(x => x.Ulid).ToList();
+            Assert.NotEmpty(res);
+            _connection.Unlink(key);
+        }
+
+        [Fact]
+        public void TestIntSelects()
+        {
+            var obj = new Person { Name = "steve", Age = 33};
+            var collection = new RedisCollection<Person>(_connection);
+            collection.Insert(obj);
+            var res = collection.Where(x => x.Age == obj.Age).Select(x => x.Age).ToList();
+            Assert.NotEmpty(res);
+            collection.Delete(obj);
+        }
     }
 }

test/Redis.OM.Unit.Tests/Serialization/SerializationTests.cs

@@ -91,6 +91,16 @@ public void TestExplicitlySetUlit()
             Assert.Equal(ulid,obj.Id);
         }
 
+        [Fact]
+        public void TestUlidMaterialization()
+        {
+            var ulid = Ulid.NewUlid();
+            var obj = new ObjectWithUlidId() {Id = ulid};
+            var key = _connection.Set(obj);
+            var reconstitutedObject = _connection.Get<ObjectWithUlidId>(key);
+            Assert.Equal(ulid, reconstitutedObject.Id);
+        }
+
         [Fact]
         public void TestNotDefaultGuid()
         {