diff --git a/src/crud.js b/src/crud.js index 2acf5eb..90eb484 100644 --- a/src/crud.js +++ b/src/crud.js @@ -31,6 +31,8 @@ export const list = (server, model) => { const include = parseInclude(request); const where = parseWhere(request); + if (include instanceof Error) return void reply(include); + const list = await model.findAll({ where, include, }); diff --git a/src/utils.js b/src/utils.js index 1393877..03f648a 100644 --- a/src/utils.js +++ b/src/utils.js @@ -1,18 +1,27 @@ -import { omit } from 'lodash'; +import { omit, identity } from 'lodash'; export const parseInclude = request => { const include = Array.isArray(request.query.include) ? request.query.include : [request.query.include]; + const noGetDb = typeof request.getDb !== 'function'; + const noRequestModels = !request.models; + + if (noGetDb && noRequestModels) { + return new Error('`request.getDb` or `request.models` are not defined. Be sure to load hapi-sequelize before hapi-sequelize-crud.'); + } + + const {models} = noGetDb ? request : request.getDb(); + return include.map(a => { - if (typeof a === 'string') return request.models[a]; + if (typeof a === 'string') return models[a]; if (a && typeof a.model === 'string' && a.model.length) { - a.model = request.models[a.model]; + a.model = models[a.model]; } return a; - }).filter(a => a); + }).filter(identity); }; export const parseWhere = request => {