Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 21 additions & 9 deletions src/models/json-api.model.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Headers } from '@angular/http';
import find from 'lodash-es/find';
import includes from 'lodash-es/includes';
import { Observable } from 'rxjs/Observable';
import { JsonApiDatastore, ModelType } from '../services/json-api-datastore.service';
import { ModelConfig } from '../interfaces/model-config.interface';
Expand Down Expand Up @@ -65,22 +66,33 @@ export class JsonApiModel {
return Reflect.getMetadata('JsonApiModelConfig', this.constructor);
}


private parseHasMany(data: any, included: any, level: number): void {
let hasMany: any = Reflect.getMetadata('HasMany', this);
if (hasMany) {
for (let metadata of hasMany) {
let relationship: any = data.relationships ? data.relationships[metadata.relationship] : null;
if (relationship && relationship.data && relationship.data.length > 0) {
let typeName: string = relationship.data[0].type;
let modelType: ModelType<this> = Reflect.getMetadata('JsonApiDatastoreConfig', this._datastore.constructor).models[typeName];
if (modelType) {
let relationshipModel: JsonApiModel[] = this.getHasManyRelationship(modelType, relationship.data, included, typeName, level);
if (relationshipModel.length > 0) {
this[metadata.propertyName] = relationshipModel;
let allModels: JsonApiModel[] = [];
let modelTypesFetched: any = [];
for (let typeIndex of Object.keys(relationship.data)) {
let typeName: string = relationship.data[typeIndex].type;
if (!includes(modelTypesFetched, typeName)) {
modelTypesFetched.push(typeName);
let modelType: ModelType<this> = Reflect.getMetadata('JsonApiDatastoreConfig', this._datastore.constructor).models[typeName];
if (modelType) {
let relationshipModels: JsonApiModel[] = this.getHasManyRelationship(modelType, relationship.data, included, typeName, level);
if (relationshipModels.length > 0) {
allModels = allModels.concat(relationshipModels);
}
} else {
throw { message: 'parseHasMany - Model type for relationship ' + typeName + ' not found.' };
}
}
if (allModels.length > 0) {
this[metadata.propertyName] = allModels;
}
}
} else {
throw {message: 'parseHasMany - Model type for relationship ' + typeName + ' not found.'};
}
}
}
}
Expand Down