refactoring

Author: arojunior

README.md

@@ -68,8 +68,9 @@ Delete
 ```
 Read
 ```php
-	$this->Users->find(); // Select all data
-	$this->Users->find(['id' => 1]); // Select data with id = 1    
+	$this->Users->findAll(); // fetchAll
+	$this->Users->findOne(['email' => 'arojunior@gmail.com']);
+    $this->Users->findById($id);
 ```
 Row count (select/insert/update/delete)
 ```php
@@ -116,7 +117,7 @@ class Example extends AppModel
 
     public function getAll()
     {
-        return $this->find();
+        return $this->findAll();
     }
 }
 ```

app/controller/UsersController.php

@@ -14,7 +14,7 @@ public function index()
 
     public function get()
     {
-        $result = $this->Users->findAll();
+        $result = $this->Users->findById('banyar@yahoo.com');
 
         return ['list' => $this->Helper->toJson($result)];
     }

app/model/Users.php

@@ -8,12 +8,7 @@
 class Users extends AppModel implements UsersInterface
 {
     protected $table    = 't_user';
-    protected $pk       = 'user_id';
-
-    public function findAll()
-    {
-        return $this->find();
-    }
+    protected $pk       = 'email';
 
     public function store($data)
     {

app/model/contracts/UsersInterface.php

@@ -4,8 +4,6 @@
 
 interface UsersInterface
 {
-    public function findAll();
-
     public function store($data);
 
     public function remove($id);

core/model/Model.php

@@ -10,7 +10,28 @@ class Model extends Database
     private $stmt;
     private $dados;
     private $sql;
-    public  $count;
+    public $count;
+
+    public function __construct()
+    {
+        parent::__construct();
+        self::setTable();
+        self::setPrivateKey();
+    }
+
+    private function setTable()
+    {
+        if (!isset($this->table)) {
+            $this->table = strtolower(get_class($this));
+        }
+    }
+
+    private function setPrivateKey()
+    {
+        if (!isset($this->pk)) {
+            $this->pk = 'id';
+        }
+    }
 
     private function param($dados = null)
     {
@@ -47,41 +68,18 @@ private function conditions($separator)
         return 'WHERE '.implode($separator, $where);
     }
 
-    private function table()
-    {
-        return (isset($this->table)) ? $this->table : strtolower(get_class($this));
-    }
-
-    public function find($dados = null)
+    private function find()
     {
-        $this->dados = $dados;
-
         $fields = (isset($this->dados['fields'])) ? self::fields() : '*';
-        $table = self::table();
         $where = (isset($this->dados['conditions'])) ? self::conditions(' AND ') : '';
-        $sql = "SELECT {$fields} FROM {$table} {$where}";
+        $sql = "SELECT {$fields} FROM {$this->table} {$where}";
         $this->stmt = $this->conn->prepare($sql);
 
         if (!empty($where)) {
             self::param();
         }
 
-        $this->stmt->execute();
-
-        $result = $this->stmt->fetchAll(PDO::FETCH_ASSOC);
-        $this->count = count($result);
-
-        return $result;
-    }
-
-    public function query($sql)
-    {
-        $this->stmt = $this->conn->prepare($sql);
-        $this->stmt->execute();
-        $result = $this->stmt->fetchAll(PDO::FETCH_ASSOC);
-        $this->count = count($result);
-
-        return $result;
+        return $this->stmt->execute();
     }
 
     private function values()
@@ -97,18 +95,42 @@ private function insert()
     {
         $fields = self::fields($this->dados);
         $values = self::values();
-        $table = self::table();
-        $sql = "INSERT INTO {$table} ({$fields}) VALUES ({$values})";
+        $sql = "INSERT INTO {$this->table} ({$fields}) VALUES ({$values})";
 
         return $sql;
     }
 
-    public function save($dados)
+    public function findAll($dados = null)
     {
-        if (!isset($this->pk)) {
-            $this->pk = 'id';
-        }
+        $this->dados = $dados;
+        self::find();
+        return $this->stmt->fetchAll(PDO::FETCH_ASSOC);
+    }
 
+    public function findOne($dados = null)
+    {
+        $this->dados['conditions'] = $dados;
+        self::find();
+        return $this->stmt->fetch(PDO::FETCH_ASSOC);
+    }
+
+    public function findById($id)
+    {
+        return self::findOne([$this->pk => $id]);
+    }
+
+    public function query($sql)
+    {
+        $this->stmt = $this->conn->prepare($sql);
+        $this->stmt->execute();
+        $result = $this->stmt->fetchAll(PDO::FETCH_ASSOC);
+        $this->count = count($result);
+
+        return $result;
+    }
+
+    public function save($dados)
+    {
         if (isset($dados[$this->pk])) {
             $this->find([$this->pk => $dados[$this->pk]]);
         }
@@ -123,19 +145,14 @@ public function save($dados)
     public function update($dados)
     {
         $param = $dados;
-        $table = self::table();
-
-        if (!isset($this->pk)) {
-            $this->pk = 'id';
-        }
 
         $this->dados['conditions'] = [$this->pk => $dados[$this->pk]];
         $where = self::conditions('');
         unset($dados[$this->pk]);
         $this->dados['conditions'] = $dados;
         $fields = str_replace('WHERE', '', self::conditions(','));
 
-        $sql = "UPDATE {$table} SET {$fields} {$where}";
+        $sql = "UPDATE {$this->table} SET {$fields} {$where}";
         $this->stmt = $this->conn->prepare($sql);
         self::param($param);
         $this->stmt->execute();

index.php

@@ -6,9 +6,6 @@
 require 'constants.php';
 require __DIR__ . '/vendor/autoload.php';
 
-require_once CORE_MODEL;
-require_once CORE_CONTROLLER;
-
 use SimpleORM\app\controller;
 
 $uri = $_SERVER['REQUEST_URI'];
@@ -40,16 +37,14 @@
 /*
 * call current class/method
 */
-$controller_file = APP_CONTROLLER . $controller . PHP;
-
 try {
-    require $controller_file;
     $load_class = 'SimpleORM\app\controller\\' . $controller;
     $class      = new $load_class();
     $set        = $class->$method($the_request);
 } catch(Exception $e) {
     echo 'No '.$controller.' found for this route',  $e->getMessage(), "\n";
 }
+
 /*
 * Declare all variables if passed in return
 */