wrap up change proposals

4H1R · 4H1R · commit 90ad3c99ee77 · 2024-07-13T12:48:47.000+03:30
diff --git a/app/Console/Commands/DeleteTempUploadedFiles.php b/app/Console/Commands/DeleteTempUploadedFiles.php
@@ -27,12 +27,19 @@ class DeleteTempUploadedFiles extends Command
      */
     public function handle(): void
     {
-        foreach (Storage::directories('tmp') as $directory) {
-            $directoryLastModified = Carbon::createFromTimestamp(Storage::lastModified($directory));
+        $startTime = microtime(true);
+        foreach (Storage::files('tmp') as $file) {
+            $lastModified = Carbon::createFromTimestamp(Storage::lastModified($file));
 
-            if (now()->diffInHours($directoryLastModified) > 24) {
-                Storage::deleteDirectory($directory);
+            $this->info("Checking $file");
+            if (now()->diffInDays($lastModified) > 3) {
+                Storage::delete($file);
+                $this->info("Deleted $file");
             }
         }
+        $endTime = microtime(true);
+        $executionTime = $endTime - $startTime;
+
+        $this->info("[{$executionTime}] Deleting temp files finished successfully.");
     }
 }
diff --git a/app/Filament/Resources/ChangeProposalResource.php b/app/Filament/Resources/ChangeProposalResource.php
@@ -17,6 +17,8 @@
 use Filament\Forms\Form;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\HtmlString;
 use Novadaemon\FilamentPrettyJson\PrettyJson;
 
 class ChangeProposalResource extends CustomResource
@@ -37,13 +39,36 @@ public static function canCreate(): bool
 
     public static function form(Form $form): Form
     {
+        $data = $form->getRecord()->data;
+
         $basicSection = BasicSection::make([
             Forms\Components\Textarea::make('reviewer_description')
                 ->minLength(3)
                 ->columnSpanFull()
                 ->maxLength(1024),
             PrettyJson::make('data')
                 ->columnSpanFull(),
+            Forms\Components\Section::make('Images')
+                ->visible(function () use ($data) {
+                    return collect($data)
+                        ->hasAny(['image_path', 'screenshots_path']);
+                })
+                ->schema([
+                    Forms\Components\Placeholder::make('image')
+                        ->visible(fn () => collect($data)->has('image_path'))
+                        ->content(function () use ($data) {
+                            return new HtmlString('<img src="'.Storage::url(data_get($data, 'image_path')).'" />');
+                        }),
+                    Forms\Components\Placeholder::make('screenshots')
+                        ->visible(fn () => collect($data)->has('screenshots_path'))
+                        ->content(function () use ($data) {
+                            return new HtmlString(
+                                collect(data_get($data, 'screenshots_path'))->map(function ($path) {
+                                    return '<img src="'.Storage::url($path).'" />';
+                                })->implode(' ')
+                            );
+                        }),
+                ]),
             Forms\Components\Select::make('user_id')
                 ->searchable()
                 ->preload()
diff --git a/app/Filament/Resources/ChangeProposalResource/Pages/EditChangeProposal.php b/app/Filament/Resources/ChangeProposalResource/Pages/EditChangeProposal.php
@@ -9,6 +9,7 @@
 use Filament\Actions;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
+use Spatie\MediaLibrary\MediaCollections\Exceptions\FileDoesNotExist;
 
 class EditChangeProposal extends EditRecord
 {
@@ -23,9 +24,28 @@ protected function mergeChangeProposal(ChangeProposal $changeProposal): void
         /** @var Project $project */
         $project = $changeProposal->model;
 
-        $project->update($collection->except('maintainers')->toArray());
+        $project->update($collection->except(['maintainers', 'image_path', 'screenshots_path'])->toArray());
         $project->maintainers()->sync($collection->get('maintainers'));
 
+        if ($collection->has('image_path')) {
+            try {
+                $project
+                    ->addMediaFromDisk($collection->get('image_path'))
+                    ->toMediaCollection('image');
+            } catch (FileDoesNotExist $e) {
+            }
+        }
+
+        if ($collection->has('screenshots_path')) {
+            foreach ($collection->get('screenshots_path') as $screenshot) {
+                try {
+                    $project->addMediaFromDisk($screenshot)
+                        ->toMediaCollection('screenshots');
+                } catch (FileDoesNotExist $e) {
+                }
+            }
+        }
+
         Notification::make()
             ->title('Change Proposal merged successfully.')
             ->success()
diff --git a/app/Http/Controllers/Project/ProjectController.php b/app/Http/Controllers/Project/ProjectController.php
@@ -95,7 +95,7 @@ public function show(Project $project): ProjectFullResource
             'category',
             'user',
             'userReview.user',
-            'reviews' => fn(HasMany $builder) => $builder
+            'reviews' => fn (HasMany $builder) => $builder
                 ->with('user')
                 ->where('status', StatusEnum::Approved)
                 ->take(10),
diff --git a/app/Http/Controllers/Project/ProjectImageController.php b/app/Http/Controllers/Project/ProjectImageController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Project;
 
+use App\Enums\StatusEnum;
 use App\Http\Controllers\Controller;
 use App\Models\Project;
 use App\Rules\FileUpload;
@@ -20,28 +21,24 @@ class ProjectImageController extends Controller
      */
     public function store(Request $request, Project $project): JsonResponse
     {
-        $this->authorize('update', $project);
+        $this->authorize('updateImages', $project);
 
         $request->validate([
             'image_path' => ['bail', 'required', 'string', new FileUpload(['image/png', 'image/jpeg'])],
         ]);
 
-        $project
-            ->addMediaFromDisk($request->input('image_path'))
-            ->toMediaCollection('image');
+        if ($project->status === StatusEnum::Draft) {
+            $project
+                ->addMediaFromDisk($request->input('image_path'))
+                ->toMediaCollection('image');
+        } else {
+            $changeProposal = $project->latestChangeProposal;
+            $changeProposal->update(['data' => [
+                ...$changeProposal->data,
+                'image_path' => $request->input('image_path'),
+            ]]);
+        }
 
         return new JsonResponse(['message' => 'Image has been saved successfully.']);
     }
-
-    /**
-     * @throws AuthorizationException
-     */
-    public function destroy(Project $project): JsonResponse
-    {
-        $this->authorize('update', $project);
-
-        $project->image?->delete();
-
-        return new JsonResponse(['message' => 'Image has been deleted successfully.']);
-    }
 }
diff --git a/app/Http/Controllers/Project/ScreenshotController.php b/app/Http/Controllers/Project/ScreenshotController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Project;
 
+use App\Enums\StatusEnum;
 use App\Http\Controllers\Controller;
 use App\Models\Project;
 use App\Rules\FileUpload;
@@ -20,16 +21,24 @@ class ScreenshotController extends Controller
      */
     public function store(Request $request, Project $project): JsonResponse
     {
-        $this->authorize('update', $project);
+        $this->authorize('updateImages', $project);
 
         $request->validate([
             'screenshots_path' => ['required', 'array', 'max:5'],
             'screenshots_path.*' => ['bail', 'required', 'string', new FileUpload(['image/png', 'image/jpeg'])],
         ]);
 
-        foreach ($request->input('screenshots_path') as $screenshot) {
-            $project->addMediaFromDisk($screenshot)
-                ->toMediaCollection('screenshots');
+        if ($project->status === StatusEnum::Draft) {
+            foreach ($request->input('screenshots_path') as $screenshot) {
+                $project->addMediaFromDisk($screenshot)
+                    ->toMediaCollection('screenshots');
+            }
+        } else {
+            $changeProposal = $project->latestChangeProposal;
+            $changeProposal->update(['data' => [
+                ...$changeProposal->data,
+                'screenshots_path' => $request->input('screenshots_path'),
+            ]]);
         }
 
         return new JsonResponse(['message' => 'Screenshots has been saved successfully.']);
@@ -40,7 +49,7 @@ public function store(Request $request, Project $project): JsonResponse
      */
     public function destroy(Project $project, int $media): JsonResponse
     {
-        $this->authorize('update', $project);
+        $this->authorize('deleteImages', $project);
 
         $project->screenshots()
             ->where('id', $media)
diff --git a/app/Http/Requests/Release/StoreReleaseRequest.php b/app/Http/Requests/Release/StoreReleaseRequest.php
@@ -42,9 +42,9 @@ public function after(): array
             new ValidateReleaseVersionName,
         ];
 
-//        if (! app()->runningUnitTests()) {
-//            $base[] = new ValidateReleaseFile;
-//        }
+        //        if (! app()->runningUnitTests()) {
+        //            $base[] = new ValidateReleaseFile;
+        //        }
 
         return $base;
     }
diff --git a/app/Policies/ProjectPolicy.php b/app/Policies/ProjectPolicy.php
@@ -7,13 +7,10 @@
 use App\Models\User;
 use App\Services\ProjectService;
 use Illuminate\Auth\Access\Response;
-use Illuminate\Support\Facades\Auth;
 
 class ProjectPolicy
 {
-    public function __construct(private readonly ProjectService $projectService)
-    {
-    }
+    public function __construct(private readonly ProjectService $projectService) {}
 
     /**
      * Determine whether the user can view any models.
@@ -47,7 +44,7 @@ public function publish(User $user, Project $project): Response
             return Response::deny("You can publish a project to get reviewed only when It's in Draft");
         }
 
-        if (!$this->projectService->isMaintainer($user->id, $project)) {
+        if (! $this->projectService->isMaintainer($user->id, $project)) {
             return Response::deny('You are not the maintainer of this project');
         }
 
@@ -76,6 +73,28 @@ public function update(User $user, Project $project): Response
             : Response::deny("You're not a maintainer of this project");
     }
 
+    public function updateImages(User $user, Project $project): Response
+    {
+        if (! $this->projectService->isMaintainer($user->id, $project)) {
+            Response::deny("You're not a maintainer of this project");
+        }
+
+        if ($project->status !== StatusEnum::Draft && $project->latestChangeProposal?->status !== StatusEnum::UnderReview) {
+            return Response::deny("You can update the images when there's a UnderReview change proposal.");
+        }
+
+        return Response::allow();
+    }
+
+    public function deleteImages(User $user, Project $project): Response
+    {
+        if (! $this->projectService->isMaintainer($user->id, $project)) {
+            Response::deny("You're not a maintainer of this project");
+        }
+
+        return Response::allow();
+    }
+
     /**
      * Determine whether the user can delete the model.
      */
diff --git a/routes/api.php b/routes/api.php
@@ -34,7 +34,7 @@
 
 Route::apiResource('projects', ProjectController::class);
 Route::post('projects/{project}/publish', [ProjectController::class, 'publish'])->name('projects.publish');
-Route::apiSingleton('projects.image', ProjectImageController::class)->creatable()->only(['store', 'destroy']);
+Route::apiSingleton('projects.image', ProjectImageController::class)->creatable()->only(['store']);
 Route::apiResource('projects.screenshots', ScreenshotController::class)->only(['store', 'destroy']);
 
 Route::apiResource('categories', CategoryController::class)->only(['index', 'show']);

Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,19 @@ class DeleteTempUploadedFiles extends Command`
`27`	`27`	`*/`
`28`	`28`	`public function handle(): void`
`29`	`29`	`{`
`30`		`- foreach (Storage::directories('tmp') as $directory) {`
`31`		`- $directoryLastModified = Carbon::createFromTimestamp(Storage::lastModified($directory));`
	`30`	`+ $startTime = microtime(true);`
	`31`	`+ foreach (Storage::files('tmp') as $file) {`
	`32`	`+ $lastModified = Carbon::createFromTimestamp(Storage::lastModified($file));`
`32`	`33`
`33`		`- if (now()->diffInHours($directoryLastModified) > 24) {`
`34`		`- Storage::deleteDirectory($directory);`
	`34`	`+ $this->info("Checking $file");`
	`35`	`+ if (now()->diffInDays($lastModified) > 3) {`
	`36`	`+ Storage::delete($file);`
	`37`	`+ $this->info("Deleted $file");`
`35`	`38`	`}`
`36`	`39`	`}`
	`40`	`+ $endTime = microtime(true);`
	`41`	`+ $executionTime = $endTime - $startTime;`
	`42`	`+`
	`43`	`+ $this->info("[{$executionTime}] Deleting temp files finished successfully.");`
`37`	`44`	`}`
`38`	`45`	`}`