browsing through upload request

This commit is contained in:
Čarodej
2022-02-24 10:20:38 +01:00
parent 06b28aeee3
commit a589ee5f7a
31 changed files with 311 additions and 118 deletions

View File

@@ -1,5 +1,4 @@
<?php
namespace Tests\Domain\Files;
use Storage;
@@ -60,7 +59,7 @@ class FileTest extends TestCase
])
->collapse()
->each(
fn($item) => Storage::assertExists(
fn ($item) => Storage::assertExists(
"files/{$user->id}/{$item['name']}-{$file->basename}"
)
);
@@ -255,11 +254,11 @@ class FileTest extends TestCase
// Mock files
$thumbnail_sizes = collect([
config('vuefilemanager.image_sizes.later'),
config('vuefilemanager.image_sizes.immediately')
config('vuefilemanager.image_sizes.immediately'),
])->collapse();
$fakeFile = UploadedFile::fake()
->create("fake-image.jpeg", 2000, 'image/jpeg');
->create('fake-image.jpeg', 2000, 'image/jpeg');
Storage::putFileAs("files/$user->id", $fakeFile, $fakeFile->name);
@@ -288,8 +287,8 @@ class FileTest extends TestCase
Storage::assertMissing("files/$user->id/fake-image.jpeg");
// Assert thumbnail was deleted
getThumbnailFileList("fake-image.jpeg")
->each(fn($thumbnail) => Storage::assertMissing("files/$user->id/$thumbnail"));
getThumbnailFileList('fake-image.jpeg')
->each(fn ($thumbnail) => Storage::assertMissing("files/$user->id/$thumbnail"));
}
/**

View File

@@ -1,49 +0,0 @@
<?php
namespace Tests\Domain\UploadRequest;
use App\Http\Controllers\Controller;
use Domain\Files\Resources\FileResource;
use Domain\Folders\Resources\FolderResource;
use Domain\Items\Requests\RenameItemRequest;
use Domain\UploadRequest\Models\UploadRequest;
use Domain\Folders\Actions\UpdateFolderPropertyAction;
use Support\Demo\Actions\FakeRenameFileOrFolderAction;
class RenameFileOrFolderController extends Controller
{
public function __construct(
public UpdateFolderPropertyAction $updateFolderProperty,
public FakeRenameFileOrFolderAction $fakeRenameFileOrFolder,
) {
}
public function __invoke(UploadRequest $uploadRequest, string $id, RenameItemRequest $request)
{
// Check if upload request is active
if ($uploadRequest->status !== 'active') {
return response('Gone', 410);
}
// Get item
$item = get_item($request->input('type'), $id);
// Check privileges
if (! in_array($item->parent_id, getChildrenFolderIds($uploadRequest->id))) {
return response('Access Denied', 403);
}
// If request contain icon or color, then change it
if ($request->input('type') === 'folder' && $request->hasAny(['emoji', 'color'])) {
($this->updateFolderProperty)($request, $id);
}
// Update item
$item->update(['name' => $request->input('name')]);
if ($request->input('type') === 'folder') {
return new FolderResource($item);
}
return new FileResource($item);
}
}

View File

@@ -1,18 +1,18 @@
<?php
namespace Tests\Domain\UploadRequest;
use Tests\TestCase;
use App\Users\Models\User;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Domain\UploadRequest\Models\UploadRequest;
use Tests\TestCase;
class UploadRequestBrowsingTest extends TestCase
{
/**
* @test
*/
public function it_get_navigator_tree()
public function it_get_navigator_tree_for_upload_request_folder()
{
$user = User::factory()
->hasSettings()
@@ -26,7 +26,7 @@ class UploadRequestBrowsingTest extends TestCase
Folder::factory()
->create([
'id' => $uploadRequest->id,
'id' => $uploadRequest->id,
'name' => 'Upload request',
'user_id' => $user->id,
]);
@@ -34,8 +34,8 @@ class UploadRequestBrowsingTest extends TestCase
$folder_level_1 = Folder::factory()
->create([
'parent_id' => $uploadRequest->id,
'name' => 'level 1',
'user_id' => $user->id,
'name' => 'level 1',
'user_id' => $user->id,
]);
$folder_level_2 = Folder::factory()
@@ -77,4 +77,104 @@ class UploadRequestBrowsingTest extends TestCase
],
]);
}
}
/**
* @test
*/
public function it_get_folder_content_for_upload_request_folder()
{
$user = User::factory()
->hasSettings()
->create();
$uploadRequest = UploadRequest::factory()
->create([
'status' => 'active',
'user_id' => $user->id,
]);
$root = Folder::factory()
->create([
'id' => $uploadRequest->id,
'name' => 'root',
'user_id' => $user->id,
]);
$folder = Folder::factory()
->create([
'parent_id' => $root->id,
'author' => 'user',
'user_id' => $user->id,
]);
$file = File::factory()
->create([
'parent_id' => $root->id,
'user_id' => $user->id,
]);
$this
->actingAs($user)
->getJson("/api/upload-request/$uploadRequest->id/browse/$root->id")
->assertStatus(200)
->assertJsonFragment([
'id' => $root->id,
])
->assertJsonFragment([
'id' => $file->id,
])
->assertJsonFragment([
'id' => $folder->id,
]);
}
/**
* @test
*/
public function it_get_folder_content_from_not_existed_upload_request_folder()
{
$user = User::factory()
->hasSettings()
->create();
$uploadRequest = UploadRequest::factory()
->create([
'status' => 'active',
'user_id' => $user->id,
]);
$root = Folder::factory()
->create([
'id' => $uploadRequest->id,
'name' => 'root',
'user_id' => $user->id,
]);
$folder = Folder::factory()
->create([
'parent_id' => $root->id,
'author' => 'user',
'user_id' => $user->id,
]);
$file = File::factory()
->create([
'parent_id' => $root->id,
'user_id' => $user->id,
]);
$this
->actingAs($user)
->getJson("/api/upload-request/$uploadRequest->id/browse/$root->id")
->assertStatus(200)
->assertJsonFragment([
'id' => $root->id,
])
->assertJsonFragment([
'id' => $file->id,
])
->assertJsonFragment([
'id' => $folder->id,
]);
}
}

