Merge remote-tracking branch 'upstream/develop' into feat/multiple-trait-subtypes

Author: Draconizations

app/Console/Commands/ConvertRewards.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Reward\Reward;
+use DB;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Schema;
+
+class ConvertRewards extends Command {
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'convert-rewards';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Converts existing rewards on general objects (ex. prompts) to the new system.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle() {
+        $this->info('************************');
+        $this->info('* CONVERT REWARDS     *');
+        $this->info('************************'."\n");
+
+        $this->line("Converting prompt rewards...\n");
+        if (Schema::hasTable('prompt_rewards')) {
+            $promptRewards = DB::table('prompt_rewards')->get();
+            $bar = $this->output->createProgressBar(count($promptRewards));
+            $bar->start();
+            foreach ($promptRewards as $promptReward) {
+                Reward::create([
+                    'object_model'    => 'App\Models\Prompt\Prompt',
+                    'object_id'       => $promptReward->prompt_id,
+                    'rewardable_type' => $promptReward->rewardable_type,
+                    'rewardable_id'   => $promptReward->rewardable_id,
+                    'quantity'        => $promptReward->quantity,
+                ]);
+
+                $bar->advance();
+            }
+            $bar->finish();
+            $this->info("\nDone!");
+            Schema::dropIfExists('prompt_rewards');
+        } else {
+            $this->info('No prompt rewards to convert.');
+        }
+
+        // Add other object types here as needed...
+
+        $this->info("\nAll done!");
+    }
+}

app/Helpers/AssetHelpers.php

@@ -144,6 +144,14 @@ function getAssetModelString($type, $namespaced = true) {
                 return 'CharacterItem';
             }
             break;
+
+        case 'prompts': case 'prompt':
+            if ($namespaced) {
+                return '\App\Models\Prompt\Prompt';
+            } else {
+                return 'Prompt';
+            }
+            break;
     }
 
     return null;
@@ -200,7 +208,10 @@ function addAsset(&$array, $asset, $quantity = 1) {
     if (isset($array[$asset->assetType][$asset->id])) {
         $array[$asset->assetType][$asset->id]['quantity'] += $quantity;
     } else {
-        $array[$asset->assetType][$asset->id] = ['asset' => $asset, 'quantity' => $quantity];
+        $array[$asset->assetType][$asset->id] = [
+            'asset'    => $asset,
+            'quantity' => $quantity,
+        ];
     }
 }
 

app/Helpers/Helpers.php

@@ -503,3 +503,23 @@ function hasUnlockedLimits($object) {
 
     return $service->checkLimits($object);
 }
+
+/**
+ * Returns the given objects rewards, if any.
+ *
+ * @param mixed $object
+ *
+ * @return bool
+ */
+function getRewards($object) {
+    return App\Models\Reward\Reward::where('object_model', get_class($object))->where('object_id', $object->id)->get();
+}
+
+/**
+ * checks if a certain object has any rewards.
+ *
+ * @param mixed $object
+ */
+function hasRewards($object) {
+    return App\Models\Reward\Reward::where('object_model', get_class($object))->where('object_id', $object->id)->exists();
+}

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

