Migrated endpoints from user to member; Renamed membership to member

app/Actions/Jetstream/UpdateMemberRole.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Actions\Jetstream;
 
 use App\Enums\Role;
-use App\Models\Membership;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\User;
 use App\Service\PermissionStore;
@@ -32,7 +32,7 @@ class UpdateMemberRole
         }
 
         $user = User::where('id', '=', $userId)->firstOrFail();
-        $member = Membership::whereBelongsTo($user)->whereBelongsTo($organization)->firstOrFail();
+        $member = Member::whereBelongsTo($user)->whereBelongsTo($organization)->firstOrFail();
         if ($member->role === Role::Placeholder->value) {
             abort(403, 'Cannot update the role of a placeholder member.');
         }

app/Filament/Resources/OrganizationResource.php

@@ -108,11 +108,15 @@ class OrganizationResource extends Resource
                     ->icon('heroicon-o-inbox-arrow-down')
                     ->action(function (Organization $record, array $data) {
                         try {
+                            $file = Storage::disk(config('filament.default_filesystem_disk'))->get($data['file']);
+                            if ($file === null) {
+                                throw new \Exception('File not found');
+                            }
                             /** @var ReportDto $report */
                             $report = app(ImportService::class)->import(
                                 $record,
                                 $data['type'],
-                                Storage::disk(config('filament.default_filesystem_disk'))->get($data['file'])
+                                $file
                             );
                             Notification::make()
                                 ->title('Import successful')

app/Http/Controllers/Api/V1/Controller.php

@@ -5,8 +5,11 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Api\V1;
 
 use App\Models\Organization;
+use App\Models\User;
 use App\Service\PermissionStore;
 use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 
 class Controller extends \App\Http\Controllers\Controller
 {
@@ -29,4 +32,19 @@ class Controller extends \App\Http\Controllers\Controller
     {
         return $this->permissionStore->has($organization, $permission);
     }
+
+    /**
+     * @throws AuthorizationException
+     */
+    protected function user(): User
+    {
+        /** @var User|null $user */
+        $user = Auth::user();
+        if ($user === null) {
+            Log::error('This function should only be called in authenticated context');
+            throw new AuthorizationException();
+        }
+
+        return $user;
+    }
 }

app/Http/Controllers/Api/V1/InvitationController.php

@@ -57,7 +57,7 @@ class InvitationController extends Controller
         $this->checkPermission($organization, 'invitations:create');
 
         app(InvitesTeamMembers::class)->invite(
-            $request->user(),
+            $this->user(),
             $organization,
             $request->input('email'),
             $request->input('role')

app/Http/Controllers/Api/V1/MemberController.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Enums\Role;
 use App\Exceptions\Api\EntityStillInUseApiException;
 use App\Exceptions\Api\UserNotPlaceholderApiException;
 use App\Http\Requests\V1\Member\MemberIndexRequest;
@@ -11,7 +12,7 @@ use App\Http\Requests\V1\Member\MemberUpdateRequest;
 use App\Http\Resources\V1\Member\MemberCollection;
 use App\Http\Resources\V1\Member\MemberPivotResource;
 use App\Http\Resources\V1\Member\MemberResource;
-use App\Models\Membership;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\ProjectMember;
 use App\Models\TimeEntry;
@@ -23,10 +24,10 @@ use Laravel\Jetstream\Contracts\InvitesTeamMembers;
 
 class MemberController extends Controller
 {
-    protected function checkPermission(Organization $organization, string $permission, ?Membership $membership = null): void
+    protected function checkPermission(Organization $organization, string $permission, ?Member $member = null): void
     {
         parent::checkPermission($organization, $permission);
-        if ($membership !== null && $membership->organization_id !== $organization->id) {
+        if ($member !== null && $member->organization_id !== $organization->id) {
             throw new AuthorizationException('Member does not belong to organization');
         }
     }
@@ -57,15 +58,15 @@ class MemberController extends Controller
      *
      * @operationId updateMember
      */
-    public function update(Organization $organization, Membership $membership, MemberUpdateRequest $request): JsonResource
+    public function update(Organization $organization, Member $member, MemberUpdateRequest $request): JsonResource
     {
-        $this->checkPermission($organization, 'members:update', $membership);
+        $this->checkPermission($organization, 'members:update', $member);
 
-        $membership->billable_rate = $request->input('billable_rate');
+        $member->billable_rate = $request->input('billable_rate');
-        $membership->role = $request->input('role');
+        $member->role = $request->input('role');
-        $membership->save();
+        $member->save();
 
-        return new MemberResource($membership);
+        return new MemberResource($member);
     }
 
     /**
@@ -75,18 +76,18 @@ class MemberController extends Controller
      *
      * @operationId removeMember
      */
-    public function destroy(Organization $organization, Membership $membership): JsonResponse
+    public function destroy(Organization $organization, Member $member): JsonResponse
     {
-        $this->checkPermission($organization, 'members:delete', $membership);
+        $this->checkPermission($organization, 'members:delete', $member);
 
-        if (TimeEntry::query()->where('user_id', $membership->user_id)->whereBelongsTo($organization, 'organization')->exists()) {
+        if (TimeEntry::query()->where('user_id', $member->user_id)->whereBelongsTo($organization, 'organization')->exists()) {
             throw new EntityStillInUseApiException('member', 'time_entry');
         }
-        if (ProjectMember::query()->whereBelongsToOrganization($organization)->where('user_id', $membership->user_id)->exists()) {
+        if (ProjectMember::query()->whereBelongsToOrganization($organization)->where('user_id', $member->user_id)->exists()) {
             throw new EntityStillInUseApiException('member', 'project_member');
         }
 
-        $membership->delete();
+        $member->delete();
 
         return response()
             ->json(null, 204);
@@ -99,20 +100,20 @@ class MemberController extends Controller
      *
      * @operationId invitePlaceholder
      */
-    public function invitePlaceholder(Organization $organization, Membership $membership, Request $request): JsonResponse
+    public function invitePlaceholder(Organization $organization, Member $member, Request $request): JsonResponse
     {
-        $this->checkPermission($organization, 'members:invite-placeholder', $membership);
+        $this->checkPermission($organization, 'members:invite-placeholder', $member);
-        $user = $membership->user;
+        $user = $member->user;
 
         if (! $user->is_placeholder) {
             throw new UserNotPlaceholderApiException();
         }
 
         app(InvitesTeamMembers::class)->invite(
-            $request->user(),
+            $this->user(),
             $organization,
             $user->email,
-            'employee'
+            Role::Employee->value,
         );
 
         return response()->json(null, 204);

app/Http/Controllers/Api/V1/ProjectController.php

@@ -17,7 +17,6 @@ use App\Models\User;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
 class ProjectController extends Controller
@@ -43,8 +42,7 @@ class ProjectController extends Controller
     {
         $this->checkPermission($organization, 'projects:view');
         $canViewAllProjects = $this->hasPermission($organization, 'projects:view:all');
-        /** @var User $user */
+        $user = $this->user();
-        $user = Auth::user();
 
         $projectsQuery = Project::query()
             ->whereBelongsTo($organization, 'organization');

app/Http/Controllers/Api/V1/ProjectMemberController.php

@@ -10,10 +10,10 @@ use App\Http\Requests\V1\ProjectMember\ProjectMemberStoreRequest;
 use App\Http\Requests\V1\ProjectMember\ProjectMemberUpdateRequest;
 use App\Http\Resources\V1\ProjectMember\ProjectMemberCollection;
 use App\Http\Resources\V1\ProjectMember\ProjectMemberResource;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
-use App\Models\User;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -62,17 +62,18 @@ class ProjectMemberController extends Controller
     {
         $this->checkPermission($organization, 'project-members:create', $project);
 
-        $user = User::findOrFail((string) $request->input('user_id'));
+        $member = Member::findOrFail((string) $request->input('member_id'));
-        if ($user->is_placeholder) {
+        if ($member->user->is_placeholder) {
             throw new InactiveUserCanNotBeUsedApiException();
         }
-        if (ProjectMember::whereBelongsTo($project, 'project')->whereBelongsTo($user, 'user')->exists()) {
+        if (ProjectMember::whereBelongsTo($project, 'project')->whereBelongsTo($member, 'member')->exists()) {
             throw new UserIsAlreadyMemberOfProjectApiException();
         }
 
         $projectMember = new ProjectMember();
         $projectMember->billable_rate = $request->input('billable_rate');
-        $projectMember->user()->associate($user);
+        $projectMember->member()->associate($member);
+        $projectMember->user()->associate($member->user);
         $projectMember->project()->associate($project);
         $projectMember->save();
 

app/Http/Controllers/Api/V1/TaskController.php

@@ -12,11 +12,9 @@ use App\Http\Resources\V1\Task\TaskCollection;
 use App\Http\Resources\V1\Task\TaskResource;
 use App\Models\Organization;
 use App\Models\Task;
-use App\Models\User;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\Auth;
 
 class TaskController extends Controller
 {
@@ -41,8 +39,7 @@ class TaskController extends Controller
     {
         $this->checkPermission($organization, 'tasks:view');
         $canViewAllTasks = $this->hasPermission($organization, 'tasks:view:all');
-        /** @var User $user */
+        $user = $this->user();
-        $user = Auth::user();
 
         $projectId = $request->input('project_id');
 

app/Http/Controllers/Api/V1/TimeEntryController.php

@@ -13,6 +13,7 @@ use App\Http\Requests\V1\TimeEntry\TimeEntryStoreRequest;
 use App\Http\Requests\V1\TimeEntry\TimeEntryUpdateRequest;
 use App\Http\Resources\V1\TimeEntry\TimeEntryCollection;
 use App\Http\Resources\V1\TimeEntry\TimeEntryResource;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\TimeEntry;
 use App\Service\TimeEntryFilter;
@@ -22,9 +23,9 @@ use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
-use Ramsey\Uuid\Type\Time;
 
 class TimeEntryController extends Controller
 {
@@ -48,7 +49,9 @@ class TimeEntryController extends Controller
      */
     public function index(Organization $organization, TimeEntryIndexRequest $request): JsonResource
     {
-        if ($request->has('user_id') && $request->get('user_id') === Auth::id()) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->get('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
@@ -62,7 +65,8 @@ class TimeEntryController extends Controller
         $filter->addBeforeFilter($request->input('before'));
         $filter->addAfterFilter($request->input('after'));
         $filter->addActiveFilter($request->input('active'));
-        $filter->addUserIdFilter($request->input('user_id'));
+        $filter->addMemberIdFilter($member);
+        $filter->addMemberIdsFilter($request->input('member_ids'));
         $filter->addProjectIdsFilter($request->input('project_ids'));
         $filter->addTagIdsFilter($request->input('tag_ids'));
         $filter->addTaskIdsFilter($request->input('task_ids'));
@@ -78,7 +82,7 @@ class TimeEntryController extends Controller
         $timeEntries = $timeEntriesQuery->get();
 
         if ($timeEntries->count() === $limit && $request->has('only_full_dates') && (bool) $request->get('only_full_dates') === true) {
-            $user = Auth::user();
+            $user = $this->user();
             $timezone = app(TimezoneService::class)->getTimezoneFromUser($user);
             $lastDate = null;
             /** @var TimeEntry $timeEntry */
@@ -113,11 +117,38 @@ class TimeEntryController extends Controller
     /**
      * Get aggregated time entries in organization
      *
+     * This endpoint allows you to filter time entries and aggregate them by different criteria.
+     * The parameters `group` and `sub_group` allow you to group the time entries by different criteria.
+     * If the group parameters are all set to `null` or are all missing, the endpoint will aggregate all filtered time entries.
+     *
+     * @operationId getAggregatedTimeEntries
+     *
+     * @return array{
+     *     data: array{
+     *          grouped_data: null|array<array{
+     *              type: string,
+     *              value: string|null,
+     *              aggregate: int,
+     *              cost: int,
+     *              grouped_data: null|array<array{
+     *                  type: string,
+     *                  value: string|null,
+     *                  aggregate: int,
+     *                  cost: int
+     *              }>
+     *          }>,
+     *          aggregate: int,
+     *          cost: int
+     *      }
+     * }
+     *
      * @throws AuthorizationException
      */
     public function aggregate(Organization $organization, TimeEntryAggregateRequest $request): array
     {
-        if ($request->has('user_id') && $request->get('user_id') === Auth::id()) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->get('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
@@ -130,7 +161,8 @@ class TimeEntryController extends Controller
         $filter->addBeforeFilter($request->input('before'));
         $filter->addAfterFilter($request->input('after'));
         $filter->addActiveFilter($request->input('active'));
-        $filter->addUserIdFilter($request->input('user_id'));
+        $filter->addMemberIdFilter($member);
+        $filter->addMemberIdsFilter($request->input('member_ids'));
         $filter->addProjectIdsFilter($request->input('project_ids'));
         $filter->addTagIdsFilter($request->input('tag_ids'));
         $filter->addTaskIdsFilter($request->input('task_ids'));
@@ -138,10 +170,12 @@ class TimeEntryController extends Controller
         $filter->addBillableFilter($request->input('billable'));
         $timeEntriesQuery = $filter->get();
 
-        $user = Auth::user();
+        $user = $this->user();
 
-        $group1Type = $request->get('group_1');
+        /** @var string|null $group1Type */
-        $group2Type = $request->get('group_2');
+        $group1Type = $request->get('group');
+        /** @var string|null $group2Type */
+        $group2Type = $request->get('sub_group');
 
         $group1Select = null;
         $group2Select = null;
@@ -178,11 +212,15 @@ class TimeEntryController extends Controller
             $group1ResponseSum = 0;
             $group1ResponseCost = 0;
             foreach ($groupedAggregates as $group1 => $group1Aggregates) {
+                /** @var string $group1 */
                 $group2Response = [];
                 if ($group2Select !== null) {
                     $group2ResponseSum = 0;
                     $group2ResponseCost = 0;
                     foreach ($group1Aggregates as $group2 => $aggregate) {
+                        /** @var string $group2 */
+                        /** @var Collection<int, object{aggregate: int, cost: int}> $aggregate */
+                        /** @var string $group2Type */
                         $group2Response[] = [
                             'type' => $group2Type,
                             'value' => $group2 === '' ? null : $group2,
@@ -193,15 +231,18 @@ class TimeEntryController extends Controller
                         $group2ResponseCost += (int) $aggregate->get(0)->cost;
                     }
                 } else {
+                    /** @var Collection<int, object{aggregate: int, cost: int}> $group1Aggregates */
                     $group2ResponseSum = (int) $group1Aggregates->get(0)->aggregate;
                     $group2ResponseCost = (int) $group1Aggregates->get(0)->cost;
                     $group2Response = null;
                 }
 
+                /** @var string $group1Type */
                 $group1Response[] = [
                     'type' => $group1Type,
                     'value' => $group1 === '' ? null : $group1,
                     'aggregate' => $group2ResponseSum,
+                    'cost' => $group2ResponseCost,
                     'grouped_data' => $group2Response,
                 ];
                 $group1ResponseSum += $group2ResponseSum;
@@ -209,6 +250,7 @@ class TimeEntryController extends Controller
             }
         } else {
             $group1Response = null;
+            /** @var Collection<int, object{aggregate: int, cost: int}> $timeEntriesAggregates */
             $group1ResponseSum = (int) $timeEntriesAggregates->get(0)->aggregate;
             $group1ResponseCost = (int) $timeEntriesAggregates->get(0)->cost;
         }
@@ -266,18 +308,21 @@ class TimeEntryController extends Controller
      */
     public function store(Organization $organization, TimeEntryStoreRequest $request): JsonResource
     {
-        if ($request->get('user_id') === Auth::id()) {
+        /** @var Member $member */
+        $member = Member::query()->findOrFail($request->get('member_id'));
+        if ($member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:create:own');
         } else {
             $this->checkPermission($organization, 'time-entries:create:all');
         }
 
-        if ($request->get('end') === null && TimeEntry::query()->where('user_id', $request->get('user_id'))->where('end', null)->exists()) {
+        if ($request->get('end') === null && TimeEntry::query()->whereBelongsTo($member, 'member')->where('end', null)->exists()) {
             throw new TimeEntryStillRunningApiException();
         }
 
         $timeEntry = new TimeEntry();
         $timeEntry->fill($request->validated());
+        $timeEntry->user_id = $member->user_id;
         $timeEntry->description = $request->get('description') ?? '';
         $timeEntry->organization()->associate($organization);
         $timeEntry->setComputedAttributeValue('billable_rate');
@@ -295,10 +340,12 @@ class TimeEntryController extends Controller
      */
     public function update(Organization $organization, TimeEntry $timeEntry, TimeEntryUpdateRequest $request): JsonResource
     {
-        if ($timeEntry->user_id === Auth::id() && $request->get('user_id') === Auth::id()) {
+        /** @var Member|null $member */
-            $this->checkPermission($organization, 'time-entries:update:own', $timeEntry);
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->get('member_id')) : null;
+        if ($timeEntry->member->user_id === Auth::id() && $member?->user_id === Auth::id()) {
+            $this->checkPermission($organization, 'time-entries:update:own');
         } else {
-            $this->checkPermission($organization, 'time-entries:update:all', $timeEntry);
+            $this->checkPermission($organization, 'time-entries:update:all');
         }
 
         if ($timeEntry->end !== null && $request->has('end') && $request->get('end') === null) {
@@ -321,7 +368,7 @@ class TimeEntryController extends Controller
      */
     public function destroy(Organization $organization, TimeEntry $timeEntry): JsonResponse
     {
-        if ($timeEntry->user_id === Auth::id()) {
+        if ($timeEntry->member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:delete:own', $timeEntry);
         } else {
             $this->checkPermission($organization, 'time-entries:delete:all', $timeEntry);

app/Http/Controllers/Api/V1/UserTimeEntryController.php

@@ -10,7 +10,6 @@ use App\Models\TimeEntry;
 use App\Models\User;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
 class UserTimeEntryController extends Controller
@@ -24,8 +23,7 @@ class UserTimeEntryController extends Controller
      */
     public function myActive(): JsonResource
     {
-        /** @var User $user */
+        $user = $this->user();
-        $user = Auth::user();
 
         $activeTimeEntriesOfUser = TimeEntry::query()
             ->whereBelongsTo($user, 'user')

app/Http/Requests/V1/ProjectMember/ProjectMemberStoreRequest.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\ProjectMember;
 
+use App\Models\Member;
 use App\Models\Organization;
-use App\Models\User;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
@@ -24,12 +24,12 @@ class ProjectMemberStoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'user_id' => [
+            'member_id' => [
                 'required',
                 'uuid',
-                new ExistsEloquent(User::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<User> $builder */
+                    /** @var Builder<Member> $builder */
-                    return $builder->belongsToOrganization($this->organization);
+                    return $builder->whereBelongsTo($this->organization, 'organization');
                 }),
             ],
             'billable_rate' => [

app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Tag;
@@ -28,14 +29,38 @@ class TimeEntryAggregateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'group_1' => [
+            'group' => [
+                'nullable',
                 'required_with:group_2',
                 'in:day,week,month,year,user,project,task,client,billable',
             ],
 
-            'group_2' => [
+            'sub_group' => [
+                'nullable',
                 'in:day,week,month,year,user,project,task,client,billable',
             ],
+            // Filter by member ID
+            'member_id' => [
+                'string',
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Member> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
+            ],
+            // Filter by multiple member IDs, member IDs are OR combined, but AND combined with the member_id parameter
+            'member_ids' => [
+                'array',
+                'min:1',
+            ],
+            'member_ids.*' => [
+                'string',
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Member> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
+            ],
 
             // Filter by user ID
             'user_id' => [

app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php

@@ -4,11 +4,11 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
-use App\Models\User;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
@@ -28,13 +28,26 @@ class TimeEntryIndexRequest extends FormRequest
     public function rules(): array
     {
         return [
-            // Filter by user ID
+            // Filter by member ID
-            'user_id' => [
+            'member_id' => [
                 'string',
                 'uuid',
-                new ExistsEloquent(User::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<User> $builder */
+                    /** @var Builder<Member> $builder */
-                    return $builder->belongsToOrganization($this->organization);
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
+            ],
+            // Filter by multiple member IDs, member IDs are OR combined, but AND combined with the member_id parameter
+            'member_ids' => [
+                'array',
+                'min:1',
+            ],
+            'member_ids.*' => [
+                'string',
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Member> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
                 }),
             ],
             // Filter by project IDs, project IDs are OR combined

app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php

@@ -4,11 +4,11 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
-use App\Models\User;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
@@ -27,14 +27,14 @@ class TimeEntryStoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            // ID of the user that the time entry should belong to
+            // ID of the organization member that the time entry should belong to
-            'user_id' => [
+            'member_id' => [
                 'required',
                 'string',
                 'uuid',
-                new ExistsEloquent(User::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
-                    /** @var Builder<User> $builder */
+                    /** @var Builder<Member> $builder */
-                    return $builder->belongsToOrganization($this->organization);
+                    return $builder->whereBelongsTo($this->organization, 'organization');
                 }),
             ],
             'project_id' => [

app/Http/Requests/V1/TimeEntry/TimeEntryUpdateRequest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Tag;
@@ -26,6 +27,16 @@ class TimeEntryUpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
+            // ID of the organization member that the time entry should belong to
+            'member_id' => [
+                'string',
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Member> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
+            ],
+            // ID of the project that the time entry should belong to
             'project_id' => [
                 'nullable',
                 'string',

app/Http/Resources/V1/Member/MemberPivotResource.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Http\Resources\V1\Member;
 
 use App\Http\Resources\V1\BaseResource;
-use App\Models\Membership;
+use App\Models\Member;
 use App\Models\User;
 use Illuminate\Http\Request;
 
@@ -21,12 +21,12 @@ class MemberPivotResource extends BaseResource
      */
     public function toArray(Request $request): array
     {
-        /** @var Membership $membership */
+        /** @var Member $member */
-        $membership = $this->resource->getRelationValue('membership');
+        $member = $this->resource->getRelationValue('membership');
 
         return [
             /** @var string $id ID of membership */
-            'id' => $membership->id,
+            'id' => $member->id,
             /** @var string $id ID of user */
             'user_id' => $this->resource->id,
             /** @var string $name Name */
@@ -34,11 +34,11 @@ class MemberPivotResource extends BaseResource
             /** @var string $email Email */
             'email' => $this->resource->email,
             /** @var string $role Role */
-            'role' => $membership->role,
+            'role' => $member->role,
             /** @var bool $is_placeholder Placeholder user for imports, user might not really exist and does not know about this placeholder membership */
             'is_placeholder' => $this->resource->is_placeholder,
             /** @var int|null $billable_rate Billable rate in cents per hour */
-            'billable_rate' => $membership->billable_rate,
+            'billable_rate' => $member->billable_rate,
         ];
     }
 }

app/Http/Resources/V1/Member/MemberResource.php

@@ -5,12 +5,12 @@ declare(strict_types=1);
 namespace App\Http\Resources\V1\Member;
 
 use App\Http\Resources\V1\BaseResource;
-use App\Models\Membership;
+use App\Models\Member;
 use App\Models\User;
 use Illuminate\Http\Request;
 
 /**
- * @property Membership $resource
+ * @property Member $resource
  */
 class MemberResource extends BaseResource
 {

app/Http/Resources/V1/ProjectMember/ProjectMemberResource.php

@@ -25,8 +25,8 @@ class ProjectMemberResource extends BaseResource
             'id' => $this->resource->id,
             /** @var int|null $billable_rate Billable rate in cents per hour */
             'billable_rate' => $this->resource->billable_rate,
-            /** @var string $user_id ID of the user */
+            /** @var string $member_id ID of the organization member */
-            'user_id' => $this->resource->user_id,
+            'member_id' => $this->resource->member_id,
             /** @var string $project_id ID of the project */
             'project_id' => $this->resource->project_id,
         ];

app/Listeners/RemovePlaceholder.php

@@ -4,8 +4,9 @@ declare(strict_types=1);
 
 namespace App\Listeners;
 
-use App\Models\User;
+use App\Models\Member;
 use App\Service\UserService;
+use Illuminate\Database\Eloquent\Builder;
 use Laravel\Jetstream\Events\TeamMemberAdded;
 
 class RemovePlaceholder
@@ -17,15 +18,21 @@ class RemovePlaceholder
     {
         /** @var UserService $userService */
         $userService = app(UserService::class);
-        $placeholders = User::query()
+        $placeholders = Member::query()
-            ->where('is_placeholder', '=', true)
+            ->whereHas('user', function (Builder $query) use ($event) {
-            ->where('email', '=', $event->user->email)
+                $query->where('is_placeholder', '=', true)
-            ->belongsToOrganization($event->team)
+                    ->where('email', '=', $event->user->email);
+            })
+            ->whereBelongsTo($event->team, 'organization')
+            ->with(['user'])
             ->get();
 
         foreach ($placeholders as $placeholder) {
-            $userService->assignOrganizationEntitiesToDifferentUser($event->team, $placeholder, $event->user);
+            /** @var Member $placeholder */
+            $placeholderUser = $placeholder->user;
+            $userService->assignOrganizationEntitiesToDifferentUser($event->team, $placeholderUser, $event->user);
             $placeholder->delete();
+            $placeholderUser->delete();
         }
     }
 }

app/Models/Member.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Models;
 
 use App\Models\Concerns\HasUuids;
-use Database\Factories\MembershipFactory;
+use Database\Factories\MemberFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Laravel\Jetstream\Membership as JetstreamMembership;
@@ -21,9 +21,9 @@ use Laravel\Jetstream\Membership as JetstreamMembership;
  * @property-read Organization $organization
  * @property-read User $user
  *
- * @method static MembershipFactory factory()
+ * @method static MemberFactory factory()
  */
-class Membership extends JetstreamMembership
+class Member extends JetstreamMembership
 {
     use HasFactory;
     use HasUuids;
@@ -33,10 +33,10 @@ class Membership extends JetstreamMembership
      *
      * @var string
      */
-    protected $table = 'organization_user';
+    protected $table = 'members';
 
     /**
-     * @return BelongsTo<User, Membership>
+     * @return BelongsTo<User, Member>
      */
     public function user(): BelongsTo
     {
@@ -44,7 +44,7 @@ class Membership extends JetstreamMembership
     }
 
     /**
-     * @return BelongsTo<Organization, Membership>
+     * @return BelongsTo<Organization, Member>
      */
     public function organization(): BelongsTo
     {

app/Models/Organization.php

@@ -30,7 +30,7 @@ use Laravel\Jetstream\Team as JetstreamTeam;
  * @property Collection<int, User> $users
  * @property Collection<int, User> $realUsers
  * @property-read Collection<int, OrganizationInvitation> $teamInvitations
- * @property Membership $membership
+ * @property Member $membership
  *
  * @method HasMany<OrganizationInvitation> teamInvitations()
  * @method static OrganizationFactory factory()

app/Models/ProjectMember.php

@@ -14,9 +14,11 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 /**
  * @property string $id
  * @property int|null $billable_rate
- * @property string $project_id
+ * @property string $project_id Project ID
- * @property string $user_id
+ * @property string $member_id Member ID
+ * @property string $user_id User ID (legacy)
  * @property-read Project $project
+ * @property-read Member $member
  * @property-read User $user
  *
  * @method static Builder<ProjectMember> whereBelongsToOrganization(Organization $organization)
@@ -45,6 +47,8 @@ class ProjectMember extends Model
     }
 
     /**
+     * @deprecated Use member relationship instead
+     *
      * @return BelongsTo<User, ProjectMember>
      */
     public function user(): BelongsTo
@@ -52,6 +56,14 @@ class ProjectMember extends Model
         return $this->belongsTo(User::class, 'user_id');
     }
 
+    /**
+     * @return BelongsTo<Member, ProjectMember>
+     */
+    public function member(): BelongsTo
+    {
+        return $this->belongsTo(Member::class, 'member_id');
+    }
+
     /**
      * @param  Builder<ProjectMember>  $builder
      */

app/Models/Task.php

@@ -65,9 +65,14 @@ class Task extends Model
         return $this->hasMany(TimeEntry::class, 'task_id');
     }
 
+    /**
+     * @param  Builder<Task>  $builder
+     * @return Builder<Task>
+     */
     public function scopeVisibleByUser(Builder $builder, User $user): Builder
     {
         return $builder->whereHas('project', function (Builder $builder) use ($user): Builder {
+            /** @var Builder<Project> $builder */
             return $builder->visibleByUser($user);
         });
     }

app/Models/TimeEntry.php

@@ -24,7 +24,9 @@ use Korridor\LaravelComputedAttributes\ComputedAttributes;
  * @property bool $billable
  * @property array $tags
  * @property string $user_id
+ * @property string $member_id
  * @property-read User $user
+ * @property-read Member $member
  * @property string $organization_id
  * @property-read Organization $organization
  * @property string|null $project_id
@@ -91,6 +93,14 @@ class TimeEntry extends Model
         return $this->belongsTo(User::class, 'user_id');
     }
 
+    /**
+     * @return BelongsTo<Member, TimeEntry>
+     */
+    public function member(): BelongsTo
+    {
+        return $this->belongsTo(Member::class, 'member_id');
+    }
+
     /**
      * @return BelongsTo<Organization, TimeEntry>
      */

app/Models/User.php

@@ -43,7 +43,7 @@ use Laravel\Passport\HasApiTokens;
  * @property string $current_team_id
  * @property Collection<int, Organization> $organizations
  * @property Collection<int, TimeEntry> $timeEntries
- * @property Membership $membership
+ * @property Member $membership
  *
  * @method HasMany<Organization> ownedTeams()
  * @method static UserFactory factory()
@@ -136,7 +136,7 @@ class User extends Authenticatable implements FilamentUser, MustVerifyEmail
      */
     public function organizations(): BelongsToMany
     {
-        return $this->belongsToMany(Organization::class, Membership::class)
+        return $this->belongsToMany(Organization::class, Member::class)
             ->withPivot([
                 'id',
                 'role',

app/Providers/AppServiceProvider.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Providers;
 
 use App\Models\Client;
-use App\Models\Membership;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use App\Models\Project;
@@ -51,7 +51,7 @@ class AppServiceProvider extends ServiceProvider
         Model::preventSilentlyDiscardingAttributes(! $this->app->isProduction());
         Model::preventAccessingMissingAttributes(! $this->app->isProduction());
         Relation::enforceMorphMap([
-            'membership' => Membership::class,
+            'membership' => Member::class,
             'organization' => Organization::class,
             'organization-invitation' => OrganizationInvitation::class,
             'user' => User::class,
@@ -85,7 +85,7 @@ class AppServiceProvider extends ServiceProvider
             return new PermissionStore();
         });
 
-        Route::model('member', Membership::class);
+        Route::model('member', Member::class);
         Route::model('invitation', OrganizationInvitation::class);
     }
 }

app/Providers/JetstreamServiceProvider.php

@@ -14,6 +14,7 @@ use App\Actions\Jetstream\UpdateMemberRole;
 use App\Actions\Jetstream\UpdateOrganization;
 use App\Enums\Role;
 use App\Enums\Weekday;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use App\Models\User;
@@ -50,6 +51,7 @@ class JetstreamServiceProvider extends ServiceProvider
         Jetstream::deleteTeamsUsing(DeleteOrganization::class);
         Jetstream::deleteUsersUsing(DeleteUser::class);
         Jetstream::useTeamModel(Organization::class);
+        Jetstream::useMembershipModel(Member::class);
         Jetstream::useTeamInvitationModel(OrganizationInvitation::class);
         app()->singleton(UpdateTeamMemberRole::class, UpdateMemberRole::class);
     }

app/Service/BillableRateService.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Models\Membership;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
@@ -36,13 +36,13 @@ class BillableRateService
             }
         }
         // Member rate
-        /** @var Membership|null $membership */
+        /** @var Member|null $member */
-        $membership = Membership::query()
+        $member = Member::query()
             ->where('user_id', '=', $timeEntry->user_id)
             ->where('organization_id', '=', $timeEntry->organization_id)
             ->first();
-        if ($membership !== null && $membership->billable_rate !== null) {
+        if ($member !== null && $member->billable_rate !== null) {
-            return $membership->billable_rate;
+            return $member->billable_rate;
         }
 
         // Organization rate

app/Service/DashboardService.php

@@ -335,20 +335,22 @@ class DashboardService
     }
 
     /**
-     * Rhe 4 most recently active members of your team with user_id, name, description of the latest time entry, time_entry_id, task_id and a boolean status if the team member is currently working
+     * Rhe 4 most recently active members of your team with member_id, name, description of the latest time entry, time_entry_id, task_id and a boolean status if the team member is currently working
      *
-     * @return array<int, array{user_id: string, name: string, description: string|null, time_entry_id: string, task_id: string|null, status: bool }>
+     * @return array<int, array{member_id: string, name: string, description: string|null, time_entry_id: string, task_id: string|null, status: bool }>
      */
     public function latestTeamActivity(Organization $organization): array
     {
         $timeEntries = TimeEntry::query()
-            ->select(DB::raw('distinct on (user_id) user_id, description, id, task_id, start, "end"'))
+            ->select(DB::raw('distinct on (member_id) member_id, description, id, task_id, start, "end"'))
             ->whereBelongsTo($organization, 'organization')
-            ->orderBy('user_id')
+            ->orderBy('member_id')
             ->orderBy('start', 'desc')
             // Note: limit here does not work because of the distinct on
             ->with([
-                'user',
+                'member' => [
+                    'user',
+                ],
             ])
             ->get()
             ->sortByDesc('start')
@@ -358,8 +360,8 @@ class DashboardService
 
         foreach ($timeEntries as $timeEntry) {
             $response[] = [
-                'user_id' => $timeEntry->user_id,
+                'member_id' => $timeEntry->member_id,
-                'name' => $timeEntry->user->name,
+                'name' => $timeEntry->member->user->name,
                 'description' => $timeEntry->description,
                 'time_entry_id' => $timeEntry->id,
                 'task_id' => $timeEntry->task_id,

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -56,6 +56,10 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                     'timezone' => 'UTC',
                     'is_placeholder' => true,
                 ]);
+                $memberId = $this->memberImportHelper->getKey([
+                    'user_id' => $userId,
+                    'organization_id' => $this->organization->getKey(),
+                ]);
                 $clientId = null;
                 if ($record['Client'] !== '') {
                     $clientId = $this->clientImportHelper->getKey([
@@ -83,6 +87,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                 }
                 $timeEntry = new TimeEntry();
                 $timeEntry->user_id = $userId;
+                $timeEntry->member_id = $memberId;
                 $timeEntry->task_id = $taskId;
                 $timeEntry->project_id = $projectId;
                 $timeEntry->organization_id = $this->organization->id;

app/Service/Import/Importers/DefaultImporter.php

@@ -6,6 +6,7 @@ namespace App\Service\Import\Importers;
 
 use App\Enums\Role;
 use App\Models\Client;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
@@ -26,6 +27,11 @@ abstract class DefaultImporter implements ImporterContract
      */
     protected ImportDatabaseHelper $userImportHelper;
 
+    /**
+     * @var ImportDatabaseHelper<Member>
+     */
+    protected ImportDatabaseHelper $memberImportHelper;
+
     /**
      * @var ImportDatabaseHelper<Project>
      */
@@ -77,6 +83,10 @@ abstract class DefaultImporter implements ImporterContract
                 'timezone:all',
             ],
         ]);
+        $this->memberImportHelper = new ImportDatabaseHelper(Member::class, ['user_id', 'organization_id'], true, function (Builder $builder) {
+            /** @var Builder<Member> $builder */
+            return $builder->whereBelongsTo($this->organization, 'organization');
+        });
         $this->projectImportHelper = new ImportDatabaseHelper(Project::class, ['name', 'organization_id'], true, function (Builder $builder) {
             /** @var Builder<Project> $builder */
             return $builder->where('organization_id', $this->organization->id);
@@ -90,7 +100,7 @@ abstract class DefaultImporter implements ImporterContract
                 'integer',
             ],
         ]);
-        $this->projectMemberImportHelper = new ImportDatabaseHelper(ProjectMember::class, ['project_id', 'user_id'], true, function (Builder $builder) {
+        $this->projectMemberImportHelper = new ImportDatabaseHelper(ProjectMember::class, ['project_id', 'member_id'], true, function (Builder $builder) {
             /** @var Builder<ProjectMember> $builder */
             return $builder->whereBelongsToOrganization($this->organization);
         }, validate: [

app/Service/Import/Importers/TogglDataImporter.php

@@ -74,13 +74,17 @@ class TogglDataImporter extends DefaultImporter
             }
 
             foreach ($workspaceUsers as $workspaceUser) {
-                $this->userImportHelper->getKey([
+                $userId = $this->userImportHelper->getKey([
                     'email' => $workspaceUser->email,
                 ], [
                     'name' => $workspaceUser->name,
                     'timezone' => $workspaceUser->timezone ?? 'UTC',
                     'is_placeholder' => true,
                 ], (string) $workspaceUser->uid);
+                $memberId = $this->memberImportHelper->getKey([
+                    'user_id' => $userId,
+                    'organization_id' => $this->organization->getKey(),
+                ], [], $userId);
             }
 
             foreach ($projects as $project) {
@@ -114,10 +118,12 @@ class TogglDataImporter extends DefaultImporter
                 }
                 $projectMembers = json_decode($projectMembersFileContent);
                 foreach ($projectMembers as $projectMember) {
+                    $userId = $this->userImportHelper->getKeyByExternalIdentifier((string) $projectMember->user_id);
                     $this->projectMemberImportHelper->getKey([
                         'project_id' => $projectId,
-                        'user_id' => $this->userImportHelper->getKeyByExternalIdentifier((string) $projectMember->user_id),
+                        'member_id' => $this->memberImportHelper->getKeyByExternalIdentifier($userId),
                     ], [
+                        'user_id' => $userId,
                         'billable_rate' => $projectMember->rate !== null ? (int) ($projectMember->rate * 100) : null,
                     ]);
                 }

app/Service/Import/Importers/TogglTimeEntriesImporter.php

@@ -56,6 +56,10 @@ class TogglTimeEntriesImporter extends DefaultImporter
                     'timezone' => 'UTC',
                     'is_placeholder' => true,
                 ]);
+                $memberId = $this->memberImportHelper->getKey([
+                    'user_id' => $userId,
+                    'organization_id' => $this->organization->getKey(),
+                ]);
                 $clientId = null;
                 if ($record['Client'] !== '') {
                     $clientId = $this->clientImportHelper->getKey([
@@ -83,6 +87,7 @@ class TogglTimeEntriesImporter extends DefaultImporter
                 }
                 $timeEntry = new TimeEntry();
                 $timeEntry->user_id = $userId;
+                $timeEntry->member_id = $memberId;
                 $timeEntry->task_id = $taskId;
                 $timeEntry->project_id = $projectId;
                 $timeEntry->organization_id = $this->organization->id;

app/Service/TimeEntryFilter.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Service;
 
+use App\Models\Member;
 use App\Models\TimeEntry;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -59,12 +60,25 @@ class TimeEntryFilter
         return $this;
     }
 
-    public function addUserIdFilter(?string $userId): self
+    public function addMemberIdFilter(?Member $member): self
     {
-        if ($userId === null) {
+        if ($member === null) {
             return $this;
         }
-        $this->builder->where('user_id', $userId);
+        $this->builder->where('member_id', $member->getKey());
+
+        return $this;
+    }
+
+    /**
+     * @param  array<string>|null  $memberIds
+     */
+    public function addMemberIdsFilter(?array $memberIds): self
+    {
+        if ($memberIds === null) {
+            return $this;
+        }
+        $this->builder->whereIn('member_id', $memberIds);
 
         return $this;
     }

app/Service/UserService.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Service;
 
 use App\Enums\Role;
-use App\Models\Membership;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\ProjectMember;
 use App\Models\TimeEntry;
@@ -19,12 +19,22 @@ class UserService
      */
     public function assignOrganizationEntitiesToDifferentUser(Organization $organization, User $fromUser, User $toUser): void
     {
+        /** @var Member|null $toMember */
+        $toMember = Member::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->whereBelongsTo($toUser, 'user')
+            ->first();
+        if ($toMember === null) {
+            throw new \InvalidArgumentException('User is not a member of the organization');
+        }
+
         // Time entries
         TimeEntry::query()
             ->whereBelongsTo($organization, 'organization')
             ->whereBelongsTo($fromUser, 'user')
             ->update([
                 'user_id' => $toUser->getKey(),
+                'member_id' => $toMember->getKey(),
             ]);
 
         // Project members
@@ -33,6 +43,7 @@ class UserService
             ->whereBelongsTo($fromUser, 'user')
             ->update([
                 'user_id' => $toUser->getKey(),
+                'member_id' => $toMember->getKey(),
             ]);
     }
 
@@ -45,13 +56,17 @@ class UserService
         $organization->update([
             'user_id' => $newOwner->getKey(),
         ]);
-        $userMembership = Membership::query()
+        /** @var Member|null $userMembership */
+        $userMembership = Member::query()
             ->whereBelongsTo($organization, 'organization')
             ->whereBelongsTo($newOwner, 'user')
             ->first();
+        if ($userMembership === null) {
+            throw new \InvalidArgumentException('User is not a member of the organization');
+        }
         $userMembership->role = Role::Owner->value;
         $userMembership->save();
-        $oldOwners = Membership::query()
+        $oldOwners = Member::query()
             ->whereBelongsTo($organization, 'organization')
             ->where('role', '=', Role::Owner->value)
             ->where('user_id', '!=', $newOwner->getKey())

database/factories/MemberFactory.php

@@ -5,15 +5,15 @@ declare(strict_types=1);
 namespace Database\Factories;
 
 use App\Enums\Role;
-use App\Models\Membership;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<Membership>
+ * @extends Factory<Member>
  */
-class MembershipFactory extends Factory
+class MemberFactory extends Factory
 {
     /**
      * Define the model's default state.
@@ -24,11 +24,20 @@ class MembershipFactory extends Factory
     {
         return [
             'role' => Role::Employee,
-            'organization_id' => OrganizationFactory::class,
+            'organization_id' => Organization::factory(),
-            'user_id' => UserFactory::class,
+            'user_id' => User::factory(),
         ];
     }
 
+    public function role(Role $role): static
+    {
+        return $this->state(function (array $attributes) use ($role): array {
+            return [
+                'role' => $role->value,
+            ];
+        });
+    }
+
     public function forOrganization(Organization $organization): static
     {
         return $this->state(function (array $attributes) use ($organization): array {

database/factories/ProjectFactory.php

@@ -5,10 +5,10 @@ declare(strict_types=1);
 namespace Database\Factories;
 
 use App\Models\Client;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
-use App\Models\User;
 use App\Service\ColorService;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -61,12 +61,12 @@ class ProjectFactory extends Factory
         });
     }
 
-    public function addMember(User $user, array $attributes = []): self
+    public function addMember(Member $member, array $attributes = []): self
     {
-        return $this->afterCreating(function (Project $project) use ($user, $attributes): void {
+        return $this->afterCreating(function (Project $project) use ($member, $attributes): void {
             ProjectMember::factory()
                 ->forProject($project)
-                ->forUser($user)
+                ->forMember($member)
                 ->create($attributes);
         });
     }

database/factories/ProjectMemberFactory.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Database\Factories;
 
+use App\Models\Member;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\User;
@@ -25,9 +26,13 @@ class ProjectMemberFactory extends Factory
             'billable_rate' => $this->faker->numberBetween(10, 10000) * 100,
             'project_id' => Project::factory(),
             'user_id' => User::factory(),
+            'member_id' => Member::factory(),
         ];
     }
 
+    /**
+     * @deprecated Use forMember instead
+     */
     public function forUser(User $user): self
     {
         return $this->state(function (array $attributes) use ($user): array {
@@ -37,6 +42,16 @@ class ProjectMemberFactory extends Factory
         });
     }
 
+    public function forMember(Member $member): self
+    {
+        return $this->state(function (array $attributes) use ($member): array {
+            return [
+                'member_id' => $member->getKey(),
+                'user_id' => $member->user_id, // Legacy
+            ];
+        });
+    }
+
     public function forProject(Project $project): self
     {
         return $this->state(function (array $attributes) use ($project): array {

database/factories/TimeEntryFactory.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Database\Factories;
 
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Tag;
@@ -34,6 +35,7 @@ class TimeEntryFactory extends Factory
             'billable' => $this->faker->boolean(),
             'tags' => [],
             'user_id' => User::factory(),
+            'member_id' => Member::factory(),
             'task_id' => null,
             'project_id' => null,
             'organization_id' => Organization::factory(),
@@ -86,6 +88,9 @@ class TimeEntryFactory extends Factory
         });
     }
 
+    /**
+     * @deprecated Use forMember instead
+     */
     public function forUser(User $user): self
     {
         return $this->state(function (array $attributes) use ($user) {
@@ -95,6 +100,17 @@ class TimeEntryFactory extends Factory
         });
     }
 
+    public function forMember(Member $member): static
+    {
+        return $this->state(function (array $attributes) use ($member): array {
+            return [
+                'member_id' => $member->getKey(),
+                'user_id' => $member->user_id,
+                'organization_id' => $member->organization_id,
+            ];
+        });
+    }
+
     public function forOrganization(Organization $organization): self
     {
         return $this->state(function (array $attributes) use ($organization) {

database/migrations/2024_05_07_134711_move_from_user_id_to_member_id_in_project_members_table.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('project_members', function (Blueprint $table): void {
+            $table->foreignUuid('member_id')
+                ->nullable()
+                ->constrained('organization_user')
+                ->cascadeOnDelete()
+                ->cascadeOnUpdate();
+        });
+        DB::statement('
+            update project_members
+            set member_id = organization_user.id
+            from projects
+            join organization_user on organization_user.organization_id = projects.organization_id
+            where projects.id = project_members.project_id and project_members.user_id = organization_user.user_id
+        ');
+        Schema::table('project_members', function (Blueprint $table): void {
+            $table->uuid('member_id')->nullable(false)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('project_members', function (Blueprint $table): void {
+            $table->dropForeign(['member_id']);
+            $table->dropColumn('member_id');
+        });
+    }
+};

database/migrations/2024_05_07_141842_move_from_user_id_to_member_id_in_time_entries_table.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+
+        Schema::table('time_entries', function (Blueprint $table): void {
+            $table->foreignUuid('member_id')
+                ->nullable()
+                ->constrained('organization_user')
+                ->cascadeOnDelete()
+                ->cascadeOnUpdate();
+        });
+        DB::statement('
+            update time_entries
+            set member_id = organization_user.id
+            from organization_user
+            where time_entries.organization_id = organization_user.organization_id and
+                  time_entries.user_id = organization_user.user_id
+        ');
+        Schema::table('time_entries', function (Blueprint $table): void {
+            $table->uuid('member_id')->nullable(false)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('time_entries', function (Blueprint $table): void {
+            $table->dropForeign(['member_id']);
+            $table->dropColumn('member_id');
+        });
+    }
+};

database/migrations/2024_05_13_171020_rename_table_organization_user_to_members.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::rename('organization_user', 'members');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::rename('members', 'organization_user');
+    }
+};

database/seeders/DatabaseSeeder.php

@@ -4,9 +4,9 @@ declare(strict_types=1);
 
 namespace Database\Seeders;
 
-// use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use App\Enums\Role;
 use App\Models\Client;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
@@ -25,6 +25,11 @@ class DatabaseSeeder extends Seeder
     public function run(): void
     {
         $this->deleteAll();
+        $userWithMultipleOrganizations = User::factory()->withPersonalOrganization()->create([
+            'name' => 'Mister Overemployed',
+            'email' => 'overemployed@acme.test',
+        ]);
+
         $userAcmeOwner = User::factory()->withPersonalOrganization()->create([
             'name' => 'Acme Owner',
             'email' => 'owner@acme.test',
@@ -34,7 +39,7 @@ class DatabaseSeeder extends Seeder
             'personal_team' => false,
             'currency' => 'EUR',
         ]);
-        $userAcmeManager = User::factory()->withPersonalOrganization()->create([
+        $userRivalManager = User::factory()->withPersonalOrganization()->create([
             'name' => 'Acme Manager',
             'email' => 'test@example.com',
         ]);
@@ -51,36 +56,28 @@ class DatabaseSeeder extends Seeder
             'email' => 'old.employee@acme.test',
             'password' => null,
         ]);
-        $userAcmeOwner->organizations()->attach($organizationAcme, [
+        $userAcmeOwnerMember = Member::factory()->forUser($userAcmeOwner)->forOrganization($organizationAcme)->role(Role::Owner)->create();
-            'role' => Role::Owner->value,
+        $userAcmeManagerMember = Member::factory()->forUser($userRivalManager)->forOrganization($organizationAcme)->role(Role::Manager)->create();
-        ]);
+        $userAcmeAdminMember = Member::factory()->forUser($userAcmeAdmin)->forOrganization($organizationAcme)->role(Role::Admin)->create();
-        $userAcmeManager->organizations()->attach($organizationAcme, [
+        $userAcmeEmployeeMember = Member::factory()->forUser($userAcmeEmployee)->forOrganization($organizationAcme)->role(Role::Employee)->create();
-            'role' => Role::Manager->value,
+        $userAcmePlaceholderMember = Member::factory()->forUser($userAcmePlaceholder)->forOrganization($organizationAcme)->role(Role::Placeholder)->create();
-        ]);
+        $userWithMultipleOrganizationsAcmeMember = Member::factory()->forUser($userWithMultipleOrganizations)->forOrganization($organizationAcme)->role(Role::Employee)->create();
-        $userAcmeAdmin->organizations()->attach($organizationAcme, [
-            'role' => Role::Admin->value,
-        ]);
-        $userAcmeEmployee->organizations()->attach($organizationAcme, [
-            'role' => Role::Employee->value,
-        ]);
-        $userAcmePlaceholder->organizations()->attach($organizationAcme, [
-            'role' => Role::Placeholder->value,
-        ]);
 
-        $timeEntriesAcmeAdmin = TimeEntry::factory()
+        TimeEntry::factory()
             ->count(10)
-            ->forUser($userAcmeAdmin)
+            ->forMember($userAcmeAdminMember)
-            ->forOrganization($organizationAcme)
             ->create();
-        $timeEntriesAcmePlaceholder = TimeEntry::factory()
+        TimeEntry::factory()
             ->count(10)
-            ->forUser($userAcmePlaceholder)
+            ->forMember($userAcmePlaceholderMember)
-            ->forOrganization($organizationAcme)
             ->create();
-        $timeEntriesAcmePlaceholder = TimeEntry::factory()
+        TimeEntry::factory()
             ->count(10)
-            ->forUser($userAcmeEmployee)
+            ->forMember($userAcmeEmployeeMember)
-            ->forOrganization($organizationAcme)
+            ->create();
+        TimeEntry::factory()
+            ->count(5)
+            ->forMember($userWithMultipleOrganizationsAcmeMember)
             ->create();
         $client = Client::factory()->forOrganization($organizationAcme)->create([
             'name' => 'Big Company',
@@ -88,6 +85,10 @@ class DatabaseSeeder extends Seeder
         $bigCompanyProject = Project::factory()->forOrganization($organizationAcme)->forClient($client)->create([
             'name' => 'Big Company Project',
         ]);
+        ProjectMember::factory()->forProject($bigCompanyProject)->forMember($userAcmeEmployeeMember)->create();
+        ProjectMember::factory()->forProject($bigCompanyProject)->forMember($userAcmeAdminMember)->create();
+        ProjectMember::factory()->forProject($bigCompanyProject)->forMember($userWithMultipleOrganizationsAcmeMember)->create();
+
         Task::factory()->forOrganization($organizationAcme)->forProject($bigCompanyProject)->create();
 
         $internalProject = Project::factory()->forOrganization($organizationAcme)->create([
@@ -98,21 +99,26 @@ class DatabaseSeeder extends Seeder
             'name' => 'Other Owner',
             'email' => 'owner@rival-company.test',
         ]);
-        $organization2 = Organization::factory()->withOwner($organization2Owner)->create([
+        $organizationRival = Organization::factory()->withOwner($organization2Owner)->create([
             'name' => 'Rival Corp',
             'personal_team' => true,
             'currency' => 'USD',
         ]);
-        $userAcmeManager = User::factory()->withPersonalOrganization()->create([
+        $userRivalManager = User::factory()->withPersonalOrganization()->create([
             'name' => 'Other User',
             'email' => 'test@rival-company.test',
         ]);
-        $userAcmeManager->organizations()->attach($organization2, [
+        $userRivalManagerMember = Member::factory()->forUser($userRivalManager)->forOrganization($organizationRival)->role(Role::Admin)->create();
-            'role' => Role::Admin->value,
+        $userWithMultipleOrganizationsRivalMember = Member::factory()->forUser($userWithMultipleOrganizations)->forOrganization($organizationRival)->role(Role::Employee)->create();
-        ]);
+        $otherCompanyProject = Project::factory()->forOrganization($organizationRival)->forClient($client)->create([
-        $otherCompanyProject = Project::factory()->forOrganization($organization2)->forClient($client)->create([
             'name' => 'Scale Company',
         ]);
+        ProjectMember::factory()->forProject($otherCompanyProject)->forMember($userRivalManagerMember)->create();
+        ProjectMember::factory()->forProject($otherCompanyProject)->forMember($userWithMultipleOrganizationsRivalMember)->create();
+        TimeEntry::factory()
+            ->count(5)
+            ->forMember($userWithMultipleOrganizationsRivalMember)
+            ->create();
 
         User::factory()->withPersonalOrganization()->create([
             'email' => 'admin@example.com',

tests/Feature/CreateTeamTest.php

@@ -5,7 +5,8 @@ declare(strict_types=1);
 namespace Tests\Feature;
 
 use App\Enums\Role;
-use App\Models\Membership;
+use App\Models\Member;
+use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
@@ -19,6 +20,7 @@ class CreateTeamTest extends TestCase
         // Arrange
         $user = User::factory()->withPersonalOrganization()->create();
         $this->actingAs($user);
+        sleep(1);
 
         // Act
         $response = $this->post('/teams', [
@@ -26,10 +28,13 @@ class CreateTeamTest extends TestCase
         ]);
 
         // Assert
-        $newOrganization = $user->fresh()->ownedTeams()->latest('id')->first();
+        /** @var Organization|null $newOrganization */
-        $this->assertCount(2, $user->fresh()->ownedTeams);
+        $ownedTeams = $user->fresh()->ownedTeams;
-        $this->assertEquals('Test Organization', $newOrganization->name);
+        $this->assertCount(2, $ownedTeams);
-        $member = Membership::query()->whereBelongsTo($user, 'user')->whereBelongsTo($newOrganization, 'organization')->firstOrFail();
+        $this->assertTrue($ownedTeams->contains('name', 'Test Organization'));
+        $newOrganization = $ownedTeams->firstWhere('name', 'Test Organization');
+        /** @var Member $member */
+        $member = Member::query()->whereBelongsTo($user, 'user')->whereBelongsTo($newOrganization, 'organization')->firstOrFail();
         $this->assertSame(Role::Owner->value, $member->role);
     }
 }

tests/Feature/InviteTeamMemberTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Tests\Feature;
 
+use App\Enums\Role;
+use App\Models\Member;
 use App\Models\TimeEntry;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -62,13 +64,13 @@ class InviteTeamMemberTest extends TestCase
         $existingUser = User::factory()->create([
             'is_placeholder' => true,
         ]);
-        $user->currentTeam->users()->attach($existingUser, ['role' => 'employee']);
+        $user->currentTeam->users()->attach($existingUser, ['role' => Role::Employee->value]);
         $this->actingAs($user);
 
         // Act
         $response = $this->post('/teams/'.$user->currentTeam->id.'/members', [
             'email' => $existingUser->email,
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
 
         // Assert
@@ -103,7 +105,7 @@ class InviteTeamMemberTest extends TestCase
         $user = User::factory()->withPersonalOrganization()->create();
         $invitation = $owner->currentTeam->teamInvitations()->create([
             'email' => $user->email,
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
         $this->actingAs($user);
 
@@ -126,11 +128,11 @@ class InviteTeamMemberTest extends TestCase
     {
         // Arrange
         Mail::fake();
-        $placeholder = User::factory()->withPersonalOrganization()->placeholder()->create();
+        $placeholder = User::factory()->placeholder()->create();
-
         $owner = User::factory()->withPersonalOrganization()->create();
-        $owner->currentTeam->users()->attach($placeholder, ['role' => 'employee']);
+        $placeholderMember = Member::factory()->forOrganization($owner->currentTeam)->forUser($placeholder)->create();
-        $timeEntries = TimeEntry::factory()->forOrganization($owner->currentTeam)->forUser($placeholder)->createMany(5);
+
+        $timeEntries = TimeEntry::factory()->forOrganization($owner->currentTeam)->forMember($placeholderMember)->createMany(5);
 
         $user = User::factory()->withPersonalOrganization()->create([
             'email' => $placeholder->email,
@@ -138,7 +140,7 @@ class InviteTeamMemberTest extends TestCase
 
         $invitation = $owner->currentTeam->teamInvitations()->create([
             'email' => $user->email,
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
         $this->actingAs($user);
 
@@ -167,7 +169,7 @@ class InviteTeamMemberTest extends TestCase
         $user = User::factory()->withPersonalOrganization()->create();
         $invitation = $owner->currentTeam->teamInvitations()->create([
             'email' => 'firstname.lastname@mail.test',
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
         $this->actingAs($user);
 

tests/Feature/RegistrationTest.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Tests\Feature;
 
 use App\Enums\Role;
-use App\Models\Membership;
+use App\Models\Member;
 use App\Models\User;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -58,7 +58,7 @@ class RegistrationTest extends TestCase
         $this->assertSame('UTC', $user->timezone);
         $organization = $user->organizations()->firstOrFail();
         $this->assertSame(true, $organization->personal_team);
-        $member = Membership::query()->whereBelongsTo($user, 'user')->whereBelongsTo($organization, 'organization')->firstOrFail();
+        $member = Member::query()->whereBelongsTo($user, 'user')->whereBelongsTo($organization, 'organization')->firstOrFail();
         $this->assertSame(Role::Owner->value, $member->role);
     }
 

tests/Feature/UpdateTeamMemberRoleTest.php

@@ -25,12 +25,12 @@ class UpdateTeamMemberRoleTest extends TestCase
 
         // Act
         $response = $this->put('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id, [
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
 
         // Assert
         $this->assertTrue($otherUser->fresh()->hasTeamRole(
-            $user->currentTeam->fresh(), 'employee'
+            $user->currentTeam->fresh(), Role::Employee->value,
         ));
     }
 
@@ -88,7 +88,7 @@ class UpdateTeamMemberRoleTest extends TestCase
 
         // Act
         $response = $this->put('/teams/'.$user->currentTeam->id.'/members/'.$otherUser->id, [
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
 
         // Assert

tests/Unit/Endpoint/Api/V1/ApiEndpointTestAbstract.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Endpoint\Api\V1;
 
-use App\Models\Membership;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -17,7 +17,7 @@ class ApiEndpointTestAbstract extends TestCase
 
     /**
      * @param  array<string>  $permissions
-     * @return object{user: User, organization: Organization, member: Membership}
+     * @return object{user: User, organization: Organization, member: Member}
      */
     protected function createUserWithPermission(array $permissions, bool $isOwner = false): object
     {
@@ -29,14 +29,14 @@ class ApiEndpointTestAbstract extends TestCase
         } else {
             $organization = Organization::factory()->create();
         }
-        $membership = Membership::factory()->forUser($user)->forOrganization($organization)->create([
+        $member = Member::factory()->forUser($user)->forOrganization($organization)->create([
             'role' => 'custom-test',
         ]);
 
         return (object) [
             'user' => $user,
             'organization' => $organization,
-            'member' => $membership,
+            'member' => $member,
         ];
     }
 }

tests/Unit/Endpoint/Api/V1/InvitationEndpointTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Endpoint\Api\V1;
 
+use App\Enums\Role;
 use App\Models\OrganizationInvitation;
 use Illuminate\Support\Facades\Mail;
 use Laravel\Jetstream\Mail\TeamInvitation;
@@ -50,7 +51,7 @@ class InvitationEndpointTest extends ApiEndpointTestAbstract
         // Act
         $response = $this->postJson(route('api.v1.invitations.store', $data->organization->getKey()), [
             'email' => 'test@mail.test',
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
 
         // Assert
@@ -68,7 +69,7 @@ class InvitationEndpointTest extends ApiEndpointTestAbstract
         // Act
         $response = $this->postJson(route('api.v1.invitations.store', $data->organization->getKey()), [
             'email' => 'test@asdf.at',
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
 
         // Assert
@@ -76,7 +77,7 @@ class InvitationEndpointTest extends ApiEndpointTestAbstract
         $invitation = OrganizationInvitation::first();
         $this->assertNotNull($invitation);
         $this->assertEquals('test@asdf.at', $invitation->email);
-        $this->assertEquals('employee', $invitation->role);
+        $this->assertEquals(Role::Employee->value, $invitation->role);
     }
 
     public function test_resend_fails_if_user_has_no_permission_to_resend_the_invitation(): void

tests/Unit/Endpoint/Api/V1/MemberEndpointTest.php

@@ -4,7 +4,8 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Endpoint\Api\V1;
 
-use App\Models\Membership;
+use App\Enums\Role;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
@@ -53,7 +54,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         // Act
         $response = $this->putJson(route('api.v1.members.update', [$data->organization->getKey(), $data->member->getKey()]), [
             'billable_rate' => 10001,
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
 
         // Assert
@@ -74,7 +75,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         // Act
         $response = $this->putJson(route('api.v1.members.update', [$data->organization->getKey(), $otherData->member->getKey()]), [
             'billable_rate' => 10001,
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
 
         // Assert
@@ -92,7 +93,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         // Act
         $response = $this->putJson(route('api.v1.members.update', [$data->organization->id, $data->member]), [
             'billable_rate' => 10001,
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
 
         // Assert
@@ -100,7 +101,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         $member = $data->member;
         $member->refresh();
         $this->assertSame(10001, $member->billable_rate);
-        $this->assertSame('employee', $member->role);
+        $this->assertSame(Role::Employee->value, $member->role);
     }
 
     public function test_invite_placeholder_succeeds_if_data_is_valid(): void
@@ -112,7 +113,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         $user = User::factory()->create([
             'is_placeholder' => true,
         ]);
-        $member = Membership::factory()->forUser($user)->forOrganization($data->organization)->create();
+        $member = Member::factory()->forUser($user)->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
 
         // Act
@@ -164,7 +165,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'members:delete',
         ]);
-        TimeEntry::factory()->forUser($data->user)->forOrganization($data->organization)->create();
+        TimeEntry::factory()->forMember($data->member)->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
 
         // Act
@@ -173,7 +174,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         // Assert
         $response->assertStatus(400);
         $response->assertJsonPath('message', 'The member is still used by a time entry and can not be deleted.');
-        $this->assertDatabaseHas(Membership::class, [
+        $this->assertDatabaseHas(Member::class, [
             'id' => $data->member->getKey(),
         ]);
     }
@@ -185,7 +186,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
             'members:delete',
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
-        ProjectMember::factory()->forProject($project)->forUser($data->user)->create();
+        ProjectMember::factory()->forProject($project)->forMember($data->member)->create();
         Passport::actingAs($data->user);
 
         // Act
@@ -194,7 +195,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         // Assert
         $response->assertStatus(400);
         $response->assertJsonPath('message', 'The member is still used by a project member and can not be deleted.');
-        $this->assertDatabaseHas(Membership::class, [
+        $this->assertDatabaseHas(Member::class, [
             'id' => $data->member->getKey(),
         ]);
     }
@@ -212,7 +213,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
 
         // Assert
         $response->assertStatus(204);
-        $this->assertDatabaseMissing(Membership::class, [
+        $this->assertDatabaseMissing(Member::class, [
             'id' => $data->member->getKey(),
         ]);
     }
@@ -225,7 +226,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         $user = User::factory()->create([
             'is_placeholder' => true,
         ]);
-        $member = Membership::factory()->forUser($user)->forOrganization($data->organization)->create();
+        $member = Member::factory()->forUser($user)->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
 
         // Act
@@ -249,7 +250,7 @@ class MemberEndpointTest extends ApiEndpointTestAbstract
         $user = User::factory()->create([
             'is_placeholder' => true,
         ]);
-        $member = Membership::factory()->forUser($user)->forOrganization($otherOrganization)->create();
+        $member = Member::factory()->forUser($user)->forOrganization($otherOrganization)->create();
         Passport::actingAs($data->user);
 
         // Act

tests/Unit/Endpoint/Api/V1/ProjectEndpointTest.php

@@ -55,7 +55,7 @@ class ProjectEndpointTest extends ApiEndpointTestAbstract
         ]);
         $privateProjects = Project::factory()->forOrganization($data->organization)->isPrivate()->createMany(2);
         $publicProjects = Project::factory()->forOrganization($data->organization)->isPublic()->createMany(2);
-        $privateProjectsWithMembership = Project::factory()->forOrganization($data->organization)->addMember($data->user)->isPrivate()->createMany(2);
+        $privateProjectsWithMembership = Project::factory()->forOrganization($data->organization)->addMember($data->member)->isPrivate()->createMany(2);
         Passport::actingAs($data->user);
 
         // Act

tests/Unit/Endpoint/Api/V1/ProjectMemberEndpointTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Endpoint\Api\V1;
 
+use App\Models\Member;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\User;
@@ -81,13 +82,14 @@ class ProjectMemberEndpointTest extends ApiEndpointTestAbstract
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         $projectMemberFake = ProjectMember::factory()->make();
-        $user = User::factory()->attachToOrganization($data->organization)->create();
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($data->organization)->forUser($user)->create();
         Passport::actingAs($data->user);
 
         // Act
         $response = $this->postJson(route('api.v1.project-members.store', [$data->organization->getKey(), $project->getKey()]), [
             'billable_rate' => $projectMemberFake->billable_rate,
-            'user_id' => $user->getKey(),
+            'member_id' => $member->getKey(),
         ]);
 
         // Assert
@@ -105,13 +107,14 @@ class ProjectMemberEndpointTest extends ApiEndpointTestAbstract
         ]);
         $project = Project::factory()->forOrganization($otherData->organization)->create();
         $projectMemberFake = ProjectMember::factory()->make();
-        $user = User::factory()->attachToOrganization($data->organization)->create();
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($data->organization)->forUser($user)->create();
         Passport::actingAs($data->user);
 
         // Act
         $response = $this->postJson(route('api.v1.project-members.store', [$data->organization->getKey(), $project->getKey()]), [
             'billable_rate' => $projectMemberFake->billable_rate,
-            'user_id' => $user->getKey(),
+            'member_id' => $member->getKey(),
         ]);
 
         // Assert
@@ -129,17 +132,18 @@ class ProjectMemberEndpointTest extends ApiEndpointTestAbstract
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         $projectMemberFake = ProjectMember::factory()->make();
-        $user = User::factory()->attachToOrganization($otherData->organization)->create();
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($otherData->organization)->forUser($user)->create();
         Passport::actingAs($data->user);
 
         // Act
         $response = $this->postJson(route('api.v1.project-members.store', [$data->organization->getKey(), $project->getKey()]), [
             'billable_rate' => $projectMemberFake->billable_rate,
-            'user_id' => $user->getKey(),
+            'member_id' => $member->getKey(),
         ]);
 
         // Assert
-        $response->assertInvalid(['user_id']);
+        $response->assertInvalid(['member_id']);
     }
 
     public function test_store_endpoint_fails_if_user_is_a_placeholder(): void
@@ -150,13 +154,14 @@ class ProjectMemberEndpointTest extends ApiEndpointTestAbstract
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         $projectMemberFake = ProjectMember::factory()->make();
-        $user = User::factory()->attachToOrganization($data->organization)->placeholder()->create();
+        $user = User::factory()->placeholder()->create();
+        $member = Member::factory()->forOrganization($data->organization)->forUser($user)->create();
         Passport::actingAs($data->user);
 
         // Act
         $response = $this->postJson(route('api.v1.project-members.store', [$data->organization->getKey(), $project->getKey()]), [
             'billable_rate' => $projectMemberFake->billable_rate,
-            'user_id' => $user->getKey(),
+            'member_id' => $member->getKey(),
         ]);
 
         // Assert
@@ -168,7 +173,7 @@ class ProjectMemberEndpointTest extends ApiEndpointTestAbstract
         ]);
         $this->assertDatabaseMissing(ProjectMember::class, [
             'billable_rate' => $projectMemberFake->billable_rate,
-            'user_id' => $user->getKey(),
+            'member_id' => $member->getKey(),
             'project_id' => $project->getKey(),
         ]);
     }
@@ -181,14 +186,14 @@ class ProjectMemberEndpointTest extends ApiEndpointTestAbstract
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         $projectMemberFake = ProjectMember::factory()->make();
-        $user = User::factory()->attachToOrganization($data->organization)->create();
+        $member = Member::factory()->forOrganization($data->organization)->create();
-        ProjectMember::factory()->forProject($project)->forUser($user)->create();
+        ProjectMember::factory()->forProject($project)->forMember($member)->create();
         Passport::actingAs($data->user);
 
         // Act
         $response = $this->postJson(route('api.v1.project-members.store', [$data->organization->getKey(), $project->getKey()]), [
             'billable_rate' => $projectMemberFake->billable_rate,
-            'user_id' => $user->getKey(),
+            'member_id' => $member->getKey(),
         ]);
 
         // Assert
@@ -200,7 +205,7 @@ class ProjectMemberEndpointTest extends ApiEndpointTestAbstract
         ]);
         $this->assertDatabaseMissing(ProjectMember::class, [
             'billable_rate' => $projectMemberFake->billable_rate,
-            'user_id' => $user->getKey(),
+            'member_id' => $member->getKey(),
             'project_id' => $project->getKey(),
         ]);
     }
@@ -213,20 +218,21 @@ class ProjectMemberEndpointTest extends ApiEndpointTestAbstract
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         $projectMemberFake = ProjectMember::factory()->make();
-        $user = User::factory()->attachToOrganization($data->organization)->create();
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($data->organization)->forUser($user)->create();
         Passport::actingAs($data->user);
 
         // Act
         $response = $this->postJson(route('api.v1.project-members.store', [$data->organization->getKey(), $project->getKey()]), [
             'billable_rate' => $projectMemberFake->billable_rate,
-            'user_id' => $user->getKey(),
+            'member_id' => $member->getKey(),
         ]);
 
         // Assert
         $response->assertStatus(201);
         $this->assertDatabaseHas(ProjectMember::class, [
             'billable_rate' => $projectMemberFake->billable_rate,
-            'user_id' => $user->getKey(),
+            'member_id' => $member->getKey(),
             'project_id' => $project->getKey(),
         ]);
     }
@@ -294,7 +300,7 @@ class ProjectMemberEndpointTest extends ApiEndpointTestAbstract
         $this->assertDatabaseHas(ProjectMember::class, [
             'id' => $projectMember->getKey(),
             'billable_rate' => $projectMemberFake->billable_rate,
-            'user_id' => $projectMember->user_id,
+            'member_id' => $projectMember->member_id,
         ]);
     }
 

tests/Unit/Endpoint/Api/V1/TagEndpointTest.php

@@ -207,7 +207,7 @@ class TagEndpointTest extends ApiEndpointTestAbstract
             'tags:delete',
         ]);
         $tag = Tag::factory()->forOrganization($data->organization)->create();
-        TimeEntry::factory()->forUser($data->user)->forOrganization($data->organization)->create([
+        TimeEntry::factory()->forMember($data->member)->forOrganization($data->organization)->create([
             'tags' => [$tag->getKey()],
         ]);
         Passport::actingAs($data->user);

tests/Unit/Endpoint/Api/V1/TaskEndpointTest.php

@@ -86,7 +86,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
         $projectPublic = Project::factory()->isPublic()->create();
         Task::factory()->forOrganization($data->organization)->forProject($projectPublic)->createMany(2);
         $projectAsMember = Project::factory()->isPrivate()->create();
-        ProjectMember::factory()->forProject($projectAsMember)->forUser($data->user)->create();
+        ProjectMember::factory()->forProject($projectAsMember)->forMember($data->member)->create();
         Task::factory()->forOrganization($data->organization)->forProject($projectAsMember)->createMany(2);
         Passport::actingAs($data->user);
 
@@ -177,7 +177,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
             'tasks:view',
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
-        ProjectMember::factory()->forProject($project)->forUser($data->user)->create();
+        ProjectMember::factory()->forProject($project)->forMember($data->member)->create();
         Task::factory()->forOrganization($data->organization)->createMany(4);
         Task::factory()->forOrganization($data->organization)->forProject($project)->createMany(2);
         Passport::actingAs($data->user);
@@ -311,7 +311,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
             'tasks:delete',
         ]);
         $task = Task::factory()->forOrganization($data->organization)->create();
-        TimeEntry::factory()->forUser($data->user)->forTask($task)->forOrganization($data->organization)->create();
+        TimeEntry::factory()->forMember($data->member)->forTask($task)->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
 
         // Act

tests/Unit/Endpoint/Api/V1/TimeEntryEndpointTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Endpoint\Api\V1;
 
+use App\Enums\Role;
+use App\Models\Member;
 use App\Models\Project;
 use App\Models\TimeEntry;
 use App\Models\User;
@@ -51,11 +53,14 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:own',
         ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->create();
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->create();
         Passport::actingAs($data->user);
 
         // Act
-        $response = $this->getJson(route('api.v1.time-entries.index', [$data->organization->getKey(), 'user_id' => $data->user->getKey()]));
+        $response = $this->getJson(route('api.v1.time-entries.index', [
+            $data->organization->getKey(),
+            'member_id' => $data->member->getKey(),
+        ]));
 
         // Assert
         $response->assertStatus(200);
@@ -68,15 +73,20 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:all',
         ]);
-        $user = User::factory()->withPersonalOrganization()->create();
+        $otherData = $this->createUserWithPermission([
+            'time-entries:view:all',
+        ]);
         Passport::actingAs($data->user);
 
         // Act
-        $response = $this->getJson(route('api.v1.time-entries.index', [$data->organization->getKey(), 'user_id' => $user->getKey()]));
+        $response = $this->getJson(route('api.v1.time-entries.index', [
+            $data->organization->getKey(),
+            'member_id' => $otherData->member->getKey(),
+        ]));
 
         // Assert
         $response->assertStatus(422);
-        $response->assertJsonValidationErrorFor('user_id');
+        $response->assertJsonValidationErrorFor('member_id');
     }
 
     public function test_index_endpoint_returns_time_entries_for_other_user_in_organization(): void
@@ -86,10 +96,8 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'time-entries:view:all',
         ]);
         $user = User::factory()->create();
-        $data->organization->users()->attach($user, [
+        $member = Member::factory()->forOrganization($data->organization)->forUser($user)->role(Role::Employee)->create();
-            'role' => 'employee',
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($member)->create();
-        ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($user)->create();
         Passport::actingAs($data->user);
 
         // Act
@@ -107,16 +115,14 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'time-entries:view:all',
         ]);
         $user = User::factory()->create();
-        $data->organization->users()->attach($user, [
+        $member = Member::factory()->forOrganization($data->organization)->forUser($user)->role(Role::Employee)->create();
-            'role' => 'employee',
+        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->create([
-        ]);
-        $timeEntry1 = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->create([
             'start' => Carbon::now()->subDay(),
         ]);
-        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forUser($user)->create([
+        $timeEntry2 = TimeEntry::factory()->forOrganization($data->organization)->forMember($member)->create([
             'start' => Carbon::now()->subDays(2),
         ]);
-        $timeEntry3 = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->create([
+        $timeEntry3 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->create([
             'start' => Carbon::now()->subDays(3),
         ]);
         Passport::actingAs($data->user);
@@ -137,15 +143,15 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:own',
         ]);
-        $activeTimeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->active()->create();
+        $activeTimeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->active()->create();
-        $nonActiveTimeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->createMany(3);
+        $nonActiveTimeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->createMany(3);
         Passport::actingAs($data->user);
 
         // Act
         $response = $this->getJson(route('api.v1.time-entries.index', [
             $data->organization->getKey(),
             'active' => 'true',
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
         ]));
 
         // Assert
@@ -160,15 +166,15 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:own',
         ]);
-        $activeTimeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->active()->createMany(3);
+        $activeTimeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->active()->createMany(3);
-        $nonActiveTimeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->create();
+        $nonActiveTimeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->create();
         Passport::actingAs($data->user);
 
         // Act
         $response = $this->getJson(route('api.v1.time-entries.index', [
             $data->organization->getKey(),
             'active' => 'false',
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
         ]));
 
         // Assert
@@ -184,7 +190,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:own',
         ]);
-        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->createMany(3);
+        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->createMany(3);
         Passport::actingAs($data->user);
 
         // Act
@@ -192,7 +198,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             $data->organization->getKey(),
             'only_full_dates' => 'true',
             'limit' => 5,
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
         ]));
 
         // Assert
@@ -206,10 +212,10 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:own',
         ]);
-        $timeEntriesDay1 = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesDay1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->startBetween(Carbon::now($data->user->timezone)->subDay()->startOfDay(), Carbon::now($data->user->timezone)->subDay()->endOfDay())
             ->createMany(3);
-        $timeEntriesDay2 = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesDay2 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->startBetween(Carbon::now($data->user->timezone)->subDays(2)->startOfDay(), Carbon::now($data->user->timezone)->subDays(2)->endOfDay())
             ->createMany(3);
         Passport::actingAs($data->user);
@@ -219,7 +225,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             $data->organization->getKey(),
             'only_full_dates' => 'true',
             'limit' => 5,
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
         ]));
 
         // Assert
@@ -241,7 +247,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
          */
 
         // Note: This entry is yesterday in user timezone and yesterday in UTC
-        $timeEntriesDay1InUserTimeZone = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesDay1InUserTimeZone = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->state([
                 'start' => Carbon::now($data->user->timezone)->subDay()->startOfDay()->utc(),
             ])
@@ -249,7 +255,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         //dump($timeEntriesDay1InUserTimeZone->first()->refresh()->start->toImmutable()->timezone('UTC')->toDateString());
         //dump($timeEntriesDay1InUserTimeZone->first()->refresh()->start->toImmutable()->timezone($data->user->timezone)->toDateString());
         // Note: This entry is yesterday in UTC timezone, but two days ago in user timezone
-        $timeEntriesDay1InUTC = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesDay1InUTC = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->state([
                 'start' => Carbon::now('UTC')->subDay()->startOfDay()->utc(),
             ])
@@ -257,7 +263,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         //dump($timeEntriesDay1InUTC->first()->refresh()->start->toImmutable()->timezone('UTC')->toDateString());
         //dump($timeEntriesDay1InUTC->first()->refresh()->start->toImmutable()->timezone($data->user->timezone)->toDateString());
         // Note: This entry is two days ago in user timezone
-        $timeEntriesDay2InUserTimeZone = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesDay2InUserTimeZone = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->state([
                 'start' => Carbon::now($data->user->timezone)->subDays(2)->startOfDay()->utc(),
             ])
@@ -270,7 +276,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             $data->organization->getKey(),
             'only_full_dates' => 'true',
             'limit' => 5,
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
         ]));
 
         // Assert
@@ -284,7 +290,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:own',
         ]);
-        $timeEntriesDay1 = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesDay1 = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->startBetween(Carbon::now()->subDay()->startOfDay(), Carbon::now()->subDay()->endOfDay())
             ->createMany(7);
         Passport::actingAs($data->user);
@@ -294,7 +300,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             $data->organization->getKey(),
             'only_full_dates' => 'true',
             'limit' => 5,
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
         ]));
 
         // Assert
@@ -311,19 +317,19 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:own',
         ]);
-        $timeEntriesAfter = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesAfter = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->startBetween(
                 Carbon::now()->timezone($data->user->timezone)->subDay()->startOfDay()->utc(),
                 Carbon::now()->timezone($data->user->timezone)->utc()
             )
             ->createMany(3);
-        $timeEntriesBefore = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesBefore = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->startBetween(
                 Carbon::now()->timezone($data->user->timezone)->subDays(2)->startOfDay()->utc(),
                 Carbon::now()->timezone($data->user->timezone)->subDays(2)->endOfDay()->utc()
             )
             ->createMany(3);
-        $timeEntriesDirectlyBeforeLimit = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesDirectlyBeforeLimit = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->create([
                 'start' => Carbon::now()->timezone($data->user->timezone)->subDays(2)->endOfDay()->utc(),
             ]);
@@ -333,7 +339,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $response = $this->getJson(route('api.v1.time-entries.index', [
             $data->organization->getKey(),
             'before' => Carbon::now()->timezone($data->user->timezone)->subDay()->startOfDay()->toIso8601ZuluString(),
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
         ]));
 
         // Assert
@@ -354,13 +360,13 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:own',
         ]);
-        $timeEntriesAfter = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesAfter = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->startBetween(Carbon::now($data->user->timezone)->startOfDay()->utc(), Carbon::now($data->user->timezone)->utc())
             ->createMany(3);
-        $timeEntriesBefore = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesBefore = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->startBetween(Carbon::now($data->user->timezone)->subDay()->startOfDay()->utc(), Carbon::now($data->user->timezone)->subDay()->endOfDay()->utc())
             ->createMany(3);
-        $timeEntriesDirectlyAfterLimit = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)
+        $timeEntriesDirectlyAfterLimit = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)
             ->create([
                 'start' => Carbon::now($data->user->timezone)->startOfDay()->utc(),
             ]);
@@ -370,7 +376,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $response = $this->getJson(route('api.v1.time-entries.index', [
             $data->organization->getKey(),
             'after' => Carbon::now($data->user->timezone)->subDay()->endOfDay()->toIso8601ZuluString(), // yesterday
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
         ]));
 
         // Assert
@@ -405,10 +411,10 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:all',
         ]);
-        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->createMany(3);
+        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->createMany(3);
         $project = Project::factory()->forOrganization($data->organization)->create();
-        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->forProject($project)->createMany(3);
+        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->forProject($project)->createMany(3);
-        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->state([
+        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->state([
             'start' => $timeEntries->get(0)->start,
         ])->createMany(3);
         Passport::actingAs($data->user);
@@ -416,8 +422,8 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         // Act
         $response = $this->getJson(route('api.v1.time-entries.aggregate', [
             $data->organization->getKey(),
-            'group_1' => 'day',
+            'group' => 'day',
-            'group_2' => 'project',
+            'sub_group' => 'project',
         ]));
 
         // Assert
@@ -430,10 +436,10 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:all',
         ]);
-        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->createMany(3);
+        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->createMany(3);
         $project = Project::factory()->forOrganization($data->organization)->create();
-        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->forProject($project)->createMany(3);
+        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->forProject($project)->createMany(3);
-        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->state([
+        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->state([
             'start' => $timeEntries->get(0)->start,
         ])->createMany(3);
         Passport::actingAs($data->user);
@@ -441,7 +447,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         // Act
         $response = $this->getJson(route('api.v1.time-entries.aggregate', [
             $data->organization->getKey(),
-            'group_1' => 'week',
+            'group' => 'week',
         ]));
 
         // Assert
@@ -454,10 +460,10 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:view:all',
         ]);
-        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->createMany(3);
+        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->createMany(3);
         $project = Project::factory()->forOrganization($data->organization)->create();
-        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->forProject($project)->createMany(3);
+        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->forProject($project)->createMany(3);
-        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->state([
+        $timeEntries = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->state([
             'start' => $timeEntries->get(0)->start,
         ])->createMany(3);
         Passport::actingAs($data->user);
@@ -486,7 +492,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
             'task_id' => $timeEntryFake->task_id,
         ]);
 
@@ -500,7 +506,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:create:own',
         ]);
-        $activeTimeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->active()->create();
+        $activeTimeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->active()->create();
         $timeEntryFake = TimeEntry::factory()->forOrganization($data->organization)->withTask($data->organization)->withTags($data->organization)->make();
         Passport::actingAs($data->user);
 
@@ -511,7 +517,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => null,
             'tags' => $timeEntryFake->tags,
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
             'project_id' => $timeEntryFake->project_id,
             'task_id' => $timeEntryFake->task_id,
         ]);
@@ -538,7 +544,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
             'project_id' => $timeEntryFake->project_id,
             'task_id' => $timeEntryFake2->task_id,
         ]);
@@ -567,7 +573,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
             'task_id' => $timeEntryFake2->task_id,
         ]);
 
@@ -595,7 +601,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
             'project_id' => $timeEntryFake->project_id,
             'task_id' => $timeEntryFake->task_id,
         ]);
@@ -604,7 +610,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $response->assertStatus(201);
         $this->assertDatabaseHas(TimeEntry::class, [
             'id' => $response->json('data.id'),
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
             'task_id' => $timeEntryFake->task_id,
         ]);
     }
@@ -622,14 +628,14 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $response = $this->postJson(route('api.v1.time-entries.store', [$data->organization->getKey()]), [
             'billable' => $timeEntryFake->billable,
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
         ]);
 
         // Assert
         $response->assertStatus(201);
         $this->assertDatabaseHas(TimeEntry::class, [
             'id' => $response->json('data.id'),
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
             'task_id' => null,
         ]);
     }
@@ -641,9 +647,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'time-entries:create:own',
         ]);
         $otherUser = User::factory()->create();
-        $data->organization->users()->attach($otherUser, [
+        $otherMember = Member::factory()->forOrganization($data->organization)->forUser($otherUser)->role(Role::Employee)->create();
-            'role' => 'employee',
-        ]);
         $timeEntryFake = TimeEntry::factory()->forOrganization($data->organization)->make();
         Passport::actingAs($data->user);
 
@@ -654,7 +658,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $otherUser->getKey(),
+            'member_id' => $otherMember->getKey(),
             'project_id' => $timeEntryFake->project_id,
             'task_id' => $timeEntryFake->task_id,
         ]);
@@ -670,9 +674,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'time-entries:create:all',
         ]);
         $otherUser = User::factory()->create();
-        $data->organization->users()->attach($otherUser, [
+        $otherMember = Member::factory()->forOrganization($data->organization)->forUser($otherUser)->role(Role::Employee)->create();
-            'role' => 'employee',
-        ]);
         $timeEntryFake = TimeEntry::factory()->forOrganization($data->organization)->make();
         Passport::actingAs($data->user);
 
@@ -683,7 +685,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $otherUser->getKey(),
+            'member_id' => $otherMember->getKey(),
             'task_id' => $timeEntryFake->task_id,
         ]);
 
@@ -692,6 +694,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $this->assertDatabaseHas(TimeEntry::class, [
             'id' => $response->json('data.id'),
             'user_id' => $otherUser->getKey(),
+            'member_id' => $otherMember->getKey(),
             'task_id' => $timeEntryFake->task_id,
         ]);
     }
@@ -701,7 +704,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
         ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->create();
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->create();
         $timeEntryFake = TimeEntry::factory()->forOrganization($data->organization)->make();
         Passport::actingAs($data->user);
 
@@ -712,7 +715,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
             'task_id' => $timeEntryFake->task_id,
         ]);
 
@@ -729,7 +732,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $otherUser = $this->createUserWithPermission([
             'time-entries:update:own',
         ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($otherUser->organization)->forUser($otherUser->user)->create();
+        $timeEntry = TimeEntry::factory()->forOrganization($otherUser->organization)->forMember($otherUser->member)->create();
         $timeEntryFake = TimeEntry::factory()->forOrganization($data->organization)->make();
         Passport::actingAs($data->user);
 
@@ -739,7 +742,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $data->user->getKey(),
             'task_id' => $timeEntryFake->task_id,
         ]);
 
@@ -754,10 +756,8 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'time-entries:update:own',
         ]);
         $user = User::factory()->create();
-        $data->organization->users()->attach($user, [
+        $member = Member::factory()->forOrganization($data->organization)->forUser($user)->role(Role::Employee)->create();
-            'role' => 'employee',
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($member)->create();
-        ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($user)->create();
         $timeEntryFake = TimeEntry::factory()->forOrganization($data->organization)->make();
         Passport::actingAs($data->user);
 
@@ -767,7 +767,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $user->getKey(),
             'task_id' => $timeEntryFake->task_id,
         ]);
 
@@ -781,7 +780,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:update:own',
         ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->create();
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->create();
         $timeEntryFake = TimeEntry::factory()->forOrganization($data->organization)->withTask($data->organization)->make();
         $timeEntryFake2 = TimeEntry::factory()->forOrganization($data->organization)->withTask($data->organization)->make();
         Passport::actingAs($data->user);
@@ -793,7 +792,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $data->user->getKey(),
             'project_id' => $timeEntryFake->project_id,
             'task_id' => $timeEntryFake2->task_id,
         ]);
@@ -811,7 +809,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:update:own',
         ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->create();
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->create();
         $timeEntryFake = TimeEntry::factory()->forOrganization($data->organization)->withTask($data->organization)->make();
         $timeEntryFake2 = TimeEntry::factory()->forOrganization($data->organization)->withTask($data->organization)->make();
         Passport::actingAs($data->user);
@@ -823,7 +821,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $data->user->getKey(),
             'task_id' => $timeEntryFake2->task_id,
         ]);
 
