Get Database From User

sama20 · sama20 · commit c3674e939524 · 2023-01-12T15:43:46.000+03:30
issue:#12
diff --git a/Readme.md b/Readme.md
@@ -7,8 +7,6 @@ composer require nanvaie/database-repository --dev
 ```
 
 ### Setup Laravel Repository
-Before publishing assets, add `REPOSITORY_PHP_VERSION` variable to `.env` and set it to your version of choosing. Supported values are: 8.0, 7.4 (Default is 8.0).
-
 Then run following command in console to publish necessary assets in your project directory. 
 ```bash
 php artisan vendor:publish vendor:publish --tag=database-repository-config
@@ -30,17 +28,18 @@ Note: Make sure to run `composer dump-autoload` after these changes.
 ## Usage
 List of artisan commands:
 
-| Command                                | Inputs                              | Options            | Description                       |
-|----------------------------------------|-------------------------------------|--------------------|-----------------------------------|
-| `repository:make-entity`               | table_name                          | -f, -d, -k, -g     | Create new Entity                 |
-| `repository:make-enum`                 | table_name                          | -f, -d, -g         | Create new Enum                   |
-| `repository:make-factory`              | table_name                          | -f, -d, -g         | Create new Factory                |
-| `repository:make-resource`             | table_name                          | -f, -d, -k, -g     | Create new Resource               |
-| `repository:make-interface-repository` | table_name                          | -f, -d, -k, -g     | Create new Repository Interface   |
-| `repository:make-repository`           | table_name                          | -f, -d, -k, -g     | Create new Base Repository        |
-| `repository:make-mysql-repository`     | table_name                          | -f, -d, -k, -g     | Create new MySql Repository class |
-| `repository:make-redis-repository`     | table_name                          | -f, -d, -k, -g     | Create new Redis Repository class |
-| `repository:make-all`                  | --table_names=table_names(optional) | -a, -f, -d, -k, -g | Run all of the above commands     |
+| Command                                | Inputs                                                                    | Options            | Description                       |
+|----------------------------------------|---------------------------------------------------------------------------|--------------------|-----------------------------------|
+| `repository:make-entity`               | table_name                                                                | -f, -d, -k, -g     | Create new Entity                 |
+| `repository:make-enum`                 | table_name                                                                | -f, -d, -g         | Create new Enum                   |
+| `repository:make-factory`              | table_name                                                                | -f, -d, -g         | Create new Factory                |
+| `repository:make-resource`             | table_name                                                                | -f, -d, -k, -g     | Create new Resource               |
+| `repository:make-interface-repository` | table_name                                                                | -f, -d, -k, -g     | Create new Repository Interface   |
+| `repository:make-repository`           | table_name, selected_db(optional)                                         | -f, -d, -k, -g     | Create new Base Repository        |
+| `repository:make-mysql-repository`     | table_name                                                                | -f, -d, -k, -g     | Create new MySql Repository class |
+| `repository:make-redis-repository`     | table_name                                                                | -f, -d, -k, -g     | Create new Redis Repository class |
+| `repository:make-all`                  | --table_names=table_names(optional) <br/>--selected_db=database(optional) | -a, -f, -d, -k, -g | Run all of the above commands     |
+
 
 ### Options Explanation
 - `-f|--force`: Force commands to override existing files.
@@ -49,6 +48,7 @@ List of artisan commands:
 - `-g|--add-to-git`: Add created files to git repository.
 - `-a|--all-tables`: Use all existing tables.
 - `--table_names=`: Add table names, separate names with comma.
