From fada6d80e1acc776be159b785d85fc65a6a6077a Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Thu, 6 Apr 2023 10:20:30 +0000
Subject: [PATCH 01/14] Created MessageType Enum

---
 app/Enums/MessageType.php | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 app/Enums/MessageType.php

diff --git a/app/Enums/MessageType.php b/app/Enums/MessageType.php
new file mode 100644
index 0000000..a18274b
--- /dev/null
+++ b/app/Enums/MessageType.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Enums;
+
+use Kwaadpepper\Enum\BaseEnumRoutable;
+
+/**
+ * @method static self private()
+ * @method static self public()
+ */
+class MessageType extends BaseEnumRoutable
+{
+    /**
+     * Enum values
+     *
+     * @return array
+     */
+    protected static function values(): array
+    {
+        return [
+            'private' => 1,
+            'public' => 2
+        ];
+    }
+
+    /**
+     * Enum labels
+     *
+     * @return array
+     */
+    protected static function labels(): array
+    {
+        return [
+            'private' => trans('Privé'),
+            'public' => trans('Public'),
+        ];
+    }
+}

From 0be5816bf799fdd3896d5d7e451a599694dde167 Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Thu, 6 Apr 2023 12:53:13 +0000
Subject: [PATCH 02/14] Added cast to message model for type enum

---
 app/Models/Message.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/Models/Message.php b/app/Models/Message.php
index be98669..6755a42 100644
--- a/app/Models/Message.php
+++ b/app/Models/Message.php
@@ -2,14 +2,17 @@
 
 namespace App\Models;
 
