Check if good answer is not in bad answers (#43)

* Check if good answer is not in bad answers
d34fmute · Feb 20, 2023 · 4a721a4 · 4a721a4
1 parent 7b9868f
commit 4a721a4
Show file tree

Hide file tree

Showing 25 changed files with 950 additions and 1,083 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .DS_Store
+.idea
diff --git a/qvgds-back/app/Http/Controllers/DTO/RestGame.php b/qvgds-back/app/Http/Controllers/DTO/RestGame.php
@@ -25,7 +25,7 @@ private function __construct(
         private string     $player,
 
         #[OA\Property]
-        private int        $step,
+        private int        $level,
 
         #[OA\Property]
         private int        $shitcoins,
@@ -49,9 +49,9 @@ public function getPlayer(): string
         return $this->player;
     }
 
-    public function getStep(): int
+    public function getLevel(): int
     {
-        return $this->step;
+        return $this->level;
     }
 
     public function getShitcoins(): int
@@ -75,7 +75,7 @@ public static function from(Game $game): self
         return new self(
             $game->id()->get(),
             $game->player(),
-            $game->step(),
+            $game->step()->value,
             $game->shitCoins()->amount(),
             $game->status(),
             RestJoker::fromGame($game)

diff --git a/qvgds-back/app/Http/Controllers/GamesController.php b/qvgds-back/app/Http/Controllers/GamesController.php
@@ -108,7 +108,7 @@ public function currentQuestion(string $gameId): Response
         $currentQuestion = $game->currentQuestion();
 
         $json = [
-            "reward" => ShitCoins::fromLevel($game->step(), $game->status())->amount(),
+            "reward" => ShitCoins::from($game->step()->value)->amount(),
             "step" => $game->step(),
             "question" => $currentQuestion->text(),
             "answers" => $this->serializeAnswers($currentQuestion),

diff --git a/qvgds-back/app/Http/Controllers/SessionsController.php b/qvgds-back/app/Http/Controllers/SessionsController.php
@@ -92,7 +92,7 @@ private static function serializeQuestion(Question $question): array
         return [
             "id" => $question->id()->get(),
             "text" => $question->text(),
-            "step" => $question->step(),
+            "step" => $question->level(),
             "goodAnswer" => $question->goodAnswer()->text,
             "badAnswers" => array_map(fn(Answer $answer): string => $answer->text, $question->badAnswers())
         ];

diff --git a/qvgds-back/app/Repositories/LaravelGamesRepository.php b/qvgds-back/app/Repositories/LaravelGamesRepository.php
@@ -17,6 +17,7 @@
 use QVGDS\Game\Domain\Joker\Jokers;
 use QVGDS\Game\Domain\Joker\JokerStatus;
 use QVGDS\Game\Domain\Joker\JokerType;
+use QVGDS\Game\Domain\Level;
 use QVGDS\Session\Domain\Session;
 use Ramsey\Uuid\Uuid;
 
@@ -83,7 +84,7 @@ private function toDomain(LaravelGame $laravelGame): Game
             new Jokers(...$laravelGame->jokers()->get()->map(fn(LaravelJoker $joker) => $this->buildJoker($joker))->toArray()),
             $laravelGame->session()->get()->map(fn(LaravelSession $session): Session => LaravelSessionsRepository::toDomain($session))->first(),
             $this->buildGameStatus($laravelGame->status),
-            $laravelGame->step
+            Level::from($laravelGame->step)
         );
     }
 

diff --git a/qvgds-back/app/Repositories/LaravelSessionsRepository.php b/qvgds-back/app/Repositories/LaravelSessionsRepository.php
@@ -5,6 +5,7 @@
 
 use App\Models\LaravelQuestion;
 use App\Models\LaravelSession;
+use QVGDS\Game\Domain\Level;
 use QVGDS\Session\Domain\Question\Answer;
 use QVGDS\Session\Domain\Question\BadAnswers;
 use QVGDS\Session\Domain\Question\GoodAnswer;
@@ -58,7 +59,7 @@ public static function toDomain(LaravelSession $laravelSession): Session
         $questions = $laravelSession->questions()->get()->map(
             fn(LaravelQuestion $q): Question => new Question(
                 new QuestionId(Uuid::fromString($q->id)),
-                $q->step,
+                Level::from($q->step,),
                 $q->question,
                 new GoodAnswer(new Answer($q->good_answer)),
                 new BadAnswers(
@@ -82,7 +83,7 @@ private function toLaravelQuestion(Question $question, SessionId $sessionId): vo
             [
                 "id" => $question->id()->get(),
                 "session" => $sessionId->get(),
-                "step" => $question->step(),
+                "step" => $question->level(),
                 "question" => $question->text(),
                 "good_answer" => $question->goodAnswer()->text,
                 "bad_answer1" => $question->badAnswers()[0]->text,

diff --git a/qvgds-back/composer.json b/qvgds-back/composer.json
@@ -31,7 +31,7 @@
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^6.1",
         "phpstan/phpstan": "^1.9",
-        "phpunit/phpunit": "^9",
+        "phpunit/phpunit": "^10",
         "spatie/laravel-ignition": "^1.0"
     },
     "scripts": {