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

Move modules

This commit is contained in:
philipp lang 2024-10-24 23:17:23 +02:00
parent 16db435018
commit 5ef5e95be8
16 changed files with 19 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Maildispatcher/Models/Maildispatcher.php
View File

@ -2,7 +2,7 @@
namespace App\Maildispatcher\Models;
use App\Mailgateway\Models\Mailgateway;
use Modules\Mailgateway\Models\Mailgateway;
use Database\Factories\Maildispatcher\Models\MaildispatcherFactory;
use Illuminate\Database\Eloquent\Concerns\HasUuids;
use Illuminate\Database\Eloquent\Factories\HasFactory;

2
app/Maildispatcher/Resources/MaildispatcherResource.php
View File

@ -4,7 +4,7 @@ namespace App\Maildispatcher\Resources;
use App\Lib\HasMeta;
use App\Maildispatcher\Models\Maildispatcher;
use App\Mailgateway\Models\Mailgateway;
use Modules\Mailgateway\Models\Mailgateway;
use App\Mailgateway\Resources\MailgatewayResource;
use App\Member\FilterScope;
use App\Member\Member;

27
app/Mailgateway/Actions/StoreAction.php
View File

@ -1,27 +0,0 @@
<?php
namespace App\Mailgateway\Actions;
use App\Mailgateway\Models\Mailgateway;
use Lorisleiva\Actions\ActionRequest;
use Lorisleiva\Actions\Concerns\AsAction;
class StoreAction
{
use AsAction;
use ValidatesRequests;
/**
* @param array<string, mixed> $input
*/
public function handle(array $input): void
{
$this->checkIfWorks($input);
Mailgateway::create($input);
}
public function asController(ActionRequest $request): void
{
$this->handle($request->validated());
}
}

28
app/Mailgateway/Actions/UpdateAction.php
View File

@ -1,28 +0,0 @@
<?php
namespace App\Mailgateway\Actions;
use App\Mailgateway\Models\Mailgateway;
use Lorisleiva\Actions\ActionRequest;
use Lorisleiva\Actions\Concerns\AsAction;
class UpdateAction
{
use AsAction;
use ValidatesRequests;
/**
* @param array<string, mixed> $input
*/
public function handle(Mailgateway $mailgateway, array $input): void
{
$this->checkIfWorks($input);
$mailgateway->update($input);
}
public function asController(Mailgateway $mailgateway, ActionRequest $request): void
{
$this->handle($mailgateway, $request->validated());
}
}

65
app/Mailgateway/Actions/ValidatesRequests.php
View File

@ -1,65 +0,0 @@
<?php
namespace App\Mailgateway\Actions;
use App\Mailgateway\Types\Type;
use Illuminate\Validation\Rule;
use Illuminate\Validation\ValidationException;
use Lorisleiva\Actions\ActionRequest;
trait ValidatesRequests
{
/**
* @param array<string, mixed> $input
*/
public function checkIfWorks(array $input): void
{
if (!app(data_get($input, 'type.cls'))->setParams($input['type']['params'])->works()) {
throw ValidationException::withMessages(['connection' => 'Verbindung fehlgeschlagen.']);
}
}
/**
* @return array<string, mixed>
*/
public function rules(): array
{
return [
'name' => 'required|string|max:255',
'domain' => 'required|string|max:255',
...$this->typeValidation(),
'type.params' => 'present|array',
...collect(request()->input('type.cls')::rules('storeValidator'))->mapWithKeys(fn ($rules, $key) => ["type.params.{$key}" => $rules]),
];
}
/**
* @return array<string, mixed>
*/
public function getValidationAttributes(): array
{
return [
'type.cls' => 'Typ',
'name' => 'Beschreibung',
'domain' => 'Domain',
...collect(request()->input('type.cls')::fieldNames())->mapWithKeys(fn ($attribute, $key) => ["type.params.{$key}" => $attribute]),
];
}
/**
* @return array<string, mixed>
*/
private function typeValidation(): array
{
return [
'type.cls' => ['required', 'string', 'max:255', Rule::in(app('mail-gateways'))],
];
}
public function prepareForValidation(ActionRequest $request): void
{
if (!is_subclass_of(request()->input('type.cls'), Type::class)) {
throw ValidationException::withMessages(['type.cls' => 'Typ ist nicht valide.']);
}
}
}

2
app/Mailgateway/MailgatewaySettings.php
View File

@ -2,7 +2,7 @@
namespace App\Mailgateway;
use App\Mailgateway\Models\Mailgateway;
use Modules\Mailgateway\Models\Mailgateway;
use App\Mailgateway\Resources\MailgatewayResource;
use App\Setting\LocalSettings;

