Refactoring

This commit is contained in:
Peter Papp
2021-07-22 14:24:07 +02:00
parent 69eb8dacce
commit 093c9451ec
34 changed files with 214 additions and 120 deletions
@@ -1,6 +1,7 @@
<?php
namespace Domain\Folders\Actions;
use Domain\Folders\Requests\CreateFolderRequest;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Facades\Auth;
@@ -11,14 +12,14 @@ class CreateFolderAction
* Create new directory
*/
public function __invoke(
$request,
CreateFolderRequest $request,
?Share $shared = null,
): Folder | array {
return Folder::create([
'parent_id' => $request->parent_id,
'name' => $request->name,
'color' => $request->color ?? null,
'emoji' => $request->emoji ?? null,
'parent_id' => $request->input('parent_id'),
'name' => $request->input('name'),
'color' => $request->input('color') ?? null,
'emoji' => $request->input('emoji') ?? null,
'author' => $shared ? 'visitor' : 'user',
'user_id' => $shared ? $shared->user_id : Auth::id(),
]);
@@ -2,13 +2,14 @@
namespace Domain\Folders\Actions;
use Domain\Folders\Models\Folder;
use Domain\Items\Requests\RenameItemRequest;
class UpdateFolderPropertyAction
{
/**
* Update folder icon or style
*/
public function __invoke($request, string $id): void
public function __invoke(RenameItemRequest $request, string $id): void
{
// Get folder
$folder = Folder::find($id);
@@ -24,7 +25,7 @@ class UpdateFolderPropertyAction
// Set emoji
if ($request->filled('emoji')) {
$folder->update([
'emoji' => $request->emoji,
'emoji' => $request->input('emoji'),
'color' => null,
]);
}
@@ -33,7 +34,7 @@ class UpdateFolderPropertyAction
if ($request->filled('color')) {
$folder->update([
'emoji' => null,
'color' => $request->color,
'color' => $request->input('color'),
]);
}
}