@@ -841,7 +838,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:update:own',
         ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->create();
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->create();
         $timeEntryFake = TimeEntry::factory()->withTags($data->organization)->forOrganization($data->organization)->make();
         Passport::actingAs($data->user);
 
@@ -851,14 +848,14 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
         ]);
 
         // Assert
         $response->assertStatus(200);
         $this->assertDatabaseHas(TimeEntry::class, [
             'id' => $timeEntry->getKey(),
-            'user_id' => $data->user->getKey(),
+            'member_id' => $data->member->getKey(),
             'task_id' => $timeEntryFake->task_id,
         ]);
     }
@@ -870,10 +867,8 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'time-entries:update:all',
         ]);
         $user = User::factory()->create();
-        $data->organization->users()->attach($user, [
+        $member = Member::factory()->forOrganization($data->organization)->forUser($user)->role(Role::Employee)->create();
-            'role' => 'employee',
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($member)->create();
-        ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($user)->create();
         $timeEntryFake = TimeEntry::factory()->forOrganization($data->organization)->make();
         Passport::actingAs($data->user);
 
@@ -883,7 +878,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'start' => $timeEntryFake->start->toIso8601ZuluString(),
             'end' => $timeEntryFake->end->toIso8601ZuluString(),
             'tags' => $timeEntryFake->tags,
-            'user_id' => $user->getKey(),
+            'member_id' => $member->getKey(),
             'task_id' => $timeEntryFake->task_id,
         ]);
 
