silva
/
adrema
2
1
Fork 0
Code Issues 23 Pull Requests 1 Projects 1 Releases 104 Wiki Activity

Rename fileshare

This commit is contained in:
philipp lang 2024-06-27 17:41:54 +02:00
parent e1c3240290
commit 5482d47f0c
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Fileshare/Actions/FileshareIndexAction.php
View File

@ -2,8 +2,8 @@
namespace App\Fileshare\Actions; namespace App\Fileshare\Actions;
use App\Fileshare\Models\FileshareConnection; use App\Fileshare\Models\Fileshare;
use App\Fileshare\Resources\FileshareConnectionResource; use App\Fileshare\Resources\FileshareResource;
use Inertia\Inertia; use Inertia\Inertia;
use Inertia\Response; use Inertia\Response;
use Lorisleiva\Actions\Concerns\AsAction; use Lorisleiva\Actions\Concerns\AsAction;
@ -18,7 +18,7 @@ class FileshareIndexAction
session()->put('title', 'Datei-Verbindungen'); session()->put('title', 'Datei-Verbindungen');
return Inertia::render('fileshareconnection/Index', [ return Inertia::render('fileshareconnection/Index', [
'data' => FileshareConnectionResource::collection(FileshareConnection::paginate(15)), 'data' => FileshareResource::collection(Fileshare::paginate(15)),
]); ]);
} }
} }

4
app/Fileshare/Actions/FileshareStoreAction.php
View File

@ -2,7 +2,7 @@
namespace App\Fileshare\Actions; namespace App\Fileshare\Actions;
use App\Fileshare\Models\FileshareConnection; use App\Fileshare\Models\Fileshare;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
use Lorisleiva\Actions\ActionRequest; use Lorisleiva\Actions\ActionRequest;
use Lorisleiva\Actions\Concerns\AsAction; use Lorisleiva\Actions\Concerns\AsAction;
@ -31,7 +31,7 @@ class FileshareStoreAction
throw ValidationException::withMessages(['type' => 'Verbindung fehlgeschlagen']); throw ValidationException::withMessages(['type' => 'Verbindung fehlgeschlagen']);
} }
FileshareConnection::create([ Fileshare::create([
...$request->validated(), ...$request->validated(),
'type' => $type, 'type' => $type,
]); ]);

4
app/Fileshare/Actions/FileshareUpdateAction.php
View File

