test: inheritance

Author: maurei

src/Examples/JsonApiDotNetCoreExample/Models/IIsLockable.cs

@@ -0,0 +1,7 @@
+namespace JsonApiDotNetCoreExample.Models
+{
+    public interface IIsLockable
+    {
+        bool IsLocked { get; set; }
+    }
+}

src/Examples/JsonApiDotNetCoreExample/Models/Person.cs

@@ -11,7 +11,7 @@ public class PersonRole : Identifiable
         public Person Person { get; set; }
     }
 
-    public class Person : Identifiable, IHasMeta
+    public class Person : Identifiable, IHasMeta, IIsLockable
     {
         public bool IsLocked { get; set; }
 

src/Examples/JsonApiDotNetCoreExample/Models/TodoItem.cs

@@ -4,7 +4,7 @@
 
 namespace JsonApiDotNetCoreExample.Models
 {
-    public class TodoItem : Identifiable
+    public class TodoItem : Identifiable, IIsLockable
     {
         public TodoItem()
         {

src/Examples/JsonApiDotNetCoreExample/Resources/LockableResourceBase.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using JsonApiDotNetCore.Internal;
+using JsonApiDotNetCore.Models;
+using JsonApiDotNetCoreExample.Models;
+
+namespace JsonApiDotNetCoreExample.Resources
+{
+    public abstract class LockableResourceBase<T> : ResourceDefinition<T> where T : class, IIsLockable, IIdentifiable
+    {
+        protected LockableResourceBase(IResourceGraph graph) : base(graph) { }
+
+        protected void DisallowLocked(IEnumerable<T> entities)
+        {
+            foreach (var e in entities ?? Enumerable.Empty<T>())
+            {
+                if (e.IsLocked)
+                {
+                    throw new JsonApiException(403, "Not allowed to update fields or relations of locked todo item", new UnauthorizedAccessException());
+                }
+            }
+        }
+    }
+}

src/Examples/JsonApiDotNetCoreExample/Resources/PersonResource.cs

@@ -1,18 +1,14 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using JsonApiDotNetCore.Internal;
-using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Hooks;
 using JsonApiDotNetCoreExample.Models;
 
 namespace JsonApiDotNetCoreExample.Resources
 {
-    public class PersonResource : ResourceDefinition<Person>
+    public class PersonResource : LockableResourceBase<Person>
     {
-        public PersonResource(IResourceGraph graph) : base(graph)
-        {
-        }
+        public PersonResource(IResourceGraph graph) : base(graph) { }
 
         public override IEnumerable<string> BeforeUpdateRelationship(HashSet<string> ids, IAffectedRelationships<Person> resourcesByRelationship, ResourcePipeline pipeline)
         {
@@ -22,18 +18,7 @@ public override IEnumerable<string> BeforeUpdateRelationship(HashSet<string> ids
 
         public override void BeforeImplicitUpdateRelationship(IAffectedRelationships<Person> resourcesByRelationship, ResourcePipeline pipeline)
         {
-            resourcesByRelationship.GetByRelationship<Passport>().ToList().ForEach(kvp => DoesNotTouchLockedPeople(kvp.Value));
-        }
-
-        private void DoesNotTouchLockedPeople(IEnumerable<Person> entities)
-        {
-            foreach (var person in entities ?? Enumerable.Empty<Person>())
-            {
-                if (person.IsLocked)
-                {
-                    throw new JsonApiException(403, "Not allowed to update fields or relations of locked persons", new UnauthorizedAccessException());
-                }
-            }
+            resourcesByRelationship.GetByRelationship<Passport>().ToList().ForEach(kvp => DisallowLocked(kvp.Value));
         }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Resources/TodoResource.cs

@@ -2,17 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using JsonApiDotNetCore.Internal;
-using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Hooks;
 using JsonApiDotNetCoreExample.Models;
 
 namespace JsonApiDotNetCoreExample.Resources
 {
-    public class TodoResource : ResourceDefinition<TodoItem>
+    public class TodoResource : LockableResourceBase<TodoItem>
     {
-        public TodoResource(IResourceGraph graph) : base(graph)
-        {
-        }
+        public TodoResource(IResourceGraph graph) : base(graph) { }
 
         public override void BeforeRead(ResourcePipeline pipeline, bool isIncluded = false, string stringId = null)
         {
@@ -25,19 +22,7 @@ public override void BeforeRead(ResourcePipeline pipeline, bool isIncluded = fal
         public override void BeforeImplicitUpdateRelationship(IAffectedRelationships<TodoItem> resourcesByRelationship, ResourcePipeline pipeline)
         {
             List<TodoItem> todos = resourcesByRelationship.GetByRelationship<Person>().SelectMany(kvp => kvp.Value).ToList();
-            DoesNotTouchLocked(todos);
-        }
-
-
-        private void DoesNotTouchLocked(IEnumerable<TodoItem> entities)
-        {
-            foreach (var person in entities ?? Enumerable.Empty<TodoItem>())
-            {
-                if (person.IsLocked)
-                {
-                    throw new JsonApiException(403, "Not allowed to update fields or relations of locked todo item", new UnauthorizedAccessException());
-                }
-            }
+            DisallowLocked(todos);
         }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Resources/UserResource.cs

@@ -9,9 +9,7 @@ namespace JsonApiDotNetCoreExample.Resources
 {
     public class UserResource : ResourceDefinition<User>
     {
-        public UserResource(IResourceGraph graph) : base(graph)
-        {
-        }
+        public UserResource(IResourceGraph graph) : base(graph) { }
 
         protected override List<AttrAttribute> OutputAttrs()
             => Remove(user => user.Password);
@@ -24,7 +22,6 @@ public override QueryFilters GetQueryFilters()
           };
         }
 
-
         private IQueryable<User> FirstCharacterFilter(IQueryable<User> users, FilterQuery filterQuery)
         {
           switch(filterQuery.Operation)

test/UnitTests/ResourceHooks/DiscoveryTests.cs

@@ -3,11 +3,20 @@
 using System.Collections.Generic;
 using Xunit;
 using JsonApiDotNetCore.Builders;
+using JsonApiDotNetCore.Internal;
 
 namespace UnitTests.ResourceHooks
 {
     public class DiscoveryTests
     {
+        public class Dummy : Identifiable { }
+        public class DummyResourceDefinition : ResourceDefinition<Dummy>
+        {
+            public DummyResourceDefinition() : base(new ResourceGraphBuilder().AddResource<Dummy>().Build()) { }
+
+            public override IEnumerable<Dummy> BeforeDelete(HashSet<Dummy> entities, ResourcePipeline pipeline) { return entities; }
+            public override void AfterDelete(HashSet<Dummy> entities, ResourcePipeline pipeline, bool succeeded) { }
+        }
 
         [Fact]
         public void Hook_Discovery()
@@ -19,15 +28,29 @@ public void Hook_Discovery()
             Assert.Contains(ResourceHook.AfterDelete, hookConfig.ImplementedHooks);
 
         }
-        public class Dummy : Identifiable { }
-        public class DummyResourceDefinition : ResourceDefinition<Dummy>
+
+
+        public class AnotherDummy : Identifiable { }
+        public abstract class ResourceDefintionBase<T> : ResourceDefinition<T> where T : class, IIdentifiable
         {
-            public DummyResourceDefinition() : base(new ResourceGraphBuilder().AddResource<Dummy>().Build())
-            {
-            }
+            protected ResourceDefintionBase(IResourceGraph graph) : base(graph) { }
+        }
 
-            public override IEnumerable<Dummy> BeforeDelete(HashSet<Dummy> entities, ResourcePipeline pipeline) { return entities; }
-            public override void AfterDelete(HashSet<Dummy> entities, ResourcePipeline pipeline, bool succeeded) {  }
+        public class AnotherDummyResourceDefinition : ResourceDefintionBase<AnotherDummy>
+        {
+            public AnotherDummyResourceDefinition() : base(new ResourceGraphBuilder().AddResource<Dummy>().Build()) { }
+
+            public override IEnumerable<AnotherDummy> BeforeDelete(HashSet<AnotherDummy> entities, ResourcePipeline pipeline) { return entities; }
+            public override void AfterDelete(HashSet<AnotherDummy> entities, ResourcePipeline pipeline, bool succeeded) { }
+        }
+        [Fact]
+        public void Hook_Discovery_With_Inheritance()
+        {
+            // arrange & act
+            var hookConfig = new HooksDiscovery<AnotherDummy>();
+            // assert
+            Assert.Contains(ResourceHook.BeforeDelete, hookConfig.ImplementedHooks);
+            Assert.Contains(ResourceHook.AfterDelete, hookConfig.ImplementedHooks);
         }
     }
 }