refactor: [equipment] 사진 업로드를 R2(FileStorageSystem) 기반으로 전환

- GCS 스텁 코드를 Cloudflare R2 기반 실제 파일 업로드로 교체
- File 모델 import를 Boards\File에서 Commons\File로 수정
- StoreEquipmentPhotoRequest FormRequest 추가 (파일 검증)
- 다중 파일 업로드 지원 (최대 10장 제한)
- softDeleteFile 패턴 적용 (삭제 시 soft delete)
- ItemsFileController 패턴 준용 (R2 저장, 랜덤 파일명)
This commit is contained in:
김보곤
2026-03-12 13:45:15 +09:00
parent 723b5a8e1a
commit 2d32faa9b5
4 changed files with 150 additions and 23 deletions

View File

@@ -4,9 +4,9 @@
use App\Helpers\ApiResponse;
use App\Http\Controllers\Controller;
use App\Http\Requests\Equipment\StoreEquipmentPhotoRequest;
use App\Services\Equipment\EquipmentPhotoService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class EquipmentPhotoController extends Controller
{
@@ -20,10 +20,10 @@ public function index(int $id): JsonResponse
);
}
public function store(Request $request, int $id): JsonResponse
public function store(StoreEquipmentPhotoRequest $request, int $id): JsonResponse
{
return ApiResponse::handle(
fn () => $this->service->store($id, $request->all()),
fn () => $this->service->store($id, $request->file('files')),
__('message.equipment.photo_uploaded')
);
}

View File

@@ -0,0 +1,53 @@
<?php
namespace App\Http\Requests\Equipment;
use App\Models\Commons\File;
use Illuminate\Foundation\Http\FormRequest;
class StoreEquipmentPhotoRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
public function rules(): array
{
$equipmentId = $this->route('id');
$currentCount = File::where('document_id', $equipmentId)
->where('document_type', 'equipment')
->whereNull('deleted_at')
->count();
$maxFiles = 10 - $currentCount;
return [
'files' => ['required', 'array', 'min:1', "max:{$maxFiles}"],
'files.*' => [
'required',
'file',
'mimes:jpg,jpeg,png,gif,bmp,webp',
'max:10240', // 10MB
],
];
}
public function attributes(): array
{
return [
'files' => '사진 파일',
'files.*' => '사진 파일',
];
}
public function messages(): array
{
return [
'files.required' => __('error.file.required'),
'files.max' => __('error.equipment.photo_limit_exceeded'),
'files.*.mimes' => __('error.file.invalid_type'),
'files.*.max' => __('error.file.size_exceeded'),
];
}
}

View File

@@ -2,7 +2,7 @@
namespace App\Models\Equipment;
use App\Models\Boards\File;
use App\Models\Commons\File;
use App\Traits\Auditable;
use App\Traits\BelongsToTenant;
use App\Traits\ModelTrait;

View File

@@ -2,41 +2,86 @@
namespace App\Services\Equipment;
use App\Models\Boards\File;
use App\Models\Commons\File;
use App\Models\Equipment\Equipment;
use App\Services\Service;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Storage;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class EquipmentPhotoService extends Service
{
public function index(int $equipmentId): \Illuminate\Database\Eloquent\Collection
private const MAX_PHOTOS = 10;
public function index(int $equipmentId): array
{
$equipment = Equipment::find($equipmentId);
$equipment = $this->getEquipment($equipmentId);
if (! $equipment) {
throw new NotFoundHttpException(__('error.equipment.not_found'));
}
return $equipment->photos;
return $equipment->photos->map(fn ($file) => $this->formatFileResponse($file))->values()->toArray();
}
public function store(int $equipmentId, array $fileData): File
/**
* @param UploadedFile[] $files
*/
public function store(int $equipmentId, array $files): array
{
$equipment = Equipment::find($equipmentId);
$equipment = $this->getEquipment($equipmentId);
$tenantId = $this->tenantId();
$userId = $this->apiUserId();
if (! $equipment) {
throw new NotFoundHttpException(__('error.equipment.not_found'));
$currentCount = File::where('document_id', $equipmentId)
->where('document_type', 'equipment')
->whereNull('deleted_at')
->count();
if ($currentCount + count($files) > self::MAX_PHOTOS) {
throw new \Exception(__('error.equipment.photo_limit_exceeded'));
}
return File::create(array_merge($fileData, [
'document_id' => $equipmentId,
'document_type' => 'equipment',
]));
$uploaded = [];
foreach ($files as $uploadedFile) {
$extension = $uploadedFile->getClientOriginalExtension();
$storedName = bin2hex(random_bytes(8)).'.'.$extension;
$displayName = $uploadedFile->getClientOriginalName();
$year = date('Y');
$month = date('m');
$directory = sprintf('%d/equipment/%s/%s', $tenantId, $year, $month);
$filePath = $directory.'/'.$storedName;
Storage::disk('r2')->putFileAs($directory, $uploadedFile, $storedName);
$mimeType = $uploadedFile->getMimeType();
$file = File::create([
'tenant_id' => $tenantId,
'display_name' => $displayName,
'stored_name' => $storedName,
'file_path' => $filePath,
'file_size' => $uploadedFile->getSize(),
'mime_type' => $mimeType,
'file_type' => 'image',
'document_id' => $equipmentId,
'document_type' => 'equipment',
'is_temp' => false,
'uploaded_by' => $userId,
'created_by' => $userId,
]);
$uploaded[] = $this->formatFileResponse($file);
}
return $uploaded;
}
public function destroy(int $equipmentId, int $fileId): bool
public function destroy(int $equipmentId, int $fileId): array
{
$file = File::where('document_id', $equipmentId)
$tenantId = $this->tenantId();
$userId = $this->apiUserId();
$file = File::where('tenant_id', $tenantId)
->where('document_id', $equipmentId)
->where('document_type', 'equipment')
->where('id', $fileId)
->first();
@@ -45,6 +90,35 @@ public function destroy(int $equipmentId, int $fileId): bool
throw new NotFoundHttpException(__('error.file.not_found'));
}
return $file->delete();
$file->softDeleteFile($userId);
return [
'file_id' => $fileId,
'deleted' => true,
];
}
private function getEquipment(int $equipmentId): Equipment
{
$equipment = Equipment::find($equipmentId);
if (! $equipment) {
throw new NotFoundHttpException(__('error.equipment.not_found'));
}
return $equipment;
}
private function formatFileResponse(File $file): array
{
return [
'id' => $file->id,
'file_name' => $file->display_name,
'file_path' => $file->file_path,
'file_url' => url("/api/v1/files/{$file->id}/download"),
'file_size' => $file->file_size,
'mime_type' => $file->mime_type,
'created_at' => $file->created_at?->format('Y-m-d H:i:s'),
];
}
}