Added additional tests

Author: koenbeuk

src/EntityFrameworkCore.Triggered.Abstractions/ITriggerContext.cs

@@ -1,4 +1,6 @@
-namespace EntityFrameworkCore.Triggered
+using System.Collections.Generic;
+
+namespace EntityFrameworkCore.Triggered
 {
     public interface ITriggerContext<out TEntity>
         where TEntity : class
@@ -8,5 +10,10 @@ public interface ITriggerContext<out TEntity>
         TEntity Entity { get; }
 
         TEntity? UnmodifiedEntity { get; }
+
+        /// <summary>
+        /// Gets or sets a key/value collection that can be used to share data within the scope of this Entity
+        /// </summary>
+        IDictionary<object, object> EntityBag { get; }
     }
 }

src/EntityFrameworkCore.Triggered/Internal/EntityStateBagManager.cs

@@ -6,13 +6,13 @@ namespace EntityFrameworkCore.Triggered.Internal
 {
     public sealed class EntityBagStateManager
     {
-        private readonly Dictionary<object, IDictionary<string, object>> _resolvedBags = new();
+        private readonly Dictionary<object, IDictionary<object, object>> _resolvedBags = new();
 
-        public IDictionary<string, object> GetForEntity(object entity)
+        public IDictionary<object, object> GetForEntity(object entity)
         {
             if (!_resolvedBags.TryGetValue(entity, out var bag))
             {
-                bag = new Dictionary<string, object>();
+                bag = new Dictionary<object, object>();
                 _resolvedBags.Add(entity, bag);
             }
 

src/EntityFrameworkCore.Triggered/TriggerContext.cs

@@ -44,6 +44,6 @@ public TEntity? UnmodifiedEntity
             }
         }
 
-        public IDictionary<string, object> Bag => _entityBagStateManager.GetForEntity(_entity);
+        public IDictionary<object, object> EntityBag => _entityBagStateManager.GetForEntity(_entity);
     }
 }

test/EntityFrameworkCore.Triggered.IntegrationTests/EntityBags/ApplicationDbContext.cs

@@ -0,0 +1,18 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace EntityFrameworkCore.Triggered.IntegrationTests.EntityBags
+{
+    public class ApplicationDbContext
+#if EFCORETRIGGERED1
+        : TriggeredDbContext
+#else
+        : DbContext
+#endif
+    {
+        public ApplicationDbContext(DbContextOptions options) : base(options)
+        {
+        }
+
+        public DbSet<User> Users { get; set; }
+    }
+}

test/EntityFrameworkCore.Triggered.IntegrationTests/EntityBags/EntityBagsTestScenario.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using ScenarioTests;
+using Xunit;
+
+namespace EntityFrameworkCore.Triggered.IntegrationTests.EntityBags
+{
+    public partial class EntityBagsTestScenario
+    {
+        [Scenario(NamingPolicy = ScenarioTestMethodNamingPolicy.Test)]
+        public void PlayScenario(ScenarioContext scenario)
+        {
+            using var dbcontext = new ApplicationDbContext(
+                new DbContextOptionsBuilder()
+                    .UseInMemoryDatabase(scenario.TargetName)
+                    .UseTriggers(triggerOptions => {
+                        triggerOptions.AddTrigger<Triggers.StampModifiedOnTrigger>();
+                        triggerOptions.AddTrigger<Triggers.SoftDeleteTrigger>();
+                    })
+                    .Options
+            );
+
+            var user = new User();
+            dbcontext.Users.Add(user);
+            dbcontext.SaveChanges();
+
+            scenario.Fact("ModifiedOn is null", () => Assert.Null(user.ModifiedOn));
+            scenario.Fact("DeletedOn is null", () => Assert.Null(user.DeletedOn));
+
+            dbcontext.Remove(user);
+            dbcontext.SaveChanges();
+
+            scenario.Fact("ModifiedOn is null after removal", () => Assert.Null(user.ModifiedOn));
+            scenario.Fact("DeletedOn is not null after removal", () => Assert.NotNull(user.DeletedOn));
+
+            user.Name = "Jon";
+            dbcontext.SaveChanges();
+
+            scenario.Fact("ModifiedOn is not null after update", () => Assert.NotNull(user.ModifiedOn));
+        }
+    }
+}

