Basic working & complete tests

SieveTests/Controllers/TestController.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Sieve.Models;
+using Sieve.Services;
+using SieveTests.Entities;
+
+namespace SieveTests.Controllers
+{
+    [Route("api/[controller]/[action]")]
+    public class TestController : Controller
+    {
+        private ISieveProcessor<Post> _sieveProcessor;
+        private ApplicationDbContext _dbContext;
+
+        public TestController(ISieveProcessor<Post> sieveProcessor,
+            ApplicationDbContext dbContext)
+        {
+            _sieveProcessor = sieveProcessor;
+            _dbContext = dbContext;
+        }
+
+        [HttpGet]
+        public JsonResult GetAllWithSieve(SieveModel sieveModel)
+        {
+            var result = _dbContext.Posts.AsNoTracking();
+
+            result = _sieveProcessor.ApplyAll(sieveModel, result);
+
+            return Json(result.ToList());
+        }
+
+        [HttpGet]
+        public JsonResult Create(int number = 10)
+        {
+            for (int i = 0; i < number; i++)
+            {
+                _dbContext.Posts.Add(new Post());
+            }
+
+            _dbContext.SaveChanges();
+
+            return Json(_dbContext.Posts.ToList());
+        }
+
+        [HttpGet]
+        public JsonResult GetAll()
+        {
+            return Json(_dbContext.Posts.ToList());
+        }
+    }
+}

SieveTests/Controllers/ValuesController.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-
-namespace SieveTests.Controllers
-{
-    [Route("api/[controller]")]
-    public class ValuesController : Controller
-    {
-        // GET api/values
-        [HttpGet]
-        public IEnumerable<string> Get()
-        {
-            return new string[] { "value1", "value2" };
-        }
-
-        // GET api/values/5
-        [HttpGet("{id}")]
-        public string Get(int id)
-        {
-            return "value";
-        }
-
-        // POST api/values
-        [HttpPost]
-        public void Post([FromBody]string value)
-        {
-        }
-
-        // PUT api/values/5
-        [HttpPut("{id}")]
-        public void Put(int id, [FromBody]string value)
-        {
-        }
-
-        // DELETE api/values/5
-        [HttpDelete("{id}")]
-        public void Delete(int id)
-        {
-        }
-    }
-}

SieveTests/Entities/ApplicationDbContext.cs

@@ -0,0 +1,20 @@
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace SieveTests.Entities
+{
+    public class ApplicationDbContext : DbContext
+    {
+        public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options) { }
+
+        public DbSet<Post> Posts { get; set; }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+        }
+    }
+}

SieveTests/Entities/Post.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Sieve.Attributes;
+
+namespace SieveTests.Entities
+{
+    public class Post
+    {
+        public int Id { get; set; }
+
+        [Sieve(CanFilter = true, CanSort = true)]
+        public string Title { get; set; } = Guid.NewGuid().ToString().Replace("-", string.Empty).Substring(0, 8);
+
+        [Sieve(CanFilter = true, CanSort = true)]
+        public int LikeCount { get; set; } = new Random().Next(0, 1000);
+
+        [Sieve(CanFilter = true, CanSort = true)]
+        public int CommentCount { get; set; } = new Random().Next(0, 1000);
+
+        [Sieve(CanFilter = true, CanSort = true)]
+        public DateTimeOffset DateCreated { get; set; } = DateTimeOffset.UtcNow;
+    }
+}

SieveTests/Migrations/20180127005347_Init.Designer.cs

@@ -0,0 +1,44 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Internal;
+using SieveTests.Entities;
+using System;
+
+namespace SieveTests.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20180127005347_Init")]
+    partial class Init
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.0.1-rtm-125")
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("SieveTests.Entities.Post", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("CommentCount");
+
+                    b.Property<DateTimeOffset>("DateCreated");
+
+                    b.Property<int>("LikeCount");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Posts");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SieveTests/Migrations/20180127005347_Init.cs

@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Collections.Generic;
+
+namespace SieveTests.Migrations
+{
+    public partial class Init : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Posts",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    CommentCount = table.Column<int>(nullable: false),
+                    DateCreated = table.Column<DateTimeOffset>(nullable: false),
+                    LikeCount = table.Column<int>(nullable: false),
+                    Title = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Posts", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Posts");
+        }
+    }
+}

SieveTests/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -0,0 +1,43 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Internal;
+using SieveTests.Entities;
+using System;
+
+namespace SieveTests.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    partial class ApplicationDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.0.1-rtm-125")
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("SieveTests.Entities.Post", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("CommentCount");
+
+                    b.Property<DateTimeOffset>("DateCreated");
+
+                    b.Property<int>("LikeCount");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Posts");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SieveTests/Program.cs

@@ -14,7 +14,9 @@ namespace SieveTests
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            var host = BuildWebHost(args);
+            
+            host.Run();
         }
 
         public static IWebHost BuildWebHost(string[] args) =>

SieveTests/Properties/launchSettings.json

@@ -18,12 +18,11 @@
     },
     "SieveTests": {
       "commandName": "Project",
-      "launchBrowser": true,
       "launchUrl": "api/values",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://localhost:65137/"
+      "applicationUrl": "http://localhost:6500/"
     }
   }
-}
+}

SieveTests/SieveTests.csproj

@@ -4,6 +4,11 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Migrations\20180127005211_Itit.cs" />
+    <Compile Remove="Migrations\20180127005211_Itit.Designer.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Folder Include="wwwroot\" />
   </ItemGroup>
@@ -16,4 +21,8 @@
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Sieve\Sieve.csproj" />
+  </ItemGroup>
+
 </Project>

SieveTests/Startup.cs

@@ -4,10 +4,14 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Sieve.Models;
+using Sieve.Services;
+using SieveTests.Entities;
 
 namespace SieveTests
 {
@@ -24,6 +28,16 @@ namespace SieveTests
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc();
+
+            services.AddDbContext<ApplicationDbContext>(options =>
+                options.UseSqlServer(Configuration.GetConnectionString("TestSqlServer")));
+
+            services.Configure<SieveOptions>(Configuration.GetSection("SieveConfig"));
+
+
+            //services.AddScoped<ISieveProcessor, SieveProcessor>();
+            services.AddScoped<ISieveProcessor<Post>, SieveProcessor<Post>>();
+
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

SieveTests/appsettings.json

@@ -1,4 +1,10 @@
 {
+  "ConnectionStrings": {
+    "TestSqlServer": "Server=(localdb)\\MSSQLLocalDB; Database=SieveTests;"
+  },
+  "SieveConfig": {
+
+  },
   "Logging": {
     "IncludeScopes": false,
     "Debug": {