Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions app-modules/authentication/composer.json

This file was deleted.

26 changes: 0 additions & 26 deletions app-modules/authentication/phpstan.ignore.neon

This file was deleted.

6 changes: 0 additions & 6 deletions app-modules/authentication/phpstan.neon

This file was deleted.

This file was deleted.

6 changes: 3 additions & 3 deletions app-modules/badge/database/factories/BadgeFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
namespace He4rt\Badge\Database\Factories;

use He4rt\Badge\Models\Badge;
use He4rt\Provider\Enums\ProviderEnum;
use He4rt\Tenant\Models\Tenant;
use He4rt\Identity\ExternalIdentity\Enums\IdentityProvider;
use He4rt\Identity\Tenant\Models\Tenant;
use Illuminate\Database\Eloquent\Factories\Factory;

/**
Expand All @@ -19,7 +19,7 @@ final class BadgeFactory extends Factory
public function definition(): array
{
return [
'provider' => fake()->randomElement(ProviderEnum::cases()),
'provider' => fake()->randomElement(IdentityProvider::cases()),
'tenant_id' => Tenant::factory(),
'name' => fake()->name(),
'description' => fake()->sentence(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Filament\Schemas\Components\Section;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use He4rt\Provider\Enums\ProviderEnum;
use He4rt\Identity\ExternalIdentity\Enums\IdentityProvider;
use Illuminate\Database\Eloquent\Builder;

class BadgeForm
Expand All @@ -38,8 +38,8 @@ public static function configure(Schema $schema): Schema
)
->required(),
Select::make('provider')
->enum(ProviderEnum::class)
->options(ProviderEnum::class)
->enum(IdentityProvider::class)
->options(IdentityProvider::class)
->required(),
Toggle::make('active')
->required(),
Expand Down
6 changes: 3 additions & 3 deletions app-modules/badge/src/Models/Badge.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
namespace He4rt\Badge\Models;

use He4rt\Badge\Database\Factories\BadgeFactory;
use He4rt\Provider\Enums\ProviderEnum;
use He4rt\Tenant\Models\Tenant;
use He4rt\Identity\ExternalIdentity\Enums\IdentityProvider;
use He4rt\Identity\Tenant\Models\Tenant;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
Expand Down Expand Up @@ -52,7 +52,7 @@ protected function casts(): array
{
return [
'active' => 'boolean',
'provider' => ProviderEnum::class,
'provider' => IdentityProvider::class,
];
}
}
2 changes: 1 addition & 1 deletion app-modules/badge/tests/Feature/CreateBadgeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

use He4rt\Tenant\Models\Tenant;
use He4rt\Identity\Tenant\Models\Tenant;
use Symfony\Component\HttpFoundation\Response;

test('can create badge', function (): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
use Filament\Facades\Filament;
use He4rt\Badge\Filament\Resources\Badges\Pages\CreateBadge;
use He4rt\Badge\Models\Badge;
use He4rt\Provider\Enums\ProviderEnum;
use He4rt\Tenant\Models\Tenant;
use He4rt\User\Models\User;
use He4rt\Identity\ExternalIdentity\Enums\IdentityProvider;
use He4rt\Identity\Tenant\Models\Tenant;
use He4rt\Identity\User\Models\User;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Storage;

Expand Down Expand Up @@ -35,7 +35,7 @@
->assertOk()
->fillForm([
'tenant_id' => $tenant->getKey(),
'provider' => ProviderEnum::Discord,
'provider' => IdentityProvider::Discord,
'name' => 'name',
'description' => 'description',
'badge' => $image,
Expand All @@ -48,7 +48,7 @@
assertDatabaseCount(Badge::class, 1);
assertDatabaseHas(Badge::class, [
'tenant_id' => $tenant->getKey(),
'provider' => ProviderEnum::Discord->value,
'provider' => IdentityProvider::Discord->value,
'name' => 'name',
'redeem_code' => 'redeem_code',
'active' => 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Filament\Facades\Filament;
use He4rt\Badge\Filament\Resources\Badges\Pages\EditBadge;
use He4rt\Badge\Models\Badge;
use He4rt\User\Models\User;
use He4rt\Identity\User\Models\User;

use function Pest\Laravel\actingAs;
use function Pest\Livewire\livewire;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Filament\Facades\Filament;
use He4rt\Badge\Filament\Resources\Badges\Pages\ListBadges;
use He4rt\User\Models\User;
use He4rt\Identity\User\Models\User;

use function Pest\Laravel\actingAs;
use function Pest\Livewire\livewire;
Expand Down
10 changes: 5 additions & 5 deletions app-modules/bot-discord/src/Events/MessageReceivedEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
use Discord\Discord;
use Discord\Parts\Channel\Message;
use Discord\WebSockets\Event as Events;
use He4rt\Identity\ExternalIdentity\Enums\IdentityProvider;
use He4rt\Identity\ExternalIdentity\Models\ExternalIdentity;
use He4rt\Identity\Tenant\Models\Tenant;
use He4rt\Message\Actions\NewMessage;
use He4rt\Message\DTO\NewMessageDTO;
use He4rt\Provider\Enums\ProviderEnum;
use He4rt\Provider\Models\Provider;
use He4rt\Tenant\Models\Tenant;
use Laracord\Events\Event;
use Throwable;

Expand All @@ -31,14 +31,14 @@ public function handle(Message $message, Discord $discord): void
}

try {
$tenantProvider = Provider::query()
$tenantProvider = ExternalIdentity::query()
->where('model_type', Tenant::class)
->where('provider_id', (string) $message->guild_id)
->firstOrFail();

resolve(NewMessage::class)->persist(new NewMessageDTO(
tenantId: $tenantProvider->tenant_id,
provider: ProviderEnum::Discord,
provider: IdentityProvider::Discord,
providerUsername: $message->author->username.'#'.$message->author->discriminator,
providerId: $message->user_id,
providerMessageId: $message->id,
Expand Down
14 changes: 7 additions & 7 deletions app-modules/bot-discord/src/Events/WelcomeMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
use Discord\Discord;
use Discord\Parts\User\Member;
use Discord\WebSockets\Event as Events;
use He4rt\Provider\DTO\ResolveUserProviderDTO;
use He4rt\Provider\Models\Provider;
use He4rt\Tenant\Models\Tenant;
use He4rt\User\Models\User;
use He4rt\User\Services\ResolveUserContextService;
use He4rt\Identity\ExternalIdentity\DTOs\ResolveUserProviderDTO;
use He4rt\Identity\ExternalIdentity\Models\ExternalIdentity;
use He4rt\Identity\Tenant\Models\Tenant;
use He4rt\Identity\User\Actions\ResolveUserContext;
use He4rt\Identity\User\Models\User;
use Illuminate\Support\Facades\Log;
use Laracord\Events\Event;
use Throwable;
Expand All @@ -24,7 +24,7 @@ public function handle(Member $member, Discord $discord): void
{
$channelId = config('bot-discord.channels.auto-report');

$tenantProvider = Provider::query()
$tenantProvider = ExternalIdentity::query()
->where('model_type', Tenant::class)
->where('provider_id', (string) $member->guild_id)
->firstOrFail();
Expand All @@ -39,7 +39,7 @@ public function handle(Member $member, Discord $discord): void
'avatar' => $member->user->avatar,
]);

resolve(ResolveUserContextService::class)->handle($userDto);
resolve(ResolveUserContext::class)->handle($userDto);
} catch (Throwable $throwable) {
Log::error('Falha ao resolver usuário no evento WelcomeMember', [
'tenant_id' => $tenantProvider->tenant_id ?? null,
Expand Down
24 changes: 12 additions & 12 deletions app-modules/bot-discord/src/SlashCommands/AbstractSlashCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
namespace He4rt\BotDiscord\SlashCommands;

use Discord\Parts\Interactions\Interaction;
use He4rt\Provider\Enums\ProviderEnum;
use He4rt\Provider\Models\Provider;
use He4rt\Tenant\Models\Tenant;
use He4rt\User\Models\User;
use He4rt\Identity\ExternalIdentity\Enums\IdentityProvider;
use He4rt\Identity\ExternalIdentity\Models\ExternalIdentity;
use He4rt\Identity\Tenant\Models\Tenant;
use He4rt\Identity\User\Models\User;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Pipeline\Pipeline;
use Laracord\Commands\Middleware\Context;
use Laracord\Commands\SlashCommand;

abstract class AbstractSlashCommand extends SlashCommand
{
protected ?Provider $memberProvider = null;
protected ?ExternalIdentity $memberProvider = null;

protected ?Provider $tenantProvider = null;
protected ?ExternalIdentity $tenantProvider = null;

protected function processMiddleware(Interaction $interaction): mixed
{
Expand All @@ -40,24 +40,24 @@ protected function processMiddleware(Interaction $interaction): mixed

protected function getMemberProviderQuery(): Builder
{
return Provider::query()
return ExternalIdentity::query()
->where('tenant_id', $this->tenantProvider->tenant_id)
->where('model_type', User::class)
->where('provider', ProviderEnum::Discord);
->where('provider', IdentityProvider::Discord);
}

private function beforePipeline(Interaction $interaction): void
{
$this->tenantProvider = Provider::query()
$this->tenantProvider = ExternalIdentity::query()
->where('model_type', Tenant::class)
->where('provider', ProviderEnum::Discord)
->where('provider', IdentityProvider::Discord)
->where('provider_id', $interaction->guild_id)
->first();

$this->memberProvider = Provider::query()
$this->memberProvider = ExternalIdentity::query()
->where('tenant_id', $this->tenantProvider->tenant_id)
->where('model_type', User::class)
->where('provider', ProviderEnum::Discord)
->where('provider', IdentityProvider::Discord)
->where('provider_id', $interaction->user->id)
->first();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
use Discord\Builders\Components\TextInput;
use Discord\Helpers\Collection;
use Discord\Parts\Interactions\Interaction;
use He4rt\User\DTO\UpdateProfileDTO;
use He4rt\User\Services\UpdateProfileService;
use He4rt\Identity\User\Actions\UpdateProfile;
use He4rt\Identity\User\DTOs\UpdateProfileDTO;
use Illuminate\Support\Facades\Date;
use Throwable;

Expand Down Expand Up @@ -139,7 +139,7 @@ private function persistData(
'about' => $components->get('custom_id', 'about')?->value,
]);

resolve(UpdateProfileService::class)->handle($payload);
resolve(UpdateProfile::class)->handle($payload);

$this
->message('Perfil atualizado!')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
use Discord\Helpers\Collection;
use Discord\Parts\Guild\Role;
use Discord\Parts\Interactions\Interaction;
use He4rt\Provider\DTO\ResolveUserProviderDTO;
use He4rt\Provider\Models\Provider;
use He4rt\Tenant\Models\Tenant;
use He4rt\User\Actions\InformationUserAction;
use He4rt\User\DTO\UpsertInformationDTO;
use He4rt\User\Models\User;
use He4rt\User\Services\ResolveUserContextService;
use He4rt\Identity\ExternalIdentity\DTOs\ResolveUserProviderDTO;
use He4rt\Identity\ExternalIdentity\Models\ExternalIdentity;
use He4rt\Identity\Tenant\Models\Tenant;
use He4rt\Identity\User\Actions\InformationUserAction;
use He4rt\Identity\User\Actions\ResolveUserContext;
use He4rt\Identity\User\DTOs\UpsertInformationDTO;
use He4rt\Identity\User\Models\User;
use Illuminate\Support\Facades\Date;
use Laracord\Commands\SlashCommand;
use Throwable;
Expand Down Expand Up @@ -114,7 +114,7 @@ public function handle(Interaction $interaction): void

private function persistData(Interaction $interaction, Collection $components): void
{
$tenantProvider = Provider::query()
$tenantProvider = ExternalIdentity::query()
->where('model_type', Tenant::class)
->where('provider_id', (string) $interaction->guild_id)
->firstOrFail();
Expand All @@ -128,7 +128,7 @@ private function persistData(Interaction $interaction, Collection $components):
'avatar' => $interaction->user->avatar,
]);

$userContext = resolve(ResolveUserContextService::class)->handle($userDto);
$userContext = resolve(ResolveUserContext::class)->handle($userDto);

$informationDto = UpsertInformationDTO::make([
'user' => $userContext->user,
Expand Down
4 changes: 2 additions & 2 deletions app-modules/bot-discord/src/SlashCommands/ProfileCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use Discord\Parts\Interactions\Command\Option;
use Discord\Parts\Interactions\Interaction;
use He4rt\Provider\Models\Provider;
use He4rt\Identity\ExternalIdentity\Models\ExternalIdentity;
use Illuminate\Support\Facades\Date;
use Throwable;

Expand Down Expand Up @@ -75,7 +75,7 @@ public function handle(Interaction $interaction): void

try {

if (! $this->memberProvider instanceof Provider || ! $this->memberProvider->user->information) {
if (! $this->memberProvider instanceof ExternalIdentity || ! $this->memberProvider->user->information) {
$this
->message()
->content($mentionedUser.' ainda não se apresentou! Use o comando `/introduction` primeiro.')
Expand Down
4 changes: 2 additions & 2 deletions app-modules/character/database/factories/CharacterFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
namespace He4rt\Character\Database\Factories;

use He4rt\Character\Models\Character;
use He4rt\Tenant\Models\Tenant;
use He4rt\User\Models\User;
use He4rt\Identity\Tenant\Models\Tenant;
use He4rt\Identity\User\Models\User;
use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Database\Eloquent\Model;

Expand Down
Loading
Loading