Fixed storage env

solidtime-io · May 27, 2024 · 7af77c9 · 7af77c9
1 parent 1a61041
commit 7af77c9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/app/Service/Import/ImportService.php b/app/Service/Import/ImportService.php
@@ -24,7 +24,8 @@ public function import(Organization $organization, string $importerType, string
         /** @var ImporterContract $importer */
         $importer = app(ImporterProvider::class)->getImporter($importerType);
         $importer->init($organization);
-        Storage::disk('s3')->put('import/'.Carbon::now()->toDateString().'-'.$organization->getKey().'-'.Str::uuid(), $data);
+        Storage::disk(config('filesystems.default'))
+            ->put('import/'.Carbon::now()->toDateString().'-'.$organization->getKey().'-'.Str::uuid(), $data);
 
         DB::transaction(function () use (&$importer, &$data) {
             $importer->importData($data);

diff --git a/config/jetstream.php b/config/jetstream.php
@@ -77,6 +77,6 @@
     |
     */
 
-    'profile_photo_disk' => env('PROFILE_PHOTO_DISK', 's3'),
+    'profile_photo_disk' => env('PROFILE_PHOTO_DISK', env('PUBLIC_FILESYSTEM_DISK', 'public')),
 
 ];
diff --git a/config/logging.php b/config/logging.php
@@ -67,6 +67,11 @@
             'replace_placeholders' => true,
         ],
 
+        'stderr_daily' => [
+            'driver' => 'stack',
+            'channels' => ['stderr', 'daily'],
+        ],
+
         'stack_production' => [
             'driver' => 'stack',
             'channels' => ['stderr', 'sentry'],

diff --git a/tests/Unit/Service/Import/ImportServiceTest.php b/tests/Unit/Service/Import/ImportServiceTest.php
@@ -17,7 +17,7 @@ class ImportServiceTest extends TestCase
     public function test_import_gets_importer_from_provider_runs_importer_and_returns_report(): void
     {
         // Arrange
-        Storage::fake('s3');
+        Storage::fake(config('filesystems.default'));
         $organization = Organization::factory()->create();
         $data = file_get_contents(storage_path('tests/toggl_time_entries_import_test_1.csv'));
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,6 +77,6 @@ @@
         |
         */
-        'profile_photo_disk' => env('PROFILE_PHOTO_DISK', 's3'),
+        'profile_photo_disk' => env('PROFILE_PHOTO_DISK', env('PUBLIC_FILESYSTEM_DISK', 'public')),
     ];