Merge pull request #89 from frontChapter/develop

add image
frontChapter · Feb 29, 2024 · ef2890a · ef2890a
2 parents ea14464 + d1772d2
commit ef2890a
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -14,7 +14,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule): void
     {
-        $schedule->job(new ProcessFestivalSitesScore())->everyTenMinutes();
+        $schedule->job(new ProcessFestivalSitesScore())->everyMinute();
         $schedule->job(new UnblockSpammers())->everyMinute();
         $schedule->command('disposable:update')->daily();
     }

diff --git a/app/Jobs/ProcessFestivalSitesScore.php b/app/Jobs/ProcessFestivalSitesScore.php
@@ -32,12 +32,13 @@ public function handle(): void
         foreach($festivalSites as $festivalSite) {
             $vote = Votable::where('votable_type', FestivalSite::class)
                 ->where('votable_id', $festivalSite->id)
-                ->selectRaw('votable_id, (sum(vote) / count(vote)) as score')
+                ->selectRaw('votable_id, (sum(vote) / count(vote)) as score, sum(vote) as count')
                 ->groupBy('votable_id')
                 ->first();
 
                 if (!empty($vote)) {
                     $festivalSite->score = $vote->score;
+                    $festivalSite->count = $vote->count;
                     $festivalSite->save();
                 }
         }

diff --git a/app/Livewire/Festival/ListSites.php b/app/Livewire/Festival/ListSites.php
@@ -16,6 +16,7 @@ class ListSites extends Component
     public function getSites()
     {
         return FestivalSite::whereStatus(FestivalSiteStatus::PUBLISHED)
+            ->orderBy("count", "DESC")
             ->orderBy("score", "DESC")
             ->paginate(23);
     }

diff --git a/app/Models/FestivalSite.php b/app/Models/FestivalSite.php
@@ -27,6 +27,7 @@ class FestivalSite extends Model implements Viewable
         'user_id',
         'app_id',
         'name',
+        'count',
         'url',
         'logo',
         'status',

diff --git a/database/migrations/2024_02_29_161756_add_count_to_sites.php b/database/migrations/2024_02_29_161756_add_count_to_sites.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('festival_sites', function (Blueprint $table) {
+            $table->integer('count')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('festival_sites', function (Blueprint $table) {
+            $table->dropColumn('count');
+        });
+    }
+};