From a3c38a27c70c71b521f65370ec87c34d10eaa3ac Mon Sep 17 00:00:00 2001
From: Michal Sieciechowicz <msieciechowi@quad.com>
Date: Mon, 1 Mar 2021 16:06:02 +0100
Subject: [PATCH] fixes

---
 app/Model/Job.php       | 17 +++++++----------
 app/Query/IJobQuery.php |  2 +-
 app/Query/JobQuery.php  |  4 ++--
 composer.json           |  5 +++--
 src/Fufle/ORM/Model.php | 33 +++++++++++++++++++--------------
 src/Fufle/ORM/Query.php |  6 ++++--
 tests/ModelTests.php    | 12 ++++++------
 7 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/app/Model/Job.php b/app/Model/Job.php
index 911d4b7..391ffc3 100644
--- a/app/Model/Job.php
+++ b/app/Model/Job.php
@@ -1,22 +1,19 @@
 <?php
 
-namespace App\Model;
+namespace Fufle\Demo\Model;
 
-use App\Query\IJobQuery;
-use App\Query\JobQuery;
+use Fufle\Demo\Query\IJobQuery;
+use Fufle\Demo\Query\JobQuery;
 use Fufle\ORM\Model as BaseModel;
 
 class Job extends BaseModel {
-    //private string $table = 'jobs';
-    //protected static ?IJobQuery $query;
     public int $id;
     public float $budget;
-    public static function Initialize() {
-        if (static::$query === null) {
-            static::$query = new JobQuery(self::class);
-        }
+    public static function QueryModel() {
+        return new JobQuery( static::class );
     }
+
     public static function GetLast10() {
-        return self::QueryAll(self::$query->GetLast10());
+        return self::QueryAll(self::QueryModel()->GetLast10());
     }
 }
\ No newline at end of file
diff --git a/app/Query/IJobQuery.php b/app/Query/IJobQuery.php
index ea0fb0b..6b44286 100644
--- a/app/Query/IJobQuery.php
+++ b/app/Query/IJobQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Query;
+namespace Fufle\Demo\Query;
 
 use Fufle\ORM\IQuery as IBaseQuery;
 
diff --git a/app/Query/JobQuery.php b/app/Query/JobQuery.php
index 6141762..8f064e9 100644
--- a/app/Query/JobQuery.php
+++ b/app/Query/JobQuery.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Query;
+namespace Fufle\Demo\Query;
 
-use App\Query\IJobQuery;
+use Fufle\Demo\Query\IJobQuery;
 use Fufle\ORM\Query as BaseQuery;
 
 class JobQuery extends BaseQuery implements IJobQuery {
diff --git a/composer.json b/composer.json
index 13d2057..5d26955 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "Fufle/SiBase2",
+    "name": "fufle/sibase2",
     "description": "MicroORM for php8",
     "type": "orm",
     "require": {
@@ -16,7 +16,8 @@
     "minimum-stability": "dev",
     "autoload": {
         "psr-4": {
-            "Fufle\\": "src/Fufle/"
+            "Fufle\\": "src/Fufle/",
+            "Fufle\\Demo\\": "app/"
         }
     }
 }
diff --git a/src/Fufle/ORM/Model.php b/src/Fufle/ORM/Model.php
index 4ceb41d..7418b7a 100644
--- a/src/Fufle/ORM/Model.php
+++ b/src/Fufle/ORM/Model.php
@@ -7,33 +7,40 @@ use Fufle\Database\ConnectionManager;
 abstract class Model {
     protected static string $primaryKey = 'id';
     protected static ?string $table = null;
-    protected static ?IQuery $query = null;
-    
-    public static function getTableName() {
+    private static ?IQuery $query = null;
+
+    protected static function QueryModel() {
+        if (self::$query === null && self::class !== static::class) {
+            self::$query = static::QueryModel();
+        }
+        return self::$query;
+    }
+
+    public static function GetTableName() {
+        if (static::$table === null) {
+            static::$table = basename(str_replace('\\', '/', get_called_class())) . 's';
+        }
         return static::$table;
     }
-    
-    public static function getPrimaryKey() {
+
+    public static function GetPrimaryKey() {
         return static::$primaryKey;
     }
-    
+
     public static function Get(int $id) {
-        self::Check();
         return self::Query(
-            static::$query->Get(),
+            static::QueryModel()->Get(),
             [$id]);
     }
-    
+
     protected static function Query(string $sql, array|object $params = []) {
-        self::Check();
         return ConnectionManager::Query(
             $sql,
             $params,
             get_called_class());
     }
-    
+
     protected static function QueryAll(string $sql, array|object $params = []) {
-        self::Check();
         return ConnectionManager::QueryAll(
             $sql,
             $params,
@@ -46,6 +53,4 @@ abstract class Model {
         }
         static::Initialize();
     }
-    
-    abstract public static function Initialize();
 }
\ No newline at end of file
diff --git a/src/Fufle/ORM/Query.php b/src/Fufle/ORM/Query.php
index 2052a56..a920ebb 100644
--- a/src/Fufle/ORM/Query.php
+++ b/src/Fufle/ORM/Query.php
@@ -4,10 +4,12 @@ namespace Fufle\ORM;
 class Query {
     private string $table;
     private string $primaryKey;
+
     public function __construct(string $model) {
-        $this->table = $model::getTableName();
-        $this->primaryKey = $model::getPrimaryKey();
+        $this->table = $model::GetTableName();
+        $this->primaryKey = $model::GetPrimaryKey();
     }
+
     public function Get(): string {
         return 'SELECT * FROM '.$this->table.' WHERE '.$this->primaryKey.' = ?';
     }
diff --git a/tests/ModelTests.php b/tests/ModelTests.php
index 7510169..962e72a 100644
--- a/tests/ModelTests.php
+++ b/tests/ModelTests.php
@@ -1,19 +1,19 @@
 <?php 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-use App\Model\Job;
+use Fufle\Demo\Model\Job;
 use Fufle\Database\ConnectionManager;
 
-$dns = 'pgsql:host=localhost;port=5432;dbname=dynamic_dev;user=test;password=pass123';
+$dns = 'pgsql:host=localhost;port=5432;dbname=dynamic;user=dynamic;password=password123';
 ConnectionManager::Connect($dns);
 echo "
 
-";
-var_dump(Job::Get(10));
-echo "
-
 ";
 var_dump(Job::GetLast10());
 echo "
 
+";
+var_dump(Job::Get(10));
+echo "
+
 ";
\ No newline at end of file