Campaigns: Systems as a multi dropdown

owlchester · Jan 16, 2024 · ba1e261 · ba1e261
1 parent 886ad4f
commit ba1e261
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 21 deletions.
diff --git a/app/Http/Resources/Public/CampaignResource.php b/app/Http/Resources/Public/CampaignResource.php
@@ -21,7 +21,7 @@ public function toArray($request)
             'followers' => number_format($campaign->follower),
             'entities' => number_format($campaign->visible_entity_count),
             'locale' => $campaign->locale,
-            'system' => $campaign->system,
+            'system' => $campaign->getSystems(),
             'is_open' => $campaign->isOpen(),
         ];
     }

diff --git a/app/Models/Campaign.php b/app/Models/Campaign.php
@@ -520,4 +520,16 @@ public function hasVanity(): bool
     {
         return $this->slug != $this->id;
     }
+
+    public function getSystems(): string
+    {
+        $systems = '';
+        foreach ($this->systems as $system) {
+            if ($systems) {
+                $systems .= ', ';
+            }
+            $systems .= $system->name;
+        }
+        return $systems;
+    }
 }
diff --git a/app/Models/GameSystem.php b/app/Models/GameSystem.php
@@ -3,21 +3,10 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use App\Models\Concerns\Acl;
-use App\Models\Concerns\SortableTrait;
-use App\Traits\ExportableTrait;
 use App\Models\CampaignSystem;
 
 class GameSystem extends Model
 {
-    use Acl;
-    use ExportableTrait;
-    use SortableTrait;
-
-    public $fillable = [
-        'name',
-    ];
-
     public function campaignSystem()
     {
         return $this->hasMany(CampaignSystem::class, 'system_id', 'id');

diff --git a/app/Models/Scopes/CampaignScopes.php b/app/Models/Scopes/CampaignScopes.php
@@ -164,12 +164,11 @@ public function scopeFilterPublic(Builder $query, array $options): Builder
         }
 
         if (!empty($system)) {
-            $valid =  \App\Facades\CampaignCache::systems();
-            if ($system == 'other') {
-                $query->whereNotIn('system', $valid);
-            } elseif (in_array($system, $valid)) {
-                $query->where('system', $system);
-            }
+            $query
+                ->select('campaigns.*')
+                ->leftJoin('campaign_system as cs', function ($join) {
+                    $join->on('cs.campaign_id', '=', 'campaigns.id');
+                })->whereIn('cs.system_id', $system)->distinct();
         }
         $boosted = Arr::get($options, 'is_boosted');
         if ($boosted === "1") {

diff --git a/app/Services/Api/CampaignService.php b/app/Services/Api/CampaignService.php
@@ -60,7 +60,7 @@ protected function filters(): self
                     'sk' => 'Slovak',
                 ]
             ],
-            'system' => [
+            'system[]' => [
                 'title' => 'System',
                 'options' => CampaignCache::systems()
             ],

diff --git a/app/Services/Caches/CampaignCacheService.php b/app/Services/Caches/CampaignCacheService.php
@@ -57,12 +57,16 @@ public function entityCount(): int
      */
     public function systems(): array
     {
-        $key = 'campaign_public_systems';
+        $key = 'campaign_systems';
         if ($this->has($key)) {
             return $this->get($key);
         }
+        $data = [];
+        $systems = GameSystem::withCount('campaignSystem')->orderBy('campaign_system_count', 'desc')->get(20);
 
-        $data = GameSystem::withCount('campaignSystem')->orderBy('campaign_system_count', 'desc')->get()->toArray();
+        foreach ($systems as $system) {
+            $data[$system->id] = $system->name;
+        }
 
         $this->put($key, $data, 24 * 3600);
         return $data;