ee-soa-service
Advanced tools
Comparing version 0.1.15 to 0.1.16
@@ -10,3 +10,5 @@ | ||
, DefaultController = require('./DefaultController') | ||
, ORMFilter = require('./ORMFilter'); | ||
, ORMFilter = require('./ORMFilter') | ||
, argv = require('ee-argv') | ||
, debug = argv.has('dev-service-spec'); | ||
@@ -115,3 +117,3 @@ module.exports = new Class({ | ||
//log(this.specs); | ||
if(debug) log(this.table, this.specs); | ||
} | ||
@@ -337,2 +339,20 @@ | ||
// FIXME: you could do better dude! | ||
// ======== | ||
// use the right primary! | ||
var primaryKey = this.specs.primaryKey; | ||
if(primaryKey == this.specs.hasOne[collection].key) { | ||
this.specs.primaryKeys.some(function(pkey) { | ||
if(pkey !== this.specs.hasOne[collection].key) | ||
{ | ||
primaryKey = pkey; | ||
return true; | ||
} | ||
return false; | ||
}.bind(this)); | ||
} | ||
// ======== | ||
// ENDFIXME | ||
ids = function(entities) { | ||
@@ -343,3 +363,3 @@ var _ids = []; | ||
var id = entity[this.specs.primaryKey]; | ||
var id = entity[primaryKey]; | ||
if(!id) return; | ||
@@ -359,3 +379,3 @@ | ||
subRequest.filters[this.table] = {}; | ||
subRequest.filters[this.table][this.specs.primaryKey] = [ | ||
subRequest.filters[this.table][primaryKey] = [ | ||
{ | ||
@@ -362,0 +382,0 @@ operator : '=' |
@@ -5,3 +5,3 @@ { | ||
, "keywords" : ["ee", "soa", "service"] | ||
, "version" : "0.1.15" | ||
, "version" : "0.1.16" | ||
, "author": { | ||
@@ -8,0 +8,0 @@ "name" : "Tobias Kneubuehler" |
58473
1023