Ghost/core/server
Katharina Irrgang c6a95c6478
Sorted out the mixed usages of include and withRelated (#9425)
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
2018-02-15 10:53:53 +01:00
..
adapters Moved utils constants to lib/constants 2017-12-14 14:13:40 +01:00
api Sorted out the mixed usages of include and withRelated (#9425) 2018-02-15 10:53:53 +01:00
apps Moved make-absolute-urls to url service 2017-12-14 22:34:37 +01:00
config Update Notification improvements (#9123) 2018-01-09 15:20:00 +01:00
controllers Moved tokens, url safe and safe string utility to lib/security 2017-12-14 13:38:00 +01:00
data 🐛 Fixed migrating from < 1.13 to 1.21 2018-02-07 12:31:21 +01:00
helpers 🐛Fixed {{get}} helper's date comparison (#9454) 2018-02-14 18:33:07 +01:00
lib Fixed missing export of card-markdown card and broken tests 2018-02-01 16:26:56 +01:00
models Sorted out the mixed usages of include and withRelated (#9425) 2018-02-15 10:53:53 +01:00
public
services Sorted out the mixed usages of include and withRelated (#9425) 2018-02-15 10:53:53 +01:00
translations Removed html usage in error messages (#9444) 2018-02-07 09:35:48 +01:00
views Fixed error trying to render 404 for missing asset 2017-12-22 20:08:59 +00:00
web 🐛Fixed asset redirects (#9455) 2018-02-14 17:21:31 +01:00
analytics-events.js
filters.js
ghost-server.js
index.js Theme translations and blog localisation (#8437) 2018-01-09 14:50:57 +01:00
overrides.js
update-check.js Update Notification improvements (#9123) 2018-01-09 15:20:00 +01:00