[ODS-6508] Add support for applying criteria using inherited properti…

…es on derived resources (#1160) Co-authored-by: Geoffrey McElhanon <[email protected]>
Ed-Fi-Alliance-OSS · Oct 14, 2024 · 9895925 · 9895925
1 parent 8a61064
commit 9895925
Show file tree

Hide file tree

Showing 30 changed files with 5,262 additions and 41 deletions.
diff --git a/Application/EdFi.Ods.Common/Extensions/ResourceExtensions.cs b/Application/EdFi.Ods.Common/Extensions/ResourceExtensions.cs
@@ -69,7 +69,7 @@ public static IEnumerable<ResourceProperty> AllRequestProperties(this ResourceCl
                                             x => x.IsIdentifyingAndHasAssociations()),
                                         ModelComparers.ResourcePropertyNameOnly)
                                    .Union(
-                                        resourceClassBase.InheritedKeyProperties(),
+                                        resourceClassBase.InheritedProperties(),
                                         ModelComparers.ResourcePropertyNameOnly)
                 : resourceClassBase.AllProperties;
         }

diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Extensions/ResourceExtensionsTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Extensions/ResourceExtensionsTests.cs
@@ -92,8 +92,7 @@ protected override void Arrange()
                 _derivedResource = resourceModel.GetAllResources()
                     .First(r => r.IsDerived);
 
-                var baseKeyProperties = _derivedResource.Entity.InheritedAlternateIdentifiers
-                    .SelectMany(x => x.Properties);
+                var baseKeyProperties = _derivedResource.Entity.InheritedProperties;
 
                 _expectedResourceProperties = _derivedResource.AllProperties.Where(
                         p => ModelComparers.Entity.Equals(