2
app/Mailgateway/Resources/MailgatewayResource.php
View File

@ -3,7 +3,7 @@
namespace App\Mailgateway\Resources;
use App\Lib\HasMeta;
use App\Mailgateway\Models\Mailgateway;
use Modules\Mailgateway\Models\Mailgateway;
use Illuminate\Http\Resources\Json\JsonResource;
/**

2
modules/Mailgateway/Components/Form.php
View File

@ -2,7 +2,7 @@
namespace Modules\Mailgateway\Components;
use App\Mailgateway\Models\Mailgateway;
use Modules\Mailgateway\Models\Mailgateway;
use App\Mailgateway\Types\Type;
use Illuminate\Support\Collection;
use Illuminate\Validation\ValidationException;

2
modules/Mailgateway/Components/SettingView.php
View File

@ -2,7 +2,7 @@
namespace Modules\Mailgateway\Components;
use App\Mailgateway\Models\Mailgateway;
use Modules\Mailgateway\Models\Mailgateway;
use Livewire\Component;
use Modules\Mailgateway\MailgatewaySettings;

4
modules/Mailgateway/IndexTest.php
View File

@ -1,8 +1,8 @@
<?php
namespace Tests\Feature\Mailgateway;
namespace Modules\Mailgateway;
use App\Mailgateway\Models\Mailgateway;
use Modules\Mailgateway\Models\Mailgateway;
use App\Mailgateway\Types\LocalType;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Livewire\Livewire;

6
app/Mailgateway/Models/Mailgateway.php → modules/Mailgateway/Models/Mailgateway.php
View File

@ -1,15 +1,17 @@
<?php
namespace App\Mailgateway\Models;
namespace Modules\Mailgateway\Models;
use App\Mailgateway\Types\Type;
use Database\Factories\Mailgateway\Models\MailgatewayFactory;
use Illuminate\Database\Eloquent\Concerns\HasUuids;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Mailgateway extends Model
{
public static $factory = MailgatewayFactory::class;
/** @use HasFactory<MailgatewayFactory> */
use HasFactory;
use HasUuids;

5
database/factories/Mailgateway/Models/MailgatewayFactory.php → modules/Mailgateway/Models/MailgatewayFactory.php
View File

@ -1,14 +1,13 @@
<?php
namespace Database\Factories\Mailgateway\Models;
namespace Modules\Mailgateway\Models;
use App\Mailgateway\Models\Mailgateway;
use App\Mailgateway\Types\LocalType;
use App\Mailgateway\Types\Type;
use Illuminate\Database\Eloquent\Factories\Factory;
/**
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Mailgateway\Models\Mailgateway>
* @extends Factory<Mailgateway>
*/
class MailgatewayFactory extends Factory
{

2
modules/Mailgateway/StoreTest.php
View File

@ -1,6 +1,6 @@
<?php
namespace Tests\Feature\Mailgateway;
namespace Modules\Mailgateway;
use App\Mailgateway\Types\LocalType;
use App\Mailgateway\Types\MailmanType;

4
modules/Mailgateway/UpdateTest.php
View File

@ -1,8 +1,8 @@
<?php
namespace Tests\Feature\Mailgateway;
namespace Modules\Mailgateway;
use App\Mailgateway\Models\Mailgateway;
use Modules\Mailgateway\Models\Mailgateway;
use App\Mailgateway\Types\LocalType;
use App\Mailgateway\Types\MailmanType;
use Illuminate\Foundation\Testing\DatabaseTransactions;

2
tests/EndToEnd/Maildispatcher/StoreTest.php
View File

@ -6,7 +6,7 @@ use \Mockery as M;
use App\Activity;
use App\Maildispatcher\Models\Localmaildispatcher;
use App\Maildispatcher\Models\Maildispatcher;
use App\Mailgateway\Models\Mailgateway;
use Modules\Mailgateway\Models\Mailgateway;
use App\Mailgateway\Types\LocalType;
use App\Member\Member;
use App\Member\Membership;

2
tests/EndToEnd/Maildispatcher/UpdateTest.php
View File

@ -4,7 +4,7 @@ namespace Tests\EndToEnd\Maildispatcher;
use App\Maildispatcher\Actions\ResyncAction;
use App\Maildispatcher\Models\Maildispatcher;
use App\Mailgateway\Models\Mailgateway;
use Modules\Mailgateway\Models\Mailgateway;
use App\Mailgateway\Types\LocalType;
use App\Member\FilterScope;
use App\Member\Member;