MAPG-235 basic gameflow works

src/Controller/GameController.php

@@ -244,7 +244,9 @@ class GameController
         if(!$this->userInChallengeRepository->isUserParticipatingInChallenge($userId, $challenge)) {
             $userInChallenge = new UserInChallenge();
             $userInChallenge->setUserId($userId);
+            $userInChallenge->setChallenge($challenge);
             $userInChallenge->setTimeLeft($challenge->getTimerSec());
+            $this->pdm->saveToDb($userInChallenge);
         }
 
         $map = $this->mapRepository->getByChallenge($challenge);

src/Controller/GameFlowController.php

@@ -8,9 +8,13 @@ use MapGuesser\Interfaces\Response\IContent;
 use MapGuesser\Multi\MultiConnector;
 use MapGuesser\PersistentData\Model\UserInChallenge;
 use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\PersistentData\Model\Guess;
 use MapGuesser\PersistentData\Model\UserPlayedPlace;
 use MapGuesser\Repository\ChallengeRepository;
+use MapGuesser\Repository\GuessRepository;
+use MapGuesser\Repository\MapRepository;
 use MapGuesser\Repository\MultiRoomRepository;
+use MapGuesser\Repository\PlaceInChallengeRepository;
 use MapGuesser\Repository\PlaceRepository;
 use MapGuesser\Repository\UserInChallengeRepository;
 use MapGuesser\Repository\UserPlayedPlaceRepository;
@@ -30,12 +34,18 @@ class GameFlowController
 
     private PlaceRepository $placeRepository;
 
+    private MapRepository $mapRepository;
+
     private UserPlayedPlaceRepository $userPlayedPlaceRepository;
 
     private ChallengeRepository $challengeRepository;
 
     private UserInChallengeRepository $userInChallengeRepository;
 
+    private PlaceInChallengeRepository $placeInChallengeRepository;
+
+    private GuessRepository $guessRepository;
+
     public function __construct(IRequest $request)
     {
         $this->request = $request;
@@ -43,9 +53,12 @@ class GameFlowController
         $this->multiConnector = new MultiConnector();
         $this->multiRoomRepository = new MultiRoomRepository();
         $this->placeRepository = new PlaceRepository();
+        $this->mapRepository = new MapRepository();
         $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
         $this->challengeRepository = new ChallengeRepository();
         $this->userInChallengeRepository = new UserInChallengeRepository();
+        $this->placeInChallengeRepository = new PlaceInChallengeRepository();
+        $this->guessRepository = new GuessRepository();
     }
 
     public function initialData(): IContent
@@ -126,7 +139,6 @@ class GameFlowController
 
     public function challengeInitialData(): IContent
     {
-        // TODO 
         $session = $this->request->session();
         $userId = $session->get('userId');
         $challengeToken_str = $this->request->query('challengeToken');
@@ -138,34 +150,36 @@ class GameFlowController
 
         $userInChallenge = $this->userInChallengeRepository->getByUserIdAndChallenge($userId, $challenge);
         $currentRound = $userInChallenge->getRound();
-
-        $currentPlace = $this->placeRepository->getCurrentInChallenge($challenge, $currentRound);
+        $currentPlace = $this->placeRepository->getByRoundInChallenge($challenge, $currentRound);
 
         $response = [];
 
-        // $last = $state['rounds'][$state['currentRound']];
-        // $response['place'] = [
-        //     'panoId' => $last['panoId'],
-        //     'pov' => $last['pov']->toArray()
-        // ];
-
-        $response['place'] = [
-            'panoId' => $currentPlace->getPanoIdCached(),
-            'pov' => [$currentPlace->getPov()->toArray()]
-        ];
-
         $response['history'] = [];
-        // for ($i = 0; $i < $state['currentRound']; ++$i) {
-        //     $round = $state['rounds'][$i];
-        //     $response['history'][] = [
-        //         'position' => $round['position']->toArray(),
-        //         'result' => [
-        //             'guessPosition' => $round['guessPosition']->toArray(),
-        //             'distance' => $round['distance'],
-        //             'score' => $round['score']
-        //         ]
-        //     ];
-        // }
+
+        $guesses = iterator_to_array($this->guessRepository->getAllInChallenge($userId, $challenge));
+        $places = iterator_to_array($this->placeRepository->getAllInChallenge($challenge));
+
+        for($i = 0; $i < $currentRound; ++$i)
+        {
+            $response['history'][] = [
+                'position' => $places[$i]->getPosition()->toArray(),
+                'result' => [
+                    'guessPosition' => $guesses[$i]->getPosition()->toArray(),
+                    'distance' => $guesses[$i]->getDistance(),
+                    'score' => $guesses[$i]->getScore()
+                ]
+            ];
+        }
+        
+        if(!isset($currentPlace)) { // game finished
+            $response['finished'] = true;
+
+        } else { // continue game
+            $response['place'] = [
+                'panoId' => $currentPlace->getPanoIdCached(),
+                'pov' => [$currentPlace->getPov()->toArray()]
+            ];
+        }
 
         return new JsonContent($response);
     }
