done: count support | asArray | emulate execution

Author: andreyons

src/sokyrko/yii/salesforce/data/ActiveQuery.php

@@ -10,6 +10,7 @@
 
 use Akeneo\SalesForce\Connector\SalesForceClient;
 use Akeneo\SalesForce\Query\QueryBuilder;
+use sokyrko\yii\salesforce\components\SalesforceComponent;
 use yii\base\InvalidCallException;
 use yii\base\InvalidParamException;
 use yii\db\ActiveQueryInterface;
@@ -33,6 +34,9 @@ class ActiveQuery implements ActiveQueryInterface
     /** @var boolean */
     protected $enableEmulateExecution;
 
+    /** @var boolean */
+    protected $asArray = false;
+
     protected $queryParts = [
         'select'  => [],
         'from'    => '',
@@ -41,8 +45,6 @@ class ActiveQuery implements ActiveQueryInterface
         'limit'   => '',
     ];
 
-    // TODO: refactor query builder to works if andWhere called without first where
-
     /**
      * Constructor.
      *
@@ -92,20 +94,24 @@ protected function parseSelect($what)
      */
     public function asArray($value = true)
     {
-        throw new InvalidCallException('Not implemented yet.'); // TODO
+        $this->asArray = $value;
     }
 
     /**
      * Executes query and returns a single row of result.
      *
      * @param Connection $db the DB connection used to create the DB command.
      * If `null`, the DB connection returned by [[ActiveQueryTrait::$modelClass|modelClass]] will be used.
-     * @return ActiveRecordInterface|array|null a single row of query result. Depending on the setting of [[asArray]],
+     * @return ActiveRecord|array|null a single row of query result. Depending on the setting of [[asArray]],
      * the query result may be either an array or an ActiveRecord object. `null` will be returned
      * if the query results in nothing.
      */
     public function one($db = null)
     {
+        if ($this->enableEmulateExecution) {
+            return null;
+        }
+
         $all = $this->all();
 
         return reset($all); // todo: refactor
@@ -185,8 +191,8 @@ public function via($relationName, callable $callable = null)
      * Finds the related records for the specified primary record.
      * This method is invoked when a relation of an ActiveRecord is being accessed in a lazy fashion.
      *
-     * @param string                $name the relation name
-     * @param ActiveRecordInterface $model the primary model
+     * @param string                             $name the relation name
+     * @param ActiveRecordInterface|ActiveRecord $model the primary model
      * @return mixed the related record(s)
      */
     public function findFor($name, $model)
@@ -199,16 +205,23 @@ public function findFor($name, $model)
      *
      * @param Connection $db the database connection used to execute the query.
      * If this parameter is not given, the `salesforce` application component will be used.
-     * @return array the query results. If the query results in nothing, an empty array will be returned.
+     * @return array|ActiveRecord[] the query results. If the query results in nothing, an empty array will be returned.
      */
     public function all($db = null)
     {
-        /** @var SalesForceClient $client */
-        $client = \Yii::$app->get('salesforce')->getClient();
+        if ($this->enableEmulateExecution) {
+            return [];
+        }
+
+        $client = $this->getDb($db)->getClient();
+
+        if ($this->asArray) {
+            return $client->search($this->getRawQuery());
+        }
 
         return array_map(function ($item) {
             return new $this->modelClass($item);
-        }, $client->search($this->getRawQuery())); // TODO: create query and then search
+        }, $client->search($this->getRawQuery()));
     }
 
     /**
@@ -234,6 +247,8 @@ public function getRawQuery()
             $q->orderBy($this->parseOrderBy($this->queryParts['orderBy']));
         }
 
+        // TODO: support limit and join
+
         return $q->getQuery();
     }
 
@@ -268,12 +283,24 @@ protected function replaceSortConstWithString($sortConst)
      *
      * @param string     $q the COUNT expression. Defaults to '*'.
      * @param Connection $db the database connection used to execute the query.
-     * If this parameter is not given, the `db` application component will be used.
+     * If this parameter is not given, the `salesforce` application component will be used.
      * @return int number of records.
      */
-    public function count($q = '*', $db = null)
+    public function count($q = 'Id', $db = null)
     {
-        throw new InvalidCallException('Not implemented yet.'); // TODO
+        $client = $this->getDb($db)->getClient();
+        $this->select(sprintf('COUNT(%s)', $q));
+
+        return $client->search($this->getRawQuery())[0]['expr0'] ?? 0;
+    }
+
+    /**
+     * @param null $db
+     * @return null|object|SalesforceComponent
+     */
+    protected function getDb($db = null)
+    {
+        return $db ?? \Yii::$app->get('salesforce');
     }
 
     /**

src/sokyrko/yii/salesforce/data/ActiveRecord.php

@@ -9,7 +9,9 @@
 namespace sokyrko\yii\salesforce\data;
 
 use yii\base\InvalidCallException;
+use yii\base\InvalidParamException;
 use yii\base\Model;
+use yii\base\UnknownMethodException;
 use yii\db\ActiveQueryInterface;
 use yii\db\ActiveRecordInterface;
 
@@ -26,6 +28,9 @@ class ActiveRecord extends Model implements ActiveRecordInterface
     /** @var boolean */
     protected static $isCustom = true;
 
+    /** @var null|array|ActiveRecord[] */
+    protected $relations;
+
     /**
      * @return string
      */
@@ -443,7 +448,7 @@ public function delete()
      */
     public function getIsNewRecord()
     {
-        // TODO: Implement getIsNewRecord() method.
+        return $this->isNewRecord;
     }
 
     /**
@@ -474,7 +479,39 @@ public function equals($record)
      */
     public function getRelation($name, $throwException = true)
     {
-        // TODO: Implement getRelation() method.
+        $getter = 'get' . $name;
+        try {
+            // the relation could be defined in a behavior
+            $relation = $this->$getter();
+        } catch (UnknownMethodException $e) {
+            if ($throwException) {
+                throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".', 0, $e);
+            } else {
+                return null;
+            }
+        }
+        if (!$relation instanceof ActiveQueryInterface) {
+            if ($throwException) {
+                throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".');
+            } else {
+                return null;
+            }
+        }
+
+        if (method_exists($this, $getter)) {
+            // relation name is case sensitive, trying to validate it when the relation is defined within this class
+            $method = new \ReflectionMethod($this, $getter);
+            $realName = lcfirst(substr($method->getName(), 3));
+            if ($realName !== $name) {
+                if ($throwException) {
+                    throw new InvalidParamException('Relation names are case sensitive. ' . get_class($this) . " has a relation named \"$realName\" instead of \"$name\".");
+                } else {
+                    return null;
+                }
+            }
+        }
+
+        return $relation;
     }
 
     /**
@@ -487,7 +524,7 @@ public function getRelation($name, $throwException = true)
      */
     public function populateRelation($name, $records)
     {
-        // TODO: Implement populateRelation() method.
+        $this->relations[ $name ] = $records;
     }
 
     /**