@@ -891,7 +886,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $response->assertStatus(200);
         $this->assertDatabaseHas(TimeEntry::class, [
             'id' => $timeEntry->getKey(),
-            'user_id' => $user->getKey(),
+            'member_id' => $member->getKey(),
             'task_id' => $timeEntryFake->task_id,
         ]);
     }
@@ -905,7 +900,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $otherUser = $this->createUserWithPermission([
             'time-entries:delete:all',
         ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($otherUser->organization)->forUser($otherUser->user)->create();
+        $timeEntry = TimeEntry::factory()->forOrganization($otherUser->organization)->forMember($otherUser->member)->create();
         Passport::actingAs($data->user);
 
         // Act
@@ -935,7 +930,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
         ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->create();
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->create();
         Passport::actingAs($data->user);
 
         // Act
@@ -952,10 +947,8 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'time-entries:delete:own',
         ]);
         $user = User::factory()->create();
-        $data->organization->users()->attach($user, [
+        $member = Member::factory()->forOrganization($data->organization)->forUser($user)->role(Role::Employee)->create();
-            'role' => 'employee',
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($member)->create();
-        ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($user)->create();
         Passport::actingAs($data->user);
 
         // Act
@@ -971,7 +964,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $data = $this->createUserWithPermission([
             'time-entries:delete:own',
         ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($data->user)->create();
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($data->member)->create();
         Passport::actingAs($data->user);
 
         // Act
@@ -992,10 +985,8 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
             'time-entries:delete:all',
         ]);
         $user = User::factory()->create();
-        $data->organization->users()->attach($user, [
+        $member = Member::factory()->forOrganization($data->organization)->forUser($user)->role(Role::Employee)->create();
-            'role' => 'employee',
+        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forMember($member)->create();
-        ]);
-        $timeEntry = TimeEntry::factory()->forOrganization($data->organization)->forUser($user)->create();
         Passport::actingAs($data->user);
 
         // Act

tests/Unit/Endpoint/Api/V1/UserTimeEntryEndpointTest.php

@@ -27,8 +27,8 @@ class UserTimeEntryEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
         ]);