+use App\Enums\MessageType;
 use App\Events\NotifySubscriptions;
 use App\Events\NotifyTicketCreator;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Kwaadpepper\Enum\Traits\CastsEnums;
 
 class Message extends Model
 {
     use HasFactory;
+    use CastsEnums;
 
     /**
      * The attributes that are mass assignable.
@@ -17,7 +20,17 @@ class Message extends Model
      * @var array
      */
     protected $fillable = [
-        'message'
+        'message',
+        'type'
+    ];
+
+    /**
+     * The attributes that should be cast to Enums.
+     *
+     * @var array
+     */
+    protected $enumCasts = [
+        'type' => MessageType::class
     ];
 
     /**

From 5fa24d69c8a1f74fe000f2158d68c6b06d2857af Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Thu, 6 Apr 2023 13:24:40 +0000
Subject: [PATCH 03/14] Added new policy to create private message

---
 app/Policies/TicketPolicy.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Policies/TicketPolicy.php b/app/Policies/TicketPolicy.php
index b31d2db..68c6e69 100644
--- a/app/Policies/TicketPolicy.php
+++ b/app/Policies/TicketPolicy.php
@@ -46,6 +46,10 @@ class TicketPolicy extends RootPolicy
                 ]),
                 'suscribeToTicket' => TicketStaticRules::make('ticketIsNotArchived', $model),
                 'createMessage' => TicketStaticRules::make('ticketIsNotArchived', $model),
+                'createPrivateMessage' => StaticRules::or([
+                    URR::make('userIsAdmin', $user),
+                    TicketStaticRules::make('ticketIsNotArchived', $model),
+                ]),
                 'updateMessage' => StaticRules::or([
                     URR::make('userIsAdmin', $user),
                     TicketStaticRules::make('ticketIsNotArchived', $model),

From 1aab65596426e7722179214b7ea0d70b2ac635ff Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Thu, 6 Apr 2023 13:25:37 +0000
Subject: [PATCH 04/14] Added migration to create 'type' column for messages

---
 .../2023_04_06_122125_add_message_type.php    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 database/migrations/2023_04_06_122125_add_message_type.php

diff --git a/database/migrations/2023_04_06_122125_add_message_type.php b/database/migrations/2023_04_06_122125_add_message_type.php
new file mode 100644
index 0000000..dd9bd38
--- /dev/null
+++ b/database/migrations/2023_04_06_122125_add_message_type.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddMessageType extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('messages', function (Blueprint $table) {
+            $table->integer('type')
+                ->nullable()
+                ->comment('Message Type defined by an enum.')
+                ->after('message');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('messages', function (Blueprint $table) {
+            $table->dropColumn('type');
+        });
+    }
+}

From a631506cf1a4390d44d2eda176ca0b5b028b3836 Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Thu, 6 Apr 2023 13:26:20 +0000
Subject: [PATCH 05/14] Changed blade and request to create private or public
 messages

---
 app/Http/Requests/CreateMessage.php   | 11 +++++++++--
 config/app.php                        |  1 +
 resources/views/ticket/show.blade.php | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/CreateMessage.php b/app/Http/Requests/CreateMessage.php
index ad93dfb..99c198f 100644
--- a/app/Http/Requests/CreateMessage.php
+++ b/app/Http/Requests/CreateMessage.php
@@ -2,7 +2,9 @@
 
 namespace App\Http\Requests;
 
+use App\Enums\MessageType;
 use Illuminate\Foundation\Http\FormRequest;
+use Kwaadpepper\Enum\Rules\EnumIsValidRule;
 
 class CreateMessage extends FormRequest
 {
@@ -33,7 +35,8 @@ class CreateMessage extends FormRequest
     protected function prepareForValidation()
     {
         $this->merge([
-            'subscribe' => $this->subscribe ? true : false
+            'subscribe' => $this->subscribe ? true : false,
+            'type' => $this->type == MessageType::private() ? MessageType::private()->value : MessageType::public()->value
         ]);
     }
 
@@ -49,7 +52,11 @@ class CreateMessage extends FormRequest
         return [
             'subscribe' => 'required|boolean',
             'message' => 'required|min:' . ($user->isAdmin() ? '5' : '20'),
-            'file_message' => 'sometimes|mimes:jpeg,jpg,png,pdf|max:2048'
+            'file_message' => 'sometimes|mimes:jpeg,jpg,png,pdf|max:2048',
+            'type' => [
+                'required',
+                new EnumIsValidRule(MessageType::class)
+            ]
         ];
     }
 }
diff --git a/config/app.php b/config/app.php
index b2c68ba..72f41ed 100644
--- a/config/app.php
+++ b/config/app.php
@@ -245,6 +245,7 @@ return [
         'TableRow' => App\Enums\Planning\TableRow::class,
         'ActivityEnum' => App\Enums\MacroSchedule\Activity::class,
         'ProjectStatus' => App\Enums\ProjectStatus::class,
+        'MessageTypeEnum' => App\Enums\MessageType::class,
     ],
 
 ];
diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php
index aec2ebd..56eef21 100644
--- a/resources/views/ticket/show.blade.php
+++ b/resources/views/ticket/show.blade.php
@@ -126,6 +126,16 @@
                                     </div>
                                 </div>
                             </div>
+                            @if(Auth::check() and !Auth::user()->role->equals(Role::client()))
+                            <div class="row mt-4">
+                                <div class="col">
+                                    <div class="form-check">
+                                        <input name="type" type="checkbox" class="form-check-input" id="setPrivate" autocomplete="off" value="{{MessageTypeEnum::private()}}">
+                                        <label class="form-check-label" for="setPrivate">{{ __('Rendre le message privé') }}</label>
+                                    </div>
+                                </div>
+                            </div>
+                            @endif
                         </div>
                         <div class="modal-footer">
                             <button type="reset" class="btn btn-sm btn-danger" data-bs-dismiss="modal">{{ __('Fermer') }}</button>
@@ -147,6 +157,10 @@
         <small class="fw-bold">({{ __('Message système') }})</small>
     </div>
     @else
+        @if (
+            $message->type->equals(MessageTypeEnum::public()) ||
+            ($message->type->equals(MessageTypeEnum::private()) && !Auth::user()->role->equals(Role::client()))
+        )
     <div class="@if($message->user_id === Auth::user()->id)offset-md-4 alert-dark @else alert-light @endif col-md-8 alert">
         {!! ToolboxHelper::plainToHtml($message->message) !!}
         @if ($message->file !== null)
@@ -194,6 +208,7 @@
         @endcan
         @endif
     </div>
+        @endif
     @endif
     @endforeach
 </div>

From fb570b166b1f8e9d0ae971710d8d69400d2d6d1e Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Thu, 6 Apr 2023 13:34:41 +0000
Subject: [PATCH 06/14] Added style and icon for private messages

---
 resources/views/ticket/show.blade.php | 89 ++++++++++++++-------------
 1 file changed, 46 insertions(+), 43 deletions(-)

diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php
index 56eef21..833c3bf 100644
--- a/resources/views/ticket/show.blade.php
+++ b/resources/views/ticket/show.blade.php
@@ -161,53 +161,56 @@
             $message->type->equals(MessageTypeEnum::public()) ||
             ($message->type->equals(MessageTypeEnum::private()) && !Auth::user()->role->equals(Role::client()))
         )
-    <div class="@if($message->user_id === Auth::user()->id)offset-md-4 alert-dark @else alert-light @endif col-md-8 alert">
-        {!! ToolboxHelper::plainToHtml($message->message) !!}
-        @if ($message->file !== null)
-        <br><a @if(ToolboxHelper::isImageFile($message->file))data-fslightbox="gallery" @endif href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
-        @endif<br><br>
-        <small class="text-muted fw-bold">
-            {!! __('Créé le :date par <b>:userName</b>', [
-                'date' => \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i'),
-                'userName' => $message->user ? $message->user->name : __('Utilisateur supprimé')
-            ]) !!}
-        </small>
-        @if($message->user_id === Auth::user()->id)
-        @can('updateMessage', $ticket, $message)
-        <button type="button" class="btn btn-sm btn-primary float-end" data-bs-toggle="modal" data-bs-target="#updateMessageModal{{$message->id}}">
-            {{ __('Modifier le message') }}
-        </button>
-        <div class="modal fade" id="updateMessageModal{{$message->id}}" tabindex="-1" aria-labelledby="updateMessageModalLabel" aria-hidden="true">
-            <div class="modal-dialog modal-lg">
-                <div class="modal-content">
-                    <form action="{{ route('ticket.message.update', ['ticket'=>$ticket, 'message'=>$message]) }}" method="POST" enctype="multipart/form-data">
-                        @method('PUT')
-                        @csrf
-                        <input type="hidden" name="ticket_id" value="{{ $ticket->id }}">
-                        <div class="modal-header">
-                            <h5 class="modal-title" id="messageModalLabel">
-                                {{ __('Modification du message n°:messageid', ['messageid' => $message->id]) }}
-                            </h5>
-                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{__('Fermer') }}"></button>
-                        </div>
-                        <div class="modal-body">
-                            <div class="row">
-                                <div class="col">
-                                    <textarea name="message" class="form-control" rows="10">{{ $message->message }}</textarea>
+            <div class="@if($message->user_id === Auth::user()->id)offset-md-4 alert-dark @else alert-light @endif @if($message->type->equals(MessageTypeEnum::private())) border border-danger @endif col-md-8 alert">
+                @if ($message->type->equals(MessageTypeEnum::private()))
+                    <i class="fa-solid fa-lock"></i>&nbsp;&nbsp;
+                @endif
+                {!! ToolboxHelper::plainToHtml($message->message) !!}
+                @if ($message->file !== null)
+                <br><a @if(ToolboxHelper::isImageFile($message->file))data-fslightbox="gallery" @endif href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
+                @endif<br><br>
+                <small class="text-muted fw-bold">
+                    {!! __('Créé le :date par <b>:userName</b>', [
+                        'date' => \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i'),
+                        'userName' => $message->user ? $message->user->name : __('Utilisateur supprimé')
+                    ]) !!}
+                </small>
+                @if($message->user_id === Auth::user()->id)
+                @can('updateMessage', $ticket, $message)
+                <button type="button" class="btn btn-sm btn-primary float-end" data-bs-toggle="modal" data-bs-target="#updateMessageModal{{$message->id}}">
+                    {{ __('Modifier le message') }}
+                </button>
+                <div class="modal fade" id="updateMessageModal{{$message->id}}" tabindex="-1" aria-labelledby="updateMessageModalLabel" aria-hidden="true">
+                    <div class="modal-dialog modal-lg">
+                        <div class="modal-content">
+                            <form action="{{ route('ticket.message.update', ['ticket'=>$ticket, 'message'=>$message]) }}" method="POST" enctype="multipart/form-data">
+                                @method('PUT')
+                                @csrf
+                                <input type="hidden" name="ticket_id" value="{{ $ticket->id }}">
+                                <div class="modal-header">
+                                    <h5 class="modal-title" id="messageModalLabel">
+                                        {{ __('Modification du message n°:messageid', ['messageid' => $message->id]) }}
+                                    </h5>
+                                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{__('Fermer') }}"></button>
                                 </div>
-                            </div>
+                                <div class="modal-body">
+                                    <div class="row">
+                                        <div class="col">
+                                            <textarea name="message" class="form-control" rows="10">{{ $message->message }}</textarea>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="reset" class="btn btn-sm btn-danger" data-bs-dismiss="modal">{{ __('Fermer') }}</button>
+                                    <button type="submit" class="btn btn-sm btn-success">{{ __('Envoyer') }}</button>
+                                </div>
+                            </form>
                         </div>
-                        <div class="modal-footer">
-                            <button type="reset" class="btn btn-sm btn-danger" data-bs-dismiss="modal">{{ __('Fermer') }}</button>
-                            <button type="submit" class="btn btn-sm btn-success">{{ __('Envoyer') }}</button>
-                        </div>
-                    </form>
+                    </div>
                 </div>
+                @endcan
+                @endif
             </div>
-        </div>
-        @endcan
-        @endif
-    </div>
         @endif
     @endif
     @endforeach

From 467ebae681f832353be3fca701bf818b61025d38 Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Thu, 6 Apr 2023 13:59:20 +0000
Subject: [PATCH 07/14] Fixed migration to set all existing messages to public

---
 database/migrations/2023_04_06_122125_add_message_type.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/database/migrations/2023_04_06_122125_add_message_type.php b/database/migrations/2023_04_06_122125_add_message_type.php
index dd9bd38..a191e80 100644
--- a/database/migrations/2023_04_06_122125_add_message_type.php
+++ b/database/migrations/2023_04_06_122125_add_message_type.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 class AddMessageType extends Migration
@@ -19,6 +20,12 @@ class AddMessageType extends Migration
                 ->comment('Message Type defined by an enum.')
                 ->after('message');
         });
+        // Set all existing messages as public.
+        $messages = DB::table('messages')->get();
+        collect($messages)->map(function (object $message) {
+            DB::table('messages')->where('id', $message->id)
+                ->update(['type' => 2]);
+        });
     }
 
     /**

From 4fd9c2f177164d3bcd84e71f1cbf770361dd18b9 Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Thu, 6 Apr 2023 14:00:30 +0000
Subject: [PATCH 08/14] Fixed : system message is now public when status or
 assignment is updated

---
 app/Http/Controllers/TicketController.php | 4 ++--
 app/Listeners/AddStatusMessages.php       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php
index e74431f..b0395d9 100644
--- a/app/Http/Controllers/TicketController.php
+++ b/app/Http/Controllers/TicketController.php
@@ -433,7 +433,7 @@ class TicketController extends Controller
 
         /** @var \App\Models\User|null */
         if ($assignedUser = User::whereId($request->assign)->first()) {
-            $message = trans(':admin à assigné le ticket n°:ticketNumber à :assignedAdmin', [
+            $message = trans(':admin a assigné le ticket n°:ticketNumber à :assignedAdmin', [
                 'admin' => $user->name,
                 'ticketNumber' => $ticket->id,
                 'assignedAdmin' => $assignedUser->name,
@@ -441,7 +441,7 @@ class TicketController extends Controller
             $ticket->assignedUser()->associate($assignedUser);
         } else {
             $message = trans(
-                ':admin modifié l\'assignation du ticket n°:ticketNumber, il n\'est plus assigné à quelqu\'un.',
+                ':admin a modifié l\'assignation du ticket n°:ticketNumber, il n\'est plus assigné à quelqu\'un.',
                 [
                     'admin' => $user->name,
                     'ticketNumber' => $ticket->id,
diff --git a/app/Listeners/AddStatusMessages.php b/app/Listeners/AddStatusMessages.php
index 491fcf8..426443f 100644
--- a/app/Listeners/AddStatusMessages.php
+++ b/app/Listeners/AddStatusMessages.php
@@ -2,6 +2,7 @@
 
 namespace App\Listeners;
 
+use App\Enums\MessageType;
 use App\Events\TicketStatusChanged;
 use App\Models\Message;
 
@@ -25,6 +26,7 @@ class AddStatusMessages
         } else {
             $message->message = "Le statut est passé à : <b>{$event->ticket->status->label}</b>";
         }
+        $message->type = MessageType::public();
         $message->save();
     }
 }

From b73563b258179c4d619e92482a75c5796d1c6607 Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Thu, 6 Apr 2023 14:05:32 +0000
Subject: [PATCH 09/14] Changed system message status to private when assign to
 a user

---
 app/Listeners/AddStatusMessages.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Listeners/AddStatusMessages.php b/app/Listeners/AddStatusMessages.php
index 426443f..6efc910 100644
--- a/app/Listeners/AddStatusMessages.php
+++ b/app/Listeners/AddStatusMessages.php
@@ -20,13 +20,15 @@ class AddStatusMessages
         $message->ticket_id = $event->ticket->id;
         if ($event->message) {
             $message->message = $event->message;
+            $message->type    = MessageType::private();
         } elseif ($event->user) {
             // phpcs:ignore Generic.Files.LineLength.TooLong
             $message->message = "<b>{$event->user->name}</b> a modifié le statut en <b>{$event->ticket->status->label}</b>";
+            $message->type    = MessageType::public();
         } else {
             $message->message = "Le statut est passé à : <b>{$event->ticket->status->label}</b>";
+            $message->type    = MessageType::public();
         }
-        $message->type = MessageType::public();
         $message->save();
     }
 }

From 72d16e5f0c5d488ec9ae44dcdeaa4651c48dd0f1 Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Thu, 6 Apr 2023 14:23:36 +0000
Subject: [PATCH 10/14] Made border larger to see it better with dark
 background

---
 resources/views/ticket/show.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php
index 833c3bf..8cbf63b 100644
--- a/resources/views/ticket/show.blade.php
+++ b/resources/views/ticket/show.blade.php
@@ -161,7 +161,7 @@
             $message->type->equals(MessageTypeEnum::public()) ||
             ($message->type->equals(MessageTypeEnum::private()) && !Auth::user()->role->equals(Role::client()))
         )
-            <div class="@if($message->user_id === Auth::user()->id)offset-md-4 alert-dark @else alert-light @endif @if($message->type->equals(MessageTypeEnum::private())) border border-danger @endif col-md-8 alert">
+            <div class="@if($message->user_id === Auth::user()->id)offset-md-4 alert-dark @else alert-light @endif @if($message->type->equals(MessageTypeEnum::private())) border border-danger border-2 @endif col-md-8 alert">
                 @if ($message->type->equals(MessageTypeEnum::private()))
                     <i class="fa-solid fa-lock"></i>&nbsp;&nbsp;
                 @endif

From 19a209c06bf5d0600c85c8458477744b1832219f Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Wed, 12 Apr 2023 07:11:28 +0000
Subject: [PATCH 11/14] Fixed migration to add the type column to the messages
 table

---
 database/migrations/2023_04_06_122125_add_message_type.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/database/migrations/2023_04_06_122125_add_message_type.php b/database/migrations/2023_04_06_122125_add_message_type.php
index a191e80..8911adc 100644
--- a/database/migrations/2023_04_06_122125_add_message_type.php
+++ b/database/migrations/2023_04_06_122125_add_message_type.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Enums\MessageType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
@@ -15,8 +16,7 @@ class AddMessageType extends Migration
     public function up()
     {
         Schema::table('messages', function (Blueprint $table) {
-            $table->integer('type')
-                ->nullable()
+            $table->unsignedTinyInteger('type')
                 ->comment('Message Type defined by an enum.')
                 ->after('message');
         });
@@ -24,7 +24,7 @@ class AddMessageType extends Migration
         $messages = DB::table('messages')->get();
         collect($messages)->map(function (object $message) {
             DB::table('messages')->where('id', $message->id)
-                ->update(['type' => 2]);
+                ->update(['type' => MessageType::public()]);
         });
     }
 

From c51e27445db06e11fbe672f08ef464945054023c Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Wed, 12 Apr 2023 10:12:46 +0000
Subject: [PATCH 12/14] Fixed message display for system messages

---
 resources/views/ticket/show.blade.php | 110 +++++++++++++-------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php
index f6ae88a..4818ca1 100644
--- a/resources/views/ticket/show.blade.php
+++ b/resources/views/ticket/show.blade.php
@@ -151,66 +151,66 @@
         @endcan
     </h4>
     @foreach ($messages as $message)
-    @if ($message->user_id === null)
-    <div class="offset-md-3 col-md-6 alert alert-info text-center text-dark">
-        {!! nl2br(clean($message->message)) !!} - <span class="fw-bold text-light">Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}}</span>
-        <small class="fw-bold">({{ __('Message système') }})</small>
-    </div>
-    @else
-        @if (
-            $message->type->equals(MessageTypeEnum::public()) ||
-            (Auth::user()->can('createPrivateMessage', $ticket))
-        )
-            <div class="@if($message->user_id === Auth::user()->id)offset-md-4 alert-dark @else alert-light @endif @if($message->type->equals(MessageTypeEnum::private())) border border-danger border-2 @endif col-md-8 alert">
-                @if ($message->type->equals(MessageTypeEnum::private()))
-                    <i class="fa-solid fa-lock"></i>&nbsp;&nbsp;
-                @endif
-                {!! ToolboxHelper::plainToHtml($message->message) !!}
-                @if ($message->file !== null)
-                <br><a @if(ToolboxHelper::isImageFile($message->file))data-fslightbox="gallery" @endif href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
-                @endif<br><br>
-                <small class="text-muted fw-bold">
-                    {!! __('Créé le :date par <b>:userName</b>', [
-                        'date' => \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i'),
-                        'userName' => $message->user ? $message->user->name : __('Utilisateur supprimé')
-                    ]) !!}
-                </small>
-                @if($message->user_id === Auth::user()->id)
-                @can('updateMessage', $ticket, $message)
-                <button type="button" class="btn btn-sm btn-primary float-end" data-bs-toggle="modal" data-bs-target="#updateMessageModal{{$message->id}}">
-                    {{ __('Modifier le message') }}
-                </button>
-                <div class="modal fade" id="updateMessageModal{{$message->id}}" tabindex="-1" aria-labelledby="updateMessageModalLabel" aria-hidden="true">
-                    <div class="modal-dialog modal-lg">
-                        <div class="modal-content">
-                            <form action="{{ route('ticket.message.update', ['ticket'=>$ticket, 'message'=>$message]) }}" method="POST" enctype="multipart/form-data">
-                                @method('PUT')
-                                @csrf
-                                <input type="hidden" name="ticket_id" value="{{ $ticket->id }}">
-                                <div class="modal-header">
-                                    <h5 class="modal-title" id="messageModalLabel">
-                                        {{ __('Modification du message n°:messageid', ['messageid' => $message->id]) }}
-                                    </h5>
-                                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{__('Fermer') }}"></button>
-                                </div>
-                                <div class="modal-body">
-                                    <div class="row">
-                                        <div class="col">
-                                            <textarea name="message" class="form-control" rows="10">{{ $message->message }}</textarea>
-                                        </div>
+    @if (
+        $message->type->equals(MessageTypeEnum::public()) ||
+        (Auth::user()->can('createPrivateMessage', $ticket))
+    )
+        @if ($message->user_id === null)
+        <div class="offset-md-3 col-md-6 alert alert-info text-center text-dark">
+            {!! nl2br(clean($message->message)) !!} - <span class="fw-bold text-light">Le {{ \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i')}}</span>
+            <small class="fw-bold">({{ __('Message système') }})</small>
+        </div>
+        @else
+        <div class="@if($message->user_id === Auth::user()->id)offset-md-4 alert-dark @else alert-light @endif @if($message->type->equals(MessageTypeEnum::private())) border border-danger border-2 @endif col-md-8 alert">
+            @if ($message->type->equals(MessageTypeEnum::private()))
+                <i class="fa-solid fa-lock"></i>&nbsp;&nbsp;
+            @endif
+            {!! ToolboxHelper::plainToHtml($message->message) !!}
+            @if ($message->file !== null)
+            <br><a @if(ToolboxHelper::isImageFile($message->file))data-fslightbox="gallery" @endif href="{{ asset($message->file) }}" target="_blank">Ouvrir la pièce jointe</a><br>
+            @endif<br><br>
+            <small class="text-muted fw-bold">
+                {!! __('Créé le :date par <b>:userName</b>', [
+                    'date' => \Carbon\Carbon::parse($message->created_at)->format('d/m/Y à H:i'),
+                    'userName' => $message->user ? $message->user->name : __('Utilisateur supprimé')
+                ]) !!}
+            </small>
+            @if($message->user_id === Auth::user()->id)
+            @can('updateMessage', $ticket, $message)
+            <button type="button" class="btn btn-sm btn-primary float-end" data-bs-toggle="modal" data-bs-target="#updateMessageModal{{$message->id}}">
+                {{ __('Modifier le message') }}
+            </button>
+            <div class="modal fade" id="updateMessageModal{{$message->id}}" tabindex="-1" aria-labelledby="updateMessageModalLabel" aria-hidden="true">
+                <div class="modal-dialog modal-lg">
+                    <div class="modal-content">
+                        <form action="{{ route('ticket.message.update', ['ticket'=>$ticket, 'message'=>$message]) }}" method="POST" enctype="multipart/form-data">
+                            @method('PUT')
+                            @csrf
+                            <input type="hidden" name="ticket_id" value="{{ $ticket->id }}">
+                            <div class="modal-header">
+                                <h5 class="modal-title" id="messageModalLabel">
+                                    {{ __('Modification du message n°:messageid', ['messageid' => $message->id]) }}
+                                </h5>
+                                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{__('Fermer') }}"></button>
+                            </div>
+                            <div class="modal-body">
+                                <div class="row">
+                                    <div class="col">
+                                        <textarea name="message" class="form-control" rows="10">{{ $message->message }}</textarea>
                                     </div>
                                 </div>
-                                <div class="modal-footer">
-                                    <button type="reset" class="btn btn-sm btn-danger" data-bs-dismiss="modal">{{ __('Fermer') }}</button>
-                                    <button type="submit" class="btn btn-sm btn-success">{{ __('Envoyer') }}</button>
-                                </div>
-                            </form>
-                        </div>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="reset" class="btn btn-sm btn-danger" data-bs-dismiss="modal">{{ __('Fermer') }}</button>
+                                <button type="submit" class="btn btn-sm btn-success">{{ __('Envoyer') }}</button>
+                            </div>
+                        </form>
                     </div>
                 </div>
-                @endcan
-                @endif
             </div>
+            @endcan
+            @endif
+        </div>
         @endif
     @endif
     @endforeach

From 00bacab68899382fa8543aa6ba72b26c26d25361 Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Wed, 12 Apr 2023 10:14:18 +0000
Subject: [PATCH 13/14] Fixed message type when a ticket is assigned

---
 app/Events/TicketStatusChanged.php        | 15 ++++++++++-----
 app/Http/Controllers/TicketController.php |  2 +-
 app/Listeners/AddStatusMessages.php       |  6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/Events/TicketStatusChanged.php b/app/Events/TicketStatusChanged.php
index 6e02add..beadccc 100644
--- a/app/Events/TicketStatusChanged.php
+++ b/app/Events/TicketStatusChanged.php
@@ -27,6 +27,9 @@ class TicketStatusChanged
     /** @var string */
     public $message;
 
+    /** @var boolean */
+    public $is_private;
+
     /**
      * Create a new event instance.
      *
@@ -34,13 +37,15 @@ class TicketStatusChanged
      * @param \App\Enums\TicketStatus $status
      * @param \App\Models\User|null   $user
      * @param string|null             $message
+     * @param boolean                 $is_private
      * @return void
      */
-    public function __construct(Ticket $ticket, TicketStatus $status, User $user = null, string $message = null)
+    public function __construct(Ticket $ticket, TicketStatus $status, User $user = null, string $message = null, bool $is_private = false)
     {
-        $this->ticket  = $ticket;
-        $this->status  = $status;
-        $this->user    = $user;
-        $this->message = $message;
+        $this->ticket     = $ticket;
+        $this->status     = $status;
+        $this->user       = $user;
+        $this->message    = $message;
+        $this->is_private = $is_private;
     }
 }
diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php
index b0395d9..02a94c5 100644
--- a/app/Http/Controllers/TicketController.php
+++ b/app/Http/Controllers/TicketController.php
@@ -454,7 +454,7 @@ class TicketController extends Controller
 
         /** @var \App\Enums\TicketStatus */
         $oldStatus = $ticket->status;
-        event(new TicketStatusChanged($ticket, $oldStatus, null, $message));
+        event(new TicketStatusChanged($ticket, $oldStatus, null, $message, true));
         event(new NotifySubscriptions($ticket, $message, collect([$ticket->user])));
 
         /** @var \App\Models\User */
diff --git a/app/Listeners/AddStatusMessages.php b/app/Listeners/AddStatusMessages.php
index e566fba..d9ab375 100644
--- a/app/Listeners/AddStatusMessages.php
+++ b/app/Listeners/AddStatusMessages.php
@@ -19,9 +19,12 @@ class AddStatusMessages
     {
         $message            = new Message();
         $message->ticket_id = $event->ticket->id;
+        $message->type      = MessageType::public();
+        if ($event->is_private) {
+            $message->type = MessageType::private();
+        }
         if ($event->message) {
             $message->message = $event->message;
-            $message->type    = MessageType::private();
         } elseif ($event->user) {
             $message->message = sprintf(
                 "<b>%s</b> %s <b>%s</b>",
@@ -93,7 +96,6 @@ class AddStatusMessages
                 );
                 break;
         } //end switch
-        $message->type = MessageType::public();
         $message->save();
     }
 }

