encounter/JSONAPI
0
0
Fork 0
mirror of https://github.com/encounter/JSONAPI.git synced 2026-03-30 11:18:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow omitting relationships if all are optional

Browse Source 
When all relationships are optional, the `relationships` key is also
optional and not required in the structure.

I'm not super happy with importing Foundation and creating new objects
any time a key is missing, but ultimately none of my attempts at
conditional generics worked out for me.
This commit is contained in:
Janko Luin
2019-07-02 16:49:47 +02:00
parent f73ca8bc2c
commit fc78958f76
3 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/JSONAPI/Resource/ResourceObject.swift
+5 -2
View File
@@ -5,6 +5,8 @@
// Created by Mathew Polzin on 7/24/18.
//
import Foundation
/// A JSON API structure within an ResourceObject that contains
/// named properties of types `ToOneRelationship` and
/// `ToManyRelationship`.
@@ -582,7 +584,6 @@ public extension ResourceObject {
}
init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: ResourceObjectCodingKeys.self)
let type = try container.decode(String.self, forKey: .type)
@@ -597,7 +598,9 @@ public extension ResourceObject {
attributes = try (NoAttributes() as? Description.Attributes) ??
container.decode(Description.Attributes.self, forKey: .attributes)
relationships = try (NoRelationships() as? Description.Relationships) ?? container.decode(Description.Relationships.self, forKey: .relationships)
relationships = try (NoRelationships() as? Description.Relationships)
?? container.decodeIfPresent(Description.Relationships.self, forKey: .relationships)
?? JSONDecoder().decode(Description.Relationships.self, from: "{}".data(using: .utf8)!)
meta = try (NoMetadata() as? MetaType) ?? container.decode(MetaType.self, forKey: .meta)