-        $activeTimeEntry = TimeEntry::factory()->forUser($data->user)->active()->create();
+        $activeTimeEntry = TimeEntry::factory()->forMember($data->member)->active()->create();
-        $inactiveTimeEntry = TimeEntry::factory()->forUser($data->user)->create();
+        $inactiveTimeEntry = TimeEntry::factory()->forMember($data->member)->create();
         Passport::actingAs($data->user);
 
         // Act
@@ -43,7 +43,7 @@ class UserTimeEntryEndpointTest extends ApiEndpointTestAbstract
         // Arrange
         $data = $this->createUserWithPermission([
         ]);
-        $inactiveTimeEntry = TimeEntry::factory()->forUser($data->user)->create();
+        $inactiveTimeEntry = TimeEntry::factory()->forMember($data->member)->create();
         Passport::actingAs($data->user);
 
         // Act

tests/Unit/Model/ProjectMemberModelTest.php

@@ -4,10 +4,10 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Model;
 
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
-use App\Models\User;
 
 class ProjectMemberModelTest extends ModelTestAbstract
 {
@@ -15,8 +15,8 @@ class ProjectMemberModelTest extends ModelTestAbstract
     {
         // Arrange
         $project = Project::factory()->create();
-        $user = User::factory()->create();
+        $member = Member::factory()->create();
-        $projectMember = ProjectMember::factory()->forProject($project)->forUser($user)->create();
+        $projectMember = ProjectMember::factory()->forProject($project)->forMember($member)->create();
 
         // Act
         $projectMember->refresh();
@@ -27,19 +27,19 @@ class ProjectMemberModelTest extends ModelTestAbstract
         $this->assertTrue($projectRel->is($project));
     }
 
-    public function test_it_belongs_to_a_user(): void
+    public function test_it_belongs_to_a_member(): void
     {
         // Arrange
-        $user = User::factory()->create();
+        $member = Member::factory()->create();
-        $projectMember = ProjectMember::factory()->forUser($user)->create();
+        $projectMember = ProjectMember::factory()->forMember($member)->create();
 
         // Act
         $projectMember->refresh();
-        $userRel = $projectMember->user;
+        $memberRel = $projectMember->member;
 
         // Assert
-        $this->assertNotNull($userRel);
+        $this->assertNotNull($memberRel);
-        $this->assertTrue($userRel->is($user));
+        $this->assertTrue($memberRel->is($member));
     }
 
     public function test_scope_where_belongs_to_organization_filters_project_members_to_only_retrieve_project_members_that_belong_to_a_project_of_the_organization(): void

tests/Unit/Model/ProjectModelTest.php

@@ -5,11 +5,11 @@ declare(strict_types=1);
 namespace Tests\Unit\Model;
 
 use App\Models\Client;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\Task;
-use App\Models\User;
 
 class ProjectModelTest extends ModelTestAbstract
 {
@@ -91,14 +91,14 @@ class ProjectModelTest extends ModelTestAbstract
     public function test_scope_visible_by_user_filters_so_that_only_public_projects_or_projects_where_the_user_is_member_are_shown(): void
     {
         // Arrange
-        $user = User::factory()->create();
+        $member = Member::factory()->create();
         $projectPrivate = Project::factory()->isPrivate()->create();
         $projectPublic = Project::factory()->isPublic()->create();
         $projectPrivateButMember = Project::factory()->isPrivate()->create();
-        ProjectMember::factory()->forProject($projectPrivateButMember)->forUser($user)->create();
+        ProjectMember::factory()->forProject($projectPrivateButMember)->forMember($member)->create();
 
         // Act
-        $projectsVisible = Project::query()->visibleByUser($user)->get();
+        $projectsVisible = Project::query()->visibleByUser($member->user)->get();
         $allProjects = Project::query()->get();
 
         // Assert

tests/Unit/Model/TaskModelTest.php

@@ -4,12 +4,12 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Model;
 
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\Task;
 use App\Models\TimeEntry;
-use App\Models\User;
 
 class TaskModelTest extends ModelTestAbstract
 {
@@ -62,17 +62,17 @@ class TaskModelTest extends ModelTestAbstract
     public function test_scope_visible_by_user_filters_so_that_only_tasks_of_public_projects_or_projects_where_the_user_is_member_are_shown(): void
     {
         // Arrange
-        $user = User::factory()->create();
+        $member = Member::factory()->create();
         $projectPrivate = Project::factory()->isPrivate()->create();
         $projectPublic = Project::factory()->isPublic()->create();
         $projectPrivateButMember = Project::factory()->isPrivate()->create();
-        ProjectMember::factory()->forProject($projectPrivateButMember)->forUser($user)->create();
+        ProjectMember::factory()->forProject($projectPrivateButMember)->forMember($member)->create();
         $taskPrivate = Task::factory()->forProject($projectPrivate)->create();
         $taskPublic = Task::factory()->forProject($projectPublic)->create();
         $taskPrivateButMember = Task::factory()->forProject($projectPrivateButMember)->create();
 
         // Act
-        $tasksVisible = Task::query()->visibleByUser($user)->get();
+        $tasksVisible = Task::query()->visibleByUser($member->user)->get();
         $allTasks = Task::query()->get();
 
         // Assert

tests/Unit/Model/UserModelTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Model;
 
+use App\Enums\Role;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\ProjectMember;
 use App\Models\TimeEntry;
@@ -57,12 +59,12 @@ class UserModelTest extends ModelTestAbstract
         $organization = Organization::factory()->withOwner($owner)->create();
         $user = User::factory()->create();
         $user->organizations()->attach($organization, [
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
         $otherOrganization = Organization::factory()->create();
         $otherUser = User::factory()->create();
         $otherUser->organizations()->attach($otherOrganization, [
-            'role' => 'employee',
+            'role' => Role::Employee->value,
         ]);
 
         // Act
@@ -98,8 +100,10 @@ class UserModelTest extends ModelTestAbstract
         // Arrange
         $user = User::factory()->create();
         $otherUser = User::factory()->create();
-        $projectMembers = ProjectMember::factory()->forUser($user)->createMany(3);
+        $member = Member::factory()->forUser($user)->create();
-        $otherProjectMembers = ProjectMember::factory()->forUser($otherUser)->createMany(3);
+        $otherMember = Member::factory()->forUser($otherUser)->create();
+        $projectMembers = ProjectMember::factory()->forMember($member)->createMany(3);
+        $otherProjectMembers = ProjectMember::factory()->forMember($otherMember)->createMany(3);
 
         // Act
         $user->refresh();

tests/Unit/Service/BillableRateServiceTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Service;
 
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
@@ -31,16 +32,17 @@ class BillableRateServiceTest extends TestCase
         $organization = Organization::factory()->create([
             'billable_rate' => 1001,
         ]);
-        $user = User::factory()->attachToOrganization($organization, [
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($organization)->forUser($user)->create([
             'billable_rate' => 2002,
-        ])->create();
+        ]);
         $project = Project::factory()->forOrganization($organization)->create([
             'billable_rate' => 3003,
         ]);
-        $projectMember = ProjectMember::factory()->forUser($user)->forProject($project)->create([
+        $projectMember = ProjectMember::factory()->forMember($member)->forProject($project)->create([
             'billable_rate' => 4004,
         ]);
-        $timeEntry = TimeEntry::factory()->forProject($project)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry = TimeEntry::factory()->forProject($project)->forMember($member)->forOrganization($organization)->create([
             'billable' => false,
         ]);
 
@@ -57,16 +59,17 @@ class BillableRateServiceTest extends TestCase
         $organization = Organization::factory()->create([
             'billable_rate' => 1001,
         ]);
-        $user = User::factory()->attachToOrganization($organization, [
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($organization)->forUser($user)->create([
             'billable_rate' => 2002,
-        ])->create();
+        ]);
         $project = Project::factory()->forOrganization($organization)->create([
             'billable_rate' => 3003,
         ]);
-        $projectMember = ProjectMember::factory()->forUser($user)->forProject($project)->create([
+        $projectMember = ProjectMember::factory()->forMember($member)->forProject($project)->create([
             'billable_rate' => 4004,
         ]);
-        $timeEntry = TimeEntry::factory()->forProject($project)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry = TimeEntry::factory()->forProject($project)->forMember($member)->forOrganization($organization)->create([
             'billable' => true,
         ]);
 
@@ -83,16 +86,17 @@ class BillableRateServiceTest extends TestCase
         $organization = Organization::factory()->create([
             'billable_rate' => 1001,
         ]);
-        $user = User::factory()->attachToOrganization($organization, [
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($organization)->forUser($user)->create([
             'billable_rate' => 2002,
-        ])->create();
+        ]);
         $project = Project::factory()->forOrganization($organization)->create([
             'billable_rate' => 3003,
         ]);
-        $projectMember = ProjectMember::factory()->forUser($user)->forProject($project)->create([
+        $projectMember = ProjectMember::factory()->forMember($member)->forProject($project)->create([
             'billable_rate' => null,
         ]);
-        $timeEntry = TimeEntry::factory()->forProject($project)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry = TimeEntry::factory()->forProject($project)->forMember($member)->forOrganization($organization)->create([
             'billable' => true,
         ]);
 
@@ -109,13 +113,14 @@ class BillableRateServiceTest extends TestCase
         $organization = Organization::factory()->create([
             'billable_rate' => 1001,
         ]);
-        $user = User::factory()->attachToOrganization($organization, [
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($organization)->forUser($user)->create([
             'billable_rate' => 2002,
-        ])->create();
+        ]);
         $project = Project::factory()->forOrganization($organization)->create([
             'billable_rate' => 3003,
         ]);
-        $timeEntry = TimeEntry::factory()->forProject($project)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry = TimeEntry::factory()->forProject($project)->forMember($member)->forOrganization($organization)->create([
             'billable' => true,
         ]);
 
@@ -132,16 +137,17 @@ class BillableRateServiceTest extends TestCase
         $organization = Organization::factory()->create([
             'billable_rate' => 1001,
         ]);
-        $user = User::factory()->attachToOrganization($organization, [
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($organization)->forUser($user)->create([
             'billable_rate' => 2002,
-        ])->create();
+        ]);
         $project = Project::factory()->forOrganization($organization)->create([
             'billable_rate' => null,
         ]);
-        $projectMember = ProjectMember::factory()->forUser($user)->forProject($project)->create([
+        $projectMember = ProjectMember::factory()->forMember($member)->forProject($project)->create([
             'billable_rate' => null,
         ]);
-        $timeEntry = TimeEntry::factory()->forProject($project)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry = TimeEntry::factory()->forProject($project)->forMember($member)->forOrganization($organization)->create([
             'billable' => true,
         ]);
 
@@ -158,10 +164,11 @@ class BillableRateServiceTest extends TestCase
         $organization = Organization::factory()->create([
             'billable_rate' => 1001,
         ]);
-        $user = User::factory()->attachToOrganization($organization, [
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($organization)->forUser($user)->create([
             'billable_rate' => 2002,
-        ])->create();
+        ]);
-        $timeEntry = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             'billable' => true,
         ]);
 
@@ -178,16 +185,17 @@ class BillableRateServiceTest extends TestCase
         $organization = Organization::factory()->create([
             'billable_rate' => 1001,
         ]);
-        $user = User::factory()->attachToOrganization($organization, [
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($organization)->forUser($user)->create([
             'billable_rate' => null,
-        ])->create();
+        ]);
         $project = Project::factory()->forOrganization($organization)->create([
             'billable_rate' => null,
         ]);
-        $projectMember = ProjectMember::factory()->forUser($user)->forProject($project)->create([
+        $projectMember = ProjectMember::factory()->forMember($member)->forProject($project)->create([
             'billable_rate' => null,
         ]);
-        $timeEntry = TimeEntry::factory()->forProject($project)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry = TimeEntry::factory()->forProject($project)->forMember($member)->forOrganization($organization)->create([
             'billable' => true,
         ]);
 
@@ -205,7 +213,10 @@ class BillableRateServiceTest extends TestCase
             'billable_rate' => 1001,
         ]);
         $user = User::factory()->create();
-        $timeEntry = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $member = Member::factory()->forOrganization($organization)->forUser($user)->create([
+            'billable_rate' => null,
+        ]);
+        $timeEntry = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             'billable' => true,
         ]);
 
@@ -222,16 +233,17 @@ class BillableRateServiceTest extends TestCase
         $organization = Organization::factory()->create([
             'billable_rate' => null,
         ]);
-        $user = User::factory()->attachToOrganization($organization, [
+        $user = User::factory()->create();
+        $member = Member::factory()->forOrganization($organization)->forUser($user)->create([
             'billable_rate' => null,
-        ])->create();
+        ]);
         $project = Project::factory()->forOrganization($organization)->create([
             'billable_rate' => null,
         ]);
-        $projectMember = ProjectMember::factory()->forUser($user)->forProject($project)->create([
+        $projectMember = ProjectMember::factory()->forMember($member)->forProject($project)->create([
             'billable_rate' => null,
         ]);
-        $timeEntry = TimeEntry::factory()->forProject($project)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry = TimeEntry::factory()->forProject($project)->forMember($member)->forOrganization($organization)->create([
             'billable' => true,
         ]);
 

tests/Unit/Service/DashboardServiceTest.php

@@ -6,6 +6,7 @@ namespace Tests\Unit\Service;
 
 use App\Enums\Role;
 use App\Enums\Weekday;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Task;
@@ -37,13 +38,13 @@ class DashboardServiceTest extends TestCase
         $user = User::factory()->create([
             'timezone' => 'Europe/Vienna',
         ]);
-        $user->organizations()->attach($organization);
+        $member = Member::factory()->forUser($user)->forOrganization($organization)->create();
-        $timeEntry1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time shifts in timezone Europe/Vienna to the next day
             'start' => Carbon::create(2023, 12, 30, 23, 0, 0, 'UTC'),
             'end' => Carbon::create(2023, 12, 30, 23, 0, 40, 'UTC'),
         ]);
-        $timeEntry2 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry2 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time NOT shifts in timezone Europe/Vienna to the next day
             'start' => Carbon::create(2023, 12, 30, 22, 59, 59, 'UTC'),
             'end' => Carbon::create(2023, 12, 30, 23, 0, 39, 'UTC'),
@@ -87,15 +88,15 @@ class DashboardServiceTest extends TestCase
             'timezone' => 'Europe/Vienna',
             'week_start' => Weekday::Sunday,
         ]);
-        $user->organizations()->attach($organization);
+        $member = Member::factory()->forUser($user)->forOrganization($organization)->create();
         // Note: This is a Sunday
-        $timeEntry1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time shifts in timezone Europe/Vienna to the next day
             'start' => Carbon::create(2023, 12, 30, 23, 0, 0, 'UTC'),
             'end' => Carbon::create(2023, 12, 30, 23, 0, 40, 'UTC'),
         ]);
         // Note: This is a Saturday
-        $timeEntry2 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry2 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time NOT shifts in timezone Europe/Vienna to the next day
             'start' => Carbon::create(2023, 12, 30, 22, 59, 59, 'UTC'),
             'end' => Carbon::create(2023, 12, 30, 23, 0, 39, 'UTC'),
@@ -147,15 +148,15 @@ class DashboardServiceTest extends TestCase
             'timezone' => 'Europe/Vienna',
             'week_start' => Weekday::Sunday,
         ]);
-        $user->organizations()->attach($organization);
+        $member = Member::factory()->forUser($user)->forOrganization($organization)->create();
         // Note: This is a Sunday
-        $timeEntry1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time shifts in timezone Europe/Vienna to the next day
             'start' => Carbon::create(2023, 12, 30, 23, 0, 0, 'UTC'),
             'end' => Carbon::create(2023, 12, 30, 23, 0, 40, 'UTC'),
         ]);
         // Note: This is a Saturday
-        $timeEntry2 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry2 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time NOT shifts in timezone Europe/Vienna to the next day
             'start' => Carbon::create(2023, 12, 30, 22, 59, 59, 'UTC'),
             'end' => Carbon::create(2023, 12, 30, 23, 0, 39, 'UTC'),
@@ -178,23 +179,23 @@ class DashboardServiceTest extends TestCase
             'timezone' => 'Europe/Vienna',
             'week_start' => Weekday::Sunday,
         ]);
-        $user->organizations()->attach($organization);
+        $member = Member::factory()->forUser($user)->forOrganization($organization)->create();
         // Note: This is a Sunday
-        $timeEntry1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time shifts in timezone Europe/Vienna to the next day
             'billable' => true,
             'start' => Carbon::create(2023, 12, 30, 23, 0, 0, 'UTC'),
             'end' => Carbon::create(2023, 12, 30, 23, 0, 40, 'UTC'),
         ]);
         // Note: This is a Sunday (non-billable)