View File

@@ -1,5 +1,4 @@
<?php
namespace Tests\Domain\UploadRequest;
use Storage;
@@ -145,11 +144,11 @@ class UploadRequestEditingTest extends TestCase
// Mock files
$thumbnail_sizes = collect([
config('vuefilemanager.image_sizes.later'),
config('vuefilemanager.image_sizes.immediately')
config('vuefilemanager.image_sizes.immediately'),
])->collapse();
$fakeFile = UploadedFile::fake()
->create("fake-image.jpeg", 2000, 'image/jpeg');
->create('fake-image.jpeg', 2000, 'image/jpeg');
Storage::putFileAs("files/$user->id", $fakeFile, $fakeFile->name);
@@ -177,8 +176,8 @@ class UploadRequestEditingTest extends TestCase
Storage::assertMissing("files/$user->id/fake-image.jpeg");
// Assert thumbnail was deleted
getThumbnailFileList("fake-image.jpeg")
->each(fn($thumbnail) => Storage::assertMissing("files/$user->id/$thumbnail"));
getThumbnailFileList('fake-image.jpeg')
->each(fn ($thumbnail) => Storage::assertMissing("files/$user->id/$thumbnail"));
}
/**

View File

@@ -128,6 +128,9 @@ class UploadRequestTest extends TestCase
])->assertStatus(201);
$this
->assertDatabaseHas('upload_requests', [
'status' => 'filling',
])
->assertDatabaseHas('folders', [
'id' => $uploadRequest->id,
'name' => 'Upload Request from 01. Jan. 2021',