feat(*): add controller, input formatter, and services

jaredcnance · jaredcnance · commit 00cbc045a45a · 2017-11-12T20:35:09.000-06:00
diff --git a/JsonApiDotnetCore.sln b/JsonApiDotnetCore.sln
@@ -28,6 +28,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{02
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportsExample", "src\Examples\ReportsExample\ReportsExample.csproj", "{FBFB0B0B-EA86-4B41-AB2A-E0249F70C86D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OperationsExample", "src\Examples\OperationsExample\OperationsExample.csproj", "{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -110,6 +112,18 @@ Global
 		{FBFB0B0B-EA86-4B41-AB2A-E0249F70C86D}.Release|x64.Build.0 = Release|x64
 		{FBFB0B0B-EA86-4B41-AB2A-E0249F70C86D}.Release|x86.ActiveCfg = Release|x86
 		{FBFB0B0B-EA86-4B41-AB2A-E0249F70C86D}.Release|x86.Build.0 = Release|x86
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Debug|x64.ActiveCfg = Debug|x64
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Debug|x64.Build.0 = Debug|x64
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Debug|x86.ActiveCfg = Debug|x86
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Debug|x86.Build.0 = Debug|x86
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Release|x64.ActiveCfg = Release|x64
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Release|x64.Build.0 = Release|x64
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Release|x86.ActiveCfg = Release|x86
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -123,5 +137,6 @@ Global
 		{6D4BD85A-A262-44C6-8572-FE3A30410BF3} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
 		{026FBC6C-AF76-4568-9B87-EC73457899FD} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
 		{FBFB0B0B-EA86-4B41-AB2A-E0249F70C86D} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
+		{CF2C1EB6-8449-4B35-B8C7-F43D6D90632D} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
 	EndGlobalSection
 EndGlobal
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs b/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using JsonApiDotNetCore.Builders;
 using JsonApiDotNetCore.Internal;
+using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Serialization;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
@@ -30,6 +32,7 @@ public IContractResolver JsonContractResolver
             ContractResolver = new DasherizedResolver()
         };
         internal IContextGraphBuilder ContextGraphBuilder { get; } = new ContextGraphBuilder();
+        internal List<JsonApiExtension> EnabledExtensions { get; set; } = new List<JsonApiExtension>();
 
         public void BuildContextGraph<TContext>(Action<IContextGraphBuilder> builder) where TContext : DbContext
         {
@@ -48,5 +51,10 @@ public void BuildContextGraph(Action<IContextGraphBuilder> builder)
 
             ContextGraph = ContextGraphBuilder.Build();
         }
+
+        public void EnableExtension(JsonApiExtension extension)
+        {
+            EnabledExtensions.Add(extension);
+        }
     }
 }
