Removed default healthcheck in prod Dockerfile

# Conflicts:
#	e2e/members.spec.ts
#	e2e/organization.spec.ts

.env.example

@@ -3,6 +3,7 @@ APP_ENV=local
 APP_KEY=base64:UNQNf1SXeASNkWux01Rj8EnHYx8FO0kAxWNDwktclkk=
 APP_DEBUG=true
 APP_URL=https://solidtime.test
+AUDITING_ENABLED=true
 
 SUPER_ADMINS=admin@example.com
 

.github/workflows/npm-publish-api.yml

@@ -0,0 +1,29 @@
+name: Publish API package to NPM
+on:
+  workflow_dispatch
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      # Setup .npmrc file to publish to npm
+      - name: Install root project dependencies
+        run: npm ci
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          registry-url: 'https://registry.npmjs.org'
+      - name: Install dependencies
+        run: npm ci
+        working-directory: ./resources/js/packages/api
+      - name: Build package
+        run: npm run build
+        working-directory: ./resources/js/packages/api
+      - name: Publish Package
+        run: npm publish --provenance --access public
+        working-directory: ./resources/js/packages/api
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/npm-publish-ui.yml

@@ -0,0 +1,29 @@
+name: Publish UI package to NPM
+on:
+  workflow_dispatch
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      # Setup .npmrc file to publish to npm
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          registry-url: 'https://registry.npmjs.org'
+      - name: Install root project dependencies
+        run: npm ci
+      - name: Install package dependencies
+        run: npm ci
+        working-directory: ./resources/js/packages/ui
+      - name: Build package
+        run: npm run build
+        working-directory: ./resources/js/packages/ui
+      - name: Publish Package
+        run: npm publish --provenance --access public
+        working-directory: ./resources/js/packages/ui
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -1,5 +1,6 @@
 /.phpunit.cache
-/node_modules
+node_modules
+dist
 /public/build
 /public/hot
 /public/storage

README.md

@@ -20,82 +20,13 @@ solidtime is a modern open-source time tracking application for Freelancers and
  - Roles and permissions: Create and manage organizations
  - Import: Import your time tracking data from other time tracking applications (Supported: Toggl, Clockify, Timeentry CSV)
 
-## Local setup for development
+## Self Hosting
 
-**System requirements**
- * Docker
+If you are looking into self-hosting solidtime, you can find the guides [here](https://docs.solidtime.io/self-hosting/intro)
 
-First you need to download or clone the repository f.e. with `git@github.com:solidtime-io/solidtime.git`. 
+We also have an examples repository [here](https://github.com/solidtime-io/self-hosting-examples)
 
-After that, execute the following commands **inside the project folder**: 
-
-```bash
-docker run --rm \
-    --pull=always \
-    -v "$(pwd)":/opt \
-    -w /opt \
-    laravelsail/php83-composer:latest \
-    bash -c "composer install --ignore-platform-reqs"
-
-cp .env.example .env
-
-./vendor/bin/sail up -d
-
-./vendor/bin/sail artisan key:generate
-
-./vendor/bin/sail artisan migrate:fresh --seed
-
-./vendor/bin/sail php artisan passport:install
-
-./vendor/bin/sail npm install
-
-./vendor/bin/sail npm run build
-```
-
-Make sure to set the APP_PORT and VITE_PORT inside your `.env` file to a port that is not already used by your system.
-
-By default the application will run on [localhost:8083](http://localhost:8083/)
-
-### Setup with Reverse Proxy
-
-**Additional System Requirements**
-* Traefik 2 Reverse-Proxy (https://github.com/korridor/reverse-proxy-docker-traefik)
-
-Add the following entry to your `/etc/hosts`
-
-```
-127.0.0.1 solidtime.test
-127.0.0.1 playwright.solidtime.test
-127.0.0.1 vite.solidtime.test
-127.0.0.1 mail.solidtime.test
-```
-
-### Running E2E Tests
-
-`./vendor/bin/sail up -d ` will automatically start a Playwright UI server that you can access at `https://playwright.solidtime.test`. 
-Make sure that you use HTTPS otherwise the resources will not be loaded correctly.
-
-### Recording E2E Tests
-
-To record E2E tests, you need to install and execute playwright locally (outside the Docker container) using: 
-
-```bash
-npx playwright install
-npx playwright codegen solidtime.test
-``` 
-
-### E2E Troubleshooting
-
-If E2E tests are not working at all, make sure you do not have the Vite server running and just run `npm run build` to update the version.
-If the E2E tests are not working consistently and fail with a timeout during the authentication, you might want to delete the `test-results/.auth` directory to force new test accounts to be created.
-
-### Generate ZOD Client
-
-The Zodius HTTP client is generated using the following command:
-
-```bash
-npm run zod:generate
-```
+If you do not want to self-host solidtime or try it out you can sign up for [solidtime cloud](https://www.solidtime.io/)
 
 ## Contributing
 

app/Actions/Fortify/CreateNewUser.php

@@ -9,6 +9,7 @@ use App\Enums\Weekday;
 use App\Events\NewsletterRegistered;
 use App\Models\Organization;
 use App\Models\User;
+use App\Service\IpLookup\IpLookupServiceContract;
 use App\Service\TimezoneService;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
@@ -18,6 +19,7 @@ use Illuminate\Validation\ValidationException;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 use Laravel\Fortify\Contracts\CreatesNewUsers;
 use Laravel\Jetstream\Jetstream;
+use Log;
 
 class CreateNewUser implements CreatesNewUsers
 {
@@ -55,20 +57,49 @@ class CreateNewUser implements CreatesNewUsers
             ],
         ])->validate();
 
-        $timezone = 'UTC';
-        if (array_key_exists('timezone', $input) && is_string($input['timezone']) && app(TimezoneService::class)->isValid($input['timezone'])) {
-            $timezone = $input['timezone'];
+        $timezone = null;
+        if (array_key_exists('timezone', $input) && is_string($input['timezone'])) {
+            if (app(TimezoneService::class)->isValid($input['timezone'])) {
+                $timezone = $input['timezone'];
+            } else {
+                Log::debug('Invalid timezone', ['timezone' => $input['timezone']]);
+            }
         }
 
-        $user = DB::transaction(function () use ($input, $timezone) {
+        $ipLookupResponse = app(IpLookupServiceContract::class)->lookup(request()->ip());
+
+        $startOfWeek = Weekday::Monday;
+        $currency = null;
+        if ($ipLookupResponse !== null) {
+            $startOfWeek = $ipLookupResponse->startOfWeek ?? Weekday::Monday;
+            if ($timezone === null) {
+                $timezone = $ipLookupResponse->timezone;
+            }
+            $currency = $ipLookupResponse->currency;
+        }
+
+        $user = DB::transaction(function () use ($input, $timezone, $startOfWeek, $currency) {
             return tap(User::create([
                 'name' => $input['name'],
                 'email' => $input['email'],
                 'password' => Hash::make($input['password']),
-                'timezone' => $timezone,
-                'week_start' => Weekday::Monday,
-            ]), function (User $user) {
-                $this->createTeam($user);
+                'timezone' => $timezone ?? 'UTC',
+                'week_start' => $startOfWeek,
+            ]), function (User $user) use ($currency): void {
+                $organization = new Organization();
+                $organization->name = explode(' ', $user->name, 2)[0]."'s Organization";
+                $organization->personal_team = true;
+                $organization->currency = $currency ?? 'EUR';
+                $organization->owner()->associate($user);
+                $organization->save();
+
+                $organization->users()->attach(
+                    $user, [
+                        'role' => Role::Owner->value,
+                    ]
+                );
+
+                $user->ownedTeams()->save($organization);
             });
         });
 
@@ -79,24 +110,4 @@ class CreateNewUser implements CreatesNewUsers
 
         return $user;
     }
-
-    /**
-     * Create a personal team for the user.
-     */
-    protected function createTeam(User $user): void
-    {
-        $organization = new Organization();
-        $organization->name = explode(' ', $user->name, 2)[0]."'s Organization";
-        $organization->personal_team = true;
-        $organization->owner()->associate($user);
-        $organization->save();
-
-        $organization->users()->attach(
-            $user, [
-                'role' => Role::Owner->value,
-            ]
-        );
-
-        $user->ownedTeams()->save($organization);
-    }
 }

app/Actions/Jetstream/AddOrganizationMember.php

@@ -7,7 +7,6 @@ namespace App\Actions\Jetstream;
 use App\Enums\Role;
 use App\Models\Organization;
 use App\Models\User;
-use App\Service\UserService;
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
@@ -43,10 +42,6 @@ class AddOrganizationMember implements AddsTeamMembers
             $organization->users()->attach(
                 $newOrganizationMember, ['role' => $role]
             );
-
-            if ($role === Role::Owner->value) {
-                app(UserService::class)->changeOwnership($organization, $newOrganizationMember);
-            }
         });
 
         TeamMemberAdded::dispatch($organization, $newOrganizationMember);
@@ -84,7 +79,6 @@ class AddOrganizationMember implements AddsTeamMembers
                 'required',
                 'string',
                 Rule::in([
-                    Role::Owner->value,
                     Role::Admin->value,
                     Role::Manager->value,
                     Role::Employee->value,

app/Actions/Jetstream/DeleteOrganization.php

@@ -15,6 +15,7 @@ class DeleteOrganization implements DeletesTeams
      */
     public function delete(Organization $organization): void
     {
+        /** @see ValidateOrganizationDeletion */
         app(DeletionService::class)->deleteOrganization($organization);
     }
 }

app/Actions/Jetstream/DeleteUser.php

@@ -14,6 +14,8 @@ class DeleteUser implements DeletesUsers
 {
     /**
      * Delete the given user.
+     *
+     * @throws ValidationException
      */
     public function delete(User $user): void
     {

app/Actions/Jetstream/InviteOrganizationMember.php

@@ -4,103 +4,21 @@ declare(strict_types=1);
 
 namespace App\Actions\Jetstream;
 
-use App\Enums\Role;
+use App\Exceptions\MovedToApiException;
 use App\Models\Organization;
-use App\Models\OrganizationInvitation;
 use App\Models\User;
-use App\Service\PermissionStore;
-use Closure;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
-use Illuminate\Validation\Rules\In;
-use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
+use Exception;
 use Laravel\Jetstream\Contracts\InvitesTeamMembers;
-use Laravel\Jetstream\Events\InvitingTeamMember;
-use Laravel\Jetstream\Mail\TeamInvitation;
 
 class InviteOrganizationMember implements InvitesTeamMembers
 {
     /**
      * Invite a new team member to the given team.
      *
-     * @throws AuthorizationException
+     * @throws Exception
      */
     public function invite(User $user, Organization $organization, string $email, ?string $role = null): void
     {
-        if (! app(PermissionStore::class)->has($organization, 'invitations:create')) {
-            throw new AuthorizationException();
-        }
-
-        $this->validate($organization, $email, $role);
-
-        InvitingTeamMember::dispatch($organization, $email, $role);
-
-        /** @var OrganizationInvitation $invitation */
-        $invitation = $organization->teamInvitations()->create([
-            'email' => $email,
-            'role' => $role,
-        ]);
-
-        Mail::to($email)->send(new TeamInvitation($invitation));
-    }
-
-    /**
-     * Validate the invite member operation.
-     */
-    protected function validate(Organization $organization, string $email, ?string $role): void
-    {
-        Validator::make([
-            'email' => $email,
-            'role' => $role,
-        ], $this->rules($organization))->after(
-            $this->ensureUserIsNotAlreadyOnTeam($organization, $email)
-        )->validateWithBag('addTeamMember');
-    }
-
-    /**
-     * Get the validation rules for inviting a team member.
-     *
-     * @return array<string, array<ValidationRule|Rule|string|In>>
-     */
-    protected function rules(Organization $organization): array
-    {
-        return array_filter([
-            'email' => [
-                'required',
-                'email',
-                (new UniqueEloquent(OrganizationInvitation::class, 'email', function (Builder $builder) use ($organization) {
-                    /** @var Builder<OrganizationInvitation> $builder */
-                    return $builder->whereBelongsTo($organization, 'organization');
-                }))->withMessage(__('This user has already been invited to the team.')),
-            ],
-            'role' => [
-                'required',
-                'string',
-                Rule::in([
-                    Role::Owner->value,
-                    Role::Admin->value,
-                    Role::Manager->value,
-                    Role::Employee->value,
-                ]),
-            ],
-        ]);
-    }
-
-    /**
-     * Ensure that the user is not already on the team.
-     */
-    protected function ensureUserIsNotAlreadyOnTeam(Organization $organization, string $email): Closure
-    {
-        return function ($validator) use ($organization, $email) {
-            $validator->errors()->addIf(
-                $organization->hasRealUserWithEmail($email),
-                'email',
-                __('This user already belongs to the team.')
-            );
-        };
+        throw new MovedToApiException();
     }
 }

app/Actions/Jetstream/RemoveOrganizationMember.php

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

app/Actions/Jetstream/UpdateMemberRole.php

@@ -5,63 +5,21 @@ declare(strict_types=1);
 namespace App\Actions\Jetstream;
 
 use App\Enums\Role;
+use App\Exceptions\MovedToApiException;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\User;
-use App\Service\PermissionStore;
-use App\Service\UserService;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
-use Illuminate\Validation\ValidationException;
-use Laravel\Jetstream\Events\TeamMemberUpdated;
+use Exception;
 
 class UpdateMemberRole
 {
     /**
      * Update the role for the given team member.
      *
-     * @throws AuthorizationException
-     * @throws ValidationException
+     * @throws Exception
      */
     public function update(User $actingUser, Organization $organization, string $userId, string $role): void
     {
-        if (! app(PermissionStore::class)->has($organization, 'members:change-role')) {
-            throw new AuthorizationException();
-        }
-
-        $user = User::where('id', '=', $userId)->firstOrFail();
-        $member = Member::whereBelongsTo($user)->whereBelongsTo($organization)->firstOrFail();
-        if ($member->role === Role::Placeholder->value) {
-            abort(403, 'Cannot update the role of a placeholder member.');
-        }
-
-        Validator::make([
-            'role' => $role,
-        ], [
-            'role' => [
-                'required',
-                'string',
-                Rule::in([
-                    Role::Owner->value,
-                    Role::Admin->value,
-                    Role::Manager->value,
-                    Role::Employee->value,
-                ]),
-            ],
-        ])->validate();
-
-        DB::transaction(function () use ($organization, $userId, $role, $user) {
-            $organization->users()->updateExistingPivot($userId, [
-                'role' => $role,
-            ]);
-
-            if ($role === Role::Owner->value) {
-                app(UserService::class)->changeOwnership($organization, $user);
-            }
-        });
-
-        TeamMemberUpdated::dispatch($organization->fresh(), User::findOrFail($userId));
+        throw new MovedToApiException();
     }
 }

app/Console/Commands/Test/TestJobCommand.php

@@ -15,7 +15,7 @@ class TestJobCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'test:job';
+    protected $signature = 'test:job {--fail}';
 
     /**
      * The console command description.
@@ -30,7 +30,9 @@ class TestJobCommand extends Command
     public function handle(): int
     {
         $user = User::firstOrFail();
-        TestJob::dispatch($user, 'Test job message.');
+        $fail = (bool) $this->option('fail');
+
+        TestJob::dispatch($user, 'Test job message.', $fail);
 
         return self::SUCCESS;
     }

app/Console/Commands/TimeEntry/TimeEntrySendStillRunningMailsCommand.php

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands\TimeEntry;
+
+use App\Mail\TimeEntryStillRunningMail;
+use App\Models\TimeEntry;
+use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Mail;
+
+class TimeEntrySendStillRunningMailsCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'time-entry:send-still-running-mails '.
+        ' { --dry-run : Do not actually send emails or save anything to the database, just output what would happen }';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Sends emails to users who have running time entries for more than 8 hours.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $this->comment('Sending still running time entry emails...');
+        $dryRun = (bool) $this->option('dry-run');
+        if ($dryRun) {
+            $this->comment('Running in dry-run mode. No emails will be sent and nothing will be saved to the database.');
+        }
+
+        $sentMails = 0;
+        TimeEntry::query()
+            ->whereNull('end')
+            ->where('start', '<', now()->subHours(8))
+            ->whereNull('still_active_email_sent_at')
+            ->with([
+                'user',
+            ])
+            ->orderBy('created_at', 'asc')
+            ->chunk(500, function (Collection $timeEntries) use ($dryRun, &$sentMails) {
+                /** @var Collection<int, TimeEntry> $timeEntries */
+                foreach ($timeEntries as $timeEntry) {
+                    $user = $timeEntry->user;
+                    $this->info('Start sending email to user "'.$user->email.'" ('.$user->getKey().') for time entry '.$timeEntry->getKey());
+                    $sentMails++;
+                    if (! $dryRun) {
+                        Mail::to($user->email)
+                            ->queue(new TimeEntryStillRunningMail($timeEntry, $user));
+                        $timeEntry->still_active_email_sent_at = Carbon::now();
+                        $timeEntry->save();
+                    }
+                }
+            });
+
+        $this->comment('Finished sending '.$sentMails.' still running time entry emails...');
+
+        return self::SUCCESS;
+    }
+}

