feat: multiple trait subtypes

app/Console/Commands/ConvertTraitSubtype.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Feature\Feature;
+use App\Models\Feature\FeatureSubtype;
+use Illuminate\Console\Command;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ConvertTraitSubtype extends Command {
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'convert-trait-subtype';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Converts the subtype_id column in the features table to a new row in the feature_subtypes table.';
+
+    /**
+     * Create a new command instance.
+     */
+    public function __construct() {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle() {
+        if (Schema::hasTable('feature_subtypes')) {
+            if (!Schema::hasColumn('features', 'subtype_id')) {
+                $this->info('This command will not execute, as it has already been run.');
+
+                return;
+            }
+
+            $features = Feature::where(function ($query) {
+                $query->whereNotNull('subtype_id');
+            })->get();
+
+            $this->info('Converting '.count($features).' features\' subtypes...');
+            $bar = $this->output->createProgressBar(count($features));
+            foreach ($features as $feature) {
+                if ($feature->subtype_id) {
+                    FeatureSubtype::create([
+                        'feature_id' => $feature->id,
+                        'subtype_id' => $feature->subtype_id,
+                    ]);
+                }
+                $bar->advance();
+            }
+
+            $bar->finish();
+            $this->info("\n".'Dropping subtype ID column from the feature table...');
+
+            Schema::table('features', function (Blueprint $table) {
+                $table->dropColumn('subtype_id');
+            });
+
+            $this->info('Done!');
+        } else {
+            $this->info('Required table does not exist, please run migrations first.');
+        }
+    }
+}

app/Http/Controllers/Admin/Data/FeatureController.php

@@ -184,9 +184,11 @@ public function getFeatureIndex(Request $request) {
         }
         if (isset($data['subtype_id']) && $data['subtype_id'] != 'none') {
             if ($data['subtype_id'] == 'withoutOption') {
-                $query->whereNull('subtype_id');
+                $query->subtypes->isEmpty();
             } else {
-                $query->where('subtype_id', $data['subtype_id']);
+                $query->whereHas('subtypes', function ($query) use ($data) {
+                    $query->where('subtype_id', $data['subtype_id']);
+                });
             }
         }
         if (isset($data['name'])) {
@@ -253,7 +255,7 @@ public function getCreateFeature() {
             'feature'    => new Feature,
             'rarities'   => ['none' => 'Select a Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
             'specieses'  => ['none' => 'No restriction'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes'   => ['none' => 'No subtype'] + Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtypes'   => Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
             'categories' => ['none' => 'No category'] + FeatureCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
@@ -275,7 +277,7 @@ public function getEditFeature($id) {
             'feature'    => $feature,
             'rarities'   => ['none' => 'Select a Rarity'] + Rarity::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
             'specieses'  => ['none' => 'No restriction'] + Species::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtypes'   => ['none' => 'No subtype'] + Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtypes'   => Subtype::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
             'categories' => ['none' => 'No category'] + FeatureCategory::orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
         ]);
     }
@@ -291,7 +293,7 @@ public function getEditFeature($id) {
     public function postCreateEditFeature(Request $request, FeatureService $service, $id = null) {
         $id ? $request->validate(Feature::$updateRules) : $request->validate(Feature::$createRules);
         $data = $request->only([
-            'name', 'species_id', 'subtype_id', 'rarity_id', 'feature_category_id', 'description', 'image', 'remove_image', 'is_visible',
+            'name', 'species_id', 'subtype_ids', 'rarity_id', 'feature_category_id', 'description', 'image', 'remove_image', 'is_visible',
         ]);
         if ($id && $service->updateFeature(Feature::find($id), $data, Auth::user())) {
             flash('Trait updated successfully.')->success();
@@ -350,11 +352,11 @@ public function postDeleteFeature(Request $request, FeatureService $service, $id
      */
     public function getCreateEditFeatureSubtype(Request $request) {
         $species = $request->input('species');
-        $subtype_id = $request->input('subtype_id');
+        $subtype_ids = $request->input('subtype_ids');
 
         return view('admin.features._create_edit_feature_subtype', [
-            'subtypes'   => ['0' => 'Select Subtype'] + Subtype::where('species_id', '=', $species)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
-            'subtype_id' => $subtype_id,
+            'subtypes'    => Subtype::where('species_id', '=', $species)->orderBy('sort', 'DESC')->pluck('name', 'id')->toArray(),
+            'subtype_ids' => $subtype_ids,
         ]);
     }
 }

app/Http/Controllers/WorldController.php

@@ -264,7 +264,7 @@ public function getFeatureCategories(Request $request) {
      * @return \Illuminate\Contracts\Support\Renderable
      */
     public function getFeatures(Request $request) {
-        $query = Feature::visible(Auth::user() ?? null)->with('category', 'rarity', 'species', 'subtype');
+        $query = Feature::visible(Auth::user() ?? null)->with('category', 'rarity', 'species', 'subtypes');
 
         $data = $request->only(['rarity_id', 'feature_category_id', 'species_id', 'subtype_id', 'name', 'sort']);
 
@@ -287,9 +287,13 @@ public function getFeatures(Request $request) {
         }
         if (isset($data['subtype_id']) && $data['subtype_id'] != 'none') {
             if ($data['subtype_id'] == 'withoutOption') {
-                $query->whereNull('subtype_id');
+                $query->doesntHave('subtypes');
             } else {
-                $query->where('subtype_id', $data['subtype_id']);
+                if (isset($data['subtype_id']) && $data['subtype_id'] != 'none') {
+                    $query->whereHas('subtypes', function ($query) use ($data) {
+                        $query->where('subtype_id', $data['subtype_id']);
+                    });
+                }
             }
         }
         if (isset($data['name'])) {
@@ -358,15 +362,20 @@ public function getSpeciesFeatures($id) {
             abort(404);
         }
 
-        $features = $species->features()->visible(Auth::user() ?? null)->with('rarity', 'subtype');
+        $features = $species->features()->visible(Auth::user() ?? null)->with('rarity', 'subtypes');
         $features = count($categories) ?
             $features->orderByRaw('FIELD(feature_category_id,'.implode(',', $categories->pluck('id')->toArray()).')') :
             $features;
         $features = $features->orderByRaw('FIELD(rarity_id,'.implode(',', $rarities->pluck('id')->toArray()).')')
             ->orderBy('has_image', 'DESC')
             ->orderBy('name')
-            ->get()->filter(function ($feature) {
-                return $feature->subtype?->is_visible !== 0;
+            ->get()
+            ->filter(function ($feature) {
+                if (!$feature->subtypes->isEmpty()) {
+                    return !$feature->subtypes->where('is_visible', true)->isEmpty();
+                }
+
+                return true;
             })
             ->groupBy(['feature_category_id', 'id']);
 
@@ -413,7 +422,7 @@ public function getSubtypeFeatures($id, Request $request) {
         } else {
             $features = $features
                 ->filter(function ($feature) use ($subtype) {
-                    return !($feature->subtype && $feature->subtype->id != $subtype->id);
+                    return $feature->subtypes->isEmpty() || !$feature->subtypes->where('id', $subtype->id)->isEmpty();
                 })
                 ->groupBy(['feature_category_id', 'id']);
         }

app/Models/Feature/Feature.php

@@ -15,7 +15,7 @@ class Feature extends Model {
      * @var array
      */
     protected $fillable = [
-        'feature_category_id', 'species_id', 'subtype_id', 'rarity_id', 'name', 'has_image', 'description', 'parsed_description', 'is_visible', 'hash',
+        'feature_category_id', 'species_id', 'rarity_id', 'name', 'has_image', 'description', 'parsed_description', 'is_visible', 'hash',
     ];
 
     /**
@@ -32,7 +32,6 @@ class Feature extends Model {
     public static $createRules = [
         'feature_category_id' => 'nullable',
         'species_id'          => 'nullable',
-        'subtype_id'          => 'nullable',
         'rarity_id'           => 'required|exists:rarities,id',
         'name'                => 'required|unique:features|between:3,100',
         'description'         => 'nullable',
@@ -47,7 +46,6 @@ class Feature extends Model {
     public static $updateRules = [
         'feature_category_id' => 'nullable',
         'species_id'          => 'nullable',
-        'subtype_id'          => 'nullable',
         'rarity_id'           => 'required|exists:rarities,id',
         'name'                => 'required|between:3,100',
         'description'         => 'nullable',
@@ -75,17 +73,17 @@ public function species() {
     }
 
     /**
-     * Get the subtype the feature belongs to.
+     * Get the category the feature belongs to.
      */
-    public function subtype() {
-        return $this->belongsTo(Subtype::class);
+    public function category() {
+        return $this->belongsTo(FeatureCategory::class, 'feature_category_id');
     }
 
     /**
-     * Get the category the feature belongs to.
+     * Get the subtypes of this feature.
      */
-    public function category() {
-        return $this->belongsTo(FeatureCategory::class, 'feature_category_id');
+    public function subtypes() {
+        return $this->belongsToMany(Subtype::class, 'feature_subtypes');
     }
 
     /**********************************************************************************************
@@ -144,7 +142,14 @@ public function scopeSortSpecies($query) {
     public function scopeSortSubtype($query) {
         $ids = Subtype::orderBy('sort', 'DESC')->pluck('id')->toArray();
 
-        return count($ids) ? $query->orderBy(DB::raw('FIELD(subtype_id, '.implode(',', $ids).')')) : $query;
+        if (count($ids)) {
+            $ordered_subtypes = $this->subtypes()->latest('id')->pluck('id')->toArray();
+            foreach ($ordered_subtypes as $subtype) {
+                return $query->with('feature_subtypes')->orderBy(DB::raw($subtype.', '.implode(',', $ids).')'));
+            }
+        }
+
+        return $query;
     }
 
     /**
@@ -286,6 +291,32 @@ public function getAdminPowerAttribute() {
 
     **********************************************************************************************/
 
+    /**
+     * Gets the trait's subtypes that are visible to the current user.
+     *
+     * @param mixed|null $user
+     */
+    public function getSubtypes($user = null) {
+        return $this->subtypes()->visible($user)->get();
+    }
+
+    /**
+     * Displays the trait's subtypes as an imploded string.
+     *
+     * @param mixed|null $user
+     */
+    public function displaySubtypes($user = null) {
+        if (!count($this->subtypes()->visible($user)->get())) {
+            return 'None';
+        }
+        $subtypes = [];
+        foreach ($this->subtypes()->visible($user)->get() as $subtype) {
+            $subtypes[] = $subtype->displayName;
+        }
+
+        return implode(', ', $subtypes);
+    }
+
     public static function getDropdownItems($withHidden = 0) {
         $visibleOnly = 1;
         if ($withHidden) {
@@ -296,7 +327,7 @@ public static function getDropdownItems($withHidden = 0) {
             $sorted_feature_categories = collect(FeatureCategory::all()->where('is_visible', '>=', $visibleOnly)->sortBy('sort')->pluck('name')->toArray());
 
             $grouped = self::where('is_visible', '>=', $visibleOnly)
-                ->select('name', 'id', 'feature_category_id', 'rarity_id', 'species_id', 'subtype_id')->with(['category', 'rarity', 'species', 'subtype'])
+                ->select('name', 'id', 'feature_category_id', 'rarity_id', 'species_id')->with(['category', 'rarity', 'species', 'subtypes'])
                 ->orderBy('name')->get()->keyBy('id')->groupBy('category.name', $preserveKeys = true)
                 ->toArray();
             if (isset($grouped[''])) {
@@ -336,8 +367,13 @@ public static function getDropdownItems($withHidden = 0) {
                         : ''
                     ).
                     (
-                        config('lorekeeper.extensions.organised_traits_dropdown.display_subtype') && $feature['subtype_id'] ?
-                        ' <span class="text-muted"><small>('.$feature['subtype']['name'].')</small></span>'
+                        config('lorekeeper.extensions.organised_traits_dropdown.display_subtype') && count($feature['subtypes']) ?
+                        ' <span class="text-muted"><small>('.implode(', ', array_map(
+                            function (array $subtype) {
+                                return $subtype['name'];
+                            },
+                            $feature['subtypes']
+                        )).')</small></span>'
                         : ''
                     ).
                     ( // rarity

app/Models/Feature/FeatureSubtype.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Models\Feature;
+
+use App\Models\Model;
+use App\Models\Species\Subtype;
+
+class FeatureSubtype extends Model {
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'feature_id', 'subtype_id',
+    ];
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'feature_subtypes';
+
+    /**
+     * Whether the model contains timestamps to be saved and updated.
+     *
+     * @var string
+     */
+    public $timestamps = false;
+
+    /**********************************************************************************************
+
+        RELATIONS
+
+    **********************************************************************************************/
+
+    /**
+     * Get the feature associated with this record.
+     */
+    public function feature() {
+        return $this->belongsTo(Feature::class, 'feature_id');
+    }
+
+    /**
+     * Get the subtype associated with this record.
+     */
+    public function subtype() {
+        return $this->belongsTo(Subtype::class, 'subtype_id');
+    }
+}

app/Models/Species/Subtype.php

@@ -72,7 +72,7 @@ public function species() {
      * Get the features associated with this subtype.
      */
     public function features() {
-        return $this->hasMany(Feature::class);
+        return $this->belongsToMany(Feature::class, 'feature_subtypes');
     }
 
     /**********************************************************************************************