interface type fixes & unit test improvements

.github/workflows/ci.yml

@@ -23,10 +23,12 @@ on:
       - 'releases/*'
 
 jobs:
-  ubuntu-latest:
-    name: ubuntu-latest
-    runs-on: ubuntu-latest
+  ubuntu-20_04:
+    name: ubuntu-20_04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Run './build.cmd Ci'
         run: ./build.cmd Ci

.github/workflows/ci_publish.yml

@@ -24,11 +24,13 @@ on:
       - 'v*'
 
 jobs:
-  ubuntu-latest:
-    name: ubuntu-latest
-    runs-on: ubuntu-latest
+  ubuntu-20_04:
+    name: ubuntu-20_04
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Run './build.cmd CiPublish'
         run: ./build.cmd CiPublish
         env:

.nuke/build.schema.json

@@ -29,14 +29,18 @@
             "AppVeyor",
             "AzurePipelines",
             "Bamboo",
+            "Bitbucket",
             "Bitrise",
             "GitHubActions",
             "GitLab",
             "Jenkins",
+            "Rider",
             "SpaceAutomation",
             "TeamCity",
             "Terminal",
-            "TravisCI"
+            "TravisCI",
+            "VisualStudio",
+            "VSCode"
           ]
         },
         "NoLogo": {
@@ -46,6 +50,10 @@
         "NUGET_API_KEY": {
           "type": "string"
         },
+        "Partition": {
+          "type": "string",
+          "description": "Partition to use on CI"
+        },
         "Plan": {
           "type": "boolean",
           "description": "Shows the execution plan (HTML)"

Sieve.Sample/Sieve.Sample.csproj

@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.14">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.14" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SieveUnitTests\SieveUnitTests.csproj" />

Sieve/Extensions/OrderByDynamic.cs → Sieve/Extensions/LinqExtensions.cs

@@ -1,21 +1,76 @@
 using System;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Reflection;
+using Sieve.Exceptions;
 
 namespace Sieve.Extensions
 {
     public static partial class LinqExtensions
     {
+        internal static Expression GeneratePropertyAccess
+        (
+            this Expression parameterExpression,
+            string propertyName
+        )
+        {
+            var propertyAccessor = parameterExpression;
+
+            try
+            {
+                propertyAccessor = Expression.PropertyOrField(propertyAccessor, propertyName);
+            }
+            catch (ArgumentException)
+            {
+                // propertyName is not a direct property of field of propertyAccessor expression's type.
+                // when propertyAccessor.Type is directly an interface, say typeof(ISomeEntity) and ISomeEntity is interfaced to IBaseEntity
+                // in which `propertyName` is defined in the first place.
+                // To solve this, search `propertyName` in all other implemented interfaces
+
+                var possibleInterfaceType = propertyAccessor.Type;
+
+                if (!possibleInterfaceType.IsInterface)
+                    throw;
+
+                // get all implemented interface types
+                var implementedInterfaces = possibleInterfaceType.GetInterfaces();
+
+                try
+                {
+                    // search propertyName in all interfaces
+                    var interfacedExpression = implementedInterfaces
+                        .Where
+                        (
+                            implementedInterface => implementedInterface
+                                .GetProperties()
+                                .Any(info => info.Name == propertyName)
+                        )
+                        .Select(implementedInterface => Expression.TypeAs(propertyAccessor, implementedInterface))
+                        .SingleOrDefault();
+
+                    if (interfacedExpression != null)
+                        propertyAccessor = Expression.PropertyOrField(interfacedExpression, propertyName);
+                }
+                catch (InvalidOperationException ioe)
+                {
+                    throw new SieveException
+                    (
+                        $"{propertyName} is repeated in interface hierarchy. Try renaming.",
+                        ioe
+                    );
+                }
+            }
+
+            return propertyAccessor;
+        }
+
         public static IQueryable<TEntity> OrderByDynamic<TEntity>(
             this IQueryable<TEntity> source,
             string fullPropertyName,
-            PropertyInfo propertyInfo,
             bool desc,
             bool useThenBy, 
             bool disableNullableTypeExpression = false)
         {
-            var lambda = GenerateLambdaWithSafeMemberAccess<TEntity>(fullPropertyName, propertyInfo, disableNullableTypeExpression);
+            var lambda = GenerateLambdaWithSafeMemberAccess<TEntity>(fullPropertyName, disableNullableTypeExpression);
 
             var command = desc
                 ? (useThenBy ? "ThenByDescending" : "OrderByDescending")
@@ -34,7 +89,6 @@ public static IQueryable<TEntity> OrderByDynamic<TEntity>(
         private static Expression<Func<TEntity, object>> GenerateLambdaWithSafeMemberAccess<TEntity>
         (
             string fullPropertyName,
-            PropertyInfo propertyInfo,
             bool disableNullableTypeExpression
         )
         {
@@ -44,15 +98,7 @@ bool disableNullableTypeExpression
 
             foreach (var name in fullPropertyName.Split('.'))
             {
-                try
-                {
-                    propertyValue = Expression.PropertyOrField(propertyValue, name);
-                }
-                catch (ArgumentException)
-                {
-                    // name is not a direct property of field of propertyValue expression. construct a memberAccess then.
-                    propertyValue = Expression.MakeMemberAccess(propertyValue, propertyInfo);
-                }
+                propertyValue = propertyValue.GeneratePropertyAccess(name);
 
                 if (propertyValue.Type.IsNullable() && !disableNullableTypeExpression)
                 {

Sieve/Services/SieveProcessor.cs

@@ -289,7 +289,7 @@ private static (Expression propertyValue, Expression nullCheck) GetPropertyValue
             var names = fullPropertyName.Split('.');
             for (var i = 0; i < names.Length; i++)
             {
-                propertyValue = Expression.PropertyOrField(propertyValue, names[i]);
+                propertyValue = propertyValue.GeneratePropertyAccess(names[i]);
 
                 if (i != names.Length - 1 && propertyValue.Type.IsNullable())
                 {
@@ -368,7 +368,7 @@ protected virtual IQueryable<TEntity> ApplySorting<TEntity>(TSieveModel model, I
 
                 if (property != null)
                 {
-                    result = result.OrderByDynamic(fullName, property, sortTerm.Descending, useThenBy, Options.Value.DisableNullableTypeExpressionForSorting);
+                    result = result.OrderByDynamic(fullName, sortTerm.Descending, useThenBy, Options.Value.DisableNullableTypeExpressionForSorting);
                 }
                 else
                 {

Sieve/Sieve.csproj

@@ -22,9 +22,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
 </Project>

SieveUnitTests/Abstractions/Entity/IBaseEntity.cs

@@ -1,8 +1,9 @@
 using System;
+using SieveUnitTests.Abstractions.Strategy;
 
 namespace SieveUnitTests.Abstractions.Entity
 {
-    public interface IBaseEntity
+    public interface IBaseEntity: ISupportSoftDelete
     {
         int Id { get; set; }
         DateTimeOffset DateCreated { get; set; }

SieveUnitTests/Abstractions/Entity/IPost.cs

@@ -1,9 +1,10 @@
 using Sieve.Attributes;
+using SieveUnitTests.Abstractions.Strategy;
 using SieveUnitTests.Entities;
 
 namespace SieveUnitTests.Abstractions.Entity
 {
-    public interface IPost: IBaseEntity
+    public interface IPost: IBaseEntity, IAudit
     {
         [Sieve(CanFilter = true, CanSort = true)]
         string Title { get; set; }

SieveUnitTests/Abstractions/Entity/SieveConfigurationForIPost.cs

@@ -4,13 +4,17 @@ namespace SieveUnitTests.Abstractions.Entity
 {
     public class SieveConfigurationForIPost : ISieveConfiguration
     {
-        public void Configure(SievePropertyMapper mapper)
+        public static void ConfigureStatic(SievePropertyMapper mapper)
         {
+            mapper
+                .Property<IPost>(p => p.Id)
+                .CanSort();
+
             mapper.Property<IPost>(p => p.ThisHasNoAttributeButIsAccessible)
                 .CanSort()
                 .CanFilter()
                 .HasName("shortname");
-            
+
             mapper.Property<IPost>(p => p.TopComment.Text)
                 .CanFilter();
 
@@ -32,6 +36,21 @@ public void Configure(SievePropertyMapper mapper)
                 .Property<IPost>(p => p.DateCreated)
                 .CanSort()
                 .HasName("CreateDate");
+
+            mapper
+                .Property<IPost>(post => post.DeletedBy)
+                .CanSort()
+                .HasName("DeletedBy");
+
+            mapper
+                .Property<IPost>(post => post.UpdatedBy)
+                .CanFilter()
+                .HasName("UpdatedBy");
+        }
+
+        public void Configure(SievePropertyMapper mapper)
+        {
+            ConfigureStatic(mapper);
         }
     }
 }

SieveUnitTests/Abstractions/Strategy/IAudit.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace SieveUnitTests.Abstractions.Strategy
+{
+    public interface IAudit
+    {
+        string CreatedBy { get; }
+        DateTime? CreatedAt { get; }
+        string UpdatedBy { get; }
+        DateTime? UpdatedAt { get; }
+    }
+}

SieveUnitTests/Abstractions/Strategy/ISupportSoftDelete.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace SieveUnitTests.Abstractions.Strategy
+{
+    public interface ISupportSoftDelete
+    {
+        string DeletedBy { get; }
+        DateTime? DeletedAt { get; }
+    }
+}

SieveUnitTests/Entities/BaseEntity.cs

@@ -10,5 +10,8 @@ public class BaseEntity : IBaseEntity
 
         [Sieve(CanFilter = true, CanSort = true)]
         public DateTimeOffset DateCreated { get; set; } = DateTimeOffset.UtcNow;
+
+        public string DeletedBy { get; set; }
+        public DateTime? DeletedAt { get; set; }
     }
 }

SieveUnitTests/Entities/Post.cs

@@ -30,5 +30,10 @@ public class Post : BaseEntity, IPost
 
         public Comment TopComment { get; set; }
         public Comment FeaturedComment { get; set; }
+
+        public string CreatedBy { get; set; }
+        public DateTime? CreatedAt { get; set; }
+        public string UpdatedBy { get; set; }
+        public DateTime? UpdatedAt { get; set; }
     }
 }

SieveUnitTests/Entities/SieveConfigurationForPost.cs

@@ -4,8 +4,12 @@ namespace SieveUnitTests.Entities
 {
     public class SieveConfigurationForPost : ISieveConfiguration
     {
-        public void Configure(SievePropertyMapper mapper)
+        public static void ConfigureStatic(SievePropertyMapper mapper)
         {
+            mapper
+                .Property<Post>(p => p.Id)
+                .CanSort();
+
             mapper.Property<Post>(p => p.ThisHasNoAttributeButIsAccessible)
                 .CanSort()
                 .CanFilter()
@@ -32,6 +36,21 @@ public void Configure(SievePropertyMapper mapper)
                 .Property<Post>(p => p.DateCreated)
                 .CanSort()
                 .HasName("CreateDate");
+
+            mapper
+                .Property<Post>(post => post.DeletedBy)
+                .CanSort()
+                .HasName("DeletedBy");
+
+            mapper
+                .Property<Post>(post => post.UpdatedBy)
+                .CanFilter()
+                .HasName("UpdatedBy");
+        }
+
+        public void Configure(SievePropertyMapper mapper)
+        {
+            ConfigureStatic(mapper);
         }
     }
 }