app/Console/Kernel.php

@@ -14,7 +14,9 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule): void
     {
-        // $schedule->command('inspire')->hourly();
+        $schedule->command('time-entry:send-still-running-mails')
+            ->when(fn (): bool => config('scheduling.tasks.time_entry_send_still_running_mails'))
+            ->everyTenMinutes();
     }
 
     /**

app/Enums/Role.php

@@ -11,5 +11,4 @@ enum Role: string
     case Manager = 'manager';
     case Employee = 'employee';
     case Placeholder = 'placeholder';
-
 }

app/Exceptions/Api/ChangingRoleToPlaceholderIsNotAllowed.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions\Api;
+
+class ChangingRoleToPlaceholderIsNotAllowed extends ApiException
+{
+    public const string KEY = 'changing_role_to_placeholder_is_not_allowed';
+}

app/Exceptions/Api/OnlyOwnerCanChangeOwnership.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions\Api;
+
+class OnlyOwnerCanChangeOwnership extends ApiException
+{
+    public const string KEY = 'only_owner_can_change_ownership';
+}

app/Exceptions/Api/OrganizationNeedsAtLeastOneOwner.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions\Api;
+
+class OrganizationNeedsAtLeastOneOwner extends ApiException
+{
+    public const string KEY = 'organization_needs_at_least_one_owner';
+}

app/Exceptions/Api/UserIsAlreadyMemberOfOrganizationApiException.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions\Api;
+
+class UserIsAlreadyMemberOfOrganizationApiException extends ApiException
+{
+    public const string KEY = 'user_is_already_member_of_organization';
+}

app/Exceptions/MovedToApiException.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions;
+
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class MovedToApiException extends HttpException
+{
+    public function __construct()
+    {
+        parent::__construct(403, 'Moved to API');
+    }
+}

app/Extensions/Auditing/Resolvers/CustomIpAddressResolver.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Extensions\Auditing\Resolvers;
+
+use Illuminate\Support\Facades\Request;
+use OwenIt\Auditing\Contracts\Auditable;
+use OwenIt\Auditing\Contracts\Resolver;
+
+class CustomIpAddressResolver implements Resolver
+{
+    private static function anonymizeIpAddress(string $ipAddress): string
+    {
+        /** @source https://stackoverflow.com/a/48777412 */
+        return preg_replace(
+            ['/\.\d*$/', '/[\da-f]*:[\da-f]*$/'],
+            ['.0', '0:0'],
+            $ipAddress
+        );
+    }
+
+    public static function resolve(Auditable $auditable): string
+    {
+        $ip = $auditable->preloadedResolverData['ip_address'] ?? Request::ip();
+
+        if ($ip !== null) {
+            $ip = self::anonymizeIpAddress($ip);
+        }
+
+        return $ip;
+    }
+}

app/Extensions/Scramble/PaginatedResourceCollectionTypeToSchema.php

@@ -27,13 +27,10 @@ class PaginatedResourceCollectionTypeToSchema extends TypeToSchemaExtension
             && $type->isInstanceOf(PaginatedResourceCollection::class);
     }
 
-    /**
-     * @param  Generic  $type
-     */
-    public function toResponse(Type $type): ?Response
+    public function toSchema(Type $type): ?OpenApiObjectType
     {
         /** @var Type|null $collectingClassType */
-        $collectingClassType = $type->templateTypes[0];
+        $collectingClassType = $type->templateTypes[0] ?? null;
 
         if (! $collectingClassType instanceof ObjectType) {
             return null;
@@ -79,6 +76,21 @@ class PaginatedResourceCollectionTypeToSchema extends TypeToSchemaExtension
         );
         $type->setRequired(['data', 'links', 'meta']);
 
+        return $type;
+    }
+
+    /**
+     * @param  Generic  $type
+     */
+    public function toResponse(Type $type): ?Response
+    {
+        /** @var ObjectType|null $collectingClassType */
+        $collectingClassType = $type->templateTypes[0] ?? null;
+        if (! $collectingClassType instanceof ObjectType) {
+            return null;
+        }
+        $type = $this->toSchema($type);
+
         return Response::make(200)
             ->description('Paginated set of `'.$this->components->uniqueSchemaName($collectingClassType->name).'`')
             ->setContent('application/json', Schema::fromType($type));

app/Filament/Resources/AuditResource.php

@@ -0,0 +1,95 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources;
+
+use App\Filament\Resources\AuditResource\Pages;
+use App\Models\Audit;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Tables;
+use Filament\Tables\Columns\IconColumn;
+use Filament\Tables\Table;
+use Illuminate\Support\Str;
+use Novadaemon\FilamentPrettyJson\PrettyJson;
+
+class AuditResource extends Resource
+{
+    protected static ?string $model = Audit::class;
+
+    protected static ?string $navigationIcon = 'heroicon-o-archive-box';
+
+    protected static ?string $navigationGroup = 'System';
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('user_type')
+                    ->maxLength(255),
+                Forms\Components\TextInput::make('user_id'),
+                Forms\Components\TextInput::make('event')
+                    ->required()
+                    ->maxLength(255),
+                Forms\Components\TextInput::make('auditable_type')
+                    ->required()
+                    ->maxLength(255),
+                Forms\Components\TextInput::make('auditable_id')
+                    ->required(),
+                PrettyJson::make('old_values'),
+                PrettyJson::make('new_values'),
+                Forms\Components\Textarea::make('url'),
+                Forms\Components\TextInput::make('ip_address'),
+                Forms\Components\TextInput::make('user_agent')
+                    ->maxLength(1023),
+                Forms\Components\TextInput::make('tags')
+                    ->maxLength(255),
+            ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('user.name'),
+                Tables\Columns\TextColumn::make('event'),
+                Tables\Columns\TextColumn::make('auditable_type'),
+                Tables\Columns\TextColumn::make('auditable_id'),
+                IconColumn::make('was_command')
+                    ->getStateUsing(fn (Audit $record) => Str::startsWith($record->url, 'artisan '))
+                    ->boolean(),
+                Tables\Columns\TextColumn::make('created_at')
+                    ->sortable()
+                    ->dateTime(),
+                Tables\Columns\TextColumn::make('updated_at')
+                    ->sortable()
+                    ->dateTime(),
+            ])
+            ->filters([
+                //
+            ])
+            ->actions([
+                Tables\Actions\ViewAction::make(),
+            ])
+            ->bulkActions([
+            ])
+            ->defaultSort('created_at', 'desc');
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListAudits::route('/'),
+            'create' => Pages\CreateAudit::route('/create'),
+            'view' => Pages\ViewAudit::route('/{record}'),
+        ];
+    }
+}

app/Filament/Resources/AuditResource/Pages/CreateAudit.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\AuditResource\Pages;
+
+use App\Filament\Resources\AuditResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateAudit extends CreateRecord
+{
+    protected static string $resource = AuditResource::class;
+}

app/Filament/Resources/AuditResource/Pages/ListAudits.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\AuditResource\Pages;
+
+use App\Filament\Resources\AuditResource;
+use Filament\Resources\Pages\ListRecords;
+
+class ListAudits extends ListRecords
+{
+    protected static string $resource = AuditResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [];
+    }
+}

app/Filament/Resources/AuditResource/Pages/ViewAudit.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\AuditResource\Pages;
+
+use App\Filament\Resources\AuditResource;
+use Filament\Resources\Pages\ViewRecord;
+
+class ViewAudit extends ViewRecord
+{
+    protected static string $resource = AuditResource::class;
+}

app/Filament/Resources/FailedJobResource.php

@@ -0,0 +1,115 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources;
+
+use App\Filament\Resources\FailedJobResource\Pages\ListFailedJobs;
+use App\Filament\Resources\FailedJobResource\Pages\ViewFailedJobs;
+use App\Models\FailedJob;
+use Filament\Forms\Components\Textarea;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
+use Filament\Notifications\Notification;
+use Filament\Resources\Resource;
+use Filament\Tables\Actions\Action;
+use Filament\Tables\Actions\BulkAction;
+use Filament\Tables\Actions\DeleteAction;
+use Filament\Tables\Actions\ViewAction;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Artisan;
+use Novadaemon\FilamentPrettyJson\PrettyJson;
+
+/**
+ * @source https://gitlab.com/amvisor/filament-failed-jobs
+ */
+class FailedJobResource extends Resource
+{
+    protected static ?string $model = FailedJob::class;
+
+    protected static ?string $navigationIcon = 'heroicon-o-exclamation-circle';
+
+    protected static ?string $navigationGroup = 'System';
+
+    public static function getNavigationBadge(): ?string
+    {
+        return (string) FailedJob::query()->count();
+    }
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                TextInput::make('uuid')->disabled()->columnSpan(4),
+                TextInput::make('failed_at')->disabled(),
+                TextInput::make('id')->disabled(),
+                TextInput::make('connection')->disabled(),
+                TextInput::make('queue')->disabled(),
+
+                // make text a little bit smaller because often a complete Stack Trace is shown:
+                TextArea::make('exception')->disabled()->columnSpan(4)->extraInputAttributes(['style' => 'font-size: 80%;']),
+                PrettyJson::make('payload')->disabled()->columnSpan(4),
+            ])->columns(4);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->defaultSort('id', 'desc')
+            ->columns([
+                TextColumn::make('id')->sortable()->searchable()->toggleable(),
+                TextColumn::make('failed_at')->sortable()->searchable(false)->toggleable(),
+                TextColumn::make('exception')
+                    ->sortable()
+                    ->searchable()
+                    ->toggleable()
+                    ->wrap()
+                    ->limit(200)
+                    ->tooltip(fn (FailedJob $record) => "{$record->failed_at} UUID: {$record->uuid}; Connection: {$record->connection}; Queue: {$record->queue};"),
+                TextColumn::make('uuid')->sortable()->searchable()->toggleable(isToggledHiddenByDefault: true),
+                TextColumn::make('connection')->sortable()->searchable()->toggleable(isToggledHiddenByDefault: true),
+                TextColumn::make('queue')->sortable()->searchable()->toggleable(isToggledHiddenByDefault: true),
+            ])
+            ->filters([])
+            ->bulkActions([
+                BulkAction::make('retry')
+                    ->label('Retry')
+                    ->requiresConfirmation()
+                    ->action(function (Collection $records): void {
+                        /** @var FailedJob $record */
+                        foreach ($records as $record) {
+                            Artisan::call("queue:retry {$record->uuid}");
+                        }
+                        Notification::make()
+                            ->title("{$records->count()} jobs have been pushed back onto the queue.")
+                            ->success()
+                            ->send();
+                    }),
+            ])
+            ->actions([
+                DeleteAction::make('Delete'),
+                ViewAction::make('View'),
+                Action::make('retry')
+                    ->label('Retry')
+                    ->requiresConfirmation()
+                    ->action(function (FailedJob $record): void {
+                        Artisan::call("queue:retry {$record->uuid}");
+                        Notification::make()
+                            ->title("The job with uuid '{$record->uuid}' has been pushed back onto the queue.")
+                            ->success()
+                            ->send();
+                    }),
+            ]);
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => ListFailedJobs::route('/'),
+            'view' => ViewFailedJobs::route('/{record}'),
+
+        ];
+    }
+}

app/Filament/Resources/FailedJobResource/Pages/ListFailedJobs.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\FailedJobResource\Pages;
+
+use App\Filament\Resources\FailedJobResource;
+use App\Models\FailedJob;
+use Filament\Notifications\Notification;
+use Filament\Pages\Actions\Action;
+use Filament\Resources\Pages\ListRecords;
+use Illuminate\Support\Facades\Artisan;
+
+class ListFailedJobs extends ListRecords
+{
+    protected static string $resource = FailedJobResource::class;
+
+    public function getHeaderActions(): array
+    {
+        return [
+            Action::make('retry_all')
+                ->label('Retry all failed Jobs')
+                ->requiresConfirmation()
+                ->action(function (): void {
+                    Artisan::call('queue:retry all');
+                    Notification::make()
+                        ->title('All failed jobs have been pushed back onto the queue.')
+                        ->success()
+                        ->send();
+                }),
+
+            Action::make('delete_all')
+                ->label('Delete all failed Jobs')
+                ->requiresConfirmation()
+                ->color('danger')
+                ->action(function (): void {
+                    FailedJob::truncate();
+                    Notification::make()
+                        ->title('All failed jobs have been removed.')
+                        ->success()
+                        ->send();
+                }),
+        ];
+    }
+}

app/Filament/Resources/FailedJobResource/Pages/ViewFailedJobs.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\FailedJobResource\Pages;
+
+use App\Filament\Resources\FailedJobResource;
+use Filament\Resources\Pages\ViewRecord;
+
+class ViewFailedJobs extends ViewRecord
+{
+    protected static string $resource = FailedJobResource::class;
+}

app/Filament/Resources/OrganizationResource.php

@@ -7,6 +7,7 @@ namespace App\Filament\Resources;
 use App\Filament\Resources\OrganizationResource\Pages;
 use App\Filament\Resources\OrganizationResource\RelationManagers\UsersRelationManager;
 use App\Models\Organization;
+use App\Service\Export\ExportService;
 use App\Service\Import\Importers\ImporterProvider;
 use App\Service\Import\Importers\ImportException;
 use App\Service\Import\Importers\ReportDto;
