X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FHttp%2FControllers%2FResultController.php;h=57f78a157f2d1537cebc3bee96626cd629271a12;hb=537b998e8059c56e3a20ee2a89d42c3bbfbb80b8;hp=b23c907f680b28edcc5dbb40efc1cbcd44c8933b;hpb=812a270c7a410461e931394496512d36b34ef7b5;p=alttp.git

diff --git a/app/Http/Controllers/ResultController.php b/app/Http/Controllers/ResultController.php
index b23c907..57f78a1 100644
--- a/app/Http/Controllers/ResultController.php
+++ b/app/Http/Controllers/ResultController.php
@@ -2,11 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use App\Events\ResultReported;
-use App\Models\Participant;
+use App\Events\ResultChanged;
+use App\Models\DiscordBotCommand;
 use App\Models\Protocol;
 use App\Models\Result;
 use App\Models\Round;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class ResultController extends Controller
@@ -14,36 +15,56 @@ class ResultController extends Controller
 
 	public function create(Request $request) {
 		$validatedData = $request->validate([
+			'comment' => 'string',
 			'forfeit' => 'boolean',
-			'participant_id' => 'required|exists:App\\Models\\Participant,id',
 			'round_id' => 'required|exists:App\\Models\\Round,id',
-			'time' => 'required_if:forfeit,false|numeric',
+			'time' => 'numeric',
+			'user_id' => 'required|exists:App\\Models\\User,id',
 		]);
-		error_log(var_export($validatedData, true));
 
-		$participant = Participant::findOrFail($validatedData['participant_id']);
 		$round = Round::findOrFail($validatedData['round_id']);
 
-		$user = $request->user();
-		if ($user->id != $participant->user->id) {
+		if ($validatedData['user_id'] != $request->user()->id) {
 			$this->authorize('create', Result::class);
 		}
 
-		$result = Result::updateOrCreate([
+		$result = Result::firstOrCreate([
 			'round_id' => $validatedData['round_id'],
-			'user_id' => $participant->user_id,
-		], [
-			'forfeit' => $validatedData['forfeit'],
-			'time' => isset($validatedData['time']) ? $validatedData['time'] : 0,
+			'user_id' => $validatedData['user_id'],
 		]);
+		if (!$round->locked) {
+			if (isset($validatedData['forfeit'])) $result->forfeit = $validatedData['forfeit'];
+			if (isset($validatedData['time'])) $result->time = $validatedData['time'];
+		}
+		$result->comment = $validatedData['comment'] ? $validatedData['comment'] : null;
+		$result->save();
+
+		if ($result->wasChanged()) {
+			ResultChanged::dispatch($result);
+		}
 
-		Protocol::resultReported(
-			$round->tournament,
-			$result,
-			$request->user(),
-		);
+		if ($result->wasChanged(['forfeit', 'time'])) {
+			Protocol::resultReported(
+				$round->tournament,
+				$result,
+				$request->user(),
+			);
+			DiscordBotCommand::queueResult($result);
+		} else if ($result->wasChanged('comment')) {
+			Protocol::resultCommented(
+				$round->tournament,
+				$result,
+				$request->user(),
+			);
+		}
+
+		$round->load('results');
+		$round->updatePlacement();
+		if ($round->tournament->hasScoreboard()) {
+			$round->tournament->updatePlacement();
+		}
 
-		ResultReported::dispatch($result);
+		$result->load('user');
 
 		return $result->toJson();
 	}