adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-06-15 13:32:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed storage env

Browse Source
This commit is contained in:
Constantin Graf
2024-05-27 15:17:37 +02:00
parent 1a610412dc
commit 7af77c9357
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Service/Import/ImportService.php
View File

@@ -24,7 +24,8 @@ class ImportService
/** @var ImporterContract $importer */ /** @var ImporterContract $importer */
$importer = app(ImporterProvider::class)->getImporter($importerType); $importer = app(ImporterProvider::class)->getImporter($importerType);
$importer->init($organization); $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) { DB::transaction(function () use (&$importer, &$data) {
$importer->importData($data); $importer->importData($data);

2
config/jetstream.php
View File

@@ -77,6 +77,6 @@ return [
| |
*/ */
'profile_photo_disk' => env('PROFILE_PHOTO_DISK', 's3'), 'profile_photo_disk' => env('PROFILE_PHOTO_DISK', env('PUBLIC_FILESYSTEM_DISK', 'public')),
]; ];

5
config/logging.php
View File

@@ -67,6 +67,11 @@ return [
'replace_placeholders' => true, 'replace_placeholders' => true,
], ],
'stderr_daily' => [
'driver' => 'stack',
'channels' => ['stderr', 'daily'],
],
'stack_production' => [ 'stack_production' => [
'driver' => 'stack', 'driver' => 'stack',
'channels' => ['stderr', 'sentry'], 'channels' => ['stderr', 'sentry'],

2
tests/Unit/Service/Import/ImportServiceTest.php
View File

@@ -17,7 +17,7 @@ class ImportServiceTest extends TestCase
public function test_import_gets_importer_from_provider_runs_importer_and_returns_report(): void public function test_import_gets_importer_from_provider_runs_importer_and_returns_report(): void
{ {
// Arrange // Arrange
Storage::fake('s3'); Storage::fake(config('filesystems.default'));
$organization = Organization::factory()->create(); $organization = Organization::factory()->create();
$data = file_get_contents(storage_path('tests/toggl_time_entries_import_test_1.csv')); $data = file_get_contents(storage_path('tests/toggl_time_entries_import_test_1.csv'));