@@ -210,7 +210,8 @@ public function getEditPrompt($id) {
     public function postCreateEditPrompt(Request $request, PromptService $service, $id = null) {
         $id ? $request->validate(Prompt::$updateRules) : $request->validate(Prompt::$createRules);
         $data = $request->only([
-            'name', 'prompt_category_id', 'summary', 'description', 'start_at', 'end_at', 'hide_before_start', 'hide_after_end', 'is_active', 'rewardable_type', 'rewardable_id', 'quantity', 'image', 'remove_image', 'prefix', 'hide_submissions', 'staff_only',
+            'name', 'prompt_category_id', 'summary', 'description', 'start_at', 'end_at', 'hide_before_start', 'hide_after_end', 'is_active', 'image', 'remove_image', 'prefix', 'hide_submissions', 'staff_only',
+            'rewardable_type', 'rewardable_id', 'quantity', 'rewardable_recipient',
         ]);
         if ($id && $service->updatePrompt(Prompt::find($id), $data, Auth::user())) {
             flash('Prompt updated successfully.')->success();

app/Http/Controllers/Admin/RewardController.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Services\RewardService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class RewardController extends Controller {
+    /**
+     * Creates or edits an objects rewards.
+     *
+     * @param App\Services\RewardService $service
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postPopulateRewards(Request $request, RewardService $service) {
+        $data = $request->only([
+            'object_model', 'object_id',
+            'rewardable_recipient', 'rewardable_type', 'rewardable_id', 'quantity',
+            'data',
+        ]);
+        if ($service->populateRewards($data['object_model'], $data['object_id'], $data, Auth::user())) {
+            flash('Rewards updated successfully.')->success();
+        } else {
+            foreach ($service->errors()->getMessages()['error'] as $error) {
+                flash($error)->error();
+            }
+        }
+
+        return redirect()->back();
+    }
+}

app/Http/Controllers/WorldController.php

@@ -453,8 +453,11 @@ public function getUniversalFeatures(Request $request) {
         $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')
+        $features = count($rarities) ?
+            $features->orderByRaw('FIELD(rarity_id,'.implode(',', $rarities->pluck('id')->toArray()).')') :
+            $features;
+
+        $features->orderBy('has_image', 'DESC')
             ->orderBy('name')
             ->get()->groupBy(['feature_category_id', 'id']);
 
@@ -493,15 +496,17 @@ public function getKitchenSinkFeatures(Request $request) {
         $categories = FeatureCategory::orderBy('sort', 'DESC')->get();
         $rarities = Rarity::orderBy('sort', 'ASC')->get();
 
+        $features = Feature::visible(Auth::user() ?? null);
+
         $features = count($categories) ?
-        $query = Feature::visible(Auth::user() ?? null)->orderByRaw('FIELD(feature_category_id,'.implode(',', $categories->pluck('id')->toArray()).')')
-            ->orderByRaw('FIELD(rarity_id,'.implode(',', $rarities->pluck('id')->toArray()).')')
-            ->orderBy('has_image', 'DESC')
-            ->orderBy('name')
-            ->get()
-            ->groupBy(['feature_category_id', 'id']) :
-        $query = Feature::visible(Auth::user() ?? null)->orderByRaw('FIELD(rarity_id,'.implode(',', $rarities->pluck('id')->toArray()).')')
-            ->orderBy('has_image', 'DESC')
+            $features->orderByRaw('FIELD(feature_category_id,'.implode(',', $categories->pluck('id')->toArray()).')') :
+            $features;
+
+        $features = count($rarities) ?
+            $features->orderByRaw('FIELD(rarity_id,'.implode(',', $rarities->pluck('id')->toArray()).')') :
+            $features;
+
+        $features->orderBy('has_image', 'DESC')
             ->orderBy('name')
             ->get()
             ->groupBy(['feature_category_id', 'id']);

app/Models/Prompt/Prompt.php

@@ -3,6 +3,7 @@
 namespace App\Models\Prompt;
 
 use App\Models\Model;
+use App\Models\Reward\Reward;
 use Carbon\Carbon;
 
 class Prompt extends Model {
@@ -79,7 +80,7 @@ public function category() {
      * Get the rewards attached to this prompt.
      */
     public function rewards() {
-        return $this->hasMany(PromptReward::class, 'prompt_id');
+        return $this->morphMany(Reward::class, 'object', 'object_model', 'object_id');
     }
 
     /**********************************************************************************************

app/Models/Prompt/PromptReward.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Models\Reward;
+
+use App\Models\Model;
+
+class Reward extends Model {
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'object_id', 'object_model', 'rewardable_recipient', 'rewardable_id', 'rewardable_type', 'quantity', 'data',
+    ];
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'rewards';
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'data' => 'array',
+    ];
+
+    /**********************************************************************************************
+
+        RELATIONS
+
+    **********************************************************************************************/
+
+    /**
+     * Get the object that this reward is attached to.
+     */
+    public function object() {
+        return $this->morphTo('object', 'object_model', 'object_id');
+    }
+
+    /**
+     * Get the reward associated with this entry.
+     */
+    public function reward() {
+        $model = getAssetModelString(strtolower($this->rewardable_type));
+
+        if (!class_exists($model)) {
+            // Laravel requires a relationship instance to be returned (cannot return null), so returning one that doesn't exist here.
+            return $this->belongsTo(self::class, 'id', 'item_id')->whereNull('item_id');
+        }
+
+        return $this->belongsTo($model, 'rewardable_id');
+    }
+
+    /**********************************************************************************************
+
+        OTHER FUNCTIONS
+
+    **********************************************************************************************/
+
+    /**
+     * checks if a certain object has any rewards.
+     *
+     * @param mixed $object
+     */
+    public static function hasRewards($object) {
+        return self::where('object_model', get_class($object))->where('object_id', $object->id)->exists();
+    }
+
+    /**
+     * get the rewards of a certain object.
+     *
+     * @param mixed $object
+     */
+    public static function getRewards($object) {
+        return self::where('object_model', get_class($object))->where('object_id', $object->id)->get();
+    }
+}

app/Models/Reward/Reward.php

@@ -27,9 +27,10 @@ class LimitService extends Service {
      * edits an limits on an object.
      *
      * @param mixed     $data
-     * @param bool|true $log
      * @param mixed     $object_model
      * @param mixed     $object_id
+     * @param mixed     $data
+     * @param bool|true $log
      */
     public function editLimits($object_model, $object_id, $data, $log = true) {
         DB::beginTransaction();