Added a better fix for issue 108 which also takes adds and deletes into account.

Craig Maslowski · Craig Maslowski · commit 19564ad0358a · 2014-01-14T14:56:01.000-08:00
modified:   SharpRepository.Repository/RepositoryBase.Batch.cs
	modified:   SharpRepository.Repository/RepositoryBase.cs
diff --git a/SharpRepository.Repository/RepositoryBase.Batch.cs b/SharpRepository.Repository/RepositoryBase.Batch.cs
@@ -75,8 +75,6 @@ public void Delete(IEnumerable<T> entities)
 
             public void Commit()
             {
-				var updatedItems = new List<T>(); 
-
 				_repository.BatchMode = true;
 				
 				foreach (var batchItem in _items)
@@ -89,8 +87,7 @@ public void Commit()
 
                         case BatchAction.Update:
                             _repository.Update(batchItem.Item);
-							updatedItems.Add(batchItem.Item);
-                            break;
+							break;
 
                         case BatchAction.Delete:
                             _repository.Delete(batchItem.Item);
@@ -100,9 +97,24 @@ public void Commit()
 
                 _repository.Save();
 
-	            foreach (var item in updatedItems)
+				// call QueryManager.OnItem{action} for each item in the batch only after saving the whole batch
+				foreach (var batchItem in _items)
 	            {
-					_repository.NotifyQueryManagerOfUpdatedEntity(item);
+		            switch (batchItem.Action)
+		            {
+						case BatchAction.Add:
+							_repository.NotifyQueryManagerOfAddedEntity(batchItem.Item);
+							break;
+
+						case BatchAction.Update:
+							_repository.NotifyQueryManagerOfUpdatedEntity(batchItem.Item);
+							break;
+
+						case BatchAction.Delete:
+							_repository.NotifyQueryManagerOfDeletedEntity(batchItem.Item);
+							break;
+		            }
+					
 	            }
                 _repository.BatchMode = false;
                 _items.Clear();
diff --git a/SharpRepository.Repository/RepositoryBase.cs b/SharpRepository.Repository/RepositoryBase.cs
@@ -1152,11 +1152,16 @@ private void ProcessAdd(T entity, bool batchMode)
 
             Save();
 
-            TKey key;
-            if (GetPrimaryKey(entity, out key))
-                QueryManager.OnItemAdded(key, entity);
+	        NotifyQueryManagerOfAddedEntity();
         }
 
+	    private void NotifyQueryManagerOfAddedEntity(T entity)
+	    {
+			TKey key;
+			if (GetPrimaryKey(entity, out key))
+				QueryManager.OnItemAdded(key, entity);
+	    }
+
         public void Add(IEnumerable<T> entities)
         {
             try
@@ -1206,11 +1211,16 @@ private void ProcessDelete(T entity, bool batchMode)
 
             Save();
 
-            TKey key;
-            if (GetPrimaryKey(entity, out key))
-                QueryManager.OnItemDeleted(key, entity);
+	        NotifyQueryManagerOfDeletedEntity(entity);
         }
 
+		private void NotifyQueryManagerOfDeletedEntity(T entity)
+		{
+			TKey key;
+			if (GetPrimaryKey(entity, out key))
+				QueryManager.OnItemDeleted(key, entity);
+		}
+
         public void Delete(IEnumerable<T> entities)
         {
             foreach (var entity in entities)
