ee-soa-service
Advanced tools
Comparing version 0.1.35 to 0.2.0
@@ -154,3 +154,3 @@ | ||
, _getSingleModel: function(queryData, callback) { | ||
, _getSingleModel: function(queryData, baseQuery, callback) { | ||
if(!queryData.hasResourceId()) return callback(new Error('[' + this.table + '] no resourceId provided!')); | ||
@@ -161,3 +161,3 @@ | ||
this.rootQuery(['*'], idFilter).findOne(function(err, data) { | ||
(baseQuery || this.rootQuery)(['*'], idFilter).findOne(function(err, data) { | ||
callback(err, data); | ||
@@ -167,3 +167,3 @@ }.bind(this)); | ||
, list: function(queryData, callback) { | ||
, list: function(queryData, callback, baseQuery) { | ||
@@ -202,3 +202,3 @@ // SET OFFSET AND LIMIT | ||
var query = this.rootQuery(queryData.getFields(), objectFilters).limit(limit).offset(offset); | ||
var query = (baseQuery || this.rootQuery)(queryData.getFields(), objectFilters).limit(limit).offset(offset); | ||
//ORDER | ||
@@ -582,3 +582,3 @@ var orders = queryData.getOrder(); | ||
, create: function(queryData, callback) { | ||
, create: function(queryData, callback, baseQuery) { | ||
queryData.getContent(function(err, content) { | ||
@@ -591,6 +591,6 @@ if(err) return callback(err); | ||
var record = new this.rootQuery(content); | ||
var record = (baseQuery || new this.rootQuery()).setValues(content); | ||
} | ||
else { | ||
var record = new this.rootQuery(); | ||
var record = baseQuery || new this.rootQuery(); | ||
} | ||
@@ -620,3 +620,3 @@ | ||
, createRelation: function(queryData, callback) { | ||
, createRelation: function(queryData, callback, baseQuery) { | ||
if(!queryData.hasRelatedTo()) return callback(new Error('[' + this.table + ']no relatedTo provided!')); | ||
@@ -634,3 +634,3 @@ | ||
if(Object.hasOwnProperty.call(this.specs.hasOne, withModel)) { | ||
this._getSingleModel(queryData, function(err, data) { | ||
this._getSingleModel(queryData, baseQuery, function(err, data) { | ||
if(err) return callback(err, data); | ||
@@ -655,3 +655,3 @@ | ||
if(Object.hasOwnProperty.call(this.specs.belongsTo, withModel)) { | ||
this._getSingleModel(queryData, function(err, entity) { | ||
this._getSingleModel(queryData, baseQuery, function(err, entity) { | ||
if(err) return callback(err); | ||
@@ -676,3 +676,3 @@ | ||
if(Object.hasOwnProperty.call(this.specs.hasMany, withModel)) { | ||
this._getSingleModel(queryData, function(err, entity) { | ||
this._getSingleModel(queryData, baseQuery, function(err, entity) { | ||
if(err) return callback(err); | ||
@@ -696,4 +696,4 @@ | ||
, update: function(queryData, callback) { | ||
this._getSingleModel(queryData, function(err, data) { | ||
, update: function(queryData, callback, baseQuery) { | ||
this._getSingleModel(queryData, baseQuery, function(err, data) { | ||
if(err) return callback(err); | ||
@@ -724,6 +724,6 @@ | ||
, delete: function(queryData, callback) { | ||
, delete: function(queryData, callback, baseQuery) { | ||
if(!queryData.hasResourceId()) return callback(new Error('no resourceId provided!')); | ||
this.rootQuery({id: queryData.getResourceId()}).limit(1).delete(function(err) { | ||
(baseQuery || this.rootQuery)({id: queryData.getResourceId()}).limit(1).delete(function(err) { | ||
callback(err); | ||
@@ -730,0 +730,0 @@ }.bind(this)); |
@@ -5,3 +5,3 @@ { | ||
, "keywords" : ["ee", "soa", "service"] | ||
, "version" : "0.1.35" | ||
, "version" : "0.2.0" | ||
, "author": { | ||
@@ -8,0 +8,0 @@ "name" : "Tobias Kneubuehler" |
62072