tbianchini
/
shopit-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(storage): centralize temporary URL generation

This commit is contained in:
ncoronel 2026-09-22 13:54:44 -03:00
parent 90b2784859
commit d9f19b42f1
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Shared/Attachable/Models/Attachment.php
View File

@ -3,12 +3,12 @@
namespace App\Shared\Attachable\Models; namespace App\Shared\Attachable\Models;
use App\Shared\Attachable\Enums\AttachmentType; use App\Shared\Attachable\Enums\AttachmentType;
use App\Shared\Storage\Services\TemporaryUrlService;
use Illuminate\Database\Eloquent\Attributes\Fillable; use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str; use Illuminate\Support\Str;
#[Fillable([ #[Fillable([
@ -70,9 +70,9 @@ class Attachment extends Model
*/ */
public function getTemporaryUrl(int $expiresInMinutes = 10): string public function getTemporaryUrl(int $expiresInMinutes = 10): string
{ {
return Storage::disk('s3')->temporaryUrl( return app(TemporaryUrlService::class)->generate(
$this->path, $this->path,
now()->addMinutes($expiresInMinutes) $expiresInMinutes,
); )['temporary_url'];
} }
} }

16
app/Shared/StorageTest/Services/S3TestService.php
View File

@ -2,6 +2,7 @@
namespace App\Shared\StorageTest\Services; namespace App\Shared\StorageTest\Services;
use App\Shared\Storage\Services\TemporaryUrlService;
use Illuminate\Http\UploadedFile; use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
@ -10,6 +11,10 @@ use RuntimeException;
class S3TestService class S3TestService
{ {
public function __construct(
protected TemporaryUrlService $temporaryUrlService,
) {}
/** /**
* @return array<string, int|string|null> * @return array<string, int|string|null>
*/ */
@ -44,8 +49,7 @@ class S3TestService
'mime_type' => $file->getClientMimeType(), 'mime_type' => $file->getClientMimeType(),
'extension' => $file->extension(), 'extension' => $file->extension(),
'size' => $file->getSize(), 'size' => $file->getSize(),
'temporary_url' => $disk->temporaryUrl($path, now()->addMinutes($expiresInMinutes)), ...$this->temporaryUrlService->generate($path, $expiresInMinutes),
'temporary_url_expires_at' => now()->addMinutes($expiresInMinutes)->toIso8601String(),
]; ];
} }
@ -58,16 +62,10 @@ class S3TestService
'disk' => 's3', 'disk' => 's3',
'key' => $path, 'key' => $path,
'path' => $path, 'path' => $path,
'temporary_url' => $this->temporaryUrlForPath($path, $expiresInMinutes), ...$this->temporaryUrlService->generate($path, $expiresInMinutes),
'temporary_url_expires_at' => now()->addMinutes($expiresInMinutes)->toIso8601String(),
]; ];
} }
protected function temporaryUrlForPath(string $path, int $expiresInMinutes): string
{
return Storage::disk('s3')->temporaryUrl($path, now()->addMinutes($expiresInMinutes));
}
protected function normalizeDirectory(?string $directory): string protected function normalizeDirectory(?string $directory): string
{ {
$directory = trim((string) $directory, '/'); $directory = trim((string) $directory, '/');