From 54faa3460cd82560cf251469893bf5e6ca785585 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Mon, 25 Apr 2022 13:31:57 +0200 Subject: [PATCH] wip --- app/Architecture/Providers/AppServiceProvider.php | 2 +- app/Domain/Slack/{ => Channels}/SlackApiChannel.php | 2 +- app/Domain/Slack/{ => Exceptions}/UserNotFoundException.php | 2 +- app/Domain/Slack/Handlers/DailySummary.php | 1 - app/Domain/Slack/Handlers/GiveKeysTo.php | 5 ++--- app/Domain/Slack/Handlers/Help.php | 1 - app/Domain/Slack/Handlers/HomeOffice.php | 1 - app/Domain/Slack/Handlers/KeyList.php | 1 - app/Domain/Slack/{ => Handlers}/SignatureHandler.php | 2 +- app/Domain/Slack/Handlers/TakeKeysFrom.php | 5 ++--- app/Domain/Slack/{ => Rules}/SlackUserExistsRule.php | 2 +- app/Domain/Slack/Traits/FindsUserBySlackId.php | 2 +- 12 files changed, 10 insertions(+), 16 deletions(-) rename app/Domain/Slack/{ => Channels}/SlackApiChannel.php (94%) rename app/Domain/Slack/{ => Exceptions}/UserNotFoundException.php (80%) rename app/Domain/Slack/{ => Handlers}/SignatureHandler.php (93%) rename app/Domain/Slack/{ => Rules}/SlackUserExistsRule.php (93%) diff --git a/app/Architecture/Providers/AppServiceProvider.php b/app/Architecture/Providers/AppServiceProvider.php index 094200f..bd8659f 100644 --- a/app/Architecture/Providers/AppServiceProvider.php +++ b/app/Architecture/Providers/AppServiceProvider.php @@ -9,7 +9,7 @@ use Illuminate\Notifications\ChannelManager; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Notification; use Illuminate\Support\ServiceProvider; -use Toby\Domain\Slack\SlackApiChannel; +use Toby\Domain\Slack\Channels\SlackApiChannel; class AppServiceProvider extends ServiceProvider { diff --git a/app/Domain/Slack/SlackApiChannel.php b/app/Domain/Slack/Channels/SlackApiChannel.php similarity index 94% rename from app/Domain/Slack/SlackApiChannel.php rename to app/Domain/Slack/Channels/SlackApiChannel.php index 9b66640..55c28ab 100644 --- a/app/Domain/Slack/SlackApiChannel.php +++ b/app/Domain/Slack/Channels/SlackApiChannel.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Toby\Domain\Slack; +namespace Toby\Domain\Slack\Channels; use Illuminate\Http\Client\Response; use Illuminate\Notifications\Notification; diff --git a/app/Domain/Slack/UserNotFoundException.php b/app/Domain/Slack/Exceptions/UserNotFoundException.php similarity index 80% rename from app/Domain/Slack/UserNotFoundException.php rename to app/Domain/Slack/Exceptions/UserNotFoundException.php index 1d60d66..3bccfc9 100644 --- a/app/Domain/Slack/UserNotFoundException.php +++ b/app/Domain/Slack/Exceptions/UserNotFoundException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Toby\Domain\Slack; +namespace Toby\Domain\Slack\Exceptions; use Spatie\SlashCommand\Exceptions\SlackSlashCommandException; diff --git a/app/Domain/Slack/Handlers/DailySummary.php b/app/Domain/Slack/Handlers/DailySummary.php index af62bb8..6eb6905 100644 --- a/app/Domain/Slack/Handlers/DailySummary.php +++ b/app/Domain/Slack/Handlers/DailySummary.php @@ -9,7 +9,6 @@ use Spatie\SlashCommand\Attachment; use Spatie\SlashCommand\Request; use Spatie\SlashCommand\Response; use Toby\Domain\DailySummaryRetriever; -use Toby\Domain\Slack\SignatureHandler; use Toby\Eloquent\Models\User; use Toby\Eloquent\Models\Vacation; diff --git a/app/Domain/Slack/Handlers/GiveKeysTo.php b/app/Domain/Slack/Handlers/GiveKeysTo.php index 049551e..51c1cf3 100644 --- a/app/Domain/Slack/Handlers/GiveKeysTo.php +++ b/app/Domain/Slack/Handlers/GiveKeysTo.php @@ -8,10 +8,9 @@ use Illuminate\Validation\ValidationException; use Spatie\SlashCommand\Request; use Spatie\SlashCommand\Response; use Toby\Domain\Notifications\KeyHasBeenGivenNotification; -use Toby\Domain\Slack\SignatureHandler; -use Toby\Domain\Slack\SlackUserExistsRule; +use Toby\Domain\Slack\Exceptions\UserNotFoundException; +use Toby\Domain\Slack\Rules\SlackUserExistsRule; use Toby\Domain\Slack\Traits\FindsUserBySlackId; -use Toby\Domain\Slack\UserNotFoundException; use Toby\Eloquent\Models\Key; class GiveKeysTo extends SignatureHandler diff --git a/app/Domain/Slack/Handlers/Help.php b/app/Domain/Slack/Handlers/Help.php index 1407c50..0df9fb8 100644 --- a/app/Domain/Slack/Handlers/Help.php +++ b/app/Domain/Slack/Handlers/Help.php @@ -7,7 +7,6 @@ namespace Toby\Domain\Slack\Handlers; use Spatie\SlashCommand\Attachment; use Spatie\SlashCommand\Request; use Spatie\SlashCommand\Response; -use Toby\Domain\Slack\SignatureHandler; use Toby\Domain\Slack\Traits\ListsHandlers; class Help extends SignatureHandler diff --git a/app/Domain/Slack/Handlers/HomeOffice.php b/app/Domain/Slack/Handlers/HomeOffice.php index 437cff0..1586eb4 100644 --- a/app/Domain/Slack/Handlers/HomeOffice.php +++ b/app/Domain/Slack/Handlers/HomeOffice.php @@ -9,7 +9,6 @@ use Spatie\SlashCommand\Request; use Spatie\SlashCommand\Response; use Toby\Domain\Actions\VacationRequest\CreateAction; use Toby\Domain\Enums\VacationType; -use Toby\Domain\Slack\SignatureHandler; use Toby\Domain\Slack\Traits\FindsUserBySlackId; use Toby\Eloquent\Models\User; use Toby\Eloquent\Models\YearPeriod; diff --git a/app/Domain/Slack/Handlers/KeyList.php b/app/Domain/Slack/Handlers/KeyList.php index 70ed4a7..c13cf21 100644 --- a/app/Domain/Slack/Handlers/KeyList.php +++ b/app/Domain/Slack/Handlers/KeyList.php @@ -7,7 +7,6 @@ namespace Toby\Domain\Slack\Handlers; use Spatie\SlashCommand\Attachment; use Spatie\SlashCommand\Request; use Spatie\SlashCommand\Response; -use Toby\Domain\Slack\SignatureHandler; use Toby\Eloquent\Models\Key; class KeyList extends SignatureHandler diff --git a/app/Domain/Slack/SignatureHandler.php b/app/Domain/Slack/Handlers/SignatureHandler.php similarity index 93% rename from app/Domain/Slack/SignatureHandler.php rename to app/Domain/Slack/Handlers/SignatureHandler.php index b7d4ddf..5cbf12f 100644 --- a/app/Domain/Slack/SignatureHandler.php +++ b/app/Domain/Slack/Handlers/SignatureHandler.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Toby\Domain\Slack; +namespace Toby\Domain\Slack\Handlers; use Illuminate\Support\Facades\Validator; use Spatie\SlashCommand\Handlers\SignatureHandler as BaseSignatureHandler; diff --git a/app/Domain/Slack/Handlers/TakeKeysFrom.php b/app/Domain/Slack/Handlers/TakeKeysFrom.php index de6aa85..9801026 100644 --- a/app/Domain/Slack/Handlers/TakeKeysFrom.php +++ b/app/Domain/Slack/Handlers/TakeKeysFrom.php @@ -8,10 +8,9 @@ use Illuminate\Validation\ValidationException; use Spatie\SlashCommand\Request; use Spatie\SlashCommand\Response; use Toby\Domain\Notifications\KeyHasBeenTakenNotification; -use Toby\Domain\Slack\SignatureHandler; -use Toby\Domain\Slack\SlackUserExistsRule; +use Toby\Domain\Slack\Exceptions\UserNotFoundException; +use Toby\Domain\Slack\Rules\SlackUserExistsRule; use Toby\Domain\Slack\Traits\FindsUserBySlackId; -use Toby\Domain\Slack\UserNotFoundException; use Toby\Eloquent\Models\Key; class TakeKeysFrom extends SignatureHandler diff --git a/app/Domain/Slack/SlackUserExistsRule.php b/app/Domain/Slack/Rules/SlackUserExistsRule.php similarity index 93% rename from app/Domain/Slack/SlackUserExistsRule.php rename to app/Domain/Slack/Rules/SlackUserExistsRule.php index f0176ba..fcdc3d3 100644 --- a/app/Domain/Slack/SlackUserExistsRule.php +++ b/app/Domain/Slack/Rules/SlackUserExistsRule.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Toby\Domain\Slack; +namespace Toby\Domain\Slack\Rules; use Illuminate\Contracts\Validation\Rule; use Illuminate\Support\Str; diff --git a/app/Domain/Slack/Traits/FindsUserBySlackId.php b/app/Domain/Slack/Traits/FindsUserBySlackId.php index 15514f9..b48a07b 100644 --- a/app/Domain/Slack/Traits/FindsUserBySlackId.php +++ b/app/Domain/Slack/Traits/FindsUserBySlackId.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Toby\Domain\Slack\Traits; use Illuminate\Support\Str; -use Toby\Domain\Slack\UserNotFoundException; +use Toby\Domain\Slack\Exceptions\UserNotFoundException; use Toby\Eloquent\Models\User; trait FindsUserBySlackId