From 4cd025f36e1c6edb2e7354882b0ccc1c78ba80bf Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 12 Nov 2023 15:54:24 +0100
Subject: [PATCH 01/72] refac delete commands

---
 GaelO2/app/Console/Commands/DeleteStudy.php   | 128 +++---------------
 .../Commands/GaelODeleteRessourcesService.php | 118 ++++++++++++++++
 2 files changed, 138 insertions(+), 108 deletions(-)
 create mode 100644 GaelO2/app/Console/Commands/GaelODeleteRessourcesService.php

diff --git a/GaelO2/app/Console/Commands/DeleteStudy.php b/GaelO2/app/Console/Commands/DeleteStudy.php
index 60ab75ea2..2e64b4743 100644
--- a/GaelO2/app/Console/Commands/DeleteStudy.php
+++ b/GaelO2/app/Console/Commands/DeleteStudy.php
@@ -4,18 +4,11 @@
 
 use App\GaelO\Services\OrthancService;
 use App\Models\DicomSeries;
-use App\Models\DicomStudy;
-use App\Models\Documentation;
-use App\Models\Patient;
-use App\Models\Review;
-use App\Models\ReviewStatus;
-use App\Models\Role;
 use App\Models\Study;
-use App\Models\Tracker;
 use App\Models\Visit;
