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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/associations/associate.js
View File

@ -16,13 +16,13 @@ export default (server, a, b, names, options) => {
async handler(request, reply) {
const instanceb = await b.findOne({
where: {
id: request.params.bid,
[b.primaryKeyField]: request.params.bid,
},
});
const instancea = await a.findOne({
where: {
id: request.params.aid,
[a.primaryKeyField]: request.params.aid,
},
});

23
src/associations/one-to-many.js
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,
},
});

10
src/associations/one-to-one.js
View File

@ -26,7 +26,7 @@ export const get = (server, a, b, names) => {
const base = await a.findOne({
where: {
id: request.params.aid,
[a.primaryKeyField]: request.params.aid,
},
});
const method = getMethod(base, names.b, false);
@ -53,7 +53,7 @@ export const create = (server, a, b, names) => {
async handler(request, reply) {
const base = await a.findOne({
where: {
id: request.params.id,
[a.primaryKeyField]: request.params.id,
},
});
@ -79,10 +79,12 @@ export const destroy = (server, a, b, names) => {
const base = await a.findOne({
where: {
id: request.params.aid,
[a.primaryKeyField]: request.params.aid,
},
});
where[b.primaryKeyField] = request.params.bid;
const method = getMethod(base, names.b, false, 'get');
const instance = await method({ where, include });
await instance.destroy();
@ -110,6 +112,8 @@ export const update = (server, a, b, names) => {
},
});
where[b.primaryKeyField] = request.params.bid;
const method = getMethod(base, names.b, false);
const instance = await method({ where, include });