+- `--selected_db=` : Use between `Mysql`,`Redis`, If it does not send, the value will return from `config/repository.php`
 
 Example 1. Create new Entity for a table named 'users'.
 ```bash
diff --git a/config/repository.php b/config/repository.php
@@ -4,6 +4,8 @@
 
     'php_version' => env('REPOSITORY_PHP_VERSION', '8.0'),
 
+    'default_db' => 'MySql',# Options: ( Redis, MySql )
+
     'path' => [
         'namespace' => [
             'entities' => 'App\Models\Entities',
diff --git a/src/Commands/BaseCommand.php b/src/Commands/BaseCommand.php
@@ -10,6 +10,7 @@
 class BaseCommand extends Command
 {
 //    use CustomMySqlQueries;
+    public string $selectedDb;
     public string $tableName;
     public string $detectForeignKeys;
     public string $entityName;
@@ -36,6 +37,7 @@ class BaseCommand extends Command
 
     public function setArguments()
     {
+        $this->selectedDb = $this->hasArgument('selected_db') && $this->argument('selected_db') ? $this->argument('selected_db') : config('repository.default_db');
         $this->tableName = $this->argument('table_name');
         if ($this->hasOption('foreign-keys')) $this->detectForeignKeys = $this->option('foreign-keys');
         $this->entityName = Str::singular(ucfirst(Str::camel($this->tableName)));
diff --git a/src/Commands/MakeAll.php b/src/Commands/MakeAll.php
@@ -16,6 +16,7 @@ class MakeAll extends Command
      * @var string
      */
     protected $signature = 'repository:make-all
+    {--selected_db= : Main database}
     {--table_names= : Table names, separate names with comma}
     {--k|foreign-keys : Detect foreign keys}
     {--d|delete : Delete resource}
@@ -35,6 +36,7 @@ class MakeAll extends Command
      */
     public function handle()
     {
+        $this->selectedDb = $this->hasOption('selected_db') && $this->option('selected_db') ? $this->option('selected_db') : config('repository.default_db');
         $force = $this->option('force');
         $delete = $this->option('delete');
         $detectForeignKeys = $this->option('foreign-keys');
@@ -65,7 +67,7 @@ public function handle()
             $this->call('repository:make-interface-repository', $arguments);
             $this->call('repository:make-mysql-repository', $arguments);
             $this->call('repository:make-redis-repository', $arguments);
-            $this->call('repository:make-repository', $arguments);
+            $this->call('repository:make-repository', [...$arguments,'selected_db'=>$this->selectedDb]);
         }
     }
 }
diff --git a/src/Commands/MakeRepository.php b/src/Commands/MakeRepository.php
@@ -15,7 +15,7 @@ class MakeRepository extends BaseCommand
      *
      * @var string
      */
-    protected $signature = 'repository:make-repository {table_name}
+    protected $signature = 'repository:make-repository {table_name} {selected_db?}
     {--k|foreign-keys : Detect foreign keys}
     {--d|delete : Delete resource}
     {--f|force : Override/Delete existing repository class}
@@ -38,9 +38,11 @@ class MakeRepository extends BaseCommand
     public function handle(): void
     {
         $this->setArguments();
+//        dd($this->selectedDb);
         $repositoryName = $this->entityName.'Repository';
-        $sqlRepositoryName = 'MySql'.$this->entityName.'Repository';
-        $sqlRepositoryVariable = 'mysqlRepository';
+//        $sqlRepositoryName = 'MySql'.$this->entityName.'Repository';
+        $sqlRepositoryName = ucwords($this->selectedDb).$this->entityName.'Repository';
+        $sqlRepositoryVariable = 'repository';
         $relativeRepositoryPath = config('repository.path.relative.repositories') . "$this->entityName" . DIRECTORY_SEPARATOR;
         $repositoryStubsPath = __DIR__ . '/../../' . config('repository.path.stub.repositories.base');
         $filenameWithPath = $relativeRepositoryPath . $repositoryName . '.php';
@@ -64,7 +66,8 @@ public function handle(): void
             $this->entityNamespace,
             $repositoryName,
             $this->interfaceName,
-            $this->repositoryNamespace
+            $this->repositoryNamespace,
+            $this->selectedDb
         );
         $creator = new BaseCreator($RepoCreator);
         $baseContent = $creator->createClass($filenameWithPath,$this);
diff --git a/src/Creators/CreatorRedisRepository.php b/src/Creators/CreatorRedisRepository.php
@@ -26,7 +26,7 @@ public function getClassName(): string
     }
     public function getExtendSection(): string
     {
-        return "extends RedisRepository";
+        return "extends RedisRepository implements IUserRepository";
     }
     public function createAttributs(): array
     {
diff --git a/src/Creators/CreatorRepository.php b/src/Creators/CreatorRepository.php
@@ -2,6 +2,7 @@
 
 namespace Nanvaie\DatabaseRepository\Creators;
 
+use App\Models\Repositories\User\IUserRepository;
 use Illuminate\Support\Collection;
 use Nanvaie\DatabaseRepository\CustomMySqlQueries;
 use Illuminate\Support\Str;
@@ -20,7 +21,8 @@ public function __construct(
         public string     $entityNamespace,
         public string     $repositoryName,
         public string     $interfaceName,
-        public string     $repositoryNamespace
+        public string     $repositoryNamespace,
+        public string     $selectedDb
     )
     {
     }
@@ -82,7 +84,7 @@ public function createAttributs(): array
     {
         $attributeSqlStub = file_get_contents($this->repositoryStubsPath . 'attribute.sql.stub');
         $attributes = [];
-        $attributes[$this->sqlRepositoryVariable] = $this->writeSqlAttribute($attributeSqlStub, $this->sqlRepositoryVariable, $this->sqlRepositoryName);
+        $attributes['repository'] = 'private IUserRepository $repository;';
         return $attributes;
     }
 
@@ -133,8 +135,6 @@ public function createFunctions(): array
 
     public function getConstruct(string $setterSqlStub, string $constructStub)
     {
-        $setters = '';
-        $setters = substr_replace($setters,$this->writeSqlAttribute($setterSqlStub, $this->sqlRepositoryVariable, $this->sqlRepositoryName),-1, 0);
-        return str_replace("{{ Setters }}", $setters, $constructStub);
+        return str_replace("{{ Setters }}", $this->writeSqlAttribute($setterSqlStub, $this->sqlRepositoryVariable, $this->sqlRepositoryName), $constructStub);
     }
 }
diff --git a/stubs/Repositories/Base/base.construct.stub b/stubs/Repositories/Base/base.construct.stub
@@ -1,5 +1,4 @@
 
     public function __construct()
 	{
-{{ Setters }}
-	}
+{{ Setters }}	}
diff --git a/stubs/Repositories/Base/base.setter.sql.stub b/stubs/Repositories/Base/base.setter.sql.stub
@@ -1 +1 @@
-        $this->{{ SqlRepositoryVariable }} = new {{ SqlRepositoryName }}();
+        $this->{{ SqlRepositoryVariable }} = new {{ SqlRepositoryName }}();
diff --git a/stubs/Repositories/Mysql/mysql.create.stub b/stubs/Repositories/Mysql/mysql.create.stub
@@ -1,4 +1,5 @@
-public function create({{ EntityName }} ${{ EntityVariableName }}): {{ EntityName }}
+
+    public function create({{ EntityName }} ${{ EntityVariableName }}): {{ EntityName }}
 	{
 {{ SetterFunctions }}
 
diff --git a/stubs/Repositories/Mysql/mysql.getAllBy.stub b/stubs/Repositories/Mysql/mysql.getAllBy.stub
@@ -1,7 +1,4 @@
 
-    /**
-    * This action has been created because '{{ FunctionName }}' exists in foreign keys or indexes
-    */
 	public function getAllBy{{ FunctionNamePlural }}(array ${{ AttributeNamePlural }}): Collection
 	{
 		${{ EntityVariableName }} = $this->newQuery()
diff --git a/stubs/Repositories/Mysql/mysql.getOneBy.stub b/stubs/Repositories/Mysql/mysql.getOneBy.stub
@@ -1,7 +1,4 @@
 
-    /**
-    * This action has been created because '{{ FunctionName }}' exists in foreign keys or indexes
-    */
 	public function getOneBy{{ FunctionName }}(int ${{ AttributeName }}): null|{{ EntityName }}
 	{
 		${{ EntityVariableName }} = $this->newQuery()

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`class BaseCommand extends Command`
`11`	`11`	`{`
`12`	`12`	`// use CustomMySqlQueries;`
	`13`	`+ public string $selectedDb;`
`13`	`14`	`public string $tableName;`
`14`	`15`	`public string $detectForeignKeys;`
`15`	`16`	`public string $entityName;`
`@@ -36,6 +37,7 @@ class BaseCommand extends Command`
`36`	`37`
`37`	`38`	`public function setArguments()`
`38`	`39`	`{`
	`40`	`+ $this->selectedDb = $this->hasArgument('selected_db') && $this->argument('selected_db') ? $this->argument('selected_db') : config('repository.default_db');`
`39`	`41`	`$this->tableName = $this->argument('table_name');`
`40`	`42`	`if ($this->hasOption('foreign-keys')) $this->detectForeignKeys = $this->option('foreign-keys');`
`41`	`43`	`$this->entityName = Str::singular(ucfirst(Str::camel($this->tableName)));`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ class MakeAll extends Command`
`16`	`16`	`* @var string`
`17`	`17`	`*/`
`18`	`18`	`protected $signature = 'repository:make-all`
	`19`	`+ {--selected_db= : Main database}`
`19`	`20`	`{--table_names= : Table names, separate names with comma}`
`20`	`21`	`{--k\|foreign-keys : Detect foreign keys}`
`21`	`22`	`{--d\|delete : Delete resource}`
`@@ -35,6 +36,7 @@ class MakeAll extends Command`
`35`	`36`	`*/`
`36`	`37`	`public function handle()`
`37`	`38`	`{`
	`39`	`+ $this->selectedDb = $this->hasOption('selected_db') && $this->option('selected_db') ? $this->option('selected_db') : config('repository.default_db');`
`38`	`40`	`$force = $this->option('force');`
`39`	`41`	`$delete = $this->option('delete');`
`40`	`42`	`$detectForeignKeys = $this->option('foreign-keys');`
`@@ -65,7 +67,7 @@ public function handle()`
`65`	`67`	`$this->call('repository:make-interface-repository', $arguments);`
`66`	`68`	`$this->call('repository:make-mysql-repository', $arguments);`
`67`	`69`	`$this->call('repository:make-redis-repository', $arguments);`
`68`		`- $this->call('repository:make-repository', $arguments);`
	`70`	`+ $this->call('repository:make-repository', [...$arguments,'selected_db'=>$this->selectedDb]);`
`69`	`71`	`}`
`70`	`72`	`}`
`71`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function getClassName(): string`
`26`	`26`	`}`
`27`	`27`	`public function getExtendSection(): string`
`28`	`28`	`{`
`29`		`- return "extends RedisRepository";`
	`29`	`+ return "extends RedisRepository implements IUserRepository";`
`30`	`30`	`}`
`31`	`31`	`public function createAttributs(): array`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Nanvaie\DatabaseRepository\Creators;`
`4`	`4`
	`5`	`+use App\Models\Repositories\User\IUserRepository;`
