MAPG-235 queries with selected relations enabled; reduced size of some of the queries

src/Repository/GuessRepository.php

@@ -7,6 +7,7 @@ use MapGuesser\PersistentData\Model\Guess;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\UserInChallenge;
 use MapGuesser\PersistentData\Model\Place;
+use MapGuesser\PersistentData\Model\PlaceInChallenge;
 use MapGuesser\PersistentData\PersistentDataManager;
 
 class GuessRepository
@@ -50,21 +51,31 @@ class GuessRepository
         yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
     }
 
-    public function getAllInChallenge(Challenge $challenge): Generator
+    public function getAllInChallenge(Challenge $challenge, array $withRelations = []): Generator
     {
+        if (count($withRelations)) {
+            $necessaryRelations = [PlaceInChallenge::class];
+            $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
+        }
+        
         $select = new Select(\Container::$dbConnection);
         $select->where('challenge_id', '=', $challenge->getId());
         $select->orderBy('round');
 
-        yield from $this->pdm->selectMultipleFromDb($select, Guess::class, true);
+        yield from $this->pdm->selectMultipleFromDb($select, Guess::class, true, $withRelations);
     }
 
-    public function getAllInChallengeByRound(int $round, Challenge $challenge): Generator
+    public function getAllInChallengeByRound(int $round, Challenge $challenge, array $withRelations = []): Generator
     {
+        if (count($withRelations)) {
+            $necessaryRelations = [PlaceInChallenge::class];
+            $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
+        }
+        
         $select = new Select(\Container::$dbConnection);
         $select->where('challenge_id', '=', $challenge->getId());
         $select->where('round', '=', $round);
 
-        yield from $this->pdm->selectMultipleFromDb($select, Guess::class, true);
+        yield from $this->pdm->selectMultipleFromDb($select, Guess::class, true, $withRelations);
     }
 }

src/Repository/PlaceInChallengeRepository.php

@@ -3,6 +3,7 @@
 use Generator;
 use MapGuesser\Database\Query\Select;
 use MapGuesser\PersistentData\Model\Challenge;
+use MapGuesser\PersistentData\Model\Map;
 use MapGuesser\PersistentData\Model\Place;
 use MapGuesser\PersistentData\Model\PlaceInChallenge;
 use MapGuesser\PersistentData\PersistentDataManager;
@@ -41,13 +42,13 @@ class PlaceInChallengeRepository
         return $this->pdm->selectFromDb($select, PlaceInChallenge::class);
     }
 
-    public function getByRoundInChallenge(int $round, Challenge $challenge): ?PlaceInChallenge
+    public function getByRoundInChallenge(int $round, Challenge $challenge, array $withRelations = []): ?PlaceInChallenge
     {
         $select = new Select(\Container::$dbConnection);
         $select->where('challenge_id', '=', $challenge->getId());
         $select->orderBy('round');
         $select->limit(1, $round);
 
-        return $this->pdm->selectFromDb($select, PlaceInChallenge::class, true);
+        return $this->pdm->selectFromDb($select, PlaceInChallenge::class, true, $withRelations);
     }
 }

src/Repository/PlaceRepository.php

@@ -198,14 +198,5 @@ class PlaceRepository
 
         yield from $this->pdm->selectMultipleFromDb($select, Place::class);
     }
-
-    public function getByIdWithMap(int $placeId): ?Place
-    {
-        $select = new Select(\Container::$dbConnection);
-        // $select->innerJoin('maps', ['maps', 'id'], '=', ['places', 'map_id']);
-        $select->where(['places', 'id'], '=', $placeId);
-
-        return $this->pdm->selectFromDb($select, Place::class, true);
-    }
   
 }

src/Repository/UserInChallengeRepository.php

@@ -41,15 +41,20 @@ class UserInChallengeRepository
         return $this->pdm->selectFromDb($select, UserInChallenge::class);
     }
 
-    public function getByUserIdAndToken(int $userId, string $token_str): ?UserInChallenge
+    public function getByUserIdAndToken(int $userId, string $token_str, array $withRelations = []): ?UserInChallenge
     {
+        if (count($withRelations)) {
+            $necessaryRelations = [Challenge::class];
+            $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
+        }
+
         $token = hexdec($token_str);
 
         $select = new Select(\Container::$dbConnection);
         $select->where('user_id', '=', $userId);
         $select->where('token', '=', $token);
 
-        return $this->pdm->selectFromDb($select, UserInChallenge::class, true);
+        return $this->pdm->selectFromDb($select, UserInChallenge::class, true, $withRelations);
     }
 
     public function isUserParticipatingInChallenge(int $userId, Challenge $challenge): bool

src/Repository/UserPlayedPlaceRepository.php

@@ -38,7 +38,7 @@ class UserPlayedPlaceRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('user_id', '=', $user->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, UserPlayedPlace::class, true);
+        yield from $this->pdm->selectMultipleFromDb($select, UserPlayedPlace::class);
     }
 
     public function getByUserIdAndPlaceId(int $userId, int $placeId) : ?UserPlayedPlace