From b1ed94758e661731ac91a85cf5c527abe0dccfe6 Mon Sep 17 00:00:00 2001
From: stevie <stevie@lifeselector.com>
Date: Wed, 30 Jan 2019 15:30:32 +0100
Subject: [PATCH 1/5] add group in query parser

---
 src/PhalconRest/QueryParsers/PhqlQueryParser.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/PhalconRest/QueryParsers/PhqlQueryParser.php b/src/PhalconRest/QueryParsers/PhqlQueryParser.php
index 86ed926..c2c98bc 100644
--- a/src/PhalconRest/QueryParsers/PhqlQueryParser.php
+++ b/src/PhalconRest/QueryParsers/PhqlQueryParser.php
@@ -117,6 +117,10 @@ public function applyQuery(\Phalcon\Mvc\Model\Query\Builder $builder, Query $que
             $builder->notInWhere($fromString . '.' . $resource->getModelPrimaryKey(), $query->getExcludes());
         }
 
+        if ($query->hasGroups()) {
+            $builder->groupBy($query->getGroups());
+        }
+
         if ($query->hasSorters()) {
 
             $sorters = $query->getSorters();

From 2e50e29dcb0a22d5755d98b01802f2019d4149bc Mon Sep 17 00:00:00 2001
From: stevie <stevie@lifeselector.com>
Date: Wed, 30 Jan 2019 15:30:40 +0100
Subject: [PATCH 2/5] check model property exist

---
 src/PhalconRest/Transformers/ModelTransformer.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/PhalconRest/Transformers/ModelTransformer.php b/src/PhalconRest/Transformers/ModelTransformer.php
index 44a9708..2d4fcde 100644
--- a/src/PhalconRest/Transformers/ModelTransformer.php
+++ b/src/PhalconRest/Transformers/ModelTransformer.php
@@ -126,7 +126,9 @@ protected function getFieldValue($item, $propertyName, $fieldName)
             $this->getModelDataTypes()) ? $this->getModelDataTypes()[$propertyName] : null;
 
         $model = $this->getModel($item);
-        $value = $model->$propertyName;
+        $value = property_exists($model, $propertyName)
+            ? $model->$propertyName
+            : null;
 
         if ($value === null) {
             return null;

From 99b56a23a09569432c11be93f6262a3586c916b9 Mon Sep 17 00:00:00 2001
From: stevie <stevie@lifeselector.com>
Date: Wed, 30 Jan 2019 17:01:41 +0100
Subject: [PATCH 3/5] update composer

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 47bd567..43fad14 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "redound/phalcon-rest",
+    "name": "stevie/phalcon-rest",
     "description": "Phalcon REST Library",
     "require": {
         "php": ">=5.4",

From d2bd75c506050f53611a860728cc088b8f522112 Mon Sep 17 00:00:00 2001
From: stevie <stevie@lifeselector.com>
Date: Wed, 30 Jan 2019 17:06:30 +0100
Subject: [PATCH 4/5] update composer

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 43fad14..ff3ff13 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "require": {
         "php": ">=5.4",
         "ext-phalcon": ">=1.3.2",
-        "redound/phalcon-api": "^1.0.2"
+        "stevie/phalcon-api": "^1.0.2"
     },
     "suggest": {
         "league/fractal": "^0.13.0",

From c467a1e1e2464628b3e6d395985110f48cb70837 Mon Sep 17 00:00:00 2001
From: stevie <stevie@lifeselector.com>
Date: Wed, 30 Jan 2019 17:13:49 +0100
Subject: [PATCH 5/5] update composer

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ff3ff13..18af40f 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "require": {
         "php": ">=5.4",
         "ext-phalcon": ">=1.3.2",
-        "stevie/phalcon-api": "^1.0.2"
+        "stevie/phalcon-api": "dev-master"
     },
     "suggest": {
         "league/fractal": "^0.13.0",