`5`	`6`	`use Illuminate\Support\Collection;`
`6`	`7`	`use Nanvaie\DatabaseRepository\CustomMySqlQueries;`
`7`	`8`	`use Illuminate\Support\Str;`
`@@ -20,7 +21,8 @@ public function __construct(`
`20`	`21`	`public string $entityNamespace,`
`21`	`22`	`public string $repositoryName,`
`22`	`23`	`public string $interfaceName,`
`23`		`- public string $repositoryNamespace`
	`24`	`+ public string $repositoryNamespace,`
	`25`	`+ public string $selectedDb`
`24`	`26`	`)`
`25`	`27`	`{`
`26`	`28`	`}`
`@@ -82,7 +84,7 @@ public function createAttributs(): array`
`82`	`84`	`{`
`83`	`85`	`$attributeSqlStub = file_get_contents($this->repositoryStubsPath . 'attribute.sql.stub');`
`84`	`86`	`$attributes = [];`
`85`		`- $attributes[$this->sqlRepositoryVariable] = $this->writeSqlAttribute($attributeSqlStub, $this->sqlRepositoryVariable, $this->sqlRepositoryName);`
	`87`	`+ $attributes['repository'] = 'private IUserRepository $repository;';`
`86`	`88`	`return $attributes;`
`87`	`89`	`}`
`88`	`90`
`@@ -133,8 +135,6 @@ public function createFunctions(): array`
`133`	`135`
`134`	`136`	`public function getConstruct(string $setterSqlStub, string $constructStub)`
`135`	`137`	`{`
`136`		`- $setters = '';`
`137`		`- $setters = substr_replace($setters,$this->writeSqlAttribute($setterSqlStub, $this->sqlRepositoryVariable, $this->sqlRepositoryName),-1, 0);`
`138`		`- return str_replace("{{ Setters }}", $setters, $constructStub);`
	`138`	`+ return str_replace("{{ Setters }}", $this->writeSqlAttribute($setterSqlStub, $this->sqlRepositoryVariable, $this->sqlRepositoryName), $constructStub);`
`139`	`139`	`}`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`
`2`	`2`	`public function __construct()`
`3`	`3`	`{`
`4`		`-{{ Setters }}`
`5`		`- }`
	`4`	`+{{ Setters }} }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`- $this->{{ SqlRepositoryVariable }} = new {{ SqlRepositoryName }}();`
	`1`	`+ $this->{{ SqlRepositoryVariable }} = new {{ SqlRepositoryName }}();`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-public function create({{ EntityName }} ${{ EntityVariableName }}): {{ EntityName }}`
	`1`	`+`
	`2`	`+ public function create({{ EntityName }} ${{ EntityVariableName }}): {{ EntityName }}`
`2`	`3`	`{`
`3`	`4`	`{{ SetterFunctions }}`
`4`	`5`