- detecting readCollection service-method works now

- closes #195
peerigon · Jul 23, 2013 · 5086af1 · 5086af1
1 parent 004c77c
commit 5086af1
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/lib/server/request/middleware/runService.js b/lib/server/request/middleware/runService.js
@@ -60,7 +60,7 @@ function runService(req, res, next) {
         //the service registry only has server-services on the server-side!
         service = services.getService(path);
 
-        if (service[method] === undefined) {
+        if (value(service[method]).notTypeOf(Function)) {
             log.debug("Unsupported Method:  " + method);
             onServiceCallFailed();
         }
@@ -69,7 +69,6 @@ function runService(req, res, next) {
                 case 'create':
                     //model = ModelClass , data = pure request data
                     if (value(model).instanceOf(Model)) {
-
                         model.save(false, function (err, response) {
                             onServiceCallback(response);
                         });
@@ -79,19 +78,11 @@ function runService(req, res, next) {
                     }
                     break;
                 case 'read':
-                    //if no id is set, we have a collection request
-                    //READ COLLECTION
-                    if (id === undefined || id === null) {
-                        if (value(service.readCollection).notTypeOf(Function)) {
-                            onServiceCallFailed();
-                            break;
-                        }
-                        //data = pure request data
-                        handleServiceCall(service.readCollection.bind(service), ids, data, onServiceCallback);
-                        break;
-                    }
                     handleServiceCall(service.read.bind(service), ids, onServiceCallback);
                     break;
+                case 'readCollection' :
+                    handleServiceCall(service.readCollection.bind(service), ids, data, onServiceCallback);
+                    break;
                 case 'update':
                     if (value(model).instanceOf(Model)) {
                         model.save(function (err, response) {
@@ -157,6 +148,12 @@ function runService(req, res, next) {
         next(null);
     }
 
+    //detect readCollection requests
+    //read request without id = readCollection
+    if (method === "read" && (id === undefined || id === null)) {
+        method = "readCollection";
+    }
+
     //attach the data to the model if model = modelInstance
     if (value(model).instanceOf(Model)) {
         model.setIds(ids);