Remove getServiceConfig from Provider & Account

payavel · Jun 26, 2024 · e2cf082 · e2cf082
1 parent be55e09
commit e2cf082
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 76 deletions.
diff --git a/src/Contracts/Accountable.php b/src/Contracts/Accountable.php
@@ -17,11 +17,4 @@ public function getId();
      * @return string
      */
     public function getName();
-
-    /**
-     * Get the accountable service config.
-     *
-     * @return \Payavel\Orchestration\Fluent\ServiceConfig
-     */
-    public function getServiceConfig();
 }
diff --git a/src/Contracts/Providable.php b/src/Contracts/Providable.php
@@ -17,11 +17,4 @@ public function getId();
      * @return string
      */
     public function getName();
-
-    /**
-     * Get the providable service config.
-     *
-     * @return \Payavel\Orchestration\Fluent\ServiceConfig
-     */
-    public function getServiceConfig();
 }
diff --git a/src/Fluent/Account.php b/src/Fluent/Account.php
@@ -12,7 +12,6 @@ class Account extends Fluent implements Accountable
      * The service config.
      *
      * @var \Payavel\Orchestration\Fluent\ServiceConfig
-     * @var string|int $id
      */
     private ServiceConfig $serviceConfig;
 
@@ -71,14 +70,4 @@ public function getName()
     {
         return $this->attributes['name'] ?? $this->attributes['id'];
     }
-
-    /**
-     * Get the accountable service config.
-     *
-     * @return \Payavel\Orchestration\Fluent\ServiceConfig
-     */
-    public function getServiceConfig()
-    {
-        return $this->serviceConfig;
-    }
 }
diff --git a/src/Fluent/Provider.php b/src/Fluent/Provider.php
@@ -11,7 +11,6 @@ class Provider extends Fluent implements Providable
      * The service config.
      *
      * @var \Payavel\Orchestration\Fluent\ServiceConfig
-     * @var string|int $id
      */
     public ServiceConfig $serviceConfig;
 
@@ -70,14 +69,4 @@ public function getName()
     {
         return $this->attributes['name'] ?? $this->attributes['id'];
     }
-
-    /**
-     * Get the providable service config.
-     *
-     * @return \Payavel\Orchestration\Fluent\ServiceConfig
-     */
-    public function getServiceConfig()
-    {
-        return $this->serviceConfig;
-    }
 }
diff --git a/src/Models/Account.php b/src/Models/Account.php
@@ -26,6 +26,13 @@ class Account extends Model implements Accountable
      */
     protected $guarded = [];
 
+    /**
+     * The service config.
+     *
+     * @var \Payavel\Orchestration\Fluent\ServiceConfig
+     */
+    private ServiceConfig $serviceConfig;
+
     /**
      * Get the accountable id.
      *
@@ -46,16 +53,6 @@ public function getName()
         return $this->name ?? $this->id;
     }
 
-    /**
-     * Get the accountable service config.
-     *
-     * @return \Payavel\Orchestration\Fluent\ServiceConfig
-     */
-    public function getServiceConfig()
-    {
-        return ServiceConfig::find($this->service_id);
-    }
-
     /**
      * Get the account's related providers.
      *
@@ -73,11 +70,15 @@ public function providers()
      */
     private function getProviderModelClass()
     {
-        if(! isset($this->providerModelClass)) {
+        if(!isset($this->providerModelClass)) {
             $this->providerModelClass = $this->guessProviderModelClass();
         }
 
-        return $this->getServiceConfig()->get("models.{$this->providerModelClass}", $this->providerModelClass);
+        if(!isset($this->serviceConfig)) {
+            $this->serviceConfig = ServiceConfig::find($this->service_id);
+        }
+
+        return $this->serviceConfig->get("models.{$this->providerModelClass}", $this->providerModelClass);
     }
 
     /**

diff --git a/src/Models/Provider.php b/src/Models/Provider.php
@@ -26,6 +26,13 @@ class Provider extends Model implements Providable
      */
     protected $guarded = [];
 
+    /**
+     * The service config.
+     *
+     * @var \Payavel\Orchestration\Fluent\ServiceConfig
+     */
+    private ServiceConfig $serviceConfig;
+
     /**
      * Get the providable id.
      *
@@ -46,16 +53,6 @@ public function getName()
         return $this->name ?? $this->id;
     }
 
-    /**
-     * Get the providable service config.
-     *
-     * @return \Payavel\Orchestration\Fluent\ServiceConfig
-     */
-    public function getServiceConfig()
-    {
-        return ServiceConfig::find($this->service_id);
-    }
-
     /**
      * Get the provider's related accounts.
      *
@@ -73,11 +70,15 @@ public function accounts()
      */
     private function getAccountModelClass()
     {
-        if(! isset($this->accountModelClass)) {
+        if(!isset($this->accountModelClass)) {
             $this->accountModelClass = $this->guessAccountModelClass();
         }
 
-        return $this->getServiceConfig()->get("models.{$this->accountModelClass}", $this->accountModelClass);
+        if (!isset($this->serviceConfig)) {
+            $this->serviceConfig = ServiceConfig::find($this->service_id);
+        }
+
+        return $this->serviceConfig->get("models.{$this->accountModelClass}", $this->accountModelClass);
     }
 
 

diff --git a/tests/Feature/Console/TestOrchestrateProviderCommand.php b/tests/Feature/Console/TestOrchestrateProviderCommand.php
@@ -42,19 +42,19 @@ public function orchestrate_provider_command_completes_without_asking_questions_
         $serviceConfig = $this->createServiceConfig();
         $provider = $this->createProvider($serviceConfig);
 
-        $gateway = $this->gatewayPath($provider->getServiceConfig(), $provider);
+        $gateway = $this->gatewayPath($serviceConfig, $provider);
 
         $ds = DIRECTORY_SEPARATOR;
         $this->artisan('orchestrate:provider', [
             'provider' => $provider->getName(),
             '--id' => $provider->getId(),
-            '--service' => $provider->getServiceConfig()->id,
+            '--service' => $serviceConfig->id,
         ])
             ->expectsOutputToContain("Gateway [app{$ds}{$gateway->request}] created successfully.")
             ->expectsOutputToContain("Gateway [app{$ds}{$gateway->response}] created successfully.")
             ->assertSuccessful();
 
-        $this->assertGatewayExists($provider->getServiceConfig(), $provider);
+        $this->assertGatewayExists($serviceConfig, $provider);
     }
 
     #[Test]

diff --git a/tests/Traits/CreatesConfigServiceables.php b/tests/Traits/CreatesConfigServiceables.php
@@ -67,18 +67,6 @@ public function linkAccountToProvider(Accountable $account, Providable $provider
             throw new RuntimeException();
         }
 
-        $serviceConfig = $account->getServiceConfig();
-
-        $providers = [
-            ...$serviceConfig->get('accounts.'.$account->getId().'.providers', []),
-            $provider->getId() => $data,
-        ];
-
-        $account->set('providers', $providers);
-
-        $serviceConfig->set(
-            'accounts.'.$account->id.'.providers',
-            $providers
-        );
+        $account->set('providers.'.$provider->getId(), $data);
     }
 }