Merge pull request #102 from H2-invent/feature/changeOrderOfServers

first individual Server

src/Service/ServerUserManagment.php

@@ -28,12 +28,7 @@ public function getServersFromUser(User $user)
         $servers = array();
         //here we add theserver which is directed connected to a user
         $servers = $user->getServers()->toArray();
-        $default = $this->em->getRepository(Server::class)->find($this->parameter->get('default_jitsi_server_id'));
 
-        //here we add the default group which is set in the env
-        if ($default && !in_array($default, $servers)) {
-            $servers[] = $default;
-        }
 
         // here we add the servers from thekeycloak group
         if ($user->getGroups()) {
@@ -55,6 +50,12 @@ public function getServersFromUser(User $user)
             }
         }
 
+        $default = $this->em->getRepository(Server::class)->find($this->parameter->get('default_jitsi_server_id'));
+        //here we add the default group which is set in the env
+        if ($default && !in_array($default, $servers)) {
+            $servers[] = $default;
+        }
+
         return $servers;
     }
 }