test/EntityFrameworkCore.Triggered.IntegrationTests/EntityBags/Triggers/SoftDeleteTrigger.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace EntityFrameworkCore.Triggered.IntegrationTests.EntityBags.Triggers
+{
+    public class SoftDeleteTrigger : IBeforeSaveTrigger<User>
+    {
+        public const string IsSoftDeleted = "SoftDeleteTrigger_IsSoftDeleted";
+
+        readonly ApplicationDbContext _dbContext;
+
+        public SoftDeleteTrigger(ApplicationDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+
+        public Task BeforeSave(ITriggerContext<User> context, CancellationToken cancellationToken)
+        {
+            if (context.ChangeType is ChangeType.Deleted)
+            {
+                context.EntityBag[IsSoftDeleted] = true;
+                context.Entity.DeletedOn = DateTime.UtcNow;
+
+                _dbContext.Entry(context.Entity).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

test/EntityFrameworkCore.Triggered.IntegrationTests/EntityBags/Triggers/StampModifiedOnTrigger.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace EntityFrameworkCore.Triggered.IntegrationTests.EntityBags.Triggers
+{
+    public class StampModifiedOnTrigger : IBeforeSaveTrigger<User>
+    {
+        public Task BeforeSave(ITriggerContext<User> context, CancellationToken cancellationToken)
+        {
+            if (context.ChangeType is ChangeType.Modified)
+            {
+                if (!context.EntityBag.ContainsKey(SoftDeleteTrigger.IsSoftDeleted))
+                {
+                    context.Entity.ModifiedOn = DateTime.UtcNow;
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

test/EntityFrameworkCore.Triggered.IntegrationTests/EntityBags/User.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace EntityFrameworkCore.Triggered.IntegrationTests.EntityBags
+{
+    public class User
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+
+        public DateTime? ModifiedOn { get; set; }
+        public DateTime? DeletedOn { get; set; }
+    }
+}

test/EntityFrameworkCore.Triggered.Tests/Internal/EntityBagStateManagerTests.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using EntityFrameworkCore.Triggered.Internal;
+using Xunit;
+
+namespace EntityFrameworkCore.Triggered.Tests.Internal
+{
+    public class EntityBagStateManagerTests
+    {
+        [Fact]
+        public void GetForEntity_MultipleCallsForSameEntity_ReturnsSameInstance()
+        {
+            var subject = new EntityBagStateManager();
+            var entity = new object();
+            var expectedBag = subject.GetForEntity(entity);
+
+            var bag = subject.GetForEntity(entity);
+
+            Assert.Same(expectedBag, bag);
+        }
+
+        [Fact]
+        public void GetForEntity_MultipleCallsForDifferentEntities_ReturnsDifferentInstances()
+        {
+            var subject = new EntityBagStateManager();
+            var entity1 = new object();
+            var entity2 = new object();
+
+            var entity1Bag = subject.GetForEntity(entity1);
+            var entity2Bag = subject.GetForEntity(entity2);
+
+            Assert.NotSame(entity1Bag, entity2Bag);
+        }
+    }
+}

test/EntityFrameworkCore.Triggered.Tests/Stubs/TriggerContextStub.cs

@@ -1,4 +1,6 @@
-namespace EntityFrameworkCore.Triggered.Tests.Stubs
+using System.Collections.Generic;
+
+namespace EntityFrameworkCore.Triggered.Tests.Stubs
 {
     public class TriggerContextStub<TEntity> : ITriggerContext<TEntity>
         where TEntity : class
@@ -7,5 +9,6 @@ public class TriggerContextStub<TEntity> : ITriggerContext<TEntity>
         public ChangeType ChangeType { get; set; }
         public TEntity Entity { get; set; }
         public TEntity UnmodifiedEntity { get; set; }
+        public IDictionary<object, object> EntityBag { get; set; }
     }
 }