Merge pull request #124 from AiAe/dev-aiae

Update team names & youtube social
AiAe · May 28, 2024 · e202d8e · e202d8e
2 parents 5661d28 + 1d4e736
commit e202d8e
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 13 deletions.
diff --git a/app/Http/Controllers/Web/Tournament/TournamentsController.php b/app/Http/Controllers/Web/Tournament/TournamentsController.php
@@ -54,10 +54,11 @@ public function update(Request $request, Tournament $tournament)
                 'prize' => ['nullable', 'array'],
                 'rank' => ['nullable', 'array'],
                 'register' => ['nullable', 'array'],
-                'discord' => ['nullable'],
-                'twitch' => ['nullable'],
-                'spreadsheet' => ['nullable'],
-                'twitter' => ['nullable'],
+                'discord' => ['nullable', 'url'],
+                'twitch' => ['nullable', 'url'],
+                'spreadsheet' => ['nullable', 'url'],
+                'twitter' => ['nullable', 'url'],
+                'youtube' => ['nullable', 'url'],
                 'information' => ['nullable'],
                 'discord_webhook_registrations' => ['nullable'],
                 'discord_webhook_matches' => ['nullable'],

diff --git a/app/Http/Controllers/Web/User/UserController.php b/app/Http/Controllers/Web/User/UserController.php
@@ -47,6 +47,7 @@ public function update(Request $request)
             foreach ($tournaments as $tournament) {
                 $team = $loggedUser->teams()->firstWhere('tournament_id', $tournament->id);
                 $team->timezone_offset = $loggedUser->timezone_offset;
+                $team->name = $loggedUser->username;
                 $team->save();
             }
         });

diff --git a/app/Jobs/UserUpdateJob.php b/app/Jobs/UserUpdateJob.php
@@ -2,6 +2,8 @@
 
 namespace App\Jobs;
 
+use App\Enums\TournamentFormat;
+use App\Enums\TournamentStatus;
 use App\Enums\UserRoles;
 use App\Http\QuaverApi\QuaverApi;
 use App\Models\User;
@@ -38,6 +40,17 @@ public function handle(): void
                 foreach ($this->user->teams as $team) {
                     $team->updateTeamRank();
                 }
+
+                // Update team names
+                $tournaments = $this->user->participatedTournaments()
+                    ->where('status', '!=', TournamentStatus::Concluded)
+                    ->where('format', TournamentFormat::Solo);
+
+                foreach ($tournaments as $tournament) {
+                    $team = $this->user->teams()->firstWhere('tournament_id', $tournament->id);
+                    $team->name = $this->user->username;
+                    $team->save();
+                }
             }
         } catch (\Exception $e) {
             $this->user->roles()->create(['role' => UserRoles::Blacklisted]);

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -37,9 +37,9 @@ public function register()
      */
     public function boot()
     {
-        if (config('app.env') == "local") {
-            Model::preventLazyLoading();
-        }
+//        if (config('app.env') == "local") {
+//            Model::preventLazyLoading();
+//        }
 
         if (config('app.env') == 'production') {
             \URL::forceScheme('https');

diff --git a/resources/views/web/tournaments/edit.blade.php b/resources/views/web/tournaments/edit.blade.php
@@ -121,7 +121,7 @@
 
                     <hr>
 
-                    <div class="row">
+                    <div class="row gy-3">
                         <div class="col-lg-6">
                             <div class="form-group">
                                 <label class="form-label">{{ __('Discord URL') }}</label>
@@ -135,9 +135,7 @@
                                 {{ Form::text('twitch', $tournament->getMeta('twitch')??"", ['class' => 'form-control']) }}
                             </div>
                         </div>
-                    </div>
 
-                    <div class="row mt-2">
                         <div class="col-lg-6">
                             <div class="form-group">
                                 <label class="form-label">{{ __('Spreadsheet URL') }}</label>
@@ -151,6 +149,13 @@
                                 {{ Form::text('twitter', $tournament->getMeta('twitter')??"", ['class' => 'form-control']) }}
                             </div>
                         </div>
+
+                        <div class="col-lg-6">
+                            <div class="form-group">
+                                <label class="form-label">{{ __('YouTube URL') }}</label>
+                                {{ Form::text('youtube', $tournament->getMeta('youtube')??"", ['class' => 'form-control']) }}
+                            </div>
+                        </div>
                     </div>
 
                     <hr>

diff --git a/resources/views/web/tournaments/show.blade.php b/resources/views/web/tournaments/show.blade.php
@@ -57,6 +57,14 @@
                                 {{ __('Twitch') }}
                             </a>
                         @endif
+                            @if($tournament->getMeta('youtube'))
+                                <a href="{{ $tournament->getMeta('youtube') }}" class="btn btn-youtube btn-sm"
+                                   target="_blank"
+                                   rel="noreferrer">
+                                    <i class="bi bi-youtube"></i>
+                                    {{ __('YouTube') }}
+                                </a>
+                            @endif
                     </div>
                 </div>
             </div>

diff --git a/resources/views/web/user/edit.blade.php b/resources/views/web/user/edit.blade.php
@@ -42,7 +42,6 @@ class="btn btn-discord"
                                 </div>
                             @endif
                         </div>
-                        <small>{{ __('If you have linked the wrong Discord account, please contact tournament organizer or site admins!') }}</small>
                     </div>
                 </div>
 

diff --git a/tests/Feature/TournamentTest.php b/tests/Feature/TournamentTest.php
@@ -95,11 +95,11 @@ public function testEditAndUpdate()
         $this->tournament->refresh();
         $this->assertEquals(TournamentStatus::RegistrationsOpen, $this->tournament->status);
 
-        $data = ['discord' => 'ababa'];
+        $data = ['discord' => 'https://discord.com'];
         $this->actingAs($this->organizer)
             ->put(route('web.tournaments.update', $this->tournament), $data)->assertRedirect();
         $this->tournament->refresh();
-        $this->assertEquals('ababa', $this->tournament->discord);
+        $this->assertEquals('https://discord.com', $this->tournament->discord);
     }
 
     public function testDelete()