[3.x] Refactor ServiceConfig::class.

src/Console/Commands/OrchestrateProvider.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
-use Payavel\Orchestration\Fluent\ServiceConfig;
+use Payavel\Orchestration\ServiceConfig;
 use Payavel\Orchestration\Traits\AsksQuestions;
 use Payavel\Orchestration\Traits\GeneratesFiles;
 
@@ -39,7 +39,7 @@ class OrchestrateProvider extends Command
     /**
      * The provider's service config.
      *
-     * @var \Payavel\Orchestration\Fluent\ServiceConfig
+     * @var \Payavel\Orchestration\ServiceConfig
      */
     protected $serviceConfig;
 
@@ -144,13 +144,13 @@ protected function setService()
             error("Service with id {$this->option('service')} does not exist.");
 
             return false;
-        } elseif (! isset($serviceConfig) && ($existingConfigs = ServiceConfig::all())->isNotEmpty()) {
-            $id = select(
+        } elseif (! isset($serviceConfig) && ($serviceConfigs = ServiceConfig::all())->isNotEmpty()) {
+            $index = select(
                 label: 'Which service will the provider be offering?',
-                options: $existingConfigs->map(fn ($existingConfig) => $existingConfig->id)->all()
+                options: $serviceConfigs->map(fn ($serviceConfig) => $serviceConfig->id)->all()
             );
 
-            $serviceConfig = $existingConfigs->all()[$id];
+            $serviceConfig = $serviceConfigs->get($index);
         }
 
         if (! isset($serviceConfig)) {

src/Console/Commands/OrchestrateService.php

@@ -5,7 +5,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Str;
-use Payavel\Orchestration\Fluent\ServiceConfig;
+use Payavel\Orchestration\ServiceConfig;
 use Payavel\Orchestration\Traits\AsksQuestions;
 use Payavel\Orchestration\Traits\GeneratesFiles;
 
@@ -39,7 +39,7 @@ class OrchestrateService extends Command
     /**
      * The service config.
      *
-     * @var \Payavel\Orchestration\Fluent\ServiceConfig
+     * @var \Payavel\Orchestration\ServiceConfig
      */
     protected $serviceConfig;
 
@@ -163,10 +163,12 @@ protected function generateProviders()
      */
     protected function setServiceConfig()
     {
-        $this->serviceConfig = new ServiceConfig([
-            'name' => $name = trim($this->argument('service') ?? $this->askName('service')),
-            'id' => $this->option('id') ?? $this->askId('service', $name),
-        ]);
+        $name = trim($this->argument('service') ?? $this->askName('service'));
+        $id = $this->option('id') ?? $this->askId('service', $name);
+
+        Config::set("orchestration.services.{$id}", Str::slug($id));
+
+        $this->serviceConfig = tap(ServiceConfig::find($id), fn ($serviceConfig) => $serviceConfig->set('name', $name));
     }
 
     /**
@@ -251,8 +253,6 @@ protected function setAccounts()
      */
     protected function makeSureOrchestraIsReady()
     {
-        Config::set("orchestration.services.{$this->serviceConfig->id}", Str::slug($this->serviceConfig->id));
-
         if (file_exists(config_path('orchestration.php'))) {
             return;
         }

src/Drivers/ConfigDriver.php

@@ -10,7 +10,7 @@
 use Payavel\Orchestration\Contracts\Providable;
 use Payavel\Orchestration\Fluent\Account;
 use Payavel\Orchestration\Fluent\Provider;
-use Payavel\Orchestration\Fluent\ServiceConfig;
+use Payavel\Orchestration\ServiceConfig;
 use Payavel\Orchestration\ServiceDriver;
 use Payavel\Orchestration\Traits\GeneratesFiles;
 
@@ -169,7 +169,7 @@ public function resolveGateway(Providable $provider, Accountable $account)
     /**
      * Generate the service skeleton based on the current driver.
      *
-     * @param \Payavel\Orchestration\Fluent\ServiceConfig $serviceConfig
+     * @param \Payavel\Orchestration\ServiceConfig $serviceConfig
      * @param \Illuminate\Support\Collection $providers
      * @param \Illuminate\Support\Collection $accounts
      * @param array $defaults

src/Drivers/DatabaseDriver.php

@@ -10,9 +10,9 @@
 use Illuminate\Support\Str;
 use Payavel\Orchestration\Contracts\Accountable;
 use Payavel\Orchestration\Contracts\Providable;
-use Payavel\Orchestration\Fluent\ServiceConfig;
 use Payavel\Orchestration\Models\Account;
 use Payavel\Orchestration\Models\Provider;
+use Payavel\Orchestration\ServiceConfig;
 use Payavel\Orchestration\ServiceDriver;
 use Payavel\Orchestration\Traits\GeneratesFiles;
 
@@ -123,7 +123,7 @@ public function resolveGateway(Providable $provider, Accountable $account)
         $this->check($provider, $account);
 
         $gateway = $this->serviceConfig->get('test_mode')
-            ? $this->serviceConfig->test_gateway
+            ? $this->serviceConfig->get('test_gateway')
             : $provider->gateway;
 
         if (! class_exists($gateway)) {
@@ -140,7 +140,7 @@ public function resolveGateway(Providable $provider, Accountable $account)
     /**
      * Generate the service skeleton based on the current driver.
      *
-     * @param \Payavel\Orchestration\Fluent\ServiceConfig $serviceConfig
+     * @param \Payavel\Orchestration\ServiceConfig $serviceConfig
      * @param \Illuminate\Support\Collection $providers
      * @param \Illuminate\Support\Collection $accounts
      * @param array $defaults

src/Fluent/Account.php

@@ -2,16 +2,16 @@
 
 namespace Payavel\Orchestration\Fluent;
 
-use Illuminate\Support\Collection;
 use Illuminate\Support\Fluent;
 use Payavel\Orchestration\Contracts\Accountable;
+use Payavel\Orchestration\ServiceConfig;
 
 class Account extends Fluent implements Accountable
 {
     /**
      * The service config.
      *
-     * @var \Payavel\Orchestration\Fluent\ServiceConfig
+     * @var \Payavel\Orchestration\ServiceConfig
      */
     private ServiceConfig $serviceConfig;
 

src/Fluent/Provider.php

@@ -4,13 +4,14 @@
 
 use Illuminate\Support\Fluent;
 use Payavel\Orchestration\Contracts\Providable;
+use Payavel\Orchestration\ServiceConfig;
 
 class Provider extends Fluent implements Providable
 {
     /**
      * The service config.
      *
-     * @var \Payavel\Orchestration\Fluent\ServiceConfig
+     * @var \Payavel\Orchestration\ServiceConfig
      */
     public ServiceConfig $serviceConfig;
 

src/Models/Account.php

@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 use Payavel\Orchestration\Contracts\Accountable;
-use Payavel\Orchestration\Fluent\ServiceConfig;
+use Payavel\Orchestration\ServiceConfig;
 use Payavel\Orchestration\Traits\HasFactory;
 
 class Account extends Model implements Accountable
@@ -29,7 +29,7 @@ class Account extends Model implements Accountable
     /**
      * The service config.
      *
-     * @var \Payavel\Orchestration\Fluent\ServiceConfig
+     * @var \Payavel\Orchestration\ServiceConfig
      */
     private ServiceConfig $serviceConfig;
 

src/Models/Provider.php

@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 use Payavel\Orchestration\Contracts\Providable;
-use Payavel\Orchestration\Fluent\ServiceConfig;
+use Payavel\Orchestration\ServiceConfig;
 use Payavel\Orchestration\Traits\HasFactory;
 
 class Provider extends Model implements Providable
@@ -29,7 +29,7 @@ class Provider extends Model implements Providable
     /**
      * The service config.
      *
-     * @var \Payavel\Orchestration\Fluent\ServiceConfig
+     * @var \Payavel\Orchestration\ServiceConfig
      */
     private ServiceConfig $serviceConfig;
 

src/Service.php

@@ -3,7 +3,7 @@
 namespace Payavel\Orchestration;
 
 use Exception;
-use Payavel\Orchestration\Fluent\ServiceConfig;
+use Payavel\Orchestration\ServiceConfig;
 use Payavel\Orchestration\Traits\SimulatesAttributes;
 
 class Service
@@ -13,7 +13,7 @@ class Service
     /**
      * The service config.
      *
-     * @var \Payavel\Orchestration\Fluent\ServiceConfig
+     * @var \Payavel\Orchestration\ServiceConfig
      */
     private $config;
 
@@ -48,7 +48,7 @@ class Service
     /**
      * Sets the service config and the driver for it.
      *
-     * @param \Payavel\Orchestration\Fluent\ServiceConfig|string|int $serviceConfig
+     * @param \Payavel\Orchestration\ServiceConfig|string|int $serviceConfig
      * @return void
      *
      * @throws Exception