ee-soa-service - npm Package Compare versions

Comparing version 0.2.4 to 0.2.5

lib/DefaultORMController.js

@@ -165,3 +165,3 @@
 
-            , list: function(queryData, callback, baseQuery) {
+            , list: function(queryData, callback, baseQuery, interceptor) {
 
@@ -225,22 +225,43 @@ // SET OFFSET AND LIMIT
 
-                query.find(function(err, entities) {
-                    if(err) return callback(err);
 
-                    entities = entities.toJSON();
+                // complete with subresource loading
+                var doList = function(entities) {
 
-                    // SUBREQUESTS
-                    if(subRequests.length && entities.length) {
+                    // maybe there is more data to load ....
+                    if (subRequests.length && entities.length) {
                         this._handleSubRequests(subRequests, entities, function(err) {
-                            if(err) return callback(err);
-
-                            callback(err, entities);
+                            if (err) callback(err);
+                            else callback(err, entities);
                         }.bind(this));
                     }
+                    else callback(err, entities);
+                }.bind(this);
+
+
+                // load data
+                query.find(function(err, entities) {
+                    if (err) callback(err);                    
                     else {
-                        callback(err, entities);
+                        // we need plain json
+                        entities = entities.toJSON();
+
+                        // is there an interception?
+                        if (interceptor) {
+                            interceptor(entities, function(err) {
+                                if (err) callback(err);
+                                else doList(entities);
+                            }.bind(this));
+                        }
+                        else doList(entities);
                     }
-
                 }.bind(this));
             }
 
+
+
+
+
+
+
+
             , _applySubOrder: function(query, field, order) {
@@ -247,0 +268,0 @@ var subQuery = query.get(field);

package.json

@@ -5,3 +5,3 @@ {
     , "keywords"                    : ["ee", "soa", "service"]
-    , "version"                     : "0.2.4"
+    , "version"                     : "0.2.5"
     , "author": {
@@ -8,0 +8,0 @@ "name"                      : "Tobias Kneubuehler"

No alert changes

Improved metrics

Total package byte prevSize

71074

increased by0.94%

Lines of code

1220

increased by1.08%

No dependency changes