From 4de34aafd6d588e8ca13aaa025c59da047663b9e Mon Sep 17 00:00:00 2001
From: damack <sebastian.netuschil@gmail.com>
Date: Sun, 7 Feb 2016 12:40:30 +0100
Subject: [PATCH 1/3] This fix #3

---
 api-console/index.html | 2 +-
 src/RouteBuilder.php   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/api-console/index.html b/api-console/index.html
index e5b6e64..c8361d0 100755
--- a/api-console/index.html
+++ b/api-console/index.html
@@ -9,7 +9,7 @@
 </head>
 
 <body ng-app="ramlConsoleApp" ng-cloak class="raml-console-body">
-    <raml-console src="../../../raml/api.raml"></raml-console>
+    <raml-console src="../../../../raml/api.raml"></raml-console>
     <script src="scripts/api-console-vendor.js"></script>
     <script src="scripts/api-console.js"></script>
     <script>
diff --git a/src/RouteBuilder.php b/src/RouteBuilder.php
index 8e85594..30ad0bb 100755
--- a/src/RouteBuilder.php
+++ b/src/RouteBuilder.php
@@ -69,9 +69,11 @@ public function build(Application $app)
                 ->before($beforeMiddleware);
         }
 
-        $controllers->match('/', function() use ($app) {
-            return $app->redirect('api-console');
-        });
+        if (array_key_exists('ramlToSilex.apiConsole', $app) && $app['ramlToSilex.apiConsole']) {
+            $controllers->match('/', function() use ($app) {
+                return $app->redirect('vendor/damack/ramltosilex/api-console/');
+            });
+        }
 
         return $controllers;
     }

From dcf2790468efe7e3bbc0d966dd42c73631907302 Mon Sep 17 00:00:00 2001
From: damack <sebastian.netuschil@gmail.com>
Date: Sun, 7 Feb 2016 15:51:46 +0100
Subject: [PATCH 2/3] this fix #4

---
 src/RestController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/RestController.php b/src/RestController.php
index 6b229ba..f82be18 100755
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -140,13 +140,17 @@ public function getAuthGooglecallbackAction($objectType, Request $request)
         $gUser = $this->provider->getResourceOwner($token);
 
         $this->createTable($tenant, $objectType);
-        $user = $this->dbal[$tenant]->fetchAssoc('SELECT * FROM '.$objectType.' WHERE mail = ?', array($gUser->getEmail()));
+        $user = $this->dbal[$tenant]->fetchObject('SELECT * FROM '.$objectType.' WHERE mail = ?', array($gUser->getEmail()));
         if ($user == null) {
             $this->dbal[$tenant]->insert($objectType, array(
                 "name" => $gUser->getName(),
                 "mail" => $gUser->getEmail(),
                 "token" => $token
             ));
+        } else if ($user->token !== $token) {
+            $this->dbal[$tenant]->update($objectType, array(
+                "token" => $token
+            ), array('id' => $user->id));
         }
         return new RedirectResponse('https://'.$tenant.'/#/login?access_token='.$token);
     }

From b574580045009b1f303032cfc757636218f51bc5 Mon Sep 17 00:00:00 2001
From: damack <sebastian.netuschil@gmail.com>
Date: Thu, 11 Feb 2016 17:24:34 +0100
Subject: [PATCH 3/3] Add function to have sub routes and list has now paramter
 q for filter the list

---
 src/RestController.php                   | 60 +++++++++++++++++++++---
 src/RouteBuilder.php                     | 16 ++++---
 tests/RamlToSilexServiceProviderTest.php | 35 +++++++++++++-
 tests/config.json                        |  2 +
 tests/controller/CustomController.php    |  2 +-
 tests/raml/api.raml                      | 24 +++++++++-
 tests/raml/todo.json                     | 14 ++++++
 tests/raml/todos.json                    |  8 ++++
 8 files changed, 144 insertions(+), 17 deletions(-)
 create mode 100644 tests/raml/todo.json
 create mode 100644 tests/raml/todos.json

diff --git a/src/RestController.php b/src/RestController.php
index f82be18..bf9dcf7 100755
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -40,7 +40,13 @@ public function getListAction($objectType, Request $request)
             ->from($objectType, 'o')
         ;
 
