Renamed jetstream team to organization

app/Actions/Jetstream/AddOrganizationMember.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
-use App\Models\Team;
+use App\Models\Organization;
 use App\Models\User;
 use Closure;
 use Illuminate\Support\Facades\Gate;
@@ -15,32 +15,32 @@ use Laravel\Jetstream\Events\TeamMemberAdded;
 use Laravel\Jetstream\Jetstream;
 use Laravel\Jetstream\Rules\Role;
 
-class AddTeamMember implements AddsTeamMembers
+class AddOrganizationMember implements AddsTeamMembers
 {
     /**
      * Add a new team member to the given team.
      */
-    public function add(User $user, Team $team, string $email, ?string $role = null): void
+    public function add(User $user, Organization $organization, string $email, ?string $role = null): void
     {
-        Gate::forUser($user)->authorize('addTeamMember', $team);
+        Gate::forUser($user)->authorize('addTeamMember', $organization);
 
-        $this->validate($team, $email, $role);
+        $this->validate($organization, $email, $role);
 
         $newTeamMember = Jetstream::findUserByEmailOrFail($email);
 
-        AddingTeamMember::dispatch($team, $newTeamMember);
+        AddingTeamMember::dispatch($organization, $newTeamMember);
 
-        $team->users()->attach(
+        $organization->users()->attach(
             $newTeamMember, ['role' => $role]
         );
 
-        TeamMemberAdded::dispatch($team, $newTeamMember);
+        TeamMemberAdded::dispatch($organization, $newTeamMember);
     }
 
     /**
      * Validate the add member operation.
      */
-    protected function validate(Team $team, string $email, ?string $role): void
+    protected function validate(Organization $organization, string $email, ?string $role): void
     {
         Validator::make([
             'email' => $email,
@@ -48,7 +48,7 @@ class AddTeamMember implements AddsTeamMembers
         ], $this->rules(), [
             'email.exists' => __('We were unable to find a registered user with this email address.'),
         ])->after(
-            $this->ensureUserIsNotAlreadyOnTeam($team, $email)
+            $this->ensureUserIsNotAlreadyOnTeam($organization, $email)
         )->validateWithBag('addTeamMember');
     }
 
@@ -70,7 +70,7 @@ class AddTeamMember implements AddsTeamMembers
     /**
      * Ensure that the user is not already on the team.
      */
-    protected function ensureUserIsNotAlreadyOnTeam(Team $team, string $email): Closure
+    protected function ensureUserIsNotAlreadyOnTeam(Organization $team, string $email): Closure
     {
         return function ($validator) use ($team, $email) {
             $validator->errors()->addIf(

app/Actions/Jetstream/CreateOrganization.php

@@ -4,22 +4,27 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
-use App\Models\Team;
+use App\Models\Organization;
 use App\Models\User;
+use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
 use Laravel\Jetstream\Contracts\CreatesTeams;
 use Laravel\Jetstream\Events\AddingTeam;
 use Laravel\Jetstream\Jetstream;
 
-class CreateTeam implements CreatesTeams
+class CreateOrganization implements CreatesTeams
 {
     /**
      * Validate and create a new team for the given user.
      *
      * @param  array<string, string>  $input
+     *
+     * @throws AuthorizationException
+     * @throws ValidationException
      */
-    public function create(User $user, array $input): Team
+    public function create(User $user, array $input): Organization
     {
         Gate::forUser($user)->authorize('create', Jetstream::newTeamModel());
 
@@ -29,11 +34,14 @@ class CreateTeam implements CreatesTeams
 
         AddingTeam::dispatch($user);
 
-        $user->switchTeam($team = $user->ownedTeams()->create([
+        /** @var Organization $organization */
+        $organization = $user->ownedTeams()->create([
             'name' => $input['name'],
             'personal_team' => false,
-        ]));
+        ]);
 
-        return $team;
+        $user->switchTeam($organization);
+
+        return $organization;
     }
 }

app/Actions/Jetstream/DeleteOrganization.php

@@ -4,15 +4,15 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
-use App\Models\Team;
+use App\Models\Organization;
 use Laravel\Jetstream\Contracts\DeletesTeams;
 
-class DeleteTeam implements DeletesTeams
+class DeleteOrganization implements DeletesTeams
 {
     /**
      * Delete the given team.
      */
-    public function delete(Team $team): void
+    public function delete(Organization $team): void
     {
         $team->purge();
     }

app/Actions/Jetstream/DeleteUser.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
-use App\Models\Team;
+use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Support\Facades\DB;
 use Laravel\Jetstream\Contracts\DeletesTeams;
@@ -47,7 +47,7 @@ class DeleteUser implements DeletesUsers
     {
         $user->teams()->detach();
 
-        $user->ownedTeams->each(function (Team $team) {
+        $user->ownedTeams->each(function (Organization $team) {
             $this->deletesTeams->delete($team);
         });
     }

app/Actions/Jetstream/InviteOrganizationMember.php

@@ -0,0 +1,94 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Models\Organization;
+use App\Models\OrganizationInvitation;
+use App\Models\User;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Validator;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
+use Laravel\Jetstream\Contracts\InvitesTeamMembers;
+use Laravel\Jetstream\Events\InvitingTeamMember;
+use Laravel\Jetstream\Jetstream;
+use Laravel\Jetstream\Mail\TeamInvitation;
+use Laravel\Jetstream\Rules\Role;
+
+class InviteOrganizationMember implements InvitesTeamMembers
+{
+    /**
+     * Invite a new team member to the given team.
+     */
+    public function invite(User $user, Organization $organization, string $email, ?string $role = null): void
+    {
+        Gate::forUser($user)->authorize('addTeamMember', $organization);
+
+        $this->validate($organization, $email, $role);
+
+        InvitingTeamMember::dispatch($organization, $email, $role);
+
+        $invitation = $organization->teamInvitations()->create([
+            'email' => $email,
+            'role' => $role,
+        ]);
+
+        Mail::to($email)->send(new TeamInvitation($invitation));
+    }
+
+    /**
+     * Validate the invite member operation.
+     */
+    protected function validate(Organization $organization, string $email, ?string $role): void
+    {
+        Validator::make([
+            'email' => $email,
+            'role' => $role,
+        ], $this->rules($organization), [
+            'email.unique' => __('This user has already been invited to the team.'),
+        ])->after(
+            $this->ensureUserIsNotAlreadyOnTeam($organization, $email)
+        )->validateWithBag('addTeamMember');
+    }
+
+    /**
+     * Get the validation rules for inviting a team member.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    protected function rules(Organization $organization): array
+    {
+        return array_filter([
+            'email' => [
+                'required',
+                'email',
+                new UniqueEloquent(OrganizationInvitation::class, 'email', function (Builder $builder) use ($organization) {
+                    /** @var Builder<OrganizationInvitation> $builder */
+                    return $builder->whereBelongsTo($organization, 'organization');
+                }),
+            ],
+            'role' => Jetstream::hasRoles()
+                            ? ['required', 'string', new Role]
+                            : null,
+        ]);
+    }
+
+    /**
+     * Ensure that the user is not already on the team.
+     */
+    protected function ensureUserIsNotAlreadyOnTeam(Organization $organization, string $email): Closure
+    {
+        return function ($validator) use ($organization, $email) {
+            $validator->errors()->addIf(
+                $organization->hasUserWithEmail($email),
+                'email',
+                __('This user already belongs to the team.')
+            );
+        };
+    }
+}

app/Actions/Jetstream/InviteTeamMember.php

@@ -1,90 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Actions\Jetstream;
-
-use App\Models\Team;
-use App\Models\User;
-use Closure;
-use Illuminate\Database\Query\Builder;
-use Illuminate\Support\Facades\Gate;
-use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
-use Laravel\Jetstream\Contracts\InvitesTeamMembers;
-use Laravel\Jetstream\Events\InvitingTeamMember;
-use Laravel\Jetstream\Jetstream;
-use Laravel\Jetstream\Mail\TeamInvitation;
-use Laravel\Jetstream\Rules\Role;
-
-class InviteTeamMember implements InvitesTeamMembers
-{
-    /**
-     * Invite a new team member to the given team.
-     */
-    public function invite(User $user, Team $team, string $email, ?string $role = null): void
-    {
-        Gate::forUser($user)->authorize('addTeamMember', $team);
-
-        $this->validate($team, $email, $role);
-
-        InvitingTeamMember::dispatch($team, $email, $role);
-
-        $invitation = $team->teamInvitations()->create([
-            'email' => $email,
-            'role' => $role,
-        ]);
-
-        Mail::to($email)->send(new TeamInvitation($invitation));
-    }
-
-    /**
-     * Validate the invite member operation.
-     */
-    protected function validate(Team $team, string $email, ?string $role): void
-    {
-        Validator::make([
-            'email' => $email,
-            'role' => $role,
-        ], $this->rules($team), [
-            'email.unique' => __('This user has already been invited to the team.'),
-        ])->after(
-            $this->ensureUserIsNotAlreadyOnTeam($team, $email)
-        )->validateWithBag('addTeamMember');
-    }
-
-    /**
-     * Get the validation rules for inviting a team member.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\Rule|array|string>
-     */
-    protected function rules(Team $team): array
-    {
-        return array_filter([
-            'email' => [
-                'required', 'email',
-                Rule::unique('team_invitations')->where(function (Builder $query) use ($team) {
-                    $query->where('team_id', $team->id);
-                }),
-            ],
-            'role' => Jetstream::hasRoles()
-                            ? ['required', 'string', new Role]
-                            : null,
-        ]);
-    }
-
-    /**
-     * Ensure that the user is not already on the team.
-     */
-    protected function ensureUserIsNotAlreadyOnTeam(Team $team, string $email): Closure
-    {
-        return function ($validator) use ($team, $email) {
-            $validator->errors()->addIf(
-                $team->hasUserWithEmail($email),
-                'email',
-                __('This user already belongs to the team.')
-            );
-        };
-    }
-}

app/Actions/Jetstream/RemoveOrganizationMember.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
-use App\Models\Team;
+use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Support\Facades\Gate;
@@ -12,28 +12,28 @@ use Illuminate\Validation\ValidationException;
 use Laravel\Jetstream\Contracts\RemovesTeamMembers;
 use Laravel\Jetstream\Events\TeamMemberRemoved;
 
-class RemoveTeamMember implements RemovesTeamMembers
+class RemoveOrganizationMember implements RemovesTeamMembers
 {
     /**
      * Remove the team member from the given team.
      */
-    public function remove(User $user, Team $team, User $teamMember): void
+    public function remove(User $user, Organization $organization, User $teamMember): void
     {
-        $this->authorize($user, $team, $teamMember);
+        $this->authorize($user, $organization, $teamMember);
 
-        $this->ensureUserDoesNotOwnTeam($teamMember, $team);
+        $this->ensureUserDoesNotOwnTeam($teamMember, $organization);
 
-        $team->removeUser($teamMember);
+        $organization->removeUser($teamMember);
 
-        TeamMemberRemoved::dispatch($team, $teamMember);
+        TeamMemberRemoved::dispatch($organization, $teamMember);
     }
 
     /**
      * Authorize that the user can remove the team member.
      */
-    protected function authorize(User $user, Team $team, User $teamMember): void
+    protected function authorize(User $user, Organization $organization, User $teamMember): void
     {
-        if (! Gate::forUser($user)->check('removeTeamMember', $team) &&
+        if (! Gate::forUser($user)->check('removeTeamMember', $organization) &&
             $user->id !== $teamMember->id) {
             throw new AuthorizationException;
         }
@@ -42,9 +42,9 @@ class RemoveTeamMember implements RemovesTeamMembers
     /**
      * Ensure that the currently authenticated user does not own the team.
      */
-    protected function ensureUserDoesNotOwnTeam(User $teamMember, Team $team): void
+    protected function ensureUserDoesNotOwnTeam(User $teamMember, Organization $organization): void
     {
-        if ($teamMember->id === $team->owner->id) {
+        if ($teamMember->id === $organization->owner->id) {
             throw ValidationException::withMessages([
                 'team' => [__('You may not leave a team that you created.')],
             ])->errorBag('removeTeamMember');

app/Actions/Jetstream/UpdateOrganization.php

@@ -4,28 +4,33 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
-use App\Models\Team;
+use App\Models\Organization;
 use App\Models\User;
+use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
 use Laravel\Jetstream\Contracts\UpdatesTeamNames;
 
-class UpdateTeamName implements UpdatesTeamNames
+class UpdateOrganization implements UpdatesTeamNames
 {
     /**
      * Validate and update the given team's name.
      *
      * @param  array<string, string>  $input
+     *
+     * @throws AuthorizationException
+     * @throws ValidationException
      */
-    public function update(User $user, Team $team, array $input): void
+    public function update(User $user, Organization $organization, array $input): void
     {
-        Gate::forUser($user)->authorize('update', $team);
+        Gate::forUser($user)->authorize('update', $organization);
 
         Validator::make($input, [
             'name' => ['required', 'string', 'max:255'],
         ])->validateWithBag('updateTeamName');
 
-        $team->forceFill([
+        $organization->forceFill([
             'name' => $input['name'],
         ])->save();
     }