diff --git a/src/JsonApiDotNetCore/Controllers/BaseJsonApiController.cs b/src/JsonApiDotNetCore/Controllers/BaseJsonApiController.cs
@@ -4,7 +4,6 @@
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
 namespace JsonApiDotNetCore.Controllers
 {
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs
@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using JsonApiDotNetCore.Models.Operations;
+using JsonApiDotNetCore.Services.Operations;
+using Microsoft.AspNetCore.Mvc;
+
+namespace JsonApiDotNetCore.Controllers
+{
+    public class JsonApiOperationsController : Controller
+    {
+        private readonly IOperationsProcessor _operationsProcessor;
+
+        public JsonApiOperationsController(IOperationsProcessor operationsProcessor)
+        {
+            _operationsProcessor = operationsProcessor;
+        }
+
+        [HttpPost("bulk")]
+        public async Task<IActionResult> PatchAsync(OperationsDocument doc)
+        {
+            var results = await _operationsProcessor.ProcessAsync(doc.Operations);
+            return Ok(results);
+        }
+    }
+}
diff --git a/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs b/src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs
@@ -6,8 +6,10 @@
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Generics;
 using JsonApiDotNetCore.Middleware;
+using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Serialization;
 using JsonApiDotNetCore.Services;
+using JsonApiDotNetCore.Services.Operations;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -91,6 +93,9 @@ public static void AddJsonApiInternals(
                 services.AddSingleton<DbContextOptions>(new DbContextOptionsBuilder().Options);
             }
 
+            if (jsonApiOptions.EnabledExtensions.Contains(JsonApiExtension.Operations))
+                AddOperationServices(services);
+
             services.AddScoped<IDbContextResolver, DbContextResolver>();
             services.AddScoped(typeof(IEntityRepository<>), typeof(DefaultEntityRepository<>));
             services.AddScoped(typeof(IEntityRepository<,>), typeof(DefaultEntityRepository<,>));
@@ -114,8 +119,18 @@ public static void AddJsonApiInternals(
             services.AddScoped<IControllerContext, Services.ControllerContext>();
         }
 
+        private static void AddOperationServices(IServiceCollection services)
+        {
+            services.AddScoped<IOperationsProcessor, OperationsProcessor>();
+            services.AddSingleton<IOperationProcessorResolver, OperationProcessorResolver>();
+            services.AddSingleton<IGenericProcessorFactory, GenericProcessorFactory>();
+        }
+
         public static void SerializeAsJsonApi(this MvcOptions options, JsonApiOptions jsonApiOptions)
         {
+            if (jsonApiOptions.EnabledExtensions.Contains(JsonApiExtension.Operations))
+                options.InputFormatters.Insert(0, new JsonApiOperationsInputFormatter());
+
             options.InputFormatters.Insert(0, new JsonApiInputFormatter());
 
             options.OutputFormatters.Insert(0, new JsonApiOutputFormatter());
diff --git a/src/JsonApiDotNetCore/Formatters/JsonApiInputFormatter.cs b/src/JsonApiDotNetCore/Formatters/JsonApiInputFormatter.cs
@@ -8,17 +8,22 @@ namespace JsonApiDotNetCore.Formatters
     public class JsonApiInputFormatter : IInputFormatter
     {
         public bool CanRead(InputFormatterContext context)
-        {
+        {            
             if (context == null)
                 throw new ArgumentNullException(nameof(context));
 
             var contentTypeString = context.HttpContext.Request.ContentType;
 
-            return contentTypeString == "application/vnd.api+json";
+            var canRead = contentTypeString == "application/vnd.api+json";
+
+            Console.WriteLine($">>> JsonApiInputFormatter Can Read {canRead}");
+
+            return canRead;
         }
 
         public async Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
         {
+            Console.WriteLine($">>> JsonApiInputFormatter ReadAsync");
             var reader = context.HttpContext.RequestServices.GetService<IJsonApiReader>();
             return await reader.ReadAsync(context);
         }
diff --git a/src/JsonApiDotNetCore/Formatters/JsonApiOperationsInputFormatter.cs b/src/JsonApiDotNetCore/Formatters/JsonApiOperationsInputFormatter.cs
@@ -1,31 +1,43 @@
 using System;
+using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
 
 namespace JsonApiDotNetCore.Formatters
 {
-    public class JsonApiOperationsInputFormatter : IInputFormatter
+    public class JsonApiOperationsInputFormatter : TextInputFormatter
     {
         const string PROFILE_EXTENSION = "<http://example.org/profiles/myjsonstuff>; rel=\"profile\"";
 
-        public bool CanRead(InputFormatterContext context)
+        public JsonApiOperationsInputFormatter()
+        {
+            SupportedMediaTypes.Add(MediaTypeHeaderValue.Parse("application/vnd.api+json"));
+            SupportedEncodings.Add(Encoding.UTF8);
+            SupportedEncodings.Add(Encoding.Unicode);
+        }
+
+        public override bool CanRead(InputFormatterContext context)
         {
             if (context == null)
                 throw new ArgumentNullException(nameof(context));
 
             var contentTypeString = context.HttpContext.Request.ContentType;
 
-            return (
-                contentTypeString == "application/vnd.api+json" && 
+            var canRead = (
+                contentTypeString == "application/vnd.api+json" &&
                 context.HttpContext.Request.Headers.TryGetValue("Link", out StringValues profileExtension) &&
                 profileExtension == PROFILE_EXTENSION
             );
+            Console.WriteLine($">>> JsonApiOperationsInputFormatter Can Read {canRead}");
+            return canRead;
         }
 
-        public async Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
+        public override async Task<InputFormatterResult> ReadRequestBodyAsync(InputFormatterContext context, Encoding encoding)
         {
+            Console.WriteLine($">>> JsonApiOperationsInputFormatter ReadAsync");
             var reader = context.HttpContext.RequestServices.GetService<IJsonApiOperationsReader>();
             return await reader.ReadAsync(context);
         }
diff --git a/src/JsonApiDotNetCore/Formatters/JsonApiOperationsReader.cs b/src/JsonApiDotNetCore/Formatters/JsonApiOperationsReader.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Models.Operations;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Newtonsoft.Json;
@@ -27,7 +28,10 @@ public Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
 
             var operations = JsonConvert.DeserializeObject<OperationsDocument>(body);
 
-            return InputFormatterResult.SuccessAsync(null);
+            if(operations == null)
+                throw new JsonApiException(400, "Failed to deserialize operations request.");
+
+            return InputFormatterResult.SuccessAsync(operations);
         }
 
         private string GetRequestBody(Stream body)
diff --git a/src/JsonApiDotNetCore/Models/JsonApiExtension.cs b/src/JsonApiDotNetCore/Models/JsonApiExtension.cs
@@ -0,0 +1,7 @@
+namespace JsonApiDotNetCore.Models
+{
+    public enum JsonApiExtension
+    {
+        Operations = 0
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using JsonApiDotNetCore.Builders;`
`3`	`4`	`using JsonApiDotNetCore.Internal;`
	`5`	`+using JsonApiDotNetCore.Models;`
`4`	`6`	`using JsonApiDotNetCore.Serialization;`
`5`	`7`	`using Microsoft.EntityFrameworkCore;`
`6`	`8`	`using Newtonsoft.Json;`
`@@ -30,6 +32,7 @@ public IContractResolver JsonContractResolver`
`30`	`32`	`ContractResolver = new DasherizedResolver()`
`31`	`33`	`};`
`32`	`34`	`internal IContextGraphBuilder ContextGraphBuilder { get; } = new ContextGraphBuilder();`
	`35`	`+ internal List<JsonApiExtension> EnabledExtensions { get; set; } = new List<JsonApiExtension>();`
`33`	`36`
`34`	`37`	`public void BuildContextGraph<TContext>(Action<IContextGraphBuilder> builder) where TContext : DbContext`
`35`	`38`	`{`
`@@ -48,5 +51,10 @@ public void BuildContextGraph(Action<IContextGraphBuilder> builder)`
`48`	`51`
`49`	`52`	`ContextGraph = ContextGraphBuilder.Build();`
`50`	`53`	`}`
	`54`	`+`
	`55`	`+ public void EnableExtension(JsonApiExtension extension)`
	`56`	`+ {`
	`57`	`+ EnabledExtensions.Add(extension);`
	`58`	`+ }`
`51`	`59`	`}`
`52`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using JsonApiDotNetCore.Models;`
`5`	`5`	`using JsonApiDotNetCore.Services;`
`6`	`6`	`using Microsoft.AspNetCore.Mvc;`
`7`		`-using Microsoft.Extensions.Logging;`
`8`	`7`
`9`	`8`	`namespace JsonApiDotNetCore.Controllers`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,17 +8,22 @@ namespace JsonApiDotNetCore.Formatters`
`8`	`8`	`public class JsonApiInputFormatter : IInputFormatter`
`9`	`9`	`{`
`10`	`10`	`public bool CanRead(InputFormatterContext context)`
`11`		`- {`
	`11`	`+ {`
`12`	`12`	`if (context == null)`
`13`	`13`	`throw new ArgumentNullException(nameof(context));`
`14`	`14`
`15`	`15`	`var contentTypeString = context.HttpContext.Request.ContentType;`
`16`	`16`
`17`		`- return contentTypeString == "application/vnd.api+json";`
	`17`	`+ var canRead = contentTypeString == "application/vnd.api+json";`
	`18`	`+`
	`19`	`+ Console.WriteLine($">>> JsonApiInputFormatter Can Read {canRead}");`
	`20`	`+`
	`21`	`+ return canRead;`
`18`	`22`	`}`
`19`	`23`
`20`	`24`	`public async Task<InputFormatterResult> ReadAsync(InputFormatterContext context)`
`21`	`25`	`{`
	`26`	`+ Console.WriteLine($">>> JsonApiInputFormatter ReadAsync");`
`22`	`27`	`var reader = context.HttpContext.RequestServices.GetService<IJsonApiReader>();`
`23`	`28`	`return await reader.ReadAsync(context);`
`24`	`29`	`}`