added teams
CI/CD / test_and_check_app (push) Failing after 2m15s
CI/CD / Publish immutable image (push) Skipped

This commit is contained in:
2026-09-11 02:28:44 +02:00
parent 76bd1536bf
commit 6220a26852
22 changed files with 818 additions and 28 deletions
+58
View File
@@ -0,0 +1,58 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
/**
* @property int $id
* @property string $name
* @property string $slug
* @property int $created_by
* @property bool $require_2fa
* @property \Carbon\CarbonImmutable|null $created_at
* @property \Carbon\CarbonImmutable|null $updated_at
* @property-read \App\Models\TeamMember|null $pivot
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $members
* @property-read int|null $members_count
* @method static Builder<static>|Team newModelQuery()
* @method static Builder<static>|Team newQuery()
* @method static Builder<static>|Team query()
* @method static Builder<static>|Team visibleTo(\App\Models\User $user)
* @method static Builder<static>|Team whereCreatedAt($value)
* @method static Builder<static>|Team whereCreatedBy($value)
* @method static Builder<static>|Team whereId($value)
* @method static Builder<static>|Team whereName($value)
* @method static Builder<static>|Team whereRequire2fa($value)
* @method static Builder<static>|Team whereSlug($value)
* @method static Builder<static>|Team whereUpdatedAt($value)
* @mixin \Eloquent
*/
#[Fillable(['name', 'slug', 'require_2fa'])]
class Team extends Model
{
protected function casts()
{
return [
'require_2fa' => 'boolean',
];
}
public function members(): BelongsToMany
{
return $this->belongsToMany(User::class, 'team_members')
->using(TeamMember::class)
->withPivot('role')
->withTimestamps();
}
public function scopeVisibleTo(Builder $query, User $user): Builder
{
return $query->whereHas('members', function (Builder $query) use ($user): void {
$query->whereKey($user->getKey());
});
}
}
+35
View File
@@ -0,0 +1,35 @@
<?php
namespace App\Models;
use App\Enums\TeamMemberRole;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\Pivot;
/**
* @property int $team_id
* @property int $user_id
* @property TeamMemberRole $role
* @property \Carbon\CarbonImmutable|null $created_at
* @property \Carbon\CarbonImmutable|null $updated_at
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember newQuery()
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember query()
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember whereRole($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember whereTeamId($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember whereUserId($value)
* @mixin \Eloquent
*/
class TeamMember extends Pivot
{
protected $table = 'team_members';
protected function casts(): array
{
return [
'role' => TeamMemberRole::class,
];
}
}
+39 -8
View File
@@ -2,14 +2,14 @@
namespace App\Models;
// use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Database\Factories\UserFactory;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Attributes\Hidden;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Carbon;
use Laravel\Fortify\Contracts\PasskeyUser;
use Laravel\Fortify\PasskeyAuthenticatable;
use Laravel\Fortify\TwoFactorAuthenticatable;
@@ -18,18 +18,41 @@ use Laravel\Fortify\TwoFactorAuthenticatable;
* @property int $id
* @property string $name
* @property string $email
* @property Carbon|null $email_verified_at
* @property \Carbon\CarbonImmutable|null $email_verified_at
* @property string $password
* @property string|null $remember_token
* @property \Carbon\CarbonImmutable|null $created_at
* @property \Carbon\CarbonImmutable|null $updated_at
* @property string|null $two_factor_secret
* @property string|null $two_factor_recovery_codes
* @property Carbon|null $two_factor_confirmed_at
* @property string|null $remember_token
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property \Carbon\CarbonImmutable|null $two_factor_confirmed_at
* @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
* @property-read int|null $notifications_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \Laravel\Passkeys\Passkey> $passkeys
* @property-read int|null $passkeys_count
* @property-read \App\Models\TeamMember|null $pivot
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Team> $teams
* @property-read int|null $teams_count
* @method static \Database\Factories\UserFactory factory($count = null, $state = [])
* @method static \Illuminate\Database\Eloquent\Builder<static>|User newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder<static>|User newQuery()
* @method static \Illuminate\Database\Eloquent\Builder<static>|User query()
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereEmail($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereEmailVerifiedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereName($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|User wherePassword($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereRememberToken($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereTwoFactorConfirmedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereTwoFactorRecoveryCodes($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereTwoFactorSecret($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereUpdatedAt($value)
* @mixin \Eloquent
*/
#[Fillable(['name', 'email', 'password'])]
#[Hidden(['password', 'two_factor_secret', 'two_factor_recovery_codes', 'remember_token'])]
class User extends Authenticatable implements PasskeyUser
class User extends Authenticatable implements PasskeyUser, MustVerifyEmail
{
/** @use HasFactory<UserFactory> */
use HasFactory, Notifiable, PasskeyAuthenticatable, TwoFactorAuthenticatable;
@@ -47,4 +70,12 @@ class User extends Authenticatable implements PasskeyUser
'two_factor_confirmed_at' => 'datetime',
];
}
public function teams(): BelongsToMany
{
return $this->belongsToMany(Team::class, 'team_members')
->using(TeamMember::class)
->withPivot(['role'])
->withTimestamps();
}
}