Merge: Repository Monitor

This commit is contained in:
Gary Sharp
2013-04-30 13:33:06 +10:00
parent 52d57a35c2
commit f6849535b0
14 changed files with 638 additions and 1 deletions
@@ -23,6 +23,7 @@ namespace Disco.Data.Repository.Monitor
internal static RepositoryMonitorEvent[] BeforeSaveChanges(DiscoDataContext dbContext)
{
var contextStateManager = ((IObjectContextAdapter)dbContext).ObjectContext.ObjectStateManager;
<<<<<<< HEAD
//var changes = contextStateManager.GetObjectStateEntries(System.Data.EntityState.Added).Concat(contextStateManager.GetObjectStateEntries(System.Data.EntityState.Deleted)).Concat(contextStateManager.GetObjectStateEntries(System.Data.EntityState.Modified));
dbContext.ChangeTracker.DetectChanges();
@@ -32,6 +33,17 @@ namespace Disco.Data.Repository.Monitor
var monitorEvent = EventFromEntryState(dbContext, entryState, contextStateManager.GetObjectStateEntry(entryState.Entity));
// Push to Stream
streamBefore.OnNext(monitorEvent);
=======
var changes = contextStateManager.GetObjectStateEntries(System.Data.EntityState.Added).Concat(contextStateManager.GetObjectStateEntries(System.Data.EntityState.Deleted)).Concat(contextStateManager.GetObjectStateEntries(System.Data.EntityState.Modified));
var events = changes.Select(entryState =>
{
var monitorEvent = EventFromEntryState(entryState);
// Push to Stream
streamBefore.OnNext(monitorEvent);
>>>>>>> origin/Repository-Monitor
return monitorEvent;
}).ToArray();
@@ -79,18 +91,28 @@ namespace Disco.Data.Repository.Monitor
var entryState = stateManager.GetObjectStateEntry(monitorEvent.Entity);
monitorEvent.EntityKey = entryState.EntityKey.EntityKeyValues.Select(kv => kv.Value).ToArray();
}
<<<<<<< HEAD
monitorEvent.afterCommit = true;
}
internal static RepositoryMonitorEvent EventFromEntryState(DiscoDataContext dbContext, DbEntityEntry dbEntryState, ObjectStateEntry objectEntryState)
=======
}
internal static RepositoryMonitorEvent EventFromEntryState(ObjectStateEntry entryState)
>>>>>>> origin/Repository-Monitor
{
RepositoryMonitorEventType eventType;
string[] modifiedProperties = null;
object[] entityKey = null;
Type entityType;
<<<<<<< HEAD
switch (dbEntryState.State)
=======
switch (entryState.State)
>>>>>>> origin/Repository-Monitor
{
case System.Data.EntityState.Added:
eventType = RepositoryMonitorEventType.Added;
@@ -108,6 +130,7 @@ namespace Disco.Data.Repository.Monitor
eventType = RepositoryMonitorEventType.Unchanged;
break;
default:
<<<<<<< HEAD
throw new NotSupportedException(string.Format("Database Entry State not supported: {0}", dbEntryState.State.ToString()));
}
@@ -128,6 +151,25 @@ namespace Disco.Data.Repository.Monitor
dbContext = dbContext,
EventType = eventType,
Entity = dbEntryState.Entity,
=======
throw new NotSupportedException(string.Format("Database Entry State not supported: {0}", entryState.State.ToString()));
}
entityType = EntityTypeFromProxy(entryState.Entity.GetType());
// Only pass modified properties on Modified Event (Ignore Added/Deleted)
if (eventType == RepositoryMonitorEventType.Modified)
modifiedProperties = entryState.GetModifiedProperties().ToArray();
// Don't pass entity key when entity newly added
if (eventType != RepositoryMonitorEventType.Added)
entityKey = entryState.EntityKey.EntityKeyValues.Select(kv => kv.Value).ToArray();
return new RepositoryMonitorEvent()
{
EventType = eventType,
Entity = entryState.Entity,
>>>>>>> origin/Repository-Monitor
EntityKey = entityKey,
EntityType = entityType,
ModifiedProperties = modifiedProperties