MAPG-235 refactor: renamed fields in challenge related tables

src/Repository/GuessRepository.php

@@ -45,7 +45,7 @@ class GuessRepository
         $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');
+        $select->orderBy('round');
 
         yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
     }
@@ -55,19 +55,17 @@ class GuessRepository
         $select = new Select(\Container::$dbConnection);
         // $select->innerJoin('place_in_challenge', ['guesses', 'place_in_challenge_id'], '=', ['place_in_challenge', 'id']);
         $select->where('challenge_id', '=', $challenge->getId());
-        $select->orderBy('order');
+        $select->orderBy('round');
 
         yield from $this->pdm->selectMultipleFromDb($select, Guess::class, true);
     }
 
     public function getAllInChallengeByRound(int $round, Challenge $challenge): Generator
     {
-        $order = $round + 1;
-
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('place_in_challenge', ['guesses', 'place_in_challenge_id'], '=', ['place_in_challenge', 'id']);
         $select->where('challenge_id', '=', $challenge->getId());
-        $select->where('order', '=', $order);
+        $select->where('round', '=', $round);
 
         yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
     }