Feature/multiple hosts #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

BadChoice wants to merge 31 commits into BadChoice:master from revosystems:feature/multiple-hosts

composer.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,10 +3,9 @@ @@
         "description": "Easy form builder from array",
         "require": {
             "php": "^8.1",
-            "khill/fontawesomephp": "^2.0",
             "goodby/csv": "1.2.0",
             "laravelcollective/html": "^6.1",
-            "laravel/framework": "8.x",
+            "laravel/framework": "8.x|9.x|10.x",
             "laravel/helpers": "^1.2"
         },
         "authors": [
@@ Expand Down @@

composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

config/tenants.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,10 @@ @@
         "DB_USERNAME"       => env('DB_USERNAME'    ,'root'),
         "DB_PASSWORD"       => env('DB_PASSWORD'    ,''),
+        'db' => [
+            'connection' => env('DB_AUTH_CONNECTION', 'mysql'),
+        ],
         "migration_paths" => [
             "database/migrations/tenants",
             "database/migrations/tenants/stocks",
@@ Expand All / @@ -15,4 +19,4 @@ @@
             TenantConfigSeeder::class,
             TenantProductsSeeder::class,
         ],
-    ];
+    ];

src/GrogServiceProvider.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     use Collective\Html\HtmlServiceProvider;
     use Illuminate\Support\ServiceProvider;
     use Illuminate\Foundation\AliasLoader;
