fix(primaryKey): use model.primaryKey instead of hardcoded id for id routes, fixes #9

This commit is contained in:
Mahdi Dibaiee
2016-07-13 11:26:46 +04:30
parent 29ee49fc62
commit 6c46ff68d0
5 changed files with 26 additions and 17 deletions

View File

@ -28,18 +28,23 @@ export const get = (server, a, b, names) => {
async handler(request, reply) {
const include = parseInclude(request);
const base = a.findOne({
const base = await a.findOne({
where: {
id: request.params.aid,
[a.primaryKeyField]: request.params.aid,
},
});
const method = getMethod(base, names.b);
const list = await method({ where: {
id: request.params.bid,
[b.primaryKeyField]: request.params.bid,
}, include });
reply(list);
if (Array.isArray(list)) {
reply(list[0]);
} else {
reply(list);
}
},
config: defaultConfig,
@ -58,7 +63,7 @@ export const list = (server, a, b, names) => {
const base = await a.findOne({
where: {
id: request.params.aid,
[a.primaryKeyField]: request.params.aid,
},
});
@ -86,7 +91,7 @@ export const scope = (server, a, b, names) => {
const base = await a.findOne({
where: {
id: request.params.aid,
[a.primaryKeyField]: request.params.aid,
},
});
@ -159,7 +164,7 @@ export const destroy = (server, a, b, names) => {
const base = await a.findOne({
where: {
id: request.params.aid,
[a.primaryKeyField]: request.params.aid,
},
});
@ -188,7 +193,7 @@ export const destroyScope = (server, a, b, names) => {
const base = await a.findOne({
where: {
id: request.params.aid,
[a.primarykeyField]: request.params.aid,
},
});
@ -228,7 +233,7 @@ export const update = (server, a, b, names) => {
const base = await a.findOne({
where: {
id: request.params.aid,
[a.primaryKeyField]: request.params.aid,
},
});