-        $timeEntry1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time shifts in timezone Europe/Vienna to the next day
             'billable' => false,
             'start' => Carbon::create(2023, 12, 30, 23, 0, 40, 'UTC'),
             'end' => Carbon::create(2023, 12, 30, 23, 0, 59, 'UTC'),
         ]);
         // Note: This is a Saturday
-        $timeEntry2 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry2 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time NOT shifts in timezone Europe/Vienna to the next day
             'billable' => true,
             'start' => Carbon::create(2023, 12, 30, 22, 59, 59, 'UTC'),
@@ -221,9 +222,9 @@ class DashboardServiceTest extends TestCase
             'timezone' => 'Europe/Vienna',
             'week_start' => Weekday::Sunday,
         ]);
-        $user->organizations()->attach($organization);
+        $member = Member::factory()->forUser($user)->forOrganization($organization)->create();
         // Note: This is a Sunday
-        $timeEntry1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time shifts in timezone Europe/Vienna to the next day
             'billable' => true,
             'billable_rate' => 50 * 100,
@@ -231,14 +232,14 @@ class DashboardServiceTest extends TestCase
             'end' => Carbon::create(2023, 12, 31, 0, 0, 0, 'UTC'),
         ]);
         // Note: This is a Sunday (non-billable)
-        $timeEntry2 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry2 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time shifts in timezone Europe/Vienna to the next day
             'billable' => false,
             'start' => Carbon::create(2023, 12, 30, 23, 0, 40, 'UTC'),
             'end' => Carbon::create(2023, 12, 30, 23, 0, 59, 'UTC'),
         ]);
         // Note: This is a Saturday