@ -2,7 +2,7 @@
namespace App\Fileshare\Actions; namespace App\Fileshare\Actions;
use App\Fileshare\Models\FileshareConnection; use App\Fileshare\Models\Fileshare;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
use Lorisleiva\Actions\ActionRequest; use Lorisleiva\Actions\ActionRequest;
use Lorisleiva\Actions\Concerns\AsAction; use Lorisleiva\Actions\Concerns\AsAction;
@ -23,7 +23,7 @@ class FileshareUpdateAction
]; ];
} }
public function handle(ActionRequest $request, FileshareConnection $fileshare): void public function handle(ActionRequest $request, Fileshare $fileshare): void
{ {
$type = $request->input('type')::from($request->input('config')); $type = $request->input('type')::from($request->input('config'));

2
app/Fileshare/Models/FileshareConnection.php → app/Fileshare/Models/Fileshare.php
View File

@ -6,7 +6,7 @@ use App\Fileshare\ConnectionTypes\ConnectionType;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
class FileshareConnection extends Model class Fileshare extends Model
{ {
use HasFactory; use HasFactory;

4
app/Fileshare/Resources/FileshareConnectionResource.php → app/Fileshare/Resources/FileshareResource.php
View File

@ -3,14 +3,14 @@
namespace App\Fileshare\Resources; namespace App\Fileshare\Resources;
use App\Fileshare\ConnectionTypes\ConnectionType; use App\Fileshare\ConnectionTypes\ConnectionType;
use App\Fileshare\Models\FileshareConnection; use App\Fileshare\Models\Fileshare;
use App\Lib\HasMeta; use App\Lib\HasMeta;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
/** /**
* @mixin FileshareConnection * @mixin FileshareConnection
*/ */
class FileshareConnectionResource extends JsonResource class FileshareResource extends JsonResource
{ {
use HasMeta; use HasMeta;

10
database/factories/Fileshare/Models/FileshareConnectionFactory.php → database/factories/Fileshare/Models/FileshareFactory.php
View File

@ -3,20 +3,20 @@
namespace Database\Factories\Fileshare\Models; namespace Database\Factories\Fileshare\Models;
use App\Fileshare\ConnectionTypes\ConnectionType; use App\Fileshare\ConnectionTypes\ConnectionType;
use App\Fileshare\Models\FileshareConnection; use App\Fileshare\Models\Fileshare;
use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Database\Eloquent\Factories\Factory;
/** /**
* @extends Factory<FileshareConnection> * @extends Factory<Fileshare>
*/ */
class FileshareConnectionFactory extends Factory class FileshareFactory extends Factory
{ {
/** /**
* The name of the factory's corresponding model. * The name of the factory's corresponding model.
* *
* @var class-string<FileshareConnection> * @var class-string<Fileshare>
*/ */
protected $model = FileshareConnection::class; protected $model = Fileshare::class;
/** /**
* Define the model's default state. * Define the model's default state.

4
database/migrations/2024_06_26_224159_create_fileshare_connections_table.php → database/migrations/2024_06_26_224159_create_fileshares_table.php
View File

@ -13,7 +13,7 @@ return new class extends Migration
*/ */
public function up() public function up()
{ {
Schema::create('fileshare_connections', function (Blueprint $table) { Schema::create('fileshares', function (Blueprint $table) {
$table->id(); $table->id();
$table->string('name'); $table->string('name');
$table->json('type'); $table->json('type');
@ -28,6 +28,6 @@ return new class extends Migration
*/ */
public function down() public function down()
{ {
Schema::dropIfExists('fileshare_connections'); Schema::dropIfExists('fileshares');
} }
}; };

4
tests/Fileshare/FileshareIndexActionTest.php
View File

@ -3,7 +3,7 @@
namespace Tests\Fileshare; namespace Tests\Fileshare;
use App\Fileshare\ConnectionTypes\OwncloudConnection; use App\Fileshare\ConnectionTypes\OwncloudConnection;
use App\Fileshare\Models\FileshareConnection; use App\Fileshare\Models\Fileshare;
use Tests\FileshareTestCase; use Tests\FileshareTestCase;
class FileshareIndexActionTest extends FileshareTestCase class FileshareIndexActionTest extends FileshareTestCase
@ -11,7 +11,7 @@ class FileshareIndexActionTest extends FileshareTestCase
public function testItListsOwncloudConnectionsThatAreActive(): void public function testItListsOwncloudConnectionsThatAreActive(): void
{ {
$this->withoutExceptionHandling()->login()->loginNami()->withOwncloudUser('badenpowell', 'secret'); $this->withoutExceptionHandling()->login()->loginNami()->withOwncloudUser('badenpowell', 'secret');
$connection = FileshareConnection::factory() $connection = Fileshare::factory()
->type(OwncloudConnection::from(['user' => 'badenpowell', 'password' => 'secret', 'base_url' => env('TEST_OWNCLOUD_DOMAIN')])) ->type(OwncloudConnection::from(['user' => 'badenpowell', 'password' => 'secret', 'base_url' => env('TEST_OWNCLOUD_DOMAIN')]))
->name('lokaler Server') ->name('lokaler Server')
->create(); ->create();

4
tests/Fileshare/FileshareStoreActionTest.php
View File

@ -3,7 +3,7 @@
namespace Tests\Fileshare; namespace Tests\Fileshare;
use App\Fileshare\ConnectionTypes\OwncloudConnection; use App\Fileshare\ConnectionTypes\OwncloudConnection;
use App\Fileshare\Models\FileshareConnection; use App\Fileshare\Models\Fileshare;
use Tests\FileshareTestCase; use Tests\FileshareTestCase;
class FileshareStoreActionTest extends FileshareTestCase class FileshareStoreActionTest extends FileshareTestCase
@ -22,7 +22,7 @@ class FileshareStoreActionTest extends FileshareTestCase
] ]
])->assertOk(); ])->assertOk();
$connection = FileshareConnection::firstOrFail(); $connection = Fileshare::firstOrFail();
$this->assertEquals('badenpowell', $connection->type->user); $this->assertEquals('badenpowell', $connection->type->user);
$this->assertEquals('secret', $connection->type->password); $this->assertEquals('secret', $connection->type->password);
$this->assertEquals(env('TEST_OWNCLOUD_DOMAIN'), $connection->type->baseUrl); $this->assertEquals(env('TEST_OWNCLOUD_DOMAIN'), $connection->type->baseUrl);

8
tests/Fileshare/FileshareUpdateActionTest.php
View File

@ -3,7 +3,7 @@
namespace Tests\Fileshare; namespace Tests\Fileshare;
use App\Fileshare\ConnectionTypes\OwncloudConnection; use App\Fileshare\ConnectionTypes\OwncloudConnection;
use App\Fileshare\Models\FileshareConnection; use App\Fileshare\Models\Fileshare;
use Tests\FileshareTestCase; use Tests\FileshareTestCase;
class FileshareUpdateActionTest extends FileshareTestCase class FileshareUpdateActionTest extends FileshareTestCase
@ -12,7 +12,7 @@ class FileshareUpdateActionTest extends FileshareTestCase
{ {
$this->withoutExceptionHandling()->login()->loginNami()->withOwncloudUser('badenpowell', 'secret'); $this->withoutExceptionHandling()->login()->loginNami()->withOwncloudUser('badenpowell', 'secret');
$connection = FileshareConnection::factory() $connection = Fileshare::factory()
->type(OwncloudConnection::from(['user' => 'test', 'password' => 'test', 'base_url' => env('TEST_OWNCLOUD_DOMAIN')])) ->type(OwncloudConnection::from(['user' => 'test', 'password' => 'test', 'base_url' => env('TEST_OWNCLOUD_DOMAIN')]))
->name('lokaler Server') ->name('lokaler Server')
->create(); ->create();
@ -27,7 +27,7 @@ class FileshareUpdateActionTest extends FileshareTestCase
] ]
])->assertOk(); ])->assertOk();
$connection = FileshareConnection::firstOrFail(); $connection = Fileshare::firstOrFail();
$this->assertEquals('badenpowell', $connection->type->user); $this->assertEquals('badenpowell', $connection->type->user);
$this->assertEquals('secret', $connection->type->password); $this->assertEquals('secret', $connection->type->password);
$this->assertEquals(env('TEST_OWNCLOUD_DOMAIN'), $connection->type->baseUrl); $this->assertEquals(env('TEST_OWNCLOUD_DOMAIN'), $connection->type->baseUrl);
@ -38,7 +38,7 @@ class FileshareUpdateActionTest extends FileshareTestCase
{ {
$this->login()->loginNami()->withOwncloudUser('test', 'test'); $this->login()->loginNami()->withOwncloudUser('test', 'test');
$connection = FileshareConnection::factory() $connection = Fileshare::factory()
->type(OwncloudConnection::from(['user' => 'test', 'password' => 'test', 'base_url' => env('TEST_OWNCLOUD_DOMAIN')])) ->type(OwncloudConnection::from(['user' => 'test', 'password' => 'test', 'base_url' => env('TEST_OWNCLOUD_DOMAIN')]))
->name('lokaler Server') ->name('lokaler Server')
->create(); ->create();