@@ -110,6 +111,30 @@ class OrganizationResource extends Resource
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
+                Action::make('Export')
+                    ->icon('heroicon-o-arrow-down-tray')
+                    ->action(function (Organization $record) {
+                        try {
+                            $file = app(ExportService::class)->export($record);
+                            Notification::make()
+                                ->title('Export successful')
+                                ->success()
+                                ->persistent()
+                                ->send();
+
+                            return response()->streamDownload(function () use ($file) {
+                                echo Storage::disk(config('filesystems.private'))->get($file);
+                            }, 'export.zip');
+                        } catch (\Exception $exception) {
+                            report($exception);
+                            Notification::make()
+                                ->title('Export failed')
+                                ->danger()
+                                ->body('Message: '.$exception->getMessage())
+                                ->persistent()
+                                ->send();
+                        }
+                    }),
                 Action::make('Import')
                     ->icon('heroicon-o-inbox-arrow-down')
                     ->action(function (Organization $record, array $data) {

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

@@ -5,14 +5,16 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Api\V1;
 
 use App\Exceptions\Api\EntityStillInUseApiException;
-use App\Http\Requests\V1\Tag\TagStoreRequest;
-use App\Http\Requests\V1\Tag\TagUpdateRequest;
+use App\Http\Requests\V1\Client\ClientIndexRequest;
+use App\Http\Requests\V1\Client\ClientStoreRequest;
+use App\Http\Requests\V1\Client\ClientUpdateRequest;
 use App\Http\Resources\V1\Client\ClientCollection;
 use App\Http\Resources\V1\Client\ClientResource;
 use App\Models\Client;
 use App\Models\Organization;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Carbon;
 
 class ClientController extends Controller
 {
@@ -33,14 +35,22 @@ class ClientController extends Controller
      *
      * @operationId getClients
      */
-    public function index(Organization $organization): ClientCollection
+    public function index(Organization $organization, ClientIndexRequest $request): ClientCollection
     {
         $this->checkPermission($organization, 'clients:view');
 
-        $clients = Client::query()
+        $clientsQuery = Client::query()
             ->whereBelongsTo($organization, 'organization')
-            ->orderBy('created_at', 'desc')
-            ->paginate(config('app.pagination_per_page_default'));
+            ->orderBy('created_at', 'desc');
+
+        $filterArchived = $request->getFilterArchived();
+        if ($filterArchived === 'true') {
+            $clientsQuery->whereNotNull('archived_at');
+        } elseif ($filterArchived === 'false') {
+            $clientsQuery->whereNull('archived_at');
+        }
+
+        $clients = $clientsQuery->paginate(config('app.pagination_per_page_default'));
 
         return new ClientCollection($clients);
     }
@@ -52,7 +62,7 @@ class ClientController extends Controller
      *
      * @operationId createClient
      */
-    public function store(Organization $organization, TagStoreRequest $request): ClientResource
+    public function store(Organization $organization, ClientStoreRequest $request): ClientResource
     {
         $this->checkPermission($organization, 'clients:create');
 
@@ -71,11 +81,14 @@ class ClientController extends Controller
      *
      * @operationId updateClient
      */
-    public function update(Organization $organization, Client $client, TagUpdateRequest $request): ClientResource
+    public function update(Organization $organization, Client $client, ClientUpdateRequest $request): ClientResource
     {
         $this->checkPermission($organization, 'clients:update', $client);
 
         $client->name = $request->input('name');
+        if ($request->has('is_archived')) {
+            $client->archived_at = $request->getIsArchived() ? Carbon::now() : null;
+        }
         $client->save();
 
         return new ClientResource($client);

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

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Models\Organization;
+use App\Service\Export\ExportException;
+use App\Service\Export\ExportService;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Storage;
+
+class ExportController extends Controller
+{
+    /**
+     * Export data of an organization
+     *
+     * @throws AuthorizationException
+     * @throws ExportException
+     *
+     * @operationId exportOrganization
+     */
+    public function export(Organization $organization, ExportService $exportService): JsonResponse
+    {
+        $this->checkPermission($organization, 'export');
+
+        $filepath = $exportService->export($organization);
+        $downloadUrl = Storage::disk(config('filesystems.private'))
+            ->temporaryUrl($filepath, Carbon::now()->addMinutes(10));
+
+        return new JsonResponse([
+            'success' => true,
+            'download_url' => $downloadUrl,
+        ], 200);
+    }
+}

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

@@ -4,17 +4,18 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
 use App\Http\Requests\V1\Invitation\InvitationIndexRequest;
 use App\Http\Requests\V1\Invitation\InvitationStoreRequest;
 use App\Http\Resources\V1\Invitation\InvitationCollection;
 use App\Http\Resources\V1\Invitation\InvitationResource;
+use App\Mail\OrganizationInvitationMail;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
+use App\Service\InvitationService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Mail;
-use Laravel\Jetstream\Contracts\InvitesTeamMembers;
-use Laravel\Jetstream\Mail\TeamInvitation;
 
 class InvitationController extends Controller
 {
@@ -49,19 +50,18 @@ class InvitationController extends Controller
      * Invite a user to the organization
      *
      * @throws AuthorizationException
+     * @throws UserIsAlreadyMemberOfOrganizationApiException
      *
      * @operationId invite
      */
-    public function store(Organization $organization, InvitationStoreRequest $request): JsonResponse
+    public function store(Organization $organization, InvitationStoreRequest $request, InvitationService $invitationService): JsonResponse
     {
         $this->checkPermission($organization, 'invitations:create');
 
-        app(InvitesTeamMembers::class)->invite(
-            $this->user(),
-            $organization,
-            $request->input('email'),
-            $request->input('role')
-        );
+        $email = $request->getEmail();
+        $role = $request->getRole();
+
+        $invitationService->inviteUser($organization, $email, $role);
 
         return response()->json(null, 204);
     }
@@ -77,7 +77,8 @@ class InvitationController extends Controller
     {
         $this->checkPermission($organization, 'invitations:resend', $invitation);
 
-        Mail::to($invitation->email)->send(new TeamInvitation($invitation));
+        Mail::to($invitation->email)
+            ->queue(new OrganizationInvitationMail($invitation));
 
         return response()->json(null, 204);
     }

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

@@ -6,22 +6,25 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\Role;
 use App\Exceptions\Api\CanNotRemoveOwnerFromOrganization;
+use App\Exceptions\Api\ChangingRoleToPlaceholderIsNotAllowed;
 use App\Exceptions\Api\EntityStillInUseApiException;
+use App\Exceptions\Api\OnlyOwnerCanChangeOwnership;
+use App\Exceptions\Api\OrganizationNeedsAtLeastOneOwner;
 use App\Exceptions\Api\UserNotPlaceholderApiException;
 use App\Http\Requests\V1\Member\MemberIndexRequest;
 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\Member;
 use App\Models\Organization;
 use App\Models\ProjectMember;
 use App\Models\TimeEntry;
+use App\Service\BillableRateService;
+use App\Service\InvitationService;
+use App\Service\MemberService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Laravel\Jetstream\Contracts\InvitesTeamMembers;
 
 class MemberController extends Controller
 {
@@ -36,7 +39,7 @@ class MemberController extends Controller
     /**
      * List all members of an organization
      *
-     * @return MemberCollection<MemberPivotResource>>
+     * @return MemberCollection<MemberResource>
      *
      * @throws AuthorizationException
      *
@@ -46,7 +49,9 @@ class MemberController extends Controller
     {
         $this->checkPermission($organization, 'members:view');
 
-        $members = $organization->users()
+        $members = Member::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->with(['user'])
             ->paginate(config('app.pagination_per_page_default'));
 
         return MemberCollection::make($members);
@@ -56,15 +61,40 @@ class MemberController extends Controller
      * Update a member of the organization
      *
      * @throws AuthorizationException
+     * @throws OrganizationNeedsAtLeastOneOwner
+     * @throws OnlyOwnerCanChangeOwnership
+     * @throws ChangingRoleToPlaceholderIsNotAllowed
      *
      * @operationId updateMember
      */
-    public function update(Organization $organization, Member $member, MemberUpdateRequest $request): JsonResource
+    public function update(Organization $organization, Member $member, MemberUpdateRequest $request, BillableRateService $billableRateService, MemberService $memberService): JsonResource
     {
         $this->checkPermission($organization, 'members:update', $member);
 
-        $member->billable_rate = $request->input('billable_rate');
-        $member->role = $request->input('role');
+        if ($request->has('billable_rate') && $member->billable_rate !== $request->getBillableRate()) {
+            $member->billable_rate = $request->getBillableRate();
+
+            $billableRateService->updateTimeEntriesBillableRateForMember($member);
+        }
+        if ($request->has('role') && $member->role !== $request->getRole()->value) {
+            $newRole = $request->getRole();
+            $oldRole = Role::from($member->role);
+            if ($oldRole === Role::Owner) {
+                throw new OrganizationNeedsAtLeastOneOwner();
+            }
+            if ($newRole === Role::Placeholder) {
+                throw new ChangingRoleToPlaceholderIsNotAllowed();
+            }
+            if ($newRole === Role::Owner) {
+                if ($this->hasPermission($organization, 'members:change-ownership')) {
+                    $memberService->changeOwnership($organization, $member);
+                } else {
+                    throw new OnlyOwnerCanChangeOwnership();
+                }
+            } else {
+                $member->role = $request->getRole()->value;
+            }
+        }
         $member->save();
 
         return new MemberResource($member);
@@ -104,7 +134,7 @@ class MemberController extends Controller
      *
      * @operationId invitePlaceholder
      */
-    public function invitePlaceholder(Organization $organization, Member $member, Request $request): JsonResponse
+    public function invitePlaceholder(Organization $organization, Member $member, InvitationService $invitationService): JsonResponse
     {
         $this->checkPermission($organization, 'members:invite-placeholder', $member);
         $user = $member->user;
@@ -113,12 +143,7 @@ class MemberController extends Controller
             throw new UserNotPlaceholderApiException();
         }
 
-        app(InvitesTeamMembers::class)->invite(
-            $this->user(),
-            $organization,
-            $user->email,
-            Role::Employee->value,
-        );
+        $invitationService->inviteUser($organization, $user->email, Role::Employee);
 
         return response()->json(null, 204);
     }

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

@@ -7,6 +7,7 @@ namespace App\Http\Controllers\Api\V1;
 use App\Http\Requests\V1\Organization\OrganizationUpdateRequest;
 use App\Http\Resources\V1\Organization\OrganizationResource;
 use App\Models\Organization;
+use App\Service\BillableRateService;
 use Illuminate\Auth\Access\AuthorizationException;
 
 class OrganizationController extends Controller
@@ -32,14 +33,19 @@ class OrganizationController extends Controller
      *
      * @throws AuthorizationException
      */
-    public function update(Organization $organization, OrganizationUpdateRequest $request): OrganizationResource
+    public function update(Organization $organization, OrganizationUpdateRequest $request, BillableRateService $billableRateService): OrganizationResource
     {
         $this->checkPermission($organization, 'organizations:update');
 
         $organization->name = $request->input('name');
+        $oldBillableRate = $organization->billable_rate;
         $organization->billable_rate = $request->getBillableRate();
         $organization->save();
 
+        if ($oldBillableRate !== $request->getBillableRate()) {
+            $billableRateService->updateTimeEntriesBillableRateForOrganization($organization);
+        }
+
         return new OrganizationResource($organization);
     }
 }

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

@@ -13,10 +13,11 @@ use App\Http\Resources\V1\Project\ProjectResource;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
-use App\Models\User;
+use App\Service\BillableRateService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 
 class ProjectController extends Controller
@@ -50,6 +51,12 @@ class ProjectController extends Controller
         if (! $canViewAllProjects) {
             $projectsQuery->visibleByEmployee($user);
         }
+        $filterArchived = $request->getFilterArchived();
+        if ($filterArchived === 'true') {
+            $projectsQuery->whereNotNull('archived_at');
+        } elseif ($filterArchived === 'false') {
+            $projectsQuery->whereNull('archived_at');
+        }
 
         $projects = $projectsQuery->paginate(config('app.pagination_per_page_default'));
 
@@ -101,16 +108,24 @@ class ProjectController extends Controller
      *
      * @operationId updateProject
      */
-    public function update(Organization $organization, Project $project, ProjectUpdateRequest $request): JsonResource
+    public function update(Organization $organization, Project $project, ProjectUpdateRequest $request, BillableRateService $billableRateService): JsonResource
     {
         $this->checkPermission($organization, 'projects:update', $project);
         $project->name = $request->input('name');
         $project->color = $request->input('color');
         $project->is_billable = (bool) $request->input('is_billable');
+        if ($request->has('is_archived')) {
+            $project->archived_at = $request->getIsArchived() ? Carbon::now() : null;
+        }
+        $oldBillableRate = $project->billable_rate;
         $project->billable_rate = $request->getBillableRate();
         $project->client_id = $request->input('client_id');
         $project->save();
 
+        if ($oldBillableRate !== $request->getBillableRate()) {
+            $billableRateService->updateTimeEntriesBillableRateForProject($project);
+        }
+
         return new ProjectResource($project);
     }
 

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

@@ -14,6 +14,7 @@ use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
+use App\Service\BillableRateService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -58,7 +59,7 @@ class ProjectMemberController extends Controller
      *
      * @operationId createProjectMember
      */
-    public function store(Organization $organization, Project $project, ProjectMemberStoreRequest $request): JsonResource
+    public function store(Organization $organization, Project $project, ProjectMemberStoreRequest $request, BillableRateService $billableRateService): JsonResource
     {
         $this->checkPermission($organization, 'project-members:create', $project);
 
@@ -77,6 +78,10 @@ class ProjectMemberController extends Controller
         $projectMember->project()->associate($project);
         $projectMember->save();
 
+        if ($request->getBillableRate() !== null) {
+            $billableRateService->updateTimeEntriesBillableRateForProjectMember($projectMember);
+        }
+
         return new ProjectMemberResource($projectMember);
     }
 
@@ -87,12 +92,17 @@ class ProjectMemberController extends Controller
      *
      * @operationId updateProjectMember
      */
-    public function update(Organization $organization, ProjectMember $projectMember, ProjectMemberUpdateRequest $request): JsonResource
+    public function update(Organization $organization, ProjectMember $projectMember, ProjectMemberUpdateRequest $request, BillableRateService $billableRateService): JsonResource
     {
         $this->checkPermission($organization, 'project-members:update', projectMember: $projectMember);
+        $oldBillableRate = $projectMember->billable_rate;
         $projectMember->billable_rate = $request->getBillableRate();
         $projectMember->save();
 
+        if ($oldBillableRate !== $request->getBillableRate()) {
+            $billableRateService->updateTimeEntriesBillableRateForProjectMember($projectMember);
+        }
+
         return new ProjectMemberResource($projectMember);
     }
 
@@ -103,12 +113,22 @@ class ProjectMemberController extends Controller
      *
      * @operationId deleteProjectMember
      */
-    public function destroy(Organization $organization, ProjectMember $projectMember): JsonResponse
+    public function destroy(Organization $organization, ProjectMember $projectMember, BillableRateService $billableRateService): JsonResponse
     {
         $this->checkPermission($organization, 'project-members:delete', projectMember: $projectMember);
 
+        $hadBillableRate = $projectMember->billable_rate !== null;
+        $project = $projectMember->project;
+        $member = $projectMember->member;
+
         $projectMember->delete();
 
+        if ($hadBillableRate) {
+            $billableRateService->updateTimeEntriesBillableRateForMember($member);
+            $billableRateService->updateTimeEntriesBillableRateForProject($project);
+            $billableRateService->updateTimeEntriesBillableRateForOrganization($organization);
+        }
+
         return response()
             ->json(null, 204);
     }

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

@@ -15,6 +15,7 @@ use App\Models\Task;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Carbon;
 
 class TaskController extends Controller
 {
@@ -53,6 +54,12 @@ class TaskController extends Controller
         if (! $canViewAllTasks) {
             $query->visibleByEmployee($user);
         }
+        $doneFilter = $request->getFilterDone();
+        if ($doneFilter === 'true') {
+            $query->whereNotNull('done_at');
+        } elseif ($doneFilter === 'false') {
+            $query->whereNull('done_at');
+        }
 
         $tasks = $query->paginate(config('app.pagination_per_page_default'));
 
@@ -89,6 +96,9 @@ class TaskController extends Controller
     {
         $this->checkPermission($organization, 'tasks:update', $task);
         $task->name = $request->input('name');
+        if ($request->has('is_done')) {
+            $task->done_at = $request->getIsDone() ? Carbon::now() : null;
+        }
         $task->save();
 
         return new TaskResource($task);

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

@@ -257,12 +257,17 @@ class TimeEntryController extends Controller
 
         $timeEntry->fill($request->validated());
         $timeEntry->description = $request->input('description', $timeEntry->description) ?? '';
+        $timeEntry->setComputedAttributeValue('billable_rate');
         $timeEntry->save();
 
         return new TimeEntryResource($timeEntry);
     }
 
     /**
+     * Update multiple time entries
+     *
+     * @operationId updateMultipleTimeEntries
+     *
      * @throws AuthorizationException
      */
     public function updateMultiple(Organization $organization, TimeEntryUpdateMultipleRequest $request): JsonResponse
@@ -270,14 +275,14 @@ class TimeEntryController extends Controller
         $this->checkAnyPermission($organization, ['time-entries:update:all', 'time-entries:update:own']);
         $canAccessAll = $this->hasPermission($organization, 'time-entries:update:all');
 
-        $ids = $request->input('ids');
+        $ids = $request->validated('ids');
 
         $timeEntries = TimeEntry::query()
             ->whereBelongsTo($organization, 'organization')
             ->whereIn('id', $ids)
             ->get();
 
-        $changes = $request->input('changes');
+        $changes = $request->validated('changes');
 
         if (isset($changes['member_id']) && ! $canAccessAll && $this->member($organization)->getKey() !== $changes['member_id']) {
             throw new AuthorizationException();
@@ -294,6 +299,7 @@ class TimeEntryController extends Controller
         $error = new Collection();
 
         foreach ($ids as $id) {
+            /** @var TimeEntry|null $timeEntry */
             $timeEntry = $timeEntries->firstWhere('id', $id);
             if ($timeEntry === null) {
                 // Note: ID wrong or time entry in different organization
@@ -311,6 +317,7 @@ class TimeEntryController extends Controller
             if ($overwriteClient) {
                 $timeEntry->client()->associate($client);
             }
+            $timeEntry->setComputedAttributeValue('billable_rate');
             $timeEntry->save();
             $success->push($id);
         }

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

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Http\Resources\V1\User\UserResource;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class UserController extends Controller
+{
+    /**
+     * Get the current user
+     *
+     * This endpoint is independent of organization.
+     *
+     * @operationId getMe
+     *
+     * @throws AuthorizationException
+     */
+    public function me(): JsonResource
+    {
+        $user = $this->user();
+
+        return new UserResource($user);
+    }
+}

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

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Http\Resources\V1\Member\PersonalMembershipCollection;
+use App\Models\Member;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class UserMembershipController extends Controller
+{
+    /**
+     * Get the memberships of the current user
+     *
+     * This endpoint is independent of organization.
+     *
+     * @operationId getMyMemberships
+     *
+     * @return PersonalMembershipCollection
+     *
+     * @throws AuthorizationException
+     */
+    public function myMemberships(): JsonResource
+    {
+        $user = $this->user();
+
+        $members = Member::query()
+            ->whereBelongsTo($user, 'user')
+            ->with(['organization'])
+            ->get();
+
+        return new PersonalMembershipCollection($members);
+    }
+}

app/Http/Middleware/HandleInertiaRequests.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Middleware;
 
+use App\Service\BillingContract;
 use Illuminate\Http\Request;
 use Inertia\Middleware;
 use Nwidart\Modules\Facades\Module;
@@ -38,8 +39,20 @@ class HandleInertiaRequests extends Middleware
      */
     public function share(Request $request): array
     {
+        $hasBilling = Module::has('Billing') && Module::isEnabled('Billing');
+        $billing = null;
+        if ($hasBilling) {
+            /** @var BillingContract $billing */
+            $billing = app(BillingContract::class);
+        }
+
+        $currentOrganization = $request->user()?->currentTeam;
+
         return array_merge(parent::share($request), [
-            'has_billing_extension' => Module::has('Billing'),
+            'has_billing_extension' => $hasBilling,
+            'billing' => $billing !== null ? [
+                'has_subscription' => $currentOrganization !== null ? $billing->hasSubscription($currentOrganization) : null,
+            ] : null,
             'flash' => [
                 'message' => fn () => $request->session()->get('message'),
             ],

app/Http/Requests/V1/Client/ClientIndexRequest.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\Client;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ClientIndexRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule>>
+     */
+    public function rules(): array
+    {
+        return [
+            'page' => [
+                'integer',
+                'min:1',
+            ],
+            'archived' => [
+                'string',
+                'in:true,false,all',
+            ],
+        ];
+    }
+
+    public function getFilterArchived(): string
+    {
+        return $this->input('archived', 'false');
+    }
+}

app/Http/Requests/V1/Client/ClientStoreRequest.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\Client;
+
+use App\Models\Client;
+use App\Models\Organization;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
+
+/**
+ * @property Organization $organization Organization from model binding
+ */
+class ClientStoreRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule>>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => [
+                'required',
+                'string',
+                'min:1',
+                'max:255',
+                (new UniqueEloquent(Client::class, 'name', function (Builder $builder): Builder {
+                    /** @var Builder<Client> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }))->withCustomTranslation('validation.client_name_already_exists'),
+            ],
+        ];
+    }
+}

app/Http/Requests/V1/Client/ClientUpdateRequest.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\Client;
+
+use App\Models\Client;
+use App\Models\Organization;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
+
+/**
+ * @property Organization $organization Organization from model binding
+ * @property Client|null $client Client from model binding
+ */
+class ClientUpdateRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule>>
+     */
+    public function rules(): array
+    {
+        return [
+            // Name of the client
+            'name' => [
+                'required',
+                'string',
+                'min:1',
+                'max:255',
+                (new UniqueEloquent(Client::class, 'name', function (Builder $builder): Builder {
+                    /** @var Builder<Client> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }))->ignore($this->client?->getKey())->withCustomTranslation('validation.client_name_already_exists'),
+            ],
+            'is_archived' => [
+                'boolean',
+            ],
+        ];
+    }
+
+    public function getIsArchived(): bool
+    {
+        assert($this->has('is_archived'));
+
+        return (bool) $this->input('is_archived');
+    }
+}

app/Http/Requests/V1/Invitation/InvitationStoreRequest.php

@@ -6,9 +6,12 @@ namespace App\Http\Requests\V1\Invitation;
 
 use App\Enums\Role;
 use App\Models\Organization;
+use App\Models\OrganizationInvitation;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization
@@ -26,13 +29,27 @@ class InvitationStoreRequest extends FormRequest
             'email' => [
                 'required',
                 'email',
+                (new UniqueEloquent(OrganizationInvitation::class, 'email', function (Builder $builder): Builder {
+                    /** @var Builder<OrganizationInvitation> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }))->withCustomTranslation('validation.invitation_already_exists'),
             ],
             'role' => [
                 'required',
                 'string',
-                // TODO: placeholder role should not be allowed
-                Rule::enum(Role::class),
+                Rule::enum(Role::class)
+                    ->except([Role::Owner, Role::Placeholder]),
             ],
         ];
     }
+
+    public function getRole(): Role
+    {
+        return Role::from($this->input('role'));
+    }
+
+    public function getEmail(): string
+    {
+        return $this->input('email');
+    }
 }

app/Http/Requests/V1/Member/MemberUpdateRequest.php

@@ -23,17 +23,15 @@ class MemberUpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
+            'role' => [
+                'string',
+                Rule::enum(Role::class),
+            ],
             'billable_rate' => [
                 'nullable',
                 'integer',
                 'min:0',
             ],
-            'role' => [
-                'required',
-                'string',
-                // TODO: placeholder role should not be allowed
-                Rule::enum(Role::class),
-            ],
         ];
     }
 
@@ -43,4 +41,9 @@ class MemberUpdateRequest extends FormRequest
 
         return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
     }
+
+    public function getRole(): Role
+    {
+        return Role::from($this->input('role'));
+    }
 }

app/Http/Requests/V1/Project/ProjectIndexRequest.php

@@ -21,6 +21,15 @@ class ProjectIndexRequest extends FormRequest
                 'integer',
                 'min:1',
             ],
+            'archived' => [
+                'string',
+                'in:true,false,all',
+            ],
         ];
     }
+
+    public function getFilterArchived(): string
+    {
+        return $this->input('archived', 'false');
+    }
 }

app/Http/Requests/V1/Project/ProjectStoreRequest.php

@@ -6,11 +6,13 @@ namespace App\Http\Requests\V1\Project;
 
 use App\Models\Client;
 use App\Models\Organization;
+use App\Models\Project;
 use App\Rules\ColorRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
@@ -26,11 +28,14 @@ class ProjectStoreRequest extends FormRequest
     {
         return [
             'name' => [
-                // TODO: unique
                 'required',
                 'string',
                 'min:1',
                 'max:255',
+                (new UniqueEloquent(Project::class, 'name', function (Builder $builder): Builder {
+                    /** @var Builder<Project> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }))->withCustomTranslation('validation.project_name_already_exists'),
             ],
             'color' => [
                 'required',

app/Http/Requests/V1/Project/ProjectUpdateRequest.php

@@ -6,14 +6,17 @@ namespace App\Http\Requests\V1\Project;
 
 use App\Models\Client;
 use App\Models\Organization;
+use App\Models\Project;
 use App\Rules\ColorRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
+ * @property Project|null $project Project from model binding
  */
 class ProjectUpdateRequest extends FormRequest
 {
@@ -26,10 +29,13 @@ class ProjectUpdateRequest extends FormRequest
     {
         return [
             'name' => [
-                // TODO: unique
                 'required',
                 'string',
                 'max:255',
+                (new UniqueEloquent(Project::class, 'name', function (Builder $builder): Builder {
+                    /** @var Builder<Project> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }))->ignore($this->project?->getKey())->withCustomTranslation('validation.project_name_already_exists'),
             ],
             'color' => [
                 'required',
@@ -41,10 +47,8 @@ class ProjectUpdateRequest extends FormRequest
                 'required',
                 'boolean',
             ],
-            'billable_rate' => [
-                'nullable',
-                'integer',
-                'min:0',
+            'is_archived' => [
+                'boolean',
             ],
             'client_id' => [
                 'nullable',
@@ -53,9 +57,21 @@ class ProjectUpdateRequest extends FormRequest
                     return $builder->whereBelongsTo($this->organization, 'organization');
                 }),
             ],
+            'billable_rate' => [
+                'nullable',
+                'integer',
+                'min:0',
+            ],
         ];
     }
 
+    public function getIsArchived(): bool
+    {
+        assert($this->has('is_archived'));
+
+        return (bool) $this->input('is_archived');
+    }
+
     public function getBillableRate(): ?int
     {
         $input = $this->input('billable_rate');

app/Http/Requests/V1/Tag/TagStoreRequest.php

@@ -4,9 +4,16 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Tag;
 
+use App\Models\Organization;
+use App\Models\Tag;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
+/**
+ * @property Organization $organization Organization from model binding
+ */
 class TagStoreRequest extends FormRequest
 {
     /**
@@ -18,11 +25,14 @@ class TagStoreRequest extends FormRequest
     {
         return [
             'name' => [
-                // TODO: unique
                 'required',
                 'string',
                 'min:1',
                 'max:255',
+                (new UniqueEloquent(Tag::class, 'name', function (Builder $builder): Builder {
+                    /** @var Builder<Tag> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }))->withCustomTranslation('validation.tag_name_already_exists'),
             ],
         ];
     }

app/Http/Requests/V1/Tag/TagUpdateRequest.php

@@ -4,9 +4,17 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Tag;
 
+use App\Models\Organization;
+use App\Models\Tag;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
+/**
+ * @property Organization $organization Organization from model binding
+ * @property Tag|null $tag Tag from model binding
+ */
 class TagUpdateRequest extends FormRequest
 {
     /**
@@ -18,11 +26,14 @@ class TagUpdateRequest extends FormRequest
     {
         return [
             'name' => [
-                // TODO: unique
                 'required',
                 'string',
                 'min:1',
                 'max:255',
+                (new UniqueEloquent(Tag::class, 'name', function (Builder $builder): Builder {
+                    /** @var Builder<Tag> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }))->ignore($this->tag?->getKey())->withCustomTranslation('validation.tag_name_already_exists'),
             ],
         ];
     }

app/Http/Requests/V1/Task/TaskIndexRequest.php

@@ -39,6 +39,15 @@ class TaskIndexRequest extends FormRequest
                     return $builder;
                 }),
             ],
+            'done' => [
+                'string',
+                'in:true,false,all',
+            ],
         ];
     }
+
+    public function getFilterDone(): string
+    {
+        return $this->input('done', 'false');
+    }
 }

app/Http/Requests/V1/Task/TaskStoreRequest.php

@@ -6,10 +6,12 @@ namespace App\Http\Requests\V1\Task;
 
 use App\Models\Organization;
 use App\Models\Project;
+use App\Models\Task;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
@@ -25,11 +27,14 @@ class TaskStoreRequest extends FormRequest
     {
         return [
             'name' => [
-                // TODO: unique
                 'required',
                 'string',
                 'min:1',
                 'max:255',
+                (new UniqueEloquent(Task::class, 'name', function (Builder $builder): Builder {
+                    /** @var Builder<Task> $builder */
+                    return $builder->where('project_id', '=', $this->input('project_id'));
+                }))->withCustomTranslation('validation.task_name_already_exists'),
             ],
             'project_id' => [
                 'required',

app/Http/Requests/V1/Task/TaskUpdateRequest.php

@@ -5,11 +5,15 @@ declare(strict_types=1);
 namespace App\Http\Requests\V1\Task;
 
 use App\Models\Organization;
+use App\Models\Task;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 
 /**
  * @property Organization $organization Organization from model binding
+ * @property Task|null $task Task from model binding
  */
 class TaskUpdateRequest extends FormRequest
 {
@@ -22,12 +26,25 @@ class TaskUpdateRequest extends FormRequest
     {
         return [
             'name' => [
-                // TODO: unique
                 'required',
                 'string',
                 'min:1',
                 'max:255',
+                (new UniqueEloquent(Task::class, 'name', function (Builder $builder): Builder {
+                    /** @var Builder<Task> $builder */
+                    return $builder->where('project_id', '=', $this->task->project_id);
+                }))->ignore($this->task?->getKey())->withCustomTranslation('validation.task_name_already_exists'),
+            ],
+            'is_done' => [
+                'boolean',
             ],
         ];
     }
+
+    public function getIsDone(): bool
+    {
+        assert($this->has('is_done'));
+
+        return $this->boolean('is_done');
+    }
 }

app/Http/Resources/V1/BaseResource.php

@@ -12,5 +12,6 @@ abstract class BaseResource extends JsonResource
     protected function formatDateTime(?Carbon $carbon): ?string
     {
         return $carbon?->toIso8601ZuluString();
+
     }
 }

app/Http/Resources/V1/Client/ClientResource.php

@@ -25,6 +25,8 @@ class ClientResource extends BaseResource
             'id' => $this->resource->id,
             /** @var string $name Name */
             'name' => $this->resource->name,
+            /** @var bool $is_archived Whether the client is archived */
+            'is_archived' => $this->resource->is_archived,
             /** @var string $created_at When the tag was created */
             'created_at' => $this->formatDateTime($this->resource->created_at),
             /** @var string $updated_at When the tag was last updated */

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

@@ -14,5 +14,5 @@ class MemberCollection extends ResourceCollection implements PaginatedResourceCo
      *
      * @var string
      */
-    public $collects = MemberPivotResource::class;
+    public $collects = MemberResource::class;
 }

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

@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Resources\V1\Member;
-
-use App\Http\Resources\V1\BaseResource;
-use App\Models\Member;
-use App\Models\User;
-use Illuminate\Http\Request;
-
-/**
- * @property User $resource
- */
-class MemberPivotResource extends BaseResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, string|bool|int|null|array<string>>
-     */
-    public function toArray(Request $request): array
-    {
-        /** @var Member $member */
-        $member = $this->resource->getRelationValue('membership');
-
-        return [
-            /** @var string $id ID of membership */
-            'id' => $member->id,
-            /** @var string $id ID of user */
-            'user_id' => $this->resource->id,
-            /** @var string $name Name */
-            'name' => $this->resource->name,
-            /** @var string $email Email */
-            'email' => $this->resource->email,
-            /** @var string $role 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' => $member->billable_rate,
-        ];
-    }
-}

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

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\V1\Member;
+
+use App\Http\Resources\PaginatedResourceCollection;
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+class PersonalMembershipCollection extends ResourceCollection implements PaginatedResourceCollection
+{
+    /**
+     * The resource that this resource collects.
+     *
+     * @var string
+     */
+    public $collects = PersonalMembershipResource::class;
+}

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

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\V1\Member;
+
+use App\Http\Resources\V1\BaseResource;
+use App\Models\Member;
+use Illuminate\Http\Request;
+
+/**
+ * @property Member $resource
+ */
+class PersonalMembershipResource extends BaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, string|bool|int|null|array<string>>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            /** @var string $id ID of membership */
+            'id' => $this->resource->id,
+            'organization' => [
+                /** @var string $id ID of organization */
+                'id' => $this->resource->organization->id,
+                /** @var string $name Name of organization */
+                'name' => $this->resource->organization->name,
+            ],
+            /** @var string $role Role */
+            'role' => $this->resource->role,
+        ];
+    }
+}

app/Http/Resources/V1/Project/ProjectResource.php

@@ -29,6 +29,8 @@ class ProjectResource extends BaseResource
             'color' => $this->resource->color,
             /** @var string|null $client_id ID of client */
             'client_id' => $this->resource->client_id,
+            /** @var bool $is_archived Whether the client is archived */
+            'is_archived' => $this->resource->is_archived,
             /** @var int|null $billable_rate Billable rate in cents per hour */
             'billable_rate' => $this->resource->billable_rate,
             /** @var bool $is_billable Project time entries billable default */

app/Http/Resources/V1/Task/TaskResource.php

@@ -26,6 +26,8 @@ class TaskResource extends BaseResource
             'id' => $this->resource->id,
             /** @var string $name Name */
             'name' => $this->resource->name,
+            /** @var bool $is_done Whether the task is done */
+            'is_done' => $this->resource->is_done,
             /** @var string $project_id ID of the project */
             'project_id' => $this->resource->project_id,
             /** @var string $created_at When the tag was created */

app/Http/Resources/V1/User/UserResource.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\V1\User;
+
+use App\Enums\Weekday;
+use App\Http\Resources\V1\BaseResource;
+use App\Models\User;
+use Illuminate\Http\Request;
+
+/**
+ * @property User $resource
+ */
+class UserResource extends BaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, string|bool|int|null|array<string>>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            /** @var string $id ID of user */
+            'id' => $this->resource->id,
+            /** @var string $name Name of user */
+            'name' => $this->resource->name,
+            /** @var string $email Email of user */
+            'email' => $this->resource->email,
+            /** @var string $profile_photo_url Profile photo URL */
+            'profile_photo_url' => $this->resource->profile_photo_url,
+            /** @var string $timezone Timezone (f.e. Europe/Berlin or America/New_York) */
+            'timezone' => $this->resource->timezone,
+            /** @var Weekday $week_start Starting day of the week */
+            'week_start' => $this->resource->week_start->value,
+        ];
+    }
+}

app/Jobs/Test/TestJob.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Jobs\Test;
 
 use App\Models\User;
+use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -23,22 +24,30 @@ class TestJob implements ShouldQueue
 
     private string $message;
 
+    private bool $fail;
+
     /**
      * Create a new job instance.
      */
-    public function __construct(User $user, string $message)
+    public function __construct(User $user, string $message, bool $fail = false)
     {
         $this->user = $user;
         $this->message = $message;
+        $this->fail = $fail;
     }
 
     /**
      * Execute the job.
+     *
+     * @throws Exception
      */
     public function handle(): void
     {
         Log::debug('TestJob: '.$this->message, [
             'user' => $this->user->getKey(),
         ]);
+        if ($this->fail) {
+            throw new Exception('TestJob failed.');
+        }
     }
 }

app/Mail/OrganizationInvitationMail.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Mail;
+
+use App\Models\OrganizationInvitation;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\URL;
+
+class OrganizationInvitationMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public OrganizationInvitation $invitation;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct(OrganizationInvitation $invitation)
+    {
+        $this->invitation = $invitation;
+    }
+
+    /**
+     * Build the message.
+     */
+    public function build(): self
+    {
+        return $this->markdown('emails.organization-invitation', [
+            'acceptUrl' => URL::signedRoute('team-invitations.accept', [
+                'invitation' => $this->invitation,
+            ]),
+        ])->subject(__('Organization Invitation'));
+    }
+}

app/Mail/TimeEntryStillRunningMail.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Mail;
+
+use App\Models\TimeEntry;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\URL;
+
+class TimeEntryStillRunningMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public TimeEntry $timeEntry;
+
+    public User $user;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct(TimeEntry $timeEntry, User $user)
+    {
+        $this->timeEntry = $timeEntry;
+        $this->user = $user;
+    }
+
+    /**
+     * Build the message.
+     */
+    public function build(): self
+    {
+        return $this->markdown('emails.time-entry-still-running', [
+            'dashboardUrl' => URL::route('dashboard'),
+        ])
+            ->subject(__('Your Time Tracker is still running!'));
+    }
+}

app/Models/Audit.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use Database\Factories\AuditFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Carbon;
+use OwenIt\Auditing\Models\Audit as PackageAuditModel;
+
+/**
+ * @property int $id
+ * @property string|null $user_type
+ * @property string|null $user_id
+ * @property string $event
+ * @property string $auditable_type
+ * @property string $auditable_id
+ * @property array|null $old_values
+ * @property array|null $new_values
+ * @property string|null $url
+ * @property string|null $ip_address
+ * @property string|null $user_agent
+ * @property string|null $tags
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ *
+ * @method static AuditFactory factory()
+ */
+class Audit extends PackageAuditModel
+{
+    use HasFactory;
+}

app/Models/Client.php

@@ -6,24 +6,30 @@ namespace App\Models;
 
 use App\Models\Concerns\HasUuids;
 use Database\Factories\ClientFactory;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Carbon;
+use OwenIt\Auditing\Auditable;
+use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
  * @property string $name
  * @property string $organization_id
+ * @property-read bool $is_archived
+ * @property Carbon|null $archived_at
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property-read Organization $organization
  *
  * @method static ClientFactory factory()
  */
-class Client extends Model
+class Client extends Model implements AuditableContract
 {
+    use Auditable;
     use HasFactory;
     use HasUuids;
 
@@ -51,4 +57,14 @@ class Client extends Model
     {
         return $this->hasMany(Project::class, 'client_id');
     }
+
+    /**
+     * @return Attribute<bool, never>
+     */
+    protected function isArchived(): Attribute
+    {
+        return Attribute::make(
+            get: fn (mixed $value, array $attributes) => isset($attributes['archived_at']),
+        );
+    }
 }

app/Models/FailedJob.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
+
+/**
+ * @property string $uuid
+ * @property string $connection
+ * @property string $queue
+ * @property Carbon $failed_at
+ */
+class FailedJob extends Model
+{
+    use HasFactory;
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = false;
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array<string, string>
+     */
+    protected $casts = [
+        'failed_at' => 'datetime',
+        'payload' => 'json',
+    ];
+}

app/Models/Member.php

@@ -8,7 +8,11 @@ use App\Models\Concerns\HasUuids;
 use Database\Factories\MemberFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Carbon;
 use Laravel\Jetstream\Membership as JetstreamMembership;
+use OwenIt\Auditing\Auditable;
+use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
@@ -16,15 +20,16 @@ use Laravel\Jetstream\Membership as JetstreamMembership;
  * @property int|null $billable_rate
  * @property string $organization_id
  * @property string $user_id
- * @property string $created_at
- * @property string $updated_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
  * @property-read Organization $organization
  * @property-read User $user
  *
  * @method static MemberFactory factory()
  */
-class Member extends JetstreamMembership
+class Member extends JetstreamMembership implements AuditableContract
 {
+    use Auditable;
     use HasFactory;
     use HasUuids;
 
@@ -50,4 +55,12 @@ class Member extends JetstreamMembership
     {
         return $this->belongsTo(Organization::class, 'organization_id');
     }
+
+    /**
+     * @return HasMany<ProjectMember>
+     */
+    public function projectMembers(): HasMany
+    {
+        return $this->hasMany(ProjectMember::class, 'member_id');
+    }
 }

app/Models/Organization.php

@@ -8,14 +8,18 @@ use App\Models\Concerns\HasUuids;
 use Database\Factories\OrganizationFactory;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Str;
 use Laravel\Jetstream\Events\TeamCreated;
 use Laravel\Jetstream\Events\TeamDeleted;
 use Laravel\Jetstream\Events\TeamUpdated;
 use Laravel\Jetstream\Jetstream;
 use Laravel\Jetstream\Team as JetstreamTeam;
+use OwenIt\Auditing\Auditable;
+use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
@@ -35,8 +39,9 @@ use Laravel\Jetstream\Team as JetstreamTeam;
  * @method HasMany<OrganizationInvitation> teamInvitations()
  * @method static OrganizationFactory factory()
  */
-class Organization extends JetstreamTeam
+class Organization extends JetstreamTeam implements AuditableContract
 {
+    use Auditable;
     use HasFactory;
     use HasUuids;
 
@@ -123,4 +128,21 @@ class Organization extends JetstreamTeam
         return $this->users()
             ->where('is_placeholder', false);
     }
+
+    /**
+     * This method prevents an unhandled exception when the ID is not a UUID.
+     * Normally this can be fixed with a route pattern, but Jetstream does not use route model binding.
+     *
+     * @param  array<string>  $columns
+     */
+    public function findOrFail(string $id, array $columns = ['*']): \Laravel\Jetstream\Team
+    {
+        if (! Str::isUuid($id)) {
+            throw (new ModelNotFoundException)->setModel(
+                self::class, $id
+            );
+        }
+
+        return parent::findOrFail($id, $columns);
+    }
 }

app/Models/OrganizationInvitation.php

@@ -8,20 +8,26 @@ use App\Models\Concerns\HasUuids;
 use Database\Factories\OrganizationInvitationFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Carbon;
 use Laravel\Jetstream\Jetstream;
 use Laravel\Jetstream\TeamInvitation as JetstreamTeamInvitation;
+use OwenIt\Auditing\Auditable;
+use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
  * @property string $email
  * @property string $role
  * @property string $organization_id
+ * @property Carbon|null $updated_at
+ * @property Carbon|null $created_at
  * @property-read Organization $organization
  *
  * @method static OrganizationInvitationFactory factory()
  */
-class OrganizationInvitation extends JetstreamTeamInvitation
+class OrganizationInvitation extends JetstreamTeamInvitation implements AuditableContract
 {
+    use Auditable;
     use HasFactory;
     use HasUuids;
 

app/Models/Project.php

@@ -7,11 +7,15 @@ namespace App\Models;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\ProjectFactory;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Carbon;
+use OwenIt\Auditing\Auditable;
+use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
@@ -20,7 +24,12 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  * @property string $organization_id
  * @property string $client_id
  * @property int|null $billable_rate
+ * @property bool $is_public
  * @property bool $is_billable
+ * @property-read bool $is_archived
+ * @property Carbon|null $archived_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
  * @property-read Organization $organization
  * @property-read Client|null $client
  * @property-read Collection<int, Task> $tasks
@@ -29,8 +38,9 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  * @method Builder<Project> visibleByEmployee(User $user)
  * @method static ProjectFactory factory()
  */
-class Project extends Model
+class Project extends Model implements AuditableContract
 {
+    use Auditable;
     use HasFactory;
     use HasUuids;
 
@@ -105,4 +115,14 @@ class Project extends Model
                 });
         });
     }
+
+    /**
+     * @return Attribute<bool, never>
+     */
+    protected function isArchived(): Attribute
+    {
+        return Attribute::make(
+            get: fn (mixed $value, array $attributes) => isset($attributes['archived_at']),
+        );
+    }
 }

app/Models/ProjectMember.php

@@ -10,6 +10,9 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Carbon;
+use OwenIt\Auditing\Auditable;
+use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
@@ -17,6 +20,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @property string $project_id Project ID
  * @property string $member_id Member ID
  * @property string $user_id User ID (legacy)
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
  * @property-read Project $project
  * @property-read Member $member
  * @property-read User $user
@@ -24,8 +29,9 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @method static Builder<ProjectMember> whereBelongsToOrganization(Organization $organization)
  * @method static ProjectMemberFactory factory()
  */
-class ProjectMember extends Model
+class ProjectMember extends Model implements AuditableContract
 {
+    use Auditable;
     use HasFactory;
     use HasUuids;
 

app/Models/Tag.php

@@ -10,6 +10,8 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Carbon;
+use OwenIt\Auditing\Auditable;
+use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
@@ -21,8 +23,9 @@ use Illuminate\Support\Carbon;
  *
  * @method static TagFactory factory()
  */
-class Tag extends Model
+class Tag extends Model implements AuditableContract
 {
+    use Auditable;
     use HasFactory;
     use HasUuids;
 

app/Models/Task.php

@@ -7,28 +7,34 @@ namespace App\Models;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\TaskFactory;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Carbon;
+use OwenIt\Auditing\Auditable;
+use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
  * @property string $name
  * @property string $project_id
  * @property string $organization_id
+ * @property Carbon|null $done_at
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property-read Project $project
  * @property-read Organization $organization
  * @property-read Collection<int, TimeEntry> $timeEntries
+ * @property-read bool $is_done
  *
  * @method static TaskFactory factory()
  */
-class Task extends Model
+class Task extends Model implements AuditableContract
 {
+    use Auditable;
     use HasFactory;
     use HasUuids;
 
@@ -39,6 +45,7 @@ class Task extends Model
      */
     protected $casts = [
         'name' => 'string',
+        'done_at' => 'datetime',
     ];
 
     /**
@@ -76,4 +83,14 @@ class Task extends Model
             return $builder->visibleByEmployee($user);
         });
     }
+
+    /**
+     * @return Attribute<bool, never>
+     */
+    public function isDone(): Attribute
+    {
+        return Attribute::make(
+            get: fn (mixed $value, array $attributes) => isset($attributes['done_at']),
+        );
+    }
 }

app/Models/TimeEntry.php

@@ -14,18 +14,23 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Carbon;
 use Korridor\LaravelComputedAttributes\ComputedAttributes;
+use OwenIt\Auditing\Auditable;
+use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
  * @property string $description
  * @property Carbon $start
  * @property Carbon|null $end
- * @property int $billable_rate Billable rate per hour in cents
+ * @property int|null $billable_rate Billable rate per hour in cents
  * @property bool $billable
  * @property array $tags
  * @property string $user_id
  * @property string $member_id
  * @property bool $is_imported
+ * @property Carbon|null $still_active_email_sent_at
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
  * @property-read User $user
  * @property-read Member $member
  * @property string $organization_id
@@ -40,8 +45,9 @@ use Korridor\LaravelComputedAttributes\ComputedAttributes;
  * @method Builder<TimeEntry> hasTag(Tag $tag)
  * @method static TimeEntryFactory factory()
  */
-class TimeEntry extends Model
+class TimeEntry extends Model implements AuditableContract
 {
+    use Auditable;
     use ComputedAttributes;
     use HasFactory;
     use HasUuids;
@@ -59,6 +65,7 @@ class TimeEntry extends Model
         'tags' => 'array',
         'billable_rate' => 'int',
         'is_imported' => 'bool',
+        'still_active_email_sent_at' => 'datetime',
     ];
 
     /**

app/Models/User.php

@@ -25,6 +25,8 @@ use Laravel\Fortify\TwoFactorAuthenticatable;
 use Laravel\Jetstream\HasProfilePhoto;
 use Laravel\Jetstream\HasTeams;
 use Laravel\Passport\HasApiTokens;
+use OwenIt\Auditing\Auditable;
+use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
  * @property string $id
@@ -53,8 +55,9 @@ use Laravel\Passport\HasApiTokens;
  * @method Builder<User> belongsToOrganization(Organization $organization)
  * @method Builder<User> active()
  */
-class User extends Authenticatable implements FilamentUser, MustVerifyEmail
+class User extends Authenticatable implements AuditableContract, FilamentUser, MustVerifyEmail
 {
+    use Auditable;
     use HasApiTokens;
     use HasFactory;
     use HasProfilePhoto;

app/Policies/OrganizationPolicy.php

@@ -70,7 +70,7 @@ class OrganizationPolicy
             return true;
         }
 
-        return $user->ownsTeam($organization);
+        return true;
     }
 
     /**
@@ -82,7 +82,8 @@ class OrganizationPolicy
             return true;
         }
 
-        return $user->ownsTeam($organization);
+        // Note: since this policy is only used for jetstream endpoints, we can return false here
+        return false;
     }
 
     /**
@@ -94,7 +95,8 @@ class OrganizationPolicy
             return true;
         }
 
-        return $user->ownsTeam($organization);
+        // Note: since this policy is only used for jetstream endpoints that are no longer in use, we can return false here
+        return false;
     }
 
     /**

app/Providers/AppServiceProvider.php

@@ -5,20 +5,26 @@ declare(strict_types=1);
 namespace App\Providers;
 
 use App\Models\Client;
+use App\Models\FailedJob;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use App\Models\Project;
+use App\Models\ProjectMember;
 use App\Models\Tag;
 use App\Models\Task;
 use App\Models\TimeEntry;
 use App\Models\User;
+use App\Service\BillingContract;
+use App\Service\IpLookup\IpLookupServiceContract;
+use App\Service\IpLookup\NoIpLookupService;
 use App\Service\PermissionStore;
 use Dedoc\Scramble\Scramble;
 use Dedoc\Scramble\Support\Generator\OpenApi;
 use Dedoc\Scramble\Support\Generator\SecurityScheme;
 use Dedoc\Scramble\Support\Generator\SecuritySchemes\OAuthFlow;
 use Filament\Forms\Components\Section;
+use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Foundation\Application;
@@ -47,25 +53,34 @@ class AppServiceProvider extends ServiceProvider
             $this->app->register(TelescopeServiceProvider::class);
         }
 
+        // Eloquent
         Model::preventLazyLoading(! $this->app->isProduction());
         Model::preventSilentlyDiscardingAttributes(! $this->app->isProduction());
         Model::preventAccessingMissingAttributes(! $this->app->isProduction());
         Relation::enforceMorphMap([
+            'client' => Client::class,
+            'failed-job' => FailedJob::class,
             'membership' => Member::class,
             'organization' => Organization::class,
             'organization-invitation' => OrganizationInvitation::class,
-            'user' => User::class,
-            'time-entry' => TimeEntry::class,
             'project' => Project::class,
-            'task' => Task::class,
-            'client' => Client::class,
+            'project-member' => ProjectMember::class,
             'tag' => Tag::class,
+            'task' => Task::class,
+            'time-entry' => TimeEntry::class,
+            'user' => User::class,
         ]);
         Model::unguard();
+
+        // Filament
         Section::configureUsing(function (Section $section): void {
             $section->columns(1);
         }, null, true);
+        Table::configureUsing(function (Table $table): void {
+            $table->paginated([10, 25, 50, 100]);
+        });
 
+        // Scramble
         Scramble::extendOpenApi(function (OpenApi $openApi) {
             $openApi->secure(
                 SecurityScheme::oauth2()
@@ -85,6 +100,11 @@ class AppServiceProvider extends ServiceProvider
             return new PermissionStore();
         });
 
+        // Extensions
+        $this->app->bind(IpLookupServiceContract::class, NoIpLookupService::class);
+        $this->app->bind(BillingContract::class);
+
+        // Routing
         Route::model('member', Member::class);
         Route::model('invitation', OrganizationInvitation::class);
     }

app/Providers/Filament/AdminPanelProvider.php

@@ -63,6 +63,9 @@ class AdminPanelProvider extends PanelProvider
                 NavigationGroup::make()
                     ->label('Users')
                     ->collapsed(),
+                NavigationGroup::make()
+                    ->label('System')
+                    ->collapsed(),
             ])
             ->middleware([
                 EncryptCookies::class,

app/Providers/JetstreamServiceProvider.php

@@ -23,6 +23,7 @@ use App\Service\TimezoneService;
 use Brick\Money\Currency;
 use Brick\Money\ISOCurrencyProvider;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\ServiceProvider;
 use Inertia\Inertia;
 use Laravel\Fortify\Fortify;
@@ -66,6 +67,9 @@ class JetstreamServiceProvider extends ServiceProvider
                 'newsletter_consent' => config('auth.newsletter_consent'),
             ]);
         });
+        Gate::define('removeTeamMember', function (User $user, Organization $team) {
+            return false;
+        });
     }
 
     /**
@@ -110,13 +114,14 @@ class JetstreamServiceProvider extends ServiceProvider
             'organizations:update',
             'organizations:delete',
             'import',
+            'export',
             'invitations:view',
             'invitations:create',
             'invitations:resend',
             'invitations:remove',
             'members:view',
             'members:invite-placeholder',
-            'members:change-role',
+            'members:change-ownership',
             'members:update',
             'members:delete',
         ])->description('Owner users can perform any action. There is only one owner per organization.');
@@ -155,11 +160,13 @@ class JetstreamServiceProvider extends ServiceProvider
             'organizations:view',
             'organizations:update',
             'import',
+            'export',
             'invitations:view',
             'invitations:create',
             'invitations:resend',
             'invitations:remove',
             'members:view',
+            'members:update',
             'members:invite-placeholder',
         ])->description('Administrator users can perform any action, except accessing the billing dashboard.');
 

app/Service/BillableRateService.php

@@ -9,9 +9,75 @@ use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\TimeEntry;
+use Illuminate\Database\Eloquent\Builder;
 
 class BillableRateService
 {
+    public function updateTimeEntriesBillableRateForProjectMember(ProjectMember $projectMember): void
+    {
+        TimeEntry::query()
+            ->where('billable', '=', true)
+            ->where('member_id', '=', $projectMember->member_id)
+            ->where('project_id', '=', $projectMember->project_id)
+            ->update(['billable_rate' => $projectMember->billable_rate]);
+    }
+
+    public function updateTimeEntriesBillableRateForProject(Project $project): void
+    {
+        TimeEntry::query()
+            ->where('billable', '=', true)
+            ->where('organization_id', '=', $project->organization_id)
+            ->whereBelongsTo($project, 'project')
+            ->whereDoesntHave('member', function (Builder $query) use ($project) {
+                /** @var Builder<Member> $query */
+                $query->whereHas('projectMembers', function (Builder $query) use ($project) {
+                    /** @var Builder<ProjectMember> $query */
+                    $query->whereBelongsTo($project, 'project')
+                        ->whereNotNull('billable_rate');
+                });
+            })
+            ->update(['billable_rate' => $project->billable_rate]);
+    }
+
+    public function updateTimeEntriesBillableRateForMember(Member $member): void
+    {
+        TimeEntry::query()
+            ->where('billable', '=', true)
+            ->where('organization_id', '=', $member->organization_id)
+            ->where('member_id', '=', $member->getKey())
+            ->whereDoesntHave('project', function (Builder $builder) use ($member): void {
+                /** @var Builder<Project> $builder */
+                $builder->whereNotNull('billable_rate')
+                    ->orWhereHas('members', function (Builder $builder) use ($member): void {
+                        /** @var Builder<ProjectMember> $builder */
+                        $builder->whereNotNull('billable_rate')
+                            ->where('member_id', '=', $member->getKey());
+                    });
+            })
+            ->update(['billable_rate' => $member->billable_rate]);
+    }
+
+    public function updateTimeEntriesBillableRateForOrganization(Organization $organization): void
+    {
+        TimeEntry::query()
+            ->where('billable', '=', true)
+            ->where('organization_id', '=', $organization->getKey())
+            ->whereDoesntHave('member', function (Builder $builder) {
+                /** @var Builder<Member> $builder */
+                $builder->whereNotNull('billable_rate');
+            })
+            ->whereDoesntHave('project', function (Builder $builder): void {
+                /** @var Builder<Project> $builder */
+                $builder->whereNotNull('billable_rate')
+                    ->orWhereHas('members', function (Builder $builder): void {
+                        /** @var Builder<ProjectMember> $builder */
+                        $builder->whereNotNull('billable_rate')
+                            ->whereRaw('member_id = time_entries.member_id');
+                    });
+            })
+            ->update(['billable_rate' => $organization->billable_rate]);
+    }
+
     public function getBillableRateForTimeEntryWithGivenRelations(TimeEntry $timeEntry, ?ProjectMember $projectMember, ?Project $project, ?Member $member, ?Organization $organization): ?int
     {
         if (! $timeEntry->billable) {

app/Service/BillingContract.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Models\Organization;
+
+class BillingContract
+{
+    public function hasSubscription(Organization $organization): bool
+    {
+        return false;
+    }
+}

app/Service/DeletionService.php

@@ -24,9 +24,12 @@ class DeletionService
 {
     private UserService $userService;
 
-    public function __construct(UserService $userService)
+    private MemberService $memberService;
+
+    public function __construct(UserService $userService, MemberService $memberService)
     {
         $this->userService = $userService;
+        $this->memberService = $memberService;
     }
 
     public function deleteOrganization(Organization $organization, bool $inTransaction = true, ?User $ignoreUser = null): void
@@ -83,7 +86,13 @@ class DeletionService
                 'currentOrganization',
             ])
             ->get();
-        $organization->users()->sync([]);
+
+        $members = Member::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->get();
+        foreach ($members as $member) {
+            $member->delete();
+        }
 
         // Make sure all users have at least one organization and delete placeholders
         foreach ($users as $user) {
@@ -145,7 +154,7 @@ class DeletionService
             if ($member->role === Role::Owner->value) {
                 $this->deleteOrganization($member->organization, false, $user);
             } else {
-                $this->userService->makeMemberToPlaceholder($member);
+                $this->memberService->makeMemberToPlaceholder($member);
             }
         }
 

app/Service/Export/ExportException.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Export;
+
+use App\Exceptions\Api\ApiException;
+
+class ExportException extends ApiException
+{
+    public const string KEY = 'export';
+}

app/Service/Export/ExportService.php

@@ -0,0 +1,362 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Export;
+
+use App\Models\Client;
+use App\Models\Member;
+use App\Models\Organization;
+use App\Models\OrganizationInvitation;
+use App\Models\Project;
+use App\Models\ProjectMember;
+use App\Models\Tag;
+use App\Models\Task;
+use App\Models\TimeEntry;
+use Exception;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Http\File;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use League\Csv\CannotInsertRecord;
+use League\Csv\Exception as LeagueCsvException;
+use League\Csv\UnavailableStream;
+use League\Csv\Writer;
+use Spatie\TemporaryDirectory\TemporaryDirectory;
+use ZipArchive;
+
+class ExportService
+{
+    public const string VERSION = '1.0';
+
+    /**
+     * @throws ExportException
+     */
+    public function export(Organization $organization): string
+    {
+        $exportId = Str::uuid();
+        $timeStamp = Carbon::now();
+        $temporaryDirectory = TemporaryDirectory::make();
+        Log::debug('Start exporting organization', [
+            'organization_id' => $organization->getKey(),
+            'export_id' => $exportId,
+        ]);
+
+        // Organizations
+        try {
+            $writer = Writer::createFromPath($temporaryDirectory->path('organizations.csv'), 'w+');
+            $writer->insertOne([
+                'id',
+                'name',
+                'billable_rate',
+                'currency',
+                'created_at',
+                'updated_at',
+            ]);
+            $writer->insertOne([
+                $organization->id,
+                $organization->name,
+                $organization->billable_rate ?? '',
+                $organization->currency,
+                $organization->created_at?->toIso8601ZuluString() ?? '',
+                $organization->updated_at?->toIso8601ZuluString() ?? '',
+            ]);
+
+            // Organization invitations
+            $writer = Writer::createFromPath($temporaryDirectory->path('organization_invitations.csv'), 'w+');
+            $writer->insertOne([
+                'id',
+                'email',
+                'organization_id',
+                'role',
+                'created_at',
+                'updated_at',
+            ]);
+            OrganizationInvitation::query()
+                ->whereBelongsTo($organization, 'organization')
+                ->chunk(1000, function (Collection $organizationInvitations) use (&$writer): void {
+                    $organizationInvitations->each(function (OrganizationInvitation $organizationInvitation) use (&$writer): void {
+                        $writer->insertOne([
+                            $organizationInvitation->id,
+                            $organizationInvitation->email,
+                            $organizationInvitation->organization_id,
+                            $organizationInvitation->role,
+                            $organizationInvitation->created_at?->toIso8601ZuluString() ?? '',
+                            $organizationInvitation->updated_at?->toIso8601ZuluString() ?? '',
+                        ]);
+                    });
+                });
+
+            // Time entries
+            $writer = Writer::createFromPath($temporaryDirectory->path('time_entries.csv'), 'w+');
+            $writer->insertOne([
+                'id',
+                'description',
+                'start',
+                'end',
+                'billable_rate',
+                'billable',
+                'member_id',
+                'user_id',
+                'organization_id',
+                'client_id',
+                'project_id',
+                'task_id',
+                'tags',
+                'is_imported',
+                'still_active_email_sent_at',
+                'created_at',
+                'updated_at',
+            ]);
+            TimeEntry::query()
+                ->whereBelongsTo($organization, 'organization')
+                ->chunk(1000, function (Collection $timeEntries) use (&$writer): void {
+                    $timeEntries->each(function (TimeEntry $timeEntry) use (&$writer): void {
+                        $tags = json_encode($timeEntry->tags);
+                        $writer->insertOne([
+                            $timeEntry->id,
+                            $timeEntry->description,
+                            $timeEntry->start->toIso8601ZuluString(),
+                            $timeEntry->end?->toIso8601ZuluString() ?? '',
+                            $timeEntry->billable_rate ?? '',
+                            $timeEntry->billable ? 'true' : 'false',
+                            $timeEntry->member_id,
+                            $timeEntry->user_id,
+                            $timeEntry->organization_id,
+                            $timeEntry->client_id ?? '',
+                            $timeEntry->project_id ?? '',
+                            $timeEntry->task_id ?? '',
+                            $tags === false ? '' : $tags,
+                            $timeEntry->is_imported ? 'true' : 'false',
+                            $timeEntry->still_active_email_sent_at?->toIso8601ZuluString() ?? '',
+                            $timeEntry->created_at?->toIso8601ZuluString() ?? '',
+                            $timeEntry->updated_at?->toIso8601ZuluString() ?? '',
+                        ]);
+                    });
+                });
+
+            // Clients
+            $writer = Writer::createFromPath($temporaryDirectory->path('clients.csv'), 'w+');
+            $writer->insertOne([
+                'id',
+                'name',
+                'organization_id',
+                'archived_at',
+                'created_at',
+                'updated_at',
+            ]);
+            Client::query()
+                ->whereBelongsTo($organization, 'organization')
+                ->chunk(1000, function (Collection $clients) use (&$writer): void {
+                    $clients->each(function (Client $client) use (&$writer): void {
+                        $writer->insertOne([
+                            $client->id,
+                            $client->name,
+                            $client->organization_id,
+                            $client->archived_at ?? '',
+                            $client->created_at?->toIso8601ZuluString() ?? '',
+                            $client->updated_at?->toIso8601ZuluString() ?? '',
+                        ]);
+                    });
+                });
+
+            // Projects
+            $writer = Writer::createFromPath($temporaryDirectory->path('projects.csv'), 'w+');
+            $writer->insertOne([
+                'id',
+                'name',
+                'color',
+                'billable_rate',
+                'is_public',
+                'client_id',
+                'organization_id',
+                'is_billable',
+                'archived_at',
+                'created_at',
+                'updated_at',
+            ]);
+            Project::query()
+                ->whereBelongsTo($organization, 'organization')
+                ->chunk(1000, function (Collection $projects) use (&$writer): void {
+                    $projects->each(function (Project $project) use (&$writer): void {
+                        $writer->insertOne([
+                            $project->id,
+                            $project->name,
+                            $project->color,
+                            $project->billable_rate ?? '',
+                            $project->is_public ? 'true' : 'false',
+                            $project->client_id ?? '',
+                            $project->organization_id,
+                            $project->is_billable ? 'true' : 'false',
+                            $project->archived_at?->toIso8601ZuluString() ?? '',
+                            $project->created_at?->toIso8601ZuluString() ?? '',
+                            $project->updated_at?->toIso8601ZuluString() ?? '',
+                        ]);
+                    });
+                });
+
+            // Project members
+            $writer = Writer::createFromPath($temporaryDirectory->path('project_members.csv'), 'w+');
+            $writer->insertOne([
+                'id',
+                'billable_rate',
+                'project_id',
+                'user_id',
+                'member_id',
+                'created_at',
+                'updated_at',
+            ]);
+            ProjectMember::query()
+                ->whereBelongsToOrganization($organization)
+                ->chunk(1000, function (Collection $projectMembers) use (&$writer): void {
+                    $projectMembers->each(function (ProjectMember $projectMember) use (&$writer): void {
+                        $writer->insertOne([
+                            $projectMember->id,
+                            $projectMember->billable_rate ?? '',
+                            $projectMember->project_id,
+                            $projectMember->user_id,
+                            $projectMember->member_id,
+                            $projectMember->created_at?->toIso8601ZuluString() ?? '',
+                            $projectMember->updated_at?->toIso8601ZuluString() ?? '',
+                        ]);
+                    });
+                });
+
+            // Members
+            $writer = Writer::createFromPath($temporaryDirectory->path('members.csv'), 'w+');
+            $writer->insertOne([
+                'id',
+                'user_id',
+                'name',
+                'email',
+                'organization_id',
+                'billable_rate',
+                'role',
+                'created_at',
+                'updated_at',
+            ]);
+            Member::query()
+                ->whereBelongsTo($organization, 'organization')
+                ->with([
+                    'user',
+                ])
+                ->chunk(1000, function (Collection $members) use (&$writer): void {
+                    $members->each(function (Member $member) use (&$writer): void {
+                        $writer->insertOne([
+                            $member->id,
+                            $member->user_id,
+                            $member->user->name,
+                            $member->user->email,
+                            $member->organization_id,
+                            $member->billable_rate ?? '',
+                            $member->role,
+                            $member->created_at?->toIso8601ZuluString() ?? '',
+                            $member->updated_at?->toIso8601ZuluString() ?? '',
+                        ]);
+                    });
+                });
+
+            // Tasks
+            $writer = Writer::createFromPath($temporaryDirectory->path('tasks.csv'), 'w+');
+            $writer->insertOne([
+                'id',
+                'name',
+                'project_id',
+                'organization_id',
+                'done_at',
+                'created_at',
+                'updated_at',
+            ]);
+            Task::query()
+                ->whereBelongsTo($organization, 'organization')
+                ->chunk(1000, function (Collection $tasks) use (&$writer): void {
+                    $tasks->each(function (Task $task) use (&$writer): void {
+                        $writer->insertOne([
+                            $task->id,
+                            $task->name,
+                            $task->project_id,
+                            $task->organization_id,
+                            $task->done_at?->toIso8601ZuluString() ?? '',
+                            $task->created_at?->toIso8601ZuluString() ?? '',
+                            $task->updated_at?->toIso8601ZuluString() ?? '',
+                        ]);
+                    });
+                });
+
+            // Tags
+            $writer = Writer::createFromPath($temporaryDirectory->path('tags.csv'), 'w+');
+            $writer->insertOne([
+                'id',
+                'name',
+                'organization_id',
+                'created_at',
+                'updated_at',
+            ]);
+            Tag::query()
+                ->whereBelongsTo($organization, 'organization')
+                ->chunk(1000, function (Collection $tags) use (&$writer): void {
+                    $tags->each(function (Tag $tag) use (&$writer): void {
+                        $writer->insertOne([
+                            $tag->id,
+                            $tag->name,
+                            $tag->organization_id,
+                            $tag->created_at?->toIso8601ZuluString() ?? '',
+                            $tag->updated_at?->toIso8601ZuluString() ?? '',
+                        ]);
+                    });
+                });
+
+            // Meta data file
+            $metaData = (object) [
+                'id' => $exportId,
+                'version' => self::VERSION,
+                'organizations' => [$organization->getKey()],
+                'exported_at' => $timeStamp->toIso8601ZuluString(),
+            ];
+            file_put_contents($temporaryDirectory->path('meta.json'), json_encode($metaData));
+
+            // Create ZIP file
+            $temporaryDirectoryZip = TemporaryDirectory::make();
+            $zip = new ZipArchive();
+            if ($zip->open($temporaryDirectoryZip->path('export.zip'), ZipArchive::CREATE) !== true) {
+                throw new Exception('Cannot create ZIP file');
+            }
+            $zip->addFile($temporaryDirectory->path('organizations.csv'), 'organizations.csv');
+            $zip->addFile($temporaryDirectory->path('organization_invitations.csv'), 'organization_invitations.csv');
+            $zip->addFile($temporaryDirectory->path('time_entries.csv'), 'time_entries.csv');
+            $zip->addFile($temporaryDirectory->path('clients.csv'), 'clients.csv');
+            $zip->addFile($temporaryDirectory->path('projects.csv'), 'projects.csv');
+            $zip->addFile($temporaryDirectory->path('project_members.csv'), 'project_members.csv');
+            $zip->addFile($temporaryDirectory->path('members.csv'), 'members.csv');
+            $zip->addFile($temporaryDirectory->path('tasks.csv'), 'tasks.csv');
+            $zip->addFile($temporaryDirectory->path('tags.csv'), 'tags.csv');
+            $zip->addFile($temporaryDirectory->path('meta.json'), 'meta.json');
+            $zip->close();
+
+            // Upload ZIP file to private storage
+            $filename = 'export_'.$organization->getKey().'_'.$timeStamp->format('Y-m-d_H-i-s').'_'.$exportId.'.zip';
+            Storage::disk(config('filesystems.private'))->putFileAs(
+                'exports',
+                new File($temporaryDirectoryZip->path('export.zip')),
+                $filename
+            );
+
+            // Delete temp files
+            $temporaryDirectoryZip->delete();
+            $temporaryDirectory->delete();
+
+            Log::debug('Finished exporting organization', [
+                'organization_id' => $organization->getKey(),
+                'export_id' => $exportId,
+            ]);
+
+            return 'exports/'.$filename;
+        } catch (UnavailableStream|CannotInsertRecord|Exception|LeagueCsvException $exception) {
+            report($exception);
+
+            throw new ExportException();
+        }
+    }
+}

app/Service/Import/Importers/DefaultImporter.php

@@ -7,6 +7,7 @@ namespace App\Service\Import\Importers;
 use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
+use App\Models\OrganizationInvitation;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\Tag;
@@ -63,6 +64,11 @@ abstract class DefaultImporter implements ImporterContract
      */
     protected ImportDatabaseHelper $projectMemberImportHelper;
 
+    /**
+     * @var ImportDatabaseHelper<OrganizationInvitation>
+     */
+    protected ImportDatabaseHelper $organizationInvitationsImportHelper;
+
     protected BillableRateService $billableRateService;
 
     public function init(Organization $organization): void
@@ -149,6 +155,15 @@ abstract class DefaultImporter implements ImporterContract
                 'max:500',
             ],
         ]);
+        $this->organizationInvitationsImportHelper = new ImportDatabaseHelper(OrganizationInvitation::class, ['email', 'organization_id'], true, function (Builder $builder) {
+            return $builder->where('organization_id', $this->organization->id);
+        }, validate: [
+            'email' => [
+                'required',
+                'email',
+                'max:255',
+            ],
+        ]);
         $this->timeEntriesCreated = 0;
         $this->colorService = app(ColorService::class);
         $this->timezoneService = app(TimezoneService::class);

app/Service/Import/Importers/ImporterProvider.php

@@ -14,6 +14,7 @@ class ImporterProvider
         'toggl_data_importer' => TogglDataImporter::class,
         'clockify_time_entries' => ClockifyTimeEntriesImporter::class,
         'clockify_projects' => ClockifyProjectsImporter::class,
+        'solidtime' => SolidtimeImporter::class,
     ];
 
     /**

app/Service/Import/Importers/SolidtimeImporter.php

@@ -0,0 +1,335 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Import\Importers;
+
+use App\Enums\Role;
+use App\Models\TimeEntry;
+use Carbon\Exceptions\InvalidFormatException;
+use Exception;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Str;
+use League\Csv\Reader;
+use Override;
+use Spatie\TemporaryDirectory\TemporaryDirectory;
+use ZipArchive;
+
+class SolidtimeImporter extends DefaultImporter
+{
+    /**
+     * @var array<string>
+     */
+    public const array SUPPORTED_VERSIONS = ['1.0'];
+
+    /**
+     * @throws ImportException
+     */
+    #[Override]
+    public function importData(string $data, string $timezone): void
+    {
+        $temporaryDirectoryZip = null;
+        $temporaryDirectory = null;
+        try {
+            $zip = new ZipArchive();
+            $temporaryDirectoryZip = TemporaryDirectory::make();
+            file_put_contents($temporaryDirectoryZip->path('import.zip'), $data);
+            $res = $zip->open($temporaryDirectoryZip->path('import.zip'), ZipArchive::RDONLY);
+            if ($res !== true) {
+                throw new ImportException('Invalid ZIP, error code: '.$res);
+            }
+            $temporaryDirectory = TemporaryDirectory::make();
+            $zip->extractTo($temporaryDirectory->path());
+            $zip->close();
+
+            if (! file_exists($temporaryDirectory->path('meta.json'))) {
+                throw new ImportException('File "meta.json" missing in ZIP');
+            }
+            $metaFileContentRaw = file_get_contents($temporaryDirectory->path('meta.json'));
+            if ($metaFileContentRaw === false) {
+                throw new ImportException('File "meta.json" can not read');
+            }
+            $metaFileContent = json_decode($metaFileContentRaw);
+            if ($metaFileContent === false || ! isset($metaFileContent->version) || ! in_array($metaFileContent->version, self::SUPPORTED_VERSIONS, true)) {
+                throw new ImportException('Invalid version');
+            }
+
+            if (! file_exists($temporaryDirectory->path('clients.csv'))) {
+                throw new ImportException('File "clients.csv" missing in ZIP');
+            }
+            $clientsReader = Reader::createFromPath($temporaryDirectory->path('clients.csv'));
+            $clientsReader->setHeaderOffset(0);
+            $clientsReader->setDelimiter(',');
+
+            if (! file_exists($temporaryDirectory->path('members.csv'))) {
+                throw new ImportException('File "members.csv" missing in ZIP');
+            }
+            $membersReader = Reader::createFromPath($temporaryDirectory->path('members.csv'));
+            $membersReader->setHeaderOffset(0);
+            $membersReader->setDelimiter(',');
+
+            if (! file_exists($temporaryDirectory->path('organization_invitations.csv'))) {
+                throw new ImportException('File "organization_invitations.csv" missing in ZIP');
+            }
+            $organizationInvitationsReader = Reader::createFromPath($temporaryDirectory->path('organization_invitations.csv'));
+            $organizationInvitationsReader->setHeaderOffset(0);
+            $organizationInvitationsReader->setDelimiter(',');
+
+            if (! file_exists($temporaryDirectory->path('project_members.csv'))) {
+                throw new ImportException('File "project_members.csv" missing in ZIP');
+            }
+            $projectMembersReader = Reader::createFromPath($temporaryDirectory->path('project_members.csv'));
+            $projectMembersReader->setHeaderOffset(0);
+            $projectMembersReader->setDelimiter(',');
+
+            if (! file_exists($temporaryDirectory->path('projects.csv'))) {
+                throw new ImportException('File "projects.csv" missing in ZIP');
+            }
+            $projectsReader = Reader::createFromPath($temporaryDirectory->path('projects.csv'));
+            $projectsReader->setHeaderOffset(0);
+            $projectsReader->setDelimiter(',');
+
+            if (! file_exists($temporaryDirectory->path('tags.csv'))) {
+                throw new ImportException('File "tags.csv" missing in ZIP');
+            }
+            $tagsReader = Reader::createFromPath($temporaryDirectory->path('tags.csv'));
+            $tagsReader->setHeaderOffset(0);
+            $tagsReader->setDelimiter(',');
+
+            if (! file_exists($temporaryDirectory->path('tasks.csv'))) {
+                throw new ImportException('File "tasks.csv" missing in ZIP');
+            }
+            $tasksReader = Reader::createFromPath($temporaryDirectory->path('tasks.csv'));
+            $tasksReader->setHeaderOffset(0);
+            $tasksReader->setDelimiter(',');
+
+            if (! file_exists($temporaryDirectory->path('time_entries.csv'))) {
+                throw new ImportException('File "time_entries.csv" missing in ZIP');
+            }
+            $timeEntriesReader = Reader::createFromPath($temporaryDirectory->path('time_entries.csv'));
+            $timeEntriesReader->setHeaderOffset(0);
+            $timeEntriesReader->setDelimiter(',');
+
+            foreach ($clientsReader as $client) {
+                $this->clientImportHelper->getKey([
+                    'name' => $client['name'],
+                    'organization_id' => $this->organization->id,
+                ], [
+                    'archived_at' => $client['archived_at'] !== '' ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $client['archived_at'], 'UTC') : null,
+                ], $client['id']);
+            }
+
+            foreach ($tagsReader as $tag) {
+                $this->tagImportHelper->getKey([
+                    'name' => $tag['name'],
+                    'organization_id' => $this->organization->id,
+                ], [], $tag['id']);
+            }
+
+            foreach ($membersReader as $member) {
+                $userId = $this->userImportHelper->getKey([
+                    'email' => $member['email'],
+                ], [
+                    'name' => $member['name'],
+                    'timezone' => 'UTC',
+                    'is_placeholder' => true,
+                ], $member['user_id']);
+                $this->memberImportHelper->getKey([
+                    'user_id' => $userId,
+                    'organization_id' => $this->organization->getKey(),
+                ], [
+                    'role' => Role::Placeholder->value,
+                    'billable_rate' => $member['billable_rate'] === '' ? null : (int) $member['billable_rate'],
+                ], $member['id']);
+            }
+
+            foreach ($projectsReader as $project) {
+                $clientId = null;
+                if ($project['client_id'] !== '') {
+                    $clientId = $this->clientImportHelper->getKeyByExternalIdentifier($project['client_id']);
+                    if ($clientId === null) {
+                        throw new Exception('Client does not exist');
+                    }
+                }
+
+                if (! $this->colorService->isValid($project['color'])) {
+                    throw new ImportException('Invalid color');
+                }
+
+                $this->projectImportHelper->getKey([
+                    'name' => $project['name'],
+                    'organization_id' => $this->organization->getKey(),
+                ], [
+                    'color' => $project['color'],
+                    'billable_rate' => $project['billable_rate'] === '' ? null : (int) $project['billable_rate'],
+                    'is_public' => $project['is_public'] === 'true',
+                    'client_id' => $clientId,
+                    'is_billable' => $project['is_billable'] === 'true',
+                    'archived_at' => $project['archived_at'] !== '' ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $project['archived_at'], 'UTC') : null,
+                ], $project['id']);
+            }
+
+            foreach ($projectMembersReader as $projectMember) {
+                $userId = $this->userImportHelper->getKeyByExternalIdentifier($projectMember['user_id']);
+                $memberId = $this->memberImportHelper->getKeyByExternalIdentifier($projectMember['member_id']);
+                $projectId = $this->projectImportHelper->getKeyByExternalIdentifier($projectMember['project_id']);
+                $this->projectMemberImportHelper->getKey([
+                    'project_id' => $projectId,
+                    'member_id' => $memberId,
+                ], [
+                    'user_id' => $userId,
+                    'billable_rate' => $projectMember['billable_rate'] === '' ? null : (int) $projectMember['billable_rate'],
+                ], $projectMember['id']);
+            }
+
+            foreach ($tasksReader as $task) {
+                $projectId = $this->projectImportHelper->getKeyByExternalIdentifier($task['project_id']);
+                if ($projectId === null) {
+                    throw new Exception('Project does not exist');
+                }
+                $this->taskImportHelper->getKey([
+                    'name' => $task['name'],
+                    'project_id' => $projectId,
+                    'organization_id' => $this->organization->getKey(),
+                ], [
+                    'done_at' => $task['done_at'] !== '' ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $task['done_at'], 'UTC') : null,
+                ], (string) $task['id']);
+            }
+
+            // Time entries
+            foreach ($timeEntriesReader as $timeEntryRow) {
+                $userId = $this->userImportHelper->getKeyByExternalIdentifier($timeEntryRow['user_id']);
+                $memberId = $this->memberImportHelper->getKeyByExternalIdentifier($timeEntryRow['member_id']);
+                $member = $this->memberImportHelper->getModelById($memberId);
+                $clientId = null;
+                if ($timeEntryRow['client_id'] !== '') {
+                    $clientId = $this->clientImportHelper->getKeyByExternalIdentifier($timeEntryRow['client_id']);
+                }
+                $project = null;
+                $projectId = null;
+                $projectMember = null;
+                if ($timeEntryRow['project_id'] !== '') {
+                    $projectId = $this->projectImportHelper->getKeyByExternalIdentifier($timeEntryRow['project_id']);
+                    $project = $this->projectImportHelper->getModelById($projectId);
+                    $projectMember = $this->projectMemberImportHelper->getModel([
+                        'project_id' => $projectId,
+                        'member_id' => $memberId,
+                    ]);
+                }
+                $taskId = null;
+                if ($timeEntryRow['task_id'] !== '') {
+                    $taskId = $this->taskImportHelper->getKeyByExternalIdentifier($timeEntryRow['task_id']);
+                }
+                $timeEntry = new TimeEntry();
+                $timeEntry->user_id = $userId;
+                $timeEntry->member_id = $memberId;
+                $timeEntry->task_id = $taskId;
+                $timeEntry->project_id = $projectId;
+                $timeEntry->client_id = $clientId;
+                $timeEntry->organization_id = $this->organization->id;
+                if (strlen($timeEntryRow['description']) > 500) {
+                    throw new ImportException('Time entry description is too long');
+                }
+                $timeEntry->description = $timeEntryRow['description'];
+                if (! in_array($timeEntryRow['billable'], ['true', 'false'], true)) {
+                    throw new ImportException('Invalid billable value');
+                }
+                $timeEntry->billable = $timeEntryRow['billable'] === 'true';
+                $timeEntry->tags = $this->getTags($timeEntryRow['tags']);
+                $timeEntry->is_imported = true;
+
+                try {
+                    $start = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $timeEntryRow['start'], 'UTC');
+                } catch (InvalidFormatException) {
+                    throw new ImportException('Start date ("'.$timeEntryRow['start'].'") is invalid');
+                }
+                if ($start === null) {
+                    throw new ImportException('Start date ("'.$timeEntryRow['start'].'") is invalid');
+                }
+                $timeEntry->start = $start->utc();
+
+                if ($timeEntryRow['end'] !== '') {
+                    try {
+                        $end = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $timeEntryRow['end'], 'UTC');
+                    } catch (InvalidFormatException) {
+                        throw new ImportException('End date ("'.$timeEntryRow['end'].'") is invalid');
+                    }
+                    if ($end === null) {
+                        throw new ImportException('End date ("'.$timeEntryRow['end'].'") is invalid');
+                    }
+                    $timeEntry->end = $end->utc();
+                } else {
+                    $timeEntry->end = null;
+                }
+
+                if ($timeEntryRow['still_active_email_sent_at'] !== '') {
+                    try {
+                        $stillActiveEmailSentAt = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $timeEntryRow['still_active_email_sent_at'], 'UTC');
+                    } catch (InvalidFormatException) {
+                        throw new ImportException('Still active email timestamp ("'.$timeEntryRow['still_active_email_sent_at'].'") is invalid');
+                    }
+                    if ($stillActiveEmailSentAt === null) {
+                        throw new ImportException('Still active email timestamp ("'.$timeEntryRow['still_active_email_sent_at'].'") is invalid');
+                    }
+                    $timeEntry->still_active_email_sent_at = $stillActiveEmailSentAt->utc();
+                } else {
+                    $timeEntry->still_active_email_sent_at = null;
+                }
+
+                $timeEntry->billable_rate = $this->billableRateService->getBillableRateForTimeEntryWithGivenRelations(
+                    $timeEntry,
+                    $projectMember,
+                    $project,
+                    $member,
+                    $this->organization
+                );
+                $timeEntry->save();
+                $this->timeEntriesCreated++;
+            }
+        } catch (ImportException $exception) {
+            throw $exception;
+        } catch (Exception $exception) {
+            report($exception);
+            throw new ImportException('Unknown error');
+        } finally {
+            $temporaryDirectory?->delete();
+            $temporaryDirectoryZip?->delete();
+        }
+    }
+
+    /**
+     * @return array<string>
+     */
+    private function getTags(string $tags): array
+    {
+        if (trim($tags) === '') {
+            return [];
+        }
+        $tagsParsed = json_decode($tags);
+        if ($tagsParsed === false || ! is_array($tagsParsed)) {
+            return [];
+        }
+        $tagIds = [];
+        foreach ($tagsParsed as $tagParsed) {
+            if (! is_string($tagParsed) || ! Str::isUuid($tagParsed)) {
+                continue;
+            }
+            $tagId = $this->tagImportHelper->getKeyByExternalIdentifier($tagParsed);
+            $tagIds[] = $tagId;
+        }
+
+        return $tagIds;
+    }
+
+    #[Override]
+    public function getName(): string
+    {
+        return __('importer.solidtime_importer.name');
+    }
+
+    #[Override]
+    public function getDescription(): string
+    {
+        return __('importer.solidtime_importer.description');
+    }
+}

