diff --git a/IDEAS.md b/IDEAS.md index 955f56f..a0cddf1 100644 --- a/IDEAS.md +++ b/IDEAS.md @@ -1,3 +1,6 @@ - Permettre à un user de suivre un projet -- permettre d'insérer des @user dans le texte avec lien vers user +- ~~permettre d'insérer des @user dans le texte avec lien vers user~~ + ~~pas de liens vers user mais mise en form~~ +- ~~parse de @user + envoie de mail si un seul user est trouvé~~ - permettre de modifier son mot de passe ? (je crois que ça n'as pas été mis exprès) +- ~~parser les liens http~~ diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php index f8fc8f2..1a7bb07 100644 --- a/app/Http/Controllers/TicketController.php +++ b/app/Http/Controllers/TicketController.php @@ -3,20 +3,21 @@ namespace App\Http\Controllers; use App\Enums\TicketStatus; -use App\Enums\TicketType; use App\Events\NotifySubscriptions; -use App\Events\TicketStatusChanged; use App\Http\Requests\ChangeTicketStatus; use App\Http\Requests\CreateMessage; use App\Http\Requests\SortTickets; use App\Http\Requests\StoreTicket; use App\Http\Requests\UpdateTicket; +use App\Jobs\SendTicketMentionMail; use App\Mail\NewTicket; +use App\Mail\TicketMention; use App\Models\Message; use App\Models\Project; use App\Models\Ticket; use App\Models\User; use Exception; +use Illuminate\Database\QueryException; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Mail; @@ -128,7 +129,10 @@ class TicketController extends Controller } $ticket->user()->associate(auth()->user()); - $ticket->save(); + $ticket->saveOrFail(); + /** @var \App\Models\User */ + $user = auth()->user(); + $user->subscriptions()->toggle($ticket->id); if (config('mail.MAIL_ADMIN')) { Mail::to(config('mail.MAIL_ADMIN'))->send(new NewTicket($ticket)); @@ -136,7 +140,7 @@ class TicketController extends Controller throw new Exception('Missing MAIL_ADMIN in .env'); } - return redirect()->route('home')->with('success', 'Ticket enregistré !'); + return redirect()->route('ticket.show', $ticket)->with('success', 'Ticket enregistré !'); } // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass @@ -184,7 +188,16 @@ class TicketController extends Controller $message = new Message($request->validated()); $message->user()->associate(auth()->user()); $message->ticket()->associate($ticket); - $message->save(); + $message->saveOrFail(); + + /** @var \App\Models\User */ + $user = auth()->user(); + + if ($request->subscribe) { + $user->subscriptions()->attach($ticket->id); + } else { + $user->subscriptions()->detach($ticket->id); + } if ($request->file_message) { $projectSlug = Str::slug($ticket->project->name); @@ -204,6 +217,25 @@ class TicketController extends Controller ]) )); + // find @user + send mail si un seul user est trouvé + $matches = []; + \preg_match_all('/@\w*/', $message->message, $matches); + $matches = collect($matches[0] ?? [])->unique(); + foreach ($matches as $pseudo_usertag) { + try { + $user = User::where('name', 'LIKE', '%' . ltrim($pseudo_usertag, '@') . '%') + ->whereDoesntHave('subscriptions', function ($q) use ($ticket) { + $q->where('id', $ticket->id); + })->firstOrFail(); + SendTicketMentionMail::dispatchAfterResponse( + $user, + new TicketMention($ticket, $message->message) + ); + } catch (QueryException $e) { + continue; + } + } + return back(); } diff --git a/app/Http/Requests/ChangeTicketStatus.php b/app/Http/Requests/ChangeTicketStatus.php index 4d681d0..f66afef 100644 --- a/app/Http/Requests/ChangeTicketStatus.php +++ b/app/Http/Requests/ChangeTicketStatus.php @@ -7,6 +7,17 @@ use Illuminate\Foundation\Http\FormRequest; class ChangeTicketStatus extends FormRequest { + /** + * Determine if the user is authorized to make this request. + * + * @return bool + */ + public function authorize() + { + return auth()->check() and + auth()->user()->role === 1; + } + /** * Get the validation rules that apply to the request. * diff --git a/app/Http/Requests/CreateMessage.php b/app/Http/Requests/CreateMessage.php index 3e7e58e..8372c88 100644 --- a/app/Http/Requests/CreateMessage.php +++ b/app/Http/Requests/CreateMessage.php @@ -6,6 +6,20 @@ use Illuminate\Foundation\Http\FormRequest; class CreateMessage extends FormRequest { + /** + * Determine if the user is authorized to make this request. + * + * @return bool + */ + public function authorize() + { + $this->merge([ + 'subscribe' => $this->subscribe ? true : false + ]); + return auth()->check() and (auth()->user()->role === 1 or + $this->ticket->project->id === auth()->user()->project_id); + } + /** * Get the validation rules that apply to the request. * @@ -14,6 +28,7 @@ class CreateMessage extends FormRequest public function rules() { return [ + 'subscribe' => 'required|boolean', 'message' => 'required|min:' . (auth()->user()->role == 1 ? '5' : '20'), 'file_message' => 'sometimes|mimes:jpeg,jpg,png,pdf|max:2048' ]; diff --git a/app/Http/Requests/StoreProject.php b/app/Http/Requests/StoreProject.php index b607417..0ce8310 100644 --- a/app/Http/Requests/StoreProject.php +++ b/app/Http/Requests/StoreProject.php @@ -13,7 +13,8 @@ class StoreProject extends FormRequest */ public function authorize() { - return auth()->check(); + return auth()->check() and + auth()->user()->role === 1; } /** diff --git a/app/Http/Requests/UpdateProject.php b/app/Http/Requests/UpdateProject.php index 307790d..2cc5353 100644 --- a/app/Http/Requests/UpdateProject.php +++ b/app/Http/Requests/UpdateProject.php @@ -2,7 +2,6 @@ namespace App\Http\Requests; - class UpdateProject extends StoreProject { } diff --git a/app/Http/Requests/UpdateTicket.php b/app/Http/Requests/UpdateTicket.php index 167da51..cdc15b9 100644 --- a/app/Http/Requests/UpdateTicket.php +++ b/app/Http/Requests/UpdateTicket.php @@ -11,11 +11,10 @@ class UpdateTicket extends StoreTicket if (auth()->user()->project_id) { $this->merge([ 'project_id' => auth()->user()->project_id, - 'status' => TicketStatus::new()->value, + 'status' => $this->project->status->value, ]); } - return auth()->check() or - auth()->user()->role === 1 or - request()->route()->ticket->created_by === auth()->user()->id; + return auth()->check() and (auth()->user()->role === 1 or + request()->route()->ticket->created_by === auth()->user()->id); } } diff --git a/app/Jobs/SendTicketMentionMail.php b/app/Jobs/SendTicketMentionMail.php new file mode 100644 index 0000000..3bbc35c --- /dev/null +++ b/app/Jobs/SendTicketMentionMail.php @@ -0,0 +1,45 @@ +user = $user; + $this->mail = $mail; + } + + /** + * Execute the job. + * + * @return void + */ + public function handle() + { + Mail::to($this->user->email)->send($this->mail); + Log::debug(sprintf('Mention mail sent to %s', $this->user->email)); + } +} diff --git a/app/Lib/Utils.php b/app/Lib/Utils.php new file mode 100644 index 0000000..457dc2e --- /dev/null +++ b/app/Lib/Utils.php @@ -0,0 +1,34 @@ +[^\s@]+@([^\s@.,]+\.)+[^\s@.,]{2,})|(?P@\w*)|(?P(?:http[s]?:\/\/.)?(?:www\.)?[-a-zA-Z0-9@%._\+~#=]{2,256}\.[a-z]{2,6}\b(?:[-a-zA-Z0-9@:%_\+.~#?&\/\/=]*))/', + function ($matches) { + $match = collect($matches)->first() ?? ''; + if (filter_var($match, FILTER_VALIDATE_EMAIL)) { + return strlen($match) ? "$match" : $match; + } elseif (isset($matches['user']) and strlen($matches['user'])) { + return sprintf( + '%s', + $matches['user'] + ); + } else { + $url = $match; + if (\strpos($url, 'http') === false and \strpos($url, 'https') === false) { + $url = sprintf('http://%s', $url); + } + return strlen($match) ? "$match" : $match; + } + }, + $text + ); + return nl2br($text); + } +} diff --git a/app/Mail/TicketMention.php b/app/Mail/TicketMention.php new file mode 100644 index 0000000..a38f6fa --- /dev/null +++ b/app/Mail/TicketMention.php @@ -0,0 +1,45 @@ +ticket = $ticket; + $this->corpsMaj = $corpsMaj; + } + + /** + * Build the message. + * + * @return $this + */ + public function build() + { + $ticket = $this->ticket; + $corpsMaj = Utils::plainToHtml($this->corpsMaj); + return $this->subject("[SupportWeb] Vous avez été mentionné sur le ticket n° $ticket->id") + ->view('mails.ticket-mention', compact('ticket', 'corpsMaj')); + } +} diff --git a/app/Mail/TicketUpdate.php b/app/Mail/TicketUpdate.php index 17673de..72fd314 100644 --- a/app/Mail/TicketUpdate.php +++ b/app/Mail/TicketUpdate.php @@ -2,6 +2,8 @@ namespace App\Mail; +use App\Lib\Utils; +use App\Models\Ticket; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; @@ -9,16 +11,21 @@ use Illuminate\Queue\SerializesModels; class TicketUpdate extends Mailable { - use Queueable, SerializesModels; + use Queueable; + use SerializesModels; - private $ticket, $corpsMaj; + /** @var Ticket */ + private $ticket; + + /** @var string */ + private $corpsMaj; /** * Create a new message instance. * * @return void */ - public function __construct($ticket, $corpsMaj) + public function __construct(Ticket $ticket, string $corpsMaj) { $this->ticket = $ticket; $this->corpsMaj = $corpsMaj; @@ -32,7 +39,7 @@ class TicketUpdate extends Mailable public function build() { $ticket = $this->ticket; - $corpsMaj = $this->corpsMaj; + $corpsMaj = Utils::plainToHtml($this->corpsMaj); return $this->subject("[SupportWeb] Le ticket n°" . $ticket->id . " à été mis à jour")->view('mails.ticket-update', compact('ticket', 'corpsMaj')); } } diff --git a/config/app.php b/config/app.php index c697c9a..58b8ecc 100644 --- a/config/app.php +++ b/config/app.php @@ -227,7 +227,8 @@ return [ 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, 'TicketType' => App\Enums\TicketType::class, - 'TicketStatus' => App\Enums\TicketStatus::class + 'TicketStatus' => App\Enums\TicketStatus::class, + 'Utils' => App\Lib\Utils::class ], ]; diff --git a/resources/views/mails/new-ticket.blade.php b/resources/views/mails/new-ticket.blade.php index 2fa6d10..7b18c5c 100644 --- a/resources/views/mails/new-ticket.blade.php +++ b/resources/views/mails/new-ticket.blade.php @@ -3,7 +3,7 @@

Description :
diff --git a/resources/views/mails/ticket-mention.blade.php b/resources/views/mails/ticket-mention.blade.php new file mode 100644 index 0000000..12399e8 --- /dev/null +++ b/resources/views/mails/ticket-mention.blade.php @@ -0,0 +1,9 @@ +

Bonjour,

+

Vous avez été mentionné sur le ticket n°{{ $ticket->id }}:

+ +

{!! $corpsMaj !!}

+

Lien vers le ticket : Ouvrir dans un nouvel onglet

diff --git a/resources/views/mails/ticket-update.blade.php b/resources/views/mails/ticket-update.blade.php index 5f021c8..9b8fcc7 100644 --- a/resources/views/mails/ticket-update.blade.php +++ b/resources/views/mails/ticket-update.blade.php @@ -3,7 +3,7 @@

{!! $corpsMaj !!}

Lien vers le ticket : Ouvrir dans un nouvel onglet

diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php index 18e7aaa..a54a661 100644 --- a/resources/views/ticket/show.blade.php +++ b/resources/views/ticket/show.blade.php @@ -63,8 +63,25 @@