From d89ad43426b61e192e2eb02ac150949ac1d6b79a Mon Sep 17 00:00:00 2001
From: "noah.lancien" <noah.lancien@ldc.fr>
Date: Wed, 12 Apr 2023 10:18:21 +0000
Subject: [PATCH 14/14] fixed some phpcs warnings

---
 app/Events/TicketStatusChanged.php  | 9 +++++++--
 app/Listeners/AddStatusMessages.php | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Events/TicketStatusChanged.php b/app/Events/TicketStatusChanged.php
index beadccc..eb592b0 100644
--- a/app/Events/TicketStatusChanged.php
+++ b/app/Events/TicketStatusChanged.php
@@ -40,8 +40,13 @@ class TicketStatusChanged
      * @param boolean                 $is_private
      * @return void
      */
-    public function __construct(Ticket $ticket, TicketStatus $status, User $user = null, string $message = null, bool $is_private = false)
-    {
+    public function __construct(
+        Ticket $ticket,
+        TicketStatus $status,
+        User $user = null,
+        string $message = null,
+        bool $is_private = false
+    ) {
         $this->ticket     = $ticket;
         $this->status     = $status;
         $this->user       = $user;
diff --git a/app/Listeners/AddStatusMessages.php b/app/Listeners/AddStatusMessages.php
index d9ab375..8429e10 100644
--- a/app/Listeners/AddStatusMessages.php
+++ b/app/Listeners/AddStatusMessages.php
@@ -14,6 +14,7 @@ class AddStatusMessages
      *
      * @param  \App\Events\TicketStatusChanged $event
      * @return void
+     * @phpcs:disable Generic.Metrics.CyclomaticComplexity
      */
     public function handle(TicketStatusChanged $event)
     {