-        $timeEntry3 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry3 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: The start time NOT shifts in timezone Europe/Vienna to the next day
             'billable' => true,
             'billable_rate' => 100 * 100,
@@ -267,42 +268,40 @@ class DashboardServiceTest extends TestCase
             'week_start' => Weekday::Sunday,
         ]);
         $organization = Organization::factory()->withOwner($user)->create();
-        $organization->users()->attach($user, [
+        $member = Member::factory()->forUser($user)->forOrganization($organization)->role(Role::Owner)->create();
-            'role' => Role::Owner->value,
-        ]);
         $project1 = Project::factory()->forOrganization($organization)->create();
         $project2 = Project::factory()->forOrganization($organization)->create();
-        $timeEntry1Project1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->forProject($project1)->create([
+        $timeEntry1Project1 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->forProject($project1)->create([
             // Note: At the start of the week
             'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
             'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
         ]);
-        $timeEntry2Project1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->forProject($project1)->create([
+        $timeEntry2Project1 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->forProject($project1)->create([
             // Note: At the end of the week
             'start' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
             'end' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
         ]);
-        $timeEntry1Project2 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->forProject($project2)->create([
+        $timeEntry1Project2 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->forProject($project2)->create([
             // Note: At the start of the week
             'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
             'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
         ]);
-        $timeEntry2Project2 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->forProject($project2)->create([
+        $timeEntry2Project2 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->forProject($project2)->create([
             // Note: At the end of the week
             'start' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
             'end' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
         ]);
-        $timeEntry1WithoutProject = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1WithoutProject = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: At the start of the week
             'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
             'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
         ]);
-        $timeEntry2WithoutProject = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry2WithoutProject = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: At the end of the week
             'start' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
             'end' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
         ]);
-        $timeEntry1WithoutProjectOutsideOfWeek = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1WithoutProjectOutsideOfWeek = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: Outside of week
             'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->subSecond()->utc(),
             'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(39)->utc(),
@@ -312,7 +311,7 @@ class DashboardServiceTest extends TestCase
         $result = $this->dashboardService->weeklyProjectOverview($user, $organization);
 
         // Assert
-        $this->assertSame([
+        $this->assertEqualsCanonicalizing([
             [
                 'value' => 80,
                 'id' => $project1->getKey(),
@@ -345,18 +344,18 @@ class DashboardServiceTest extends TestCase
             'timezone' => 'Europe/Vienna',
             'week_start' => Weekday::Sunday,
         ]);
-        $user->organizations()->attach($organization);
+        $member = Member::factory()->forUser($user)->forOrganization($organization)->create();
-        $timeEntry1WithoutProject = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1WithoutProject = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: At the start of the week
             'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
             'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
         ]);
-        $timeEntry2WithoutProject = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry2WithoutProject = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: At the end of the week
             'start' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->utc(),
             'end' => $now->endOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(40)->utc(),
         ]);
-        $timeEntry1WithoutProjectOutsideOfWeek = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1WithoutProjectOutsideOfWeek = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             // Note: Outside of week
             'start' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->subSecond()->utc(),
             'end' => $now->startOfWeek(Weekday::Sunday->carbonWeekDay())->addSeconds(39)->utc(),
@@ -386,7 +385,7 @@ class DashboardServiceTest extends TestCase
             'timezone' => 'Europe/Vienna',
             'week_start' => Weekday::Sunday,
         ]);
-        $user->organizations()->attach($organization);
+        $member = Member::factory()->forUser($user)->forOrganization($organization)->create();
 
         // Act
         $result = $this->dashboardService->weeklyProjectOverview($user, $organization);
@@ -406,31 +405,31 @@ class DashboardServiceTest extends TestCase
     {
         // Arrange
         $organization = Organization::factory()->create();
-        $user1 = User::factory()->create();
+        $member1 = Member::factory()->forOrganization($organization)->create();
-        $user2 = User::factory()->create();
+        $member2 = Member::factory()->forOrganization($organization)->create();
-        $user3 = User::factory()->create();
+        $member3 = Member::factory()->forOrganization($organization)->create();
-        $user4 = User::factory()->create();
+        $member4 = Member::factory()->forOrganization($organization)->create();
-        $user5 = User::factory()->create();
+        $member5 = Member::factory()->forOrganization($organization)->create();
         $task1 = Task::factory()->forOrganization($organization)->create();
-        $timeEntry1 = TimeEntry::factory()->forUser($user1)->forOrganization($organization)->active()->create([
+        $timeEntry1 = TimeEntry::factory()->forMember($member1)->forOrganization($organization)->active()->create([
             'start' => now()->subMinutes(10),
         ]);
-        $timeEntry2 = TimeEntry::factory()->forUser($user2)->forOrganization($organization)->create([
+        $timeEntry2 = TimeEntry::factory()->forMember($member2)->forOrganization($organization)->create([
             'start' => now()->subMinutes(20),
         ]);
-        $timeEntry3 = TimeEntry::factory()->forUser($user3)->forOrganization($organization)->forTask($task1)->create([
+        $timeEntry3 = TimeEntry::factory()->forMember($member3)->forOrganization($organization)->forTask($task1)->create([
             'description' => '',
             'start' => now()->subMinutes(30),
         ]);
-        $timeEntry4 = TimeEntry::factory()->forUser($user4)->forOrganization($organization)->forTask($task1)->create([
+        $timeEntry4 = TimeEntry::factory()->forMember($member4)->forOrganization($organization)->forTask($task1)->create([
             'description' => 'TEST 123',
             'start' => now()->subMinutes(40),
         ]);
-        $timeEntry5 = TimeEntry::factory()->forUser($user4)->forOrganization($organization)->forTask($task1)->create([
+        $timeEntry5 = TimeEntry::factory()->forMember($member4)->forOrganization($organization)->forTask($task1)->create([
             'description' => 'TEST 321',
             'start' => now()->subMinutes(50),
         ]);
-        $timeEntry6 = TimeEntry::factory()->forUser($user5)->forOrganization($organization)->forTask($task1)->create([
+        $timeEntry6 = TimeEntry::factory()->forMember($member5)->forOrganization($organization)->forTask($task1)->create([
             'description' => 'TEST 321',
             'start' => now()->subMinutes(60),
         ]);
@@ -441,32 +440,32 @@ class DashboardServiceTest extends TestCase
         // Assert
         $this->assertSame([
             [
-                'user_id' => $user1->getKey(),
+                'member_id' => $member1->getKey(),
-                'name' => $user1->name,
+                'name' => $member1->user->name,
                 'description' => $timeEntry1->description,
                 'time_entry_id' => $timeEntry1->getKey(),
                 'task_id' => null,
                 'status' => true,
             ],
             [
-                'user_id' => $user2->getKey(),
+                'member_id' => $member2->getKey(),
-                'name' => $user2->name,
+                'name' => $member2->user->name,
                 'description' => $timeEntry2->description,
                 'time_entry_id' => $timeEntry2->getKey(),
                 'task_id' => null,
                 'status' => false,
             ],
             [
-                'user_id' => $user3->getKey(),
+                'member_id' => $member3->getKey(),
-                'name' => $user3->name,
+                'name' => $member3->user->name,
                 'description' => $timeEntry3->description,
                 'time_entry_id' => $timeEntry3->getKey(),
                 'task_id' => $task1->getKey(),
                 'status' => false,
             ],
             [
-                'user_id' => $user4->getKey(),
+                'member_id' => $member4->getKey(),
-                'name' => $user4->name,
+                'name' => $member4->user->name,
                 'description' => $timeEntry4->description,
                 'time_entry_id' => $timeEntry4->getKey(),
                 'task_id' => $task1->getKey(),
@@ -480,25 +479,26 @@ class DashboardServiceTest extends TestCase
         // Arrange
         $organization = Organization::factory()->create();
         $user = User::factory()->create();
+        $member = Member::factory()->forUser($user)->forOrganization($organization)->create();
         $task1 = Task::factory()->forOrganization($organization)->create();
         $task2 = Task::factory()->forOrganization($organization)->create();
         $task3 = Task::factory()->forOrganization($organization)->create();
         $task4 = Task::factory()->forOrganization($organization)->create();
         $task5 = Task::factory()->forOrganization($organization)->create();
 
-        $timeEntry1Task1 = TimeEntry::factory()->forTask($task1)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1Task1 = TimeEntry::factory()->forTask($task1)->forMember($member)->forOrganization($organization)->create([
             'start' => now()->subMinutes(20),
         ]);
-        $timeEntry1Task2 = TimeEntry::factory()->forTask($task2)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1Task2 = TimeEntry::factory()->forTask($task2)->forMember($member)->forOrganization($organization)->create([
             'start' => now()->subMinutes(30),
         ]);
-        $timeEntry1Task3 = TimeEntry::factory()->forTask($task3)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1Task3 = TimeEntry::factory()->forTask($task3)->forMember($member)->forOrganization($organization)->create([
             'start' => now()->subMinutes(40),
         ]);
-        $timeEntry1Task4 = TimeEntry::factory()->forTask($task4)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1Task4 = TimeEntry::factory()->forTask($task4)->forMember($member)->forOrganization($organization)->create([
             'start' => now()->subMinutes(50),
         ]);
-        $timeEntry1Task5 = TimeEntry::factory()->forTask($task5)->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1Task5 = TimeEntry::factory()->forTask($task5)->forMember($member)->forOrganization($organization)->create([
             'start' => now()->subMinutes(60),
         ]);
 
@@ -543,15 +543,16 @@ class DashboardServiceTest extends TestCase
         $user = User::factory()->create([
             'timezone' => 'Europe/Vienna',
         ]);
-        $timeEntryOverWholePeriod = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $member = Member::factory()->forUser($user)->forOrganization($organization)->create();
+        $timeEntryOverWholePeriod = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             'start' => now('Europe/Vienna')->subDays(7)->startOfDay()->utc(),
             'end' => now('Europe/Vienna')->endOfDay()->addSecond()->utc(), // TODO: fix problem with last second
         ]);
-        $timeEntryOverWholePeriodWithoutEnd = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntryOverWholePeriodWithoutEnd = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             'start' => now('Europe/Vienna')->subDays(7)->startOfDay()->utc(),
             'end' => null,
         ]);
-        $timeEntry1Task1 = TimeEntry::factory()->forUser($user)->forOrganization($organization)->create([
+        $timeEntry1Task1 = TimeEntry::factory()->forMember($member)->forOrganization($organization)->create([
             'start' => now('Europe/Vienna')->subMinutes(30)->utc(),
             'end' => now('Europe/Vienna')->subMinutes(20)->utc(),
         ]);

tests/Unit/Service/PermissionStoreTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Service;
 
+use App\Enums\Role;
 use App\Models\Organization;
 use App\Models\User;
 use App\Service\PermissionStore;
@@ -20,7 +21,7 @@ class PermissionStoreTest extends TestCase
         // Arrange
         $organization = Organization::factory()->create();
         $user = User::factory()->create();
-        $organization->users()->attach($user, ['role' => 'employee']);
+        $organization->users()->attach($user, ['role' => Role::Employee->value]);
         $permissionStore = new PermissionStore();
 
         // Act
@@ -50,7 +51,7 @@ class PermissionStoreTest extends TestCase
         // Arrange
         $organization = Organization::factory()->create();
         $user = User::factory()->create();
-        $organization->users()->attach($user, ['role' => 'employee']);
+        $organization->users()->attach($user, ['role' => Role::Employee->value]);
         $permissionStore = new PermissionStore();
         $this->actingAs($user);
 
@@ -66,7 +67,7 @@ class PermissionStoreTest extends TestCase
         // Arrange
         $organization = Organization::factory()->create();
         $user = User::factory()->create();
-        $organization->users()->attach($user, ['role' => 'employee']);
+        $organization->users()->attach($user, ['role' => Role::Employee->value]);
         $permissionStore = new PermissionStore();
         $this->actingAs($user);
 
@@ -82,7 +83,7 @@ class PermissionStoreTest extends TestCase
         // Arrange
         $organization = Organization::factory()->create();
         $user = User::factory()->create();
-        $organization->users()->attach($user, ['role' => 'employee']);
+        $organization->users()->attach($user, ['role' => Role::Employee->value]);
         $permissionStore = new PermissionStore();
 
         // Act
@@ -111,7 +112,7 @@ class PermissionStoreTest extends TestCase
         // Arrange
         $organization = Organization::factory()->create();
         $user = User::factory()->create();
-        $organization->users()->attach($user, ['role' => 'employee']);
+        $organization->users()->attach($user, ['role' => Role::Employee->value]);
         $permissionStore = new PermissionStore();
         $this->actingAs($user);
 
@@ -119,6 +120,6 @@ class PermissionStoreTest extends TestCase
         $result = $permissionStore->getPermissions($organization);
 
         // Assert
-        $this->assertSame(Jetstream::findRole('employee')->permissions, $result);
+        $this->assertSame(Jetstream::findRole(Role::Employee->value)->permissions, $result);
     }
 }

tests/Unit/Service/UserServiceTest.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Tests\Unit\Service;
 
 use App\Enums\Role;
-use App\Models\Membership;
+use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
@@ -27,10 +27,13 @@ class UserServiceTest extends TestCase
         $otherUser = User::factory()->create();
         $fromUser = User::factory()->create();
         $toUser = User::factory()->create();
-        TimeEntry::factory()->forOrganization($organization)->forUser($otherUser)->createMany(3);
+        $otherUserMember = Member::factory()->forOrganization($organization)->forUser($otherUser)->create();
-        TimeEntry::factory()->forOrganization($organization)->forUser($fromUser)->createMany(3);
+        $fromUserMember = Member::factory()->forOrganization($organization)->forUser($fromUser)->create();
-        ProjectMember::factory()->forProject($project)->forUser($otherUser)->create();
+        $toUserMember = Member::factory()->forOrganization($organization)->forUser($toUser)->create();
-        ProjectMember::factory()->forProject($project)->forUser($fromUser)->create();
+        TimeEntry::factory()->forOrganization($organization)->forMember($otherUserMember)->createMany(3);
+        TimeEntry::factory()->forOrganization($organization)->forMember($fromUserMember)->createMany(3);
+        ProjectMember::factory()->forProject($project)->forMember($otherUserMember)->create();
+        ProjectMember::factory()->forProject($project)->forMember($fromUserMember)->create();
 
         // Act
         /** @var UserService $userService */
@@ -66,7 +69,7 @@ class UserServiceTest extends TestCase
 
         // Assert
         $this->assertSame($newOwner->getKey(), $organization->refresh()->user_id);
-        $this->assertSame(Role::Owner->value, Membership::whereBelongsTo($newOwner)->whereBelongsTo($organization)->firstOrFail()->role);
+        $this->assertSame(Role::Owner->value, Member::whereBelongsTo($newOwner)->whereBelongsTo($organization)->firstOrFail()->role);
-        $this->assertSame(Role::Admin->value, Membership::whereBelongsTo($oldOwner)->whereBelongsTo($organization)->firstOrFail()->role);
+        $this->assertSame(Role::Admin->value, Member::whereBelongsTo($oldOwner)->whereBelongsTo($organization)->firstOrFail()->role);
     }
 }