-    use Khill\FontAwesome\Laravel\FontAwesomeServiceProvider;
     class GrogServiceProvider extends ServiceProvider
     {
@@ Expand Down Expand Up / @@ -32,6 +31,6 @@ public function boot(){ @@
         public function register(){
             $this->app->register(HtmlServiceProvider::class);
-            $this->app->register(FontAwesomeServiceProvider::class);
+            $this->mergeConfigFrom(__DIR__ . '/../config/tenants.php', 'tenants');
         }
     }

src/Helpers/Helpers.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     use BadChoice\Grog\Services\RVConnection;
     use Illuminate\Support\Facades\App;
     use Illuminate\Support\Facades\Config;
+    use BadChoice\Grog\Services\ProvidesDatabaseConnection;
     /**
      * Creates a connection for the database of the $user
      * the name of the connection will be 'RevoRetail_{$user}'
@@ Expand All / @@ -13,8 +13,15 @@ @@
      * @param $shouldConnect
      * @param bool $reports true to connect to the read only database insatance
      */
-    function createDBConnection($user, $shouldConnect = false, $reports = false) {
-        (new RVConnection($user))->useReportsDatabase($reports)->create($shouldConnect);
+    function createDBConnection(string|ProvidesDatabaseConnection $object, $shouldConnect = false, $reports = false) {
+        if (is_string($object) && RVConnection::$provider) {
+            $object = RVConnection::$provider::databaseConnectionProviderByName($object);
+        }
+        return (new RVConnection($object instanceof ProvidesDatabaseConnection ? $object->getDatabaseName() : $object))
+            ->atInstance($object instanceof ProvidesDatabaseConnection ? $object->getDatabaseInstance() : null)
+            ->useReportsDatabase($reports)
+            ->create($shouldConnect);
     }
     /**
@@ Expand Down @@

src/Services/ProvidesDatabaseConnection.php

-Original file line number
+Diff line change
@@ -0,0 +1,10 @@
+    <?php
+    namespace BadChoice\Grog\Services;
+    interface ProvidesDatabaseConnection
+    {
+        public function getDatabaseInstance() : ?string;
+        public function getDatabaseName(): string;
+        static function databaseConnectionProviderByName($string) : ?ProvidesDatabaseConnection;
+    }

src/Services/RVConnection.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,9 +8,12 @@ @@
     class RVConnection {
-        protected $useReportsDatabase   = false;
-        protected $databaseName;
-        protected $connectionName;
+        static ?string $provider;
+        protected bool $useReportsDatabase   = false;
+        protected string $databaseName;
+        protected string $connectionName;
+        protected ?string $dbInstance;
         public function __construct($database)
         {
@@ Expand All @@
             return $this;
         }
+        public function atInstance(?string $instanceName) {
+            $this->dbInstance = $instanceName;
+            return $this;
+        }
         private function getDatabase(){
             $prefix = config('tenants.DB_TENANTS_PREFIX');
             return App::environment('testing') ? config('database.connections.'.config('database.default').'.database', ':memory:') : $prefix.$this->databaseName;
@@ Expand Down Expand Up / @@ -70,6 +78,9 @@ protected function getUsername() { @@
         }
         protected function getHost() {
+            if ($this->dbInstance) {
+                return config('tenants.DB_INSTANCES.'.$this->dbInstance . '.' . ($this->useReportsDatabase ? 'reports' : 'main'));
+            }
             return ($this->useReportsDatabase) ? config('tenants.DB_REPORTS_HOST') : config('tenants.DB_HOST');
         }
@@ Expand Down @@

src/Services/ResourceRoute.php

-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ public static function link_to_edit($object) @@
         public static function link_to_delete($object)
         {
-            return link_to(route(object_route($object) . '.destroy', $object->id), '', ['id' => $object->id, 'class' => 'delete-resource', 'data-delete' => 'confirm resource']) ;
+            return link_to(route(object_route($object) . '.destroy', $object->id), '', ['id' => $object->id, 'class' => 'delete-resource', 'data-delete' => 'confirm resource', 'confirm-message' => __('admin.confirmDelete')]) ;
         }
         public static function route_to_update()
@@ Expand Down @@

src/Traits/AuthConnectionTrait.php

-Original file line number
+Diff line change
@@ -1,7 +1,11 @@
-    <?php namespace BadChoice\Grog\Traits;
+    <?php
-    trait AuthConnectionTrait{
-        public function getConnectionName(){
-            return env('DB_AUTH_CONNECTION','mysql');
+    namespace BadChoice\Grog\Traits;
+    trait AuthConnectionTrait
+    {
+        public function getConnectionName()
+        {
+            return config('tenants.db.connection');
         }
-    }
+    }

src/Traits/SaveNestedTrait.php

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,52 +1,75 @@
  
    <?php namespace BadChoice\Grog\Traits;

    <?php

    namespace BadChoice\Grog\Traits;

    use Illuminate\Database\Eloquent\Relations\MorphOneOrMany;

    use Illuminate\Database\Eloquent\Relations\Relation;

    /**

     * Class SaveNestedTrait

     * @package BadChoice\Grog\Traits

     */

    trait SaveNestedTrait{

        public static function saveNested(array $nestedArray, $createIfNotFound = false)

    trait SaveNestedTrait

    {

        public static function saveNested(array $nestedArray, bool $createIfNotFound = false)

        {

            $toSaveNested = [];

            foreach ($nestedArray as $key => $value) {

                if (static::isKeyARelation($key) ) {

                    if($value != null) {

                        $toSaveNested[$key] = $value;

            foreach ($nestedArray as $relationMethodName => $value) {

                if (static::isARelationMethod($relationMethodName)) {

                    if ($value != null) {

                        $toSaveNested[$relationMethodName] = $value;

                    }

                    unset($nestedArray[$key]);

                    unset($nestedArray[$relationMethodName]);

                }

            }

            if (isset($nestedArray['id']) && $nestedArray['id']) {

                $object = static::find($nestedArray['id']);

                if($object)                 $object->update($nestedArray);

                else if($createIfNotFound)  $object = static::create($nestedArray);

                if ($object = static::find($nestedArray['id'])) {

                    $object->update($nestedArray);

                } else if ($createIfNotFound) {

                    $object = static::withTrashed()->updateOrCreate([

                        'id' => $nestedArray['id'],

                    ], [

                        'deleted_at' => null,

                        ...$nestedArray

                    ]);

                }

            } else {

                $object = static::create($nestedArray);

            }

            foreach ($toSaveNested as $key => $array) {

                $relatedModel = $object->$key()->getRelated();

                $foreignKey   = $object->$key()->getForeignKeyName();

            foreach ($toSaveNested as $relationMethodName => $contents) {

                $relation = $object->$relationMethodName();

                $relatedModel = $relation->getRelated();

                $foreignKey = $relation->getForeignKeyName();

                $foreignKeyType = $relation instanceof MorphOneOrMany

                    ? $relation->getMorphType()

                    : null;

                $contents = is_array($contents) ? $contents : [$contents];

                if(is_array($array)) {

                    foreach ($array as $content) {

                        $content->$foreignKey = $object->id;

                        $relatedModel::saveNested((array)$content, $createIfNotFound);

                    }

                if (static::isAnOverwritableMethodRelation($relationMethodName)) {

                    $object->$relationMethodName()->delete();

                }

                else{

                    $array->$foreignKey = $object->id;

                    $relatedModel::saveNested((array)$array, $createIfNotFound);

                foreach ($contents as $content) {

                    $content->$foreignKey = $object->id;

                    if ($foreignKeyType) {

                        $content->$foreignKeyType = get_class($object);

                    }

                    $relatedModel::saveNested((array) $content, $createIfNotFound);

                }

            }

            return $object;

        }

        public static function isKeyARelation($key){

        public static function isARelationMethod(string $relationMethodName): bool

        {

            $object = new static();

            return  method_exists($object, $relationMethodName) && ($object->$relationMethodName() instanceof Relation);

        }

        public static function isAnOverwritableMethodRelation(string $relationMethodName): bool

        {

            $object = new static();

            return  method_exists( $object, $key) && ($object->$key() instanceof Relation);

            return in_array($relationMethodName, $object->overwritableRelations ?? []);

        }

    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/multiple hosts #27

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Feature/multiple hosts #27

Are you sure you want to change the base?

Uh oh!

Feature/multiple hosts #27

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!