Add existance check on belongs to parsing

ghidoz · Sep 22, 2016 · 3f538a0 · 3f538a0
1 parent 3871511
commit 3f538a0
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/models/json-api.model.ts b/src/models/json-api.model.ts
@@ -86,11 +86,13 @@ export class JsonApiModel {
                 let relationship: any = data.relationships[metadata.relationship];
                 if (relationship && relationship.data) {
                     let dataRelationship: any = (relationship.data instanceof Array) ? relationship.data[0] : relationship.data;
-                    let typeName: string = dataRelationship.type;
-                    let modelType: ModelType = Reflect.getMetadata('JsonApiDatastoreConfig', this._datastore.constructor).models[typeName];
-                    let relationshipModel: JsonApiModel = this.getBelongsToRelationship(modelType, dataRelationship, included, typeName, level);
-                    if (relationshipModel) {
-                        this[metadata.propertyName] = relationshipModel;
+                    if (dataRelationship) {
+                        let typeName: string = dataRelationship.type;
+                        let modelType: ModelType = Reflect.getMetadata('JsonApiDatastoreConfig', this._datastore.constructor).models[typeName];
+                        let relationshipModel: JsonApiModel = this.getBelongsToRelationship(modelType, dataRelationship, included, typeName, level);
+                        if (relationshipModel) {
+                            this[metadata.propertyName] = relationshipModel;
+                        }
                     }
                 }
             }