Audit improvements

shinyorg · May 14, 2024 · 200b758 · 200b758
1 parent 5dc93c6
commit 200b758
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/Shiny.Extensions.EntityFramework/Auditing/AuditSaveChangesInterceptor.cs b/src/Shiny.Extensions.EntityFramework/Auditing/AuditSaveChangesInterceptor.cs
@@ -42,8 +42,13 @@ protected virtual List<AuditEntry> GetAuditEntries(SaveChangesCompletedEventData
             // Dot not audit entities that are not tracked, not changed, or not of type IAuditable
             if (entry.State != EntityState.Detached && 
                 entry.State != EntityState.Unchanged &&
-                entry.Entity is IAuditable)
+                entry.Entity is IAuditable auditable)
             {
+                auditable.LastEditUserIdentifier = auditInfo.UserIdentifier;
+                if (auditable.DateCreated == DateTimeOffset.MinValue)
+                    auditable.DateCreated = DateTimeOffset.UtcNow;
+
+                entry.DetectChanges();
                 var auditEntry = new AuditEntry
                 {
                     Operation = ToOperation(entry.State),
@@ -65,11 +70,33 @@ protected virtual Dictionary<string, object> CalculateChangeSet(EntityEntry entr
         var dict = new Dictionary<string, object>();
         foreach (var property in entry.Properties)
         {
-            if (property.IsModified && property.CurrentValue is not byte[])
+            if (this.IsAuditedProperty(property))
             {
                 dict.Add(property.Metadata.Name, property.OriginalValue ?? "NULL");
             }
         }
         return dict;
     }
+
+
+    protected virtual bool IsAuditedProperty(PropertyEntry entry)
+    {
+        if (!entry.IsModified)
+            return false;
+
+        if (entry.OriginalValue is byte[])
+            return false;
+
+        if (this.IsPropertyIgnored(entry.Metadata.Name))
+            return false;
+
+        return true;
+    }
+
+    protected virtual bool IsPropertyIgnored(string propertyName) => propertyName switch
+    {
+        nameof(IAuditable.LastEditUserIdentifier) => false,
+        nameof(IAuditable.DateCreated) => false,
+        _ => true
+    };
 }
diff --git a/src/Shiny.Extensions.EntityFramework/Auditing/IAuditable.cs b/src/Shiny.Extensions.EntityFramework/Auditing/IAuditable.cs
@@ -4,7 +4,8 @@ namespace Shiny.Auditing;
 
 public interface IAuditable
 {
-    AuditInfo Audit { get; set; }
+    string? LastEditUserIdentifier { get; set; }
+    DateTimeOffset DateCreated { get; set; }
 }
 
 [Owned]