setup refactor, to utilize basic Eloquent query builder-esque methods. when time allows will move completely over to Eloquents library, for now just mocked similar API

Author: Edwin Daniels

.gitignore

@@ -1,3 +1,4 @@
+.DS_store
 vendor/
 config/*.php
 .idea/

src/Salesforce/Database/Model.php

@@ -59,109 +59,53 @@ public static function hydrateFactory($data)
         return $instance;
     }
 
+
     /**
      * @param $field
      * @param $value
      *
-     * @todo migrate to a query builder object
-     * @return mixed
+     * @return Collection
      */
-    protected static function q_castQueryValue($field, $value)
+    public static function findBy()
     {
-        if (is_bool($value)) {
-            return $value ? 'true' : 'false';
-        } else {
-            return "'" . addslashes($value) . "'";
-        }
+        $instance = new static;
+        $args = func_get_args() ? func_get_args() : [[]];
+        $query = call_user_func_array([$instance, 'where'], $args);
+
+        return $query->get();
     }
 
+
     /**
-     * @param       $selectFields
-     * @param       $objectName
-     * @param array $searchCriteria
+     * Handle dynamic static method calls into the method.
      *
-     * @todo migrate to a query builder object
-     * @return string
+     * @param  string  $method
+     * @param  array  $parameters
+     * @return mixed
      */
-    protected static function q_buildSelectQuery($selectFields, $objectName, $searchCriteria = [])
+    public static function __callStatic($method, $parameters)
     {
-
-        $query = "SELECT %s FROM %s ";
-        $ands  = [];
-
-        foreach ($searchCriteria as $search) {
-            foreach ($search as $field => $val) {
-                $ands[] = $field . ' = ' . self::q_castQueryValue($field, $val);
-            }
-        }
-
-        if (count($ands)) {
-            $query .= " WHERE " . implode(' AND ', $ands);
-        }
-
-        return sprintf($query,
-            implode(', ', $selectFields),
-            $objectName
-        );
+        return (new static)->$method(...$parameters);
     }
 
     /**
-     * @param $search
+     * Convert the model to its string representation.
      *
-     * @todo migrate to a query builder object
-     * @return array
+     * @return string
      */
-    protected static function q_fetchResults($search)
+    public function __toString()
     {
-        // get our fields
-        $fields = array_keys(static::getSchema());
-
-        $q = self::q_buildSelectQuery($fields, static::resolveObjectName(), $search);
-        // if searching IsArchived or IsDeleted, fetch from queryAll https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/dome_queryall.htm
-        $queryAll = false;
-        foreach ($search as $filter) {
-            foreach ($filter as $field => $value) {
-                switch ($field) {
-                    case 'IsArchived':
-                    case 'IsDeleted':
-                        $queryAll = true;
-                        break 3;
-                }
-            }
-        }
-
-        $connection = self::$connection;
-        if ($queryAll) {
-            $results = $connection->queryAll($q);
-        } else {
-            $results = $connection->query($q);
-        }
-
-        return $results;
+        return $this->toJson();
     }
 
     /**
-     * @param $field
-     * @param $value
-     *
-     * @return Collection
+     * @return QueryBuilder
      */
-    public static function findBy()
+    public function newQuery()
     {
-        $search = func_get_args();
-        if (func_num_args() == 2) {
-            $args   = func_get_args();
-            $search = [[$args[0] => $args[1]]];
-        }
-
-        $results = self::q_fetchResults($search);
-
-        $collection = [];
-        foreach ($results['records'] as $item) {
-            $collection[] = self::hydrateFactory($item);
-        }
-
-        return new Collection($collection);
+        return (new QueryBuilder(self::$connection))
+            ->from(static::resolveObjectName())
+            ->select(array_keys(static::getSchema()))->setModel($this);
     }
 
     /**
@@ -172,17 +116,10 @@ public static function findBy()
      */
     public static function findOneBy()
     {
-        $search = func_get_args();
-        if (func_num_args() == 2) {
-            $args   = func_get_args();
-            $search = [[$args[0] => $args[1]]];
-        }
+        $results = self::findBy(...func_get_args());
+        if(isset($results[0])) {
 
-        $results = self::q_fetchResults($search);
-
-        if (isset($results['records'][0])) {
-
-            return self::hydrateFactory($results['records'][0]);
+            return $results[0];
         }
 
         return null;
@@ -382,7 +319,11 @@ public function __call($name, $arguments)
             return $this;
         }
 
-        return null;
+        if (in_array($name, ['increment', 'decrement'])) {
+            return $this->$name(...$arguments);
+        }
+
+        return $this->newQuery()->$name(...$arguments);
     }
 
     /**