Better handling of provider creation for social and ticket providers

Author: mintopia

app/Services/SocialProviders/AbstractSocialProvider.php

@@ -60,32 +60,26 @@ public function configMapping(): array
 
     public function install(): SocialProvider
     {
-        if ($this->provider) {
-            return $this->provider;
-        }
-
-        $provider = SocialProvider::whereCode($this->code)->first();
-        $this->provider = $provider;
-        if ($provider) {
-            return $provider;
-        }
-
-        $provider = new SocialProvider();
-        $provider->name = $this->name;
-        $provider->code = $this->code;
-        $provider->provider_class = get_called_class();
-        $provider->supports_auth = $this->supportsAuth;
-        $provider->enabled = false;
-        $provider->auth_enabled = false;
-        $provider->can_be_renamed = $this->canBeRenamed;
+        $this->provider = SocialProvider::whereCode($this->code)->first();
+        if (!$this->provider) {
+            $provider = new SocialProvider();
+            $this->provider = $provider;
+            $provider->name = $this->name;
+            $provider->code = $this->code;
+            $provider->provider_class = get_called_class();
+            $provider->supports_auth = $this->supportsAuth;
+            $provider->enabled = false;
+            $provider->auth_enabled = false;
+            $provider->can_be_renamed = $this->canBeRenamed;
+
+            DB::transaction(function () use ($provider) {
+                $provider->save();
+                $this->installSettings();
+            });
 
-        DB::transaction(function() use ($provider) {
             $provider->save();
-            $this->installSettings();
-        });
-
-        $provider->save();
-        return $provider;
+        }
+        return $this->provider;
     }
 
     public function installSettings(): void

app/Services/TicketProviders/AbstractTicketProvider.php

@@ -45,10 +45,10 @@ public function configMapping(): array
 
     public function install(): TicketProvider
     {
-        $provider = TicketProvider::whereCode($this->code)->first();
-        $this->provider = $provider;
-        if (!$provider) {
+        $this->provider = TicketProvider::whereCode($this->code)->first();
+        if (!$this->provider) {
             $provider = new TicketProvider();
+            $this->provider = $provider;
             $provider->name = $this->name;
             $provider->code = $this->code;
             $provider->provider_class = get_called_class();
@@ -59,7 +59,7 @@ public function install(): TicketProvider
                 $this->installSettings();
             });
         }
-        return $provider;
+        return $this->provider;
     }
 
     public function installSettings(): void