@@ -181,7 +195,7 @@ class GameFlowController
 
         $last = $state['rounds'][$state['currentRound']];
         $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
-        $result = $this->evalueteGuess($last['position'], $guessPosition, $state['area']);
+        $result = $this->evaluateGuess($last['position'], $guessPosition, $state['area']);
 
         $last['guessPosition'] = $guessPosition;
         $last['distance'] = $result['distance'];
@@ -205,19 +219,18 @@ class GameFlowController
 
         $session->set('state', $state);
 
-        $this->saveVisit($last);
+        $this->saveVisit($last['placeId']);
 
         return new JsonContent($response);
     }
 
     // save the selected place for the round in UserPlayedPlace
-    private function saveVisit($last): void
+    private function saveVisit($placeId): void
     {
         $session = $this->request->session();
         $userId = $session->get('userId');
 
         if(isset($userId)) {
-            $placeId = $last['placeId'];
             $userPlayedPlace = $this->userPlayedPlaceRepository->getByUserIdAndPlaceId($userId, $placeId);
             if(!$userPlayedPlace) {
                 $userPlayedPlace = new UserPlayedPlace();
@@ -245,7 +258,7 @@ class GameFlowController
 
         $last = $state['rounds'][$state['currentRound']];
         $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
-        $result = $this->evalueteGuess($last['position'], $guessPosition, $state['area']);
+        $result = $this->evaluateGuess($last['position'], $guessPosition, $state['area']);
 
         $responseFromMulti = $this->multiConnector->sendMessage('guess', [
             'roomId' => $roomId,
@@ -268,6 +281,61 @@ class GameFlowController
         return new JsonContent($response);
     }
 
+    public function challengeGuess(): IContent
+    {
+        $session = $this->request->session();
+        $userId = $session->get('userId');
+        $challengeToken_str = $this->request->query('challengeToken');
+        $challenge = $this->challengeRepository->getByTokenStr($challengeToken_str);
+
+        if (!isset($challenge)) {
+            return new JsonContent(['error' => 'game_not_found']);
+        }
+
+        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndChallenge($userId, $challenge);
+        $currentRound = $userInChallenge->getRound();
+        $currentPlace = $this->placeRepository->getByRoundInChallenge($challenge, $currentRound);
+        $map = $this->mapRepository->getByPlace($currentPlace);
+        $placeInChallenge = $this->placeInChallengeRepository->getByPlaceAndChallenge($currentPlace, $challenge);
+
+        $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
+        $result = $this->evaluateGuess($currentPlace->getPosition(), $guessPosition, $map->getArea());
+
+        // save guess
+        $guess = new Guess();
+        $guess->setUserId($userId);
+        $guess->setPlaceInChallenge($placeInChallenge);
+        $guess->setPosition($guessPosition);
+        $guess->setDistance($result['distance']);
+        $guess->setScore($result['score']);
+        $this->pdm->saveToDb($guess);
+
+        $response = [
+            'position' => $currentPlace->getPosition()->toArray(),
+            'result' => $result
+        ];
+
+        // update round
+        $nextRound = $currentRound + 1;
+
+        $userInChallenge->setRound($nextRound);
+        $this->pdm->saveToDb($userInChallenge);
+
+        if ($nextRound < static::NUMBER_OF_ROUNDS) {
+
+            $nextPlace = $this->placeRepository->getByRoundInChallenge($challenge, $nextRound);
+
+            $response['place'] = [
+                'panoId' => $nextPlace->getPanoIdCached(),
+                'pov' => $nextPlace->getPov()->toArray()
+            ];
+        }
+
+        $this->saveVisit($currentPlace->getId());
+
+        return new JsonContent($response);
+    }
+
     public function multiNextRound(): IContent
     {
         $roomId = $this->request->query('roomId');
@@ -297,7 +365,7 @@ class GameFlowController
         return new JsonContent(['ok' => true]);
     }
 
-    private function evalueteGuess(Position $realPosition, Position $guessPosition, float $area)
+    private function evaluateGuess(Position $realPosition, Position $guessPosition, float $area)
     {
         $distance = $this->calculateDistance($realPosition, $guessPosition);
         $score = $this->calculateScore($distance, $area);