Model doc; business and data access getAll; route middleware

src/Utils/LuBusiness.php

@@ -101,19 +101,6 @@ abstract class LuBusiness {
         return $default;
     }
 
-    /**
-     * @param $page int
-     * @param $perPage int
-     * @param $column string
-     * @param $order string
-     * @param $query string
-     * @return LuDbo[]
-     */
-    public static function search($page, $perPage, $column, $order, $query = null)
-    {
-        return static::getDataAccess()->search($page, $perPage, $column, $order, $query);
-    }
-
     /**
      * @param $id int
      * @return LuDbo|null
@@ -141,4 +128,9 @@ abstract class LuBusiness {
     {
         return null;
     }
+
+    public static function getAll($page = 0, $perPage = PHP_INT_MAX)
+    {
+        return static::getDataAccess()->getAll($page, $perPage);
+    }
 }

src/Utils/LuDataAccess.php

@@ -3,19 +3,6 @@
 namespace Luticate\Utils;
 
 abstract class LuDataAccess {
-    /**
-     * @param $page int
-     * @param $perPage int
-     * @param $column string
-     * @param $order string
-     * @param $query string
-     * @return LuModel[]
-     */
-    protected static function search_($page, $perPage, $column, $order, $query)
-    {
-        return static::getModel();
-    }
-
     /**
      * @param $data LuModel[]
      * @return LuDbo[]
@@ -31,27 +18,6 @@ abstract class LuDataAccess {
         return $tab;
     }
 
-    /**
-     * @param $page int
-     * @param $perPage int
-     * @param $column string
-     * @param $order string
-     * @param $query string
-     * @return LuDbo[]
-     */
-    public static function search($page, $perPage, $column, $order, $query = null)
-    {
-        if (is_null($query))
-            $data = static::getModel();
-        else
-            $data = static::search_($page, $perPage, $column, $order, $query);
-
-        $data = $data->orderBy($column, $order)->take($perPage)->offset($page * $perPage)->get();
-
-        $tab = self::arrayToDbo($data);
-        return $tab;
-    }
-
     /**
      * @param $id int
      * @return LuModel
@@ -120,18 +86,16 @@ abstract class LuDataAccess {
      * @param $orders array
      * @param int $page
      * @param int $perPage
-     * @return array
+     * @return LuMultipleDbo
      */
     public static function getMultiple($predicates, $orders, $page = 0, $perPage = PHP_INT_MAX)
     {
         $model = static::getModel();
-        foreach($predicates as $predicate)
-        {
+        foreach($predicates as $predicate) {
             $model = $model->where($predicate[0], $predicate[1], $predicate[2]);
         }
         $count = $model->count();
-        foreach($orders as $order)
-        {
+        foreach($orders as $order) {
             $model = $model->orderBy($order[0], $order[1]);
         }
         $data = $model->take($perPage)->offset($page * $perPage)->get();
@@ -147,4 +111,17 @@ abstract class LuDataAccess {
     {
         return null;
     }
+
+    /**
+     * @return array
+     */
+    private static function getOrderBy()
+    {
+        return array();
+    }
+
+    public static function getAll($page = 0, $perPage = PHP_INT_MAX)
+    {
+        return self::getMultiple(array(), static::getOrderBy(), $page, $perPage);
+    }
 }

src/Utils/LuModel.php

@@ -13,6 +13,10 @@ use Illuminate\Database\Eloquent\Model;
  * @method static LuModel orderBy($column, $order)
  * @method static LuModel take($count)
  * @method static LuModel offset($offset)
+ * @method static LuModel rightJoin($table, $column1, $operator, $column2)
+ * @method static LuModel leftJoin($table, $column1, $operator, $column2)
+ * @method static LuModel join($table, $column1, $operator, $column2)
+ * @method static LuModel groupBy($column)
  * @method static LuModel[] get()
  * @method static LuModel first()
  * @method static int count()

src/Utils/LuRoute.php

@@ -2,65 +2,99 @@
 
 namespace Luticate\Utils;
 
-use Illuminate\Http\Request;
-
 class LuRoute {
     /**
-     * @var callable
+     * @var string[]
      */
-    private $_middleware;
+    private $middleware = array();
 
     /**
-     * @param $middleware callable
+     * @param $middleware string
      */
-    public function setMiddleware($middleware)
+    public function addMiddleware($middleware)
     {
-        $this->_middleware = $middleware;
+        $this->middleware[] = $middleware;
     }
 
-    private function getOptions($url, $business, $method, $permissions = array())
+    private function getOptions($url, $business, $method, $permissions, $middleware)
     {
-        $middleware = $this->_middleware;
-        return [function(Request $request) use($business, $method, $permissions, $middleware)
+        if (!is_array($permissions)) {
+            $permissions = array($permissions);
+        }
+        if (!is_array($middleware)) {
+            $middleware = array($middleware);
+        }
+        $permissions_string = implode(",", $permissions);
+        $middleware_string = [];
+        foreach (array_merge($this->middleware, $middleware) as $mid) {
+            $middleware_string[] = $mid . ":" . $permissions_string;
+        }
+        return [function() use($business, $method, $permissions)
         {
-            if (!is_array($permissions)) {
-                $permissions = array($permissions);
-            }
-
-            if ($middleware != null && !$middleware($permissions, $request)) {
-                abort(401);
-            }
-
             $controller = new LuController();
 
-            if (strpos($business, "\\") === false)
+            if (strpos($business, "\\") === false) {
                 $business = "App\\Http\\Business\\" . $business . "Business";
+            }
 
             return $controller->execute($business, $method);
-        }];
+        },
+            'middleware' => $middleware_string];
     }
 
-    public function get($url, $business, $method, $permissions = array())
+    /**
+     * @param $url string
+     * @param $business string
+     * @param $method string
+     * @param array $permissions string|string[]
+     * @param array $middleware string|string[]
+     * @return mixed
+     */
+    public function get($url, $business, $method, $permissions = array(), $middleware = array())
     {
         global $app;
-        return $app->get($url, $this->getOptions($url, $business, $method, $permissions));
+        return $app->get($url, $this->getOptions($url, $business, $method, $permissions, $middleware));
     }
 
-    public function post($url, $business, $method, $permissions = array())
+    /**
+     * @param $url string
+     * @param $business string
+     * @param $method string
+     * @param array $permissions string|string[]
+     * @param array $middleware string|string[]
+     * @return mixed
+     */
+    public function post($url, $business, $method, $permissions = array(), $middleware = array())
     {
         global $app;
-        return $app->post($url, $this->getOptions($url, $business, $method, $permissions));
+        return $app->post($url, $this->getOptions($url, $business, $method, $permissions, $middleware));
     }
 
-    public function put($url, $business, $method, $permissions = array())
+    /**
+     * @param $url string
+     * @param $business string
+     * @param $method string
+     * @param array $permissions string|string[]
+     * @param array $middleware string|string[]
+     * @return mixed
+     */
+    public function put($url, $business, $method, $permissions = array(), $middleware = array())
     {
         global $app;
-        return $app->put($url, $this->getOptions($url, $business, $method, $permissions));
+        return $app->put($url, $this->getOptions($url, $business, $method, $permissions, $middleware));
     }
 
-    public function delete($url, $business, $method, $permissions = array())
+    /**
+     * @param $url string
+     * @param $business string
+     * @param $method string
+     * @param array $permissions string|string[]
+     * @param array $middleware string|string[]
+     * @return mixed
+     */
+    public function delete($url, $business, $method, $permissions = array(), $middleware = array())
     {
         global $app;
-        return $app->delete($url, $this->getOptions($url, $business, $method, $permissions));
+        return $app->delete($url, $this->getOptions($url, $business, $method, $permissions, $middleware));
     }
 }