From 1bb1b8d211a08299af87c46c67f8d6de57e267b4 Mon Sep 17 00:00:00 2001 From: Arthur Monney Date: Mon, 17 Jan 2022 17:51:27 +0100 Subject: [PATCH 1/3] :recycle: mis a jour de l'attribution des points dans le commentaire discussion --- app/Http/Controllers/Api/ReplyController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/ReplyController.php b/app/Http/Controllers/Api/ReplyController.php index 74f3ba72..fde78c61 100644 --- a/app/Http/Controllers/Api/ReplyController.php +++ b/app/Http/Controllers/Api/ReplyController.php @@ -15,6 +15,7 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\AnonymousResourceCollection; +use Illuminate\Support\Facades\Auth; class ReplyController extends Controller { @@ -47,7 +48,7 @@ public function store(CreateReplyRequest $request): ReplyResource $reply->to($target); $reply->save(); - givePoint(new ReplyCreated($target), $author); + givePoint(new ReplyCreated($target), Auth::user()); // On envoie un event pour une nouvelle réponse à tous les abonnés de la discussion event(new CommentWasAdded($reply, $target)); From 7e0290836a859c3aaddad99ef349ba1dc6bccd4b Mon Sep 17 00:00:00 2001 From: Arthur Monney Date: Mon, 17 Jan 2022 19:52:56 +0100 Subject: [PATCH 2/3] :ambulance: correction du bug sur les commentaires --- app/Gamify/Points/ReplyCreated.php | 8 ++++++-- app/Http/Controllers/Api/ReplyController.php | 5 ++++- app/Http/Livewire/Forum/CreateReply.php | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/Gamify/Points/ReplyCreated.php b/app/Gamify/Points/ReplyCreated.php index cabdb51c..8be711e8 100644 --- a/app/Gamify/Points/ReplyCreated.php +++ b/app/Gamify/Points/ReplyCreated.php @@ -2,19 +2,23 @@ namespace App\Gamify\Points; +use App\Models\User; use QCod\Gamify\PointType; class ReplyCreated extends PointType { public int $points = 2; - public function __construct($subject) + public User $author; + + public function __construct($subject, $author) { $this->subject = $subject; + $this->author = $author; } public function payee() { - return $this->getSubject()->author; + return $this->author; } } diff --git a/app/Http/Controllers/Api/ReplyController.php b/app/Http/Controllers/Api/ReplyController.php index fde78c61..a40bdd78 100644 --- a/app/Http/Controllers/Api/ReplyController.php +++ b/app/Http/Controllers/Api/ReplyController.php @@ -48,7 +48,7 @@ public function store(CreateReplyRequest $request): ReplyResource $reply->to($target); $reply->save(); - givePoint(new ReplyCreated($target), Auth::user()); + $author->givePoint(new ReplyCreated($target, $author)); // On envoie un event pour une nouvelle réponse à tous les abonnés de la discussion event(new CommentWasAdded($reply, $target)); @@ -80,6 +80,9 @@ public function delete(int $id): JsonResponse { /** @var Reply $reply */ $reply = Reply::findOrFail($id); + + undoPoint(new ReplyCreated($reply->replyAble, $reply->author)); + $reply->delete(); return response()->json(['message' => 'Commentaire supprimé avec succès']); diff --git a/app/Http/Livewire/Forum/CreateReply.php b/app/Http/Livewire/Forum/CreateReply.php index 2ee4f8c0..52a3a946 100644 --- a/app/Http/Livewire/Forum/CreateReply.php +++ b/app/Http/Livewire/Forum/CreateReply.php @@ -40,9 +40,9 @@ public function save() $reply->to($this->thread); $reply->save(); - event(new ReplyWasCreated($reply)); + givePoint(new ReplyCreated($this->thread, Auth::user())); - givePoint(new ReplyCreated($this->thread)); + event(new ReplyWasCreated($reply)); session()->flash('status', 'Réponse ajoutée avec succès!'); From b7bb099458e6411792fc35d192a38417389f082e Mon Sep 17 00:00:00 2001 From: mckenziearts Date: Mon, 17 Jan 2022 18:53:41 +0000 Subject: [PATCH 3/3] Apply php-cs-fixer changes --- app/Http/Controllers/Api/ReplyController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Api/ReplyController.php b/app/Http/Controllers/Api/ReplyController.php index a40bdd78..670c1823 100644 --- a/app/Http/Controllers/Api/ReplyController.php +++ b/app/Http/Controllers/Api/ReplyController.php @@ -15,7 +15,6 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\AnonymousResourceCollection; -use Illuminate\Support\Facades\Auth; class ReplyController extends Controller {