Some work on entity serialization.

3 files changed, 74 insertions, 49 deletions

diff --git a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs
index e98e48422..bee94552e 100644
--- a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs
@@ -26,6 +26,7 @@ using System.ComponentModel;
 using Tango.Core.Json;
 using Newtonsoft.Json.Converters;
 using Tango.BL.Serialization;
+using Newtonsoft.Json.Linq;
 
 namespace Tango.BL
 {
@@ -436,6 +437,12 @@ Maybe you have deleted an entity that was no yet inserted into database?", LogCa
             {
                 ContractResolver = new SerializableEntityContractResolver(serializationStrategy, flags),
             };
+
+            if (flags.HasFlag(EntitySerializationFlags.PreserveReferencesHandling))
+            {
+                settings.PreserveReferencesHandling = PreserveReferencesHandling.All;
+            }
+
             settings.Converters.Add(new StringEnumConverter { CamelCaseText = false });
             return JsonConvert.DeserializeObject<T>(json, settings);
         }
@@ -446,19 +453,56 @@ Maybe you have deleted an entity that was no yet inserted into database?", LogCa
             {
                 ContractResolver = new SerializableEntityContractResolver(serializationStrategy, flags),
             };
+
+            if (flags.HasFlag(EntitySerializationFlags.PreserveReferencesHandling))
+            {
+                settings.PreserveReferencesHandling = PreserveReferencesHandling.All;
+            }
+
             settings.Converters.Add(new StringEnumConverter { CamelCaseText = false });
-            String json = JsonConvert.SerializeObject(this, Formatting.Indented, settings);
+            String json = JsonConvert.SerializeObject(this, flags.HasFlag(EntitySerializationFlags.Indented) ? Formatting.Indented : Formatting.None, settings);
             return json;
         }
 
         public static T FromJson(String json)
         {
-            return FromJson(json, new EntitySerializationStrategy(), EntitySerializationFlags.IgnoreReferenceTypes);
+            return FromJson(json, new EntitySerializationStrategy(), EntitySerializationFlags.IgnoreReferenceTypes | EntitySerializationFlags.Indented);
         }
 
         public String ToJson()
         {
-            return ToJson(new EntitySerializationStrategy(), EntitySerializationFlags.IgnoreReferenceTypes);
+            return ToJson(new EntitySerializationStrategy(), EntitySerializationFlags.IgnoreReferenceTypes | EntitySerializationFlags.Indented);
+        }
+
+        public void PopulateFromJson(string json)
+        {
+            //JsonCobnve
+
+            //JObject from = JObject.Parse(json);
+            //JObject entity = new JObject(this);
+            //from.Merge()
+
+            //Person p = new Person()
+            //{
+            //    Age = 30,
+            //    Name = "Roy",
+            //};
+
+            //Person p2 = new Person();
+            //p2.Adderess = new Address()
+            //{
+            //    City = "Gan Yavne",
+            //    Street = "Yohanan"
+            //};
+
+            //String j1 = JsonConvert.SerializeObject(p);
+            //String j2 = JsonConvert.SerializeObject(p2);
+
+            //JsonConvert.PopulateObject(j2, p, new JsonSerializerSettings()
+            //{
+            //    NullValueHandling = NullValueHandling.Ignore,
+
+            //});
         }
 
         #endregion
@@ -632,51 +676,5 @@ Maybe you have deleted an entity that was no yet inserted into database?", LogCa
         }
 
         #endregion
-
-        #region Operator Overloading
-
-        //public static bool operator ==(ObservableEntity<T> observable1, ObservableEntity<T> observable2)
-        //{
-        //    if (object.ReferenceEquals(observable1, null) || object.ReferenceEquals(observable2, null))
-        //    {
-        //        return object.ReferenceEquals(observable1, observable2);
-        //    }
-
-        //    return observable1.Guid.ToLower() == observable2.Guid.ToLower();
-        //}
-
-        //public static bool operator !=(ObservableEntity<T> observable1, ObservableEntity<T> observable2)
-        //{
-        //    if (object.ReferenceEquals(observable1, null) || object.ReferenceEquals(observable2, null))
-        //    {
-        //        return !object.ReferenceEquals(observable1, observable2);
-        //    }
-
-        //    return observable1.Guid.ToLower() != observable2.Guid.ToLower();
-        //}
-
-        //public override bool Equals(object obj)
-        //{
-        //    if (object.ReferenceEquals(this, null) || object.ReferenceEquals(obj, null))
-        //    {
-        //        return object.ReferenceEquals(this, obj);
-        //    }
-
-        //    if (obj is ObservableEntity<T>)
-        //    {
-        //        return Guid.ToLower() == (obj as ObservableEntity<T>).Guid.ToLower();
-        //    }
-        //    else
-        //    {
-        //        return false;
-        //    }
-        //}
-
-        //public override int GetHashCode()
-        //{
-        //    return base.GetHashCode();
-        //}
-
-        #endregion
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Serialization/EntitySerializationFlags.cs b/Software/Visual_Studio/Tango.BL/Serialization/EntitySerializationFlags.cs
index 1491fb2e5..1993b64a0 100644
--- a/Software/Visual_Studio/Tango.BL/Serialization/EntitySerializationFlags.cs
+++ b/Software/Visual_Studio/Tango.BL/Serialization/EntitySerializationFlags.cs
@@ -12,5 +12,7 @@ namespace Tango.BL.Serialization
         IgnoreGuids = 1,
         IgnoreReferenceTypes = 2,
         IgnoreCollections = 4,
+        PreserveReferencesHandling = 8,
+        Indented = 16,
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Serialization/ISerializableEntity.cs b/Software/Visual_Studio/Tango.BL/Serialization/ISerializableEntity.cs
index 8a3c7d54b..80ac96046 100644
--- a/Software/Visual_Studio/Tango.BL/Serialization/ISerializableEntity.cs
+++ b/Software/Visual_Studio/Tango.BL/Serialization/ISerializableEntity.cs
@@ -11,6 +11,31 @@ namespace Tango.BL.Serialization
     /// </summary>
     public interface ISerializableEntity
     {
+        /// <summary>
+        /// Gets the default serialization strategy.
+        /// </summary>
+        /// <param name="flags">The serialization flags.</param>
+        /// <returns></returns>
         EntitySerializationStrategy GetDefaultSerializationStrategy(EntitySerializationFlags flags);
+
+        /// <summary>
+        /// Converts the entity to a json string using the specified serialization strategy.
+        /// </summary>
+        /// <param name="serializationStrategy">The serialization strategy.</param>
+        /// <param name="flags">The flags.</param>
+        /// <returns></returns>
+        String ToJson(EntitySerializationStrategy serializationStrategy, EntitySerializationFlags flags);
+
+        /// <summary>
+        /// Converts the entity to a json string using the default serialization strategy.
+        /// </summary>
+        /// <returns></returns>
+        String ToJson();
+
+        /// <summary>
+        /// Merges the specified json string into this entity.
+        /// </summary>
+        /// <param name="json">The json.</param>
+        void PopulateFromJson(String json);
     }
 }