storing project file with original name (#7)

* storing project file with original name * github workflows * file_name in resource --------- Co-authored-by: dawid.miklas <dawid.miklas@escolasoft.com>
EscolaLMS · Jun 26, 2023 · 5f6df6d · 5f6df6d
1 parent cc993a3
commit 5f6df6d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
 
     services:
       mysql:
-        image: mariadb
+        image: mysql:5.7
         env:
           MYSQL_ROOT_PASSWORD: root
           MYSQL_DATABASE: database
@@ -58,7 +58,7 @@ jobs:
 
     services:
       mysql:
-        image: mariadb
+        image: mysql:5.7
         env:
           MYSQL_ROOT_PASSWORD: root
           MYSQL_DATABASE: database

diff --git a/src/Http/Resources/ProjectSolutionResource.php b/src/Http/Resources/ProjectSolutionResource.php
@@ -50,6 +50,7 @@ public function toArray($request): array
             'id' => $this->getKey(),
             'created_at' => $this->created_at,
             'file_url' => Storage::url($this->path),
+            'file_name' => basename($this->path),
             'topic_id' => $this->topic_id,
             'user_id' => $this->user_id,
         ];

diff --git a/src/Services/ProjectSolutionService.php b/src/Services/ProjectSolutionService.php
@@ -40,7 +40,10 @@ public function findAllByUser(CriteriaDto $criteriaDto, PageDto $pageDto, int $u
 
     public function create(CreateProjectSolutionDto $dto): ProjectSolution
     {
-        $path = $dto->getFile()->storePublicly(self::DIR . DIRECTORY_SEPARATOR . $dto->getTopicId() . DIRECTORY_SEPARATOR . $dto->getUserId());
+        $path = $dto->getFile()->storeAs(
+            self::DIR . DIRECTORY_SEPARATOR . $dto->getTopicId() . DIRECTORY_SEPARATOR . $dto->getUserId(),
+            $dto->getFile()->getClientOriginalName(),
+        );
 
         /** @var ProjectSolution $projectSolution */
         $projectSolution = $this->projectSolutionRepository->create(array_merge($dto->toArray(), [

diff --git a/tests/Api/ProjectSolutionCreateApiTest.php b/tests/Api/ProjectSolutionCreateApiTest.php
@@ -16,6 +16,7 @@
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 class ProjectSolutionCreateApiTest extends TestCase
 {
@@ -69,12 +70,20 @@ public function testCreateProjectSolution(): void
         $student = $this->makeStudent();
         $this->course->users()->sync($student);
 
-        $this->actingAs($student, 'api')
+        $response = $this->actingAs($student, 'api')
             ->postJson('api/topic-project-solutions', [
                 'topic_id' => $this->topic->getKey(),
                 'file' => UploadedFile::fake()->create('solution.zip'),
-            ])
-            ->assertCreated();
+            ]);
+
+        $response
+            ->assertCreated()
+            ->assertJsonFragment([
+                'file_name' => 'solution.zip',
+            ]);
+
+        $this->assertTrue(Str::contains($response->json('data.file_url'), 'solution.zip'));
+
 
         /** @var ProjectSolution $solution */
         $solution = ProjectSolution::query()->latest()->first();