Merge pull request #370 from pacoorozco/issue-369

Increase performance by reducing # of queries

app/Models/Level.php

@@ -31,6 +31,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Cache;
 use Laracodes\Presenter\Traits\Presentable;
 use QCod\ImageUp\HasImageUploads;
 
@@ -92,21 +93,27 @@ class Level extends Model
 
     public static function findNextByExperience(int $experience): Level
     {
-        return self::query()
+        return Cache::rememberForever('levels', function () {
+            return self::query()
                 ->active()
-                ->where('required_points', '>', $experience)
-                ->orderBy('required_points', 'asc')
-                ->first()
+                ->orderBy('required_points', 'ASC')
+                ->get();
+        })
+            ->where('required_points', '>', $experience)
+            ->first()
             ?? self::findByExperience($experience);
     }
 
     public static function findByExperience(int $experience): Level
     {
-        return self::query()
+        return Cache::rememberForever('levels', function () {
+            return self::query()
                 ->active()
-                ->where('required_points', '<=', $experience)
-                ->orderBy('required_points', 'desc')
-                ->first()
+                ->orderBy('required_points', 'ASC')
+                ->get();
+        })
+            ->where('required_points', '<=', $experience)
+            ->last()
             ?? self::defaultLevel();
     }
 
@@ -133,7 +140,7 @@ public function scopeActive(Builder $query): Builder
     protected function image(): Attribute
     {
         return Attribute::make(
-            get: fn ($value) => $this->imageUrl()
+            get: fn($value) => $this->imageUrl()
         );
     }
 }

app/Models/User.php

@@ -168,18 +168,6 @@ public function answeredQuestions(): BelongsToMany
             ->using(UserResponse::class);
     }
 
-    public function hasQuestionsToAnswer(): bool
-    {
-        $answeredQuestions = $this->answeredQuestions()
-            ->pluck('question_id')
-            ->toArray();
-
-        return Question::query()
-            ->published()
-            ->whereNotIn('id', $answeredQuestions)
-            ->exists();
-    }
-
     public function answeredQuestionsCount(): int
     {
         return $this->answeredQuestions()->count();

app/Observers/LevelObserver.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Gamify\Observers;
+
+use Gamify\Models\Level;
+use Illuminate\Support\Facades\Cache;
+
+class LevelObserver
+{
+    public function created(Level $level): void
+    {
+        Cache::forget('levels');
+    }
+
+    public function updated(Level $level): void
+    {
+        Cache::forget('levels');
+    }
+
+    public function deleted(Level $level): void
+    {
+        Cache::forget('levels');
+    }
+
+    public function restored(Level $level): void
+    {
+        Cache::forget('levels');
+    }
+
+    public function forceDeleted(Level $level): void
+    {
+        //
+    }
+}

app/Providers/AppServiceProvider.php

@@ -25,6 +25,8 @@
 
 namespace Gamify\Providers;
 
+use Gamify\Models\Level;
+use Gamify\Observers\LevelObserver;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Validation\Rules\Password;
@@ -51,5 +53,7 @@ public function boot(): void
         });
 
         Paginator::useBootstrapFour();
+
+        Level::observe(LevelObserver::class);
     }
 }

database/migrations/2015_12_10_143950_create_levels_table.php

@@ -34,7 +34,7 @@ public function up(): void
         Schema::create('levels', function (Blueprint $table) {
             $table->id();
             $table->string('name');
-            $table->unsignedInteger('required_points');
+            $table->unsignedInteger('required_points')->unique();
             $table->boolean('active')->default(true);
             $table->string('image_url')->nullable();
             $table->timestamps();

lang/en/question/messages.php

@@ -31,8 +31,8 @@
     'obtained_points' => 'Points obtained by answering this question',
     'send' => 'Send',
     'choices' => 'Choose your answer:',
-    'no_pending_questions' => 'Well done!. You have answered all questions.',
-    'only_hidden_questions_pending' => 'You have answered almost all questions, maybe be there are hidden questions pending.',
+
+    'no_pending_questions' => 'Well done!. You have answered all the public questions. Have you though about the hidden ones?',
 
     'legend' => 'Legend:',
     'correct_answer' => 'Correct answer.',

resources/views/question/_empty-list.blade.php

@@ -1,8 +1,4 @@
 <p class="text-center">
-    @if (Auth::user()->hasQuestionsToAnswer())
-        {{ __('question/messages.ony_hidden_questions_pending') }}
-    @else
-        {{ __('question/messages.no_pending_questions') }}
-    @endif
+    {{ __('question/messages.no_pending_questions') }}
 </p>