Merge pull request #28 from deanblackborough/main

v0.16.0
costs-to-expect · Aug 1, 2022 · 8c6dead · 8c6dead
2 parents 08d8546 + c986a3d
commit 8c6dead
Show file tree

Hide file tree

Showing 13 changed files with 272 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 The complete changelog for the Costs to Expect REST API, our changelog follows the format defined at https://keepachangelog.com/en/1.0.0/
 
+## [0.16.0] - [2022-08-01]
+### Added
+- Added ability to remove a player from an open game, deletes the score sheet, share token and assignment.
+- Upon scoring or scratching the background color for dice is updated to highlight what has been scored.
+
 ## [0.15.0] - [2022-08-01]
 ### Added
 - Open games can be deleted.

diff --git a/app/Actions/Game/DeletePlayer.php b/app/Actions/Game/DeletePlayer.php
@@ -0,0 +1,88 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\Game;
+
+use App\Actions\Action;
+use App\Api\Service;
+use App\Models\ShareToken;
+
+/**
+ * @author Dean Blackborough <[email protected]>
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2022
+ * https://github.com/costs-to-expect/yahtzee/blob/main/LICENSE
+ */
+class DeletePlayer extends Action
+{
+    public function __invoke(
+        Service $api,
+        string $resource_type_id,
+        string $resource_id,
+        string $game_id,
+        string $player_id
+    ): int
+    {
+        // Delete the score sheet if it exists for the player
+        $score_sheet_response = $api->getPlayerScoreSheet(
+            $resource_type_id,
+            $resource_id,
+            $game_id,
+            $player_id
+        );
+
+        if ($score_sheet_response['status'] === 200) {
+
+            $response = $api->deletePlayerScoreSheet(
+                $resource_type_id,
+                $resource_id,
+                $game_id,
+                $score_sheet_response['content']['key']
+            );
+
+            if ($response['status'] !== 204) {
+                throw new \RuntimeException('Unable to delete score sheet for player with id ' .
+                    $score_sheet_response['content']['key'] . ', error ' . $response['content']);
+            }
+        }
+
+        // Delete the player from the assignments
+        // We need all the players to work out which id to delete
+        $assigned_players_response = $api->getAssignedGamePlayers(
+            $resource_type_id,
+            $resource_id,
+            $game_id
+        );
+
+        if ($assigned_players_response['status'] !== 200) {
+            throw new \RuntimeException('Unable to fetch the assigned game players');
+        }
+
+        foreach($assigned_players_response['content'] as $player) {
+
+            if ($player['category']['id'] === $player_id) {
+                $response = $api->deleteAssignedGamePlayer(
+                    $resource_type_id,
+                    $resource_id,
+                    $game_id,
+                    $player['id']
+                );
+
+                if ($response['status'] !== 204) {
+                    throw new \RuntimeException(
+                        'Unable to delete player with id ' . $player['id'] . ', error ' .
+                        $response['content']
+                    );
+                }
+
+                break;
+            }
+        }
+
+        ShareToken::query()
+            ->where('game_id', $game_id)
+            ->where('player_id', $player_id)
+            ->delete();
+
+        return 204;
+    }
+}
diff --git a/app/Http/Controllers/Game.php b/app/Http/Controllers/Game.php
@@ -7,6 +7,7 @@
 use App\Actions\Game\Complete;
 use App\Actions\Game\Create;
 use App\Actions\Game\Delete;
+use App\Actions\Game\DeletePlayer;
 use App\Models\ShareToken;
 use Illuminate\Http\Request;
 
@@ -348,6 +349,30 @@ public function deleteGame(Request $request, string $game_id)
         abort(500, 'Unable to delete the game, unknown error');
     }
 
+    public function deleteGamePlayer(Request $request, string $game_id, string $player_id)
+    {
+        $this->boostrap($request);
+
+        $action = new DeletePlayer();
+        try {
+            $result = $action(
+                $this->api,
+                $this->resource_type_id,
+                $this->resource_id,
+                $game_id,
+                $player_id
+            );
+
+            if ($result === 204) {
+                return redirect()->route('home');
+            }
+        } catch (\Exception $e) {
+            abort(500, $e->getMessage());
+        }
+
+        abort(500, 'Unable to delete the player from the game, unknown error');
+    }
+
     public function playerBonus(Request $request, string $game_id, string $player_id)
     {
         $this->boostrap($request);

diff --git a/config/app/config.php b/config/app/config.php
@@ -10,6 +10,6 @@
     'item_subtype_id' => env('ITEM_SUBTYPE_ID'),
     'cookie_user' => env('SESSION_NAME_USER'),
     'cookie_bearer' => env('SESSION_NAME_BEARER'),
-    'version' => '0.15.0',
+    'version' => '0.16.0',
     'release_date' => '1st August 2022'
 ];
diff --git a/public/css/theme.css b/public/css/theme.css
diff --git a/public/css/theme.css.map b/public/css/theme.css.map
diff --git a/public/js/public-score-sheet.js b/public/js/public-score-sheet.js
@@ -40,6 +40,10 @@
                        upper.disabled = true;
 
                        disable_yahtzee_bonus(response.data.turns);