app/Service/Import/Importers/TogglDataImporter.php

@@ -6,6 +6,8 @@ namespace App\Service\Import\Importers;
 
 use App\Enums\Role;
 use Exception;
+use Illuminate\Support\Carbon;
+use Override;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
 use ValueError;
 use ZipArchive;
@@ -15,14 +17,16 @@ class TogglDataImporter extends DefaultImporter
     /**
      * @throws ImportException
      */
-    #[\Override]
+    #[Override]
     public function importData(string $data, string $timezone): void
     {
+        $temporaryDirectoryZip = null;
+        $temporaryDirectory = null;
         try {
             $zip = new ZipArchive();
-            $temporaryDirectory = TemporaryDirectory::make();
-            file_put_contents($temporaryDirectory->path('import.zip'), $data);
-            $res = $zip->open($temporaryDirectory->path('import.zip'), ZipArchive::RDONLY);
+            $temporaryDirectoryZip = TemporaryDirectory::make();
+            file_put_contents($temporaryDirectoryZip->path('import.zip'), $data);
+            $res = $zip->open($temporaryDirectoryZip->path('import.zip'), ZipArchive::RDONLY);
             if ($res !== true) {
                 throw new ImportException('Invalid ZIP, error code: '.$res);
             }
@@ -77,7 +81,9 @@ class TogglDataImporter extends DefaultImporter
                 $this->clientImportHelper->getKey([
                     'name' => $client->name,
                     'organization_id' => $this->organization->id,
-                ], [], (string) $client->id);
+                ], [
+                    'archived_at' => $client->archived === true ? Carbon::now() : null,
+                ], (string) $client->id);
             }
             foreach ($tags as $tag) {
                 $this->tagImportHelper->getKey([
@@ -121,7 +127,8 @@ class TogglDataImporter extends DefaultImporter
                 ], [
                     'client_id' => $clientId,
                     'color' => $project->color,
-                    'is_billable' => $project->rate !== null,
+                    'is_billable' => $project->billable,
+                    'is_public' => ! $project->is_private,
                     'billable_rate' => $project->rate !== null ? (int) ($project->rate * 100) : null,
                 ], (string) $project->id);
 
@@ -170,7 +177,9 @@ class TogglDataImporter extends DefaultImporter
                         'name' => $task->name,
                         'project_id' => $projectId,
                         'organization_id' => $this->organization->getKey(),
-                    ], [], (string) $task->id);
+                    ], [
+                        'done_at' => $task->active === false ? Carbon::now() : null,
+                    ], (string) $task->id);
                 }
             }
         } catch (ValueError $exception) {
@@ -180,16 +189,19 @@ class TogglDataImporter extends DefaultImporter
         } catch (Exception $exception) {
             report($exception);
             throw new ImportException('Unknown error');
+        } finally {
+            $temporaryDirectory?->delete();
+            $temporaryDirectoryZip?->delete();
         }
     }
 