-        if ($sort = $request->query->get('_sort')) {
+        $q = $request->query->get('q');
+        $foreignKeys = $this->getForeignKeys($request->attributes);
+        $where = $this->createWhere($queryBuilder, $q, $foreignKeys);
+        if ($where) {
+            $queryBuilder->where($where);
+        }
+        if ($sort = $request->query->get('sort')) {
             $queryBuilder->orderBy($sort, $request->query->get('_sortDir', 'ASC'));
         }
 
@@ -57,7 +63,7 @@ public function getListAction($objectType, Request $request)
         $results = $pager->getSlice($request->query->get('_start', 0), $request->query->get('_end', 20));
 
         foreach($results as &$obj) {
-            $this->removeHiddenFields($objectType, $obj);
+            $this->removeHiddenFields($objectType, $obj, $foreignKeys);
         }
 
         return new JsonResponse($results, 200, array(
@@ -68,9 +74,10 @@ public function getListAction($objectType, Request $request)
     public function postListAction($objectType, Request $request)
     {
         $tenant = $request->headers->get('Tenant');
-        $this->createTable($tenant, $objectType);
+        $foreignKeys = $this->getForeignKeys($request->attributes);
+        $this->createTable($tenant, $objectType, $foreignKeys);
         try {
-            $this->dbal[$tenant]->insert($objectType, $request->request->all());
+            $this->dbal[$tenant]->insert($objectType, array_merge($request->request->all(), $foreignKeys));
         } catch (\Exception $e) {
             return new JsonResponse(array(
                 'errors' => array('detail' => $e->getMessage()),
@@ -96,7 +103,7 @@ public function getObjectAction($objectId, $objectType, Request $request)
         if (false === $result) {
             return new Response('', 404);
         }
-        $this->removeHiddenFields($objectType, $result);
+        $this->removeHiddenFields($objectType, $result, $this->getForeignKeys($request->attributes));
 
         return new JsonResponse($result, 200);
     }
@@ -174,7 +181,39 @@ public function getAuthGooglemeAction($objectType, Request $request) {
         return new JsonResponse($result, 200);
     }
 
-    private function removeHiddenFields($schemaName, &$obj) {
+    private function getForeignKeys($attributes) {
+        $return = array();
+        foreach($attributes as $key => $value) {
+            if(strpos($key, 'Id') && $key !== 'objectId') {
+                $return[$key] = $value;
+            }
+        }
+        return $return;
+    }
+
+    private function createWhere($queryBuilder, $q, $foreignKeys) {
+        $return = '';
+
+        if ($q) {
+            $qSplit = explode(',', $q);
+            foreach($qSplit as $value) {
+                $valueSplit = explode(':', $value);
+                if (strlen($return) > 0) {
+                    $return .= ',';
+                }
+                $return .= trim($valueSplit[0]) . "=" . $queryBuilder->createPositionalParameter($valueSplit[1]);
+            }
+        }
+        foreach($foreignKeys as $key => $value) {
+            if (strlen($return) > 0) {
+                $return .= ',';
+            }
+            $return .= $key . "=" . $queryBuilder->createPositionalParameter($value);
+        }
+        return $return;
+    }
+
+    private function removeHiddenFields($schemaName, &$obj, $foreignKeys = array()) {
         $apiDefinition = $this->app['ramlToSilex.apiDefinition'];
         foreach ($apiDefinition->getSchemaCollections() as $schema) {
             if (key($schema) == $schemaName) {
@@ -186,9 +225,12 @@ private function removeHiddenFields($schemaName, &$obj) {
                 }
             }
         }
+        foreach ($foreignKeys as $key => $value) {
+            unset($obj[$key]);
+        }
     }
 
-    private function createTable($tenant, $name) {
+    private function createTable($tenant, $name, $foreignKeys = []) {
         $findTable = false;
         $schema = $this->dbal[$tenant]->getSchemaManager();
 
@@ -229,6 +271,10 @@ private function createTable($tenant, $name) {
                             }
                         }
                     }
+                    //Add foreign keys
+                    foreach($foreignKeys as $key => $value) {
+                        $table->addColumn($key, 'integer');
+                    }
                 }
             }
 
diff --git a/src/RouteBuilder.php b/src/RouteBuilder.php
index 30ad0bb..d788fe9 100755
--- a/src/RouteBuilder.php
+++ b/src/RouteBuilder.php
@@ -38,17 +38,21 @@ public function build(Application $app)
             }
 
             $availableRoutes[] = $index;
-
             if (preg_match('/auth/', $route['path'])) {
                 $route['type'] = str_replace('google', 'Google', str_replace('auth', 'Auth', str_replace('/', '', $route['path'])));
                 $route['objectType'] = 'users';
-            } else if (preg_match('/{[\w-]+}/', $route['path'], $identifier)) {
+            } else if (preg_match_all('/{[\w-]+}/', $route['path'], $identifier) && strrpos($route['path'], "}") === (strlen($route['path']) - 1)) {
                 $route['type'] = 'Object';
-                $route['objectType'] = strtolower(str_replace(array('/', $identifier[0]), '', $route['path']));
-                $route['path'] = str_replace($identifier[0], '{objectId}', $route['path']);
+                $route['objectType'] = strtolower(str_replace(array('/', $identifier[0][count($identifier[0]) - 1]), '', $route['path']));
+                $route['path'] = str_replace($identifier[0][count($identifier[0]) - 1], '{objectId}', $route['path']);
+
+                //object type is last element
+                if (strpos($route['objectType'], "}") !== false) {
+                    $route['objectType'] = substr(strrchr($route['objectType'], "}"), 1);
+                }
             } else {
                 $route['type'] = 'List';
-                $route['objectType'] = strtolower(str_replace('/', '', $route['path']));
+                $route['objectType'] = substr($route['path'], strrpos($route['path'], "/") + 1, strlen($route['path']));
             }
             if (property_exists($app['ramlToSilex.customControllerMapping'], $routePath) && $app['ramlToSilex.customControllerMapping']->{$routePath}) {
                 $mapping = $app['ramlToSilex.customControllerMapping']->{$routePath};
@@ -58,14 +62,12 @@ public function build(Application $app)
             } else {
                 $action = 'ramlToSilex.restController:'.strtolower($route['method']).$route['type'].'Action';
             }
-            $name = 'ramlToSilex.'.strtolower($route['method']).ucfirst($route['objectType']).$route['type'];
 
             $controllers
                 ->match($route['path'], $action)
                 ->method($route['method'])
                 ->setDefault('objectType', $route['objectType'])
                 ->setDefault('path', $routePath)
-                ->bind($name)
                 ->before($beforeMiddleware);
         }
 
diff --git a/tests/RamlToSilexServiceProviderTest.php b/tests/RamlToSilexServiceProviderTest.php
index 7a332a2..c7ee94d 100644
--- a/tests/RamlToSilexServiceProviderTest.php
+++ b/tests/RamlToSilexServiceProviderTest.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Damack\RamlToSilex;
 
 use Damack\RamlToSilex\RamlToSilexServiceProvider;
@@ -71,6 +70,15 @@ public function testGetList() {
         $this->assertEquals('[{"id":"1","name":"Hans Walter Admin","mail":"hans.walter@gmail.com","role":"Admin","activ":"1"},{"id":"2","name":"Hans Walter Describer","mail":"hans.walter@gmail.com","role":"Describer","activ":"1"},{"id":"3","name":"Hans Walter Anonymous","mail":"hans.walter@gmail.com","role":"Anonymous","activ":"1"}]', $response->getContent());
     }
 
+    public function testGetListQFilter() {
+        $request = Request::create('/users?q=role:Admin', 'GET');
+        $request->headers->set('Authorization', 'Bearer admin');
+        $request->headers->set('Tenant', 'test');
+        $response = $this->app->handle($request);
+
+        $this->assertEquals('[{"id":"1","name":"Hans Walter Admin","mail":"hans.walter@gmail.com","role":"Admin","activ":"1"}]', $response->getContent());
+    }
+
     public function testGetListAnonymous() {
         $request = Request::create('/users', 'GET');
         $request->headers->set('Authorization', 'Bearer anonymous');
@@ -132,4 +140,29 @@ public function testCustomController() {
         $response = $this->app->handle($request);
         $this->assertEquals('{"id":"1","name":"Hans Walter Admin","mail":"hans.walter@gmail.com","role":"Admin","activ":"1","token":"admin"}', $response->getContent());
     }
+
+    public function testToDoPost() {
+        $request = Request::create('/users/1/todos', 'POST', array(), array(), array(), array('CONTENT_TYPE' => 'application/json'), '{"name":"Test"}');
+        $request->headers->set('Authorization', 'Bearer admin');
+        $request->headers->set('Tenant', 'test');
+        $response = $this->app->handle($request);
+
+        $this->assertEquals(201, $response->getStatusCode());
+    }
+
+    public function testToDoGetList() {
+        $request = Request::create('/users/2/todos', 'GET');
+        $request->headers->set('Authorization', 'Bearer admin');
+        $request->headers->set('Tenant', 'test');
+        $response = $this->app->handle($request);
+
+        $this->assertEquals('[]', $response->getContent());
+
+        $request = Request::create('/users/1/todos', 'GET');
+        $request->headers->set('Authorization', 'Bearer admin');
+        $request->headers->set('Tenant', 'test');
+        $response = $this->app->handle($request);
+
+        $this->assertEquals('[{"id":"1","name":"Test"}]', $response->getContent());
+    }
 }
diff --git a/tests/config.json b/tests/config.json
index ba145c3..bbe5c79 100644
--- a/tests/config.json
+++ b/tests/config.json
@@ -6,6 +6,8 @@
         "PUT /users/{userId}": "Admin",
         "DELETE /users/{userId}": "Admin",
         "PUT /users/{userId}/test": "Admin",
+        "GET /users/{userId}/todos": "Admin",
+        "POST /users/{userId}/todos": "Admin",
         "GET /auth/google/me": "Admin, Describer, Anonymous"
     },
     "controllers": {
diff --git a/tests/controller/CustomController.php b/tests/controller/CustomController.php
index f1ec5ee..a1ae00b 100644
--- a/tests/controller/CustomController.php
+++ b/tests/controller/CustomController.php
@@ -13,7 +13,7 @@ public function __construct($app) {
         $this->dbal = $app['dbs'];
     }
 
-    public function testAction($objectId, $objectType, Request $request) {
+    public function testAction($objectType, Request $request) {
         $tenant = $request->headers->get('Tenant');
         $token = $request->headers->get('Authorization') ? $request->headers->get('Authorization') : getallheaders()['Authorization'];
         $token = str_replace('Bearer ', '', $token);
diff --git a/tests/raml/api.raml b/tests/raml/api.raml
index d3d086d..c5b67e2 100644
--- a/tests/raml/api.raml
+++ b/tests/raml/api.raml
@@ -7,6 +7,8 @@ mediaType:  application/json
 schemas:
   - users: !include users.json
   - user: !include user.json
+  - todos: !include todos.json
+  - todo: !include todo.json
 
 traits: 
   - oauth2:
@@ -48,7 +50,7 @@ traits:
               Used to use the right site
             type: string
             required: true
-        
+            
 /users:
   get:
     is: [oauth2, tenant]
@@ -115,6 +117,26 @@ traits:
               description: The resource has been successfully created
             500:
               description: Some server side error occurred.
+    /todos:
+      get:
+        is: [oauth2, tenant]
+        description: Gets all todos for a user
+        responses:
+          200:
+            body:
+              application/json:
+                schema: todos
+      post:
+        is: [oauth2, tenant]
+        description: Add a new todo for a user
+        body:
+          application/json:
+            schema: todo
+        responses:
+            201:
+              description: The resource has been successfully created
+            500:
+              description: Some server side error occurred.  
 /auth:
   /google:
     get:
diff --git a/tests/raml/todo.json b/tests/raml/todo.json
new file mode 100644
index 0000000..a8973fe
--- /dev/null
+++ b/tests/raml/todo.json
@@ -0,0 +1,14 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "Todo",
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        }
+    },
+    "required": ["name"]
+}
diff --git a/tests/raml/todos.json b/tests/raml/todos.json
new file mode 100644
index 0000000..8d8847c
--- /dev/null
+++ b/tests/raml/todos.json
@@ -0,0 +1,8 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "Collection of Todos for user",
+    "type": "array",
+    "items": {
+        "$ref": "todo.json"
+    }
+}
