MAPG-235 basic gameflow works

src/Repository/GuessRepository.php

@@ -21,7 +21,7 @@ class GuessRepository
     public function getAllByUserAndChallenge(User $user, Challenge $challenge) : Generator
     {
         $select = new Select(\Container::$dbConnection);
-        $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guess', 'place_in_challenge_id']);
+        $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guesses', 'place_in_challenge_id']);
         $select->where('user_id', '=', $user->getId());
         $select->where('challenge_id', '=', $challenge->getId());
 
@@ -31,11 +31,22 @@ class GuessRepository
     public function getByUserAndPlaceInChallenge(User $user, Challenge $challenge, Place $place) : ?Guess
     {
         $select = new Select(\Container::$dbConnection);
-        $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guess', 'place_in_challenge_id']);
+        $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guesses', 'place_in_challenge_id']);
         $select->where('user_id', '=', $user->getId());
         $select->where('challenge_id', '=', $challenge->getId());
         $select->where('place_id', '=', $place->getId());
 
         return $this->pdm->selectFromDb($select, Guess::class);
     }
+
+    public function getAllInChallenge(int $userId, Challenge $challenge): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guesses', 'place_in_challenge_id']);
+        $select->where('user_id', '=', $userId);
+        $select->where('challenge_id', '=', $challenge->getId());
+        $select->orderBy('order');
+
+        yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
+    }
 }

src/Repository/MapRepository.php

@@ -3,6 +3,7 @@
 use MapGuesser\Database\Query\Select;
 use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\Map;
+use MapGuesser\PersistentData\Model\Place;
 use MapGuesser\PersistentData\PersistentDataManager;
 
 class MapRepository
@@ -19,6 +20,14 @@ class MapRepository
         return $this->pdm->selectFromDbById($mapId, Map::class);
     }
 
+    public function getByPlace(Place $place): ?Map
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('id', '=', $place->getMapId());
+
+        return $this->pdm->selectFromDb($select, Map::class);
+    }
+
     public function getByChallenge(Challenge $challenge): ?Map
     {
         $select = new Select(\Container::$dbConnection);

src/Repository/PlaceInChallengeRepository.php

@@ -31,4 +31,13 @@ class PlaceInChallengeRepository
 
         yield from $this->pdm->selectMultipleFromDb($select, PlaceInChallenge::class);
     }
+
+    public function getByPlaceAndChallenge(Place $place, Challenge $challenge) : ?PlaceInChallenge
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('place_id', '=', $place->getId());
+        $select->where('challenge_id', '=', $challenge->getId());
+
+        return $this->pdm->selectFromDb($select, PlaceInChallenge::class);
+    }
 }

src/Repository/PlaceRepository.php

@@ -178,14 +178,25 @@ class PlaceRepository
         return $places;
     }
 
-    public function getCurrentInChallenge(Challenge $challenge, int $round): ?Place
+    public function getByRoundInChallenge(Challenge $challenge, int $round): ?Place
     {
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('place_in_challenge', ['places', 'id'], '=', ['place_in_challenge', 'place_id']);
+        $select->where('challenge_id', '=', $challenge->getId());
         $select->orderBy('order');
         $select->limit(1, $round);
 
         return $this->pdm->selectFromDb($select, Place::class);
     }
+
+    public function getAllInChallenge(Challenge $challenge): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->innerJoin('place_in_challenge', ['places', 'id'], '=', ['place_in_challenge', 'place_id']);
+        $select->where('challenge_id', '=', $challenge->getId());
+        $select->orderBy('order');
+
+        yield from $this->pdm->selectMultipleFromDb($select, Place::class);
+    }
   
 }