WIP

Author: salimkanoun

GaelO2/app/GaelO/Adapters/HttpClientAdapter.php

@@ -7,6 +7,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Pool;
+use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Utils;
 use Illuminate\Support\Facades\Log;
@@ -72,7 +73,7 @@ public function requestUploadArrayDicom(string $method, string $uri, array $file
                     'headers'  => ['content-type' => 'application/dicom', 'Accept' => 'application/json']
                 ];
 
-                $this->client->request($method, $this->address . $uri, $headers, $body);
+                yield new Request($method, $this->address . $uri, $headers, $body);
             }
         };
 

GaelO2/app/GaelO/Adapters/JobAdapter.php

@@ -4,11 +4,17 @@
 
 use App\GaelO\Interfaces\Adapters\JobInterface;
 use App\Jobs\JobQcReport;
+use App\Jobs\JobRadiomicsReport;
 
 class JobAdapter implements JobInterface
 {
     public function sendQcReportJob(int $visitId): void
     {
         JobQcReport::dispatch($visitId);
     }
+
+    public function sendRadiomicsReport(int $visitId): void
+    {
+        JobRadiomicsReport::dispatch($visitId);
+    }
 }

GaelO2/app/GaelO/Interfaces/Adapters/JobInterface.php

@@ -5,4 +5,5 @@
 interface JobInterface
 {
     public function sendQcReportJob(int $visitId) : void;
+    public function sendRadiomicsReport(int $visitId) :void;
 }

GaelO2/app/GaelO/Services/GaelOStudiesService/AbstractGaelOStudy.php

@@ -10,8 +10,8 @@
 
 abstract class AbstractGaelOStudy
 {
-    private MailServices $mailServices;
-    private JobInterface $jobInterface;
+    protected MailServices $mailServices;
+    protected JobInterface $jobInterface;
     protected string $studyName;
 
     public function __construct(MailServices $mailServices, JobInterface $jobInterface)

GaelO2/app/GaelO/Services/SpecificStudiesRules/TEST/TEST.php

@@ -4,6 +4,8 @@
 
 use App\GaelO\Services\GaelOStudiesService\AbstractGaelOStudy;
 use App\GaelO\Services\GaelOStudiesService\DefaultVisitRules;
+use App\GaelO\Services\GaelOStudiesService\Events\AbstractGaelOStudyEvent;
+use App\GaelO\Services\GaelOStudiesService\Events\VisitUploadedEvent;
 
 class TEST extends AbstractGaelOStudy {
 
@@ -79,6 +81,14 @@ public function getVisitRulesClass(string $visitGroupName, string $visitTypeName
 
     }
 
+    public function onEventStudy(AbstractGaelOStudyEvent $studyEvent): void
+    {
+        parent::onEventStudy($studyEvent);
+        if ($studyEvent instanceof VisitUploadedEvent) {
+           $this->jobInterface->sendRadiomicsReport($studyEvent->getVisitId());
+        }
+    }
+
 }
 
 

GaelO2/app/Jobs/JobRadiomicsReport.php

@@ -37,8 +37,6 @@ public function handle(DicomStudyRepositoryInterface $dicomStudyRepositoryInterf
         $orthancIds = $this->getSeriesOrthancIds($dicomStudyEntity);
         $orthancSeriesIdPt = $orthancIds['orthancSeriesIdPt'];
         $orthancSeriesIdCt = $orthancIds['orthancSeriesIdCt'];
-        //$idPT = $gaelOProcessingService->createSeriesFromOrthanc($orthancIds['orthancSeriesIdPt'], true, true);
-        //$idCT = $gaelOProcessingService->createSeriesFromOrthanc($orthancIds['orthancSeriesIdCt']);
 
         $downloadedFilePathPT  = tempnam(ini_get('upload_tmp_dir'), 'TMP_Inference_');
         $orthancService->getZipStreamToFile([$orthancSeriesIdPt], fopen($downloadedFilePathPT, 'r+'));
@@ -112,11 +110,6 @@ private function getSeriesOrthancIds(array $dicomStudyEntity)
             }
         }
 
-        return [
-            'orthancSeriesIdPt' => '40f008c4-18e01723-3bf8793d-5e1d2cfb-af1b3802',
-            'orthancSeriesIdCt' => '8460a711-e055e4b2-1747def1-0db79fdf-f33d2944'
-        ];
-
         return [
             'orthancSeriesIdPt' => $idPT,
             'orthancSeriesIdCt' => $idCT