tests; business; data access

src/Utils/Business/LuBusiness.php

@@ -41,8 +41,9 @@ abstract class LuBusiness {
     public static function getById($id)
     {
         $data = static::getDataAccess()->getSingleById($id);
-        if (is_null($data))
+        if (is_null($data)) {
             self::notFound(static::getResourceName() . " not found");
+        }
         return $data;
     }
 
@@ -53,8 +54,9 @@ abstract class LuBusiness {
     public static function deleteById($id)
     {
         $res = static::getDataAccess()->deleteSingleById($id);
-        if (!$res)
+        if (!$res) {
             self::notFound(static::getResourceName() . " not found");
+        }
         return true;
     }
 
@@ -66,11 +68,6 @@ abstract class LuBusiness {
         return null;
     }
 
-    public static function getAll($page = 0, $perPage = PHP_INT_MAX, $query = "")
-    {
-        return static::getDataAccess()->getAll($page, $perPage, $query);
-    }
-
     public static function getResourceName()
     {
         $match = [];

src/Utils/DataAccess/LuDataAccess.php

@@ -8,6 +8,7 @@ use Illuminate\Database\Query\Builder;
 use Luticate\Utils\Business\LuArrayUtils;
 use Luticate\Utils\Business\LuStringUtils;
 use Luticate\Utils\Dbo\LuDbo;
+use Luticate\Utils\Dbo\LuPaginatedDbo;
 
 abstract class LuDataAccess {
 
@@ -72,6 +73,9 @@ abstract class LuDataAccess {
         if (is_callable($query)) {
             $query = $query(static::getTableAs());
         }
+        else if (is_null($query)) {
+            return static::getTableAs();
+        }
         return $query;
     }
 
@@ -89,6 +93,16 @@ abstract class LuDataAccess {
         $json = LuArrayUtils::camelCaseToSnake($json);
         return $json;
     }
+    
+    public static function getData($query)
+    {
+        $query = static::resolveQuery($query);
+        $sql = $query->toSql();
+        $string = static::getConnection()->select("WITH query AS (${sql}) SELECT COALESCE(json_agg(data), '[]'::json) AS data FROM query data", $query->getBindings())[0]->data;
+
+        $data = LuStringUtils::convertJsonString($string);
+        return $data;
+    }
 
     /**
      * @param $query Builder|callable
@@ -96,12 +110,7 @@ abstract class LuDataAccess {
      */
     public static function getMultiple($query)
     {
-        $query = static::resolveQuery($query);
-        $string = $query->aggregate("json_agg", [static::$_table_as]);
-        if (is_null($string)) {
-            return [];
-        }
-        $data = LuStringUtils::convertJsonString($string);
+        $data = static::getData($query);
         
         return LuDbo::deserializeValue($data, static::$_dboClass . "[]");
     }
@@ -112,18 +121,24 @@ abstract class LuDataAccess {
      */
     public static function getSingle($query)
     {
-        $query = static::resolveQuery($query);
-        $string = $query->take(1)->aggregate("json_agg", [static::$_table_as]);
-        if (is_null($string)) {
-            return null;
-        }
-        $data = LuStringUtils::convertJsonString($string);
+        $data = static::getData($query);
+        
         if (count($data) < 1) {
             return null;
         }
 
         return LuDbo::deserializeValue($data[0], static::$_dboClass);
     }
+    
+    public static function getMultiplePaginated($query, $page, $perPage)
+    {
+        $query = static::resolveQuery($query);
+        $sql = $query->toSql();
+        $count = static::getConnection()->select("WITH query AS (${sql}) SELECT count(data) AS data FROM query data", $query->getBindings())[0]->data;
+        $query->take($perPage)->offset($page * $perPage);
+        $data = self::getMultiple($query);
+        return new LuPaginatedDbo($count, $data);
+    }
 
     /**
      * @param $id

src/Utils/Dbo/LuPaginatedDbo.php

@@ -34,7 +34,7 @@ class LuPaginatedDbo extends LuDbo {
     {
         return array(
             "Count" => $this->_count,
-            "Data" => $this->_data
+            "Data" => LuDbo::serializeValue($this->_data)
         );
     }
 
@@ -50,7 +50,7 @@ class LuPaginatedDbo extends LuDbo {
         foreach ($this->_data as $data) {
             $values[] = $callback($data);
         }
-        return new LuPaginatedDbo($this->_count, $values);
+        return new static($this->_count, $values);
     }
     
     public static function jsonDeserialize($json)

tests/DatabaseTest.php

@@ -215,15 +215,32 @@ class DatabaseTest extends \PHPUnit_Framework_TestCase
 
     public function testDaGetMultiple()
     {
-        $this->assertSame([
-            ["Id" => 1, "SomeText" => "lol2", "SomeIntegerArray" => [], "CreatedAt" => "2016-06-15 13:45:23"]
-        ],
+        $this->assertSame([["Id" => 1, "SomeText" => "lol2", "SomeIntegerArray" => [], "CreatedAt" => "2016-06-15 13:45:23"]],
             LuDbo::serializeValue(TestTableDataAccess::getMultiple(function(Builder $q)
             {
                 return $q->where("id", "=", 1);
             })));
     }
 
+    public function testDaGetMultipleOffset()
+    {
+        $this->assertSame([["Id" => 11, "SomeText" => "lol2", "SomeIntegerArray" => [], "CreatedAt" => "2016-06-15 13:45:23"]],
+            LuDbo::serializeValue(TestTableDataAccess::getMultiple(function(Builder $q)
+            {
+                return $q->take(1)->offset(2);
+            })));
+    }
+
+    public function testDaGetPaginated()
+    {
+        $this->assertSame(["Count" => 3, "Data" =>
+            [["Id" => 11, "SomeText" => "lol2", "SomeIntegerArray" => [], "CreatedAt" => "2016-06-15 13:45:23"]]],
+            LuDbo::serializeValue(TestTableDataAccess::getMultiplePaginated(function(Builder $q)
+            {
+                return $q->orderBy("id", "ASC");
+            }, 1, 1)));
+    }
+
     public function testDaGetSingleById()
     {
         $this->assertSame(["Id" => 1, "SomeText" => "lol2", "SomeIntegerArray" => [], "CreatedAt" => "2016-06-15 13:45:23"],