Merge pull request #43 from johelvisguzman/dev

Merge from 'dev' for v2.1.1

Author: johelvisguzman

src/DotNetToolkit.Repository.InMemory/InMemoryFileBasedRepositoryBase.cs

@@ -92,21 +92,34 @@ private void OnInitialize(string filePath)
             // Otherwise, try to get the data from the file
             else
             {
-                // Adds the data from the file into memory
-                using (var stream = new FileStream(DatabaseName, FileMode.Open, FileAccess.Read))
-                using (var reader = new StreamReader(stream))
+                // Checks to see when was the last time that the file was updated. If the TimeStamp and the lastWriteTime
+                // are the same, then it means that the file has only been updated by this repository; otherwise,
+                // something else updated it (maybe a manual edit). In which case, we need to re-upload the entities into memory
+                var lastWriteTime = File.GetLastWriteTime(DatabaseName);
+                var timetamp = GetTimeStamp();
+                if (!lastWriteTime.Equals(timetamp))
                 {
-                    var entities = OnLoaded(reader);
+                    LoadChanges();
+                }
+            }
+        }
 
-                    EnsureDeleted();
+        private void LoadChanges()
+        {
+            // Adds the data from the file into memory
+            using (var stream = new FileStream(DatabaseName, FileMode.Open, FileAccess.Read))
+            using (var reader = new StreamReader(stream))
+            {
+                var entities = OnLoaded(reader);
 
-                    foreach (var entity in entities)
-                    {
-                        AddItem(entity);
-                    }
+                EnsureDeleted();
 
-                    base.SaveChanges();
+                foreach (var entity in entities)
+                {
+                    AddItem(entity);
                 }
+
+                base.SaveChanges();
             }
         }
 
@@ -131,6 +144,8 @@ protected override void SaveChanges()
 
                     OnSaved(writer, entities);
                 }
+
+                SetTimeStamp(File.GetLastWriteTime(DatabaseName));
             }
         }
 

src/DotNetToolkit.Repository.InMemory/InMemoryRepositoryBase.cs

@@ -79,6 +79,24 @@ internal void EnsureDeleted()
             InMemoryCache<TEntity, TKey>.Instance.GetContext(DatabaseName).Clear();
         }
 
+        /// <summary>
+        /// Sets the time stamp.
+        /// </summary>
+        /// <param name="time">The time.</param>
+        internal void SetTimeStamp(DateTime time)
+        {
+            InMemoryCache<TEntity, TKey>.Instance.SetTimeStamp(DatabaseName, time);
+        }
+
+        /// <summary>
+        /// Gets the time stamp.
+        /// </summary>
+        /// <returns>The time stamp.</returns>
+        internal DateTime GetTimeStamp()
+        {
+            return InMemoryCache<TEntity, TKey>.Instance.GetTimeStamp(DatabaseName);
+        }
+
         #endregion
 
         #region	Private Methods
@@ -146,17 +164,23 @@ protected override void AddItem(TEntity entity)
                 .Select(x => x.Key)
                 .SingleOrDefault();
 
+            var hasTemporaryKey = false;
+
             if (key != null && key.Equals(default(TKey)))
             {
                 key = GetPrimaryKey(entity);
 
                 if (key != null && key.Equals(default(TKey)))
                 {
                     key = GenerateTemporaryPrimaryKey();
+                    hasTemporaryKey = true;
                 }
             }
 
-            _context[key] = new EntitySet<TEntity, TKey>(entity, key, EntityState.Added);
+            _context[key] = new EntitySet<TEntity, TKey>(entity, key, EntityState.Added)
+            {
+                HasTemporaryKey = hasTemporaryKey
+            };
         }
 
         /// <summary>
@@ -165,13 +189,18 @@ protected override void AddItem(TEntity entity)
         protected override void DeleteItem(TEntity entity)
         {
             var key = GetPrimaryKey(entity);
+            var hasTemporaryKey = false;
 
             if (key != null && key.Equals(default(TKey)))
             {
                 key = GenerateTemporaryPrimaryKey();
+                hasTemporaryKey = true;
             }
 
-            _context[key] = new EntitySet<TEntity, TKey>(entity, key, EntityState.Removed);
+            _context[key] = new EntitySet<TEntity, TKey>(entity, key, EntityState.Removed)
+            {
+                HasTemporaryKey = hasTemporaryKey
+            };
         }
 
         /// <summary>
@@ -180,13 +209,18 @@ protected override void DeleteItem(TEntity entity)
         protected override void UpdateItem(TEntity entity)
         {
             var key = GetPrimaryKey(entity);
+            var hasTemporaryKey = false;
 
             if (key != null && key.Equals(default(TKey)))
             {
                 key = GenerateTemporaryPrimaryKey();
+                hasTemporaryKey = true;
             }
 
-            _context[key] = new EntitySet<TEntity, TKey>(entity, key, EntityState.Modified);
+            _context[key] = new EntitySet<TEntity, TKey>(entity, key, EntityState.Modified)
+            {
+                HasTemporaryKey = hasTemporaryKey
+            };
         }
 
         /// <summary>
