Skip to content

Change AuditStateEntry's EntityType so that it returns the correct underlying EntityType #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2015
Merged

Change AuditStateEntry's EntityType so that it returns the correct underlying EntityType #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions Source/EntityFramework.Extended/Audit/AuditEntryState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,33 @@
using System.Data.Entity;
using System.Data.Entity.Core.Metadata.Edm;
using System.Data.Entity.Core.Objects;
using System.Linq;
using EntityFramework.Reflection;

namespace EntityFramework.Audit
{
internal class AuditEntryState
{
public AuditEntryState(ObjectStateEntry objectStateEntry)
public AuditEntryState(ObjectContext objectContext, ObjectStateEntry objectStateEntry)
{
if (objectStateEntry == null)
throw new ArgumentNullException("objectStateEntry");

if (objectStateEntry.Entity == null)
throw new ArgumentException("The Entity property is null for the specified ObjectStateEntry.", "objectStateEntry");

ObjectStateEntry = objectStateEntry;
Entity = objectStateEntry.Entity;

EntityType = objectStateEntry.EntitySet.ElementType as EntityType;
if (objectContext == null)
{
throw new ArgumentNullException("objectContext");
}

Type entityType = objectStateEntry.Entity.GetType();
entityType = ObjectContext.GetObjectType(entityType);
ObjectStateEntry = objectStateEntry;
ObjectContext = objectContext;
ObjectType = ObjectContext.GetObjectType(objectStateEntry.Entity.GetType());

ObjectType = entityType;
EntityAccessor = TypeAccessor.GetAccessor(entityType);
Entity = objectStateEntry.Entity;
EntityType = objectContext.MetadataWorkspace.GetItems(DataSpace.OSpace).OfType<EntityType>().FirstOrDefault(x => x.Name == ObjectType.Name);
EntityAccessor = TypeAccessor.GetAccessor(ObjectType);

AuditEntity = new AuditEntity(objectStateEntry.Entity)
{
Expand Down
3 changes: 1 addition & 2 deletions Source/EntityFramework.Extended/Audit/AuditLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,9 @@ public AuditLog UpdateLog(AuditLog auditLog)
if (!Configuration.IsAuditable(entityType))
continue;

var state = new AuditEntryState(objectStateEntry)
var state = new AuditEntryState(ObjectContext, objectStateEntry)
{
AuditLog = auditLog,
ObjectContext = ObjectContext,
};

if (WriteEntity(state))
Expand Down
3 changes: 3 additions & 0 deletions Source/Samples/net45/Tracker.SqlServer.Test/Tracker.SqlServer.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down