Commit b841433

committed

fix: handle 'GetPublicAttributeName' null and mock for tests

1 parent 0e17059 commit b841433Copy full SHA for b841433

File tree

+356

-348

lines changed

src/JsonApiDotNetCore
- Extensions
  - ModelStateExtensions.cs
- Internal
  - ContextGraph.cs
test/UnitTests/Controllers
- BaseJsonApiController_Tests.cs

+356

-348

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@ public static ErrorCollection ConvertToErrorCollection<T>(this ModelStateDiction`
`14`	`14`	`if (entry.Value.Errors.Any() == false)`
`15`	`15`	`continue;`
`16`	`16`
	`17`	`+ var attrName = contextGraph.GetPublicAttributeName<T>(entry.Key);`
	`18`	`+`
`17`	`19`	`foreach (var modelError in entry.Value.Errors)`
`18`	`20`	`{`
`19`		`- var attrName =contextGraph.GetPublicAttributeName<T>(entry.Key);`
`20`		`-`
`21`	`21`	`if (modelError.Exception is JsonApiException jex)`
`22`	`22`	`collection.Errors.AddRange(jex.GetError().Errors);`
`23`	`23`	`else`
`@@ -26,7 +26,7 @@ public static ErrorCollection ConvertToErrorCollection<T>(this ModelStateDiction`
`26`	`26`	`title: entry.Key,`
`27`	`27`	`detail: modelError.ErrorMessage,`
`28`	`28`	`meta: modelError.Exception != null ? ErrorMeta.FromException(modelError.Exception) : null,`
`29`		`- source: new {`
	`29`	`+ source: attrName==null?null:new {`
`30`	`30`	`pointer = $"/data/attributes/{attrName}"`
`31`	`31`	`}));`
`32`	`32`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public string GetPublicAttributeName<TParent>(string internalAttributeName)`
`122`	`122`	`{`
`123`	`123`	`return GetContextEntity(typeof(TParent))`
`124`	`124`	`.Attributes`
`125`		`- .Single(a => a.InternalAttributeName == internalAttributeName)`
	`125`	`+ .SingleOrDefault(a => a.InternalAttributeName == internalAttributeName)?`
`126`	`126`	`.PublicAttributeName;`
`127`	`127`	`}`
`128`	`128`	`}`

Comments

(0)