Merge pull request #330 from json-api-dotnet/develop

v2.3.4 Introduce ResourceDefinition

Author: jaredcnance

Build.ps1

@@ -46,18 +46,18 @@ If($env:APPVEYOR_REPO_TAG -eq $true) {
 
     IF ([string]::IsNullOrWhitespace($revision)){
         Write-Output "RUNNING dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts"
-        dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts
+        dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --include-symbols
         CheckLastExitCode
     }
     Else {
         Write-Output "RUNNING dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$revision"
-        dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$revision 
+        dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$revision --include-symbols
         CheckLastExitCode
     }
 }
 Else { 
     Write-Output "VERSION-SUFFIX: alpha1-$revision"
     Write-Output "RUNNING dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=alpha1-$revision"
-    dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=alpha1-$revision 
+    dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=alpha1-$revision --include-symbols
     CheckLastExitCode
 }

appveyor.yml

@@ -44,6 +44,7 @@ deploy:
   api_key:
     secure: 6CeYcZ4Ze+57gxfeuHzqP6ldbUkPtF6pfpVM1Gw/K2jExFrAz763gNAQ++tiacq3
   skip_symbols: false
+  symbol_server: https://www.myget.org/F/research-institute/symbols/api/v2/package
   on:
     branch: develop
 - provider: NuGet

src/Examples/JsonApiDotNetCoreExample/Controllers/UsersController.cs

@@ -0,0 +1,17 @@
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Services;
+using JsonApiDotNetCoreExample.Models;
+using Microsoft.Extensions.Logging;
+
+namespace JsonApiDotNetCoreExample.Controllers
+{
+    public class UsersController : JsonApiController<User>
+    {
+        public UsersController(
+            IJsonApiContext jsonApiContext,
+            IResourceService<User> resourceService,
+            ILoggerFactory loggerFactory) 
+            : base(jsonApiContext, resourceService, loggerFactory)
+        { }
+    }
+}

src/Examples/JsonApiDotNetCoreExample/Data/AppDbContext.cs

@@ -37,7 +37,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         public DbSet<Article> Articles { get; set; }
         public DbSet<Author> Authors { get; set; }
-
         public DbSet<NonJsonApiResource> NonJsonApiResources { get; set; }
+        public DbSet<User> Users { get; set; }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Migrations/20180327120810_initial.cs

@@ -1,7 +1,5 @@
-using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using System;
-using System.Collections.Generic;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace JsonApiDotNetCoreExample.Migrations

src/Examples/JsonApiDotNetCoreExample/Models/User.cs

@@ -0,0 +1,10 @@
+using JsonApiDotNetCore.Models;
+
+namespace JsonApiDotNetCoreExample.Models
+{
+    public class User : Identifiable
+    {
+        [Attr("username")] public string Username { get; set; }
+        [Attr("password")] public string Password { get; set; }
+    }
+}

src/Examples/JsonApiDotNetCoreExample/Resources/UserResource.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using JsonApiDotNetCore.Models;
+using JsonApiDotNetCoreExample.Models;
+
+namespace JsonApiDotNetCoreExample.Resources
+{
+    public class UserResource : ResourceDefinition<User>
+    {
+        protected override List<AttrAttribute> OutputAttrs()
+            => Remove(user => user.Password);
+    }
+}

src/Examples/JsonApiDotNetCoreExample/Startup.cs

@@ -7,6 +7,9 @@
 using Microsoft.EntityFrameworkCore;
 using JsonApiDotNetCore.Extensions;
 using System;
+using JsonApiDotNetCore.Models;
+using JsonApiDotNetCoreExample.Resources;
+using JsonApiDotNetCoreExample.Models;
 
 namespace JsonApiDotNetCoreExample
 {
@@ -38,7 +41,9 @@ public virtual IServiceProvider ConfigureServices(IServiceCollection services)
                     options.Namespace = "api/v1";
                     options.DefaultPageSize = 5;
                     options.IncludeTotalRecordCount = true;
-                });
+                })
+                // TODO: this should be handled via auto-discovery
+                .AddScoped<ResourceDefinition<User>, UserResource>();
 
             var provider = services.BuildServiceProvider();
             var appContext = provider.GetRequiredService<AppDbContext>();

src/Examples/ReportsExample/Controllers/ReportsController.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Services;

src/Examples/ReportsExample/Services/ReportService.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using JsonApiDotNetCore.Services;