MAPG-204 clean up result sending

src/Controller/GameFlowController.php

@@ -61,9 +61,11 @@ class GameFlowController
             $round = $state['rounds'][$i];
             $response['history'][] = [
                 'position' => $round['position']->toArray(),
-                'guessPosition' => $round['guessPosition']->toArray(),
-                'distance' => $round['distance'],
-                'score' => $round['score']
+                'result' => [
+                    'guessPosition' => $round['guessPosition']->toArray(),
+                    'distance' => $round['distance'],
+                    'score' => $round['score']
+                ]
             ];
         }
 
@@ -126,11 +128,8 @@ class GameFlowController
         $last['score'] = $result['score'];
 
         $response = [
-            'result' => [
-                'position' => $last['position']->toArray(),
-                'distance' => $result['distance'],
-                'score' => $result['score']
-            ]
+            'position' => $last['position']->toArray(),
+            'result' => $result
         ];
 
         $state['rounds'][$state['currentRound']] = $last;
@@ -165,20 +164,18 @@ class GameFlowController
         $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
         $result = $this->evalueteGuess($last['position'], $guessPosition, $state['area']);
 
-        $this->multiConnector->sendMessage('guess', [
+        $allResults = $this->multiConnector->sendMessage('guess', [
             'roomId' => $roomId,
             'token' => $multiState['token'],
-            'guess' => $guessPosition->toArray(),
+            'guessPosition' => $guessPosition->toArray(),
             'distance' => $result['distance'],
             'score' => $result['score']
         ]);
 
         $response = [
-            'result' => [
-                'position' => $last['position']->toArray(),
-                'distance' => $result['distance'],
-                'score' => $result['score']
-            ]
+            'position' => $last['position']->toArray(),
+            'result' => $result,
+            'allResults' => $allResults
         ];
 
         return new JsonContent($response);