-use App\Models\VisitGroup;
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 
@@ -23,16 +16,8 @@ class DeleteStudy extends Command
 {
 
     private Study $study;
-    private Patient $patient;
     private Visit $visit;
-    private ReviewStatus $reviewStatus;
-    private DicomStudy $dicomStudy;
     private DicomSeries $dicomSeries;
-    private Tracker $tracker;
-    private Documentation $documentation;
-    private Role $role;
-    private VisitGroup $visitGroup;
-    private Review $review;
     private OrthancService $orthancService;
     /**
      * The name and signature of the console command.
@@ -55,29 +40,13 @@ class DeleteStudy extends Command
      */
     public function handle(
         Study $study,
-        VisitGroup $visitGroup,
         Visit $visit,
-        Patient $patient,
-        DicomStudy $dicomStudy,
         DicomSeries $dicomSeries,
-        Role $role,
-        Tracker $tracker,
-        Documentation $documentation,
-        Review $review,
-        ReviewStatus $reviewStatus,
-        OrthancService $orthancService)
-    {
+        OrthancService $orthancService
+    ) {
         $this->study = $study;
-        $this->visitGroup = $visitGroup;
         $this->visit = $visit;
-        $this->patient = $patient;
-        $this->dicomStudy = $dicomStudy;
         $this->dicomSeries = $dicomSeries;
-        $this->tracker = $tracker;
-        $this->documentation = $documentation;
-        $this->role = $role;
-        $this->review = $review;
-        $this->reviewStatus = $reviewStatus;
         $this->orthancService = $orthancService;
         $this->orthancService->setOrthancServer(true);
 
@@ -106,9 +75,10 @@ public function handle(
 
         if ($this->confirm('Warning : This CANNOT be undone, do you wish to continue?')) {
 
-            $this->deleteDocumentation($studyEntity->name);
-            $this->deleteRoles($studyEntity->name);
-            $this->deleteTracker($studyEntity->name);
+            $gaeloDeleteRessourceService = App::make(GaelODeleteRessourcesService::class);
+            $gaeloDeleteRessourceService->deleteDocumentation($studyEntity->name);
+            $gaeloDeleteRessourceService->deleteRoles($studyEntity->name);
+            $gaeloDeleteRessourceService->deleteTracker($studyEntity->name);
 
             //Get Visit ID of Original Study
             $originalStudy = $studyEntity->ancillary_of ?? $studyEntity->name;
@@ -118,10 +88,9 @@ public function handle(
                 return $visit['id'];
             }, $visits->toArray());
 
-           
-            $this->deleteReviews($visitIds, $studyName);
-            $this->deleteReviewStatus($visitIds, $studyName);
-            
+            $gaeloDeleteRessourceService->deleteReviews($visitIds, $studyName);
+            $gaeloDeleteRessourceService->deleteReviewStatus($visitIds, $studyName);
+
             if ($studyEntity['ancillary_of'] === null) {
 
                 $dicomSeries = $this->getDicomSeriesOfVisits($visitIds);
@@ -137,27 +106,26 @@ public function handle(
                     $dicomSeries
                 );
 
-                
-                $this->deleteDicomsSeries($visitIds);
-                $this->deleteDicomsStudies($visitIds);
-                $this->deleteVisits($visitIds);
-                $this->deleteVisitGroupAndVisitType($studyName);
-                $this->deletePatient($studyName);
+                $gaeloDeleteRessourceService->deleteDicomsSeries($visitIds);
+                $gaeloDeleteRessourceService->deleteDicomsStudies($visitIds);
+                $gaeloDeleteRessourceService->deleteVisits($visitIds);
+                $gaeloDeleteRessourceService->deleteVisitGroupAndVisitType($studyName);
+                $gaeloDeleteRessourceService->deletePatient($studyName);
             }
 
             $studyEntity->forceDelete();
 
-            if($this->option('deleteDicom') && $this->confirm('Found '.sizeOf($orthancIdArray).' series to delete, do you want to continue ?')){
-                foreach($orthancIdArray as $seriesOrthancId){
-                    try{
+            if ($this->option('deleteDicom') && $this->confirm('Found ' . sizeOf($orthancIdArray) . ' series to delete, do you want to continue ?')) {
+                foreach ($orthancIdArray as $seriesOrthancId) {
+                    try {
                         $this->orthancService->deleteFromOrthanc('series', $seriesOrthancId);
-                    }catch(Exception $e){
+                    } catch (Exception $e) {
                         Log::error($e->getMessage());
                     }
                 }
             }
 
-            if($this->option('deleteAssociatedFile')&& $this->confirm('Going to delete associated file, do you want to continue ?')){
+            if ($this->option('deleteAssociatedFile') && $this->confirm('Going to delete associated file, do you want to continue ?')) {
                 Storage::deleteDirectory($studyName);
             }
 
@@ -183,60 +151,4 @@ private function getVisitsOfStudy(string $studyName)
             })->get();
     }
 
-    private function deleteDocumentation(string $studyName)
-    {
-        $this->documentation->where('study_name', $studyName)->withTrashed()->forceDelete();
-    }
-
-    private function deleteRoles(string $studyName)
-    {
-        $this->role->where('study_name', $studyName)->delete();
-    }
-
-    private function deleteTracker(string $studyName)
-    {
-        $this->tracker->where('study_name', $studyName)->delete();
-    }
-
-    private function deleteDicomsStudies(array $visitId)
-    {
-        return $this->dicomStudy->whereIn('visit_id', $visitId)->withTrashed()->forceDelete();
-    }
-
-    private function deleteDicomsSeries(array $visitId)
-    {
-        return $this->dicomSeries->whereHas('dicomStudy', function ($query) use ($visitId) {
-            $query->whereIn('visit_id', $visitId)->withTrashed();
-        })->withTrashed()->forceDelete();
-    }
-
-
-    private function deleteVisitGroupAndVisitType(string $studyName)
-    {
-        $visitGroups = $this->visitGroup->where('study_name', $studyName)->get();
-        foreach ($visitGroups as $visitGroup) {
-            $visitGroup->visitTypes()->delete();
-            $visitGroup->delete();
-        }
-    }
-
-    private function deletePatient(string $studyName)
-    {
-        $this->patient->where('study_name', $studyName)->delete();
-    }
-
-    private function deleteReviews(array $visitIds, string $studyName)
-    {
-        $this->review->where('study_name', $studyName)->whereIn('visit_id', $visitIds)->withTrashed()->forceDelete();
-    }
-
-    private function deleteReviewStatus(array $visitIds, String $studyName)
-    {
-        $this->reviewStatus->where('study_name', $studyName)->whereIn('visit_id', $visitIds)->delete();
-    }
-
-    private function deleteVisits(array $visitIds)
-    {
-        $this->visit->whereIn('id', $visitIds)->withTrashed()->forceDelete();
-    }
 }
diff --git a/GaelO2/app/Console/Commands/GaelODeleteRessourcesService.php b/GaelO2/app/Console/Commands/GaelODeleteRessourcesService.php
new file mode 100644
index 000000000..70f6152eb
--- /dev/null
+++ b/GaelO2/app/Console/Commands/GaelODeleteRessourcesService.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\GaelO\Entities\StudyEntity;
+use App\GaelO\Exceptions\GaelOException;
+use App\GaelO\Services\OrthancService;
+use App\Models\DicomSeries;
+use App\Models\DicomStudy;
+use App\Models\Documentation;
+use App\Models\Patient;
+use App\Models\Review;
+use App\Models\ReviewStatus;
+use App\Models\Role;
+use App\Models\Study;
+use App\Models\Tracker;
+use App\Models\Visit;
+use App\Models\VisitGroup;
+
+class GaelODeleteRessourcesService
+{
+
+    private Study $study;
+    private Patient $patient;
+    private Visit $visit;
+    private ReviewStatus $reviewStatus;
+    private DicomStudy $dicomStudy;
+    private DicomSeries $dicomSeries;
+    private Tracker $tracker;
+    private Documentation $documentation;
+    private Role $role;
+    private VisitGroup $visitGroup;
+    private Review $review;
+    private OrthancService $orthancService;
+
+    public function __construct(
+        Study $study,
+        VisitGroup $visitGroup,
+        Visit $visit,
+        Patient $patient,
+        DicomStudy $dicomStudy,
+        DicomSeries $dicomSeries,
+        Role $role,
+        Tracker $tracker,
+        Documentation $documentation,
+        Review $review,
+        ReviewStatus $reviewStatus
+    ) {
+
+        $this->study = $study;
+        $this->visitGroup = $visitGroup;
+        $this->visit = $visit;
+        $this->patient = $patient;
+        $this->dicomStudy = $dicomStudy;
+        $this->dicomSeries = $dicomSeries;
+        $this->tracker = $tracker;
+        $this->documentation = $documentation;
+        $this->role = $role;
+        $this->review = $review;
+        $this->reviewStatus = $reviewStatus;
+    }
+
+    public function deleteDocumentation(string $studyName)
+    {
+        $this->documentation->where('study_name', $studyName)->withTrashed()->forceDelete();
+    }
+
+    public function deleteRoles(string $studyName)
+    {
+        $this->role->where('study_name',  $studyName)->delete();
+    }
+
+    public function deleteTracker(string $studyName)
+    {
+        $this->tracker->where('study_name', $studyName)->delete();
+    }
+
+    public function deleteDicomsStudies(array $visitId)
+    {
+        return $this->dicomStudy->whereIn('visit_id', $visitId)->withTrashed()->forceDelete();
+    }
+
+    public function deleteDicomsSeries(array $visitId)
+    {
+        return $this->dicomSeries->whereHas('dicomStudy', function ($query) use ($visitId) {
+            $query->whereIn('visit_id', $visitId)->withTrashed();
+        })->withTrashed()->forceDelete();
+    }
+
+    public function deletePatient(string $studyName)
+    {
+        $this->patient->where('study_name', $studyName)->delete();
+    }
+
+    public function deleteReviews(array $visitIds, string $studyName)
+    {
+        $this->review->where('study_name', $studyName)->whereIn('visit_id', $visitIds)->withTrashed()->forceDelete();
+    }
+
+    public function deleteReviewStatus(array $visitIds, String $studyName)
+    {
+        $this->reviewStatus->where('study_name', $studyName)->whereIn('visit_id', $visitIds)->delete();
+    }
+
+    public function deleteVisits(array $visitIds)
+    {
+        $this->visit->whereIn('id', $visitIds)->withTrashed()->forceDelete();
+    }
+
+    public function deleteVisitGroupAndVisitType(string $studyName)
+    {
+        $visitGroups = $this->visitGroup->where('study_name', $studyName)->get();
+        foreach ($visitGroups as $visitGroup) {
+            $visitGroup->visitTypes()->delete();
+            $visitGroup->delete();
+        }
+    }
+}

From 43a8c0a08aa0e68f52044241513f0077b44f396a Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Mon, 13 Nov 2023 09:14:09 +0100
Subject: [PATCH 02/72] starting remove old visits, tested delete study

---
 .../app/Console/Commands/DeleteOldVisits.php  | 150 ++++++++++++++++++
 GaelO2/app/Console/Commands/DeleteStudy.php   |  42 ++---
 ...hp => GaelODeleteRessourcesRepository.php} |  12 +-
 GaelO2/app/Providers/AdapterProvider.php      |   2 +
 4 files changed, 182 insertions(+), 24 deletions(-)
 create mode 100644 GaelO2/app/Console/Commands/DeleteOldVisits.php
 rename GaelO2/app/Console/Commands/{GaelODeleteRessourcesService.php => GaelODeleteRessourcesRepository.php} (93%)

diff --git a/GaelO2/app/Console/Commands/DeleteOldVisits.php b/GaelO2/app/Console/Commands/DeleteOldVisits.php
new file mode 100644
index 000000000..5b4b844b2
--- /dev/null
+++ b/GaelO2/app/Console/Commands/DeleteOldVisits.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\GaelO\Services\OrthancService;
+use App\Models\DicomSeries;
+use App\Models\Study;
+use App\Models\Visit;
+use Exception;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+
+class DeleteOldVisits extends Command
+{
+
+    private Study $study;
+    private Visit $visit;
+    private DicomSeries $dicomSeries;
+    private OrthancService $orthancService;
+    private GaelODeleteRessourcesRepository $gaelODeleteRessourcesRepository;
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'gaelo:delete-old-visits {studyName : the study name to delete old visits} {numberOfDays : days threshold from visit creation}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Delete visits of a Study created later than days threshold (hard delete)';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(
+        Study $study,
+        Visit $visit,
+        DicomSeries $dicomSeries,
+        OrthancService $orthancService,
+        GaelODeleteRessourcesRepository $gaelODeleteRessourcesRepository
+    ) {
+        $this->study = $study;
+        $this->visit = $visit;
+        $this->dicomSeries = $dicomSeries;
+        $this->orthancService = $orthancService;
+        $this->gaelODeleteRessourcesRepository = $gaelODeleteRessourcesRepository;
+        $this->orthancService->setOrthancServer(true);
+
+        $studyName = $this->argument('studyName');
+        $studyNameConfirmation = $this->ask('Warning : Please confirm study Name');
+
+        if ($studyName !== $studyNameConfirmation) {
+            $this->error('Wrong study name, terminating');
+            return 0;
+        }
+
+        $studyEntity = $this->study->withTrashed()->findOrFail($studyName);
+        
+        //Check that no ancillary study is remaining on this study
+        $ancilariesStudies = $this->study->where('ancillary_of', $studyName)->get();
+        if ($ancilariesStudies->count() > 0) {
+            $this->error('Delete all ancilaries studies first');
+            return 0;
+        }
+
+        if($studyEntity['ancillary_of']){
+            $this->error('Cannot be used for an ancillary study');
+            return 0;
+        }
+
+        if ($this->confirm('Warning : This CANNOT be undone, do you wish to continue?')) {
+
+            //TODO delete tracker doit etre specifique au visites supprimées
+            //$this->gaelODeleteRessourcesRepository->deleteTracker($studyEntity->name);
+
+            //Get Visit ID of Original Study
+            //TODO Doit tenir compte de l'interval de temps depuis la creation
+            $visits = $this->getVisitsOfStudy($studyName);
+
+            $visitIds = array_map(function ($visit) {
+                return $visit['id'];
+            }, $visits->toArray());
+
+            $this->gaelODeleteRessourcesRepository->deleteReviews($visitIds, $studyName);
+            $this->gaelODeleteRessourcesRepository->deleteReviewStatus($visitIds, $studyName);
+
+            $dicomSeries = $this->getDicomSeriesOfVisits($visitIds);
+            $orthancIdArray = array_map(function ($seriesId) {
+                return $seriesId['orthanc_id'];
+            }, $dicomSeries);
+
+            $this->line(implode(" ", $orthancIdArray));
+
+            $this->table(
+                ['orthanc_id'],
+                $dicomSeries
+            );
+
+            $this->gaelODeleteRessourcesRepository->deleteDicomsSeries($visitIds);
+            $this->gaelODeleteRessourcesRepository->deleteDicomsStudies($visitIds);
+            $this->gaelODeleteRessourcesRepository->deleteVisits($visitIds);
+            //TODO Doit supprimer les patients que si il ne reste pas de visites...
+            //$this->gaelODeleteRessourcesRepository->deletePatient($studyName);
+            
+
+            if ($this->option('deleteDicom') && $this->confirm('Found ' . sizeOf($orthancIdArray) . ' series to delete, do you want to continue ?')) {
+                foreach ($orthancIdArray as $seriesOrthancId) {
+                    try {
+                        $this->info('Deleting '.$seriesOrthancId);
+                        $this->orthancService->deleteFromOrthanc('series', $seriesOrthancId);
+                    } catch (Exception $e) {
+                        Log::error($e->getMessage());
+                    }
+                }
+            }
+
+            if ($this->option('deleteAssociatedFile') && $this->confirm('Going to delete associated file, do you want to continue ?')) {
+                //TODO doit supprimer que les associated file des visites deleted
+                //Storage::deleteDirectory($studyName);
+            }
+
+            $this->info('The command was successful !');
+        }
+
+        return 0;
+    }
+
+    private function getDicomSeriesOfVisits(array $visitIds)
+    {
+        return $this->dicomSeries
+            ->whereHas('dicomStudy', function ($query) use ($visitIds) {
+                $query->whereIn('visit_id', $visitIds)->withTrashed();
+            })->select('orthanc_id')->get()->toArray();
+    }
+
+    private function getVisitsOfStudy(string $studyName)
+    {
+        return $this->visit->withTrashed()->with(['visitType', 'patient'])
+            ->whereHas('patient', function ($query) use ($studyName) {
+                $query->where('study_name', $studyName);
+            })->get();
+    }
+
+}
diff --git a/GaelO2/app/Console/Commands/DeleteStudy.php b/GaelO2/app/Console/Commands/DeleteStudy.php
index 2e64b4743..ea4a0100a 100644
--- a/GaelO2/app/Console/Commands/DeleteStudy.php
+++ b/GaelO2/app/Console/Commands/DeleteStudy.php
@@ -8,7 +8,6 @@
 use App\Models\Visit;
 use Exception;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 
@@ -19,6 +18,7 @@ class DeleteStudy extends Command
     private Visit $visit;
     private DicomSeries $dicomSeries;
     private OrthancService $orthancService;
+    private GaelODeleteRessourcesRepository $gaelODeleteRessourcesRepository;
     /**
      * The name and signature of the console command.
      *
@@ -42,12 +42,14 @@ public function handle(
         Study $study,
         Visit $visit,
         DicomSeries $dicomSeries,
-        OrthancService $orthancService
+        OrthancService $orthancService,
+        GaelODeleteRessourcesRepository $gaelODeleteRessourcesRepository
     ) {
         $this->study = $study;
         $this->visit = $visit;
         $this->dicomSeries = $dicomSeries;
         $this->orthancService = $orthancService;
+        $this->gaelODeleteRessourcesRepository = $gaelODeleteRessourcesRepository;
         $this->orthancService->setOrthancServer(true);
 
         $studyName = $this->argument('studyName');
@@ -75,10 +77,9 @@ public function handle(
 
         if ($this->confirm('Warning : This CANNOT be undone, do you wish to continue?')) {
 
-            $gaeloDeleteRessourceService = App::make(GaelODeleteRessourcesService::class);
-            $gaeloDeleteRessourceService->deleteDocumentation($studyEntity->name);
-            $gaeloDeleteRessourceService->deleteRoles($studyEntity->name);
-            $gaeloDeleteRessourceService->deleteTracker($studyEntity->name);
+            $this->gaelODeleteRessourcesRepository->deleteDocumentation($studyEntity->name);
+            $this->gaelODeleteRessourcesRepository->deleteRoles($studyEntity->name);
+            $this->gaelODeleteRessourcesRepository->deleteTracker($studyEntity->name);
 
             //Get Visit ID of Original Study
             $originalStudy = $studyEntity->ancillary_of ?? $studyEntity->name;
@@ -88,8 +89,8 @@ public function handle(
                 return $visit['id'];
             }, $visits->toArray());
 
-            $gaeloDeleteRessourceService->deleteReviews($visitIds, $studyName);
-            $gaeloDeleteRessourceService->deleteReviewStatus($visitIds, $studyName);
+            $this->gaelODeleteRessourcesRepository->deleteReviews($visitIds, $studyName);
+            $this->gaelODeleteRessourcesRepository->deleteReviewStatus($visitIds, $studyName);
 
             if ($studyEntity['ancillary_of'] === null) {
 
@@ -98,26 +99,30 @@ public function handle(
                 $orthancIdArray = array_map(function ($seriesId) {
                     return $seriesId['orthanc_id'];
                 }, $dicomSeries);
-    
+
                 $this->line(implode(" ", $orthancIdArray));
-    
+
                 $this->table(
                     ['orthanc_id'],
                     $dicomSeries
                 );
 
-                $gaeloDeleteRessourceService->deleteDicomsSeries($visitIds);
-                $gaeloDeleteRessourceService->deleteDicomsStudies($visitIds);
-                $gaeloDeleteRessourceService->deleteVisits($visitIds);
-                $gaeloDeleteRessourceService->deleteVisitGroupAndVisitType($studyName);
-                $gaeloDeleteRessourceService->deletePatient($studyName);
+                $this->gaelODeleteRessourcesRepository->deleteDicomsSeries($visitIds);
+                $this->gaelODeleteRessourcesRepository->deleteDicomsStudies($visitIds);
+                $this->gaelODeleteRessourcesRepository->deleteVisits($visitIds);
+                $this->gaelODeleteRessourcesRepository->deleteVisitGroupAndVisitType($studyName);
+                $this->gaelODeleteRessourcesRepository->deletePatient($studyName);
             }
 
-            $studyEntity->forceDelete();
+            $this->gaelODeleteRessourcesRepository->deleteStudy($studyName);
 
-            if ($this->option('deleteDicom') && $this->confirm('Found ' . sizeOf($orthancIdArray) . ' series to delete, do you want to continue ?')) {
+            $confirmDeleteDicom = $this->confirm('Found ' . sizeOf($orthancIdArray) . ' series to delete, do you want to continue ?');
+            $confirmDeleteAssociatedFiles = $this->confirm('Going to delete associated file, do you want to continue ?');
+
+            if ($this->option('deleteDicom') && $confirmDeleteDicom) {
                 foreach ($orthancIdArray as $seriesOrthancId) {
                     try {
+                        $this->info('Deleting ' . $seriesOrthancId);
                         $this->orthancService->deleteFromOrthanc('series', $seriesOrthancId);
                     } catch (Exception $e) {
                         Log::error($e->getMessage());
@@ -125,7 +130,7 @@ public function handle(
                 }
             }
 
-            if ($this->option('deleteAssociatedFile') && $this->confirm('Going to delete associated file, do you want to continue ?')) {
+            if ($this->option('deleteAssociatedFile') && $confirmDeleteAssociatedFiles) {
                 Storage::deleteDirectory($studyName);
             }
 
@@ -150,5 +155,4 @@ private function getVisitsOfStudy(string $studyName)
                 $query->where('study_name', $studyName);
             })->get();
     }
-
 }
diff --git a/GaelO2/app/Console/Commands/GaelODeleteRessourcesService.php b/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
similarity index 93%
rename from GaelO2/app/Console/Commands/GaelODeleteRessourcesService.php
rename to GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
index 70f6152eb..def1ba600 100644
--- a/GaelO2/app/Console/Commands/GaelODeleteRessourcesService.php
+++ b/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
@@ -2,9 +2,6 @@
 
 namespace App\Console\Commands;
 
-use App\GaelO\Entities\StudyEntity;
-use App\GaelO\Exceptions\GaelOException;
-use App\GaelO\Services\OrthancService;
 use App\Models\DicomSeries;
 use App\Models\DicomStudy;
 use App\Models\Documentation;
@@ -17,7 +14,7 @@
 use App\Models\Visit;
 use App\Models\VisitGroup;
 
-class GaelODeleteRessourcesService
+class GaelODeleteRessourcesRepository
 {
 
     private Study $study;
@@ -31,7 +28,6 @@ class GaelODeleteRessourcesService
     private Role $role;
     private VisitGroup $visitGroup;
     private Review $review;
-    private OrthancService $orthancService;
 
     public function __construct(
         Study $study,
@@ -102,6 +98,12 @@ public function deleteReviewStatus(array $visitIds, String $studyName)
         $this->reviewStatus->where('study_name', $studyName)->whereIn('visit_id', $visitIds)->delete();
     }
 
+    public function deleteStudy(string $studyName)
+    {
+        $studyEntity = $this->study->withTrashed()->findOrFail($studyName);
+        $studyEntity->forceDelete();
+    }
+
     public function deleteVisits(array $visitIds)
     {
         $this->visit->whereIn('id', $visitIds)->withTrashed()->forceDelete();
diff --git a/GaelO2/app/Providers/AdapterProvider.php b/GaelO2/app/Providers/AdapterProvider.php
index 72c6c919f..c9d11ab6d 100644
--- a/GaelO2/app/Providers/AdapterProvider.php
+++ b/GaelO2/app/Providers/AdapterProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Console\Commands\GaelODeleteRessourcesRepository;
 use App\GaelO\Adapters\DatabaseDumperAdapter;
 use App\GaelO\Adapters\FrameworkAdapter;
 use App\GaelO\Adapters\HttpClientAdapter;
@@ -34,6 +35,7 @@ public function register()
         $this->app->bind(PhoneNumberInterface::class, PhoneNumberAdapter::class);
         $this->app->bind(JobInterface::class, JobAdapter::class);
         $this->app->bind(PdfInterface::class, PdfAdapter::class);
+        $this->app->bind(GaelODeleteRessourcesRepository::class, GaelODeleteRessourcesRepository::class);
     }
 
     /**

From e0bcfb482bbcd2fde12d87fb9eb61b8a4c6e5b46 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Tue, 14 Nov 2023 00:23:31 +0100
Subject: [PATCH 03/72] WIP

---
 .../app/Console/Commands/DeleteOldVisits.php  | 39 ++++++-------------
 .../GaelODeleteRessourcesRepository.php       | 10 +++++
 2 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/GaelO2/app/Console/Commands/DeleteOldVisits.php b/GaelO2/app/Console/Commands/DeleteOldVisits.php
index 5b4b844b2..3a1b70771 100644
--- a/GaelO2/app/Console/Commands/DeleteOldVisits.php
+++ b/GaelO2/app/Console/Commands/DeleteOldVisits.php
@@ -9,7 +9,6 @@
 use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
 
 class DeleteOldVisits extends Command
 {
@@ -61,7 +60,7 @@ public function handle(
         }
 
         $studyEntity = $this->study->withTrashed()->findOrFail($studyName);
-        
+
         //Check that no ancillary study is remaining on this study
         $ancilariesStudies = $this->study->where('ancillary_of', $studyName)->get();
         if ($ancilariesStudies->count() > 0) {
@@ -69,19 +68,15 @@ public function handle(
             return 0;
         }
 
-        if($studyEntity['ancillary_of']){
+        if ($studyEntity['ancillary_of']) {
             $this->error('Cannot be used for an ancillary study');
             return 0;
         }
 
         if ($this->confirm('Warning : This CANNOT be undone, do you wish to continue?')) {
 
-            //TODO delete tracker doit etre specifique au visites supprimées
-            //$this->gaelODeleteRessourcesRepository->deleteTracker($studyEntity->name);
-
-            //Get Visit ID of Original Study
-            //TODO Doit tenir compte de l'interval de temps depuis la creation
-            $visits = $this->getVisitsOfStudy($studyName);
+            //Get visits created more than 5 day
+            $visits = $this->getOlderVisitsOfStudy($studyName, date('Y.m.d', strtotime("-5 days")));
 
             $visitIds = array_map(function ($visit) {
                 return $visit['id'];
@@ -89,30 +84,24 @@ public function handle(
 
             $this->gaelODeleteRessourcesRepository->deleteReviews($visitIds, $studyName);
             $this->gaelODeleteRessourcesRepository->deleteReviewStatus($visitIds, $studyName);
+            $this->gaelODeleteRessourcesRepository->deleteTrackerOfVisits($visitIds, $studyEntity->name);
 
             $dicomSeries = $this->getDicomSeriesOfVisits($visitIds);
             $orthancIdArray = array_map(function ($seriesId) {
                 return $seriesId['orthanc_id'];
             }, $dicomSeries);
 
-            $this->line(implode(" ", $orthancIdArray));
-
-            $this->table(
-                ['orthanc_id'],
-                $dicomSeries
-            );
-
             $this->gaelODeleteRessourcesRepository->deleteDicomsSeries($visitIds);
             $this->gaelODeleteRessourcesRepository->deleteDicomsStudies($visitIds);
             $this->gaelODeleteRessourcesRepository->deleteVisits($visitIds);
-            //TODO Doit supprimer les patients que si il ne reste pas de visites...
-            //$this->gaelODeleteRessourcesRepository->deletePatient($studyName);
-            
+            //Remove patients with no visits
+            $this->gaelODeleteRessourcesRepository->deletePatientsWithNoVisits($studyName);
+
 
             if ($this->option('deleteDicom') && $this->confirm('Found ' . sizeOf($orthancIdArray) . ' series to delete, do you want to continue ?')) {
                 foreach ($orthancIdArray as $seriesOrthancId) {
                     try {
-                        $this->info('Deleting '.$seriesOrthancId);
+                        $this->info('Deleting ' . $seriesOrthancId);
                         $this->orthancService->deleteFromOrthanc('series', $seriesOrthancId);
                     } catch (Exception $e) {
                         Log::error($e->getMessage());
@@ -120,11 +109,6 @@ public function handle(
                 }
             }
 
-            if ($this->option('deleteAssociatedFile') && $this->confirm('Going to delete associated file, do you want to continue ?')) {
-                //TODO doit supprimer que les associated file des visites deleted
-                //Storage::deleteDirectory($studyName);
-            }
-
             $this->info('The command was successful !');
         }
 
@@ -139,12 +123,11 @@ private function getDicomSeriesOfVisits(array $visitIds)
             })->select('orthanc_id')->get()->toArray();
     }
 
-    private function getVisitsOfStudy(string $studyName)
+    private function getOlderVisitsOfStudy(string $studyName, string $datelimit)
     {
-        return $this->visit->withTrashed()->with(['visitType', 'patient'])
+        return $this->visit->withTrashed()->whereDate('creation_date', '<=', $datelimit)->with(['visitType', 'patient'])
             ->whereHas('patient', function ($query) use ($studyName) {
                 $query->where('study_name', $studyName);
             })->get();
     }
-
 }
diff --git a/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php b/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
index def1ba600..4cdc4ccdd 100644
--- a/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
+++ b/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
@@ -71,6 +71,11 @@ public function deleteTracker(string $studyName)
         $this->tracker->where('study_name', $studyName)->delete();
     }
 
+    public function deleteTrackerOfVisits(array $visitIds, string $studyName)
+    {
+        $this->tracker->where('study_name', $studyName)->whereIn('visit_id', $visitIds)->delete();
+    }
+
     public function deleteDicomsStudies(array $visitId)
     {
         return $this->dicomStudy->whereIn('visit_id', $visitId)->withTrashed()->forceDelete();
@@ -88,6 +93,11 @@ public function deletePatient(string $studyName)
         $this->patient->where('study_name', $studyName)->delete();
     }
 
+    public function deletePatientsWithNoVisits(string $studyName)
+    {
+        $this->patient->where('study_name', $studyName)->doesntHave('visits')->delete();
+    }
+
     public function deleteReviews(array $visitIds, string $studyName)
     {
         $this->review->where('study_name', $studyName)->whereIn('visit_id', $visitIds)->withTrashed()->forceDelete();

From 1318c73ca72fd51cf89fb33a03d3b80a9722edfc Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Thu, 28 Dec 2023 17:50:37 +0100
Subject: [PATCH 04/72] reading as stream to be tested

---
 GaelO2/app/GaelO/Adapters/FrameworkAdapter.php           | 9 +++++++--
 .../app/GaelO/Interfaces/Adapters/FrameworkInterface.php | 2 +-
 GaelO2/app/GaelO/Util.php                                | 7 +++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/GaelO2/app/GaelO/Adapters/FrameworkAdapter.php b/GaelO2/app/GaelO/Adapters/FrameworkAdapter.php
index 03d8b6c92..3109a0f43 100644
--- a/GaelO2/app/GaelO/Adapters/FrameworkAdapter.php
+++ b/GaelO2/app/GaelO/Adapters/FrameworkAdapter.php
@@ -46,9 +46,14 @@ public static function deleteFile(string $path): void
         Storage::delete($path);
     }
 
-    public static function getFile(string $path): string
+    public static function getFile(string $path, bool $asStream = false)
     {
-        $file = Storage::get($path);
+        if($asStream){
+            $file = Storage::readStream($path);
+        }else{
+            $file = Storage::get($path);
+        }
+        
         if($file === null){
             throw new GaelOException("File not found in storage");
         }
diff --git a/GaelO2/app/GaelO/Interfaces/Adapters/FrameworkInterface.php b/GaelO2/app/GaelO/Interfaces/Adapters/FrameworkInterface.php
index 2d9e224b0..ebd19dae1 100644
--- a/GaelO2/app/GaelO/Interfaces/Adapters/FrameworkInterface.php
+++ b/GaelO2/app/GaelO/Interfaces/Adapters/FrameworkInterface.php
@@ -21,7 +21,7 @@ public static function storeFile(string $path, $contents): void;
 
     public static function deleteFile(string $path): void;
 
-    public static function getFile(string $path): string;
+    public static function getFile(string $path, bool $asStream) :mixed;
 
     public static function sendResetPasswordLink(string $email): bool;
 
diff --git a/GaelO2/app/GaelO/Util.php b/GaelO2/app/GaelO/Util.php
index f33d287ae..5e9b1fc3b 100644
--- a/GaelO2/app/GaelO/Util.php
+++ b/GaelO2/app/GaelO/Util.php
@@ -52,8 +52,11 @@ public static function addStoredFilesInZip(ZipArchive $zip, ?string $path)
 
         foreach ($files as $file) {
             // Add current file to archive
-            $fileContent = FrameworkAdapter::getFile($file);
-            $zip->addFromString($file, $fileContent);
+            $tempraryFile = tmpfile();
+            $tempraryFilePath = stream_get_meta_data($tempraryFile)['uri']; 
+            $fileContent = FrameworkAdapter::getFile($file, true);
+            stream_copy_to_stream($fileContent, $tempraryFile);
+            $zip->addFile($tempraryFilePath, $file);
         }
     }
 

From 1d877004dbb3b2a1cef32e139163673263a6e317 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Thu, 28 Dec 2023 17:55:18 +0100
Subject: [PATCH 05/72] fixes

---
 GaelO2/app/GaelO/Adapters/FrameworkAdapter.php         | 10 +++++-----
 .../GaelO/Interfaces/Adapters/FrameworkInterface.php   |  2 +-
 GaelO2/app/GaelO/Util.php                              |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/GaelO2/app/GaelO/Adapters/FrameworkAdapter.php b/GaelO2/app/GaelO/Adapters/FrameworkAdapter.php
index 3109a0f43..72737fd25 100644
--- a/GaelO2/app/GaelO/Adapters/FrameworkAdapter.php
+++ b/GaelO2/app/GaelO/Adapters/FrameworkAdapter.php
@@ -46,15 +46,15 @@ public static function deleteFile(string $path): void
         Storage::delete($path);
     }
 
-    public static function getFile(string $path, bool $asStream = false)
+    public static function getFile(string $path, bool $asStream = false): mixed
     {
-        if($asStream){
+        if ($asStream) {
             $file = Storage::readStream($path);
-        }else{
+        } else {
             $file = Storage::get($path);
         }
-        
-        if($file === null){
+
+        if ($file === null) {
             throw new GaelOException("File not found in storage");
         }
         return $file;
diff --git a/GaelO2/app/GaelO/Interfaces/Adapters/FrameworkInterface.php b/GaelO2/app/GaelO/Interfaces/Adapters/FrameworkInterface.php
index ebd19dae1..4c7471ce1 100644
--- a/GaelO2/app/GaelO/Interfaces/Adapters/FrameworkInterface.php
+++ b/GaelO2/app/GaelO/Interfaces/Adapters/FrameworkInterface.php
@@ -21,7 +21,7 @@ public static function storeFile(string $path, $contents): void;
 
     public static function deleteFile(string $path): void;
 
-    public static function getFile(string $path, bool $asStream) :mixed;
+    public static function getFile(string $path, bool $asStream): mixed;
 
     public static function sendResetPasswordLink(string $email): bool;
 
diff --git a/GaelO2/app/GaelO/Util.php b/GaelO2/app/GaelO/Util.php
index 5e9b1fc3b..a5bac2193 100644
--- a/GaelO2/app/GaelO/Util.php
+++ b/GaelO2/app/GaelO/Util.php
@@ -13,7 +13,7 @@
 class Util
 {
 
-    public static function fillObject(array $dataToExtract, object $dataToFill) :void
+    public static function fillObject(array $dataToExtract, object $dataToFill): void
     {
         //Get Expected properties awaited in DTO Request
         $reflect = new ReflectionClass($dataToFill);
@@ -53,7 +53,7 @@ public static function addStoredFilesInZip(ZipArchive $zip, ?string $path)
         foreach ($files as $file) {
             // Add current file to archive
             $tempraryFile = tmpfile();
-            $tempraryFilePath = stream_get_meta_data($tempraryFile)['uri']; 
+            $tempraryFilePath = stream_get_meta_data($tempraryFile)['uri'];
             $fileContent = FrameworkAdapter::getFile($file, true);
             stream_copy_to_stream($fileContent, $tempraryFile);
             $zip->addFile($tempraryFilePath, $file);
@@ -134,7 +134,7 @@ public static function isSemanticVersioning(string $version): bool
         return preg_match('/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)?$/', $version);
     }
 
-    public static function isUrlSafeString(string $value) :bool
+    public static function isUrlSafeString(string $value): bool
     {
         return preg_match('/^[a-zA-Z0-9_-]*$/', $value);
     }

From d54556361502d97dec00736fbd0f5fa54b239924 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Thu, 28 Dec 2023 18:30:44 +0100
Subject: [PATCH 06/72] fix download of large file

---
 .../app/GaelO/Services/ExportStudyService.php |  3 +--
 .../ExportDatabase/ExportDatabase.php         |  3 +--
 GaelO2/app/GaelO/Util.php                     | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/GaelO2/app/GaelO/Services/ExportStudyService.php b/GaelO2/app/GaelO/Services/ExportStudyService.php
index 313dbf417..69a92f50b 100644
--- a/GaelO2/app/GaelO/Services/ExportStudyService.php
+++ b/GaelO2/app/GaelO/Services/ExportStudyService.php
@@ -311,8 +311,7 @@ public function exportAssociatedFiles(): void
         //Add a file to create zip
         $zip->addFromString('Readme', 'Folder Containing associated files to study');
         //send stored file for this study
-        Util::addStoredFilesInZip($zip, $this->studyName);
-        $zip->close();
+        Util::addStoredFilesInZipAndClose($zip, $this->studyName);
 
         $exporFileResult = new ExportFileResults();
         $exporFileResult->addExportFile(ExportDataResults::EXPORT_TYPE_ZIP, $tempZip);
diff --git a/GaelO2/app/GaelO/UseCases/ExportDatabase/ExportDatabase.php b/GaelO2/app/GaelO/UseCases/ExportDatabase/ExportDatabase.php
index c28de6fef..8468fd694 100644
--- a/GaelO2/app/GaelO/UseCases/ExportDatabase/ExportDatabase.php
+++ b/GaelO2/app/GaelO/UseCases/ExportDatabase/ExportDatabase.php
@@ -38,8 +38,7 @@ public function execute(ExportDatabaseRequest $exportDatabaseRequest, ExportData
             $date = Date('Ymd_His');
             $zip->addFile($filePathSql, "export_database_$date.sql");
             
-            Util::addStoredFilesInZip($zip, null);
-            $zip->close();
+            Util::addStoredFilesInZipAndClose($zip, null);
             
             //Unlick after lock released by zip close
             unlink($filePathSql);
diff --git a/GaelO2/app/GaelO/Util.php b/GaelO2/app/GaelO/Util.php
index a5bac2193..913d97053 100644
--- a/GaelO2/app/GaelO/Util.php
+++ b/GaelO2/app/GaelO/Util.php
@@ -5,6 +5,7 @@
 use App\GaelO\Adapters\FrameworkAdapter;
 use Carbon\Carbon;
 use FilesystemIterator;
+use Illuminate\Support\Facades\Log;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use ReflectionClass;
@@ -45,19 +46,25 @@ public static function camelCaseToSnakeCase(string $string, string $us = "_"): s
         ));
     }
 
-    public static function addStoredFilesInZip(ZipArchive $zip, ?string $path)
+    public static function addStoredFilesInZipAndClose(ZipArchive $zip, ?string $path)
     {
 
         $files = FrameworkAdapter::getStoredFiles($path);
-
+        $temporaryFilesToDelete=[];
         foreach ($files as $file) {
-            // Add current file to archive
-            $tempraryFile = tmpfile();
-            $tempraryFilePath = stream_get_meta_data($tempraryFile)['uri'];
+            // Add current file to archive using data as stream to prevent running out memory for large files
+            $tempraryFilePath = tempnam(ini_get('upload_tmp_dir'), 'TMPEXP_');
+            $temporaryFilesToDelete[] = $tempraryFilePath;
             $fileContent = FrameworkAdapter::getFile($file, true);
-            stream_copy_to_stream($fileContent, $tempraryFile);
+            stream_copy_to_stream($fileContent, fopen($tempraryFilePath, 'w'));
             $zip->addFile($tempraryFilePath, $file);
         }
+        //Close to build the zip as the operation is async
+        $zip->close();
+        //Delete all temporary files
+        foreach($temporaryFilesToDelete as $temp){
+            unlink($temp);
+        }
     }
 
     public static function recursiveDirectoryDelete(string $directory)

From 23626774e84daa8810da41dc9dbc294a86adf706 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Fri, 29 Dec 2023 10:07:27 +0100
Subject: [PATCH 07/72] remove unneded import

---
 GaelO2/app/GaelO/Util.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/GaelO2/app/GaelO/Util.php b/GaelO2/app/GaelO/Util.php
index 913d97053..fad808ffc 100644
--- a/GaelO2/app/GaelO/Util.php
+++ b/GaelO2/app/GaelO/Util.php
@@ -5,7 +5,6 @@
 use App\GaelO\Adapters\FrameworkAdapter;
 use Carbon\Carbon;
 use FilesystemIterator;
-use Illuminate\Support\Facades\Log;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use ReflectionClass;

From f095f3de3897e0fdb11dbe649741b5424865d26d Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Fri, 29 Dec 2023 10:25:16 +0100
Subject: [PATCH 08/72] max execution time for export apis

---
 GaelO2/app/GaelO/UseCases/ExportDatabase/ExportDatabase.php  | 3 ++-
 .../app/GaelO/UseCases/ExportStudyData/ExportStudyData.php   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/GaelO2/app/GaelO/UseCases/ExportDatabase/ExportDatabase.php b/GaelO2/app/GaelO/UseCases/ExportDatabase/ExportDatabase.php
index 8468fd694..111ef573c 100644
--- a/GaelO2/app/GaelO/UseCases/ExportDatabase/ExportDatabase.php
+++ b/GaelO2/app/GaelO/UseCases/ExportDatabase/ExportDatabase.php
@@ -27,7 +27,8 @@ public function execute(ExportDatabaseRequest $exportDatabaseRequest, ExportData
 
         try {
             $this->checkAuthorization($exportDatabaseRequest->currentUserId);
-
+            //Operation might be long, set max execution time to 30 minutes
+            set_time_limit(1800);
             $zip = new ZipArchive();
             $tempZip = tempnam(ini_get('upload_tmp_dir'), 'TMPZIPDB_');
             $zip->open($tempZip, ZipArchive::OVERWRITE);
diff --git a/GaelO2/app/GaelO/UseCases/ExportStudyData/ExportStudyData.php b/GaelO2/app/GaelO/UseCases/ExportStudyData/ExportStudyData.php
index 06a8b3cbd..ab2258534 100644
--- a/GaelO2/app/GaelO/UseCases/ExportStudyData/ExportStudyData.php
+++ b/GaelO2/app/GaelO/UseCases/ExportStudyData/ExportStudyData.php
@@ -30,10 +30,11 @@ public function execute(ExportStudyDataRequest $exportStudyDataRequest, ExportSt
 
             $this->checkAuthorization($exportStudyDataRequest->currentUserId, $studyName);
 
-            $this->exportStudyService->setStudyName($studyName);
+            //Operation might be long, set max execution time to 30 minutes
+            set_time_limit(1800);
 
+            $this->exportStudyService->setStudyName($studyName);
             $this->exportStudyService->exportAll();
-
             $exportResults = $this->exportStudyService->getExportStudyResult();
 
             $exportStudyDataResponse->zipFile = $exportResults->getResultsAsZip();

From 302e1fa5c1b934d666b744054b9960828aa2d6a7 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sat, 13 Jan 2024 17:57:33 +0100
Subject: [PATCH 09/72] migrate qc report to processing backend

---
 .../GaelOProcessingService.php                | 13 ++++++
 .../TmtvProcessingService.php                 | 16 ++------
 GaelO2/app/GaelO/Services/OrthancService.php  | 10 +++++
 GaelO2/app/Jobs/JobQcReport.php               |  4 +-
 GaelO2/app/Jobs/QcReport/SeriesReport.php     | 41 +++++++++++--------
 5 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php b/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php
index 00393f282..2d07f6882 100644
--- a/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php
+++ b/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php
@@ -49,6 +49,9 @@ public function executeInference(string $modelName, array $payload)
         return $request->getJsonBody();
     }
 
+    /**
+     * Return gif
+     */
     public function createMIPForSeries(string $seriesId, array $payload = []): string
     {
         $downloadedFilePath  = tempnam(ini_get('upload_tmp_dir'), 'TMP_Inference_');
@@ -57,6 +60,16 @@ public function createMIPForSeries(string $seriesId, array $payload = []): strin
         return $downloadedFilePath;
     }
 
+    /**
+     * return png
+     */
+    public function createMosaicForSeries(string $seriesId, array $payload = ["min" => null, "max" => null, "cols" => 5, "nbImages" => 20, "width" => 512, "height" => 512, "orientation"=>"LPI"]): string
+    {
+        $downloadedFilePath  = tempnam(ini_get('upload_tmp_dir'), 'TMP_Inference_');
+        $this->httpClientInterface->requestStreamResponseToFile('POST', "/series/" . $seriesId . "/mosaic", $downloadedFilePath, ['content-Type' => 'application/json'], $payload);
+        return $downloadedFilePath;
+    }
+
     public function getNiftiMask(string $maskId): string
     {
         $downloadedFilePath  = tempnam(ini_get('upload_tmp_dir'), 'TMP_Inference_');
diff --git a/GaelO2/app/GaelO/Services/GaelOProcessingService/TmtvProcessingService.php b/GaelO2/app/GaelO/Services/GaelOProcessingService/TmtvProcessingService.php
index a94cb6d33..c63265676 100644
--- a/GaelO2/app/GaelO/Services/GaelOProcessingService/TmtvProcessingService.php
+++ b/GaelO2/app/GaelO/Services/GaelOProcessingService/TmtvProcessingService.php
@@ -33,8 +33,10 @@ public function __construct(
     public function runInference(): MaskProcessingService
     {
 
-        $this->sendDicomToProcessing($this->ptOrthancSeriesId);
-        $this->sendDicomToProcessing($this->ctOrthancSeriesId);
+        $this->orthancService->sendDicomToProcessing($this->ptOrthancSeriesId, $this->gaelOProcessingService);
+        $this->addCreatedRessource('dicoms', $this->ptOrthancSeriesId);
+        $this->orthancService->sendDicomToProcessing($this->ctOrthancSeriesId, $this->gaelOProcessingService);
+        $this->addCreatedRessource('dicoms', $this->ptOrthancSeriesId);
 
         $idPT = $this->gaelOProcessingService->createSeriesFromOrthanc($this->ptOrthancSeriesId, true, true);
         $this->addCreatedRessource('series', $idPT);
@@ -56,16 +58,6 @@ public function runInference(): MaskProcessingService
     }
 
 
-
-    protected function sendDicomToProcessing(string $orthancSeriesIdPt)
-    {
-        $temporaryZipDicom  = tempnam(ini_get('upload_tmp_dir'), 'TMP_Inference_');
-        $this->orthancService->getZipStreamToFile([$orthancSeriesIdPt], $temporaryZipDicom);
-        $this->gaelOProcessingService->createDicom($temporaryZipDicom);
-        $this->addCreatedRessource('dicoms', $orthancSeriesIdPt);
-        unlink($temporaryZipDicom);
-    }
-
     public function loadPetAndCtSeriesOrthancIdsFromVisit($visitId): void
     {
         $dicomStudyEntity = $this->dicomStudyRepositoryInterface->getDicomsDataFromVisit($visitId, false, false);
diff --git a/GaelO2/app/GaelO/Services/OrthancService.php b/GaelO2/app/GaelO/Services/OrthancService.php
index 904b4ebaa..bfd0e9b64 100644
--- a/GaelO2/app/GaelO/Services/OrthancService.php
+++ b/GaelO2/app/GaelO/Services/OrthancService.php
@@ -8,6 +8,7 @@
 use App\GaelO\Exceptions\GaelOException;
 use App\GaelO\Interfaces\Adapters\FrameworkInterface;
 use App\GaelO\Interfaces\Adapters\HttpClientInterface;
+use App\GaelO\Services\GaelOProcessingService\GaelOProcessingService;
 use App\GaelO\Services\StoreObjects\OrthancMetaData;
 use App\GaelO\Services\StoreObjects\TagAnon;
 use App\GaelO\Services\StoreObjects\OrthancStudy;
@@ -472,4 +473,13 @@ public function getInstancePreview(string $instanceOrthancID): string
         $this->httpClientInterface->requestStreamResponseToFile('GET', '/instances/' . $instanceOrthancID . '/preview?returnUnsupportedImage',  $downloadedFilePath, []);
         return $downloadedFilePath;
     }
+
+    public function sendDicomToProcessing(string $orthancSeriesIdPt, GaelOProcessingService $gaelOProcessingService)
+    {
+        $temporaryZipDicom  = tempnam(ini_get('upload_tmp_dir'), 'TMP_Inference_');
+        $this->getZipStreamToFile([$orthancSeriesIdPt], $temporaryZipDicom);
+        $gaelOProcessingService->createDicom($temporaryZipDicom);
+        unlink($temporaryZipDicom);        
+    }
+
 }
diff --git a/GaelO2/app/Jobs/JobQcReport.php b/GaelO2/app/Jobs/JobQcReport.php
index 4ac8f2ef0..231d20b09 100644
--- a/GaelO2/app/Jobs/JobQcReport.php
+++ b/GaelO2/app/Jobs/JobQcReport.php
@@ -9,6 +9,7 @@
 use App\GaelO\Interfaces\Repositories\ReviewRepositoryInterface;
 use App\GaelO\Interfaces\Repositories\UserRepositoryInterface;
 use App\GaelO\Interfaces\Repositories\VisitRepositoryInterface;
+use App\GaelO\Services\GaelOProcessingService\GaelOProcessingService;
 use App\GaelO\Services\MailServices;
 use App\GaelO\Services\OrthancService;
 use App\Jobs\QcReport\InstanceReport;
@@ -57,6 +58,7 @@ public function handle(
         DicomStudyRepositoryInterface $dicomStudyRepositoryInterface,
         MailServices $mailServices,
         OrthancService $orthancService,
+        GaelOProcessingService $gaelOProcessingService,
         ReviewRepositoryInterface $reviewRepositoryInterface
     ) {
         $this->orthancService = $orthancService;
@@ -115,7 +117,7 @@ public function handle(
                 $seriesReport->fillData($seriesSharedTags);
                 $seriesReport->setInstanceReport($instanceReport);
 
-                $seriesReport->loadSeriesPreview($this->orthancService);
+                $seriesReport->loadSeriesPreview($this->orthancService, $gaelOProcessingService);
 
                 $seriesReports[] = $seriesReport;
             } catch (Throwable $t) {
diff --git a/GaelO2/app/Jobs/QcReport/SeriesReport.php b/GaelO2/app/Jobs/QcReport/SeriesReport.php
index 05a835524..6195f6e8b 100644
--- a/GaelO2/app/Jobs/QcReport/SeriesReport.php
+++ b/GaelO2/app/Jobs/QcReport/SeriesReport.php
@@ -4,6 +4,7 @@
 
 use App\GaelO\DicomUtils;
 use App\GaelO\Exceptions\GaelOException;
+use App\GaelO\Services\GaelOProcessingService\GaelOProcessingService;
 use App\GaelO\Services\OrthancService;
 use App\GaelO\Services\StoreObjects\OrthancMetaData;
 use Throwable;
@@ -136,29 +137,35 @@ private function getPreviewType(): ImageType
         return ImageType::DEFAULT;
     }
 
-    public function loadSeriesPreview(OrthancService $orthancService): void
+    public function loadSeriesPreview(OrthancService $orthancService, GaelOProcessingService $gaelOProcessingService): void
     {
         $imageType = $this->getPreviewType();
 
         $imagePath = [];
 
+
         try {
-            switch ($imageType) {
-                case ImageType::MIP:
-                    //Mosaic for now as mip need significant computation and memory backend
-                    $imagePath[] = $orthancService->getMosaic('series', $this->seriesOrthancId);
-                    break;
-                case ImageType::MOSAIC:
-                    $imagePath[] = $orthancService->getMosaic('series', $this->seriesOrthancId);
-                    break;
-                case ImageType::MULTIFRAME:
-                    $imagePath = array_map(function ($instanceOrthancId) use ($orthancService) {
-                        return $orthancService->getMosaic('instances', $instanceOrthancId);
-                    }, $this->orthancInstanceIds);
-                    break;
-                case ImageType::DEFAULT:
-                    $imagePath[] = $orthancService->getInstancePreview($this->orthancInstanceIds[0]);
-                    break;
+            if ($imageType === ImageType::DEFAULT) {
+                $imagePath[] = $orthancService->getInstancePreview($this->orthancInstanceIds[0]);
+            } else {
+                $isPet = $this->modality == 'PT';
+                $payload = $isPet ? ['min' => 0, 'max' => 5] : [];
+                $orthancService->sendDicomToProcessing($this->seriesOrthancId, $gaelOProcessingService);
+                $processingSeriesId = $gaelOProcessingService->createSeriesFromOrthanc($this->seriesOrthancId, $isPet, $isPet);
+                switch ($imageType) {
+                    case ImageType::MIP:
+                        //Mosaic for now as mip need significant computation and memory backend
+                        $imagePath[] = $gaelOProcessingService->createMIPForSeries($processingSeriesId, $payload);
+                        break;
+                    case ImageType::MOSAIC:
+                        $imagePath[] = $gaelOProcessingService->createMosaicForSeries($processingSeriesId, $payload);
+                        break;
+                    case ImageType::MULTIFRAME:
+                        $imagePath = array_map(function ($instanceOrthancId) use ($gaelOProcessingService) {
+                            return $gaelOProcessingService->createMosaicForSeries('instances', $instanceOrthancId);
+                        }, $this->orthancInstanceIds);
+                        break;
+                }
             }
         } catch (Throwable $t) {
         }

From bec47caaa4666d4c12ea4849b35c5d02977393e2 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sat, 13 Jan 2024 18:06:53 +0100
Subject: [PATCH 10/72] migrate qc to processing server

---
 GaelO2/app/Jobs/JobQcReport.php           | 2 +-
 GaelO2/app/Jobs/QcReport/SeriesReport.php | 3 ++-
 laravel-worker.conf                       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/GaelO2/app/Jobs/JobQcReport.php b/GaelO2/app/Jobs/JobQcReport.php
index 231d20b09..85925f06d 100644
--- a/GaelO2/app/Jobs/JobQcReport.php
+++ b/GaelO2/app/Jobs/JobQcReport.php
@@ -42,7 +42,7 @@ class JobQcReport implements ShouldQueue, ShouldBeUnique
      */
     public function __construct(int $visitId)
     {
-        $this->onQueue('auto-qc');
+        $this->onQueue('processing');
         $this->visitId = $visitId;
     }
 
diff --git a/GaelO2/app/Jobs/QcReport/SeriesReport.php b/GaelO2/app/Jobs/QcReport/SeriesReport.php
index 6195f6e8b..d91ad3dfc 100644
--- a/GaelO2/app/Jobs/QcReport/SeriesReport.php
+++ b/GaelO2/app/Jobs/QcReport/SeriesReport.php
@@ -143,7 +143,6 @@ public function loadSeriesPreview(OrthancService $orthancService, GaelOProcessin
 
         $imagePath = [];
 
-
         try {
             if ($imageType === ImageType::DEFAULT) {
                 $imagePath[] = $orthancService->getInstancePreview($this->orthancInstanceIds[0]);
@@ -166,6 +165,8 @@ public function loadSeriesPreview(OrthancService $orthancService, GaelOProcessin
                         }, $this->orthancInstanceIds);
                         break;
                 }
+                $gaelOProcessingService->deleteRessource('series', $processingSeriesId);
+                $gaelOProcessingService->deleteRessource('dicoms', $this->seriesOrthancId);
             }
         } catch (Throwable $t) {
         }
diff --git a/laravel-worker.conf b/laravel-worker.conf
index a0bfadccb..ad2fdccd3 100644
--- a/laravel-worker.conf
+++ b/laravel-worker.conf
@@ -12,7 +12,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 
 [program:laravel-worker]
 process_name=%(program_name)s_%(process_num)02d
-command=php /var/www/html/artisan queue:work --tries=3 --sleep=3 --max-time=3600 --queue=default,auto-qc,processing
+command=php /var/www/html/artisan queue:work --tries=3 --sleep=3 --max-time=3600 --queue=default,processing
 autostart=true
 autorestart=true
 stopasgroup=true

From 00c86119c2f42516ee2f30530cc0a824b7b53b3f Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Mon, 15 Jan 2024 00:34:15 +0100
Subject: [PATCH 11/72] qc report using file caching

---
 GaelO2/.env.example                           |   2 +
 .../app/GaelO/Adapters/AzureCacheAdapter.php  | 100 ++++++++
 .../app/GaelO/Adapters/FileCacheAdapter.php   |  28 +++
 .../Interfaces/Adapters/CacheInterface.php    |  10 +
 .../app/GaelO/Services/FileCacheService.php   |  45 ++++
 .../GaelOProcessingService.php                |  10 +-
 GaelO2/app/GaelO/Services/MailServices.php    |  14 +-
 .../Services/StoreObjects/OrthancMetaData.php |   5 +
 .../GetDicomSeriesMetadata.php                |  70 ++++++
 .../GetDicomSeriesMetadataRequest.php         |  10 +
 .../GetDicomSeriesMetadataResponse.php        |  10 +
 .../GetDicomSeriesPreview.php                 |  75 ++++++
 .../GetDicomSeriesPreviewRequest.php          |  11 +
 .../GetDicomSeriesPreviewResponse.php         |  11 +
 .../GetDicomStudyMetadata.php                 |  70 ++++++
 .../GetDicomStudyMetadataRequest.php          |  10 +
 .../GetDicomStudyMetadataResponse.php         |  10 +
 .../views/mails/mail_qc_report.blade.php      | 113 +--------
 .../mails/mail_qc_report_buttons.blade.php    | 217 +++++++++++-------
 ...mail_qc_report_investigator_form.blade.php | 102 --------
 .../mails/mail_qc_report_series.blade.php     | 151 ------------
 .../mails/mail_qc_report_study.blade.php      | 214 -----------------
 .../views/mails/mjml/qc_report_buttons.mjml   |   7 +-
 .../mjml/qc_report_investigator_form.mjml     |  36 ---
 .../views/mails/mjml/qc_report_series.mjml    |  49 ----
 .../views/mails/mjml/qc_report_study.mjml     |  65 ------
 .../app/Http/Controllers/DicomController.php  |  52 +++++
 .../app/Http/Controllers/ReviewController.php |   1 -
 GaelO2/app/Jobs/JobQcReport.php               |  46 ++--
 GaelO2/app/Jobs/QcReport/SeriesReport.php     |  22 +-
 GaelO2/app/Jobs/QcReport/VisitReport.php      |   8 -
 GaelO2/app/Providers/AdapterProvider.php      |  16 +-
 GaelO2/config/cache.php                       |   8 +
 GaelO2/routes/api.php                         |   4 +-
 .../Feature/TestDicoms/DicomMetadataTest.php  |  77 +++++++
 .../TestAdapters/FileCacheAdapterTest.php     |  39 ++++
 README.md                                     |   3 -
 37 files changed, 845 insertions(+), 876 deletions(-)
 create mode 100644 GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
 create mode 100644 GaelO2/app/GaelO/Adapters/FileCacheAdapter.php
 create mode 100644 GaelO2/app/GaelO/Interfaces/Adapters/CacheInterface.php
 create mode 100644 GaelO2/app/GaelO/Services/FileCacheService.php
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadata.php
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataRequest.php
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataResponse.php
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewRequest.php
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewResponse.php
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadata.php
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataRequest.php
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataResponse.php
 delete mode 100644 GaelO2/app/GaelO/views/mails/mail_qc_report_investigator_form.blade.php
 delete mode 100644 GaelO2/app/GaelO/views/mails/mail_qc_report_series.blade.php
 delete mode 100644 GaelO2/app/GaelO/views/mails/mail_qc_report_study.blade.php
 delete mode 100644 GaelO2/app/GaelO/views/mails/mjml/qc_report_investigator_form.mjml
 delete mode 100644 GaelO2/app/GaelO/views/mails/mjml/qc_report_series.mjml
 delete mode 100644 GaelO2/app/GaelO/views/mails/mjml/qc_report_study.mjml
 create mode 100644 GaelO2/tests/Feature/TestDicoms/DicomMetadataTest.php
 create mode 100644 GaelO2/tests/Unit/TestAdapters/FileCacheAdapterTest.php

diff --git a/GaelO2/.env.example b/GaelO2/.env.example
index caddf52d1..f61ba626c 100644
--- a/GaelO2/.env.example
+++ b/GaelO2/.env.example
@@ -40,6 +40,8 @@ FILESYSTEM_DISK='local'
 AZURE_BLOB_DSN=''
 AZURE_CONTAINER_NAME=''
 AZURE_BLOB_PREFIX=''
+AZURE_FILE_CACHE_CONTAINER_NAME=''
+FILE_CACHE_DRIVER='local'
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
diff --git a/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php b/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
new file mode 100644
index 000000000..d2c23feec
--- /dev/null
+++ b/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace App\GaelO\Adapters;
+
+use App\GaelO\Exceptions\GaelOException;
+use App\GaelO\Exceptions\GaelONotFoundException;
+use Illuminate\Contracts\Cache\Store;
+use League\Flysystem\Filesystem;
+
+/**
+ * File Cache using Azure blob storage, this cache adapter does not implement auto delete of files which should be 
+ * implemented by the blob storage
+ */
+class AzureCacheAdapter implements Store
+{
+
+    private Filesystem $fileSystem;
+    private string $rootDirectory = '';
+
+    public function __construct(Filesystem $fileSystem)
+    {
+        $this->fileSystem = $fileSystem;
+    }
+
+    private function getPath(string $key)
+    {
+        $hash = sha1($key);
+        return $this->rootDirectory . '/'. $hash;
+    }
+
+    public function get($key)
+    {
+        $path = $this->getPath($key);
+
+        if ($this->fileSystem->fileExists($path)) {
+            throw new GaelONotFoundException("File doesn't exist in azure cache");
+        }
+
+        $this->fileSystem->read($path);
+    }
+
+    public function many(array $keys)
+    {
+        $answer = [];
+        foreach ($keys as $key) {
+            $answer[$key] = $this->get($key);
+        }
+        return $answer;
+    }
+
+    public function put($key, $value, $seconds)
+    {
+        $path = $this->getPath($key);
+
+        $this->fileSystem->write($path, $value);
+        return true;
+    }
+
+    public function putMany(array $values, $seconds)
+    {
+        foreach ($values as $key => $value) {
+            $this->put($key, $value, $seconds);
+        }
+        return true;
+    }
+
+    public function increment($key, $value = 1)
+    {
+        throw new GaelOException('No implementation for increment in Azure Cache');
+    }
+
+    public function decrement($key, $value = 1)
+    {
+        throw new GaelOException('No implementation for decrement in Azure Cache');
+    }
+
+    public function forever($key, $value)
+    {
+        $this->put($key, $value, 0);
+    }
+
+    public function forget($key)
+    {
+        $path = $this->getPath($key);
+        $this->fileSystem->delete($path);
+    }
+
+    public function flush()
+    {
+        $files = $this->fileSystem->listContents($this->rootDirectory);
+        foreach ($files as $file) {
+            $this->fileSystem->delete($file->path());
+        }
+    }
+
+    public function getPrefix()
+    {
+        return '';
+    }
+}
diff --git a/GaelO2/app/GaelO/Adapters/FileCacheAdapter.php b/GaelO2/app/GaelO/Adapters/FileCacheAdapter.php
new file mode 100644
index 000000000..1ae6d75f2
--- /dev/null
+++ b/GaelO2/app/GaelO/Adapters/FileCacheAdapter.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\GaelO\Adapters;
+
+use App\GaelO\Interfaces\Adapters\CacheInterface;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+
+class FileCacheAdapter implements CacheInterface
+{
+
+    public function get(string $key)
+    {
+        return Cache::store(Config::get('cache.file-cache'))->get($key);
+    }
+
+    public function store(string $key, $value): bool
+    {
+        Cache::store(Config::get('cache.file-cache'))->put($key, $value);
+        return true;
+    }
+
+    public function delete(string $key): bool
+    {
+        Cache::store(Config::get('cache.file-cache'))->forget($key);
+        return true;
+    }
+}
diff --git a/GaelO2/app/GaelO/Interfaces/Adapters/CacheInterface.php b/GaelO2/app/GaelO/Interfaces/Adapters/CacheInterface.php
new file mode 100644
index 000000000..3af5e7181
--- /dev/null
+++ b/GaelO2/app/GaelO/Interfaces/Adapters/CacheInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\GaelO\Interfaces\Adapters;
+
+interface CacheInterface
+{
+    public function store(string $key, $value): bool;
+    public function get(string $key);
+    public function delete(string $key): bool;
+}
diff --git a/GaelO2/app/GaelO/Services/FileCacheService.php b/GaelO2/app/GaelO/Services/FileCacheService.php
new file mode 100644
index 000000000..02f3081a7
--- /dev/null
+++ b/GaelO2/app/GaelO/Services/FileCacheService.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\GaelO\Services;
+
+use App\GaelO\Adapters\FileCacheAdapter;
+
+class FileCacheService
+{
+    private FileCacheAdapter $fileCacheAdapter;
+
+    public function __construct(FileCacheAdapter $fileCacheAdapter)
+    {
+        $this->fileCacheAdapter = $fileCacheAdapter;
+    }
+
+    public function getSeriesPreview(string $seriesInstanceUID, int $index)
+    {
+        return $this->fileCacheAdapter->get('preview-' . $seriesInstanceUID . '-' . $index);
+    }
+
+    public function storeSeriesPreview(string $seriesInstanceUID, int $index, $value)
+    {
+        return $this->fileCacheAdapter->store('preview-' . $seriesInstanceUID . '-' . $index, $value);
+    }
+
+    public function deleteSeriesPreview(string $seriesInstanceUID, int $index)
+    {
+        return $this->fileCacheAdapter->delete('preview-' . $seriesInstanceUID . '-' . $index);
+    }
+
+    public function storeDicomMetadata(string $uid, $value)
+    {
+        return $this->fileCacheAdapter->store('metadata-' . $uid, $value);
+    }
+
+    public function getDicomMetadata(string $uid)
+    {
+        return $this->fileCacheAdapter->get('metadata-' . $uid);
+    }
+
+    public function deleteDicomMetadata(string $uid)
+    {
+        return $this->fileCacheAdapter->delete('metadata-' . $uid);
+    }
+}
diff --git a/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php b/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php
index 2d07f6882..129d3dc2a 100644
--- a/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php
+++ b/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php
@@ -52,11 +52,11 @@ public function executeInference(string $modelName, array $payload)
     /**
      * Return gif
      */
-    public function createMIPForSeries(string $seriesId, array $payload = []): string
+    public function createMIPForSeries(string $seriesId, array $payload = ['orientation' => 'LPI']): string
     {
         $downloadedFilePath  = tempnam(ini_get('upload_tmp_dir'), 'TMP_Inference_');
 
-        $this->httpClientInterface->requestStreamResponseToFile('POST', "/series/" . $seriesId . "/mip", $downloadedFilePath, ['content-Type' => 'application/json'], $payload);
+        $this->httpClientInterface->requestStreamResponseToFile('POST', "/series/" . $seriesId . "/mip", $downloadedFilePath, ['Content-Type' => 'application/json'], $payload);
         return $downloadedFilePath;
     }
 
@@ -66,7 +66,7 @@ public function createMIPForSeries(string $seriesId, array $payload = []): strin
     public function createMosaicForSeries(string $seriesId, array $payload = ["min" => null, "max" => null, "cols" => 5, "nbImages" => 20, "width" => 512, "height" => 512, "orientation"=>"LPI"]): string
     {
         $downloadedFilePath  = tempnam(ini_get('upload_tmp_dir'), 'TMP_Inference_');
-        $this->httpClientInterface->requestStreamResponseToFile('POST', "/series/" . $seriesId . "/mosaic", $downloadedFilePath, ['content-Type' => 'application/json'], $payload);
+        $this->httpClientInterface->requestStreamResponseToFile('POST', "/series/" . $seriesId . "/mosaic", $downloadedFilePath, ['Content-Type' => 'application/json'], $payload);
         return $downloadedFilePath;
     }
 
@@ -74,7 +74,7 @@ public function getNiftiMask(string $maskId): string
     {
         $downloadedFilePath  = tempnam(ini_get('upload_tmp_dir'), 'TMP_Inference_');
 
-        $this->httpClientInterface->requestStreamResponseToFile('GET', "/masks/" . $maskId . "/file", $downloadedFilePath, ['content-Type' => 'application/json'], []);
+        $this->httpClientInterface->requestStreamResponseToFile('GET', "/masks/" . $maskId . "/file", $downloadedFilePath, ['Content-Type' => 'application/json'], []);
         return $downloadedFilePath;
     }
 
@@ -82,7 +82,7 @@ public function getNiftiSeries(string $imageId): string
     {
         $downloadedFilePath  = tempnam(ini_get('upload_tmp_dir'), 'TMP_Inference_');
 
-        $this->httpClientInterface->requestStreamResponseToFile('GET', "/series/" . $imageId . "/file", $downloadedFilePath, ['content-Type' => 'application/json'], []);
+        $this->httpClientInterface->requestStreamResponseToFile('GET', "/series/" . $imageId . "/file", $downloadedFilePath, ['Content-Type' => 'application/json'], []);
         return $downloadedFilePath;
     }
 
diff --git a/GaelO2/app/GaelO/Services/MailServices.php b/GaelO2/app/GaelO/Services/MailServices.php
index d01915dcd..f5d3a7823 100644
--- a/GaelO2/app/GaelO/Services/MailServices.php
+++ b/GaelO2/app/GaelO/Services/MailServices.php
@@ -590,24 +590,14 @@ public function sendMagicLink(int $targetedUserId, string $studyName, string $ur
         $this->mailInterface->send();
     }
 
-    public function sendQcReport(string $studyName, string $visitType, string $patientCode, array $studyInfo, array $seriesInfo, string $magicLinkAccepted, string $magicLinkRefused, string $controllerEmail)
+    public function sendQcReport(string $studyName, string $visitType, string $patientCode, string $magicLink, string $controllerEmail)
     {
 
-        $isVisitDateExpected = true;
-
-        if (isset($studyInfo['visitDate']) && isset($studyInfo['studyDetails']['Study Date'])) {
-            $isVisitDateExpected = ($studyInfo['visitDate'] === $studyInfo['studyDetails']['Study Date']);
-        }
-
         $parameters = [
             'study' => $studyName,
             'visitType' => $visitType,
             'patientCode' => $patientCode,
-            'studyInfo' => $studyInfo,
-            'seriesInfo' => $seriesInfo,
-            'warningVisitDate' =>  $isVisitDateExpected === false,
-            'magicLinkAccepted' => $magicLinkAccepted,
-            'magicLinkRefused' => $magicLinkRefused
+            'magicLink' => $magicLink,
         ];
 
         $this->mailInterface->setTo([$controllerEmail]);
diff --git a/GaelO2/app/GaelO/Services/StoreObjects/OrthancMetaData.php b/GaelO2/app/GaelO/Services/StoreObjects/OrthancMetaData.php
index ff126fb0c..a3d78899a 100644
--- a/GaelO2/app/GaelO/Services/StoreObjects/OrthancMetaData.php
+++ b/GaelO2/app/GaelO/Services/StoreObjects/OrthancMetaData.php
@@ -260,4 +260,9 @@ public function getImageID() : ?string
     {
         return $this->getMetaDataValueFromCode('0054,0400');
     }
+
+    public function getSeriesInstanceUID() : ?string
+    {
+        return $this->getMetaDataValueFromCode('0020,000e');
+    }
 }
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadata.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadata.php
new file mode 100644
index 000000000..1c6af849b
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadata.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomSeriesMetadata;
+
+use App\GaelO\Exceptions\AbstractGaelOException;
+use App\GaelO\Exceptions\GaelOForbiddenException;
+use App\GaelO\Interfaces\Repositories\VisitRepositoryInterface;
+use App\GaelO\Repositories\DicomSeriesRepository;
+use App\GaelO\Services\AuthorizationService\AuthorizationVisitService;
+use App\GaelO\Services\FileCacheService;
+use Exception;
+
+class GetDicomSeriesMetadata
+{
+
+    private AuthorizationVisitService $authorizationVisitService;
+    private FileCacheService $fileCacheService;
+    private DicomSeriesRepository $dicomSeriesRepository;
+    private VisitRepositoryInterface $visitRepositoryInterface;
+
+    public function __construct(AuthorizationVisitService $authorizationVisitService, DicomSeriesRepository $dicomSeriesRepository, VisitRepositoryInterface $visitRepositoryInterface, FileCacheService $fileCacheService)
+    {
+        $this->authorizationVisitService = $authorizationVisitService;
+        $this->fileCacheService = $fileCacheService;
+        $this->dicomSeriesRepository = $dicomSeriesRepository;
+        $this->visitRepositoryInterface = $visitRepositoryInterface;
+    }
+
+    public function execute(GetDicomSeriesMetadataRequest $getDicomSeriesMetadataRequest, GetDicomSeriesMetadataResponse $getDicomSeriesMetadataResponse)
+    {
+
+        try {
+            $curentUserId = $getDicomSeriesMetadataRequest->currentUserId;
+            $role = $getDicomSeriesMetadataRequest->role;
+            $seriesInstanceUID = $getDicomSeriesMetadataRequest->seriesInstanceUID;
+
+            $seriesData = $this->dicomSeriesRepository->getSeries($seriesInstanceUID, false);
+            $visitId = $seriesData['dicom_study']['visit_id'];
+
+            $visitContext = $this->visitRepositoryInterface->getVisitContext($visitId);
+            $studyName = $visitContext['patient']['study_name'];
+
+            $this->checkAuthorization($curentUserId, $role, $visitId, $studyName, $visitContext);
+
+            $studyMetadata = $this->fileCacheService->getDicomMetadata($seriesInstanceUID);
+
+            $getDicomSeriesMetadataResponse->body = json_decode($studyMetadata);
+            $getDicomSeriesMetadataResponse->status = 200;
+            $getDicomSeriesMetadataResponse->statusText = 'OK';
+        } catch (AbstractGaelOException $e) {
+            $getDicomSeriesMetadataResponse->body = $e->getErrorBody();
+            $getDicomSeriesMetadataResponse->status = $e->statusCode;
+            $getDicomSeriesMetadataResponse->statusText = $e->statusText;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    private function checkAuthorization(int $userId, string $role, int $visitId, string $studyName, array $visitContext): void
+    {
+        $this->authorizationVisitService->setUserId($userId);
+        $this->authorizationVisitService->setVisitId($visitId);
+        $this->authorizationVisitService->setStudyName($studyName);
+        $this->authorizationVisitService->setVisitContext($visitContext);
+
+        if (!$this->authorizationVisitService->isVisitAllowed($role)) {
+            throw new GaelOForbiddenException();
+        }
+    }
+}
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataRequest.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataRequest.php
new file mode 100644
index 000000000..7bfc1ebb6
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataRequest.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomSeriesMetadata;
+
+class GetDicomSeriesMetadataRequest
+{
+    public string $seriesInstanceUID;
+    public int $currentUserId;
+    public string $role;
+}
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataResponse.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataResponse.php
new file mode 100644
index 000000000..b18e94b5a
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataResponse.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomSeriesMetadata;
+
+class GetDicomSeriesMetadataResponse
+{
+    public $body = null;
+    public int $status;
+    public string $statusText;
+}
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php
new file mode 100644
index 000000000..da5e791c8
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomSeriesPreview;
+
+use App\GaelO\Exceptions\AbstractGaelOException;
+use App\GaelO\Exceptions\GaelOForbiddenException;
+use App\GaelO\Interfaces\Repositories\VisitRepositoryInterface;
+use App\GaelO\Repositories\DicomSeriesRepository;
+use App\GaelO\Services\AuthorizationService\AuthorizationVisitService;
+use App\GaelO\Services\FileCacheService;
+use Exception;
+
+class GetDicomSeriesPreview
+{
+
+    private AuthorizationVisitService $authorizationVisitService;
+    private FileCacheService $fileCacheService;
+    private DicomSeriesRepository $dicomSeriesRepository;
+    private VisitRepositoryInterface $visitRepositoryInterface;
+
+    public function __construct(AuthorizationVisitService $authorizationVisitService, DicomSeriesRepository $dicomSeriesRepository, VisitRepositoryInterface $visitRepositoryInterface, FileCacheService $fileCacheService)
+    {
+        $this->authorizationVisitService = $authorizationVisitService;
+        $this->fileCacheService = $fileCacheService;
+        $this->dicomSeriesRepository = $dicomSeriesRepository;
+        $this->visitRepositoryInterface = $visitRepositoryInterface;
+    }
+
+    public function execute(GetDicomSeriesPreviewRequest $getDicomSeriesPreviewRequest, GetDicomSeriesPreviewResponse $getDicomSeriesPreviewResponse)
+    {
+
+        try {
+            $curentUserId = $getDicomSeriesPreviewRequest->currentUserId;
+            $role = $getDicomSeriesPreviewRequest->role;
+            $seriesInstanceUID = $getDicomSeriesPreviewRequest->seriesInstanceUID;
+            $index = $getDicomSeriesPreviewRequest->index;
+
+            $seriesData = $this->dicomSeriesRepository->getSeries($seriesInstanceUID, false);
+            $visitId = $seriesData['dicom_study']['visit_id'];
+
+            $visitContext = $this->visitRepositoryInterface->getVisitContext($visitId);
+            $studyName = $visitContext['patient']['study_name'];
+
+            $this->checkAuthorization($curentUserId, $role, $visitId, $studyName, $visitContext);
+
+            $previewData = $this->fileCacheService->getSeriesPreview($seriesInstanceUID, $index);
+            $finfo = finfo_open();
+            $mimeType = finfo_buffer($finfo, $previewData, FILEINFO_MIME_TYPE);
+            finfo_close($finfo);
+
+            $getDicomSeriesPreviewResponse->body = $previewData;
+            $getDicomSeriesPreviewResponse->status = 200;
+            $getDicomSeriesPreviewResponse->statusText = 'OK';
+            $getDicomSeriesPreviewResponse->contentType = $mimeType;
+        } catch (AbstractGaelOException $e) {
+            $getDicomSeriesPreviewResponse->body = $e->getErrorBody();
+            $getDicomSeriesPreviewResponse->status = $e->statusCode;
+            $getDicomSeriesPreviewResponse->statusText = $e->statusText;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    private function checkAuthorization(int $userId, string $role, int $visitId, string $studyName, array $visitContext): void
+    {
+        $this->authorizationVisitService->setUserId($userId);
+        $this->authorizationVisitService->setVisitId($visitId);
+        $this->authorizationVisitService->setStudyName($studyName);
+        $this->authorizationVisitService->setVisitContext($visitContext);
+
+        if (!$this->authorizationVisitService->isVisitAllowed($role)) {
+            throw new GaelOForbiddenException();
+        }
+    }
+}
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewRequest.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewRequest.php
new file mode 100644
index 000000000..93e94ee22
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewRequest.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomSeriesPreview;
+
+class GetDicomSeriesPreviewRequest
+{
+    public string $seriesInstanceUID;
+    public int $index;
+    public int $currentUserId;
+    public string $role;
+}
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewResponse.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewResponse.php
new file mode 100644
index 000000000..59bc87fd7
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewResponse.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomSeriesPreview;
+
+class GetDicomSeriesPreviewResponse
+{
+    public $body = null;
+    public int $status;
+    public string $statusText;
+    public string $contentType;
+}
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadata.php b/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadata.php
new file mode 100644
index 000000000..065a3d39e
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadata.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomStudyMetadata;
+
+use App\GaelO\Exceptions\AbstractGaelOException;
+use App\GaelO\Exceptions\GaelOForbiddenException;
+use App\GaelO\Interfaces\Repositories\DicomStudyRepositoryInterface;
+use App\GaelO\Interfaces\Repositories\VisitRepositoryInterface;
+use App\GaelO\Services\AuthorizationService\AuthorizationVisitService;
+use App\GaelO\Services\FileCacheService;
+use Exception;
+
+class GetDicomStudyMetadata
+{
+
+    private AuthorizationVisitService $authorizationVisitService;
+    private FileCacheService $fileCacheService;
+    private DicomStudyRepositoryInterface $dicomStudyRepositoryInterface;
+    private VisitRepositoryInterface $visitRepositoryInterface;
+
+    public function __construct(AuthorizationVisitService $authorizationVisitService, DicomStudyRepositoryInterface $dicomStudyRepositoryInterface, VisitRepositoryInterface $visitRepositoryInterface, FileCacheService $fileCacheService)
+    {
+        $this->authorizationVisitService = $authorizationVisitService;
+        $this->fileCacheService = $fileCacheService;
+        $this->dicomStudyRepositoryInterface = $dicomStudyRepositoryInterface;
+        $this->visitRepositoryInterface = $visitRepositoryInterface;
+    }
+
+    public function execute(GetDicomStudyMetadataRequest $getDicomStudyMetadataRequest, GetDicomStudyMetadataResponse $getDicomStudyMetadataResponse)
+    {
+
+        try {
+            $curentUserId = $getDicomStudyMetadataRequest->currentUserId;
+            $role = $getDicomStudyMetadataRequest->role;
+            $studyInstanceUID = $getDicomStudyMetadataRequest->studyInstanceUID;
+
+            $studyData = $this->dicomStudyRepositoryInterface->getDicomStudy($studyInstanceUID, false);
+            $visitId = $studyData['visit_id'];
+
+            $visitContext = $this->visitRepositoryInterface->getVisitContext($visitId);
+            $studyName = $visitContext['patient']['study_name'];
+
+            $this->checkAuthorization($curentUserId, $role, $visitId, $studyName, $visitContext);
+
+            $studyMetadata = $this->fileCacheService->getDicomMetadata($studyInstanceUID);
+
+            $getDicomStudyMetadataResponse->body = json_decode($studyMetadata);
+            $getDicomStudyMetadataResponse->status = 200;
+            $getDicomStudyMetadataResponse->statusText = 'OK';
+        } catch (AbstractGaelOException $e) {
+            $getDicomStudyMetadataResponse->body = $e->getErrorBody();
+            $getDicomStudyMetadataResponse->status = $e->statusCode;
+            $getDicomStudyMetadataResponse->statusText = $e->statusText;
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    private function checkAuthorization(int $userId, string $role, int $visitId, string $studyName, array $visitContext): void
+    {
+        $this->authorizationVisitService->setUserId($userId);
+        $this->authorizationVisitService->setVisitId($visitId);
+        $this->authorizationVisitService->setStudyName($studyName);
+        $this->authorizationVisitService->setVisitContext($visitContext);
+
+        if (!$this->authorizationVisitService->isVisitAllowed($role)) {
+            throw new GaelOForbiddenException();
+        }
+    }
+}
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataRequest.php b/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataRequest.php
new file mode 100644
index 000000000..c0a2be9e4
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataRequest.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomStudyMetadata;
+
+class GetDicomStudyMetadataRequest
+{
+    public string $studyInstanceUID;
+    public int $currentUserId;
+    public string $role;
+}
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataResponse.php b/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataResponse.php
new file mode 100644
index 000000000..b6835eee3
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataResponse.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomStudyMetadata;
+
+class GetDicomStudyMetadataResponse
+{
+    public $body = null;
+    public int $status;
+    public string $statusText;
+}
diff --git a/GaelO2/app/GaelO/views/mails/mail_qc_report.blade.php b/GaelO2/app/GaelO/views/mails/mail_qc_report.blade.php
index 7e173480e..48fc185a0 100644
--- a/GaelO2/app/GaelO/views/mails/mail_qc_report.blade.php
+++ b/GaelO2/app/GaelO/views/mails/mail_qc_report.blade.php
@@ -1,116 +1,11 @@
 @extends('mails.mail_template')
 
 @section('content')
-    <!doctype html>
-    <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
-        xmlns:o="urn:schemas-microsoft-com:office:office" lang="en">
-
-    <head>
-        <title>Quality Control Report</title>
-        <!--[if !mso]><!-->
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <!--<![endif]-->
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="stylesheet" type="text/css" href="./mjml/style.css">
-        <style type="text/css">
-            #outlook a {
-                padding: 0;
-            }
-
-            body {
-                margin: 0;
-                padding: 0;
-                -webkit-text-size-adjust: 100%;
-                -ms-text-size-adjust: 100%;
-            }
-
-            table,
-            td {
-                border-collapse: collapse;
-                mso-table-lspace: 0pt;
-                mso-table-rspace: 0pt;
-            }
-
-            img {
-                border: 0;
-                height: auto;
-                line-height: 100%;
-                outline: none;
-                text-decoration: none;
-                -ms-interpolation-mode: bicubic;
-            }
-
-            p {
-                display: block;
-                margin: 13px 0;
-            }
-        </style>
-        <!--[if mso]>
-            <noscript>
-            <xml>
-            <o:OfficeDocumentSettings>
-              <o:AllowPNG/>
-              <o:PixelsPerInch>96</o:PixelsPerInch>
-            </o:OfficeDocumentSettings>
-            </xml>
-            </noscript>
-            <![endif]-->
-        <!--[if lte mso 11]>
-            <style type="text/css">
-              .mj-outlook-group-fix { width:100% !important; }
-            </style>
-            <![endif]-->
-        <style type="text/css">
-            @media only screen and (min-width:480px) {
-                .mj-column-per-50 {
-                    width: 50% !important;
-                    max-width: 50%;
-                }
-            }
-        </style>
-        <style media="screen and (min-width:480px)">
-            .moz-text-html .mj-column-per-50 {
-                width: 50% !important;
-                max-width: 50%;
-            }
-        </style>
-        <style type="text/css">
-            @media only screen and (min-width:480px) {
-                .mj-column-per-100 {
-                    width: 100% !important;
-                    max-width: 100%;
-                }
-
-                .mj-column-per-70 {
-                    width: 70% !important;
-                    max-width: 70%;
-                }
-            }
-        </style>
-        <style>
-            .table-striped tr:nth-child(even) {
-                background: #f0f0f0;
-            }
-
-            .table-striped tr:nth-child(odd) {
-                background: #FFF;
-            }
-        </style>
-        <style type="text/css">
-        </style>
-    </head>
-
     <body style="word-spacing:normal;">
-        @include('mails.mail_qc_report_study', ['studyInfo' => $studyInfo])
-        @foreach ($seriesInfo as $series)
-            @include('mails.mail_qc_report_series', ['seriesInfo' => $series])
-        @endforeach
-        @if ($studyInfo['investigatorForm'] != null)
-            @include('mails.mail_qc_report_investigator_form', ['studyInfo' => $studyInfo])
-        @endif
+        The QC report for the following visit has been prepared on the platform:<br>
+        Study : {{ $study }}<br>
+        Patient Code : {{ $patientCode }}<br>
+        Uploaded visit : {{ $visitType }}<br>
         @include('mails.mail_qc_report_buttons')
     </body>
-
-    </html>
 @endsection
diff --git a/GaelO2/app/GaelO/views/mails/mail_qc_report_buttons.blade.php b/GaelO2/app/GaelO/views/mails/mail_qc_report_buttons.blade.php
index 8ecd2114f..e96853e4b 100644
--- a/GaelO2/app/GaelO/views/mails/mail_qc_report_buttons.blade.php
+++ b/GaelO2/app/GaelO/views/mails/mail_qc_report_buttons.blade.php
@@ -1,84 +1,139 @@
+<!doctype html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+
+<head>
+  <title></title>
+  <!--[if !mso]><!-->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
+
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
+
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
+
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
+
+    p {
+      display: block;
+      margin: 13px 0;
+    }
+
+  </style>
+  <!--[if mso]>
+    <noscript>
+    <xml>
+    <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    </noscript>
+    <![endif]-->
+  <!--[if lte mso 11]>
+    <style type="text/css">
+      .mj-outlook-group-fix { width:100% !important; }
+    </style>
+    <![endif]-->
+  <!--[if !mso]><!-->
+  <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    @import url(https://fonts.googleapis.com/css?family=Roboto:300,400,500,700);
+
+  </style>
+  <!--<![endif]-->
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
+    }
+
+  </style>
+  <style media="screen and (min-width:480px)">
+    .moz-text-html .mj-column-per-100 {
+      width: 100% !important;
+      max-width: 100%;
+    }
+
+  </style>
+  <style type="text/css">
+  </style>
+  <style type="text/css">
+  </style>
+</head>
+
+<body style="word-spacing:normal;">
   <div style="" lang="en">
-      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td
-                          style="direction:ltr;font-size:0px;padding:20px 0;padding-bottom:20px;padding-top:20px;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:300px;" ><![endif]-->
-                          <div class="mj-column-per-50 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="center" vertical-align="middle"
-                                              style="font-size:0px;padding:15px 30px;padding-top:10px;padding-right:25px;padding-bottom:10px;padding-left:25px;word-break:break-word;">
-                                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                  style="border-collapse:separate;line-height:100%;">
-                                                  <tbody>
-                                                      <tr>
-                                                          <td align="center" bgcolor="#2ec086" role="presentation"
-                                                              style="border:none;border-radius:10px;cursor:auto;mso-padding-alt:10px 25px;background:#2ec086;"
-                                                              valign="middle">
-                                                              <a href="{{ $magicLinkAccepted }}" rel="noopener"
-                                                                  style="display:inline-block;background:#2ec086;color:#FFFFFF;font-family:Roboto, Helvetica, sans-serif;font-size:14px;font-weight:bold;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:10px;"
-                                                                  target="_blank"> It's all good ! </a>
-                                                          </td>
-                                                      </tr>
-                                                  </tbody>
-                                              </table>
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td><td class="" style="vertical-align:top;width:300px;" ><![endif]-->
-                          <div class="mj-column-per-50 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="center" vertical-align="middle"
-                                              style="font-size:0px;padding:15px 30px;padding-top:10px;padding-right:25px;padding-bottom:10px;padding-left:25px;word-break:break-word;">
-                                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                                  style="border-collapse:separate;line-height:100%;">
-                                                  <tbody>
-                                                      <tr>
-                                                          <td align="center" bgcolor="#FFBA4D" role="presentation"
-                                                              style="border:none;border-radius:10px;cursor:auto;mso-padding-alt:10px 25px;background:#FFBA4D;"
-                                                              valign="middle">
-                                                              <a href="{{ $magicLinkRefused }}" rel="noopener"
-                                                                  style="display:inline-block;background:#FFBA4D;color:#FFFFFF;font-family:Roboto, Helvetica, sans-serif;font-size:14px;font-weight:bold;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:10px;"
-                                                                  target="_blank"> See in GaelO </a>
-                                                          </td>
-                                                      </tr>
-                                                  </tbody>
-                                              </table>
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
+    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;padding-bottom:20px;padding-top:20px;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
+                  <tbody>
+                    <tr>
+                      <td align="center" vertical-align="middle" style="font-size:0px;padding:15px 30px;padding-top:10px;padding-right:25px;padding-bottom:10px;padding-left:25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
+                          <tbody>
+                            <tr>
+                              <td align="center" bgcolor="#2ec086" role="presentation" style="border:none;border-radius:10px;cursor:auto;mso-padding-alt:10px 25px;background:#2ec086;" valign="middle">
+                                <a href="{{ $magicLink }}" rel="noopener" style="display:inline-block;background:#2ec086;color:#FFFFFF;font-family:Roboto, Helvetica, sans-serif;font-size:14px;font-weight:bold;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:10px;" target="_blank"> Access QC </a>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
                       </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><![endif]-->
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <!--[if mso | IE]></td></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr></tr></table><![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]></td></tr></table><![endif]-->
   </div>
+</body>
+
+</html>
diff --git a/GaelO2/app/GaelO/views/mails/mail_qc_report_investigator_form.blade.php b/GaelO2/app/GaelO/views/mails/mail_qc_report_investigator_form.blade.php
deleted file mode 100644
index 9a89e7843..000000000
--- a/GaelO2/app/GaelO/views/mails/mail_qc_report_investigator_form.blade.php
+++ /dev/null
@@ -1,102 +0,0 @@
-  <div style="" lang="en">
-      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                          <div class="mj-column-per-100 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="center"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <div
-                                                  style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:center;color:#0495A0;">
-                                                  <h3> Investigator form </h3>
-                                              </div>
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                          <div class="mj-column-per-100 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="left" class="table-striped"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <table cellpadding="0" cellspacing="0" role="presentation" width="100%"
-                                                  border="0"
-                                                  style="color:#000000;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;">
-                                                  @foreach ($studyInfo['investigatorForm'] as $key => $value)
-                                                      <tr>
-                                                          <td style="padding: 0 15px 0 0;font-weight: bold;"
-                                                              align="left">{{ $key }}</td>
-                                                          <td style="padding: 0 15px;" align="right">
-                                                              {{ var_export($value) }}</td>
-                                                      </tr>
-                                                  @endforeach
-                                              </table>
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                          <div class="mj-column-per-100 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="center"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <p
-                                                  style="border-top:solid 1px #616161;font-size:1px;margin:0px auto;width:100%;">
-                                              </p>
-                                              <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" style="border-top:solid 1px #616161;font-size:1px;margin:0px auto;width:550px;" role="presentation" width="550px" ><tr><td style="height:0;line-height:0;"> &nbsp;
-</td></tr></table><![endif]-->
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><![endif]-->
-  </div>
diff --git a/GaelO2/app/GaelO/views/mails/mail_qc_report_series.blade.php b/GaelO2/app/GaelO/views/mails/mail_qc_report_series.blade.php
deleted file mode 100644
index a1b9d3e35..000000000
--- a/GaelO2/app/GaelO/views/mails/mail_qc_report_series.blade.php
+++ /dev/null
@@ -1,151 +0,0 @@
-  <div style="" lang="en">
-      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                          <div class="mj-column-per-100 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="left"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <div
-                                                  style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#0495A0;">
-                                                  <h3 align="center">
-                                                      {{ $series['Series Description'] }}
-                                                  </h3>
-                                              </div>
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><![endif]-->
-                          @foreach ($series['image_path'] as $path)
-                              <!--[if mso | IE]><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                              <div class="mj-column-per-100 mj-outlook-group-fix"
-                                  style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                      style="vertical-align:top;" width="100%">
-                                      <tbody>
-                                          <tr>
-                                              <td align="center"
-                                                  style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                                  <table border="0" cellpadding="0" cellspacing="0"
-                                                      role="presentation"
-                                                      style="border-collapse:collapse;border-spacing:0px;">
-                                                      <tbody>
-                                                          <tr>
-                                                              <td style="width:550px;">
-                                                                  <img alt="series preview" height="auto"
-                                                                      src="{{ $message->embed($path ?? public_path('static/media/ban-image-photo-icon.png')) }}"
-                                                                      style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;"
-                                                                      width="550" />
-                                                              </td>
-                                                          </tr>
-                                                      </tbody>
-                                                  </table>
-                                              </td>
-                                          </tr>
-                                      </tbody>
-                                  </table>
-                              </div>
-                              <!--[if mso | IE]></td><![endif]-->
-                          @endforeach
-                          <!--[if mso | IE]></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                          <div class="mj-column-per-100 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="left" class="table-striped"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <table cellpadding="0" cellspacing="0" role="presentation"
-                                                  width="100%" border="0"
-                                                  style="color:#000000;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;">
-                                                  @foreach ($series as $key => $value)
-                                                      @if ($value != null && $key !== 'image_path')
-                                                          <tr>
-                                                              <td style="padding: 0 15px 0 0;font-weight: bold;"
-                                                                  align="left">{{ $key }}</td>
-                                                              <td style="padding: 0 15px;" align="right">
-                                                                  {{ $value }}</td>
-                                                          </tr>
-                                                      @endif
-                                                  @endforeach
-                                              </table>
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-              style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                          <div class="mj-column-per-100 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="center"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <p
-                                                  style="border-top:solid 1px #616161;font-size:1px;margin:0px auto;width:100%;">
-                                              </p>
-                                              <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" style="border-top:solid 1px #616161;font-size:1px;margin:0px auto;width:550px;" role="presentation" width="550px" ><tr><td style="height:0;line-height:0;"> &nbsp;
-</td></tr></table><![endif]-->
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><![endif]-->
-  </div>
diff --git a/GaelO2/app/GaelO/views/mails/mail_qc_report_study.blade.php b/GaelO2/app/GaelO/views/mails/mail_qc_report_study.blade.php
deleted file mode 100644
index 997d557ee..000000000
--- a/GaelO2/app/GaelO/views/mails/mail_qc_report_study.blade.php
+++ /dev/null
@@ -1,214 +0,0 @@
-  <div style="" lang="en">
-      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                          <div class="mj-column-per-100 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="center" class="text-color"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <div
-                                                  style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:center;color:#000000;">
-                                                  Visit {{ $studyInfo['visitName'] }} of the patient
-                                                  {{ $studyInfo['patientCode'] }} from the {{ $studyInfo['studyName'] }}
-                                                  study has been uploaded.</div>
-                                          </td>
-                                      </tr>
-                                      <tr>
-                                          <td align="center"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <div
-                                                  style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:16px;text-align:center;color:#000000;">
-                                                  Registation Date : {{ $studyInfo['registrationDate'] }}<br> Visit Date
-                                                  Expected After : {{ $studyInfo['minVisitDate'] }}<br> Visit Date
-                                                  Expected Before : {{ $studyInfo['maxVisitDate'] }}<br> Visit Date:
-                                                  {{ $studyInfo['visitDate'] }}</div>
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                          <div class="mj-column-per-100 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="center"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <p
-                                                  style="border-top:solid 1px #616161;font-size:1px;margin:0px auto;width:100%;">
-                                              </p>
-                                              <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" style="border-top:solid 1px #616161;font-size:1px;margin:0px auto;width:550px;" role="presentation" width="550px" ><tr><td style="height:0;line-height:0;"> &nbsp;
-</td></tr></table><![endif]-->
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                          <div class="mj-column-per-100 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="left"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <div
-                                                  style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:left;color:#0495A0;">
-                                                  <h3 align="center">Study info</h3>
-                                              </div>
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-              style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                          <div class="mj-column-per-100 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="left" class="table-striped"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <table cellpadding="0" cellspacing="0" role="presentation"
-                                                  width="100%" border="0"
-                                                  style="color:#000000;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;">
-                                                  @foreach ($studyInfo['studyDetails'] as $key => $value)
-                                                      @if ($value != null)
-                                                          <tr>
-                                                              <td style="padding: 0 15px 0 0;font-weight: bold;"
-                                                                  align="left">{{ $key }}</td>
-                                                              <td style="padding: 0 15px;" align="right">
-                                                                  {{ $value }}</td>
-                                                          </tr>
-                                                      @endif
-                                                  @endforeach
-                                              </table>
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><![endif]-->
-      @if ($warningVisitDate)
-          <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-          <div style="margin:0px auto;max-width:600px;">
-              <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-                  style="width:100%;">
-                  <tbody>
-                      <tr>
-                          <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                              <div class="mj-column-per-100 mj-outlook-group-fix"
-                                  style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                      style="vertical-align:top;" width="100%">
-                                      <tbody>
-                                          <tr>
-                                              <td align="center"
-                                                  style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                                  <div
-                                                      style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;font-weight:700;line-height:1;text-align:center;color:red;">
-                                                      Warning : DICOM Study Date and GaelO Visit Date are different
-                                                  </div>
-                                              </td>
-                                          </tr>
-                                      </tbody>
-                                  </table>
-                              </div>
-                              <!--[if mso | IE]></td></tr></table><![endif]-->
-                          </td>
-                      </tr>
-                  </tbody>
-              </table>
-          </div>
-          <!--[if mso | IE]></td></tr></table><![endif]-->
-      @endif
-      <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-      <div style="margin:0px auto;max-width:600px;">
-          <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
-              style="width:100%;">
-              <tbody>
-                  <tr>
-                      <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-                          <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-                          <div class="mj-column-per-100 mj-outlook-group-fix"
-                              style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                              <table border="0" cellpadding="0" cellspacing="0" role="presentation"
-                                  style="vertical-align:top;" width="100%">
-                                  <tbody>
-                                      <tr>
-                                          <td align="center"
-                                              style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                              <p
-                                                  style="border-top:solid 1px #616161;font-size:1px;margin:0px auto;width:100%;">
-                                              </p>
-                                              <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" style="border-top:solid 1px #616161;font-size:1px;margin:0px auto;width:550px;" role="presentation" width="550px" ><tr><td style="height:0;line-height:0;"> &nbsp;
-</td></tr></table><![endif]-->
-                                          </td>
-                                      </tr>
-                                  </tbody>
-                              </table>
-                          </div>
-                          <!--[if mso | IE]></td></tr></table><![endif]-->
-                      </td>
-                  </tr>
-              </tbody>
-          </table>
-      </div>
-      <!--[if mso | IE]></td></tr></table><![endif]-->
-  </div>
diff --git a/GaelO2/app/GaelO/views/mails/mjml/qc_report_buttons.mjml b/GaelO2/app/GaelO/views/mails/mjml/qc_report_buttons.mjml
index 9fe41d50e..35db83cd8 100644
--- a/GaelO2/app/GaelO/views/mails/mjml/qc_report_buttons.mjml
+++ b/GaelO2/app/GaelO/views/mails/mjml/qc_report_buttons.mjml
@@ -7,11 +7,8 @@
   </mj-head>
   <mj-body>
     <mj-section padding-bottom="20px" padding-top="20px">
-      <mj-column width="50%">
-        <mj-button href="{{ $magicLinkAccepted }}" rel="noopener" background-color="#2ec086" mj-class="button">It's all good !</mj-button>
-      </mj-column>
-      <mj-column width="50%">
-        <mj-button href="{{ $magicLinkRefused }}" rel="noopener" background-color="#FFBA4D" mj-class="button">See in GaelO</mj-button>
+      <mj-column width="100%">
+        <mj-button href="{{ $magicLink }}" rel="noopener" background-color="#2ec086" mj-class="button">Access QC</mj-button>
       </mj-column>
     </mj-section>
     <mj-section>
diff --git a/GaelO2/app/GaelO/views/mails/mjml/qc_report_investigator_form.mjml b/GaelO2/app/GaelO/views/mails/mjml/qc_report_investigator_form.mjml
deleted file mode 100644
index 7d0055e40..000000000
--- a/GaelO2/app/GaelO/views/mails/mjml/qc_report_investigator_form.mjml
+++ /dev/null
@@ -1,36 +0,0 @@
-<mjml lang="en">
-  <mj-head>
-    <mj-attributes>
-      <mj-class name="text-blue" color="#0495A0" />
-      <mj-include path="./style.css" type="css" />
-    </mj-attributes>
-  </mj-head>
-  <mj-body>
-    <mj-section>
-      <mj-column>
-        <mj-text mj-class="text-blue" align="center">
-          <h3>
-            Investigator form
-          </h3>
-        </mj-text>
-      </mj-column>
-    </mj-section>
-    <mj-section>
-      <mj-column>
-        <mj-table css-class="table-striped" role="presentation">
-          @foreach($studyInfo['investigatorForm'] as $key => $value)
-          <tr>
-            <td style="padding: 0 15px 0 0;font-weight: bold;" align="left">{{ $key }}</td>
-            <td style="padding: 0 15px;" align="right">{{ var_export($value) }}</td>
-          </tr>
-          @endforeach
-        </mj-table>
-      </mj-column>
-    </mj-section>
-    <mj-section>
-      <mj-column>
-        <mj-divider border-width="1px" border-color="#616161"></mj-divider>
-      </mj-column>
-    </mj-section>
-  </mj-body>
-</mjml>
\ No newline at end of file
diff --git a/GaelO2/app/GaelO/views/mails/mjml/qc_report_series.mjml b/GaelO2/app/GaelO/views/mails/mjml/qc_report_series.mjml
deleted file mode 100644
index b3a90f20a..000000000
--- a/GaelO2/app/GaelO/views/mails/mjml/qc_report_series.mjml
+++ /dev/null
@@ -1,49 +0,0 @@
-<mjml lang="en">
-  <mj-head>
-    <mj-attributes>
-      <mj-class name="text-blue" color="#0495A0" />
-      <mj-include path="./style.css" type="css" />
-    </mj-attributes>
-  </mj-head>
-  <mj-body>
-    <mj-section>
-      <mj-column>
-        <mj-text mj-class="text-blue">
-          <h3 align="center">
-            {{$series['Series Description']}}
-          </h3>
-        </mj-text>
-      </mj-column>
-    </mj-section>
-    <mj-section>
-      <mj-raw>
-        @foreach($series['image_path'] as $path)
-      </mj-raw>
-      <mj-column>
-        <mj-image alt="series preview" src="{{$message->embed($path ?? public_path('static/media/ban-image-photo-icon.png'))}}" align="center"></mj-image>
-      </mj-column>
-      <mj-raw>
-        @endforeach
-      </mj-raw>
-    </mj-section>
-    <mj-section>
-      <mj-column>
-        <mj-table css-class="table-striped" role="presentation">
-          @foreach($series as $key => $value)
-          @if ($value != null && $key !== 'image_path')
-          <tr>
-            <td style="padding: 0 15px 0 0;font-weight: bold;" align="left">{{ $key }}</td>
-            <td style="padding: 0 15px;" align="right">{{ $value }}</td>
-          </tr>
-          @endif
-          @endforeach
-        </mj-table>
-      </mj-column>
-    </mj-section>
-    <mj-section>
-      <mj-column>
-        <mj-divider border-width="1px" border-color="#616161"></mj-divider>
-      </mj-column>
-    </mj-section>
-  </mj-body>
-</mjml>
\ No newline at end of file
diff --git a/GaelO2/app/GaelO/views/mails/mjml/qc_report_study.mjml b/GaelO2/app/GaelO/views/mails/mjml/qc_report_study.mjml
deleted file mode 100644
index 374410e92..000000000
--- a/GaelO2/app/GaelO/views/mails/mjml/qc_report_study.mjml
+++ /dev/null
@@ -1,65 +0,0 @@
-<mjml lang="en">
-  <mj-head>
-    <mj-attributes>
-      <mj-class name="text-blue" color="#0495A0" />
-      <mj-include path="./style.css" type="css" />
-    </mj-attributes>
-  </mj-head>
-  <mj-body>
-    <mj-section>
-      <mj-column>
-        <mj-text align="center" css-class="text-color"> Visit {{$studyInfo['visitName']}} of the patient {{$studyInfo['patientCode']}} from the {{$studyInfo['studyName']}} study has been uploaded.</mj-text>
-        <mj-text align="center" line-height="16px">
-          Registation Date : {{$studyInfo['registrationDate']}}<br>
-          Visit Date Expected After : {{$studyInfo['minVisitDate']}}<br>
-          Visit Date Expected Before : {{$studyInfo['maxVisitDate']}}<br>
-          Visit Date: {{$studyInfo['visitDate']}}
-        </mj-text>
-      </mj-column>
-    </mj-section>
-    <mj-section>
-      <mj-column>
-        <mj-divider border-width="1px" border-color="#616161"></mj-divider>
-      </mj-column>
-    </mj-section>
-    <mj-section>
-      <mj-column>
-        <mj-text mj-class="text-blue">
-          <h3 align="center">Study info</h3>
-        </mj-text>
-      </mj-column>
-    </mj-section>
-    <mj-section>
-      <mj-column>
-        <mj-table css-class="table-striped" role="presentation">
-          @foreach($studyInfo['studyDetails'] as $key => $value)
-          @if ($value != null)
-          <tr>
-            <td style="padding: 0 15px 0 0;font-weight: bold;" align="left">{{ $key }}</td>
-            <td style="padding: 0 15px;" align="right">{{ $value }}</td>
-          </tr>
-          @endif
-          @endforeach
-        </mj-table>
-      </mj-column>
-    </mj-section>
-    <mj-raw>
-      @if($warningVisitDate)
-    </mj-raw>
-    <mj-section>
-      <mj-column>
-        <mj-text color="red" font-weight="700" align="center">
-          Warning : DICOM Study Date and GaelO Visit Date are different
-        </mj-text>
-      </mj-column>
-    </mj-section>
-    <mj-raw>
-      @endif
-    </mj-raw>
-    <mj-section>
-      <mj-column>
-        <mj-divider border-width="1px" border-color="#616161"></mj-divider>
-      </mj-column>
-    </mj-section>
-  </mj-body>
-</mjml>
\ No newline at end of file
diff --git a/GaelO2/app/Http/Controllers/DicomController.php b/GaelO2/app/Http/Controllers/DicomController.php
index e5263151e..5f7114e87 100644
--- a/GaelO2/app/Http/Controllers/DicomController.php
+++ b/GaelO2/app/Http/Controllers/DicomController.php
@@ -8,12 +8,21 @@
 use App\GaelO\UseCases\GetDicoms\GetDicoms;
 use App\GaelO\UseCases\GetDicoms\GetDicomsRequest;
 use App\GaelO\UseCases\GetDicoms\GetDicomsResponse;
+use App\GaelO\UseCases\GetDicomSeriesMetadata\GetDicomSeriesMetadata;
+use App\GaelO\UseCases\GetDicomSeriesMetadata\GetDicomSeriesMetadataRequest;
+use App\GaelO\UseCases\GetDicomSeriesMetadata\GetDicomSeriesMetadataResponse;
+use App\GaelO\UseCases\GetDicomSeriesPreview\GetDicomSeriesPreview;
+use App\GaelO\UseCases\GetDicomSeriesPreview\GetDicomSeriesPreviewRequest;
+use App\GaelO\UseCases\GetDicomSeriesPreview\GetDicomSeriesPreviewResponse;
 use App\GaelO\UseCases\GetDicomsFile\GetDicomsFile;
 use App\GaelO\UseCases\GetDicomsFile\GetDicomsFileRequest;
 use App\GaelO\UseCases\GetDicomsFile\GetDicomsFileResponse;
 use App\GaelO\UseCases\GetDicomsFileSupervisor\GetDicomsFileSupervisor;
 use App\GaelO\UseCases\GetDicomsFileSupervisor\GetDicomsFileSupervisorRequest;
 use App\GaelO\UseCases\GetDicomsFileSupervisor\GetDicomsFileSupervisorResponse;
+use App\GaelO\UseCases\GetDicomStudyMetadata\GetDicomStudyMetadata;
+use App\GaelO\UseCases\GetDicomStudyMetadata\GetDicomStudyMetadataRequest;
+use App\GaelO\UseCases\GetDicomStudyMetadata\GetDicomStudyMetadataResponse;
 use App\GaelO\UseCases\GetNiftiFileSupervisor\GetNiftiFileSupervisor;
 use App\GaelO\UseCases\GetNiftiFileSupervisor\GetNiftiFileSupervisorRequest;
 use App\GaelO\UseCases\GetNiftiFileSupervisor\GetNiftiFileSupervisorResponse;
@@ -157,4 +166,47 @@ public function getNiftiSeries(Request $request, GetNiftiFileSupervisor $getNift
                 ->setStatusCode($getNiftiFileSupervisorResponse->status, $getNiftiFileSupervisorResponse->statusText);
         }
     }
+
+    public function getStudyMetadata(Request $request, GetDicomStudyMetadata $getDicomStudyMetadata, GetDicomStudyMetadataRequest $getDicomStudyMetadataRequest, GetDicomStudyMetadataResponse $getDicomStudyMetadataResponse, string $studyInstanceUID)
+    {
+        $currentUser = Auth::user();
+        $queryParam = $request->query();
+
+        $getDicomStudyMetadataRequest->studyInstanceUID = $studyInstanceUID;
+        $getDicomStudyMetadataRequest->role = $queryParam['role'];
+        $getDicomStudyMetadataRequest->currentUserId = $currentUser['id'];
+
+        $getDicomStudyMetadata->execute($getDicomStudyMetadataRequest, $getDicomStudyMetadataResponse);
+
+        return $this->getJsonResponse($getDicomStudyMetadataResponse->body, $getDicomStudyMetadataResponse->status, $getDicomStudyMetadataResponse->statusText);
+    }
+
+    public function getSeriesMetadata(Request $request, GetDicomSeriesMetadata $getDicomSeriesMetadata, GetDicomSeriesMetadataRequest $getDicomSeriesMetadataRequest, GetDicomSeriesMetadataResponse $getDicomSeriesMetadataResponse, string $seriesInstanceUID)
+    {
+        $currentUser = Auth::user();
+        $queryParam = $request->query();
+
+        $getDicomSeriesMetadataRequest->seriesInstanceUID = $seriesInstanceUID;
+        $getDicomSeriesMetadataRequest->role = $queryParam['role'];
+        $getDicomSeriesMetadataRequest->currentUserId = $currentUser['id'];
+
+        $getDicomSeriesMetadata->execute($getDicomSeriesMetadataRequest, $getDicomSeriesMetadataResponse);
+
+        return $this->getJsonResponse($getDicomSeriesMetadataResponse->body, $getDicomSeriesMetadataResponse->status, $getDicomSeriesMetadataResponse->statusText);
+    }
+
+    public function getSeriesPreview(Request $request, GetDicomSeriesPreview $getDicomSeriesPreview, GetDicomSeriesPreviewRequest $getDicomSeriesPreviewRequest, GetDicomSeriesPreviewResponse $getDicomSeriesPreviewResponse, string $seriesInstanceUID, int $index)
+    {
+        $currentUser = Auth::user();
+        $queryParam = $request->query();
+
+        $getDicomSeriesPreviewRequest->role = $queryParam['role'];
+        $getDicomSeriesPreviewRequest->seriesInstanceUID = $seriesInstanceUID;
+        $getDicomSeriesPreviewRequest->index = $index;
+        $getDicomSeriesPreviewRequest->currentUserId = $currentUser['id'];
+
+        $getDicomSeriesPreview->execute($getDicomSeriesPreviewRequest, $getDicomSeriesPreviewResponse);
+
+        return response($getDicomSeriesPreviewResponse->body, $getDicomSeriesPreviewResponse->status)->header('Content-Type', $getDicomSeriesPreviewResponse->contentType);
+    }
 }
diff --git a/GaelO2/app/Http/Controllers/ReviewController.php b/GaelO2/app/Http/Controllers/ReviewController.php
index 91d9c72ed..2e744af31 100644
--- a/GaelO2/app/Http/Controllers/ReviewController.php
+++ b/GaelO2/app/Http/Controllers/ReviewController.php
@@ -56,7 +56,6 @@
 use App\GaelO\Util;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
 
 class ReviewController extends Controller
diff --git a/GaelO2/app/Jobs/JobQcReport.php b/GaelO2/app/Jobs/JobQcReport.php
index 85925f06d..5de45c59f 100644
--- a/GaelO2/app/Jobs/JobQcReport.php
+++ b/GaelO2/app/Jobs/JobQcReport.php
@@ -3,12 +3,11 @@
 namespace App\Jobs;
 
 use App\GaelO\Constants\Constants;
-use App\GaelO\Constants\Enums\InvestigatorFormStateEnum;
 use App\GaelO\Interfaces\Adapters\FrameworkInterface;
 use App\GaelO\Interfaces\Repositories\DicomStudyRepositoryInterface;
-use App\GaelO\Interfaces\Repositories\ReviewRepositoryInterface;
 use App\GaelO\Interfaces\Repositories\UserRepositoryInterface;
 use App\GaelO\Interfaces\Repositories\VisitRepositoryInterface;
+use App\GaelO\Services\FileCacheService;
 use App\GaelO\Services\GaelOProcessingService\GaelOProcessingService;
 use App\GaelO\Services\MailServices;
 use App\GaelO\Services\OrthancService;
@@ -29,7 +28,6 @@ class JobQcReport implements ShouldQueue, ShouldBeUnique
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
     private int $visitId;
-    private OrthancService $orthancService;
 
     public $failOnTimeout = true;
     public $timeout = 300;
@@ -53,16 +51,15 @@ public function __construct(int $visitId)
      */
     public function handle(
         FrameworkInterface $frameworkInterface,
+        FileCacheService $fileCacheService,
         UserRepositoryInterface $userRepositoryInterface,
         VisitRepositoryInterface $visitRepositoryInterface,
         DicomStudyRepositoryInterface $dicomStudyRepositoryInterface,
         MailServices $mailServices,
         OrthancService $orthancService,
         GaelOProcessingService $gaelOProcessingService,
-        ReviewRepositoryInterface $reviewRepositoryInterface
     ) {
-        $this->orthancService = $orthancService;
-        $this->orthancService->setOrthancServer(true);
+        $orthancService->setOrthancServer(true);
 
         $visitReport = new VisitReport();
 
@@ -72,7 +69,6 @@ public function handle(
         $visitId = $visitEntity['id'];
         $visitType = $visitEntity['visit_type']['name'];
         $patientCode = $visitEntity['patient']['code'];
-        $stateInvestigatorForm = $visitEntity['state_investigator_form'];
         $visitDate = $visitEntity['visit_date'];
         $registrationDate = $visitEntity['patient']['registration_date'];
 
@@ -95,20 +91,15 @@ public function handle(
             $visitReport->setMinMaxVisitDate($formattedMinVisitDate, $formattedMaxVisitDate);
         }
 
-        if ($stateInvestigatorForm !== InvestigatorFormStateEnum::NOT_NEEDED->value) {
-            $reviewEntity = $reviewRepositoryInterface->getInvestigatorForm($this->visitId, false);
-            $visitReport->setInvestigatorForm($reviewEntity['review_data']);
-        }
-
         $seriesReports = [];
 
         foreach ($dicomStudyEntity[0]['dicom_series'] as $series) {
 
             try {
-                $seriesSharedTags = $this->orthancService->getSharedTags($series['orthanc_id']);
-                $seriesDetails = $this->orthancService->getOrthancRessourcesDetails(Constants::ORTHANC_SERIES_LEVEL, $series['orthanc_id']);
+                $seriesSharedTags = $orthancService->getSharedTags($series['orthanc_id']);
+                $seriesDetails = $orthancService->getOrthancRessourcesDetails(Constants::ORTHANC_SERIES_LEVEL, $series['orthanc_id']);
                 //Needed for radiopharmaceutical data (need first instance metadata to access it)
-                $instanceTags = $this->orthancService->getInstanceTags($seriesDetails['Instances'][0]);
+                $instanceTags = $orthancService->getInstanceTags($seriesDetails['Instances'][0]);
 
                 $instanceReport = new InstanceReport();
                 $instanceReport->fillData($instanceTags);
@@ -117,7 +108,7 @@ public function handle(
                 $seriesReport->fillData($seriesSharedTags);
                 $seriesReport->setInstanceReport($instanceReport);
 
-                $seriesReport->loadSeriesPreview($this->orthancService, $gaelOProcessingService);
+                $seriesReport->loadSeriesPreview($orthancService, $gaelOProcessingService);
 
                 $seriesReports[] = $seriesReport;
             } catch (Throwable $t) {
@@ -128,11 +119,19 @@ public function handle(
         $visitReport->setSeriesReports($seriesReports);
 
         $seriesReports = $visitReport->getSeriesReports();
-        $seriesInfo = array_map(function (SeriesReport $seriesReport) {
-            return $seriesReport->toArray();
-        }, $seriesReports);
+        foreach ($seriesReports as $seriesReport) {
+            $seriesInstanceUID = $seriesReport->getSeriesInstanceUID();
+            $previews = $seriesReport->getPreviews();
+            for ($i = 0; $i < sizeof($previews); $i++) {
+                $fileCacheService->storeSeriesPreview($seriesInstanceUID, $i, file_get_contents($previews[$i]));
+            }
+            $fileCacheService->storeDicomMetadata($seriesInstanceUID, json_encode($seriesReport->toArray()));
+        }
+
 
         $studyInfo = $visitReport->toArray();
+        $studyInstanceUID = $dicomStudyEntity[0]['study_uid'];
+        $fileCacheService->storeDicomMetadata($studyInstanceUID, json_encode($studyInfo));
 
         $controllerUsers = $userRepositoryInterface->getUsersByRolesInStudy($studyName, Constants::ROLE_CONTROLLER);
 
@@ -140,16 +139,13 @@ public function handle(
             $redirectLink = '/magic-link-tools/auto-qc';
             $queryParams = [
                 'visitId' => $visitId,
-                'accepted' => 'true',
                 'studyName' => $studyName
             ];
-            $magicLinkAccepted = $frameworkInterface->createMagicLink($user['id'], $redirectLink, $queryParams);
-            $queryParams['accepted'] = 'false';
-            $magicLinkRefused = $frameworkInterface->createMagicLink($user['id'], $redirectLink, $queryParams);
-            $mailServices->sendQcReport($studyName, $visitType, $patientCode, $studyInfo, $seriesInfo, $magicLinkAccepted, $magicLinkRefused, $user['email']);
+            $magicLink = $frameworkInterface->createMagicLink($user['id'], $redirectLink, $queryParams);
+            $mailServices->sendQcReport($studyName, $visitType, $patientCode, $magicLink, $user['email']);
         }
 
-        //Once all email emited remove preview file to avoid dangling temporary files
+        //Once job finished remove preview file to avoid dangling temporary files
         foreach ($seriesReports as $seriesReport) {
             $seriesReport->deletePreviewImages();
         }
diff --git a/GaelO2/app/Jobs/QcReport/SeriesReport.php b/GaelO2/app/Jobs/QcReport/SeriesReport.php
index d91ad3dfc..2baee7dd1 100644
--- a/GaelO2/app/Jobs/QcReport/SeriesReport.php
+++ b/GaelO2/app/Jobs/QcReport/SeriesReport.php
@@ -33,6 +33,7 @@ class SeriesReport
     private $protocolName;
     private $patientWeight;
     private $patientHeight;
+    private $seriesInstanceUID;
     private array $previewImagePath = [];
     private array $orthancInstanceIds;
     private string $seriesOrthancId;
@@ -54,11 +55,6 @@ public function getNumberOfInstances(): int
         return sizeof($this->orthancInstanceIds);
     }
 
-    public function addPreviewImagePath(?string $path)
-    {
-        $this->previewImagePath[] = $path;
-    }
-
     public function deletePreviewImages()
     {
         foreach ($this->previewImagePath as $imagePath) {
@@ -88,6 +84,7 @@ public function fillData(OrthancMetaData $sharedTags)
         $this->matrixSize = $sharedTags->getMatrixSize();
         $this->patientPosition = $sharedTags->getPatientPosition();
         $this->patientOrientation = $sharedTags->getImageOrientation();
+        $this->seriesInstanceUID = $sharedTags->getSeriesInstanceUID();
 
         if ($this->modality == 'MR') {
             $this->scanningSequence = $sharedTags->getScanningSequence();
@@ -148,12 +145,11 @@ public function loadSeriesPreview(OrthancService $orthancService, GaelOProcessin
                 $imagePath[] = $orthancService->getInstancePreview($this->orthancInstanceIds[0]);
             } else {
                 $isPet = $this->modality == 'PT';
-                $payload = $isPet ? ['min' => 0, 'max' => 5] : [];
+                $payload = $isPet ? ['min' => 0, 'max' => 5, 'orientation' => 'LPI'] : ['orientation' => 'LPI'];
                 $orthancService->sendDicomToProcessing($this->seriesOrthancId, $gaelOProcessingService);
                 $processingSeriesId = $gaelOProcessingService->createSeriesFromOrthanc($this->seriesOrthancId, $isPet, $isPet);
                 switch ($imageType) {
                     case ImageType::MIP:
-                        //Mosaic for now as mip need significant computation and memory backend
                         $imagePath[] = $gaelOProcessingService->createMIPForSeries($processingSeriesId, $payload);
                         break;
                     case ImageType::MOSAIC:
@@ -174,6 +170,16 @@ public function loadSeriesPreview(OrthancService $orthancService, GaelOProcessin
         $this->previewImagePath = $imagePath;
     }
 
+    public function getSeriesInstanceUID(): string
+    {
+        return $this->seriesInstanceUID;
+    }
+
+    public function getPreviews(): array
+    {
+        return $this->previewImagePath;
+    }
+
     public function toArray()
     {
 
@@ -203,7 +209,7 @@ public function toArray()
             'Protocol Name' => $this->protocolName ?? null,
             'Patient weight (kg)' => $this->patientWeight ?? null,
             'Patient height (m)' => $this->patientHeight ?? null,
-            'image_path' => $this->previewImagePath,
+            'Previews' => sizeof($this->previewImagePath),
             ...$instanceData
         ];
     }
diff --git a/GaelO2/app/Jobs/QcReport/VisitReport.php b/GaelO2/app/Jobs/QcReport/VisitReport.php
index dc519a443..2f88956b3 100644
--- a/GaelO2/app/Jobs/QcReport/VisitReport.php
+++ b/GaelO2/app/Jobs/QcReport/VisitReport.php
@@ -7,12 +7,10 @@ class VisitReport
     private string $studyName;
     private string $visitName;
     private string $patientCode;
-
     private string $visitDate;
     private string $minVisitDate;
     private string $maxVisitDate;
     private string $registrationDate;
-    private array $investigatorForm = [];
 
     private array $seriesReports = [];
 
@@ -46,11 +44,6 @@ public function setVisitDate(string $visitDate)
         $this->visitDate = $visitDate;
     }
 
-    public function setInvestigatorForm(array $investigatorForm)
-    {
-        $this->investigatorForm = $investigatorForm;
-    }
-
     public function setRegistrationDate(string $registrationDate)
     {
         $this->registrationDate = $registrationDate;
@@ -72,7 +65,6 @@ public function toArray()
                 }, $this->seriesReports)),
                 'Number Of Series' => sizeof($this->seriesReports)
             ],
-            'investigatorForm' => $this->investigatorForm,
             'studyName' => $this->studyName,
             'visitName' => $this->visitName,
             'patientCode' => $this->patientCode,
diff --git a/GaelO2/app/Providers/AdapterProvider.php b/GaelO2/app/Providers/AdapterProvider.php
index 1fc3e72d0..5e3c13253 100644
--- a/GaelO2/app/Providers/AdapterProvider.php
+++ b/GaelO2/app/Providers/AdapterProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\GaelO\Adapters\AzureCacheAdapter;
 use App\GaelO\Adapters\DatabaseDumperAdapter;
 use App\GaelO\Adapters\FrameworkAdapter;
 use App\GaelO\Adapters\HttpClientAdapter;
@@ -18,7 +19,7 @@
 use App\GaelO\Interfaces\Adapters\PhoneNumberInterface;
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Foundation\Application;
-use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\ServiceProvider;
 use League\Flysystem\AzureBlobStorage\AzureBlobStorageAdapter;
@@ -60,5 +61,18 @@ public function boot()
 
             return new FilesystemAdapter(new Filesystem($adapter, $config),$adapter, $config);
         });
+
+        Cache::extend('azure', function($app, $config){
+            $client = BlobRestProxy::createBlobService($config['dsn']);
+            $adapter = new AzureBlobStorageAdapter(
+                $client,
+                $config['container'],
+                $config['prefix'],
+            );
+    
+            $fileSystem = new Filesystem($adapter, $config);
+
+			return Cache::repository(new AzureCacheAdapter($fileSystem));
+		});
     }
 }
diff --git a/GaelO2/config/cache.php b/GaelO2/config/cache.php
index 4f41fdf96..93132cfb7 100644
--- a/GaelO2/config/cache.php
+++ b/GaelO2/config/cache.php
@@ -19,6 +19,7 @@
     */
 
     'default' => env('CACHE_DRIVER', 'file'),
+    'file-cache' => env('FILE_CACHE_DRIVER', 'file'),
 
     /*
     |--------------------------------------------------------------------------
@@ -86,6 +87,13 @@
             'endpoint' => env('DYNAMODB_ENDPOINT'),
         ],
 
+        'azure' => [
+            'driver' => 'azure',
+            'dsn' =>env('AZURE_BLOB_DSN'),
+            'container'=>env('AZURE_FILE_CACHE_CONTAINER_NAME'),
+            'prefix' => env('AZURE_BLOB_PREFIX', '') 
+        ]
+
     ],
 
     /*
diff --git a/GaelO2/routes/api.php b/GaelO2/routes/api.php
index b57ed25df..277dd908f 100644
--- a/GaelO2/routes/api.php
+++ b/GaelO2/routes/api.php
@@ -163,7 +163,9 @@
     Route::post('dicom-series/{seriesInstanceUID}/activate', [DicomController::class, 'reactivateSeries']);
     Route::post('dicom-study/{studyInstanceUID}/activate', [DicomController::class, 'reactivateStudy']);
     Route::get('visits/{id}/dicoms', [DicomController::class, 'getVisitDicoms']);
-
+    Route::get('dicom-series/{seriesInstanceUID}/previews/{index}', [DicomController::class, 'getSeriesPreview']);
+    Route::get('dicom-series/{seriesInstanceUID}/metadata', [DicomController::class, 'getSeriesMetadata']);
+    Route::get('dicom-studies/{studyInstanceUID}/metadata', [DicomController::class, 'getStudyMetadata']);
 
     //Ask Unlock route
     Route::post('visits/{id}/ask-unlock', [AskUnlockController::class, 'askUnlock']);
diff --git a/GaelO2/tests/Feature/TestDicoms/DicomMetadataTest.php b/GaelO2/tests/Feature/TestDicoms/DicomMetadataTest.php
new file mode 100644
index 000000000..04f792d94
--- /dev/null
+++ b/GaelO2/tests/Feature/TestDicoms/DicomMetadataTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Tests\Feature\TestDicoms;
+
+use App\GaelO\Adapters\FileCacheAdapter;
+use App\GaelO\Constants\Constants;
+use App\GaelO\Services\FileCacheService;
+use App\Models\DicomSeries;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\AuthorizationTools;
+use Tests\TestCase;
+
+class DicomMetadataTest extends TestCase
+{
+
+    use RefreshDatabase;
+    private DicomSeries $dicomSeries;
+    private string $studyName;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->artisan('db:seed');
+        $this->dicomSeries = DicomSeries::factory()->create();
+        $this->studyName = $this->dicomSeries->dicomStudy->visit->patient->study_name;
+        $fileCacheAdapter = new FileCacheService(new FileCacheAdapter());
+        $fileCacheAdapter->storeDicomMetadata($this->dicomSeries->dicomStudy->study_uid, json_encode(['study' => 'value']));
+        $fileCacheAdapter->storeDicomMetadata($this->dicomSeries->series_uid, json_encode(['series' => 'value2']));
+        $fileCacheAdapter->storeSeriesPreview($this->dicomSeries->series_uid, 0, 'plaintext');
+    }
+
+    public function testGetDicomStudiesMetadata()
+    {
+        $userId = AuthorizationTools::actAsAdmin(false);
+        AuthorizationTools::addRoleToUser($userId, Constants::ROLE_SUPERVISOR, $this->studyName);
+
+        $response = $this->get('api/dicom-studies/' . $this->dicomSeries->dicomStudy->study_uid . '/metadata?role=Supervisor&studyName=' . $this->studyName);
+        $response->assertStatus(200);
+        $response->assertJsonIsObject();
+    }
+
+    public function testGetDicomStudiesMetadataShouldFailNoRole()
+    {
+        AuthorizationTools::actAsAdmin(false);
+
+        $response = $this->get('api/dicom-studies/' . $this->dicomSeries->dicomStudy->study_uid . '/metadata?role=Supervisor&studyName=' . $this->studyName);
+        $response->assertStatus(403);
+    }
+
+    public function testGetDicomSeriesMetadata()
+    {
+        $userId = AuthorizationTools::actAsAdmin(false);
+        AuthorizationTools::addRoleToUser($userId, Constants::ROLE_SUPERVISOR, $this->studyName);
+
+        $response = $this->get('api/dicom-series/' . $this->dicomSeries->series_uid . '/metadata?role=Supervisor&studyName=' . $this->studyName);
+        $response->assertStatus(200);
+        $response->assertJsonIsObject();
+    }
+
+    public function testGetDicomSeriesMetadataShouldFailNoRole()
+    {
+        AuthorizationTools::actAsAdmin(false);
+
+        $response = $this->get('api/dicom-series/' . $this->dicomSeries->series_uid . '/metadata?role=Supervisor&studyName=' . $this->studyName);
+        $response->assertStatus(403);
+    }
+
+    public function testGetDicomSeriesPreview()
+    {
+        $userId = AuthorizationTools::actAsAdmin(false);
+        AuthorizationTools::addRoleToUser($userId, Constants::ROLE_SUPERVISOR, $this->studyName);
+
+        $response = $this->get('api/dicom-series/' . $this->dicomSeries->series_uid . '/previews/0?role=Supervisor&studyName=' . $this->studyName);
+        $response->assertStatus(200);
+        $response->assertContent("plaintext");
+    }
+}
diff --git a/GaelO2/tests/Unit/TestAdapters/FileCacheAdapterTest.php b/GaelO2/tests/Unit/TestAdapters/FileCacheAdapterTest.php
new file mode 100644
index 000000000..9c6c585a3
--- /dev/null
+++ b/GaelO2/tests/Unit/TestAdapters/FileCacheAdapterTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Tests\Unit\TestAdapters;
+
+use App\GaelO\Adapters\FileCacheAdapter;
+use Tests\TestCase;
+
+
+class FileCacheAdapterTest extends TestCase
+{
+    private FileCacheAdapter $fileCacheAdapter;
+
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->fileCacheAdapter = new FileCacheAdapter();
+    }
+
+    public function testReadFile()
+    {
+        $this->fileCacheAdapter->store('keyFile2', 'payload');
+        $content = $this->fileCacheAdapter->get('keyFile2');
+        $this->assertEquals('payload', $content);
+    }
+
+    public function testStoreFile()
+    {
+        $success = $this->fileCacheAdapter->store('keyFile', 'payload');
+        $this->assertTrue($success);
+    }
+
+    public function testDeleteFile()
+    {
+        $this->fileCacheAdapter->store('keyFile3', 'payload');
+        $success = $this->fileCacheAdapter->delete('keyFile3');
+        $this->assertTrue($success);
+    }
+}
diff --git a/README.md b/README.md
index b9959d5c8..df8c52a89 100755
--- a/README.md
+++ b/README.md
@@ -26,9 +26,6 @@ sheetname limité a 31 caractère $sheetName =  substr($role, 0, 3)  . '_' . $vi
 # Regenerate views email using mjml template
 ```
 node_modules/mjml/bin/mjml ./app/GaelO/views/mails/mjml/qc_report_buttons.mjml -o ./app/GaelO/views/mails/mail_qc_report_buttons.blade.php
-node_modules/mjml/bin/mjml ./app/GaelO/views/mails/mjml/qc_report_series.mjml -o ./app/GaelO/views/mails/mail_qc_report_series.blade.php
-node_modules/mjml/bin/mjml ./app/GaelO/views/mails/mjml/qc_report_study.mjml -o ./app/GaelO/views/mails/mail_qc_report_study.blade.php
-node_modules/mjml/bin/mjml ./app/GaelO/views/mails/mjml/qc_report_investigator_form.mjml -o ./app/GaelO/views/mails/mail_qc_report_investigator_form.blade.php
 node_modules/mjml/bin/mjml ./app/GaelO/views/mails/mjml/radiomics_report.mjml -o ./app/GaelO/views/mails/mail_radiomics_report.blade.php
 ```
 In blade generated files, edit file to keep only body content (remove header...)

From 5976c5d60dda4582b9b7a7979caf54d71e2813f0 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Mon, 15 Jan 2024 00:42:53 +0100
Subject: [PATCH 12/72] fix cache store

---
 GaelO2/.env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GaelO2/.env.example b/GaelO2/.env.example
index f61ba626c..382dd1c07 100644
--- a/GaelO2/.env.example
+++ b/GaelO2/.env.example
@@ -41,7 +41,7 @@ AZURE_BLOB_DSN=''
 AZURE_CONTAINER_NAME=''
 AZURE_BLOB_PREFIX=''
 AZURE_FILE_CACHE_CONTAINER_NAME=''
-FILE_CACHE_DRIVER='local'
+FILE_CACHE_DRIVER='file'
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file

From 333f3e50df09e2eaf36781152da880b4312b7292 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Mon, 15 Jan 2024 00:45:29 +0100
Subject: [PATCH 13/72] fix stan

---
 GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php b/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
index d2c23feec..5a022a238 100644
--- a/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
+++ b/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
@@ -25,7 +25,7 @@ public function __construct(Filesystem $fileSystem)
     private function getPath(string $key)
     {
         $hash = sha1($key);
-        return $this->rootDirectory . '/'. $hash;
+        return $this->rootDirectory . '/' . $hash;
     }
 
     public function get($key)
@@ -77,12 +77,14 @@ public function decrement($key, $value = 1)
     public function forever($key, $value)
     {
         $this->put($key, $value, 0);
+        return true;
     }
 
     public function forget($key)
     {
         $path = $this->getPath($key);
         $this->fileSystem->delete($path);
+        return true;
     }
 
     public function flush()
@@ -91,6 +93,7 @@ public function flush()
         foreach ($files as $file) {
             $this->fileSystem->delete($file->path());
         }
+        return true;
     }
 
     public function getPrefix()

From 08afeb182b114dfb62f60d22894a4a1eee12dfaa Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Mon, 15 Jan 2024 20:27:04 +0100
Subject: [PATCH 14/72] remove mail autoQc

---
 GaelO2/app/Jobs/JobQcReport.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/GaelO2/app/Jobs/JobQcReport.php b/GaelO2/app/Jobs/JobQcReport.php
index 5de45c59f..da2bd1ce5 100644
--- a/GaelO2/app/Jobs/JobQcReport.php
+++ b/GaelO2/app/Jobs/JobQcReport.php
@@ -3,9 +3,7 @@
 namespace App\Jobs;
 
 use App\GaelO\Constants\Constants;
-use App\GaelO\Interfaces\Adapters\FrameworkInterface;
 use App\GaelO\Interfaces\Repositories\DicomStudyRepositoryInterface;
-use App\GaelO\Interfaces\Repositories\UserRepositoryInterface;
 use App\GaelO\Interfaces\Repositories\VisitRepositoryInterface;
 use App\GaelO\Services\FileCacheService;
 use App\GaelO\Services\GaelOProcessingService\GaelOProcessingService;
@@ -50,12 +48,9 @@ public function __construct(int $visitId)
      * @return void
      */
     public function handle(
-        FrameworkInterface $frameworkInterface,
         FileCacheService $fileCacheService,
-        UserRepositoryInterface $userRepositoryInterface,
         VisitRepositoryInterface $visitRepositoryInterface,
         DicomStudyRepositoryInterface $dicomStudyRepositoryInterface,
-        MailServices $mailServices,
         OrthancService $orthancService,
         GaelOProcessingService $gaelOProcessingService,
     ) {
@@ -133,18 +128,6 @@ public function handle(
         $studyInstanceUID = $dicomStudyEntity[0]['study_uid'];
         $fileCacheService->storeDicomMetadata($studyInstanceUID, json_encode($studyInfo));
 
-        $controllerUsers = $userRepositoryInterface->getUsersByRolesInStudy($studyName, Constants::ROLE_CONTROLLER);
-
-        foreach ($controllerUsers as $user) {
-            $redirectLink = '/magic-link-tools/auto-qc';
-            $queryParams = [
-                'visitId' => $visitId,
-                'studyName' => $studyName
-            ];
-            $magicLink = $frameworkInterface->createMagicLink($user['id'], $redirectLink, $queryParams);
-            $mailServices->sendQcReport($studyName, $visitType, $patientCode, $magicLink, $user['email']);
-        }
-
         //Once job finished remove preview file to avoid dangling temporary files
         foreach ($seriesReports as $seriesReport) {
             $seriesReport->deletePreviewImages();

From 516aedec91b7f6220ef84c1c470e9ac7a76a774c Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Mon, 15 Jan 2024 21:44:31 +0100
Subject: [PATCH 15/72] cotinue

---
 .../GetDicomSeriesMetadata/GetDicomSeriesMetadata.php         | 4 +++-
 .../GetDicomSeriesMetadata/GetDicomSeriesMetadataRequest.php  | 1 +
 .../UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php  | 2 +-
 .../GetDicomSeriesPreview/GetDicomSeriesPreviewRequest.php    | 1 +
 .../UseCases/GetDicomStudyMetadata/GetDicomStudyMetadata.php  | 2 +-
 .../GetDicomStudyMetadata/GetDicomStudyMetadataRequest.php    | 1 +
 GaelO2/app/Http/Controllers/DicomController.php               | 4 ++++
 GaelO2/app/Jobs/JobQcReport.php                               | 1 -
 8 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadata.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadata.php
index 1c6af849b..30cd15b1c 100644
--- a/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadata.php
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadata.php
@@ -3,12 +3,14 @@
 namespace App\GaelO\UseCases\GetDicomSeriesMetadata;
 
 use App\GaelO\Exceptions\AbstractGaelOException;
+use App\GaelO\Exceptions\GaelOException;
 use App\GaelO\Exceptions\GaelOForbiddenException;
 use App\GaelO\Interfaces\Repositories\VisitRepositoryInterface;
 use App\GaelO\Repositories\DicomSeriesRepository;
 use App\GaelO\Services\AuthorizationService\AuthorizationVisitService;
 use App\GaelO\Services\FileCacheService;
 use Exception;
+use Illuminate\Support\Facades\Log;
 
 class GetDicomSeriesMetadata
 {
@@ -33,12 +35,12 @@ public function execute(GetDicomSeriesMetadataRequest $getDicomSeriesMetadataReq
             $curentUserId = $getDicomSeriesMetadataRequest->currentUserId;
             $role = $getDicomSeriesMetadataRequest->role;
             $seriesInstanceUID = $getDicomSeriesMetadataRequest->seriesInstanceUID;
+            $studyName = $getDicomSeriesMetadataRequest->studyName;
 
             $seriesData = $this->dicomSeriesRepository->getSeries($seriesInstanceUID, false);
             $visitId = $seriesData['dicom_study']['visit_id'];
 
             $visitContext = $this->visitRepositoryInterface->getVisitContext($visitId);
-            $studyName = $visitContext['patient']['study_name'];
 
             $this->checkAuthorization($curentUserId, $role, $visitId, $studyName, $visitContext);
 
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataRequest.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataRequest.php
index 7bfc1ebb6..88b686dee 100644
--- a/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataRequest.php
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesMetadata/GetDicomSeriesMetadataRequest.php
@@ -7,4 +7,5 @@ class GetDicomSeriesMetadataRequest
     public string $seriesInstanceUID;
     public int $currentUserId;
     public string $role;
+    public string $studyName;
 }
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php
index da5e791c8..2fcee99fa 100644
--- a/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php
@@ -34,12 +34,12 @@ public function execute(GetDicomSeriesPreviewRequest $getDicomSeriesPreviewReque
             $role = $getDicomSeriesPreviewRequest->role;
             $seriesInstanceUID = $getDicomSeriesPreviewRequest->seriesInstanceUID;
             $index = $getDicomSeriesPreviewRequest->index;
+            $studyName = $getDicomSeriesPreviewRequest->studyName;
 
             $seriesData = $this->dicomSeriesRepository->getSeries($seriesInstanceUID, false);
             $visitId = $seriesData['dicom_study']['visit_id'];
 
             $visitContext = $this->visitRepositoryInterface->getVisitContext($visitId);
-            $studyName = $visitContext['patient']['study_name'];
 
             $this->checkAuthorization($curentUserId, $role, $visitId, $studyName, $visitContext);
 
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewRequest.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewRequest.php
index 93e94ee22..fff9cfaeb 100644
--- a/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewRequest.php
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreviewRequest.php
@@ -8,4 +8,5 @@ class GetDicomSeriesPreviewRequest
     public int $index;
     public int $currentUserId;
     public string $role;
+    public string $studyName;
 }
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadata.php b/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadata.php
index 065a3d39e..2989fc3e4 100644
--- a/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadata.php
+++ b/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadata.php
@@ -33,12 +33,12 @@ public function execute(GetDicomStudyMetadataRequest $getDicomStudyMetadataReque
             $curentUserId = $getDicomStudyMetadataRequest->currentUserId;
             $role = $getDicomStudyMetadataRequest->role;
             $studyInstanceUID = $getDicomStudyMetadataRequest->studyInstanceUID;
+            $studyName = $getDicomStudyMetadataRequest->studyName;
 
             $studyData = $this->dicomStudyRepositoryInterface->getDicomStudy($studyInstanceUID, false);
             $visitId = $studyData['visit_id'];
 
             $visitContext = $this->visitRepositoryInterface->getVisitContext($visitId);
-            $studyName = $visitContext['patient']['study_name'];
 
             $this->checkAuthorization($curentUserId, $role, $visitId, $studyName, $visitContext);
 
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataRequest.php b/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataRequest.php
index c0a2be9e4..d30b93045 100644
--- a/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataRequest.php
+++ b/GaelO2/app/GaelO/UseCases/GetDicomStudyMetadata/GetDicomStudyMetadataRequest.php
@@ -7,4 +7,5 @@ class GetDicomStudyMetadataRequest
     public string $studyInstanceUID;
     public int $currentUserId;
     public string $role;
+    public string $studyName;
 }
diff --git a/GaelO2/app/Http/Controllers/DicomController.php b/GaelO2/app/Http/Controllers/DicomController.php
index 5f7114e87..202037128 100644
--- a/GaelO2/app/Http/Controllers/DicomController.php
+++ b/GaelO2/app/Http/Controllers/DicomController.php
@@ -174,7 +174,9 @@ public function getStudyMetadata(Request $request, GetDicomStudyMetadata $getDic
 
         $getDicomStudyMetadataRequest->studyInstanceUID = $studyInstanceUID;
         $getDicomStudyMetadataRequest->role = $queryParam['role'];
+        $getDicomStudyMetadataRequest->studyName = $queryParam['studyName'];
         $getDicomStudyMetadataRequest->currentUserId = $currentUser['id'];
+        
 
         $getDicomStudyMetadata->execute($getDicomStudyMetadataRequest, $getDicomStudyMetadataResponse);
 
@@ -188,6 +190,7 @@ public function getSeriesMetadata(Request $request, GetDicomSeriesMetadata $getD
 
         $getDicomSeriesMetadataRequest->seriesInstanceUID = $seriesInstanceUID;
         $getDicomSeriesMetadataRequest->role = $queryParam['role'];
+        $getDicomSeriesMetadataRequest->studyName = $queryParam['studyName'];
         $getDicomSeriesMetadataRequest->currentUserId = $currentUser['id'];
 
         $getDicomSeriesMetadata->execute($getDicomSeriesMetadataRequest, $getDicomSeriesMetadataResponse);
@@ -201,6 +204,7 @@ public function getSeriesPreview(Request $request, GetDicomSeriesPreview $getDic
         $queryParam = $request->query();
 
         $getDicomSeriesPreviewRequest->role = $queryParam['role'];
+        $getDicomSeriesPreviewRequest->studyName = $queryParam['studyName'];
         $getDicomSeriesPreviewRequest->seriesInstanceUID = $seriesInstanceUID;
         $getDicomSeriesPreviewRequest->index = $index;
         $getDicomSeriesPreviewRequest->currentUserId = $currentUser['id'];
diff --git a/GaelO2/app/Jobs/JobQcReport.php b/GaelO2/app/Jobs/JobQcReport.php
index da2bd1ce5..fd8095cb5 100644
--- a/GaelO2/app/Jobs/JobQcReport.php
+++ b/GaelO2/app/Jobs/JobQcReport.php
@@ -61,7 +61,6 @@ public function handle(
         $visitEntity = $visitRepositoryInterface->getVisitContext($this->visitId);
 
         $studyName = $visitEntity['patient']['study_name'];
-        $visitId = $visitEntity['id'];
         $visitType = $visitEntity['visit_type']['name'];
         $patientCode = $visitEntity['patient']['code'];
         $visitDate = $visitEntity['visit_date'];

From 336e7a60e804f0e6dd869565571fb5325e7a666c Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Tue, 16 Jan 2024 08:58:20 +0100
Subject: [PATCH 16/72] add time to live to caching file

---
 .../app/GaelO/Adapters/FileCacheAdapter.php   |  4 +--
 .../Interfaces/Adapters/CacheInterface.php    |  2 +-
 .../app/GaelO/Services/FileCacheService.php   | 27 ++++++++++++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/GaelO2/app/GaelO/Adapters/FileCacheAdapter.php b/GaelO2/app/GaelO/Adapters/FileCacheAdapter.php
index 1ae6d75f2..31c7f17fd 100644
--- a/GaelO2/app/GaelO/Adapters/FileCacheAdapter.php
+++ b/GaelO2/app/GaelO/Adapters/FileCacheAdapter.php
@@ -14,9 +14,9 @@ public function get(string $key)
         return Cache::store(Config::get('cache.file-cache'))->get($key);
     }
 
-    public function store(string $key, $value): bool
+    public function store(string $key, $value, ?int $ttl): bool
     {
-        Cache::store(Config::get('cache.file-cache'))->put($key, $value);
+        Cache::store(Config::get('cache.file-cache'))->put($key, $value, $ttl);
         return true;
     }
 
diff --git a/GaelO2/app/GaelO/Interfaces/Adapters/CacheInterface.php b/GaelO2/app/GaelO/Interfaces/Adapters/CacheInterface.php
index 3af5e7181..e413babfc 100644
--- a/GaelO2/app/GaelO/Interfaces/Adapters/CacheInterface.php
+++ b/GaelO2/app/GaelO/Interfaces/Adapters/CacheInterface.php
@@ -4,7 +4,7 @@
 
 interface CacheInterface
 {
-    public function store(string $key, $value): bool;
+    public function store(string $key, $value, ?int $ttl): bool;
     public function get(string $key);
     public function delete(string $key): bool;
 }
diff --git a/GaelO2/app/GaelO/Services/FileCacheService.php b/GaelO2/app/GaelO/Services/FileCacheService.php
index 02f3081a7..bf47e7769 100644
--- a/GaelO2/app/GaelO/Services/FileCacheService.php
+++ b/GaelO2/app/GaelO/Services/FileCacheService.php
@@ -3,6 +3,7 @@
 namespace App\GaelO\Services;
 
 use App\GaelO\Adapters\FileCacheAdapter;
+use App\GaelO\Exceptions\GaelONotFoundException;
 
 class FileCacheService
 {
@@ -15,12 +16,19 @@ public function __construct(FileCacheAdapter $fileCacheAdapter)
 
     public function getSeriesPreview(string $seriesInstanceUID, int $index)
     {
-        return $this->fileCacheAdapter->get('preview-' . $seriesInstanceUID . '-' . $index);
+        $data = $this->fileCacheAdapter->get('preview-' . $seriesInstanceUID . '-' . $index);
+        if ($data == null) {
+            throw new GaelONotFoundException();
+        }
+        return $data;
     }
 
-    public function storeSeriesPreview(string $seriesInstanceUID, int $index, $value)
+    /**
+     * ttl in seconds may not be supported with all drivers (ok with redis not with Azure)
+     */
+    public function storeSeriesPreview(string $seriesInstanceUID, int $index, $value, ?int $ttl = null)
     {
-        return $this->fileCacheAdapter->store('preview-' . $seriesInstanceUID . '-' . $index, $value);
+        return $this->fileCacheAdapter->store('preview-' . $seriesInstanceUID . '-' . $index, $value, $ttl);
     }
 
     public function deleteSeriesPreview(string $seriesInstanceUID, int $index)
@@ -28,14 +36,21 @@ public function deleteSeriesPreview(string $seriesInstanceUID, int $index)
         return $this->fileCacheAdapter->delete('preview-' . $seriesInstanceUID . '-' . $index);
     }
 
-    public function storeDicomMetadata(string $uid, $value)
+    /**
+     * ttl in seconds may not be supported with all drivers (ok with redis not with Azure)
+     */
+    public function storeDicomMetadata(string $uid, $value, ?int $ttl = null)
     {
-        return $this->fileCacheAdapter->store('metadata-' . $uid, $value);
+        return $this->fileCacheAdapter->store('metadata-' . $uid, $value, $ttl);
     }
 
     public function getDicomMetadata(string $uid)
     {
-        return $this->fileCacheAdapter->get('metadata-' . $uid);
+        $data = $this->fileCacheAdapter->get('metadata-' . $uid);
+        if ($data == null) {
+            throw new GaelONotFoundException();
+        }
+        return $data;
     }
 
     public function deleteDicomMetadata(string $uid)

From 479adf291ceaa3cd72da0d315043cf4e525cde0d Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Tue, 16 Jan 2024 09:03:50 +0100
Subject: [PATCH 17/72] fix

---
 .../UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php
index 2fcee99fa..85b4d03ff 100644
--- a/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesPreview/GetDicomSeriesPreview.php
@@ -56,6 +56,7 @@ public function execute(GetDicomSeriesPreviewRequest $getDicomSeriesPreviewReque
             $getDicomSeriesPreviewResponse->body = $e->getErrorBody();
             $getDicomSeriesPreviewResponse->status = $e->statusCode;
             $getDicomSeriesPreviewResponse->statusText = $e->statusText;
+            $getDicomSeriesPreviewResponse->contentType = "application/json";
         } catch (Exception $e) {
             throw $e;
         }

From 7ee89c484b88d4ad07f622e0bd00988c2e7d4b37 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Tue, 16 Jan 2024 09:06:28 +0100
Subject: [PATCH 18/72] fix tests

---
 GaelO2/tests/Unit/TestAdapters/FileCacheAdapterTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/GaelO2/tests/Unit/TestAdapters/FileCacheAdapterTest.php b/GaelO2/tests/Unit/TestAdapters/FileCacheAdapterTest.php
index 9c6c585a3..5497de3e8 100644
--- a/GaelO2/tests/Unit/TestAdapters/FileCacheAdapterTest.php
+++ b/GaelO2/tests/Unit/TestAdapters/FileCacheAdapterTest.php
@@ -19,20 +19,20 @@ protected function setUp(): void
 
     public function testReadFile()
     {
-        $this->fileCacheAdapter->store('keyFile2', 'payload');
+        $this->fileCacheAdapter->store('keyFile2', 'payload', null);
         $content = $this->fileCacheAdapter->get('keyFile2');
         $this->assertEquals('payload', $content);
     }
 
     public function testStoreFile()
     {
-        $success = $this->fileCacheAdapter->store('keyFile', 'payload');
+        $success = $this->fileCacheAdapter->store('keyFile', 'payload', null);
         $this->assertTrue($success);
     }
 
     public function testDeleteFile()
     {
-        $this->fileCacheAdapter->store('keyFile3', 'payload');
+        $this->fileCacheAdapter->store('keyFile3', 'payload', null);
         $success = $this->fileCacheAdapter->delete('keyFile3');
         $this->assertTrue($success);
     }

From d535b5238f28fcadc40c02bd2012bc0fb4d74702 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Tue, 16 Jan 2024 10:26:58 +0100
Subject: [PATCH 19/72] fix read from azure

---
 GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php b/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
index 5a022a238..976859096 100644
--- a/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
+++ b/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
@@ -36,7 +36,7 @@ public function get($key)
             throw new GaelONotFoundException("File doesn't exist in azure cache");
         }
 
-        $this->fileSystem->read($path);
+        return $this->fileSystem->read($path);
     }
 
     public function many(array $keys)

From b00f24a656f0ed296322c65b2b72360713192821 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Tue, 16 Jan 2024 10:39:45 +0100
Subject: [PATCH 20/72] try fix

---
 GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php b/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
index 976859096..11e64a50c 100644
--- a/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
+++ b/GaelO2/app/GaelO/Adapters/AzureCacheAdapter.php
@@ -6,6 +6,7 @@
 use App\GaelO\Exceptions\GaelONotFoundException;
 use Illuminate\Contracts\Cache\Store;
 use League\Flysystem\Filesystem;
+use Throwable;
 
 /**
  * File Cache using Azure blob storage, this cache adapter does not implement auto delete of files which should be 
@@ -31,12 +32,11 @@ private function getPath(string $key)
     public function get($key)
     {
         $path = $this->getPath($key);
-
-        if ($this->fileSystem->fileExists($path)) {
+        try {
+            return $this->fileSystem->read($path);
+        } catch (Throwable $e) {
             throw new GaelONotFoundException("File doesn't exist in azure cache");
         }
-
-        return $this->fileSystem->read($path);
     }
 
     public function many(array $keys)
@@ -83,8 +83,12 @@ public function forever($key, $value)
     public function forget($key)
     {
         $path = $this->getPath($key);
-        $this->fileSystem->delete($path);
-        return true;
+        try {
+            $this->fileSystem->delete($path);
+            return true;
+        } catch (Throwable $t) {
+            throw new GaelONotFoundException("File cache delete file");
+        }
     }
 
     public function flush()

From c999888488151dc8ee3cf4921940bee238ce1586 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Wed, 17 Jan 2024 16:33:41 +0100
Subject: [PATCH 21/72] tmtv stored in cache file

---
 .../app/GaelO/Services/FileCacheService.php   | 35 +++++++-
 .../TmtvProcessingService.php                 | 13 +++
 GaelO2/app/GaelO/Services/MailServices.php    |  8 +-
 .../GetDicomSeriesTmtvReport.php              | 83 +++++++++++++++++++
 .../GetDicomSeriesTmtvReportRequest.php       | 13 +++
 .../GetDicomSeriesTmtvReportResponse.php      | 11 +++
 .../mails/mail_radiomics_report.blade.php     | 70 ++--------------
 .../views/mails/mjml/radiomics_report.mjml    | 37 +--------
 .../app/Http/Controllers/DicomController.php  | 22 ++++-
 GaelO2/routes/api.php                         |  1 +
 .../TestDicoms/DicomTmtvReportTest.php        | 65 +++++++++++++++
 11 files changed, 254 insertions(+), 104 deletions(-)
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReport.php
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReportRequest.php
 create mode 100644 GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReportResponse.php
 create mode 100644 GaelO2/tests/Feature/TestDicoms/DicomTmtvReportTest.php

diff --git a/GaelO2/app/GaelO/Services/FileCacheService.php b/GaelO2/app/GaelO/Services/FileCacheService.php
index bf47e7769..da8470980 100644
--- a/GaelO2/app/GaelO/Services/FileCacheService.php
+++ b/GaelO2/app/GaelO/Services/FileCacheService.php
@@ -31,9 +31,42 @@ public function storeSeriesPreview(string $seriesInstanceUID, int $index, $value
         return $this->fileCacheAdapter->store('preview-' . $seriesInstanceUID . '-' . $index, $value, $ttl);
     }
 
+    /**
+     * Methodology should be 41 / 25 / 4
+     */
+    public function storeTmtvPreview(string $seriesInstanceUID, string $methodology, $value, ?int $ttl = null)
+    {
+        return $this->fileCacheAdapter->store('tmtv-preview-' . $seriesInstanceUID . '-' . $methodology, $value, $ttl);
+    }
+
+    public function storeTmtvResults(string $seriesInstanceUID, string $methodology, $value, ?int $ttl = null)
+    {
+        return $this->fileCacheAdapter->store('tmtv-results-' . $seriesInstanceUID . '-' . $methodology, $value, $ttl);
+    }
+
     public function deleteSeriesPreview(string $seriesInstanceUID, int $index)
     {
-        return $this->fileCacheAdapter->delete('preview-' . $seriesInstanceUID . '-' . $index);
+        return $this->fileCacheAdapter->delete('tmtv-preview-' . $seriesInstanceUID . '-' . $index);
+    }
+
+    public function deleteTmtvResults(string $seriesInstanceUID, int $index)
+    {
+        return $this->fileCacheAdapter->delete('tmtv-results-' . $seriesInstanceUID . '-' . $index);
+    }
+
+    public function deleteTmtvPreview(string $seriesInstanceUID, string $methodology)
+    {
+        return $this->fileCacheAdapter->delete('tmtv-' . $seriesInstanceUID . '-' . $methodology);
+    }
+
+    public function getTmtvResults(string $seriesInstanceUID, string $methodology)
+    {
+        return $this->fileCacheAdapter->get('tmtv-results-' . $seriesInstanceUID . '-' . $methodology);
+    }
+
+    public function getTmtvPreview(string $seriesInstanceUID, string $methodology)
+    {
+        return $this->fileCacheAdapter->get('tmtv-preview-' . $seriesInstanceUID . '-' . $methodology);
     }
 
     /**
diff --git a/GaelO2/app/GaelO/Services/GaelOProcessingService/TmtvProcessingService.php b/GaelO2/app/GaelO/Services/GaelOProcessingService/TmtvProcessingService.php
index c63265676..06b978bbd 100644
--- a/GaelO2/app/GaelO/Services/GaelOProcessingService/TmtvProcessingService.php
+++ b/GaelO2/app/GaelO/Services/GaelOProcessingService/TmtvProcessingService.php
@@ -16,6 +16,8 @@ class TmtvProcessingService
     private GaelOProcessingService $gaelOProcessingService;
     private string $ptOrthancSeriesId;
     private string $ctOrthancSeriesId;
+    private string $ptSeriesUid;
+    private string $ctSeriesUid;
     private array $createdFiles = [];
 
 
@@ -63,15 +65,19 @@ public function loadPetAndCtSeriesOrthancIdsFromVisit($visitId): void
         $dicomStudyEntity = $this->dicomStudyRepositoryInterface->getDicomsDataFromVisit($visitId, false, false);
 
         $idPT = null;
+        $ptSeriesUid = null;
         $idCT = null;
+        $ctSeriesUid = null;
         foreach ($dicomStudyEntity[0]['dicom_series'] as $series) {
             if ($series['modality'] == 'PT') {
                 if ($idPT) throw new GaelOException('Multiple PET Series, unable to perform segmentation');
                 $idPT = $series['orthanc_id'];
+                $ptSeriesUid = $series['series_uid'];
             }
             if ($series['modality'] == 'CT') {
                 if ($idCT) throw new GaelOException('Multiple CT Series, unable to perform segmentation');
                 $idCT = $series['orthanc_id'];
+                $ctSeriesUid = $series['series_uid'];
             }
         }
 
@@ -82,6 +88,13 @@ public function loadPetAndCtSeriesOrthancIdsFromVisit($visitId): void
 
         $this->ctOrthancSeriesId = $idCT;
         $this->ptOrthancSeriesId = $idPT;
+        $this->ptSeriesUid = $ptSeriesUid;
+        $this->ctSeriesUid = $ctSeriesUid;
+    }
+
+    public function getInferedPtSeriesUid(): string
+    {
+        return $this->ptSeriesUid;
     }
 
     public function addCreatedRessource(string $type, string $id)
diff --git a/GaelO2/app/GaelO/Services/MailServices.php b/GaelO2/app/GaelO/Services/MailServices.php
index f5d3a7823..e171cf13a 100644
--- a/GaelO2/app/GaelO/Services/MailServices.php
+++ b/GaelO2/app/GaelO/Services/MailServices.php
@@ -607,18 +607,16 @@ public function sendQcReport(string $studyName, string $visitType, string $patie
         $this->mailInterface->send();
     }
 
-    public function sendRadiomicsReport(string $studyName, string $patientCode, string $visitType, string $visitDate, string $imagePath, array $stats, array $emailList)
+    public function sendRadiomicsReport(string $studyName, string $patientCode, string $visitType, string $magicLink, string $email)
     {
         $parameters = [
             'patientCode' => $patientCode,
             'visitType' => $visitType,
             'studyName' => $studyName,
-            'visitDate' => $visitDate,
-            'image_path' => [$imagePath],
-            'stats' => $stats
+            'magicLink' => $magicLink,
         ];
 
-        $this->mailInterface->setTo($emailList);
+        $this->mailInterface->setTo([$email]);
         $this->mailInterface->setReplyTo($this->getStudyContactEmail($studyName));
         $this->mailInterface->setParameters($parameters);
         $this->mailInterface->setBody(MailConstants::EMAIL_RADIOMICS_REPORT);
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReport.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReport.php
new file mode 100644
index 000000000..4d2d76aab
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReport.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomSeriesTmtvReport;
+
+use App\GaelO\Exceptions\AbstractGaelOException;
+use App\GaelO\Exceptions\GaelOForbiddenException;
+use App\GaelO\Interfaces\Repositories\VisitRepositoryInterface;
+use App\GaelO\Repositories\DicomSeriesRepository;
+use App\GaelO\Services\AuthorizationService\AuthorizationVisitService;
+use App\GaelO\Services\FileCacheService;
+use Exception;
+
+class GetDicomSeriesTmtvReport
+{
+    private AuthorizationVisitService $authorizationVisitService;
+    private FileCacheService $fileCacheService;
+    private DicomSeriesRepository $dicomSeriesRepository;
+    private VisitRepositoryInterface $visitRepositoryInterface;
+
+    public function __construct(AuthorizationVisitService $authorizationVisitService, DicomSeriesRepository $dicomSeriesRepository, VisitRepositoryInterface $visitRepositoryInterface, FileCacheService $fileCacheService)
+    {
+        $this->authorizationVisitService = $authorizationVisitService;
+        $this->fileCacheService = $fileCacheService;
+        $this->dicomSeriesRepository = $dicomSeriesRepository;
+        $this->visitRepositoryInterface = $visitRepositoryInterface;
+    }
+
+
+    public function execute(GetDicomSeriesTmtvReportRequest $getDicomSeriesTmtvReportRequest, GetDicomSeriesTmtvReportResponse $getDicomSeriesTmtvReportResponse)
+    {
+
+        try {
+            $curentUserId = $getDicomSeriesTmtvReportRequest->currentUserId;
+            $role = $getDicomSeriesTmtvReportRequest->role;
+            $seriesInstanceUID = $getDicomSeriesTmtvReportRequest->seriesInstanceUID;
+            $studyName = $getDicomSeriesTmtvReportRequest->studyName;
+            $type = $getDicomSeriesTmtvReportRequest->type;
+            $methodology = $getDicomSeriesTmtvReportRequest->methodology;
+
+            $seriesData = $this->dicomSeriesRepository->getSeries($seriesInstanceUID, false);
+            $visitId = $seriesData['dicom_study']['visit_id'];
+
+            $visitContext = $this->visitRepositoryInterface->getVisitContext($visitId);
+
+            $this->checkAuthorization($curentUserId, $role, $visitId, $studyName, $visitContext);
+
+            if ($type === "stats") {
+                $previewData = $this->fileCacheService->getTmtvResults($seriesInstanceUID, $methodology);
+            } else {
+                $previewData = $this->fileCacheService->getTmtvPreview($seriesInstanceUID, $methodology);
+            }
+
+
+            $finfo = finfo_open();
+            $mimeType = finfo_buffer($finfo, $previewData, FILEINFO_MIME_TYPE);
+            finfo_close($finfo);
+
+            $getDicomSeriesTmtvReportResponse->body = $previewData;
+            $getDicomSeriesTmtvReportResponse->status = 200;
+            $getDicomSeriesTmtvReportResponse->statusText = 'OK';
+            $getDicomSeriesTmtvReportResponse->contentType = $mimeType;
+        } catch (AbstractGaelOException $e) {
+            $getDicomSeriesTmtvReportResponse->body = $e->getErrorBody();
+            $getDicomSeriesTmtvReportResponse->status = $e->statusCode;
+            $getDicomSeriesTmtvReportResponse->statusText = $e->statusText;
+            $getDicomSeriesTmtvReportResponse->contentType = "application/json";
+        } catch (Exception $e) {
+            throw $e;
+        }
+    }
+
+    private function checkAuthorization(int $userId, string $role, int $visitId, string $studyName, array $visitContext): void
+    {
+        $this->authorizationVisitService->setUserId($userId);
+        $this->authorizationVisitService->setVisitId($visitId);
+        $this->authorizationVisitService->setStudyName($studyName);
+        $this->authorizationVisitService->setVisitContext($visitContext);
+
+        if (!$this->authorizationVisitService->isVisitAllowed($role)) {
+            throw new GaelOForbiddenException();
+        }
+    }
+}
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReportRequest.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReportRequest.php
new file mode 100644
index 000000000..fe09f2545
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReportRequest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomSeriesTmtvReport;
+
+class GetDicomSeriesTmtvReportRequest
+{
+    public string $seriesInstanceUID;
+    public string $type;
+    public string $methodology;
+    public int $currentUserId;
+    public string $role;
+    public string $studyName;
+}
\ No newline at end of file
diff --git a/GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReportResponse.php b/GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReportResponse.php
new file mode 100644
index 000000000..327d7cfb4
--- /dev/null
+++ b/GaelO2/app/GaelO/UseCases/GetDicomSeriesTmtvReport/GetDicomSeriesTmtvReportResponse.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\GaelO\UseCases\GetDicomSeriesTmtvReport;
+
+class GetDicomSeriesTmtvReportResponse
+{
+    public $body = null;
+    public int $status;
+    public string $statusText;
+    public string $contentType;
+}
\ No newline at end of file
diff --git a/GaelO2/app/GaelO/views/mails/mail_radiomics_report.blade.php b/GaelO2/app/GaelO/views/mails/mail_radiomics_report.blade.php
index 592bf0a42..7bb1ba221 100644
--- a/GaelO2/app/GaelO/views/mails/mail_radiomics_report.blade.php
+++ b/GaelO2/app/GaelO/views/mails/mail_radiomics_report.blade.php
@@ -81,16 +81,6 @@
 
   </style>
   <style type="text/css">
-    @media only screen and (max-width:479px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
-    }
-
   </style>
   <style type="text/css">
     h3 {
@@ -150,42 +140,23 @@
                   <tbody>
                     <tr>
                       <td align="center" class="text-color" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:center;color:#000000;">Visit {{$visitType}} of the patient {{$patientCode}} from the {{$studyName}}.</div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:16px;text-align:center;color:#000000;">Visit Date: {{$visitDate}}</div>
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:center;color:#000000;">The Visit {{$visitType}} of the patient {{$patientCode}} from the {{$studyName}}, has the TMTV report ready</div>
                       </td>
                     </tr>
                   </tbody>
                 </table>
               </div>
-              <!--[if mso | IE]></td></tr></table><![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <!--[if mso | IE]></td></tr></table><![endif]--> @if(!empty($message))
-    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-    <div style="margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><![endif]--> @foreach($image_path as $path)
-              <!--[if mso | IE]><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
+              <!--[if mso | IE]></td><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
               <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
                 <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
                   <tbody>
                     <tr>
-                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
+                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
                           <tbody>
                             <tr>
-                              <td style="width:550px;">
-                                <img alt="tmtv preview" src="{{$message->embed($path ?? public_path('static/media/ban-image-photo-icon.png'))}}" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="550" height="auto" />
+                              <td align="center" bgcolor="#2ec086" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:10px 25px;background:#2ec086;" valign="middle">
+                                <a href="{{ $magicLink }}" rel="noopener" style="display:inline-block;background:#2ec086;color:#ffffff;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:3px;" target="_blank"> Access TMTV report </a>
                               </td>
                             </tr>
                           </tbody>
@@ -195,35 +166,6 @@
                   </tbody>
                 </table>
               </div>
-              <!--[if mso | IE]></td><![endif]--> @endforeach
-              <!--[if mso | IE]></tr></table><![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <!--[if mso | IE]></td></tr></table><![endif]--> @endif
-    <!--[if mso | IE]><table align="center" border="0" cellpadding="0" cellspacing="0" class="" role="presentation" style="width:600px;" width="600" ><tr><td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;"><![endif]-->
-    <div style="margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-              <!--[if mso | IE]><table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td class="" style="vertical-align:top;width:600px;" ><![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
-                  <tbody>
-                    <tr>
-                      <td align="left" class="table-striped" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <table cellpadding="0" cellspacing="0" role="presentation" width="100%" border="0" style="color:#000000;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:22px;table-layout:auto;width:100%;border:none;"> @foreach($stats as $key => $value) <tr>
-                            <td style="padding: 0 15px 0 0;font-weight: bold;" align="left">{{ $key }}</td>
-                            <td style="padding: 0 15px;" align="right">{{ $value }}</td>
-                          </tr> @endforeach </table>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
               <!--[if mso | IE]></td></tr></table><![endif]-->
             </td>
           </tr>
diff --git a/GaelO2/app/GaelO/views/mails/mjml/radiomics_report.mjml b/GaelO2/app/GaelO/views/mails/mjml/radiomics_report.mjml
index e258ec4e5..a93ce2c2d 100644
--- a/GaelO2/app/GaelO/views/mails/mjml/radiomics_report.mjml
+++ b/GaelO2/app/GaelO/views/mails/mjml/radiomics_report.mjml
@@ -16,40 +16,11 @@
       </mj-column>
     </mj-section>
     <mj-section>
-      <mj-column>
-        <mj-text align="center" css-class="text-color"> Visit {{$visitType}} of the patient {{$patientCode}} from the {{$studyName}}.</mj-text>
-        <mj-text align="center" line-height="16px">
-          Visit Date: {{$visitDate}}
-        </mj-text>
-      </mj-column>
-    </mj-section>
-    <mj-raw>
-      @if(!empty($message))
-    </mj-raw>
-    <mj-section>
-      <mj-raw>
-        @foreach($image_path as $path)
-      </mj-raw>
-      <mj-column>
-        <mj-image alt="tmtv preview" src="{{$message->embed($path ?? public_path('static/media/ban-image-photo-icon.png'))}}" align="center"></mj-image>
+      <mj-column width="100%">
+        <mj-text align="center" css-class="text-color"> The Visit {{$visitType}} of the patient {{$patientCode}} from the {{$studyName}}, has the TMTV report ready</mj-text>
       </mj-column>
-      <mj-raw>
-        @endforeach
-      </mj-raw>
-    </mj-section>
-    <mj-raw>
-      @endif
-    </mj-raw>
-    <mj-section>
-      <mj-column>
-        <mj-table css-class="table-striped" role="presentation">
-          @foreach($stats as $key => $value)
-          <tr>
-            <td style="padding: 0 15px 0 0;font-weight: bold;" align="left">{{ $key }}</td>
-            <td style="padding: 0 15px;" align="right">{{ $value }}</td>
-          </tr>
-          @endforeach
-        </mj-table>
+      <mj-column width="100%">
+        <mj-button align="center" href="{{ $magicLink }}" rel="noopener" background-color="#2ec086" mj-class="button">Access TMTV report</mj-button>
       </mj-column>
     </mj-section>
     <mj-section>
diff --git a/GaelO2/app/Http/Controllers/DicomController.php b/GaelO2/app/Http/Controllers/DicomController.php
index 202037128..c5563cb74 100644
--- a/GaelO2/app/Http/Controllers/DicomController.php
+++ b/GaelO2/app/Http/Controllers/DicomController.php
@@ -14,6 +14,9 @@
 use App\GaelO\UseCases\GetDicomSeriesPreview\GetDicomSeriesPreview;
 use App\GaelO\UseCases\GetDicomSeriesPreview\GetDicomSeriesPreviewRequest;
 use App\GaelO\UseCases\GetDicomSeriesPreview\GetDicomSeriesPreviewResponse;
+use App\GaelO\UseCases\GetDicomSeriesTmtvReport\GetDicomSeriesTmtvReport;
+use App\GaelO\UseCases\GetDicomSeriesTmtvReport\GetDicomSeriesTmtvReportRequest;
+use App\GaelO\UseCases\GetDicomSeriesTmtvReport\GetDicomSeriesTmtvReportResponse;
 use App\GaelO\UseCases\GetDicomsFile\GetDicomsFile;
 use App\GaelO\UseCases\GetDicomsFile\GetDicomsFileRequest;
 use App\GaelO\UseCases\GetDicomsFile\GetDicomsFileResponse;
@@ -176,7 +179,7 @@ public function getStudyMetadata(Request $request, GetDicomStudyMetadata $getDic
         $getDicomStudyMetadataRequest->role = $queryParam['role'];
         $getDicomStudyMetadataRequest->studyName = $queryParam['studyName'];
         $getDicomStudyMetadataRequest->currentUserId = $currentUser['id'];
-        
+
 
         $getDicomStudyMetadata->execute($getDicomStudyMetadataRequest, $getDicomStudyMetadataResponse);
 
@@ -213,4 +216,21 @@ public function getSeriesPreview(Request $request, GetDicomSeriesPreview $getDic
 
         return response($getDicomSeriesPreviewResponse->body, $getDicomSeriesPreviewResponse->status)->header('Content-Type', $getDicomSeriesPreviewResponse->contentType);
     }
+
+    public function getSeriesTmtvReport(Request $request, GetDicomSeriesTmtvReport $getDicomSeriesTmtvReport, GetDicomSeriesTmtvReportRequest $getDicomSeriesTmtvRequest, GetDicomSeriesTmtvReportResponse $getDicomSeriesTmtvReportResponse, string $seriesInstanceUID, string $type)
+    {
+        $currentUser = Auth::user();
+        $queryParam = $request->query();
+
+        $getDicomSeriesTmtvRequest->role = $queryParam['role'];
+        $getDicomSeriesTmtvRequest->studyName = $queryParam['studyName'];
+        $getDicomSeriesTmtvRequest->seriesInstanceUID = $seriesInstanceUID;
+        $getDicomSeriesTmtvRequest->type = $type;
+        $getDicomSeriesTmtvRequest->methodology = $queryParam['methodology'];
+        $getDicomSeriesTmtvRequest->currentUserId = $currentUser['id'];
+
+        $getDicomSeriesTmtvReport->execute($getDicomSeriesTmtvRequest, $getDicomSeriesTmtvReportResponse);
+
+        return response($getDicomSeriesTmtvReportResponse->body, $getDicomSeriesTmtvReportResponse->status)->header('Content-Type', $getDicomSeriesTmtvReportResponse->contentType);
+    }
 }
diff --git a/GaelO2/routes/api.php b/GaelO2/routes/api.php
index 277dd908f..30a9296e3 100644
--- a/GaelO2/routes/api.php
+++ b/GaelO2/routes/api.php
@@ -166,6 +166,7 @@
     Route::get('dicom-series/{seriesInstanceUID}/previews/{index}', [DicomController::class, 'getSeriesPreview']);
     Route::get('dicom-series/{seriesInstanceUID}/metadata', [DicomController::class, 'getSeriesMetadata']);
     Route::get('dicom-studies/{studyInstanceUID}/metadata', [DicomController::class, 'getStudyMetadata']);
+    Route::get('dicom-series/{seriesInstanceUID}/tmtv-report/{type}', [DicomController::class, 'getSeriesTmtvReport']);
 
     //Ask Unlock route
     Route::post('visits/{id}/ask-unlock', [AskUnlockController::class, 'askUnlock']);
diff --git a/GaelO2/tests/Feature/TestDicoms/DicomTmtvReportTest.php b/GaelO2/tests/Feature/TestDicoms/DicomTmtvReportTest.php
new file mode 100644
index 000000000..e9b3904fc
--- /dev/null
+++ b/GaelO2/tests/Feature/TestDicoms/DicomTmtvReportTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Tests\Feature\TestDicoms;
+
+use App\GaelO\Adapters\FileCacheAdapter;
+use App\GaelO\Constants\Constants;
+use App\GaelO\Services\FileCacheService;
+use App\Models\DicomSeries;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\AuthorizationTools;
+use Tests\TestCase;
+
+class DicomTmtvReportTest extends TestCase
+{
+
+    use RefreshDatabase;
+    private DicomSeries $dicomSeries;
+    private string $studyName;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->artisan('db:seed');
+        $this->dicomSeries = DicomSeries::factory()->create();
+        $this->studyName = $this->dicomSeries->dicomStudy->visit->patient->study_name;
+        $fileCacheAdapter = new FileCacheService(new FileCacheAdapter());
+        $fileCacheAdapter->storeTmtvResults($this->dicomSeries->series_uid, '41', 'a binary payload');
+        $fileCacheAdapter->storeTmtvPreview($this->dicomSeries->series_uid, '41', json_encode(['tmtv' => '41']));
+    }
+
+    public function testGetDicomTmtvPreview()
+    {
+        $userId = AuthorizationTools::actAsAdmin(false);
+        AuthorizationTools::addRoleToUser($userId, Constants::ROLE_SUPERVISOR, $this->studyName);
+
+        $response = $this->get('api/dicom-series/' . $this->dicomSeries->series_uid . '/tmtv-report/preview?methodology=41&role=Supervisor&studyName=' . $this->studyName);
+        $response->assertStatus(200);
+        $response->assertJsonIsObject();
+    }
+
+    public function testGetDicomTmtvPreviewShouldFailNoRole()
+    {
+        AuthorizationTools::actAsAdmin(false);
+
+        $response = $this->get('api/dicom-series/' . $this->dicomSeries->series_uid . '/tmtv-report/preview?methodology=41&role=Supervisor&studyName=' . $this->studyName);
+        $response->assertStatus(403);
+    }
+
+    public function testGetDicomTmtvResults()
+    {
+        $userId = AuthorizationTools::actAsAdmin(false);
+        AuthorizationTools::addRoleToUser($userId, Constants::ROLE_SUPERVISOR, $this->studyName);
+
+        $response = $this->get('api/dicom-series/' . $this->dicomSeries->series_uid . '/tmtv-report/stats?methodology=41&role=Supervisor&studyName=' . $this->studyName);
+        $response->assertStatus(200);
+    }
+
+    public function testGetDicomTmtvResultsShouldFailNoRole()
+    {
+        AuthorizationTools::actAsAdmin(false);
+
+        $response = $this->get('api/dicom-series/' . $this->dicomSeries->series_uid . '/tmtv-report/stats?methodology=41&role=Supervisor&studyName=' . $this->studyName);
+        $response->assertStatus(403);
+    }
+}

From 8ffab1fe7e0a61dc11ebeb73cf53820f1649ed4b Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Wed, 17 Jan 2024 16:48:06 +0100
Subject: [PATCH 22/72] try fix test

---
 GaelO2/tests/Unit/TestServices/PdfServiceTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GaelO2/tests/Unit/TestServices/PdfServiceTest.php b/GaelO2/tests/Unit/TestServices/PdfServiceTest.php
index 6b484a8c0..84f1c2ee5 100644
--- a/GaelO2/tests/Unit/TestServices/PdfServiceTest.php
+++ b/GaelO2/tests/Unit/TestServices/PdfServiceTest.php
@@ -18,7 +18,7 @@ protected function setUp(): void
 
     public function testMakeRadiomicsPdf()
     {
-        $filename = $this->pdfService->saveRadiomicsPdf('TEST', '12345', 'PET0', '07141995', ['tmtv41' => 55]);
+        $filename = $this->pdfService->saveRadiomicsPdf('TEST', '12345', 'PET0', '07141995', ['tmtv41' => 55, 'magicLink'=> 'link']);
         $this->assertIsString($filename);
     }
 

From fa15c5b98fd55b73880bc14925bfdfb675f54ec0 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Wed, 17 Jan 2024 16:54:19 +0100
Subject: [PATCH 23/72] try fix tests

---
 GaelO2/tests/Unit/TestServices/PdfServiceTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GaelO2/tests/Unit/TestServices/PdfServiceTest.php b/GaelO2/tests/Unit/TestServices/PdfServiceTest.php
index 84f1c2ee5..db0f8b911 100644
--- a/GaelO2/tests/Unit/TestServices/PdfServiceTest.php
+++ b/GaelO2/tests/Unit/TestServices/PdfServiceTest.php
@@ -18,7 +18,7 @@ protected function setUp(): void
 
     public function testMakeRadiomicsPdf()
     {
-        $filename = $this->pdfService->saveRadiomicsPdf('TEST', '12345', 'PET0', '07141995', ['tmtv41' => 55, 'magicLink'=> 'link']);
+        $filename = $this->pdfService->saveRadiomicsPdf('TEST', '12345', 'PET0', 'magiclink', ['tmtv41' => 55, 'magicLink'=> 'link']);
         $this->assertIsString($filename);
     }
 

From 5b91c0260cc872eb4312eb09ee3c83dda0e2b301 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Wed, 17 Jan 2024 16:58:49 +0100
Subject: [PATCH 24/72] fix tests

---
 GaelO2/app/GaelO/Services/PdfServices.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/GaelO2/app/GaelO/Services/PdfServices.php b/GaelO2/app/GaelO/Services/PdfServices.php
index 4b0384fa6..0cb9c127a 100644
--- a/GaelO2/app/GaelO/Services/PdfServices.php
+++ b/GaelO2/app/GaelO/Services/PdfServices.php
@@ -14,13 +14,13 @@ public function __construct(PdfInterface $pdfInterface)
         $this->pdfInterface = $pdfInterface;
     }
 
-    public function saveRadiomicsPdf(string $studyName, string $patientCode, string $visitType, string $visitDate, array $stats): string
+    public function saveRadiomicsPdf(string $studyName, string $patientCode, string $visitType, string $magicLink, array $stats): string
     {
         $parameters = [
             'patientCode' => $patientCode,
             'visitType' => $visitType,
             'studyName' => $studyName,
-            'visitDate' => $visitDate,
+            'magicLink' => $magicLink,
             'stats' => $stats
         ];
 

From 3265197b508f1b92d0adc16be4efd67a1ec11b9e Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Wed, 17 Jan 2024 23:22:32 +0100
Subject: [PATCH 25/72] add env testing

---
 GaelO2/.env.testing | 6 ++++++
 GaelO2/phpunit.xml  | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 GaelO2/.env.testing

diff --git a/GaelO2/.env.testing b/GaelO2/.env.testing
new file mode 100644
index 000000000..11b01ad57
--- /dev/null
+++ b/GaelO2/.env.testing
@@ -0,0 +1,6 @@
+APP_ENV="testing"
+DB_CONNECTION="sqlite_testing"
+MAIL_MAILER="array"
+QUEUE_CONNECTION="sync"
+SESSION_DRIVER="array"
+TELESCOPE_ENABLED="false"
\ No newline at end of file
diff --git a/GaelO2/phpunit.xml b/GaelO2/phpunit.xml
index aca977d61..714f1a00a 100644
--- a/GaelO2/phpunit.xml
+++ b/GaelO2/phpunit.xml
@@ -12,9 +12,7 @@
   <php>
     <server name="APP_ENV" value="testing"/>
     <server name="BCRYPT_ROUNDS" value="4"/>
-    <server name="CACHE_DRIVER" value="array"/>
-    <server name="DB_CONNECTION" value="sqlite"/>
-    <server name="DB_DATABASE" value=":memory:"/>
+    <server name="DB_CONNECTION" value="sqlite_testing"/>
     <server name="MAIL_MAILER" value="array"/>
     <server name="QUEUE_CONNECTION" value="sync"/>
     <server name="SESSION_DRIVER" value="array"/>

From 156df5784c35e13794164a72f086691677c3bf0f Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Wed, 17 Jan 2024 23:33:14 +0100
Subject: [PATCH 26/72] try fix tests

---
 GaelO2/.env.testing | 75 ++++++++++++++++++++++++++++++++++++++++++---
 GaelO2/phpunit.xml  |  1 -
 2 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/GaelO2/.env.testing b/GaelO2/.env.testing
index 11b01ad57..48f4f5c12 100644
--- a/GaelO2/.env.testing
+++ b/GaelO2/.env.testing
@@ -1,6 +1,73 @@
+APP_NAME=GaelO
+APP_CORPORATION=Pixilib
 APP_ENV="testing"
+APP_KEY=base64:Eqa/LcdPhfxg6PQ9uytXcu5WoMN8p5Ms2rlBywsOq08=
+APP_DEBUG=false
+TZ=UTC
 DB_CONNECTION="sqlite_testing"
-MAIL_MAILER="array"
-QUEUE_CONNECTION="sync"
-SESSION_DRIVER="array"
-TELESCOPE_ENABLED="false"
\ No newline at end of file
+APP_URL='http://localhost:80'
+LOG_CHANNEL=stderr
+
+TUS_URL='http://localhost:1080'
+
+ORTHANC_TEMPORARY_URL='http://localhost:8042'
+ORTHANC_TEMPORARY_LOGIN='login'
+ORTHANC_TEMPORARY_PASSWORD='password'
+
+ORTHANC_STORAGE_URL='http://localhost:8043'
+ORTHANC_STORAGE_LOGIN='login'
+ORTHANC_STORAGE_PASSWORD='password'
+
+GAELO_PROCESSING_URL='http://gaeloprocessing:8000'
+GAELO_PROCESSING_LOGIN='login'
+GAELO_PROCESSING_PASSWORD='password'
+
+AZURE_CLIENT_ID=''
+AZURE_DIRECTORY_ID=''
+AZURE_CLIENT_SECRET=''
+AZURE_SUBSCRIPTION_ID=''
+AZURE_CONTAINER_GROUP=''
+AZURE_RESOURCE_GROUP=''
+
+FILESYSTEM_DISK='local'
+AZURE_BLOB_DSN=''
+AZURE_CONTAINER_NAME=''
+AZURE_BLOB_PREFIX=''
+AZURE_FILE_CACHE_CONTAINER_NAME=''
+FILE_CACHE_DRIVER='file'
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=array
+SESSION_LIFETIME=120
+SESSION_SECURE_COOKIE=true
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=array
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="notifications@gaelo.fr"
+MAIL_FROM_NAME="${APP_NAME}"
+MAIL_REPLY_TO_DEFAULT="support@gaelo.fr"
+
+SENTRY_DSN=null
+SENTRY_ENVIRONMENT=null
+SENTRY_TRACES_SAMPLE_RATE=0.0
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
\ No newline at end of file
diff --git a/GaelO2/phpunit.xml b/GaelO2/phpunit.xml
index 714f1a00a..f87bef30e 100644
--- a/GaelO2/phpunit.xml
+++ b/GaelO2/phpunit.xml
@@ -16,7 +16,6 @@
     <server name="MAIL_MAILER" value="array"/>
     <server name="QUEUE_CONNECTION" value="sync"/>
     <server name="SESSION_DRIVER" value="array"/>
-    <server name="TELESCOPE_ENABLED" value="false"/>
   </php>
   <source>
     <include>

From 405867410c1f9a4a14d118a9bdcca0fa3a4fe56f Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Thu, 18 Jan 2024 16:43:48 +0100
Subject: [PATCH 27/72] mail simplification

---
 GaelO2/app/GaelO/views/mails/mail_radiomics_report.blade.php | 2 +-
 GaelO2/app/GaelO/views/mails/mjml/radiomics_report.mjml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/GaelO2/app/GaelO/views/mails/mail_radiomics_report.blade.php b/GaelO2/app/GaelO/views/mails/mail_radiomics_report.blade.php
index 7bb1ba221..519a10847 100644
--- a/GaelO2/app/GaelO/views/mails/mail_radiomics_report.blade.php
+++ b/GaelO2/app/GaelO/views/mails/mail_radiomics_report.blade.php
@@ -140,7 +140,7 @@
                   <tbody>
                     <tr>
                       <td align="center" class="text-color" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:center;color:#000000;">The Visit {{$visitType}} of the patient {{$patientCode}} from the {{$studyName}}, has the TMTV report ready</div>
+                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;line-height:1;text-align:center;color:#000000;">The TMTV report of the patient {{$patientCode}} is ready !</div>
                       </td>
                     </tr>
                   </tbody>
diff --git a/GaelO2/app/GaelO/views/mails/mjml/radiomics_report.mjml b/GaelO2/app/GaelO/views/mails/mjml/radiomics_report.mjml
index a93ce2c2d..d42ecaf85 100644
--- a/GaelO2/app/GaelO/views/mails/mjml/radiomics_report.mjml
+++ b/GaelO2/app/GaelO/views/mails/mjml/radiomics_report.mjml
@@ -17,7 +17,7 @@
     </mj-section>
     <mj-section>
       <mj-column width="100%">
-        <mj-text align="center" css-class="text-color"> The Visit {{$visitType}} of the patient {{$patientCode}} from the {{$studyName}}, has the TMTV report ready</mj-text>
+        <mj-text align="center" css-class="text-color"> The TMTV report of the patient {{$patientCode}} is ready !</mj-text>
       </mj-column>
       <mj-column width="100%">
         <mj-button align="center" href="{{ $magicLink }}" rel="noopener" background-color="#2ec086" mj-class="button">Access TMTV report</mj-button>

From 570085fe52e60bb1ee595cbf78fee659c46e82d7 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Thu, 18 Jan 2024 17:53:45 +0100
Subject: [PATCH 28/72] update mail service

---
 GaelO2/app/GaelO/Services/MailServices.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/GaelO2/app/GaelO/Services/MailServices.php b/GaelO2/app/GaelO/Services/MailServices.php
index e171cf13a..949ccde80 100644
--- a/GaelO2/app/GaelO/Services/MailServices.php
+++ b/GaelO2/app/GaelO/Services/MailServices.php
@@ -607,7 +607,7 @@ public function sendQcReport(string $studyName, string $visitType, string $patie
         $this->mailInterface->send();
     }
 
-    public function sendRadiomicsReport(string $studyName, string $patientCode, string $visitType, string $magicLink, string $email)
+    public function sendRadiomicsReport(string $studyName, string $patientCode, string $visitType, string $magicLink, int $userId)
     {
         $parameters = [
             'patientCode' => $patientCode,
@@ -616,7 +616,7 @@ public function sendRadiomicsReport(string $studyName, string $patientCode, stri
             'magicLink' => $magicLink,
         ];
 
-        $this->mailInterface->setTo([$email]);
+        $this->mailInterface->setTo([$this->getUserEmail($userId)]);
         $this->mailInterface->setReplyTo($this->getStudyContactEmail($studyName));
         $this->mailInterface->setParameters($parameters);
         $this->mailInterface->setBody(MailConstants::EMAIL_RADIOMICS_REPORT);

From 8aff586989173a798d2b361410889998dd725d91 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 28 Jan 2024 15:44:46 +0100
Subject: [PATCH 29/72] refactoring delete commands

---
 GaelO2/app/Console/Commands/DeleteStudy.php   | 28 +++++----------
 ...ldVisits.php => DeleteVisitsOlderThan.php} | 28 ++++++++-------
 .../GaelODeleteRessourcesRepository.php       | 36 +++++++++++++++----
 .../TestDeleteCommand/DeleteCommandTest.php   | 31 +++++-----------
 4 files changed, 62 insertions(+), 61 deletions(-)
 rename GaelO2/app/Console/Commands/{DeleteOldVisits.php => DeleteVisitsOlderThan.php} (84%)

diff --git a/GaelO2/app/Console/Commands/DeleteStudy.php b/GaelO2/app/Console/Commands/DeleteStudy.php
index ea4a0100a..db20bdd11 100644
--- a/GaelO2/app/Console/Commands/DeleteStudy.php
+++ b/GaelO2/app/Console/Commands/DeleteStudy.php
@@ -9,7 +9,6 @@
 use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
 
 class DeleteStudy extends Command
 {
@@ -24,14 +23,14 @@ class DeleteStudy extends Command
      *
      * @var string
      */
-    protected $signature = 'gaelo:delete-study {studyName : the study name to delete} {--deleteDicom : delete dicom in Orthanc} { --deleteAssociatedFile : delete associated files}';
+    protected $signature = 'gaelo:delete-study {studyName : the study name to delete}';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Delete a Study from GaelO (hard delete)';
+    protected $description = 'Delete a Study from GaelO (hard delete), including DICOM and associated files';
 
     /**
      * Execute the console command.
@@ -111,29 +110,20 @@ public function handle(
                 $this->gaelODeleteRessourcesRepository->deleteDicomsStudies($visitIds);
                 $this->gaelODeleteRessourcesRepository->deleteVisits($visitIds);
                 $this->gaelODeleteRessourcesRepository->deleteVisitGroupAndVisitType($studyName);
-                $this->gaelODeleteRessourcesRepository->deletePatient($studyName);
+                $this->gaelODeleteRessourcesRepository->deleteAllPatientsOfStudy($studyName);
             }
 
             $this->gaelODeleteRessourcesRepository->deleteStudy($studyName);
 
-            $confirmDeleteDicom = $this->confirm('Found ' . sizeOf($orthancIdArray) . ' series to delete, do you want to continue ?');
-            $confirmDeleteAssociatedFiles = $this->confirm('Going to delete associated file, do you want to continue ?');
-
-            if ($this->option('deleteDicom') && $confirmDeleteDicom) {
-                foreach ($orthancIdArray as $seriesOrthancId) {
-                    try {
-                        $this->info('Deleting ' . $seriesOrthancId);
-                        $this->orthancService->deleteFromOrthanc('series', $seriesOrthancId);
-                    } catch (Exception $e) {
-                        Log::error($e->getMessage());
-                    }
+            foreach ($orthancIdArray as $seriesOrthancId) {
+                try {
+                    $this->info('Deleting ' . $seriesOrthancId);
+                    $this->orthancService->deleteFromOrthanc('series', $seriesOrthancId);
+                } catch (Exception $e) {
+                    Log::error($e->getMessage());
                 }
             }
 
-            if ($this->option('deleteAssociatedFile') && $confirmDeleteAssociatedFiles) {
-                Storage::deleteDirectory($studyName);
-            }
-
             $this->info('The command was successful !');
         }
 
diff --git a/GaelO2/app/Console/Commands/DeleteOldVisits.php b/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
similarity index 84%
rename from GaelO2/app/Console/Commands/DeleteOldVisits.php
rename to GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
index 3a1b70771..c9c1ea572 100644
--- a/GaelO2/app/Console/Commands/DeleteOldVisits.php
+++ b/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
@@ -10,7 +10,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
-class DeleteOldVisits extends Command
+class DeleteVisitsOlderThan extends Command
 {
 
     private Study $study;
@@ -23,7 +23,7 @@ class DeleteOldVisits extends Command
      *
      * @var string
      */
-    protected $signature = 'gaelo:delete-old-visits {studyName : the study name to delete old visits} {numberOfDays : days threshold from visit creation}';
+    protected $signature = 'gaelo:delete-visits-older-than {studyName : the study name to delete old visits} {numberOfDays : days threshold from visit creation}';
 
     /**
      * The console command description.
@@ -82,6 +82,10 @@ public function handle(
                 return $visit['id'];
             }, $visits->toArray());
 
+            $patientIds = array_map(function ($visit) {
+                return $visit['patient']['id'];
+            }, $visits->toArray());
+
             $this->gaelODeleteRessourcesRepository->deleteReviews($visitIds, $studyName);
             $this->gaelODeleteRessourcesRepository->deleteReviewStatus($visitIds, $studyName);
             $this->gaelODeleteRessourcesRepository->deleteTrackerOfVisits($visitIds, $studyEntity->name);
@@ -95,19 +99,17 @@ public function handle(
             $this->gaelODeleteRessourcesRepository->deleteDicomsStudies($visitIds);
             $this->gaelODeleteRessourcesRepository->deleteVisits($visitIds);
             //Remove patients with no visits
-            $this->gaelODeleteRessourcesRepository->deletePatientsWithNoVisits($studyName);
-
-
-            if ($this->option('deleteDicom') && $this->confirm('Found ' . sizeOf($orthancIdArray) . ' series to delete, do you want to continue ?')) {
-                foreach ($orthancIdArray as $seriesOrthancId) {
-                    try {
-                        $this->info('Deleting ' . $seriesOrthancId);
-                        $this->orthancService->deleteFromOrthanc('series', $seriesOrthancId);
-                    } catch (Exception $e) {
-                        Log::error($e->getMessage());
-                    }
+            $this->gaelODeleteRessourcesRepository->deletePatientsWithNoVisits($patientIds);
+
+            foreach ($orthancIdArray as $seriesOrthancId) {
+                try {
+                    $this->info('Deleting ' . $seriesOrthancId);
+                    $this->orthancService->deleteFromOrthanc('series', $seriesOrthancId);
+                } catch (Exception $e) {
+                    Log::error($e->getMessage());
                 }
             }
+            
 
             $this->info('The command was successful !');
         }
diff --git a/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php b/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
index 4cdc4ccdd..f405788a8 100644
--- a/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
+++ b/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\GaelO\Interfaces\Adapters\FrameworkInterface;
 use App\Models\DicomSeries;
 use App\Models\DicomStudy;
 use App\Models\Documentation;
@@ -28,6 +29,7 @@ class GaelODeleteRessourcesRepository
     private Role $role;
     private VisitGroup $visitGroup;
     private Review $review;
+    private FrameworkInterface $frameworkInterface;
 
     public function __construct(
         Study $study,
@@ -40,7 +42,8 @@ public function __construct(
         Tracker $tracker,
         Documentation $documentation,
         Review $review,
-        ReviewStatus $reviewStatus
+        ReviewStatus $reviewStatus,
+        FrameworkInterface $frameworkInterface
     ) {
 
         $this->study = $study;
@@ -54,11 +57,16 @@ public function __construct(
         $this->role = $role;
         $this->review = $review;
         $this->reviewStatus = $reviewStatus;
+        $this->frameworkInterface = $frameworkInterface;
     }
 
     public function deleteDocumentation(string $studyName)
     {
-        $this->documentation->where('study_name', $studyName)->withTrashed()->forceDelete();
+        $documentations = $this->documentation->where('study_name', $studyName)->withTrashed();
+        foreach($documentations as $documentation){
+            $this->frameworkInterface->deleteFile($documentation['path']);
+            $documentation->forceDelete();
+        }
     }
 
     public function deleteRoles(string $studyName)
@@ -88,19 +96,26 @@ public function deleteDicomsSeries(array $visitId)
         })->withTrashed()->forceDelete();
     }
 
-    public function deletePatient(string $studyName)
+    public function deleteAllPatientsOfStudy(string $studyName)
     {
         $this->patient->where('study_name', $studyName)->delete();
     }
 
-    public function deletePatientsWithNoVisits(string $studyName)
+    public function deletePatientsWithNoVisits(array $patientIds)
     {
-        $this->patient->where('study_name', $studyName)->doesntHave('visits')->delete();
+        $this->patient->whereIn('id', $patientIds)->doesntHave('visits')->delete();
     }
 
     public function deleteReviews(array $visitIds, string $studyName)
     {
-        $this->review->where('study_name', $studyName)->whereIn('visit_id', $visitIds)->withTrashed()->forceDelete();
+        $reviews = $this->review->where('study_name', $studyName)->whereIn('visit_id', $visitIds)->withTrashed();
+        foreach ($reviews as $review) {
+            $files = $review['sent_files'];
+            foreach ($files as $key => $path) {
+                $this->frameworkInterface->deleteFile($path);
+            }
+            $review->forceDelete();
+        }
     }
 
     public function deleteReviewStatus(array $visitIds, String $studyName)
@@ -116,7 +131,14 @@ public function deleteStudy(string $studyName)
 
     public function deleteVisits(array $visitIds)
     {
-        $this->visit->whereIn('id', $visitIds)->withTrashed()->forceDelete();
+        $visits = $this->visit->whereIn('id', $visitIds)->withTrashed();
+        foreach ($visits as $visit) {
+            $files = $visit['sent_files'];
+            foreach ($files as $key => $path) {
+                $this->frameworkInterface->deleteFile($path);
+            }
+            $visit->forceDelete();
+        }
     }
 
     public function deleteVisitGroupAndVisitType(string $studyName)
diff --git a/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php b/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
index e2ba68758..a8cb9beb1 100644
--- a/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
+++ b/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
@@ -20,6 +20,15 @@ class DeleteCommandTest extends TestCase
 {
 
     use RefreshDatabase;
+    private Study $study;
+    private VisitGroup $visitGroup;
+    private VisitType $visitType;
+    private Patient $patient;
+    private Visit $visit;
+    private DicomStudy $dicomStudy;
+    private DicomSeries $dicomSeries;
+    private Review $review;
+    private ReviewStatus $reviewStatus;
 
     protected function setUp(): void
     {
@@ -68,28 +77,6 @@ public function testDeleteCommand()
             ->expectsOutput('The command was successful !');
     }
 
-    public function testDeleteCommandWithDeleteDicom()
-    {
-        $studyName = $this->study->name;
-        $this->artisan('gaelo:delete-study ' . $studyName.' --deleteDicom')->expectsQuestion('Warning : Please confirm study Name', $studyName)
-            ->expectsQuestion('Warning : This CANNOT be undone, do you wish to continue?', "\r\n")
-            ->expectsTable(['orthanc_id'], [[$this->dicomSeries->orthanc_id]])
-            ->expectsQuestion('Found 1 series to delete, do you want to continue ?', 'yes')
-            ->expectsOutput('The command was successful !');
-    }
-
-
-    public function testDeleteCommandWithDeleteDicomAndAssociatedFiles()
-    {
-        $studyName = $this->study->name;
-        $this->artisan('gaelo:delete-study ' . $studyName.' --deleteDicom --deleteAssociatedFile')->expectsQuestion('Warning : Please confirm study Name', $studyName)
-            ->expectsQuestion('Warning : This CANNOT be undone, do you wish to continue?', "\r\n")
-            ->expectsTable(['orthanc_id'], [[$this->dicomSeries->orthanc_id]])
-            ->expectsQuestion('Found 1 series to delete, do you want to continue ?', 'yes')
-            ->expectsQuestion('Going to delete associated file, do you want to continue ?', 'yes')
-            ->expectsOutput('The command was successful !');
-    }
-
     public function testDeleteCommandShouldFailBecauseExistingAncillary()
     {
         $studyName = $this->study->name;

From d742ca031b8b2e7618bdb2f4237397e3bc8a229e Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 28 Jan 2024 22:08:30 +0100
Subject: [PATCH 30/72] debug delete commands and add tests

---
 .../Commands/DeleteVisitsOlderThan.php        |  5 +-
 .../GaelODeleteRessourcesRepository.php       |  4 +-
 .../TestDeleteCommand/DeleteCommandTest.php   |  1 -
 .../DeleteVisitOlderCommandTest.php           | 76 +++++++++++++++++++
 4 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 GaelO2/tests/Feature/TestDeleteCommand/DeleteVisitOlderCommandTest.php

diff --git a/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php b/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
index c9c1ea572..71dad7984 100644
--- a/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
+++ b/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
@@ -52,6 +52,7 @@ public function handle(
         $this->orthancService->setOrthancServer(true);
 
         $studyName = $this->argument('studyName');
+        $numberOfDays = $this->argument('numberOfDays');
         $studyNameConfirmation = $this->ask('Warning : Please confirm study Name');
 
         if ($studyName !== $studyNameConfirmation) {
@@ -76,7 +77,7 @@ public function handle(
         if ($this->confirm('Warning : This CANNOT be undone, do you wish to continue?')) {
 
             //Get visits created more than 5 day
-            $visits = $this->getOlderVisitsOfStudy($studyName, date('Y.m.d', strtotime("-5 days")));
+            $visits = $this->getOlderVisitsOfStudy($studyName, date('Y.m.d', strtotime("-".$numberOfDays." days")));
 
             $visitIds = array_map(function ($visit) {
                 return $visit['id'];
@@ -95,6 +96,8 @@ public function handle(
                 return $seriesId['orthanc_id'];
             }, $dicomSeries);
 
+            $this->info(implode(",", $visitIds));
+
             $this->gaelODeleteRessourcesRepository->deleteDicomsSeries($visitIds);
             $this->gaelODeleteRessourcesRepository->deleteDicomsStudies($visitIds);
             $this->gaelODeleteRessourcesRepository->deleteVisits($visitIds);
diff --git a/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php b/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
index f405788a8..9223e8cd1 100644
--- a/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
+++ b/GaelO2/app/Console/Commands/GaelODeleteRessourcesRepository.php
@@ -108,7 +108,7 @@ public function deletePatientsWithNoVisits(array $patientIds)
 
     public function deleteReviews(array $visitIds, string $studyName)
     {
-        $reviews = $this->review->where('study_name', $studyName)->whereIn('visit_id', $visitIds)->withTrashed();
+        $reviews = $this->review->where('study_name', $studyName)->whereIn('visit_id', $visitIds)->withTrashed()->get();
         foreach ($reviews as $review) {
             $files = $review['sent_files'];
             foreach ($files as $key => $path) {
@@ -131,7 +131,7 @@ public function deleteStudy(string $studyName)
 
     public function deleteVisits(array $visitIds)
     {
-        $visits = $this->visit->whereIn('id', $visitIds)->withTrashed();
+        $visits = $this->visit->whereIn('id', $visitIds)->withTrashed()->get();
         foreach ($visits as $visit) {
             $files = $visit['sent_files'];
             foreach ($files as $key => $path) {
diff --git a/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php b/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
index a8cb9beb1..e0b20bcd6 100644
--- a/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
+++ b/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
@@ -32,7 +32,6 @@ class DeleteCommandTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->markTestSkipped();
         parent::setUp();
         $this->artisan('db:seed');
         $this->study = Study::factory()->create();
diff --git a/GaelO2/tests/Feature/TestDeleteCommand/DeleteVisitOlderCommandTest.php b/GaelO2/tests/Feature/TestDeleteCommand/DeleteVisitOlderCommandTest.php
new file mode 100644
index 000000000..7dbe22e0a
--- /dev/null
+++ b/GaelO2/tests/Feature/TestDeleteCommand/DeleteVisitOlderCommandTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Tests\Feature\TestDeleteCommand;
+
+use App\GaelO\Services\OrthancService;
+use App\Models\DicomSeries;
+use App\Models\DicomStudy;
+use App\Models\Patient;
+use App\Models\Review;
+use App\Models\ReviewStatus;
+use App\Models\Study;
+use App\Models\Visit;
+use App\Models\VisitGroup;
+use App\Models\VisitType;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Mockery\MockInterface;
+use Tests\TestCase;
+
+class DeleteVisitOlderCommandTest extends TestCase
+{
+
+    use RefreshDatabase;
+    private Study $study;
+    private VisitGroup $visitGroup;
+    private VisitType $visitType;
+    private Patient $patient;
+    private Visit $visit;
+    private DicomStudy $dicomStudy;
+    private DicomSeries $dicomSeries;
+    private Review $review;
+    private ReviewStatus $reviewStatus;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->artisan('db:seed');
+        $this->study = Study::factory()->create();
+        $this->visitGroup = VisitGroup::factory()->studyName($this->study->name)->create();
+        $this->visitType = VisitType::factory()->visitGroupId($this->visitGroup->id)->create();
+        $this->patient = Patient::factory()->studyName($this->study->name)->create();
+        $this->visit = Visit::factory()->patientId($this->patient->id)->visitTypeId($this->visitType->id)->create();
+        $this->dicomStudy = DicomStudy::factory()->visitId($this->visit->id)->create();
+        $this->dicomSeries = DicomSeries::factory()->studyInstanceUid($this->dicomStudy->study_uid)->create();
+        $this->review = Review::factory()->visitId($this->visit->id)->studyName($this->study->name)->create();
+        $this->reviewStatus = ReviewStatus::factory()->visitId($this->visit->id)->studyName($this->study->name)->create();
+
+        $mockOrthancService = $this->partialMock(OrthancService::class, function (MockInterface $mock) {
+            $mock->shouldReceive('setOrthancServer')->andReturn(null);
+            $mock->shouldReceive('deleteFromOrthanc')->andReturn(true);
+        });
+        app()->instance(OrthancService::class, $mockOrthancService);
+    }
+
+    public function testDeleteCommandShouldFailWrongStudyNameConfirmation()
+    {
+        $studyName = $this->study->name;
+        $this->artisan('gaelo:delete-visits-older-than ' . $studyName . " 0")->expectsQuestion('Warning : Please confirm study Name', 'WrongStudyName')
+            ->expectsOutput('Wrong study name, terminating');
+    }
+
+    public function testDeleteCommand()
+    {
+        $studyName = $this->study->name;
+        $this->artisan('gaelo:delete-visits-older-than ' . $studyName . " 0")->expectsQuestion('Warning : Please confirm study Name', $studyName)
+            ->expectsQuestion('Warning : This CANNOT be undone, do you wish to continue?', "\r\n")
+            ->expectsOutput('The command was successful !');
+    }
+
+    public function testDeleteCommandShouldFailBecauseExistingAncillary()
+    {
+        $studyName = $this->study->name;
+        Study::factory()->ancillaryOf($studyName)->create();
+        $this->artisan('gaelo:delete-visits-older-than ' . $studyName . " 0")->expectsQuestion('Warning : Please confirm study Name', $studyName)
+            ->expectsOutput('Delete all ancilaries studies first');
+    }
+}

From 4b668a9afd4dd6ed9f447f1e3ea61eeef4ad82c4 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 28 Jan 2024 22:32:05 +0100
Subject: [PATCH 31/72] update cron

---
 .../Console/Commands/DeleteVisitsOlderThan.php | 18 +++++++++++-------
 GaelO2/app/Console/Kernel.php                  |  7 -------
 GaelO2/app/GaelO/CronJobs/GaelOScheduler.php   |  7 ++-----
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php b/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
index 71dad7984..68db2db91 100644
--- a/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
+++ b/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
@@ -23,7 +23,7 @@ class DeleteVisitsOlderThan extends Command
      *
      * @var string
      */
-    protected $signature = 'gaelo:delete-visits-older-than {studyName : the study name to delete old visits} {numberOfDays : days threshold from visit creation}';
+    protected $signature = 'gaelo:delete-visits-older-than {studyName : the study name to delete old visits} {numberOfDays : days threshold from visit creation} {--force}';
 
     /**
      * The console command description.
@@ -53,11 +53,15 @@ public function handle(
 
         $studyName = $this->argument('studyName');
         $numberOfDays = $this->argument('numberOfDays');
-        $studyNameConfirmation = $this->ask('Warning : Please confirm study Name');
+        $force = $this->option('force');
 
-        if ($studyName !== $studyNameConfirmation) {
-            $this->error('Wrong study name, terminating');
-            return 0;
+        if (!$force) {
+            $studyNameConfirmation = $this->ask('Warning : Please confirm study Name');
+
+            if ($studyName !== $studyNameConfirmation) {
+                $this->error('Wrong study name, terminating');
+                return 0;
+            }
         }
 
         $studyEntity = $this->study->withTrashed()->findOrFail($studyName);
@@ -77,7 +81,7 @@ public function handle(
         if ($this->confirm('Warning : This CANNOT be undone, do you wish to continue?')) {
 
             //Get visits created more than 5 day
-            $visits = $this->getOlderVisitsOfStudy($studyName, date('Y.m.d', strtotime("-".$numberOfDays." days")));
+            $visits = $this->getOlderVisitsOfStudy($studyName, date('Y.m.d', strtotime("-" . $numberOfDays . " days")));
 
             $visitIds = array_map(function ($visit) {
                 return $visit['id'];
@@ -112,7 +116,7 @@ public function handle(
                     Log::error($e->getMessage());
                 }
             }
-            
+
 
             $this->info('The command was successful !');
         }
diff --git a/GaelO2/app/Console/Kernel.php b/GaelO2/app/Console/Kernel.php
index 28a137e7d..21641d1d3 100644
--- a/GaelO2/app/Console/Kernel.php
+++ b/GaelO2/app/Console/Kernel.php
@@ -5,7 +5,6 @@
 use App\GaelO\CronJobs\GaelOScheduler;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use Illuminate\Support\Facades\Log;
 use DateTimeZone;
 
 class Kernel extends ConsoleKernel
@@ -31,12 +30,6 @@ protected function schedule(Schedule $schedule)
         $schedule->command('cache:prune-stale-tags')->hourly();
         //Register custom jobs
         GaelOScheduler::registerScheduledJobs($schedule);
-        //Scheduler Probe for monitoring
-        $schedule->call(function () {
-            Log::info("Scheduler Probe");
-        })
-            ->hourly()
-            ->sentryMonitor('gaelo-scheduler');
     }
 
     /**
diff --git a/GaelO2/app/GaelO/CronJobs/GaelOScheduler.php b/GaelO2/app/GaelO/CronJobs/GaelOScheduler.php
index a50c1d579..873b5c4b6 100644
--- a/GaelO2/app/GaelO/CronJobs/GaelOScheduler.php
+++ b/GaelO2/app/GaelO/CronJobs/GaelOScheduler.php
@@ -13,11 +13,8 @@ class GaelOScheduler
 
     public static function registerScheduledJobs(Schedule $schedule)
     {
-
-        /*
         $schedule->call(function () {
-            Log::info("Scheduled custom job");
-        })->everyMinute();
-        */
+            Log::info("Scheduler Probe");
+        })->hourly()->sentryMonitor('gaelo-scheduler');
     }
 }

From 831667f06188c599d6fe78e84a15c2a9f6d81f44 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Mon, 29 Jan 2024 15:14:00 +0100
Subject: [PATCH 32/72] small

---
 .../Services/GaelOProcessingService/GaelOProcessingService.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php b/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php
index 129d3dc2a..518180a55 100644
--- a/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php
+++ b/GaelO2/app/GaelO/Services/GaelOProcessingService/GaelOProcessingService.php
@@ -63,7 +63,7 @@ public function createMIPForSeries(string $seriesId, array $payload = ['orientat
     /**
      * return png
      */
-    public function createMosaicForSeries(string $seriesId, array $payload = ["min" => null, "max" => null, "cols" => 5, "nbImages" => 20, "width" => 512, "height" => 512, "orientation"=>"LPI"]): string
+    public function createMosaicForSeries(string $seriesId, array $payload = ["min" => null, "max" => null, "cols" => 5, "nbImages" => 20, "width" => 512, "height" => 512, "orientation" => "LPI"]): string
     {
         $downloadedFilePath  = tempnam(ini_get('upload_tmp_dir'), 'TMP_Inference_');
         $this->httpClientInterface->requestStreamResponseToFile('POST', "/series/" . $seriesId . "/mosaic", $downloadedFilePath, ['Content-Type' => 'application/json'], $payload);

From def3744b26a19af80e140276e3b116344cd21630 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 10:11:14 +0100
Subject: [PATCH 33/72] remove confirmation if force

---
 .../Commands/DeleteVisitsOlderThan.php        | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php b/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
index 68db2db91..f22ebe7ef 100644
--- a/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
+++ b/GaelO2/app/Console/Commands/DeleteVisitsOlderThan.php
@@ -62,6 +62,10 @@ public function handle(
                 $this->error('Wrong study name, terminating');
                 return 0;
             }
+
+            if (!$this->confirm('Warning : This CANNOT be undone, do you wish to continue?')) {
+                return 0;
+            }
         }
 
         $studyEntity = $this->study->withTrashed()->findOrFail($studyName);
@@ -78,48 +82,46 @@ public function handle(
             return 0;
         }
 
-        if ($this->confirm('Warning : This CANNOT be undone, do you wish to continue?')) {
-
-            //Get visits created more than 5 day
-            $visits = $this->getOlderVisitsOfStudy($studyName, date('Y.m.d', strtotime("-" . $numberOfDays . " days")));
+        //Get visits created more than 5 day
+        $visits = $this->getOlderVisitsOfStudy($studyName, date('Y.m.d', strtotime("-" . $numberOfDays . " days")));
 
-            $visitIds = array_map(function ($visit) {
-                return $visit['id'];
-            }, $visits->toArray());
+        $visitIds = array_map(function ($visit) {
+            return $visit['id'];
+        }, $visits->toArray());
 
-            $patientIds = array_map(function ($visit) {
-                return $visit['patient']['id'];
-            }, $visits->toArray());
+        $patientIds = array_map(function ($visit) {
+            return $visit['patient']['id'];
+        }, $visits->toArray());
 
-            $this->gaelODeleteRessourcesRepository->deleteReviews($visitIds, $studyName);
-            $this->gaelODeleteRessourcesRepository->deleteReviewStatus($visitIds, $studyName);
-            $this->gaelODeleteRessourcesRepository->deleteTrackerOfVisits($visitIds, $studyEntity->name);
+        $this->gaelODeleteRessourcesRepository->deleteReviews($visitIds, $studyName);
+        $this->gaelODeleteRessourcesRepository->deleteReviewStatus($visitIds, $studyName);
+        $this->gaelODeleteRessourcesRepository->deleteTrackerOfVisits($visitIds, $studyEntity->name);
 
-            $dicomSeries = $this->getDicomSeriesOfVisits($visitIds);
-            $orthancIdArray = array_map(function ($seriesId) {
-                return $seriesId['orthanc_id'];
-            }, $dicomSeries);
+        $dicomSeries = $this->getDicomSeriesOfVisits($visitIds);
+        $orthancIdArray = array_map(function ($seriesId) {
+            return $seriesId['orthanc_id'];
+        }, $dicomSeries);
 
-            $this->info(implode(",", $visitIds));
+        $this->info(implode(",", $visitIds));
 
-            $this->gaelODeleteRessourcesRepository->deleteDicomsSeries($visitIds);
-            $this->gaelODeleteRessourcesRepository->deleteDicomsStudies($visitIds);
-            $this->gaelODeleteRessourcesRepository->deleteVisits($visitIds);
-            //Remove patients with no visits
-            $this->gaelODeleteRessourcesRepository->deletePatientsWithNoVisits($patientIds);
+        $this->gaelODeleteRessourcesRepository->deleteDicomsSeries($visitIds);
+        $this->gaelODeleteRessourcesRepository->deleteDicomsStudies($visitIds);
+        $this->gaelODeleteRessourcesRepository->deleteVisits($visitIds);
+        //Remove patients with no visits
+        $this->gaelODeleteRessourcesRepository->deletePatientsWithNoVisits($patientIds);
 
-            foreach ($orthancIdArray as $seriesOrthancId) {
-                try {
-                    $this->info('Deleting ' . $seriesOrthancId);
-                    $this->orthancService->deleteFromOrthanc('series', $seriesOrthancId);
-                } catch (Exception $e) {
-                    Log::error($e->getMessage());
-                }
+        foreach ($orthancIdArray as $seriesOrthancId) {
+            try {
+                $this->info('Deleting ' . $seriesOrthancId);
+                $this->orthancService->deleteFromOrthanc('series', $seriesOrthancId);
+            } catch (Exception $e) {
+                Log::error($e->getMessage());
             }
+        }
 
 
-            $this->info('The command was successful !');
-        }
+        $this->info('The command was successful !');
+
 
         return 0;
     }

From 4c9be6c7e3d606f856d81d4a1ab41310fafe7d8d Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 14:02:26 +0100
Subject: [PATCH 34/72] upgrade ci and fix test

---
 .github/workflows/clean-packages.yml                   |  4 ++--
 .github/workflows/php-stan.yml                         |  2 +-
 .github/workflows/publish.yml                          | 10 +++++-----
 .github/workflows/tests.yml                            |  2 +-
 .../Feature/TestDeleteCommand/DeleteCommandTest.php    |  1 +
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/clean-packages.yml b/.github/workflows/clean-packages.yml
index fe16d64b1..e90eb324d 100644
--- a/.github/workflows/clean-packages.yml
+++ b/.github/workflows/clean-packages.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Build checkout'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         
       - name: Login to github registery
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: 'salimkanoun'
diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
index baa0c4db5..74e407b47 100644
--- a/.github/workflows/php-stan.yml
+++ b/.github/workflows/php-stan.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Build checkout'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 'Setup PHP'
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6a2125460..5838f3af6 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Build checkout'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/pixilib/gaelo
           tags: |
@@ -27,17 +27,17 @@ jobs:
             v2-latest
             
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         
       - name: Login to github registery
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: 'salimkanoun'
           password: ${{ secrets.GITHUB_TOKEN }}
           
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           push: true
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0a8712d2f..b3a7a23e2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Build checkout'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 'Setup PHP'
         uses: shivammathur/setup-php@v2
diff --git a/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php b/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
index e0b20bcd6..fe40b7a3c 100644
--- a/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
+++ b/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
@@ -81,6 +81,7 @@ public function testDeleteCommandShouldFailBecauseExistingAncillary()
         $studyName = $this->study->name;
         Study::factory()->ancillaryOf($studyName)->create();
         $this->artisan('gaelo:delete-study ' . $studyName)->expectsQuestion('Warning : Please confirm study Name', $studyName)
+            ->expectsQuestion('Warning : This CANNOT be undone, do you wish to continue?', "\r\n")    
             ->expectsOutput('Delete all ancilaries studies first');
     }
 }

From d9dd2a306ae7b4a2f98a33aeffcce0511094aa21 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 14:12:53 +0100
Subject: [PATCH 35/72] fix tests

---
 GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php     | 1 -
 .../Feature/TestDeleteCommand/DeleteVisitOlderCommandTest.php    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php b/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
index fe40b7a3c..e0b20bcd6 100644
--- a/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
+++ b/GaelO2/tests/Feature/TestDeleteCommand/DeleteCommandTest.php
@@ -81,7 +81,6 @@ public function testDeleteCommandShouldFailBecauseExistingAncillary()
         $studyName = $this->study->name;
         Study::factory()->ancillaryOf($studyName)->create();
         $this->artisan('gaelo:delete-study ' . $studyName)->expectsQuestion('Warning : Please confirm study Name', $studyName)
-            ->expectsQuestion('Warning : This CANNOT be undone, do you wish to continue?', "\r\n")    
             ->expectsOutput('Delete all ancilaries studies first');
     }
 }
diff --git a/GaelO2/tests/Feature/TestDeleteCommand/DeleteVisitOlderCommandTest.php b/GaelO2/tests/Feature/TestDeleteCommand/DeleteVisitOlderCommandTest.php
index 7dbe22e0a..2a9f73960 100644
--- a/GaelO2/tests/Feature/TestDeleteCommand/DeleteVisitOlderCommandTest.php
+++ b/GaelO2/tests/Feature/TestDeleteCommand/DeleteVisitOlderCommandTest.php
@@ -71,6 +71,7 @@ public function testDeleteCommandShouldFailBecauseExistingAncillary()
         $studyName = $this->study->name;
         Study::factory()->ancillaryOf($studyName)->create();
         $this->artisan('gaelo:delete-visits-older-than ' . $studyName . " 0")->expectsQuestion('Warning : Please confirm study Name', $studyName)
+            ->expectsQuestion('Warning : This CANNOT be undone, do you wish to continue?', "\r\n")
             ->expectsOutput('Delete all ancilaries studies first');
     }
 }

From d5e9d8eb345e1a5b0a85319daabcb14b9fa2e68d Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 14:13:33 +0100
Subject: [PATCH 36/72] update ci

---
 .github/workflows/publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5838f3af6..fa6401ba9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -37,7 +37,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
           
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

From 3505d28f26aac79b322dd221252365af94e76088 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 15:37:03 +0100
Subject: [PATCH 37/72] init migrate to php fpm

---
 Dockerfile              |  20 +--
 GaelO2/public/.htaccess |  21 ---
 apache.conf             |  22 ----
 docker_start.sh         |   3 +-
 nginx.conf              |  66 ++++++++++
 php-fpm.conf            | 279 ++++++++++++++++++++++++++++++++++++++++
 vhost.conf              |  11 --
 7 files changed, 353 insertions(+), 69 deletions(-)
 delete mode 100644 GaelO2/public/.htaccess
 delete mode 100644 apache.conf
 create mode 100644 nginx.conf
 create mode 100644 php-fpm.conf
 delete mode 100755 vhost.conf

diff --git a/Dockerfile b/Dockerfile
index bfe32e1b4..d6c1a27cd 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
-FROM php:8.2.13-apache-bullseye
+FROM php:8.2.13-fpm
 
 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0"
 ENV TZ="UTC"
 
 RUN apt-get update -qy && \
     apt-get install -y --no-install-recommends apt-utils\
+    ngnix \
     git \
     cron \
     nano \
@@ -37,16 +38,10 @@ COPY php.ini "$PHP_INI_DIR/php.ini"
 
 RUN curl -s https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
 
-COPY vhost.conf /etc/apache2/sites-available/000-default.conf
-COPY apache.conf /etc/apache2/conf-available/zgaelo.conf
-
-RUN a2enmod rewrite
-RUN a2enmod headers
-RUN a2enmod remoteip
-RUN a2enmod deflate
-RUN a2enmod http2
-
-RUN a2enconf zgaelo
+# Copy configuration files.
+COPY php.ini "$PHP_INI_DIR/php.ini"
+COPY php-fpm.conf /usr/local/etc/php-fpm.d/www.conf
+COPY nginx.conf /etc/nginx/nginx.conf
 
 ENV APP_HOME /var/www/html
 ENV COMPOSER_ALLOW_SUPERUSER=1
@@ -61,12 +56,9 @@ RUN mv .env.example .env
 
 RUN composer install --optimize-autoloader --no-interaction
 
-# docker_start.sh
 COPY docker_start.sh /usr/local/bin/start
 RUN chmod u+x /usr/local/bin/start
 
 EXPOSE 80
 
-RUN service apache2 restart
-
 ENTRYPOINT ["/usr/local/bin/start"]
diff --git a/GaelO2/public/.htaccess b/GaelO2/public/.htaccess
deleted file mode 100644
index 3aec5e27e..000000000
--- a/GaelO2/public/.htaccess
+++ /dev/null
@@ -1,21 +0,0 @@
-<IfModule mod_rewrite.c>
-    <IfModule mod_negotiation.c>
-        Options -MultiViews -Indexes
-    </IfModule>
-
-    RewriteEngine On
-
-    # Handle Authorization Header
-    RewriteCond %{HTTP:Authorization} .
-    RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-
-    # Redirect Trailing Slashes If Not A Folder...
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteCond %{REQUEST_URI} (.+)/$
-    RewriteRule ^ %1 [L,R=301]
-
-    # Send Requests To Front Controller...
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^ index.php [L]
-</IfModule>
diff --git a/apache.conf b/apache.conf
deleted file mode 100644
index eccc025df..000000000
--- a/apache.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#remove port form X-Forwarded-From replace all after : by empty string (needed as Azure gateway add port)
-RequestHeader edit X-Forwarded-For :.* "" early
-RemoteIPHeader X-Forwarded-For
-
-ServerTokens Prod
-ServerSignature Off
-ServerName localhost
-TimeOut 3600
-
-<Directory /var/www/html/public/ >
-    <IfModule mod_deflate.c>
-        SetOutputFilter DEFLATE
-    </IfModule>
-    <IfModule mod_headers.c>
-        Header always set X-Content-Type-Options "nosniff"
-        Header always set X-XSS-Protection "1; mode=block"
-    </IfModule>
-    Options +FollowSymLinks
-    AllowOverride all
-    Require all granted
-</Directory>
-
diff --git a/docker_start.sh b/docker_start.sh
index 3edb873af..9f2adfad3 100644
--- a/docker_start.sh
+++ b/docker_start.sh
@@ -24,7 +24,8 @@ fi
 
 if [ "$role" = "app" ]; then
     echo "App started"
-    apache2-foreground
+    php-fpm -D
+    nginx -g "daemon off;"
 
 elif [ "$role" = "queue" ]; then
     echo "Queue role"
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 000000000..8d6cd0e44
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,66 @@
+user www-data;
+
+events {
+    worker_connections 2048;
+    use epoll;
+}
+
+http {
+    keepalive_timeout 3600;
+    keepalive_requests 5000;
+
+    client_max_body_size 32m;
+    client_body_buffer_size 32m;
+
+    sendfile on;
+    server_tokens off;
+
+    tcp_nopush on;
+    tcp_nodelay on;
+    reset_timedout_connection on;
+
+    gzip on;
+    gzip_comp_level 5;
+    gzip_min_length 256;
+    gzip_proxied any;
+    gzip_types application/javascript application/json application/xml text/css text/plain text/xml;
+    gzip_vary on;
+
+    open_file_cache max=1000 inactive=20s;
+    open_file_cache_valid 30s;
+    open_file_cache_min_uses 2;
+    open_file_cache_errors on;
+
+    upstream php-fpm {
+        server 127.0.0.1:9000 max_fails=5 fail_timeout=5s;
+    }
+
+    server {
+        listen 80;
+        timeout 3600;
+        server_name localhost;
+        server_tokens off;
+        add_header X-Content-Type-Options "nosniff" always;
+        add_header X-XSS-Protection "1; mode=block" always;
+        
+        root /var/www/public;
+        index index.php;
+
+        error_log /var/log/nginx/error.log;
+        access_log /var/log/nginx/access.log;
+
+        include /etc/nginx/mime.types;
+
+        location / {
+            try_files $uri $uri/ /index.php?$query_string;
+        }
+
+        location ~ \.php$ {
+            fastcgi_pass php-fpm;
+            fastcgi_index index.php;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            fastcgi_param SCRIPT_NAME $fastcgi_script_name;
+            include fastcgi_params;
+        }
+    }
+}
\ No newline at end of file
diff --git a/php-fpm.conf b/php-fpm.conf
new file mode 100644
index 000000000..a02f5e3d1
--- /dev/null
+++ b/php-fpm.conf
@@ -0,0 +1,279 @@
+[www]
+; Log level
+; Possible Values: alert, error, warning, notice, debug
+; Default Value: notice
+;log_level = notice
+
+; If this number of child processes exit with SIGSEGV or SIGBUS within the time
+; interval set by emergency_restart_interval then FPM will restart. A value
+; of '0' means 'Off'.
+; Default Value: 0
+;emergency_restart_threshold = 0
+
+; Interval of time used by emergency_restart_interval to determine when
+; a graceful restart will be initiated.  This can be useful to work around
+; accidental corruptions in an accelerator's shared memory.
+; Available Units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;emergency_restart_interval = 0
+
+; Time limit for child processes to wait for a reaction on signals from master.
+; Available units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;process_control_timeout = 0
+
+; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
+; Default Value: yes
+;daemonize = yes
+
+;;;;;;;;;;;;;;;;;;;;
+; Pool Definitions ;
+;;;;;;;;;;;;;;;;;;;;
+
+; Multiple pools of child processes may be started with different listening
+; ports and different management options.  The name of the pool will be
+; used in logs and stats. There is no limitation on the number of pools which
+; FPM can handle. Your system will tell you anyway :)
+
+; Start a new pool named 'www'.
+; the variable $pool can we used in any directive and will be replaced by the
+; pool name ('www' here)
+[www]
+
+; Per pool prefix
+; It only applies on the following directives:
+; - 'slowlog'
+; - 'listen' (unixsocket)
+; - 'chroot'
+; - 'chdir'
+; - 'php_values'
+; - 'php_admin_values'
+; When not set, the global prefix (or /etc) applies instead.
+; Note: This directive can also be relative to the global prefix.
+; Default Value: none
+;prefix = /path/to/pools/$pool
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses on a
+;                            specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = 127.0.0.1:9000
+
+; Set listen(2) backlog. A value of '-1' means unlimited.
+; Default Value: 128 (-1 on FreeBSD and OpenBSD)
+;listen.backlog = -1
+
+; List of ipv4 addresses of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+;listen.allowed_clients = 127.0.0.1
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server. Many
+; BSD-derived systems allow connections regardless of permissions.
+; Default Values: user and group are set as the running user
+;                 mode is set to 0666
+;listen.owner = nginx
+;listen.group = nginx
+;listen.mode = 0660
+
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+;       will be used.
+user = www-data
+group = www-data
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+;   static  - a fixed number (pm.max_children) of child processes;
+;   dynamic - the number of child processes are set dynamically based on the
+;             following directives:
+;             pm.max_children      - the maximum number of children that can
+;                                    be alive at the same time.
+;             pm.start_servers     - the number of children created on startup.
+;             pm.min_spare_servers - the minimum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is less than this
+;                                    number then some children will be created.
+;             pm.max_spare_servers - the maximum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is greater than this
+;                                    number then some children will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes to be created when pm is set to 'dynamic'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI.
+; Note: Used when pm is set to either 'static' or 'dynamic'
+; Note: This value is mandatory.
+pm.max_children = 50
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+pm.start_servers = 2
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = 1
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = 3
+
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+pm.max_requests = 5000
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. By default, the status page shows the following
+; information:
+;   accepted conn        - the number of request accepted by the pool;
+;   pool                 - the name of the pool;
+;   process manager      - static or dynamic;
+;   idle processes       - the number of idle processes;
+;   active processes     - the number of active processes;
+;   total processes      - the number of idle + active processes.
+;   max children reached - number of times, the process limit has been reached,
+;                          when pm tries to start more children (works only for
+;                          pm 'dynamic')
+; The values of 'idle processes', 'active processes' and 'total processes' are
+; updated each second. The value of 'accepted conn' is updated in real time.
+; Example output:
+;   accepted conn:        12073
+;   pool:                 www
+;   process manager:      static
+;   idle processes:       35
+;   active processes:     65
+;   total processes:      100
+;   max children reached: 1
+; By default the status page output is formatted as text/plain. Passing either
+; 'html' or 'json' as a query string will return the corresponding output
+; syntax. Example:
+;   http://www.foo.bar/status
+;   http://www.foo.bar/status?json
+;   http://www.foo.bar/status?html
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+pm.status_path = /phpstatus
+
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+ping.path = /phpping
+
+; This directive may be used to customize the response of a ping request. The
+; response is formatted as text/plain with a 200 response code.
+; Default Value: pong
+ping.response = pong
+
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
+
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_slowlog_timeout = 0
+
+; The log file for slow requests
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
+;slowlog = log/$pool.log.slow
+
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
+; of its subdirectories. If the pool prefix is not set, the global prefix
+; will be used instead.
+; Note: chrooting is a great security feature and should be used whenever
+;       possible. However, all PHP paths will be relative to the chroot
+;       (error_log, sessions.save_path, ...).
+; Default Value: not set
+;chroot =
+
+; Chdir to this directory at the start.
+; Note: relative path can be used.
+; Default Value: current directory or / when chroot
+;chdir = /var/www
+
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environement, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+;catch_workers_output = yes
+
+; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
+; the current environment.
+; Default Value: clean env
+;env[HOSTNAME] = $HOSTNAME
+;env[PATH] = /usr/local/bin:/usr/bin:/bin
+;env[TMP] = /tmp
+;env[TMPDIR] = /tmp
+;env[TEMP] = /tmp
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+;   php_value/php_flag             - you can set classic ini defines which can
+;                                    be overwritten from PHP call 'ini_set'.
+;   php_admin_value/php_admin_flag - these directives won't be overwritten by
+;                                     PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Note: path INI options can be relative and will be expanded with the prefix
+; (pool, global or /etc)
+
+; Default Value: nothing is defined by default except the values in php.ini and
+;                specified at startup with the -d argument
+;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
+;php_flag[display_errors] = off
+;php_admin_value[error_log] = /var/log/fpm-php.www.log
+;php_admin_flag[log_errors] = on
+;php_admin_value[memory_limit] = 32M
+php_admin_value[disable_functions] = shell_exec
\ No newline at end of file
diff --git a/vhost.conf b/vhost.conf
deleted file mode 100755
index b2c821d2f..000000000
--- a/vhost.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# conf/vhost.conf
-<VirtualHost *:80>
-	ServerAdmin contact@GaelO.fr
-	DocumentRoot /var/www/html/public
-	Protocols h2 h2c http/1.1
-	LogFormat "%a %v %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" loadbalance_combined
-
-	ErrorLog /dev/stderr
-	CustomLog /dev/stdout loadbalance_combined
-</VirtualHost>
-

From a0ba20b471f656943600a277a9b86b3ad9d61151 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 15:38:21 +0100
Subject: [PATCH 38/72] add build

---
 .github/workflows/publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index fa6401ba9..7e94a358a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - GaelO2
       - GaelO2-dev
+      - php-fpm
     tags:
       - '*'
 

From b3d47a043aafe54f33e266ba9be863b8b701b6e5 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 15:41:47 +0100
Subject: [PATCH 39/72] use bullseye

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d6c1a27cd..6ad5fec3d 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2.13-fpm
+FROM php:8.2.13-fpm-bullseye
 
 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0"
 ENV TZ="UTC"

From d164478ec70e4fd03d4605b1209a8c7e23d6b01d Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 15:42:16 +0100
Subject: [PATCH 40/72] remove duplicate copy

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6ad5fec3d..0ba5f1459 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,8 +34,6 @@ RUN docker-php-ext-configure opcache --enable-opcache \
 
 RUN docker-php-ext-enable redis memcached pcov
 
-COPY php.ini "$PHP_INI_DIR/php.ini"
-
 RUN curl -s https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
 
 # Copy configuration files.

From ca168b83499fcb46bccb435439333831404ac5e9 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 15:43:06 +0100
Subject: [PATCH 41/72] typo

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0ba5f1459..dcba484f0 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ENV TZ="UTC"
 
 RUN apt-get update -qy && \
     apt-get install -y --no-install-recommends apt-utils\
-    ngnix \
+    nginx \
     git \
     cron \
     nano \

From 50d367dc22cbfb9f093e647f7438b0c319e70f59 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 15:45:37 +0100
Subject: [PATCH 42/72] add permissions

---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index dcba484f0..836924644 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,4 +59,8 @@ RUN chmod u+x /usr/local/bin/start
 
 EXPOSE 80
 
+# Adjust user permission & group
+RUN usermod --uid 1000 www-data
+RUN groupmod --gid 1001 www-data
+
 ENTRYPOINT ["/usr/local/bin/start"]

From eed46aea8dbfba96a60f31e8306c5fe53252be90 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 15:52:38 +0100
Subject: [PATCH 43/72] timeout

---
 nginx.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index 8d6cd0e44..dee33f51c 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -8,6 +8,9 @@ events {
 http {
     keepalive_timeout 3600;
     keepalive_requests 5000;
+    proxy_read_timeout 3600;
+    proxy_connect_timeout 3600;
+    proxy_send_timeout 3600;
 
     client_max_body_size 32m;
     client_body_buffer_size 32m;
@@ -37,7 +40,6 @@ http {
 
     server {
         listen 80;
-        timeout 3600;
         server_name localhost;
         server_tokens off;
         add_header X-Content-Type-Options "nosniff" always;

From 8982c71c0ab4ad2a682b74eacb3aedaf0191ee08 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 16:01:31 +0100
Subject: [PATCH 44/72] fix path

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 836924644..7c0219ac0 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,7 +41,7 @@ COPY php.ini "$PHP_INI_DIR/php.ini"
 COPY php-fpm.conf /usr/local/etc/php-fpm.d/www.conf
 COPY nginx.conf /etc/nginx/nginx.conf
 
-ENV APP_HOME /var/www/html
+ENV APP_HOME /var/www
 ENV COMPOSER_ALLOW_SUPERUSER=1
 
 WORKDIR $APP_HOME

From 8edfadd3c8dd5f2cbcba3b4015fb7dce76aeec9b Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 16:08:23 +0100
Subject: [PATCH 45/72] fix container

---
 crontab             | 2 +-
 docker_start.sh     | 6 +++---
 laravel-worker.conf | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crontab b/crontab
index e4abd3b47..062358cae 100755
--- a/crontab
+++ b/crontab
@@ -11,4 +11,4 @@
 # For more information see the manual pages of crontab(5) and cron(8)
 # 
 # m h  dom mon dow   command
-* * * * * cd /var/www/html && php artisan schedule:run >> /dev/null 2>&1
+* * * * * cd /var/www && php artisan schedule:run >> /dev/null 2>&1
diff --git a/docker_start.sh b/docker_start.sh
index 9f2adfad3..85c05c430 100644
--- a/docker_start.sh
+++ b/docker_start.sh
@@ -8,18 +8,18 @@ seed=${SEED:-false}
 
 if [ "$migrate" = "true" ]; then
     echo "Migration..."
-    (cd /var/www/html && php artisan migrate --force)
+    (cd /var/www && php artisan migrate --force)
 fi
 
 if [ "$seed" = "true" ]; then
     echo "Seeding..."
-    (cd /var/www/html && php artisan db:seed && php artisan db:seed --class=Database\\Seeders\\Studies\\TestSeeder )
+    (cd /var/www && php artisan db:seed && php artisan db:seed --class=Database\\Seeders\\Studies\\TestSeeder )
 fi
 
 #only the app container with production settings will set the cache (ideally in redis)
 if [ "$env" = "production" ] && [ "$role" = "app" ]; then
     echo "Caching configuration..."
-    (cd /var/www/html && php artisan config:cache && php artisan route:cache && php artisan view:cache)
+    (cd /var/www && php artisan config:cache && php artisan route:cache && php artisan view:cache)
 fi
 
 if [ "$role" = "app" ]; then
diff --git a/laravel-worker.conf b/laravel-worker.conf
index ad2fdccd3..3b96eaa1c 100644
--- a/laravel-worker.conf
+++ b/laravel-worker.conf
@@ -12,7 +12,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 
 [program:laravel-worker]
 process_name=%(program_name)s_%(process_num)02d
-command=php /var/www/html/artisan queue:work --tries=3 --sleep=3 --max-time=3600 --queue=default,processing
+command=php /var/www/artisan queue:work --tries=3 --sleep=3 --max-time=3600 --queue=default,processing
 autostart=true
 autorestart=true
 stopasgroup=true

From e834b6e8b54bc01477668aec29990308a282b7da Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 16:16:29 +0100
Subject: [PATCH 46/72] ci

---
 .github/workflows/publish.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7e94a358a..fa6401ba9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -5,7 +5,6 @@ on:
     branches:
       - GaelO2
       - GaelO2-dev
-      - php-fpm
     tags:
       - '*'
 

From 0626ee1eb54aacff7b577a4f8e11bb4e8dd8e80e Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 21:14:22 +0100
Subject: [PATCH 47/72] stdout log

---
 nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx.conf b/nginx.conf
index dee33f51c..3d982f59f 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -48,8 +48,8 @@ http {
         root /var/www/public;
         index index.php;
 
-        error_log /var/log/nginx/error.log;
-        access_log /var/log/nginx/access.log;
+        access_log /dev/stdout;
+        error_log /dev/stdout info;
 
         include /etc/nginx/mime.types;
 

From 5d936ba11390b31b1d01a7ef34d11b943b7198d9 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 22:22:27 +0100
Subject: [PATCH 48/72] log verbosity

---
 nginx.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nginx.conf b/nginx.conf
index 3d982f59f..abf2932be 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -6,6 +6,11 @@ events {
 }
 
 http {
+
+    log_format compression '$remote_addr - $remote_user [$time_local] '
+                        '"$request" $status $body_bytes_sent '
+                        '"$http_referer" "$http_user_agent" "$gzip_ratio"';
+
     keepalive_timeout 3600;
     keepalive_requests 5000;
     proxy_read_timeout 3600;

From 213a0627f0711427932cccb5bfede4a4c3918ca0 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 22:48:47 +0100
Subject: [PATCH 49/72] stderr and php ini

---
 Dockerfile | 2 +-
 nginx.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7c0219ac0..a1176937d 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN docker-php-ext-enable redis memcached pcov
 RUN curl -s https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
 
 # Copy configuration files.
-COPY php.ini "$PHP_INI_DIR/php.ini"
+COPY php.ini /usr/local/etc/php/php.ini
 COPY php-fpm.conf /usr/local/etc/php-fpm.d/www.conf
 COPY nginx.conf /etc/nginx/nginx.conf
 
diff --git a/nginx.conf b/nginx.conf
index abf2932be..b70c8693a 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -54,7 +54,7 @@ http {
         index index.php;
 
         access_log /dev/stdout;
-        error_log /dev/stdout info;
+        error_log /dev/stderr info;
 
         include /etc/nginx/mime.types;
 

From bee07d1ce3c0eaf30d07969f27b8dd8d0f2108ab Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 23:46:02 +0100
Subject: [PATCH 50/72] add curl extension

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a1176937d..2ba6e7f5a 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,7 +28,7 @@ RUN apt-get update -qy && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN pecl install pcov redis memcached
-RUN docker-php-ext-install gd zip pdo pdo_mysql pdo_pgsql mbstring bcmath ctype fileinfo xml bz2 pcntl
+RUN docker-php-ext-install gd zip pdo pdo_mysql pdo_pgsql mbstring bcmath ctype fileinfo xml bz2 pcntl curl
 RUN docker-php-ext-configure opcache --enable-opcache \
     && docker-php-ext-install opcache
 

From 70bf248a6d050eb8c40cbc049d07cf702ea3f8f1 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sun, 4 Feb 2024 23:52:04 +0100
Subject: [PATCH 51/72] add lib curl

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 2ba6e7f5a..669aaf746 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,8 @@ RUN apt-get update -qy && \
     libbz2-dev \
     libmcrypt-dev \
     libxml2-dev \
+    libcurl4 \
+    libcurl4-openssl-dev \
     openssl \
     sqlite3 \
     supervisor \

From dd950927545be83a9d5cf5ae5aec16890900f7d8 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Mon, 5 Feb 2024 00:11:23 +0100
Subject: [PATCH 52/72] try fix permissions

---
 Dockerfile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 669aaf746..d8e91e40c 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,7 @@ RUN apt-get update -qy && \
     libbz2-dev \
     libmcrypt-dev \
     libxml2-dev \
-    libcurl4 \
-    libcurl4-openssl-dev \
+    libcurl4-gnutls-dev \
     openssl \
     sqlite3 \
     supervisor \
@@ -59,10 +58,17 @@ RUN composer install --optimize-autoloader --no-interaction
 COPY docker_start.sh /usr/local/bin/start
 RUN chmod u+x /usr/local/bin/start
 
-EXPOSE 80
+# Set correct permission.
+RUN chmod -R 755 /var/www/storage
+RUN chmod -R 755 /var/www/storage/logs
+RUN chmod -R 755 /var/www/storage/framework
+RUN chmod -R 755 /var/www/storage/framework/sessions
+RUN chmod -R 755 /var/www/bootstrap
 
 # Adjust user permission & group
 RUN usermod --uid 1000 www-data
 RUN groupmod --gid 1001 www-data
 
+EXPOSE 80
+
 ENTRYPOINT ["/usr/local/bin/start"]

From 7e62b5e0ebd4e2ce7eb943a0c4aabba532975e40 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Tue, 6 Feb 2024 22:46:21 +0100
Subject: [PATCH 53/72] log dicom web api

---
 .../UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php b/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php
index 00cf746f9..10c2b080b 100644
--- a/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php
+++ b/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php
@@ -9,6 +9,7 @@
 use App\GaelO\Interfaces\Adapters\HttpClientInterface;
 use App\GaelO\Services\AuthorizationService\AuthorizationDicomWebService;
 use Exception;
+use Illuminate\Support\Facades\Log;
 
 class ReverseProxyDicomWeb
 {
@@ -59,7 +60,8 @@ public function execute(ReverseProxyDicomWebRequest $reverseProxyDicomWebRequest
             }
 
             $headers['Forwarded'] = [$forwardedRule];
-
+            Log::info($headers);
+            Log::info($calledUrl);
             $response = $this->httpClientInterface->rawRequest('GET', $calledUrl, null, $headers);
 
             $responseHeaders  = $response->getHeaders();

From 0df35a4967bfb85300cd52ea2802561dcdce1ac7 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Tue, 6 Feb 2024 23:07:32 +0100
Subject: [PATCH 54/72] try run as www-data

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index d8e91e40c..b2ef9eeae 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,6 +63,7 @@ RUN chmod -R 755 /var/www/storage
 RUN chmod -R 755 /var/www/storage/logs
 RUN chmod -R 755 /var/www/storage/framework
 RUN chmod -R 755 /var/www/storage/framework/sessions
+RUN chmod -R 755 /var/www/storage/framework/views
 RUN chmod -R 755 /var/www/bootstrap
 
 # Adjust user permission & group
@@ -71,4 +72,5 @@ RUN groupmod --gid 1001 www-data
 
 EXPOSE 80
 
+USER www-data
 ENTRYPOINT ["/usr/local/bin/start"]

From 7aa07d651eae9fd934df372cd15a00be8f6480b6 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Tue, 6 Feb 2024 23:22:11 +0100
Subject: [PATCH 55/72] new try

---
 Dockerfile      | 1 -
 docker_start.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b2ef9eeae..19d62139b 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -72,5 +72,4 @@ RUN groupmod --gid 1001 www-data
 
 EXPOSE 80
 
-USER www-data
 ENTRYPOINT ["/usr/local/bin/start"]
diff --git a/docker_start.sh b/docker_start.sh
index 85c05c430..4aa67f405 100644
--- a/docker_start.sh
+++ b/docker_start.sh
@@ -19,7 +19,7 @@ fi
 #only the app container with production settings will set the cache (ideally in redis)
 if [ "$env" = "production" ] && [ "$role" = "app" ]; then
     echo "Caching configuration..."
-    (cd /var/www && php artisan config:cache && php artisan route:cache && php artisan view:cache)
+    (cd /var/www && sudo -u www-data php artisan config:cache && sudo -u www-data php artisan route:cache && sudo -u www-data php artisan view:cache)
 fi
 
 if [ "$role" = "app" ]; then

From 9de8caa168d576418c62d972cee2d77bb6e86c48 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Tue, 6 Feb 2024 23:43:40 +0100
Subject: [PATCH 56/72] try

---
 Dockerfile      | 2 --
 docker_start.sh | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 19d62139b..32719dbf1 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,8 +62,6 @@ RUN chmod u+x /usr/local/bin/start
 RUN chmod -R 755 /var/www/storage
 RUN chmod -R 755 /var/www/storage/logs
 RUN chmod -R 755 /var/www/storage/framework
-RUN chmod -R 755 /var/www/storage/framework/sessions
-RUN chmod -R 755 /var/www/storage/framework/views
 RUN chmod -R 755 /var/www/bootstrap
 
 # Adjust user permission & group
diff --git a/docker_start.sh b/docker_start.sh
index 4aa67f405..68b9d84b5 100644
--- a/docker_start.sh
+++ b/docker_start.sh
@@ -19,7 +19,9 @@ fi
 #only the app container with production settings will set the cache (ideally in redis)
 if [ "$env" = "production" ] && [ "$role" = "app" ]; then
     echo "Caching configuration..."
-    (cd /var/www && sudo -u www-data php artisan config:cache && sudo -u www-data php artisan route:cache && sudo -u www-data php artisan view:cache)
+    (cd /var/www && php artisan config:cache && php artisan route:cache && php artisan view:cache)
+    #in case cache is in file
+    chmod -R 755 /var/www/storage/framework
 fi
 
 if [ "$role" = "app" ]; then

From 7b3da36155a996ed472238fa0ed6efef70190214 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Tue, 6 Feb 2024 23:58:33 +0100
Subject: [PATCH 57/72] try fix dicom web

---
 .../UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php b/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php
index 10c2b080b..da048c171 100644
--- a/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php
+++ b/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php
@@ -60,6 +60,9 @@ public function execute(ReverseProxyDicomWebRequest $reverseProxyDicomWebRequest
             }
 
             $headers['Forwarded'] = [$forwardedRule];
+            unset($headers["authorization"]);
+            unset($headers["content-length"]);
+            unset($headers["content-type"]);
             Log::info($headers);
             Log::info($calledUrl);
             $response = $this->httpClientInterface->rawRequest('GET', $calledUrl, null, $headers);

From c7262864ee8a1b54cf0032bb3f21e85992b2e678 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Wed, 7 Feb 2024 00:07:56 +0100
Subject: [PATCH 58/72] fix DicomWeb API

---
 .../UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php b/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php
index da048c171..c53756a6d 100644
--- a/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php
+++ b/GaelO2/app/GaelO/UseCases/ReverseProxyDicomWeb/ReverseProxyDicomWeb.php
@@ -9,7 +9,6 @@
 use App\GaelO\Interfaces\Adapters\HttpClientInterface;
 use App\GaelO\Services\AuthorizationService\AuthorizationDicomWebService;
 use Exception;
-use Illuminate\Support\Facades\Log;
 
 class ReverseProxyDicomWeb
 {
@@ -63,8 +62,6 @@ public function execute(ReverseProxyDicomWebRequest $reverseProxyDicomWebRequest
             unset($headers["authorization"]);
             unset($headers["content-length"]);
             unset($headers["content-type"]);
-            Log::info($headers);
-            Log::info($calledUrl);
             $response = $this->httpClientInterface->rawRequest('GET', $calledUrl, null, $headers);
 
             $responseHeaders  = $response->getHeaders();

From 71bf66f3f71ceda1eb5a598b7aa20904c30f164f Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Wed, 7 Feb 2024 00:28:32 +0100
Subject: [PATCH 59/72] fix timeout

---
 nginx.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index b70c8693a..f6ced58a4 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -10,9 +10,10 @@ http {
     log_format compression '$remote_addr - $remote_user [$time_local] '
                         '"$request" $status $body_bytes_sent '
                         '"$http_referer" "$http_user_agent" "$gzip_ratio"';
+    keepalive_requests 5000;
 
     keepalive_timeout 3600;
-    keepalive_requests 5000;
+    send_timeout 3600;
     proxy_read_timeout 3600;
     proxy_connect_timeout 3600;
     proxy_send_timeout 3600;

From 8ed835eb27d6a7258481253bb7f7f63722f2b358 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Wed, 7 Feb 2024 00:52:53 +0100
Subject: [PATCH 60/72] cgi timeout

---
 nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nginx.conf b/nginx.conf
index f6ced58a4..b35c0e9ae 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -68,6 +68,7 @@ http {
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             fastcgi_param SCRIPT_NAME $fastcgi_script_name;
+            fastcgi_read_timeout 3600s;
             include fastcgi_params;
         }
     }

From 1f7edbbe95650ec9f95c85617068474f50ec796c Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Wed, 7 Feb 2024 21:29:08 +0100
Subject: [PATCH 61/72] spearate worker for queue

---
 laravel-worker.conf | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/laravel-worker.conf b/laravel-worker.conf
index 3b96eaa1c..f72962e7b 100644
--- a/laravel-worker.conf
+++ b/laravel-worker.conf
@@ -10,9 +10,9 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 [supervisorctl]
 serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 
-[program:laravel-worker]
+[program:default-queue-worker]
 process_name=%(program_name)s_%(process_num)02d
-command=php /var/www/artisan queue:work --tries=3 --sleep=3 --max-time=3600 --queue=default,processing
+command=php /var/www/artisan queue:work --tries=3 --sleep=3 --max-time=3600 --queue=default
 autostart=true
 autorestart=true
 stopasgroup=true
@@ -22,4 +22,18 @@ numprocs=4
 redirect_stderr=true
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
+stopwaitsecs=3600
+
+[program:processing-queue-worker]
+process_name=%(program_name)s_%(process_num)02d
+command=php /var/www/artisan queue:work --tries=3 --sleep=3 --max-time=3600 --queue=processing
+autostart=true
+autorestart=true
+stopasgroup=true
+killasgroup=true
+user=root
+numprocs=1
+redirect_stderr=true
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
 stopwaitsecs=3600
\ No newline at end of file

From 973947dd1fe7605a990c759431ce809e883a714b Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sat, 10 Feb 2024 00:43:16 +0100
Subject: [PATCH 62/72] try fix denied

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 32719dbf1..d8e91e40c 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,6 +62,7 @@ RUN chmod u+x /usr/local/bin/start
 RUN chmod -R 755 /var/www/storage
 RUN chmod -R 755 /var/www/storage/logs
 RUN chmod -R 755 /var/www/storage/framework
+RUN chmod -R 755 /var/www/storage/framework/sessions
 RUN chmod -R 755 /var/www/bootstrap
 
 # Adjust user permission & group

From 126507757435ceb605e4a869b2102239c2de1757 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sat, 10 Feb 2024 00:59:55 +0100
Subject: [PATCH 63/72] add chown

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d8e91e40c..c13a8e909 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,9 +62,10 @@ RUN chmod u+x /usr/local/bin/start
 RUN chmod -R 755 /var/www/storage
 RUN chmod -R 755 /var/www/storage/logs
 RUN chmod -R 755 /var/www/storage/framework
-RUN chmod -R 755 /var/www/storage/framework/sessions
 RUN chmod -R 755 /var/www/bootstrap
 
+RUN chown -R www-data:www-data /var/www/storage
+
 # Adjust user permission & group
 RUN usermod --uid 1000 www-data
 RUN groupmod --gid 1001 www-data

From 17878f70e7bb75aa418433733a3907f1c12c028b Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sat, 10 Feb 2024 01:15:50 +0100
Subject: [PATCH 64/72] ls

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c13a8e909..0c09a3b4a 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,7 +64,7 @@ RUN chmod -R 755 /var/www/storage/logs
 RUN chmod -R 755 /var/www/storage/framework
 RUN chmod -R 755 /var/www/bootstrap
 
-RUN chown -R www-data:www-data /var/www/storage
+RUN ls -l
 
 # Adjust user permission & group
 RUN usermod --uid 1000 www-data

From ecfa9c8074f7836619c2220b2e86c6605cbacdbb Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sat, 10 Feb 2024 01:31:19 +0100
Subject: [PATCH 65/72] revert

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0c09a3b4a..32719dbf1 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,8 +64,6 @@ RUN chmod -R 755 /var/www/storage/logs
 RUN chmod -R 755 /var/www/storage/framework
 RUN chmod -R 755 /var/www/bootstrap
 
-RUN ls -l
-
 # Adjust user permission & group
 RUN usermod --uid 1000 www-data
 RUN groupmod --gid 1001 www-data

From 7f645a68eff93897dc378a8fbe0f35a250e21ac5 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Sun, 11 Feb 2024 15:49:58 +0100
Subject: [PATCH 66/72] try new dockerfile permission

---
 Dockerfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 32719dbf1..9c75244e2 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1
 WORKDIR $APP_HOME
 
 COPY docker_start.sh /usr/local/bin/start
-COPY --chown=www-data:www-data GaelO2 .
+COPY GaelO2 .
 COPY laravel-worker.conf /etc/supervisor/conf.d
 
 RUN mv .env.example .env
@@ -58,15 +58,17 @@ RUN composer install --optimize-autoloader --no-interaction
 COPY docker_start.sh /usr/local/bin/start
 RUN chmod u+x /usr/local/bin/start
 
+# Adjust user permission & group
+#RUN usermod --uid 1000 www-data
+#RUN groupmod --gid 1001 www-data
+
 # Set correct permission.
+RUN chown -R www-data:www-data $APP_HOME
 RUN chmod -R 755 /var/www/storage
-RUN chmod -R 755 /var/www/storage/logs
-RUN chmod -R 755 /var/www/storage/framework
 RUN chmod -R 755 /var/www/bootstrap
 
-# Adjust user permission & group
-RUN usermod --uid 1000 www-data
-RUN groupmod --gid 1001 www-data
+# Change current user to www-data
+USER www-data
 
 EXPOSE 80
 

From d7bec1d51a761322826fd7a8363f96d54b849d95 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Sun, 11 Feb 2024 16:20:12 +0100
Subject: [PATCH 67/72] try

---
 Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9c75244e2..43d49a73c 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -67,9 +67,6 @@ RUN chown -R www-data:www-data $APP_HOME
 RUN chmod -R 755 /var/www/storage
 RUN chmod -R 755 /var/www/bootstrap
 
-# Change current user to www-data
-USER www-data
-
 EXPOSE 80
 
 ENTRYPOINT ["/usr/local/bin/start"]

From 96974ca89577b48f78718baecefac016c2dd0ef6 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Sun, 11 Feb 2024 16:25:25 +0100
Subject: [PATCH 68/72] re add users

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 43d49a73c..3ca770c02 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,8 +59,8 @@ COPY docker_start.sh /usr/local/bin/start
 RUN chmod u+x /usr/local/bin/start
 
 # Adjust user permission & group
-#RUN usermod --uid 1000 www-data
-#RUN groupmod --gid 1001 www-data
+RUN usermod --uid 1000 www-data
+RUN groupmod --gid 1001 www-data
 
 # Set correct permission.
 RUN chown -R www-data:www-data $APP_HOME

From 0e5dbb413f0fa6e4a7e4d4d524294f8ab5f40c3a Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Tue, 13 Feb 2024 14:54:14 +0100
Subject: [PATCH 69/72] upgrade container php

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3ca770c02..35b257976 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2.13-fpm-bullseye
+FROM php:8.3.2-fpm-bullseye
 
 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0"
 ENV TZ="UTC"

From 88300aa8086d9ef9b6476e63ba72b7cb753d2b90 Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Tue, 13 Feb 2024 14:56:13 +0100
Subject: [PATCH 70/72] upgrade testing to php 8.3

---
 .github/workflows/php-stan.yml | 2 +-
 .github/workflows/tests.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
index 74e407b47..aeccee0c1 100644
--- a/.github/workflows/php-stan.yml
+++ b/.github/workflows/php-stan.yml
@@ -19,7 +19,7 @@ jobs:
       - name: 'Setup PHP'
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
 
       - name: 'Copy .env'
         working-directory: ./GaelO2
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b3a7a23e2..3852e4d36 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,7 +20,7 @@ jobs:
       - name: 'Setup PHP'
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
 
       - name: 'Copy .env'
         working-directory: ./GaelO2

From dd96249c8341458f6540cd73b1645e99f3f7bf6a Mon Sep 17 00:00:00 2001
From: salim kanoun <salim.kanoun@gmail.Com>
Date: Tue, 13 Feb 2024 15:02:12 +0100
Subject: [PATCH 71/72] add php ftp extension

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 35b257976..2ffee4adf 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update -qy && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN pecl install pcov redis memcached
-RUN docker-php-ext-install gd zip pdo pdo_mysql pdo_pgsql mbstring bcmath ctype fileinfo xml bz2 pcntl curl
+RUN docker-php-ext-install gd zip pdo pdo_mysql pdo_pgsql mbstring bcmath ctype fileinfo xml bz2 pcntl curl ftp
 RUN docker-php-ext-configure opcache --enable-opcache \
     && docker-php-ext-install opcache
 

From 926ee8588fa8ac5c31ab1617240383eb9296a9a2 Mon Sep 17 00:00:00 2001
From: Salim Kanoun <salim.kanoun@gmail.com>
Date: Sat, 17 Feb 2024 20:17:31 +0100
Subject: [PATCH 72/72] update version to 2.5.0

---
 GaelO2/config/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GaelO2/config/app.php b/GaelO2/config/app.php
index 14aadf88c..74734c8ec 100644
--- a/GaelO2/config/app.php
+++ b/GaelO2/config/app.php
@@ -25,7 +25,7 @@
     | or any other location as required by the application or its packages.
     */
 
-    'version' => '2.4.0',
+    'version' => '2.5.0',
 
     /*
     |--------------------------------------------------------------------------