chore: inspect commit message guidance

app/Http/Controllers/Api/SentinelController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Jobs\PushServerUpdateJob;
 use App\Models\Server;
 use Exception;
+use Illuminate\Contracts\Cache\LockTimeoutException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Validator;
@@ -119,20 +120,24 @@ class SentinelController extends Controller
         $forceKey = "sentinel:push-force:{$server->id}";
         $lockKey = "sentinel:push-lock:{$server->id}";
 
-        return Cache::lock($lockKey, 10)->block(5, function () use ($hashKey, $forceKey, $hash): bool {
-            $cachedHash = Cache::get($hashKey);
-            $forceActive = Cache::has($forceKey);
+        try {
+            return Cache::lock($lockKey, 10)->block(5, function () use ($hashKey, $forceKey, $hash): bool {
+                $cachedHash = Cache::get($hashKey);
+                $forceActive = Cache::has($forceKey);
 
-            $shouldDispatch = $cachedHash === null || $cachedHash !== $hash || ! $forceActive;
+                $shouldDispatch = $cachedHash === null || $cachedHash !== $hash || ! $forceActive;
 
-            if ($shouldDispatch) {
-                // Day-long TTL bounds memory if a server stops pushing entirely.
-                Cache::put($hashKey, $hash, now()->addDay());
-                Cache::put($forceKey, true, config('constants.sentinel.push_force_interval_seconds', 300));
-            }
+                if ($shouldDispatch) {
+                    // Day-long TTL bounds memory if a server stops pushing entirely.
+                    Cache::put($hashKey, $hash, now()->addDay());
+                    Cache::put($forceKey, true, config('constants.sentinel.push_force_interval_seconds', 300));
+                }
 
-            return $shouldDispatch;
-        });
+                return $shouldDispatch;
+            });
+        } catch (LockTimeoutException) {
+            return false;
+        }
     }
 
     /**

app/Livewire/Project/Shared/Destination.php

@@ -8,7 +8,6 @@ use App\Events\ApplicationStatusChanged;
 use App\Models\Server;
 use App\Models\StandaloneDocker;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -116,17 +115,19 @@ class Destination extends Component
             $network = StandaloneDocker::ownedByCurrentTeam()->where('server_id', $server->id)->findOrFail($network_id);
             $this->authorize('update', $this->resource);
 
-            DB::transaction(function () use ($network, $server) {
+            $this->resource->getConnection()->transaction(function () use ($network, $server) {
                 $main_destination = $this->resource->destination;
                 $this->resource->update([
                     'destination_id' => $network->id,
                     'destination_type' => StandaloneDocker::class,
                 ]);
-                $this->resource->additional_networks()->detach($network->id, ['server_id' => $server->id]);
+                $this->resource->additional_networks()
+                    ->wherePivot('server_id', $server->id)
+                    ->detach($network->id);
                 $this->resource->additional_networks()->attach($main_destination->id, ['server_id' => $main_destination->server->id]);
-                $this->refreshServers();
-                $this->resource->refresh();
             });
+            $this->resource->refresh();
+            $this->refreshServers();
         } catch (\Exception $e) {
             return handleError($e, $this);
         }
@@ -167,7 +168,9 @@ class Destination extends Component
             }
             $server = Server::ownedByCurrentTeam()->findOrFail($server_id);
             StopApplicationOneServer::run($this->resource, $server);
-            $this->resource->additional_networks()->detach($network_id, ['server_id' => $server_id]);
+            $this->resource->additional_networks()
+                ->wherePivot('server_id', $server_id)
+                ->detach($network_id);
             $this->loadData();
             $this->dispatch('refresh');
             ApplicationStatusChanged::dispatch(data_get($this->resource, 'environment.project.team.id'));

app/Models/User.php

@@ -104,6 +104,12 @@ class User extends Authenticatable implements SendsEmail
                 $new_team->forceFill($team);
                 $new_team->save();
 
+                if (! $user->teams()->whereKey($new_team->id)->exists()) {
+                    $user->teams()->attach($new_team, ['role' => 'owner']);
+                } else {
+                    $user->teams()->updateExistingPivot($new_team->id, ['role' => 'owner']);
+                }
+
                 return;
             }