Develop (#408)

* UI part and DB migration.

* fix .clan view not found, enable new 2v2 matching logic

* Added faction policy service.

* Added point system simulation.

* Route for point system simulation.

* Changes according to code review.

* Added default values.

* Fixed counting factions played per month.

* Minor improvements.

* feature/show observers page (#405)

* add a page to view observers

* Update cncnet-api/app/Http/Controllers/AdminController.php

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* include user alias in observers page

* 2v2 match fix

* fix duplicate team member

---------

Co-authored-by: Sneer <forum@snear.de>
Co-authored-by: Sneer-ra2 <116219243+Sneer-ra2@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 3 people

cncnet-api/app/Extensions/Qm/Matchup/TeamMatchupHandler.php

@@ -26,8 +26,11 @@ public function matchup(): void
             return;
         }
 
-        // Fetch all other players in the queue
-        $opponents = $this->quickMatchService->fetchQmQueueEntry($this->history, $this->qmQueueEntry);
+        // Fetch all other players in the queue and exclude current player
+        $opponents = $this->quickMatchService->fetchQmQueueEntry($this->history, $this->qmQueueEntry)
+            ->filter(function($entry) {
+                return $entry->id !== $this->qmQueueEntry->id;
+            })->values();
         $count = $opponents->count() + 1;
         $timeInQueue = $this->qmQueueEntry->secondsinQueue();
         Log::debug("FindOpponent ** inQueue={$playerInQueue}, players in q: {$count}, for ladder={$ladder->abbreviation}, seconds in Queue: {$timeInQueue}");
@@ -39,7 +42,10 @@ public function matchup(): void
         $matchableOpponents = $this->getEntriesInPointRange2v2($this->qmQueueEntry, $matchableOpponents);
 
         $opponentCount = $matchableOpponents->count();
-        Log::debug("FindOpponent ** inQueue={$playerInQueue}, amount of matchable opponent after point filter: {$opponentCount} of {$count}");
+        $matchableNames = $matchableOpponents->map(function($entry) {
+            return $entry->qmPlayer?->player?->username ?? 'Unknown';
+        })->implode(', ');
+        Log::debug("FindOpponent ** inQueue={$playerInQueue}, amount of matchable opponent after point filter: {$opponentCount} of {$count}. Names: [{$matchableNames}]");
 
         // Count the number of players we need to start a match
         // Excluding current player
@@ -74,6 +80,11 @@ public function matchup(): void
         Log::debug("Team A (" . $teamAPlayers->count() . "): " . $teamALog);
         Log::debug("Team B (" . $teamBPlayers->count() . "): " . $teamBLog);
 
+        // Ensure both teams have exactly two players
+        if ($teamAPlayers->count() !== 2 || $teamBPlayers->count() !== 2) {
+            Log::warning("Team size error: Team A has {$teamAPlayers->count()} players, Team B has {$teamBPlayers->count()} players. Expected 2 each.");
+        }
+
         $players = $teamAPlayers->merge($teamBPlayers);
 
         $commonQmMaps = $this->quickMatchService->getCommonMapsForPlayers($ladder, $players);
@@ -92,6 +103,12 @@ public function matchup(): void
             $this->matchHasObservers = true;
         }
 
+        // Throw exception if team sizes are not exactly two
+        if ($teamAPlayers->count() !== 2 || $teamBPlayers->count() !== 2) {
+            Log::warning("Team size error: Team A has {$teamAPlayers->count()} players, Team B has {$teamBPlayers->count()} players. Expected 2 each.");
+            throw new \RuntimeException("Team size error: Team A has {$teamAPlayers->count()} players, Team B has {$teamBPlayers->count()} players. Expected 2 each.");
+        }
+
         // Start the match with all other players and other observers if there is any
         $this->createTeamMatch($commonQmMaps, $teamAPlayers, $teamBPlayers, $observers, $stats);
     }
@@ -191,12 +208,21 @@ public function getEntriesInPointRange2v2(QmQueueEntry $currentQmQueueEntry, Col
     private function getCombinations(Collection $items, int $size): Collection
     {
         $array = $items->all();
+        $allNames = collect($array)->map(function($entry) {
+            return $entry->qmPlayer?->player?->username ?? 'Unknown';
+        })->implode(', ');
+        Log::debug("getCombinations called with items: [{$allNames}] and size: {$size}");
         $results = [];
 
         $recurse = function ($arr, $size, $start = 0, $current = []) use (&$results, &$recurse)
         {
             if (count($current) === $size)
             {
+                // Debug log the combination
+                $names = collect($current)->map(function($entry) {
+                    return $entry->qmPlayer?->player?->username ?? 'Unknown';
+                })->implode(', ');
+                Log::debug("getCombinations: [{$names}]");
                 $results[] = $current;
                 return;
             }

cncnet-api/app/Http/Services/QuickMatchService.php

@@ -1653,7 +1653,9 @@ public function getRandomTeams($possibleMatches): array
     public function getBestMatch2v2ForPlayer(QmQueueEntry $currentPlayer, Collection $matchableOpponents, LadderHistory $history): array
     {
 
-        $players = $matchableOpponents->concat([$currentPlayer]);
+        // Ensure matchableOpponents does not contain the current player and is unique by id
+        $matchableOpponents = $matchableOpponents->filter(fn($opponent) => $opponent->id !== $currentPlayer->id)->unique('id')->values();
+        $players = $matchableOpponents->concat([$currentPlayer])->unique('id')->values();
 
         $opponentsRating = [];
         $currentPlayerRank = $currentPlayer->qmPlayer->player->points($history);
@@ -1672,17 +1674,16 @@ public function getBestMatch2v2ForPlayer(QmQueueEntry $currentPlayer, Collection
             $opponentsRating
         );
 
-        // $matchup = $this->findBestMatch($possibleMatches);
-        // $matchup = $this->getRandomTeams($possibleMatches);
         $matchup = $this->findBestMatchRandomized($possibleMatches);
 
         $g = function ($players, $match, $team)
         {
+            // Only include unique players by id
             return $players
                 ->filter(fn(QmQueueEntry $qmQueueEntry) => in_array($qmQueueEntry->id, [
                     $match[$team]['player1'],
                     $match[$team]['player2']
-                ]));
+                ]))->unique('id')->values();
         };
 
         $teamAPlayers = $g($players, $matchup, 'teamA');