Merge pull request #115 from EscolaLMS/bugfix/fix-screen-directory

Fix screen directory
EscolaLMS · Oct 29, 2024 · 75376c3 · 75376c3
2 parents cf6cbf9 + c13c64e
commit 75376c3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/Dto/ConsultationDto.php b/src/Dto/ConsultationDto.php
@@ -38,7 +38,7 @@ public function toArray($filters = false): array
     public function getImagePath()
     {
         if ($this->imagePath !== false) {
-            return $this->imagePath === null ? '' : Str::after($this->imagePath, env('AWS_ACCESS_KEY_ID') . '/');
+            return $this->imagePath === null ? '' : Str::after($this->imagePath, Str::after(env('AWS_URL'), 'https://') . '/');
         }
         return false;
     }
@@ -47,7 +47,7 @@ public function getLogotypePath()
     {
         if ($this->logotypePath !== false) {
             if ($this->logotypePath) {
-                $logotypePath = Str::after($this->logotypePath, env('AWS_ACCESS_KEY_ID') . '/');
+                $logotypePath = Str::after($this->logotypePath, Str::after(env('AWS_URL'), 'https://') . '/');
                 return Str::startsWith($logotypePath, ConstantEnum::DIRECTORY) ? $logotypePath : ConstantEnum::DIRECTORY . '/' .$logotypePath;
             }
             return '';
@@ -60,7 +60,8 @@ protected function setProposedTerms(array $proposedTerms): void
         $result = [];
         foreach ($proposedTerms as $term) {
             if (is_int($term)) {
-                $date = Carbon::parse((string) ($term/1000));
+                // @phpstan-ignore-next-line
+                $date = Carbon::parse($term / 1000);
             } else {
                 $date = Carbon::parse($term);
             }

diff --git a/src/Services/ConsultationService.php b/src/Services/ConsultationService.php
@@ -514,7 +514,7 @@ public function saveScreen(ConsultationSaveScreenDto $dto): void
 
         $termin = Carbon::make($consultationUser->executed_at);
         // consultation_id/term_start_timestamp/user_id/timestamp.jpg
-        $folder = "consultations/{$dto->getConsultationId()}/{$termin->getTimestamp()}/{$user->getKey()}";
+        $folder = ConstantEnum::DIRECTORY . "/{$dto->getConsultationId()}/{$termin->getTimestamp()}/{$user->getKey()}";
 
         $extension = $dto->getFile() instanceof UploadedFile ? $dto->getFile()->getClientOriginalExtension() : Str::between($dto->getFile(), 'data:image/', ';base64');
         Storage::putFileAs($folder, $dto->getFile(), Carbon::make($dto->getTimestamp())->getTimestamp() . '.' . $extension);

diff --git a/tests/APIs/ConsultationApiTest.php b/tests/APIs/ConsultationApiTest.php
@@ -7,6 +7,7 @@
 use EscolaLms\Auth\Services\Contracts\UserServiceContract;
 use EscolaLms\Categories\Models\Category;
 use EscolaLms\Consultations\Database\Seeders\ConsultationsPermissionSeeder;
+use EscolaLms\Consultations\Enum\ConstantEnum;
 use EscolaLms\Consultations\Enum\ConsultationsPermissionsEnum;
 use EscolaLms\Consultations\Enum\ConsultationStatusEnum;
 use EscolaLms\Consultations\Enum\ConsultationTermStatusEnum;
@@ -241,7 +242,7 @@ public function testConsultationSaveScreen(): void
 
         $term = Carbon::make($consultationUser->executed_at);
         // consultation_id/term_start_timestamp/user_id/timestamp.jpg
-        Storage::assertExists("consultations/{$consultation->getKey()}/{$term->getTimestamp()}/{$student->getKey()}/{$time->getTimestamp()}.jpg");
+        Storage::assertExists(ConstantEnum::DIRECTORY . "/{$consultation->getKey()}/{$term->getTimestamp()}/{$student->getKey()}/{$time->getTimestamp()}.jpg");
 
         $this->response = $this->json('POST', '/api/consultations/save-screen', [
             'consultation_id' => $consultation->getKey(),