8000 fix(adapter): moves loadRelationsFor logic into separate method by stalniy · Pull Request #10 · js-data/js-data-adapter · GitHub
[go: up one dir, main page]
Skip to content

fix(adapter): moves loadRelationsFor logic into separate method #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 2, 2017
Merged

fix(adapter): moves loadRelationsFor logic into separate method #10

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f39c62
fix(adapter): moves loadRelationsFor logic into separate method
Jun 12, 2017
9f7fd3b
Make find/findAll use of "op" consistent with other methods.
jmdobry Jul 2, 2017
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
Next Next commit
fix(adapter): moves loadRelationsFor logic into separate method
  • Loading branch information
Sergii Stotskyi committed Jun 12, 2017
commit 9f39c629bda9994379e7c1696f7f5a5fc4d4c945
123 changes: 46 additions & 77 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,58 +846,26 @@ Component.extend({
* @return {Promise}
*/
find (mapper, id, opts) {
let record, op
let meta = {}
opts || (opts = {})
opts.with || (opts.with = [])

// beforeFind lifecycle hook
op = opts.op = 'beforeFind'
return utils.resolve(this[op](mapper, id, opts))
opts.op = 'beforeFind'
return utils.resolve(this[opts.op](mapper, id, opts))
.then(() => {
op = opts.op = 'find'
this.dbg(op, mapper, id, opts)
opts.op = 'find'
this.dbg(opts.op, mapper, id, opts)
return utils.resolve(this._find(mapper, id, opts))
})
.then((results) => {
let [_record, _meta] = results
if (!_record) {
return
}
record = _record
meta = _meta
const tasks = []

utils.forEachRelation(mapper, opts, (def, __opts) => {
let task
if (def.foreignKey && (def.type === 'hasOne' || def.type === 'hasMany')) {
if (def.type === 'hasOne') {
task = this.loadHasOne(mapper, def, record, __opts)
} else {
task = this.loadHasMany(mapper, def, record, __opts)
}
} else if (def.type === 'hasMany' && def.localKeys) {
task = this.loadHasManyLocalKeys(mapper, def, record, __opts)
} else if (def.type === 'hasMany' && def.foreignKeys) {
task = this.loadHasManyForeignKeys(mapper, def, record, __opts)
} else if (def.type === 'belongsTo') {
task = this.loadBelongsTo(mapper, def, record, __opts)
}
if (task) {
tasks.push(task)
}
})

return utils.Promise.all(tasks)
})
.then(() => {
.then((results) => this.loadRelationsFor(mapper, results, opts))
.then(([record, meta]) => {
let response = new Response(record, meta, 'find')
response.found = record ? 1 : 0
response = this.respond(response, opts)

// afterFind lifecycle hook
op = opts.op = 'afterFind'
return utils.resolve(this[op](mapper, id, opts, response))
opts.op = 'afterFind'
return utils.resolve(this[opts.op](mapper, id, opts, response))
.then((_response) => _response === undefined ? response : _response)
})
},
Expand Down Expand Up @@ -925,9 +893,6 @@ Component.extend({
opts || (opts = {})
opts.with || (opts.with = [])

let records = []
let meta = {}
let op
const activeWith = opts._activeWith

if (utils.isObject(activeWith)) {
Expand All @@ -940,52 +905,56 @@ Component.extend({
}

// beforeFindAll lifecycle hook
op = opts.op = 'beforeFindAll'
return utils.resolve(this[op](mapper, query, opts))
opts.op = 'beforeFindAll'
return utils.resolve(this[opts.op](mapper, query, opts))
.then(() => {
op = opts.op = 'findAll'
this.dbg(op, mapper, query, opts)
opts.op = 'findAll'
this.dbg(opts.op, mapper, query, opts)
return utils.resolve(this._findAll(mapper, query, opts))
})
.then((results) => {
let [_records, _meta] = results
_records || (_records = [])
records = _records
meta = _meta
const tasks = []
utils.forEachRelation(mapper, opts, (def, __opts) => {
let task
if (def.foreignKey && (def.type === 'hasOne' || def.type === 'hasMany')) {
if (def.type === 'hasMany') {
task = this.loadHasMany(mapper, def, records, __opts)
} else {
task = this.loadHasOne(mapper, def, records, __opts)
}
} else if (def.type === 'hasMany' && def.localKeys) {
task = this.loadHasManyLocalKeys(mapper, def, records, __opts)
} else if (def.type === 'hasMany' && def.foreignKeys) {
task = this.loadHasManyForeignKeys(mapper, def, records, __opts)
} else if (def.type === 'belongsTo') {
task = this.loadBelongsTo(mapper, def, records, __opts)
}
if (task) {
tasks.push(task)
}
})
return utils.Promise.all(tasks)
})
.then(() => {
.then((results) => this.loadRelationsFor(mapper, results, opts))
.then(([records, meta]) => {
let response = new Response(records, meta, 'findAll')
response.found = records.length
response = this.respond(response, opts)

// afterFindAll lifecycle hook
op = opts.op = 'afterFindAll'
return utils.resolve(this[op](mapper, query, opts, response))
opts.op = 'afterFindAll'
return utils.resolve(this[opts.op](mapper, query, opts, response))
.then((_response) => _response === undefined ? response : _response)
})
},

loadRelationsFor (mapper, results, opts) {
const [records] = results
const tasks = []

if (records) {
utils.forEachRelation(mapper, opts, (def, __opts) => {
let task
if (def.foreignKey && (def.type === 'hasOne' || def.type === 'hasMany')) {
if (def.type === 'hasOne') {
task = this.loadHasOne(mapper, def, records, __opts)
} else {
task = this.loadHasMany(mapper, def, records, __opts)
}
} else if (def.type === 'hasMany' && def.localKeys) {
task = this.loadHasManyLocalKeys(mapper, def, records, __opts)
} else if (def.type === 'hasMany' && def.foreignKeys) {
task = this.loadHasManyForeignKeys(mapper, def, records, __opts)
} else if (def.type === 'belongsTo') {
task = this.loadBelongsTo(mapper, def, records, __opts)
}
if (task) {
tasks.push(task)
}
})
}

return utils.Promise.all(tasks)
.then(() => results)
},

/**
* Resolve the value of the specified option based on the given options and
* this adapter's settings. Override with care.
Expand Down
0