-    #[\Override]
+    #[Override]
     public function getName(): string
     {
         return __('importer.toggl_data_importer.name');
     }
 
-    #[\Override]
+    #[Override]
     public function getDescription(): string
     {
         return __('importer.toggl_data_importer.description');

app/Service/InvitationService.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Enums\Role;
+use App\Exceptions\Api\UserIsAlreadyMemberOfOrganizationApiException;
+use App\Mail\OrganizationInvitationMail;
+use App\Models\Member;
+use App\Models\Organization;
+use App\Models\OrganizationInvitation;
+use Illuminate\Support\Facades\Mail;
+use Laravel\Jetstream\Events\InvitingTeamMember;
+
+class InvitationService
+{
+    /**
+     * @throws UserIsAlreadyMemberOfOrganizationApiException
+     */
+    public function inviteUser(Organization $organization, string $email, Role $role): OrganizationInvitation
+    {
+        if (Member::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->whereRelation('user', 'email', '=', $email)
+            ->where('role', '!=', Role::Placeholder->value)
+            ->exists()) {
+            throw new UserIsAlreadyMemberOfOrganizationApiException();
+        }
+
+        InvitingTeamMember::dispatch($organization, $email, $role->value);
+
+        $invitation = new OrganizationInvitation();
+        $invitation->email = $email;
+        $invitation->role = $role->value;
+        $invitation->organization()->associate($organization);
+        $invitation->save();
+
+        Mail::to($email)->queue(new OrganizationInvitationMail($invitation));
+
+        return $invitation;
+    }
+}

app/Service/IpLookup/IpLookupResponseDto.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\IpLookup;
+
+use App\Enums\Weekday;
+
+class IpLookupResponseDto
+{
+    public ?string $timezone;
+
+    public ?Weekday $startOfWeek;
+
+    public ?string $currency;
+
+    public function __construct(?string $timezone, ?Weekday $startOfWeek, ?string $currency)
+    {
+        $this->timezone = $timezone;
+        $this->startOfWeek = $startOfWeek;
+        $this->currency = $currency;
+    }
+}

app/Service/IpLookup/IpLookupServiceContract.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\IpLookup;
+
+interface IpLookupServiceContract
+{
+    public function lookup(string $ip): ?IpLookupResponseDto;
+}

app/Service/IpLookup/NoIpLookupService.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\IpLookup;
+
+class NoIpLookupService implements IpLookupServiceContract
+{
+    public function lookup(string $ip): ?IpLookupResponseDto
+    {
+        return null;
+    }
+}

app/Service/MemberService.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Enums\Role;
+use App\Models\Member;
+use App\Models\Organization;
+use App\Models\User;
+use InvalidArgumentException;
+
+class MemberService
+{
+    private UserService $userService;
+
+    public function __construct(UserService $userService)
+    {
+        $this->userService = $userService;
+    }
+
+    /**
+     * Change the ownership of an organization to a new user.
+     * The previous owner will be demoted to an admin.
+     */
+    public function changeOwnership(Organization $organization, Member $newOwner): void
+    {
+        $organization->update([
+            'user_id' => $newOwner->user_id,
+        ]);
+        if ($newOwner->organization_id !== $organization->getKey()) {
+            throw new InvalidArgumentException('Member is not part of the organization');
+        }
+        $newOwner->role = Role::Owner->value;
+        $newOwner->save();
+        $oldOwners = Member::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->where('role', '=', Role::Owner->value)
+            ->where('id', '!=', $newOwner->getKey())
+            ->get();
+        foreach ($oldOwners as $oldOwner) {
+            $oldOwner->role = Role::Admin->value;
+            $oldOwner->save();
+        }
+    }
+
+    public function makeMemberToPlaceholder(Member $member): void
+    {
+        $user = $member->user;
+        $placeholderUser = $user->replicate();
+        $placeholderUser->is_placeholder = true;
+        $placeholderUser->save();
+
+        $member->user()->associate($placeholderUser);
+        $member->role = Role::Placeholder->value;
+        $member->save();
+
+        $this->userService->assignOrganizationEntitiesToDifferentMember($member->organization, $user, $placeholderUser, $member);
+        $this->userService->makeSureUserHasAtLeastOneOrganization($user);
+    }
+}

app/Service/TimeEntryAggregationService.php

@@ -65,6 +65,12 @@ class TimeEntryAggregationService
         if ($groupBy !== null) {
             $timeEntriesQuery->groupBy($groupBy);
         }
+        if ($group1Select !== null) {
+            $timeEntriesQuery->orderBy('group_1');
+            if ($group2Select !== null) {
+                $timeEntriesQuery->orderBy('group_2');
+            }
+        }
 
         $timeEntriesAggregates = $timeEntriesQuery->get();
 

app/Service/UserService.php

@@ -31,7 +31,7 @@ class UserService
         $this->assignOrganizationEntitiesToDifferentMember($organization, $fromUser, $toUser, $toMember);
     }
 
-    private function assignOrganizationEntitiesToDifferentMember(Organization $organization, User $fromUser, User $toUser, Member $toMember): void
+    public function assignOrganizationEntitiesToDifferentMember(Organization $organization, User $fromUser, User $toUser, Member $toMember): void
     {
         // Time entries
         TimeEntry::query()
@@ -52,21 +52,6 @@ class UserService
             ]);
     }
 
-    public function makeMemberToPlaceholder(Member $member): void
-    {
-        $user = $member->user;
-        $placeholderUser = $user->replicate();
-        $placeholderUser->is_placeholder = true;
-        $placeholderUser->save();
-
-        $member->user()->associate($placeholderUser);
-        $member->role = Role::Placeholder->value;
-        $member->save();
-
-        $this->assignOrganizationEntitiesToDifferentMember($member->organization, $user, $placeholderUser, $member);
-        $this->makeSureUserHasAtLeastOneOrganization($user);
-    }
-
     public function makeSureUserHasAtLeastOneOrganization(User $user): void
     {
         if ($user->organizations()->count() > 0) {