Merge branch 'develop' into trunk

This commit is contained in:
Jérémy Munsch 2021-05-18 22:53:27 +02:00
commit 78874d79d6
16 changed files with 250 additions and 31 deletions

View file

@ -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~~

View file

@ -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();
}

View file

@ -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.
*

View file

@ -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'
];

View file

@ -13,7 +13,8 @@ class StoreProject extends FormRequest
*/
public function authorize()
{
return auth()->check();
return auth()->check() and
auth()->user()->role === 1;
}
/**

View file

@ -2,7 +2,6 @@
namespace App\Http\Requests;
class UpdateProject extends StoreProject
{
}

View file

@ -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);
}
}

View file

@ -0,0 +1,45 @@
<?php
namespace App\Jobs;
use App\Mail\TicketMention;
use App\Models\User;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail;
class SendTicketMentionMail implements ShouldQueue
{
use Dispatchable;
use SerializesModels;
/** @var User */
private $user;
/** @var TicketMention */
private $mail;
/**
* Create a new job instance.
*
* @return void
*/
public function __construct(User $user, TicketMention $mail)
{
$this->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));
}
}

34
app/Lib/Utils.php Normal file
View file

@ -0,0 +1,34 @@
<?php
namespace App\Lib;
class Utils
{
public static function plainToHtml(string $text)
{
$text = e($text);
// url replace and email replace
$text = preg_replace_callback(
'/(?P<email>[^\s@]+@([^\s@.,]+\.)+[^\s@.,]{2,})|(?P<user>@\w*)|(?P<url>(?: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) ? "<a href=\"mailto:$match\">$match</a>" : $match;
} elseif (isset($matches['user']) and strlen($matches['user'])) {
return sprintf(
'<span class="text-primary fw-bold font-weight-bold">%s</span>',
$matches['user']
);
} else {
$url = $match;
if (\strpos($url, 'http') === false and \strpos($url, 'https') === false) {
$url = sprintf('http://%s', $url);
}
return strlen($match) ? "<a href=\"$url\" target=\"_blank\">$match</a>" : $match;
}
},
$text
);
return nl2br($text);
}
}

View file

@ -0,0 +1,45 @@
<?php
namespace App\Mail;
use App\Lib\Utils;
use App\Models\Ticket;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
class TicketMention extends Mailable
{
use Queueable;
use SerializesModels;
/** @var Ticket */
private $ticket;
/** @var string */
private $corpsMaj;
/**
* Create a new message instance.
*
* @return void
*/
public function __construct(Ticket $ticket, string $corpsMaj)
{
$this->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'));
}
}

View file

@ -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'));
}
}

View file

@ -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
],
];

View file

@ -3,7 +3,7 @@
<ul>
<li>Projet : {{ $ticket->project->name }}</li>
<li>Type : {{ $ticket->type === "0" ? "Bug" : "Évolution" }}</li>
<li>Créer par : {{ $ticket->user->name }}</li>
<li>Créé par : {{ $ticket->user->name }}</li>
</ul>
<p>
Description :<br>

View file

@ -0,0 +1,9 @@
<p>Bonjour,</p>
<p>Vous avez été mentionné sur le ticket n°{{ $ticket->id }}:</p>
<ul>
<li>Projet : {{ $ticket->project->name }}</li>
<li>Type : {{ $ticket->type === 0 ? "Bug" : "Évolution" }}</li>
<li>Créé par : {{ $ticket->user->name }}</li>
</ul>
<p>{!! $corpsMaj !!}</p>
<p>Lien vers le ticket : <a href="{{ route('ticket.show', $ticket->id) }}" target="_blank">Ouvrir dans un nouvel onglet</a></p>

View file

@ -3,7 +3,7 @@
<ul>
<li>Projet : {{ $ticket->project->name }}</li>
<li>Type : {{ $ticket->type === 0 ? "Bug" : "Évolution" }}</li>
<li>Créer par : {{ $ticket->user->name }}</li>
<li>Créé par : {{ $ticket->user->name }}</li>
</ul>
<p>{!! $corpsMaj !!}</p>
<p>Lien vers le ticket : <a href="{{ route('ticket.show', $ticket->id) }}" target="_blank">Ouvrir dans un nouvel onglet</a></p>

View file

@ -63,8 +63,25 @@
</button>
</div>
<div class="modal-body">
<textarea name="message" class="form-control" rows="10"></textarea><br>
<input type="file" name="file_message" accept="image/jpeg, image/png, image/jpg, .pdf">
<div class="row">
<div class="col">
<textarea name="message" class="form-control" rows="10"></textarea>
</div>
</div>
<div class="row mt-4">
<div class="col">
<label for="formFile" class="form-label">Joindre un fichier (jpg, png, pdf) 2Mo max</label>
<input class="form-control" type="file" id="formFile" name="file_message" accept="image/jpeg, image/png, image/jpg, .pdf">
</div>
</div>
<div class="row mt-4">
<div class="col">
<div class="form-check">
<input name="subscribe" type="checkbox" class="form-check-input" id="subscribeResponse" autocomplete="off" @if ($isSubscribed)checked @endif value="1">
<label class="form-check-label" for="subscribeResponse">Suivre le ticket</label>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="reset" class="btn btn-sm btn-danger" data-dismiss="modal">Fermer</button>
@ -79,22 +96,23 @@
@foreach ($messages as $message)
@if ($message->user_id === null)
<div class="offset-md-3 col-md-6 alert alert-secondary text-center">
{!! nl2br(e($message->message)) !!} - Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}} <small class="text-muted">(Message système)</small>
{!! nl2br(e($message->message)) !!} - Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}}
<small class="text-muted">(Message système)</small>
</div>
@elseif ($message->user_id === Auth::user()->id)
<div class="offset-md-4 col-md-8 alert alert-primary text-right">
{!! nl2br(e($message->message)) !!}<br>
<div class="offset-md-4 col-md-8 alert alert-primary">
{!! Utils::plainToHtml($message->message) !!}
@if ($message->file !== null)
<a data-fslightbox href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
@endif
<br><a data-fslightbox href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
@endif<br><br>
<small class="text-muted">Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}} par {{ $message->user->name }}</small>
</div>
@else
<div class="col-md-8 alert alert-success text-left">
{!! nl2br(e($message->message)) !!}<br>
<div class="col-md-8 alert alert-success">
{!! Utils::plainToHtml($message->message) !!}
@if ($message->file !== null)
<a data-fslightbox href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
@endif
<br><a data-fslightbox href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
@endif<br><br>
<small class="text-muted">Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}} par {{ $message->user->name }}</small>
</div>
@endif
@ -103,7 +121,7 @@
<hr>
<div>
<h4>Description</h4>
<p>{!! nl2br(e($ticket->text)) !!}</p>
<p>{!! Utils::plainToHtml($ticket->text) !!}</p>
<small class="text-muted">Créé le {{ \Carbon\Carbon::parse($ticket->created_at)->format('d/m/Y à H:i') }} par <b>{{ $ticket->user->name }}</b></small>
</div>
@if ($ticket->file !== null || $ticket->file2 !== null)