+
+                       document.querySelectorAll('label[for="' + this.value + '"] svg').forEach(dice =>
+                           dice.classList.add('scored')
+                       );
                    })
                    .catch(error => {
                        console.log(error);
@@ -94,6 +98,10 @@
                         total_score.innerText = response.data.score.upper + response.data.score.bonus + response.data.score.lower;
 
                         disable_yahtzee_bonus(response.data.turns);
+
+                        document.querySelectorAll('label[for="' + this.id + '"] svg').forEach(dice =>
+                            dice.classList.add('scored')
+                        );
                     })
                     .catch(error => {
                         console.log(error);
@@ -287,6 +295,10 @@
                 disable_yahtzee_bonus(response.data.turns);
 
                 display_toast(show_toast);
+
+                document.querySelectorAll('p.' + element.id + '_dice svg').forEach(dice =>
+                    dice.classList.add('scored')
+                );
             })
             .catch(error => {
                 console.log(error);
@@ -319,6 +331,10 @@
                         disable_yahtzee_bonus(response.data.turns);
 
                         display_toast(show_toast);
+
+                        document.querySelectorAll('p.' + element.id + '_dice svg').forEach(dice =>
+                            dice.classList.add('scored')
+                        );
                     })
                     .catch(error => {
                         console.log(error);
@@ -352,6 +368,10 @@
                 disable_yahtzee_bonus(response.data.turns);
 
                 display_toast(show_toast);
+
+                document.querySelectorAll('p.' + element.id.toString().replace('scratch_', '') + '_dice svg').forEach(dice =>
+                    dice.classList.add('scored')
+                );
             })
             .catch(error => {
                 console.log(error);
@@ -381,6 +401,10 @@
                     lower.disabled = true;
 
                     disable_yahtzee_bonus(response.data.turns);
+
+                    document.querySelectorAll('p.' + element.id.toString().replace('scratch_', '') + '_dice svg').forEach(dice =>
+                        dice.classList.add('scored')
+                    );
                 })
                 .catch(error => {
                     console.log(error);

diff --git a/public/js/score-sheet.js b/public/js/score-sheet.js
@@ -209,6 +209,10 @@
                     disable_yahtzee_bonus_if_game_over(response.data.turns);
 
                     display_selected_toast(show_toast);
+
+                    document.querySelectorAll('p.' + element.id + '_dice svg').forEach(dice =>
+                        dice.classList.add('scored')
+                    );
                 })
                 .catch(error => {
                     console.log(error);
@@ -246,6 +250,10 @@
                 disable_yahtzee_bonus_if_game_over(response.data.turns);
 
                 display_selected_toast(show_toast);
+
+                document.querySelectorAll('p.' + element.id + '_dice svg').forEach(dice =>
+                    dice.classList.add('scored')
+                );
             })
             .catch(error => {
                 console.log(error);
@@ -280,6 +288,10 @@
                 disable_yahtzee_bonus_if_game_over(response.data.turns);
 
                 display_selected_toast(show_toast);
+
+                document.querySelectorAll('p.' + element.id.toString().replace('scratch_', '') + '_dice svg').forEach(dice =>
+                    dice.classList.add('scored')
+                );
             })
             .catch(error => {
                 console.log(error);
@@ -313,6 +325,10 @@
                 display_selected_toast(show_toast);
 
                 disable_yahtzee_bonus_if_game_over(response.data.turns);
+
+                document.querySelectorAll('p.' + element.id.toString().replace('scratch_', '') + '_dice svg').forEach(dice =>
+                    dice.classList.add('scored')
+                );
             })
             .catch(error => {
                 console.log(error);
@@ -366,6 +382,10 @@
                     display_selected_toast(show_toast);
 
                     disable_yahtzee_bonus_if_game_over(response.data.turns);
+
+                    document.querySelectorAll('label[for="' + element.id + '"] svg').forEach(dice =>
+                        dice.classList.add('scored')
+                    );
                 })
                 .catch(error => {
                     console.log(error);
@@ -403,6 +423,10 @@
                     display_selected_toast(show_toast);
 
                     disable_yahtzee_bonus_if_game_over(response.data.turns);
+
+                    document.querySelectorAll('label[for="' + element.value + '"] svg').forEach(dice =>
+                        dice.classList.add('scored')
+                    );
                 })
                 .catch(error => {
                     console.log(error);

diff --git a/resources/scss/theme.scss b/resources/scss/theme.scss
@@ -91,4 +91,9 @@ a.nav-link.active {
 div.bonus-message p {
     margin-top: 1rem;
     border: 1px solid rgba(137, 43, 124, 1);
+}
+
+svg.scored {
+    border-radius: 0.3rem;
+    background-image: linear-gradient(55deg, rgba(137, 43, 124, 0.8), rgba(137, 43, 124, 0.4), rgba(137, 43, 124, 0.1));
 }
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
@@ -63,6 +63,7 @@
                                                 @if (array_key_exists($__open_game['id'], $share_tokens) && array_key_exists($__player['id'], $share_tokens[$__open_game['id']]))
                                                     <li class="list-inline-item"><a href="{{ route('public.score-sheet', ['token' => $share_tokens[$__open_game['id']][$__player['id']]]) }}">[Share]</a></li>
                                                 @endif
+                                                <li class="list-inline-item"><a href="{{ route('game.player.delete', ['game_id' => $__open_game['id'], 'player_id' => $__player['id']]) }}">[Remove]</a></li>
                                             </ul>
                                         </li>
                                     @endforeach