@@ -200,36 +234,37 @@ protected override void SaveChanges()
 
                 foreach (var entitySet in _context.Select(y => y.Value))
                 {
-                    var temporaryKey = entitySet.Key;
-                    var key = GetPrimaryKey(entitySet.Entity);
+                    var key = entitySet.Key;
 
                     if (entitySet.State == EntityState.Added)
                     {
-                        if (key == null || key.Equals(default(TKey)))
+                        if (entitySet.HasTemporaryKey)
                         {
                             key = GeneratePrimaryKey();
                             SetPrimaryKey(entitySet.Entity, key);
                         }
-                        else if (context.ContainsKey(temporaryKey))
+                        else if (context.ContainsKey(key))
                         {
                             throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, Resources.EntityAlreadyBeingTrackedInStore, entitySet.Entity.GetType()));
                         }
                     }
-                    else if (!context.ContainsKey(temporaryKey))
+                    else if (!context.ContainsKey(key))
                     {
                         throw new InvalidOperationException(Resources.EntityNotFoundInStore);
                     }
 
                     if (entitySet.State == EntityState.Removed)
                     {
-                        context.Remove(temporaryKey);
+                        context.Remove(key);
                     }
                     else
                     {
                         context[key] = DeepCopy(entitySet.Entity);
                     }
                 }
 
+                SetTimeStamp(DateTime.Now);
+
                 _context.Clear();
             }
         }
@@ -241,8 +276,8 @@ protected override IQueryable<TEntity> GetQuery(IFetchStrategy<TEntity> fetchStr
         {
             return InMemoryCache<TEntity, TKey>.Instance
                 .GetContext(DatabaseName)
-                .AsQueryable()
-                .Select(y => y.Value);
+                .Select(y => y.Value)
+                .AsQueryable();
         }
 
         /// <summary>
@@ -300,6 +335,11 @@ public EntitySet(TEntity entity, TKey key, EntityState state)
             /// </summary>
             public EntityState State { get; }
 
+            /// <summary>
+            /// Gets or sets a value indicating whether this instance has a temporary key.
+            /// </summary>
+            public bool HasTemporaryKey { get; set; }
+
             #endregion
         }
 
@@ -314,8 +354,7 @@ private enum EntityState
         {
             Added,
             Removed,
-            Modified,
-            Unchanged
+            Modified
         }
 
         #endregion
@@ -333,6 +372,7 @@ private class InMemoryCache<TEntity, TKey> where TEntity : class
             private static volatile InMemoryCache<TEntity, TKey> _instance;
             private static readonly object _syncRoot = new object();
             private readonly ConcurrentDictionary<string, SortedDictionary<TKey, TEntity>> _storage;
+            private readonly ConcurrentDictionary<string, DateTime> _timestamp;
 
             #endregion
 
@@ -344,6 +384,7 @@ private class InMemoryCache<TEntity, TKey> where TEntity : class
             private InMemoryCache()
             {
                 _storage = new ConcurrentDictionary<string, SortedDictionary<TKey, TEntity>>();
+                _timestamp = new ConcurrentDictionary<string, DateTime>();
             }
 
             #endregion
@@ -389,6 +430,28 @@ public SortedDictionary<TKey, TEntity> GetContext(string name)
                 return _storage[name];
             }
 
+            /// <summary>
+            /// Sets the time stamp.
+            /// </summary>
+            /// <param name="name">The database name.</param>
+            /// <param name="time">The time.</param>
+            public void SetTimeStamp(string name, DateTime time)
+            {
+                _timestamp[name] = time;
+            }
+
+            /// <summary>
+            /// Gets the time stamp.
+            /// </summary>
+            /// <param name="name">The database name.</param>
+            /// <returns>The time stamp.</returns>
+            public DateTime GetTimeStamp(string name)
+            {
+                _timestamp.TryGetValue(name, out DateTime time);
+
+                return time;
+            }
+
             #endregion
         }
 

src/DotNetToolkit.Repository.Json/JsonRepositoryBase.cs

@@ -49,8 +49,7 @@ protected override void OnSaved(StreamWriter writer, IEnumerable<TEntity> entiti
             var serializer = new JsonSerializer
             {
                 Formatting = Formatting.Indented,
-                ContractResolver = new CamelCasePropertyNamesContractResolver(),
-                TypeNameHandling = TypeNameHandling.All
+                ContractResolver = new CamelCasePropertyNamesContractResolver()
             };
 
             serializer.Serialize(writer, entities);