Commit a1241ee

authored

Merge pull request #466 from joshhubers/feat/#356

Feat/#356

2 parents f72e8ae + 531f079 commit a1241eeCopy full SHA for a1241ee

File tree

+46

-36

lines changed

+46

-36

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,8 @@`
	`1`	`+#!/usr/bin/env bash`
	`2`	`+`
	`3`	`+docker run --rm --name jsonapi-dotnet-core-testing \`
	`4`	`+ -e POSTGRES_DB=JsonApiDotNetCoreExample \`
	`5`	`+ -e POSTGRES_USER=postgres \`
	`6`	`+ -e POSTGRES_PASSWORD=postgres \`
	`7`	`+ -p 5432:5432 \`
	`8`	`+ postgres`

Lines changed: 2 additions & 26 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,36 +14,12 @@ protected IActionResult Forbidden()`
`14`	`14`
`15`	`15`	`protected IActionResult Error(Error error)`
`16`	`16`	`{`
`17`		`- var errorCollection = new ErrorCollection`
`18`		`- {`
`19`		`- Errors = new List<Error> { error }`
`20`		`- };`
`21`		`-`
`22`		`- return new ObjectResult(errorCollection)`
`23`		`- {`
`24`		`- StatusCode = error.StatusCode`
`25`		`- };`
	`17`	`+ return error.AsActionResult();`
`26`	`18`	`}`
`27`	`19`
`28`	`20`	`protected IActionResult Errors(ErrorCollection errors)`
`29`	`21`	`{`
`30`		`- return new ObjectResult(errors)`
`31`		`- {`
`32`		`- StatusCode = GetErrorStatusCode(errors)`
`33`		`- };`
`34`		`- }`
`35`		`-`
`36`		`- private int GetErrorStatusCode(ErrorCollection errors)`
`37`		`- {`
`38`		`- var statusCodes = errors.Errors`
`39`		`- .Select(e => e.StatusCode)`
`40`		`- .Distinct()`
`41`		`- .ToList();`
`42`		`-`
`43`		`- if (statusCodes.Count == 1)`
`44`		`- return statusCodes[0];`
`45`		`-`
`46`		`- return int.Parse(statusCodes.Max().ToString()[0] + "00");`
	`22`	`+ return errors.AsActionResult();`
`47`	`23`	`}`
`48`	`24`	`}`
`49`	`25`	`}`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Diagnostics;`
	`3`	`+using System.Collections.Generic;`
`3`	`4`	`using JsonApiDotNetCore.Configuration;`
`4`	`5`	`using Newtonsoft.Json;`
	`6`	`+using Microsoft.AspNetCore.Mvc;`
`5`	`7`
`6`	`8`	`namespace JsonApiDotNetCore.Internal`
`7`	`9`	`{`
`@@ -66,6 +68,16 @@ public Error(int status, string title, string detail, ErrorMeta meta = null, obj`
`66`	`68`
`67`	`69`	`public bool ShouldSerializeMeta() => (JsonApiOptions.DisableErrorStackTraces == false);`
`68`	`70`	`public bool ShouldSerializeSource() => (JsonApiOptions.DisableErrorSource == false);`
	`71`	`+`
	`72`	`+ public IActionResult AsActionResult()`
	`73`	`+ {`
	`74`	`+ var errorCollection = new ErrorCollection`
	`75`	`+ {`
	`76`	`+ Errors = new List<Error> { this }`
	`77`	`+ };`
	`78`	`+`
	`79`	`+ return errorCollection.AsActionResult();`
	`80`	`+ }`
`69`	`81`	`}`
`70`	`82`
`71`	`83`	`public class ErrorMeta`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`using System.Collections.Generic;`
	`2`	`+using System.Linq;`
`2`	`3`	`using Newtonsoft.Json;`
`3`	`4`	`using Newtonsoft.Json.Serialization;`
	`5`	`+using Microsoft.AspNetCore.Mvc;`
`4`	`6`
`5`	`7`	`namespace JsonApiDotNetCore.Internal`
`6`	`8`	`{`
`@@ -25,5 +27,26 @@ public string GetJson()`
`25`	`27`	`ContractResolver = new CamelCasePropertyNamesContractResolver()`
`26`	`28`	`});`
`27`	`29`	`}`
	`30`	`+`
	`31`	`+ public int GetErrorStatusCode()`
	`32`	`+ {`
	`33`	`+ var statusCodes = Errors`
	`34`	`+ .Select(e => e.StatusCode)`
	`35`	`+ .Distinct()`
	`36`	`+ .ToList();`
	`37`	`+`
	`38`	`+ if (statusCodes.Count == 1)`
	`39`	`+ return statusCodes[0];`
	`40`	`+`
	`41`	`+ return int.Parse(statusCodes.Max().ToString()[0] + "00");`
	`42`	`+ }`
	`43`	`+`
	`44`	`+ public IActionResult AsActionResult()`
	`45`	`+ {`
	`46`	`+ return new ObjectResult(this)`
	`47`	`+ {`
	`48`	`+ StatusCode = GetErrorStatusCode()`
	`49`	`+ };`
	`50`	`+ }`
`28`	`51`	`}`
`29`	`52`	`}`

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,16 +41,7 @@ public JsonApiException(int statusCode, string message, Exception innerException`
`41`	`41`
`42`	`42`	`public int GetStatusCode()`
`43`	`43`	`{`
`44`		`- if (_errors.Errors.Select(a => a.StatusCode).Distinct().Count() == 1)`
`45`		`- return _errors.Errors[0].StatusCode;`
`46`		`-`
`47`		`- if (_errors.Errors.FirstOrDefault(e => e.StatusCode >= 500) != null)`
`48`		`- return 500;`
`49`		`-`
`50`		`- if (_errors.Errors.FirstOrDefault(e => e.StatusCode >= 400) != null)`
`51`		`- return 400;`
`52`		`-`
`53`		`- return 500;`
	`44`	`+ return _errors.GetErrorStatusCode();`
`54`	`45`	`}`
`55`	`46`
`56`	`47`	`private ErrorMeta GetMeta() => ErrorMeta.FromException(this);`

Comments

(0)