Merge pull request #144 from JakeGinnivan/bugfix-input-formatter

Bugfix input formatter

Author: panmanphil

.gitignore

@@ -111,3 +111,7 @@ artifacts
 
 WebApi.Hal*.nupkg
 *.received.txt
+
+.vscode/
+
+*~

WebApi.Hal.Build/WebApi.Hal.Commons.props

@@ -20,7 +20,7 @@
     <RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
   </PropertyGroup>
   <PropertyGroup>
-      <Major>1</Major>
+      <Major>3</Major>
       <Minor>0</Minor>
       <Revision>0</Revision>
 
@@ -29,7 +29,7 @@
       <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
 
       <!-- Remove for release -->
-      <PrereleaseLabel>-beta</PrereleaseLabel>
+      <PrereleaseLabel>-pre</PrereleaseLabel>
 
       <BuildSuffix Condition=" '$(PrereleaseLabel)' != '' ">$(PrereleaseLabel)-$(BuildNumber)</BuildSuffix>
       <BuildSuffix Condition=" '$(BuildSuffix)' == '' "></BuildSuffix>

WebApi.Hal.Tests/WebApi.Hal.Tests.csproj

@@ -4,6 +4,10 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <Version>3.0.0-pre-1</Version>
+    <Authors>Jake Ginnivan, DotNetMedia Organizaion</Authors>
+    <Copyright>Copyright © Jake Ginnvan 2017</Copyright>
+    <AssemblyVersion>3.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>

WebApi.Hal.Web/Api/BeerController.cs

@@ -4,6 +4,7 @@
 using Microsoft.EntityFrameworkCore;
 using WebApi.Hal.Web.Api.Resources;
 using WebApi.Hal.Web.Data;
+using WebApi.Hal.Web.Models;
 
 namespace WebApi.Hal.Web.Api
 {
@@ -23,25 +24,26 @@ public BeerRepresentation Get(int id)
         {
             var beer = beerDbContext.Beers
                                     .Include("Brewery") // lazy loading isn't on for this query; force loading
-                                    .Include("BeerStyle")
+                                    .Include("Style")
                                     .Single(br => br.Id == id);
 
             return new BeerRepresentation
-                   {
-                       Id = beer.Id,
-                       Name = beer.Name,
-                       BreweryId = beer.Brewery == null ? (int?) null : beer.Brewery.Id,
-                       BreweryName = beer.Brewery == null ? null : beer.Brewery.Name,
-                       StyleId = beer.Style == null ? (int?) null : beer.Style.Id,
-                       StyleName = beer.Style == null ? null : beer.Style.Name,
-                       ReviewIds = beerDbContext.Reviews.Where(r => r.Beer_Id == id).Select(r => r.Id).ToList()
-                   };
+            {
+                Id = beer.Id,
+                Name = beer.Name,
+                BreweryId = beer.Brewery == null ? (int?)null : beer.Brewery.Id,
+                BreweryName = beer.Brewery == null ? null : beer.Brewery.Name,
+                StyleId = beer.Style == null ? (int?)null : beer.Style.Id,
+                StyleName = beer.Style == null ? null : beer.Style.Name,
+                ReviewIds = beerDbContext.Reviews.Where(r => r.Beer_Id == id).Select(r => r.Id).ToList()
+            };
         }
 
-        [HttpPut]
-        // PUT beer?id=1&value=foo
-        public void Put(int id, string value)
+        [HttpPut("{id}")]
+        // PUT beer/5 with a hal representation in the body as json. Be sure to set content-type: application/hal+json (and accept: application/hal+json for the response)
+        public void Put(int id, [FromBody] BeerRepresentation value)
         {
+            Console.WriteLine(string.Format("new beer would be updated if repostory supported it! {0}, {1}", value.Id, value.Name));
         }
 
         [HttpDelete]

WebApi.Hal.Web/Api/BeersController.cs

@@ -56,9 +56,9 @@ public BeerListRepresentation Search(string searchTerm, int page = 1)
 
         [HttpPost]
         // POST beers
-        public IActionResult Post(BeerRepresentation value)
+        public IActionResult Post([FromBody] BeerRepresentation value)
         {
-            var newBeer = new Beer(value.Name);
+            var newBeer = new Beer(value.Name) { Style_Id = value.StyleId.Value, Brewery_Id = value.BreweryId.Value };
             repository.Add(newBeer);
 
             return Created(LinkTemplates.Beers.Beer.CreateUri(new {id = newBeer.Id}), newBeer);

WebApi.Hal.Web/FormattersMvcOptionsSetup.cs

@@ -56,13 +56,12 @@ public void Configure(MvcOptions options)
             // JsonInputFormatter would consume "application/json-patch+json" requests
             // before JsonPatchInputFormatter gets to see them.
 
-            //TODO Including this formatter causes all returns to be empty
-            //var jsonInputPatchLogger = _loggerFactory.CreateLogger<JsonHalMediaTypeInputFormatter>();
-            //options.InputFormatters.Add(new JsonHalMediaTypeInputFormatter(
-            //                                jsonInputPatchLogger,
-            //                                _jsonSerializerSettings,
-            //                                _charPool,
-            //                                _objectPoolProvider));
+            var jsonInputPatchLogger = _loggerFactory.CreateLogger<JsonHalMediaTypeInputFormatter>();
+            options.InputFormatters.Add(new JsonHalMediaTypeInputFormatter(
+                                            jsonInputPatchLogger,
+                                            new JsonSerializerSettings(),
+                                            _charPool,
+                                            _objectPoolProvider));
         }
     }
 }

WebApi.Hal/WebApi.Hal.csproj

@@ -4,6 +4,12 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <Version>3.0.0</Version>
+    <PackageVersion>3.0.0</PackageVersion>
+    <Copyright>Copyright © Jake Ginnivan 2018</Copyright>
+    <Description>Adds support for the Hal Media Type (and Hypermedia) to Asp.net</Description>
+    <ProjectUrl>https://github.com/JakeGinnivan/WebApi.Hal</ProjectUrl>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>