mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-11-24 06:35:49 +03:00
c6a95c6478
no issue - this commit cleans up the usages of `include` and `withRelated`. ### API layer (`include`) - as request parameter e.g. `?include=roles,tags` - as theme API parameter e.g. `{{get .... include="author"}}` - as internal API access e.g. `api.posts.browse({include: 'author,tags'})` - the `include` notation is more readable than `withRelated` - and it allows us to use a different easier format (comma separated list) - the API utility transforms these more readable properties into model style (or into Ghost style) ### Model access (`withRelated`) - e.g. `models.Post.findPage({withRelated: ['tags']})` - driven by bookshelf --- Commits explained. * Reorder the usage of `convertOptions` - 1. validation - 2. options convertion - 3. permissions - the reason is simple, the permission layer access the model layer - we have to prepare the options before talking to the model layer - added `convertOptions` where it was missed (not required, but for consistency reasons) * Use `withRelated` when accessing the model layer and use `include` when accessing the API layer * Change `convertOptions` API utiliy - API Usage - ghost.api(..., {include: 'tags,authors'}) - `include` should only be used when calling the API (either via request or via manual usage) - `include` is only for readability and easier format - Ghost (Model Layer Usage) - models.Post.findOne(..., {withRelated: ['tags', 'authors']}) - should only use `withRelated` - model layer cannot read 'tags,authors` - model layer has no idea what `include` means, speaks a different language - `withRelated` is bookshelf - internal usage * include-count plugin: use `withRelated` instead of `include` - imagine you outsource this plugin to git and publish it to npm - `include` is an unknown option in bookshelf * Updated `permittedOptions` in base model - `include` is no longer a known option * Remove all occurances of `include` in the model layer * Extend `filterOptions` base function - this function should be called as first action - we clone the unfiltered options - check if you are using `include` (this is a protection which could help us in the beginning) - check for permitted and (later on default `withRelated`) options - the usage is coming in next commit * Ensure we call `filterOptions` as first action - use `ghostBookshelf.Model.filterOptions` as first action - consistent naming pattern for incoming options: `unfilteredOptions` - re-added allowed options for `toJSON` - one unsolved architecture problem: - if you override a function e.g. `edit` - then you should call `filterOptions` as first action - the base implementation of e.g. `edit` will call it again - future improvement * Removed `findOne` from Invite model - no longer needed, the base implementation is the same
106 lines
3.6 KiB
JavaScript
106 lines
3.6 KiB
JavaScript
var _debug = require('ghost-ignition').debug._base,
|
|
debug = _debug('ghost-query'),
|
|
_ = require('lodash');
|
|
|
|
module.exports = function (Bookshelf) {
|
|
var modelProto = Bookshelf.Model.prototype,
|
|
Model,
|
|
countQueryBuilder;
|
|
|
|
countQueryBuilder = {
|
|
tags: {
|
|
posts: function addPostCountToTags(model, options) {
|
|
model.query('columns', 'tags.*', function (qb) {
|
|
qb.count('posts.id')
|
|
.from('posts')
|
|
.leftOuterJoin('posts_tags', 'posts.id', 'posts_tags.post_id')
|
|
.whereRaw('posts_tags.tag_id = tags.id')
|
|
.as('count__posts');
|
|
|
|
if (options.context && options.context.public) {
|
|
// @TODO use the filter behavior for posts
|
|
qb.andWhere('posts.page', '=', false);
|
|
qb.andWhere('posts.status', '=', 'published');
|
|
}
|
|
});
|
|
}
|
|
},
|
|
users: {
|
|
posts: function addPostCountToTags(model, options) {
|
|
model.query('columns', 'users.*', function (qb) {
|
|
qb.count('posts.id')
|
|
.from('posts')
|
|
.whereRaw('posts.author_id = users.id')
|
|
.as('count__posts');
|
|
|
|
if (options.context && options.context.public) {
|
|
// @TODO use the filter behavior for posts
|
|
qb.andWhere('posts.page', '=', false);
|
|
qb.andWhere('posts.status', '=', 'published');
|
|
}
|
|
});
|
|
}
|
|
}
|
|
};
|
|
|
|
Model = Bookshelf.Model.extend({
|
|
addCounts: function (options) {
|
|
if (!options) {
|
|
return;
|
|
}
|
|
|
|
var tableName = _.result(this, 'tableName');
|
|
|
|
if (options.withRelated && options.withRelated.indexOf('count.posts') > -1) {
|
|
// remove post_count from withRelated
|
|
options.withRelated = _.pull([].concat(options.withRelated), 'count.posts');
|
|
|
|
// Call the query builder
|
|
countQueryBuilder[tableName].posts(this, options);
|
|
}
|
|
},
|
|
fetch: function () {
|
|
this.addCounts.apply(this, arguments);
|
|
|
|
// Useful when debugging no. database queries, GQL, etc
|
|
// To output this, use DEBUG=ghost:*,ghost-query
|
|
if (_debug.enabled('ghost-query')) {
|
|
debug('QUERY', this.query().toQuery());
|
|
}
|
|
|
|
// Call parent fetch
|
|
return modelProto.fetch.apply(this, arguments);
|
|
},
|
|
fetchAll: function () {
|
|
this.addCounts.apply(this, arguments);
|
|
|
|
// Useful when debugging no. database queries, GQL, etc
|
|
// To output this, use DEBUG=ghost:*,ghost-query
|
|
if (_debug.enabled('ghost-query')) {
|
|
debug('QUERY', this.query().toQuery());
|
|
}
|
|
|
|
// Call parent fetchAll
|
|
return modelProto.fetchAll.apply(this, arguments);
|
|
},
|
|
|
|
serialize: function serialize(options) {
|
|
var attrs = modelProto.serialize.call(this, options),
|
|
countRegex = /^(count)(__)(.*)$/;
|
|
|
|
_.forOwn(attrs, function (value, key) {
|
|
var match = key.match(countRegex);
|
|
if (match) {
|
|
attrs[match[1]] = attrs[match[1]] || {};
|
|
attrs[match[1]][match[3]] = value;
|
|
delete attrs[key];
|
|
}
|
|
});
|
|
|
|
return attrs;
|
|
}
|
|
});
|
|
|
|
Bookshelf.Model = Model;
|
|
};
|