thereadme/hapi-sequelize-crud
1
0
Fork 0
Code Issues 4 Pull Requests 1 Projects Releases Wiki Activity

Boom #4

Merged
joeybaker merged 3 commits from boom into master 2016-06-30 13:44:07 +00:00
Conversation 4 Commits 3 Files Changed 2 +10 -3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3f419284be - Show all commits

13
src/crud.js
View File

@ -2,6 +2,7 @@ import joi from 'joi';
import error from './error'; import error from './error';
import _ from 'lodash'; import _ from 'lodash';
import { parseInclude, parseWhere } from './utils'; import { parseInclude, parseWhere } from './utils';
import { notFound } from 'boom';
let prefix; let prefix;
let defaultConfig; let defaultConfig;
@ -50,10 +51,13 @@ export const get = (server, model) => {
async handler(request, reply) { async handler(request, reply) {
const include = parseInclude(request); const include = parseInclude(request);
const where = parseWhere(request); const where = parseWhere(request);
if (request.params.id) where.id = request.params.id; const {id} = request.params;
if (id) where.id = id;
const instance = await model.findOne({ where, include }); const instance = await model.findOne({ where, include });
if (!instance) return void reply(notFound(`${id} not found.`));
reply(instance); reply(instance);
}, },
config: _.defaultsDeep({ config: _.defaultsDeep({
@ -186,12 +190,15 @@ export const update = (server, model) => {
@error @error
async handler(request, reply) { async handler(request, reply) {
let instance = await model.findOne({ const {id} = request.params;
const instance = await model.findOne({
where: { where: {
id: request.params.id id
} }
}); });
if (!instance) return void reply(notFound(`${id} not found.`));
await instance.update(request.payload); await instance.update(request.payload);
reply(instance); reply(instance);