keep tags when starting a new time entry from a finished one, fixes ST-469

.env.example

@@ -27,7 +27,6 @@ DB_TEST_PASSWORD=root
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-FILESYSTEM_DISK=local
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
@@ -47,12 +46,6 @@ MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="no-reply@solidtime.test"
 MAIL_FROM_NAME="${APP_NAME}"
 
-S3_ACCESS_KEY_ID=
-S3_SECRET_ACCESS_KEY=
-S3_REGION=us-east-1
-S3_BUCKET=
-S3_USE_PATH_STYLE_ENDPOINT=false
-
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
@@ -61,6 +54,17 @@ PUSHER_PORT=443
 PUSHER_SCHEME=https
 PUSHER_APP_CLUSTER=mt1
 
+# Storage
+FILESYSTEM_DISK=s3
+PUBLIC_FILESYSTEM_DISK=s3
+S3_ACCESS_KEY_ID=sail
+S3_SECRET_ACCESS_KEY=password
+S3_REGION=us-east-1
+S3_BUCKET=local
+S3_URL=http://storage.solidtime.test/local
+S3_ENDPOINT=http://storage.solidtime.test
+S3_USE_PATH_STYLE_ENDPOINT=true
+
 VITE_HOST_NAME=vite.solidtime.test
 VITE_APP_NAME="${APP_NAME}"
 VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"

.env.production

@@ -1,4 +1,6 @@
 APP_NAME=solidtime
+APP_VERSION=0.0.0
+APP_BUILD=0
 VITE_APP_NAME=solidtime
 APP_ENV=production
 APP_DEBUG=false

.github/workflows/build-private.yml

@@ -15,20 +15,60 @@ name: Build - Private
 jobs:
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
 
     steps:
       - name: "Check out code"
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
+
+      - name: "Get build"
+        id: build
+        run: echo "build=$(git rev-parse --short=8 HEAD)" >> "$GITHUB_OUTPUT"
+
+      - name: "Get Previous tag (normal push)"
+        id: previoustag
+        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+        with:
+          prefix: "v"
+
+      - name: "Get version"
+        id: version
+        run: |
+          if ${{ !startsWith(github.ref, 'refs/tags/v') }}; then
+            if ${{ startsWith(steps.previoustag.outputs.tag, 'v') }}; then
+              version=$(echo "${{ steps.previoustag.outputs.tag }}" | cut -c 2-)
+              echo "app_version=${version}" >> "$GITHUB_OUTPUT"
+            else
+              echo "ERROR: No previous tag found";
+              exit 1;
+            fi
+          else
+            version=$(echo "${{ github.ref }}" | cut -c 12-)
+            echo "app_version=${version}" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: "Copy .env template for production"
+        run: |
+          cp .env.production .env
+          rm .env.production .env.ci .env.example
+
+      - name: "Add version to .env"
+        run: sed -i 's/APP_VERSION=0.0.0/APP_VERSION=${{ steps.version.outputs.app_version }}/g' .env
+
+      - name: "Add build to .env"
+        run: sed -i 's/APP_BUILD=0/APP_BUILD=${{ steps.build.outputs.build }}/g' .env
+
+      - name: "Output .env"
+        run: cat .env
 
       - name: "Use Node.js"
         uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
-      - name: "Copy .env template for production"
-        run: cp .env.production .env && cat .env
-
       - name: "Checkout billing extension"
         uses: actions/checkout@v4
         with:
@@ -114,6 +154,9 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=sha,format=long
 
+      - name: "Set up QEMU"
+        uses: docker/setup-qemu-action@v3
+
       - name: "Set up Docker Buildx"
         uses: docker/setup-buildx-action@v3
 
@@ -125,6 +168,7 @@ jobs:
             DOCKER_FILES_BASE_PATH=docker/prod/
           file: docker/prod/Dockerfile
           push: true
+          platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha

.github/workflows/build-public.yml

@@ -15,14 +15,59 @@ name: Build - Public
 jobs:
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
+    timeout-minutes: 90
 
     steps:
       - name: "Check out code"
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
+
+      - name: "Get build"
+        id: build
+        run: echo "build=$(git rev-parse --short=8 HEAD)" >> "$GITHUB_OUTPUT"
+
+      - name: "Get Previous tag (normal push)"
+        id: previoustag
+        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+        with:
+          prefix: "v"
+
+      - name: "Get version"
+        id: version
+        run: |
+          if ${{ !startsWith(github.ref, 'refs/tags/v') }}; then
+            if ${{ startsWith(steps.previoustag.outputs.tag, 'v') }}; then
+              version=$(echo "${{ steps.previoustag.outputs.tag }}" | cut -c 2-)
+              echo "app_version=${version}" >> "$GITHUB_OUTPUT"
+            else
+              echo "ERROR: No previous tag found";
+              exit 1;
+            fi
+          else
+            version=$(echo "${{ github.ref }}" | cut -c 12-)
+            echo "app_version=${version}" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: "Copy .env template for production"
-        run: cp .env.production .env
+        run: |
+          cp .env.production .env
+          rm .env.production .env.ci .env.example
+
+      - name: "Add version to .env"
+        run: sed -i 's/APP_VERSION=0.0.0/APP_VERSION=${{ steps.version.outputs.app_version }}/g' .env
+
+      - name: "Add build to .env"
+        run: sed -i 's/APP_BUILD=0/APP_BUILD=${{ steps.build.outputs.build }}/g' .env
+
+      - name: "Output .env"
+        run: cat .env
 
       - name: "Install dependencies"
         uses: php-actions/composer@v6
@@ -48,18 +93,28 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
+      - name: "Login to GitHub Container Registry"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: "Docker meta"
         id: "meta"
         uses: docker/metadata-action@v5
         with:
-          images: solidtime/solidtime
+          images: |
+            solidtime/solidtime
+            ghcr.io/${{ github.repository }}
           tags: |
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
 
+      - name: "Set up QEMU"
+        uses: docker/setup-qemu-action@v3
+
       - name: "Set up Docker Buildx"
         uses: docker/setup-buildx-action@v3
 
@@ -70,7 +125,7 @@ jobs:
           file: docker/prod/Dockerfile
           build-args: |
             DOCKER_FILES_BASE_PATH=docker/prod/
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

app/Actions/Fortify/CreateNewUser.php

@@ -45,7 +45,7 @@ class CreateNewUser implements CreatesNewUsers
                 'string',
                 'email',
                 'max:255',
-                new UniqueEloquent(User::class, 'email', function (Builder $builder): Builder {
+                UniqueEloquent::make(User::class, 'email', function (Builder $builder): Builder {
                     /** @var Builder<User> $builder */
                     return $builder->where('is_placeholder', '=', false);
                 }),
@@ -62,7 +62,10 @@ class CreateNewUser implements CreatesNewUsers
             if (app(TimezoneService::class)->isValid($input['timezone'])) {
                 $timezone = $input['timezone'];
             } else {
-                Log::debug('Invalid timezone', ['timezone' => $input['timezone']]);
+                $timezone = app(TimezoneService::class)->mapLegacyTimezone($input['timezone']);
+                if ($timezone === null) {
+                    Log::debug('Invalid timezone', ['timezone' => $input['timezone']]);
+                }
             }
         }
 
@@ -77,30 +80,31 @@ class CreateNewUser implements CreatesNewUsers
             }
             $currency = $ipLookupResponse->currency;
         }
-
-        $user = DB::transaction(function () use ($input, $timezone, $startOfWeek, $currency) {
-            return tap(User::create([
+        $user = null;
+        $organization = null;
+        DB::transaction(function () use (&$user, &$organization, $input, $timezone, $startOfWeek, $currency): void {
+            $user = User::create([
                 'name' => $input['name'],
                 'email' => $input['email'],
                 'password' => Hash::make($input['password']),
                 '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,
-                    ]
-                );
+            $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();
 
-                $user->ownedTeams()->save($organization);
-            });
+            $organization->users()->attach(
+                $user, [
+                    'role' => Role::Owner->value,
+                ]
+            );
+
+            $user->ownedTeams()->save($organization);
         });
 
         $newsletterConsent = isset($input['newsletter_consent']) && (bool) $input['newsletter_consent'];

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -35,7 +35,7 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
                 'required',
                 'email',
                 'max:255',
-                (new UniqueEloquent(User::class, 'email'))->ignore($user->id)->query(function (Builder $query) {
+                UniqueEloquent::make(User::class, 'email')->ignore($user->id)->query(function (Builder $query) {
                     /** @var Builder<User> $query */
                     return $query->where('is_placeholder', '=', false);
                 }),

app/Actions/Jetstream/AddOrganizationMember.php

@@ -38,7 +38,7 @@ class AddOrganizationMember implements AddsTeamMembers
 
         AddingTeamMember::dispatch($organization, $newOrganizationMember);
 
-        DB::transaction(function () use ($organization, $newOrganizationMember, $role) {
+        DB::transaction(function () use ($organization, $newOrganizationMember, $role): void {
             $organization->users()->attach(
                 $newOrganizationMember, ['role' => $role]
             );
@@ -71,9 +71,10 @@ class AddOrganizationMember implements AddsTeamMembers
             'email' => [
                 'required',
                 'email',
-                (new ExistsEloquent(User::class, 'email', function (Builder $builder) {
+                ExistsEloquent::make(User::class, 'email', function (Builder $builder) {
+                    /** @var Builder<User> $builder */
                     return $builder->where('is_placeholder', '=', false);
-                }))->withMessage(__('We were unable to find a registered user with this email address.')),
+                })->withMessage(__('We were unable to find a registered user with this email address.')),
             ],
             'role' => [
                 'required',
@@ -92,7 +93,7 @@ class AddOrganizationMember implements AddsTeamMembers
      */
     protected function ensureUserIsNotAlreadyOnTeam(Organization $team, string $email): Closure
     {
-        return function ($validator) use ($team, $email) {
+        return function ($validator) use ($team, $email): void {
             $validator->errors()->addIf(
                 $team->hasRealUserWithEmail($email),
                 'email',

app/Actions/Jetstream/CreateOrganization.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Actions\Jetstream;
 
 use App\Enums\Role;
+use App\Events\AfterCreateOrganization;
 use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Auth\Access\AuthorizationException;
@@ -12,7 +13,6 @@ use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use Laravel\Jetstream\Contracts\CreatesTeams;
-use Laravel\Jetstream\Events\AddingTeam;
 use Laravel\Jetstream\Jetstream;
 
 class CreateOrganization implements CreatesTeams
@@ -33,9 +33,7 @@ class CreateOrganization implements CreatesTeams
             'name' => ['required', 'string', 'max:255'],
         ])->validateWithBag('createTeam');
 
-        AddingTeam::dispatch($user);
-
-        $organization = new Organization();
+        $organization = new Organization;
         $organization->name = $input['name'];
         $organization->personal_team = false;
         $organization->owner()->associate($user);
@@ -47,10 +45,12 @@ class CreateOrganization implements CreatesTeams
             ]
         );
 
-        $user->ownedTeams()->save($organization);
-
         $user->switchTeam($organization);
 
+        // Note: The refresh is necessary for currently unknown reasons. Do not remove it.
+        $organization = $organization->refresh();
+        AfterCreateOrganization::dispatch($organization);
+
         return $organization;
     }
 }

app/Actions/Jetstream/InviteOrganizationMember.php

@@ -19,6 +19,6 @@ class InviteOrganizationMember implements InvitesTeamMembers
      */
     public function invite(User $user, Organization $organization, string $email, ?string $role = null): void
     {
-        throw new MovedToApiException();
+        throw new MovedToApiException;
     }
 }

app/Actions/Jetstream/RemoveOrganizationMember.php

@@ -19,6 +19,6 @@ class RemoveOrganizationMember implements RemovesTeamMembers
      */
     public function remove(User $user, Organization $organization, User $teamMember): void
     {
-        throw new MovedToApiException();
+        throw new MovedToApiException;
     }
 }

app/Actions/Jetstream/UpdateMemberRole.php

@@ -20,6 +20,6 @@ class UpdateMemberRole
      */
     public function update(User $actingUser, Organization $organization, string $userId, string $role): void
     {
-        throw new MovedToApiException();
+        throw new MovedToApiException;
     }
 }

app/Actions/Jetstream/UpdateOrganization.php

@@ -36,7 +36,7 @@ class UpdateOrganization implements UpdatesTeamNames
             'currency' => [
                 'required',
                 'string',
-                new CurrencyRule(),
+                new CurrencyRule,
             ],
         ])->validateWithBag('updateTeamName');
 

app/Actions/Jetstream/ValidateOrganizationDeletion.php

@@ -22,7 +22,7 @@ class ValidateOrganizationDeletion
     public function validate(User $user, Organization $organization): void
     {
         if (! app(PermissionStore::class)->userHas($organization, $user, 'organizations:delete')) {
-            throw new AuthorizationException();
+            throw new AuthorizationException;
         }
     }
 }

app/Console/Commands/Admin/OrganizationDeleteCommand.php

@@ -9,14 +9,14 @@ use App\Service\DeletionService;
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 
-class DeleteOrganizationCommand extends Command
+class OrganizationDeleteCommand extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'admin:delete-organization
+    protected $signature = 'admin:organization:delete
                 { organization : The ID of the organization to delete }';
 
     /**
@@ -24,7 +24,7 @@ class DeleteOrganizationCommand extends Command
      *
      * @var string
      */
-    protected $description = 'Delete a organization.';
+    protected $description = 'Delete a organization';
 
     /**
      * Execute the console command.

app/Console/Commands/Admin/UserVerifyCommand.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands\Admin;
+
+use App\Models\User;
+use Illuminate\Auth\Events\Verified;
+use Illuminate\Console\Command;
+
+class UserVerifyCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'admin:user:verify
+                { email : The email of the user to verify }';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Verify the email address of an user';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $email = $this->argument('email');
+
+        $this->info('Start verifying user with email "'.$email.'"');
+
+        /** @var User|null $user */
+        $user = User::where('email', $email)->first();
+
+        if ($user === null) {
+            $this->error('User with email "'.$email.'" not found.');
+
+            return self::FAILURE;
+        }
+
+        if ($user->hasVerifiedEmail()) {
+            $this->info('User with email "'.$email.'" already verified.');
+
+            return self::FAILURE;
+        }
+
+        $user->markEmailAsVerified();
+        event(new Verified($user));
+
+        $this->info('User with email "'.$email.'" has been verified.');
+
+        return self::SUCCESS;
+    }
+}

app/Console/Commands/SelfHost/SelfHostCheckForUpdateCommand.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands\SelfHost;
+
+use App\Service\ApiService;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Cache;
+
+class SelfHostCheckForUpdateCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'self-host:check-for-update';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $apiService = app(ApiService::class);
+
+        $latestVersion = $apiService->checkForUpdate();
+        if ($latestVersion === null) {
+            $this->error('Failed to check for update, check the logs for more information.');
+
+            return self::FAILURE;
+        }
+
+        // Note: Cache for 13 hours, because the command runs twice daily (every 12 hours).
+        Cache::put('latest_version', $latestVersion, 60 * 60 * 12);
+
+        return self::SUCCESS;
+    }
+}

app/Console/Commands/SelfHost/SelfHostTelemetryCommand.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands\SelfHost;
+
+use App\Service\ApiService;
+use Illuminate\Console\Command;
+
+class SelfHostTelemetryCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'self-host:telemetry';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $apiService = app(ApiService::class);
+
+        $success = $apiService->telemetry();
+
+        if (! $success) {
+            $this->error('Failed to send telemetry data, check the logs for more information.');
+
+            return self::FAILURE;
+
+        }
+
+        return self::SUCCESS;
+    }
+}

app/Console/Commands/TimeEntry/TimeEntrySendStillRunningMailsCommand.php

@@ -6,7 +6,9 @@ namespace App\Console\Commands\TimeEntry;
 
 use App\Mail\TimeEntryStillRunningMail;
 use App\Models\TimeEntry;
+use App\Models\User;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Mail;
@@ -47,8 +49,12 @@ class TimeEntrySendStillRunningMailsCommand extends Command
             ->with([
                 'user',
             ])
+            ->whereHas('user', function (Builder $query): void {
+                /** @var Builder<User> $query */
+                $query->where('is_placeholder', '=', false);
+            })
             ->orderBy('created_at', 'asc')
-            ->chunk(500, function (Collection $timeEntries) use ($dryRun, &$sentMails) {
+            ->chunk(500, function (Collection $timeEntries) use ($dryRun, &$sentMails): void {
                 /** @var Collection<int, TimeEntry> $timeEntries */
                 foreach ($timeEntries as $timeEntry) {
                     $user = $timeEntry->user;

app/Console/Kernel.php

@@ -17,6 +17,14 @@ class Kernel extends ConsoleKernel
         $schedule->command('time-entry:send-still-running-mails')
             ->when(fn (): bool => config('scheduling.tasks.time_entry_send_still_running_mails'))
             ->everyTenMinutes();
+
+        $schedule->command('self-host:check-for-update')
+            ->when(fn (): bool => config('scheduling.tasks.self_hosting_check_for_update'))
+            ->twiceDaily();
+
+        $schedule->command('self-host:telemetry')
+            ->when(fn (): bool => config('scheduling.tasks.self_hosting_telemetry'))
+            ->twiceDaily();
     }
 
     /**

app/Enums/TimeEntryAggregationType.php

@@ -15,6 +15,7 @@ enum TimeEntryAggregationType: string
     case Task = 'task';
     case Client = 'client';
     case Billable = 'billable';
+    case Description = 'description';
 
     public function toInterval(): ?TimeEntryAggregationTypeInterval
     {

app/Events/AfterCreateOrganization.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Events;
+
+use App\Models\Organization;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * This event is fired after an organization has been created.
+ * This event does NOT fire when an organization is created as part of a registration.
+ */
+class AfterCreateOrganization
+{
+    use Dispatchable;
+    use SerializesModels;
+
+    public Organization $organization;
+
+    public function __construct(Organization $organization)
+    {
+        $this->organization = $organization;
+    }
+}

app/Events/MemberMadeToPlaceholder.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Events;
+
+use App\Models\Member;
+use App\Models\Organization;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class MemberMadeToPlaceholder
+{
+    use Dispatchable;
+
+    public Organization $organization;
+
+    public Member $member;
+
+    public function __construct(Member $member, Organization $organization)
+    {
+        $this->member = $member;
+        $this->organization = $organization;
+    }
+}

app/Events/MemberRemoved.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Events;
+
+use App\Models\Member;
+use App\Models\Organization;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class MemberRemoved
+{
+    use Dispatchable;
+
+    public Organization $organization;
+
+    public Member $member;
+
+    public function __construct(Member $member, Organization $organization)
+    {
+        $this->member = $member;
+        $this->organization = $organization;
+    }
+}

app/Exceptions/Api/OrganizationHasNoSubscriptionButMultipleMembersException.php

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

app/Exceptions/Handler.php

@@ -27,7 +27,7 @@ class Handler extends ExceptionHandler
      */
     public function register(): void
     {
-        $this->reportable(function (Throwable $e) {
+        $this->reportable(function (Throwable $e): void {
             //
         });
     }

app/Extensions/Scramble/ApiExceptionTypeToSchema.php

@@ -24,20 +24,20 @@ class ApiExceptionTypeToSchema extends ExceptionToResponseExtension
 
     public function toResponse(Type $type): Response
     {
-        $validationResponseBodyType = (new OpenApiTypes\ObjectType())
+        $validationResponseBodyType = (new OpenApiTypes\ObjectType)
             ->addProperty(
                 'error',
-                (new OpenApiTypes\BooleanType())
+                (new OpenApiTypes\BooleanType)
                     ->setDescription('Whether the response is an error.')
             )
             ->addProperty(
                 'key',
-                (new OpenApiTypes\StringType())
+                (new OpenApiTypes\StringType)
                     ->setDescription('Error key.')
             )
             ->addProperty(
                 'message',
-                (new OpenApiTypes\StringType())
+                (new OpenApiTypes\StringType)
                     ->setDescription('Error message.')
             )
             ->setRequired(['error', 'key', 'message']);

app/Extensions/Scramble/PaginatedResourceCollectionTypeToSchema.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Extensions\Scramble;
 
 use App\Http\Resources\PaginatedResourceCollection;
+use App\Http\Resources\V1\TimeEntry\TimeEntryCollection;
 use Dedoc\Scramble\Extensions\TypeToSchemaExtension;
 use Dedoc\Scramble\Support\Generator\Response;
 use Dedoc\Scramble\Support\Generator\Schema;
@@ -44,39 +45,49 @@ class PaginatedResourceCollectionTypeToSchema extends TypeToSchemaExtension
             return null;
         }
 
-        $type = new OpenApiObjectType;
-        $type->addProperty('data', (new ArrayType())->setItems($collectingType));
-        $type->addProperty(
-            'links',
-            (new OpenApiObjectType)
-                ->addProperty('first', (new StringType)->nullable(true))
-                ->addProperty('last', (new StringType)->nullable(true))
-                ->addProperty('prev', (new StringType)->nullable(true))
-                ->addProperty('next', (new StringType)->nullable(true))
-                ->setRequired(['first', 'last', 'prev', 'next'])
-        );
-        $type->addProperty(
-            'meta',
-            (new OpenApiObjectType)
-                ->addProperty('current_page', new IntegerType)
-                ->addProperty('from', (new IntegerType)->nullable(true))
-                ->addProperty('last_page', new IntegerType)
-                ->addProperty('links', (new ArrayType)->setItems(
-                    (new OpenApiObjectType)
-                        ->addProperty('url', (new StringType)->nullable(true))
-                        ->addProperty('label', new StringType)
-                        ->addProperty('active', new BooleanType)
-                        ->setRequired(['url', 'label', 'active'])
-                )->setDescription('Generated paginator links.'))
-                ->addProperty('path', (new StringType)->nullable(true)->setDescription('Base path for paginator generated URLs.'))
-                ->addProperty('per_page', (new IntegerType)->setDescription('Number of items shown per page.'))
-                ->addProperty('to', (new IntegerType)->nullable(true)->setDescription('Number of the last item in the slice.'))
-                ->addProperty('total', (new IntegerType)->setDescription('Total number of items being paginated.'))
-                ->setRequired(['current_page', 'from', 'last_page', 'links', 'path', 'per_page', 'to', 'total'])
-        );
-        $type->setRequired(['data', 'links', 'meta']);
+        $newType = new OpenApiObjectType;
+        $newType->addProperty('data', (new ArrayType)->setItems($collectingType));
+        if ($type instanceof ObjectType && $type->isInstanceOf(TimeEntryCollection::class)) {
+            $newType->addProperty(
+                'meta',
+                (new OpenApiObjectType)
+                    ->addProperty('total', (new IntegerType)->setDescription('Total number of items being paginated.'))
+                    ->setRequired(['total'])
+            );
+            $newType->setRequired(['data', 'meta']);
+        } else {
+            $newType->addProperty(
+                'links',
+                (new OpenApiObjectType)
+                    ->addProperty('first', (new StringType)->nullable(true))
+                    ->addProperty('last', (new StringType)->nullable(true))
+                    ->addProperty('prev', (new StringType)->nullable(true))
+                    ->addProperty('next', (new StringType)->nullable(true))
+                    ->setRequired(['first', 'last', 'prev', 'next'])
+            );
+            $newType->addProperty(
+                'meta',
+                (new OpenApiObjectType)
+                    ->addProperty('current_page', new IntegerType)
+                    ->addProperty('from', (new IntegerType)->nullable(true))
+                    ->addProperty('last_page', new IntegerType)
+                    ->addProperty('links', (new ArrayType)->setItems(
+                        (new OpenApiObjectType)
+                            ->addProperty('url', (new StringType)->nullable(true))
+                            ->addProperty('label', new StringType)
+                            ->addProperty('active', new BooleanType)
+                            ->setRequired(['url', 'label', 'active'])
+                    )->setDescription('Generated paginator links.'))
+                    ->addProperty('path', (new StringType)->nullable(true)->setDescription('Base path for paginator generated URLs.'))
+                    ->addProperty('per_page', (new IntegerType)->setDescription('Number of items shown per page.'))
+                    ->addProperty('to', (new IntegerType)->nullable(true)->setDescription('Number of the last item in the slice.'))
+                    ->addProperty('total', (new IntegerType)->setDescription('Total number of items being paginated.'))
+                    ->setRequired(['current_page', 'from', 'last_page', 'links', 'path', 'per_page', 'to', 'total'])
+            );
+            $newType->setRequired(['data', 'links', 'meta']);
+        }
 
-        return $type;
+        return $newType;
     }
 
     /**

app/Filament/Resources/OrganizationResource.php

@@ -70,6 +70,7 @@ class OrganizationResource extends Resource
                         'nullable',
                         'integer',
                         'gt:0',
+                        'max:2147483647',
                     ])
                     ->numeric(),
                 Forms\Components\DateTimePicker::make('created_at')
@@ -122,7 +123,7 @@ class OrganizationResource extends Resource
                                 ->persistent()
                                 ->send();
 
-                            return response()->streamDownload(function () use ($file) {
+                            return response()->streamDownload(function () use ($file): void {
                                 echo Storage::disk(config('filesystems.private'))->get($file);
                             }, 'export.zip');
                         } catch (\Exception $exception) {
@@ -137,7 +138,7 @@ class OrganizationResource extends Resource
                     }),
                 Action::make('Import')
                     ->icon('heroicon-o-inbox-arrow-down')
-                    ->action(function (Organization $record, array $data) {
+                    ->action(function (Organization $record, array $data): void {
                         try {
                             $file = Storage::disk(config('filament.default_filesystem_disk'))->get($data['file']);
                             if ($file === null) {

app/Filament/Resources/ProjectMemberResource.php

@@ -29,6 +29,7 @@ class ProjectMemberResource extends Resource
                         'nullable',
                         'integer',
                         'gt:0',
+                        'max:2147483647',
                     ])
                     ->numeric(),
                 Forms\Components\Select::make('user_id')

app/Filament/Resources/ProjectResource.php

@@ -45,6 +45,7 @@ class ProjectResource extends Resource
                         'nullable',
                         'integer',
                         'gt:0',
+                        'max:2147483647',
                     ])
                     ->numeric(),
                 Forms\Components\Select::make('organization_id')

app/Filament/Resources/TimeEntryResource.php

@@ -49,7 +49,7 @@ class TimeEntryResource extends Resource
                     ->label('End')
                     ->nullable()
                     ->rules([
-                        'after:start',
+                        'after_or_equal:start',
                     ]),
                 Select::make('user_id')
                     ->relationship(name: 'user', titleAttribute: 'email')

app/Filament/Resources/UserResource.php

@@ -111,9 +111,18 @@ class UserResource extends Resource
             ->filters([
                 TernaryFilter::make('real_user')
                     ->queries(
-                        true: fn (Builder $query) => $query->where('is_placeholder', '=', false),
-                        false: fn (Builder $query) => $query->where('is_placeholder', '=', true),
-                        blank: fn (Builder $query) => $query,
+                        true: function (Builder $query): Builder {
+                            /** @var Builder<User> $query */
+                            return $query->where('is_placeholder', '=', false);
+                        },
+                        false: function (Builder $query): Builder {
+                            /** @var Builder<User> $query */
+                            return $query->where('is_placeholder', '=', true);
+                        },
+                        blank: function (Builder $query): Builder {
+                            /** @var Builder<User> $query */
+                            return $query;
+                        },
                     )
                     ->label('Real User?'),
                 TernaryFilter::make('email_verified')

app/Filament/Widgets/ActiveUserOverview.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Filament\Widgets;
 
+use App\Models\TimeEntry;
 use App\Models\User;
 use Filament\Widgets\StatsOverviewWidget as BaseWidget;
 use Filament\Widgets\StatsOverviewWidget\Stat;
@@ -21,7 +22,8 @@ class ActiveUserOverview extends BaseWidget
         $placeholderUserCount = User::query()->where('is_placeholder', '=', true)->count();
         $activeInLastWeek = User::query()
             ->where('is_placeholder', '=', false)
-            ->whereHas('timeEntries', function (Builder $query) {
+            ->whereHas('timeEntries', function (Builder $query): void {
+                /** @var Builder<TimeEntry> $query */
                 $query->where('created_at', '>=', now()->subWeek())
                     ->orWhere('updated_at', '>=', now()->subWeek());
             })

app/Filament/Widgets/ServerOverview.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Widgets;
+
+use Filament\Widgets\Widget;
+use Illuminate\Support\Facades\Cache;
+
+class ServerOverview extends Widget
+{
+    protected static string $view = 'filament.widgets.server-overview';
+
+    /**
+     * @return array<string, mixed>
+     */
+    protected function getViewData(): array
+    {
+        /** @var string|null $currentVersion */
+        $currentVersion = config('app.version');
+        /** @var string|null $build */
+        $build = config('app.build');
+        $latestVersion = Cache::get('latest_version', null);
+
+        $needsUpdate = false;
+        if ($latestVersion !== null && $currentVersion !== null && version_compare($latestVersion, $currentVersion) > 0) {
+            $needsUpdate = true;
+        }
+
+        return [
+            'version' => $currentVersion,
+            'build' => $build,
+            'environment' => config('app.env'),
+            'currentVersion' => $latestVersion,
+            'needsUpdate' => $needsUpdate,
+        ];
+    }
+}

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

@@ -66,7 +66,7 @@ class ClientController extends Controller
     {
         $this->checkPermission($organization, 'clients:create');
 
-        $client = new Client();
+        $client = new Client;
         $client->name = $request->input('name');
         $client->organization()->associate($organization);
         $client->save();

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Api\V1;
 
 use App\Models\Organization;
+use App\Service\BillingContract;
 use App\Service\PermissionStore;
 use Illuminate\Auth\Access\AuthorizationException;
 
@@ -12,8 +13,7 @@ class Controller extends \App\Http\Controllers\Controller
 {
     public function __construct(
         protected PermissionStore $permissionStore,
-    ) {
-    }
+    ) {}
 
     /**
      * @throws AuthorizationException
@@ -21,7 +21,7 @@ class Controller extends \App\Http\Controllers\Controller
     protected function checkPermission(Organization $organization, string $permission): void
     {
         if (! $this->permissionStore->has($organization, $permission)) {
-            throw new AuthorizationException();
+            throw new AuthorizationException;
         }
     }
 
@@ -37,11 +37,16 @@ class Controller extends \App\Http\Controllers\Controller
                 return;
             }
         }
-        throw new AuthorizationException();
+        throw new AuthorizationException;
     }
 
     protected function hasPermission(Organization $organization, string $permission): bool
     {
         return $this->permissionStore->has($organization, $permission);
     }
+
+    protected function canAccessPremiumFeatures(Organization $organization): bool
+    {
+        return app(BillingContract::class)->hasSubscription($organization) || app(BillingContract::class)->hasTrial($organization);
+    }
 }

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

@@ -35,7 +35,7 @@ class ImportController extends Controller
 
         foreach ($importers as $key => $importerClass) {
             /** @var ImporterContract $importer */
-            $importer = new $importerClass();
+            $importer = new $importerClass;
             $importersResponse[] = [
                 'key' => $key,
                 'name' => $importer->getName(),

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

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\Role;
+use App\Events\MemberMadeToPlaceholder;
+use App\Events\MemberRemoved;
 use App\Exceptions\Api\CanNotRemoveOwnerFromOrganization;
 use App\Exceptions\Api\ChangingRoleToPlaceholderIsNotAllowed;
 use App\Exceptions\Api\EntityStillInUseApiException;
@@ -80,16 +82,16 @@ class MemberController extends Controller
             $newRole = $request->getRole();
             $oldRole = Role::from($member->role);
             if ($oldRole === Role::Owner) {
-                throw new OrganizationNeedsAtLeastOneOwner();
+                throw new OrganizationNeedsAtLeastOneOwner;
             }
             if ($newRole === Role::Placeholder) {
-                throw new ChangingRoleToPlaceholderIsNotAllowed();
+                throw new ChangingRoleToPlaceholderIsNotAllowed;
             }
             if ($newRole === Role::Owner) {
                 if ($this->hasPermission($organization, 'members:change-ownership')) {
                     $memberService->changeOwnership($organization, $member);
                 } else {
-                    throw new OnlyOwnerCanChangeOwnership();
+                    throw new OnlyOwnerCanChangeOwnership;
                 }
             } else {
                 $member->role = $request->getRole()->value;
@@ -118,15 +120,34 @@ class MemberController extends Controller
             throw new EntityStillInUseApiException('member', 'project_member');
         }
         if ($member->role === Role::Owner->value) {
-            throw new CanNotRemoveOwnerFromOrganization();
+            throw new CanNotRemoveOwnerFromOrganization;
         }
 
         $member->delete();
+        MemberRemoved::dispatch($member, $organization);
 
         return response()
             ->json(null, 204);
     }
 
+    /**
+     * @throws AuthorizationException|CanNotRemoveOwnerFromOrganization
+     */
+    public function makePlaceholder(Organization $organization, Member $member, MemberService $memberService): JsonResponse
+    {
+        $this->checkPermission($organization, 'members:make-placeholder', $member);
+
+        if ($member->role === Role::Owner->value) {
+            throw new CanNotRemoveOwnerFromOrganization;
+        }
+
+        $memberService->makeMemberToPlaceholder($member);
+
+        MemberMadeToPlaceholder::dispatch($member, $organization);
+
+        return response()->json(null, 204);
+    }
+
     /**
      * Invite a placeholder member to become a real member of the organization
      *
@@ -140,7 +161,7 @@ class MemberController extends Controller
         $user = $member->user;
 
         if (! $user->is_placeholder) {
-            throw new UserNotPlaceholderApiException();
+            throw new UserNotPlaceholderApiException;
         }
 
         $invitationService->inviteUser($organization, $user->email, Role::Employee);

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

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Enums\Role;
 use App\Http\Requests\V1\Organization\OrganizationUpdateRequest;
 use App\Http\Resources\V1\Organization\OrganizationResource;
 use App\Models\Organization;
@@ -23,7 +24,9 @@ class OrganizationController extends Controller
     {
         $this->checkPermission($organization, 'organizations:view');
 
-        return new OrganizationResource($organization);
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
+
+        return new OrganizationResource($organization, $showBillableRate);
     }
 
     /**
@@ -39,6 +42,9 @@ class OrganizationController extends Controller
 
         $organization->name = $request->input('name');
         $oldBillableRate = $organization->billable_rate;
+        if ($request->has('employees_can_see_billable_rates')) {
+            $organization->employees_can_see_billable_rates = $request->validated('employees_can_see_billable_rates');
+        }
         $organization->billable_rate = $request->getBillableRate();
         $organization->save();
 
@@ -46,6 +52,6 @@ class OrganizationController extends Controller
             $billableRateService->updateTimeEntriesBillableRateForOrganization($organization);
         }
 
-        return new OrganizationResource($organization);
+        return new OrganizationResource($organization, true);
     }
 }

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

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Enums\Role;
 use App\Exceptions\Api\EntityStillInUseApiException;
 use App\Http\Requests\V1\Project\ProjectIndexRequest;
 use App\Http\Requests\V1\Project\ProjectStoreRequest;
@@ -13,6 +14,7 @@ use App\Http\Resources\V1\Project\ProjectResource;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\ProjectMember;
+use App\Models\TimeEntry;
 use App\Service\BillableRateService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
@@ -60,7 +62,9 @@ class ProjectController extends Controller
 
         $projects = $projectsQuery->paginate(config('app.pagination_per_page_default'));
 
-        return new ProjectCollection($projects);
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
+
+        return new ProjectCollection($projects, $showBillableRate);
     }
 
     /**
@@ -74,9 +78,12 @@ class ProjectController extends Controller
     {
         $this->checkPermission($organization, 'projects:view', $project);
 
+        // Note: There is currently no need to check if a user is a member of the project,
+        // since this is only relevant for users with the role "employee" and they can not access this endpoint.
+
         $project->load('organization');
 
-        return new ProjectResource($project);
+        return new ProjectResource($project, true);
     }
 
     /**
@@ -89,16 +96,19 @@ class ProjectController extends Controller
     public function store(Organization $organization, ProjectStoreRequest $request): JsonResource
     {
         $this->checkPermission($organization, 'projects:create');
-        $project = new Project();
+        $project = new Project;
         $project->name = $request->input('name');
         $project->color = $request->input('color');
         $project->is_billable = (bool) $request->input('is_billable');
         $project->billable_rate = $request->getBillableRate();
         $project->client_id = $request->input('client_id');
+        if ($this->canAccessPremiumFeatures($organization) && $request->has('estimated_time')) {
+            $project->estimated_time = $request->getEstimatedTime();
+        }
         $project->organization()->associate($organization);
         $project->save();
 
-        return new ProjectResource($project);
+        return new ProjectResource($project, true);
     }
 
     /**
@@ -117,16 +127,29 @@ class ProjectController extends Controller
         if ($request->has('is_archived')) {
             $project->archived_at = $request->getIsArchived() ? Carbon::now() : null;
         }
+        if ($this->canAccessPremiumFeatures($organization) && $request->has('estimated_time')) {
+            $project->estimated_time = $request->getEstimatedTime();
+        }
         $oldBillableRate = $project->billable_rate;
+        $clientIdChanged = false;
         $project->billable_rate = $request->getBillableRate();
-        $project->client_id = $request->input('client_id');
+        if ($project->client_id !== $request->input('client_id')) {
+            $project->client_id = $request->input('client_id');
+            $clientIdChanged = true;
+        }
         $project->save();
 
         if ($oldBillableRate !== $request->getBillableRate()) {
             $billableRateService->updateTimeEntriesBillableRateForProject($project);
         }
+        if ($clientIdChanged) {
+            TimeEntry::query()
+                ->whereBelongsTo($organization, 'organization')
+                ->whereBelongsTo($project, 'project')
+                ->update(['client_id' => $project->client_id]);
+        }
 
-        return new ProjectResource($project);
+        return new ProjectResource($project, true);
     }
 
     /**
@@ -147,8 +170,8 @@ class ProjectController extends Controller
             throw new EntityStillInUseApiException('project', 'time_entry');
         }
 
-        DB::transaction(function () use (&$project) {
-            $project->members->each(function (ProjectMember $member) {
+        DB::transaction(function () use (&$project): void {
+            $project->members->each(function (ProjectMember $member): void {
                 $member->delete();
             });
 

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

@@ -65,13 +65,13 @@ class ProjectMemberController extends Controller
 
         $member = Member::findOrFail((string) $request->input('member_id'));
         if ($member->user->is_placeholder) {
-            throw new InactiveUserCanNotBeUsedApiException();
+            throw new InactiveUserCanNotBeUsedApiException;
         }
         if (ProjectMember::whereBelongsTo($project, 'project')->whereBelongsTo($member, 'member')->exists()) {
-            throw new UserIsAlreadyMemberOfProjectApiException();
+            throw new UserIsAlreadyMemberOfProjectApiException;
         }
 
-        $projectMember = new ProjectMember();
+        $projectMember = new ProjectMember;
         $projectMember->billable_rate = $request->getBillableRate();
         $projectMember->member()->associate($member);
         $projectMember->user()->associate($member->user);

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

@@ -57,7 +57,7 @@ class TagController extends Controller
     {
         $this->checkPermission($organization, 'tags:create');
 
-        $tag = new Tag();
+        $tag = new Tag;
         $tag->name = $request->input('name');
         $tag->organization()->associate($organization);
         $tag->save();

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

@@ -76,9 +76,12 @@ class TaskController extends Controller
     public function store(Organization $organization, TaskStoreRequest $request): JsonResource
     {
         $this->checkPermission($organization, 'tasks:create');
-        $task = new Task();
+        $task = new Task;
         $task->name = $request->input('name');
         $task->project_id = $request->input('project_id');
+        if ($this->canAccessPremiumFeatures($organization) && $request->has('estimated_time')) {
+            $task->estimated_time = $request->getEstimatedTime();
+        }
         $task->organization()->associate($organization);
         $task->save();
 
@@ -96,6 +99,9 @@ class TaskController extends Controller
     {
         $this->checkPermission($organization, 'tasks:update', $task);
         $task->name = $request->input('name');
+        if ($this->canAccessPremiumFeatures($organization) && $request->has('estimated_time')) {
+            $task->estimated_time = $request->getEstimatedTime();
+        }
         if ($request->has('is_done')) {
             $task->done_at = $request->getIsDone() ? Carbon::now() : null;
         }

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

@@ -7,15 +7,19 @@ namespace App\Http\Controllers\Api\V1;
 use App\Exceptions\Api\TimeEntryCanNotBeRestartedApiException;
 use App\Exceptions\Api\TimeEntryStillRunningApiException;
 use App\Http\Requests\V1\TimeEntry\TimeEntryAggregateRequest;
+use App\Http\Requests\V1\TimeEntry\TimeEntryDestroyMultipleRequest;
 use App\Http\Requests\V1\TimeEntry\TimeEntryIndexRequest;
 use App\Http\Requests\V1\TimeEntry\TimeEntryStoreRequest;
 use App\Http\Requests\V1\TimeEntry\TimeEntryUpdateMultipleRequest;
 use App\Http\Requests\V1\TimeEntry\TimeEntryUpdateRequest;
 use App\Http\Resources\V1\TimeEntry\TimeEntryCollection;
 use App\Http\Resources\V1\TimeEntry\TimeEntryResource;
+use App\Jobs\RecalculateSpentTimeForProject;
+use App\Jobs\RecalculateSpentTimeForTask;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
+use App\Models\Task;
 use App\Models\TimeEntry;
 use App\Service\TimeEntryAggregationService;
 use App\Service\TimeEntryFilter;
@@ -43,6 +47,8 @@ class TimeEntryController extends Controller
      * If you only need time entries for a specific user, you can filter by `user_id`.
      * Users with the permission `time-entries:view:own` can only use this endpoint with their own user ID in the user_id filter.
      *
+     * @return TimeEntryCollection<TimeEntryResource>
+     *
      * @throws AuthorizationException
      *
      * @operationId getTimeEntries
@@ -73,11 +79,14 @@ class TimeEntryController extends Controller
         $filter->addClientIdsFilter($request->input('client_ids'));
         $filter->addBillableFilter($request->input('billable'));
 
-        $limit = $request->has('limit') ? (int) $request->input('limit', 100) : 100;
+        $totalCount = $timeEntriesQuery->count();
+
+        $limit = $request->getLimit();
         if ($limit > 1000) {
             $limit = 1000;
         }
         $timeEntriesQuery->limit($limit);
+        $timeEntriesQuery->skip($request->getOffset());
 
         $timeEntries = $timeEntriesQuery->get();
 
@@ -111,7 +120,12 @@ class TimeEntryController extends Controller
             }
         }
 
-        return new TimeEntryCollection($timeEntries);
+        return (new TimeEntryCollection($timeEntries))
+            ->additional([
+                'meta' => [
+                    'total' => $totalCount,
+                ],
+            ]);
     }
 
     /**
@@ -212,12 +226,21 @@ class TimeEntryController extends Controller
         }
 
         if ($request->input('end') === null && TimeEntry::query()->whereBelongsTo($member, 'member')->where('end', null)->exists()) {
-            throw new TimeEntryStillRunningApiException();
+            throw new TimeEntryStillRunningApiException;
         }
 
-        $client = $request->input('project_id') !== null ? Project::findOrFail((string) $request->input('project_id'))->client : null;
+        $project = $request->input('project_id') !== null ? Project::findOrFail((string) $request->input('project_id')) : null;
+        $client = $project?->client;
+        $task = $request->input('task_id') !== null ? $project->tasks()->findOrFail((string) $request->input('task_id')) : null;
 
-        $timeEntry = new TimeEntry();
+        if ($project !== null) {
+            RecalculateSpentTimeForProject::dispatch($project);
+        }
+        if ($task !== null) {
+            RecalculateSpentTimeForTask::dispatch($task);
+        }
+
+        $timeEntry = new TimeEntry;
         $timeEntry->fill($request->validated());
         $timeEntry->client()->associate($client);
         $timeEntry->user_id = $member->user_id;
@@ -247,19 +270,41 @@ class TimeEntryController extends Controller
         }
 
         if ($timeEntry->end !== null && $request->has('end') && $request->input('end') === null) {
-            throw new TimeEntryCanNotBeRestartedApiException();
+            throw new TimeEntryCanNotBeRestartedApiException;
         }
 
+        $oldProject = $timeEntry->project;
+        $oldTask = $timeEntry->task;
+
+        $project = null;
         if ($request->has('project_id')) {
-            $client = $request->input('project_id') !== null ? Project::findOrFail((string) $request->input('project_id'))->client : null;
+            $project = $request->input('project_id') !== null ? Project::findOrFail((string) $request->input('project_id')) : null;
+            $client = $project?->client;
             $timeEntry->client()->associate($client);
         }
+        $task = null;
+        if ($request->has('task_id')) {
+            $task = $request->input('task_id') !== null ? Task::findOrFail((string) $request->input('task_id')) : null;
+        }
 
         $timeEntry->fill($request->validated());
         $timeEntry->description = $request->input('description', $timeEntry->description) ?? '';
         $timeEntry->setComputedAttributeValue('billable_rate');
         $timeEntry->save();
 
+        if ($oldProject !== null) {
+            RecalculateSpentTimeForProject::dispatch($oldProject);
+        }
+        if ($oldTask !== null) {
+            RecalculateSpentTimeForTask::dispatch($oldTask);
+        }
+        if ($project !== null && ($oldProject === null || $project->isNot($oldProject))) {
+            RecalculateSpentTimeForProject::dispatch($project);
+        }
+        if ($task !== null && ($oldTask === null || $task->isNot($oldTask))) {
+            RecalculateSpentTimeForTask::dispatch($task);
+        }
+
         return new TimeEntryResource($timeEntry);
     }
 
@@ -279,24 +324,35 @@ class TimeEntryController extends Controller
 
         $timeEntries = TimeEntry::query()
             ->whereBelongsTo($organization, 'organization')
+            ->with([
+                'project',
+                'task',
+            ])
             ->whereIn('id', $ids)
             ->get();
 
         $changes = $request->validated('changes');
 
         if (isset($changes['member_id']) && ! $canAccessAll && $this->member($organization)->getKey() !== $changes['member_id']) {
-            throw new AuthorizationException();
+            throw new AuthorizationException;
         }
 
+        $project = null;
         $client = null;
         $overwriteClient = false;
         if ($request->has('changes.project_id')) {
-            $client = $request->input('changes.project_id') !== null ? Project::findOrFail((string) $request->input('changes.project_id'))->client : null;
+            $project = $request->input('changes.project_id') !== null ? Project::findOrFail((string) $request->input('changes.project_id')) : null;
+            $client = $project?->client;
             $overwriteClient = true;
         }
 
-        $success = new Collection();
-        $error = new Collection();
+        $task = null;
+        if ($request->has('changes.task_id')) {
+            $task = $request->input('changes.task_id') !== null ? Task::findOrFail((string) $request->input('changes.task_id')) : null;
+        }
+
+        $success = new Collection;
+        $error = new Collection;
 
         foreach ($ids as $id) {
             /** @var TimeEntry|null $timeEntry */
@@ -313,12 +369,32 @@ class TimeEntryController extends Controller
                 continue;
 
             }
+            $oldProject = $timeEntry->project;
+            $oldTask = $timeEntry->task;
+
             $timeEntry->fill($changes);
+            // If project is changed, but task is not, we remove the old task from the time entry
+            if ($oldProject !== null && $project !== null && $oldProject->isNot($project) && $task === null) {
+                $timeEntry->task()->disassociate();
+            }
             if ($overwriteClient) {
                 $timeEntry->client()->associate($client);
             }
             $timeEntry->setComputedAttributeValue('billable_rate');
             $timeEntry->save();
+            if ($oldTask !== null) {
+                RecalculateSpentTimeForTask::dispatch($oldTask);
+            }
+            if ($oldProject !== null) {
+                RecalculateSpentTimeForProject::dispatch($oldProject);
+            }
+            if ($project !== null && ($oldProject === null || $project->isNot($oldProject))) {
+                RecalculateSpentTimeForProject::dispatch($project);
+            }
+            if ($task !== null && ($oldTask === null || $task->isNot($oldTask))) {
+                RecalculateSpentTimeForTask::dispatch($task);
+            }
+
             $success->push($id);
         }
 
@@ -343,9 +419,81 @@ class TimeEntryController extends Controller
             $this->checkPermission($organization, 'time-entries:delete:all', $timeEntry);
         }
 
+        $project = $timeEntry->project;
+        $task = $timeEntry->task;
+
         $timeEntry->delete();
 
+        if ($project !== null) {
+            RecalculateSpentTimeForProject::dispatch($project);
+        }
+        if ($task !== null) {
+            RecalculateSpentTimeForTask::dispatch($task);
+        }
+
         return response()
             ->json(null, 204);
     }
+
+    /**
+     * Delete multiple time entries
+     *
+     * @throws AuthorizationException
+     *
+     * @operationId deleteTimeEntries
+     */
+    public function destroyMultiple(Organization $organization, TimeEntryDestroyMultipleRequest $request): JsonResponse
+    {
+        $this->checkAnyPermission($organization, ['time-entries:delete:all', 'time-entries:delete:own']);
+        $canDeleteAll = $this->hasPermission($organization, 'time-entries:delete:all');
+
+        $ids = $request->validated('ids');
+        $timeEntries = TimeEntry::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->with([
+                'project',
+                'task',
+            ])
+            ->whereIn('id', $ids)
+            ->get();
+
+        $success = new Collection;
+        $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
+                $error->push($id);
+
+                continue;
+            }
+
+            if (! $canDeleteAll && $timeEntry->user_id !== Auth::id()) {
+                $error->push($id);
+
+                continue;
+
+            }
+
+            $project = $timeEntry->project;
+            $task = $timeEntry->task;
+
+            $timeEntry->delete();
+
+            if ($project !== null) {
+                RecalculateSpentTimeForProject::dispatch($project);
+            }
+            if ($task !== null) {
+                RecalculateSpentTimeForTask::dispatch($task);
+            }
+            $success->push($id);
+        }
+
+        return response()->json([
+            'success' => $success->toArray(),
+            'error' => $error->toArray(),
+        ]);
+    }
 }

app/Http/Controllers/Controller.php

@@ -28,7 +28,7 @@ class Controller extends BaseController
         $user = Auth::user();
         if ($user === null) {
             Log::error('This function should only be called in authenticated context');
-            throw new AuthorizationException();
+            throw new AuthorizationException;
         }
 
         return $user;
@@ -44,7 +44,7 @@ class Controller extends BaseController
         $member = Member::query()->whereBelongsTo($organization, 'organization')->whereBelongsTo($user, 'user')->first();
         if ($member === null) {
             Log::error('This function should only be called in authenticated context after checking the user is a member of the organization');
-            throw new AuthorizationException();
+            throw new AuthorizationException;
         }
 
         return $member;

app/Http/Controllers/Web/Controller.php

@@ -4,6 +4,4 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Web;
 
-abstract class Controller extends \App\Http\Controllers\Controller
-{
-}
+abstract class Controller extends \App\Http\Controllers\Controller {}

app/Http/Kernel.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http;
 
+use App\Http\Middleware\CheckOrganizationBlocked;
 use App\Http\Middleware\ForceJsonResponse;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
@@ -50,6 +51,9 @@ class Kernel extends HttpKernel
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             ForceJsonResponse::class,
         ],
+
+        'health-check' => [
+        ],
     ];
 
     /**
@@ -71,5 +75,6 @@ class Kernel extends HttpKernel
         'signed' => \App\Http\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \App\Http\Middleware\EnsureEmailIsVerified::class,
+        'check-organization-blocked' => CheckOrganizationBlocked::class,
     ];
 }

app/Http/Middleware/CheckOrganizationBlocked.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Middleware;
+
+use App\Exceptions\Api\OrganizationHasNoSubscriptionButMultipleMembersException;
+use App\Models\Organization;
+use App\Service\BillingContract;
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class CheckOrganizationBlocked
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Closure(Request): (Response)  $next
+     *
+     * @throws OrganizationHasNoSubscriptionButMultipleMembersException
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        $organization = $request->route('organization');
+
+        if (! ($organization instanceof Organization)) {
+            throw new \LogicException('The organization must be loaded before this middleware.');
+        }
+
+        /** @var BillingContract $billing */
+        $billing = app(BillingContract::class);
+
+        if ($billing->isBlocked($organization)) {
+            throw new OrganizationHasNoSubscriptionButMultipleMembersException;
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/HandleInertiaRequests.php

@@ -40,18 +40,19 @@ 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);
-        }
+
+        /** @var BillingContract $billing */
+        $billing = app(BillingContract::class);
 
         $currentOrganization = $request->user()?->currentTeam;
 
         return array_merge(parent::share($request), [
             'has_billing_extension' => $hasBilling,
-            'billing' => $billing !== null ? [
-                'has_subscription' => $currentOrganization !== null ? $billing->hasSubscription($currentOrganization) : null,
+            'billing' => $billing !== null && $currentOrganization !== null ? [
+                'has_subscription' => $billing->hasSubscription($currentOrganization),
+                'has_trial' => $billing->hasTrial($currentOrganization),
+                'trial_until' => $billing->getTrialUntil($currentOrganization)?->toIso8601ZuluString(),
+                'is_blocked' => $billing->isBlocked($currentOrganization),
             ] : null,
             'flash' => [
                 'message' => fn () => $request->session()->get('message'),

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

@@ -20,6 +20,7 @@ class ClientIndexRequest extends FormRequest
             'page' => [
                 'integer',
                 'min:1',
+                'max:2147483647',
             ],
             'archived' => [
                 'string',

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

@@ -29,10 +29,10 @@ class ClientStoreRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                (new UniqueEloquent(Client::class, 'name', function (Builder $builder): Builder {
+                UniqueEloquent::make(Client::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }))->withCustomTranslation('validation.client_name_already_exists'),
+                })->withCustomTranslation('validation.client_name_already_exists'),
             ],
         ];
     }

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

@@ -31,10 +31,10 @@ class ClientUpdateRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                (new UniqueEloquent(Client::class, 'name', function (Builder $builder): Builder {
+                UniqueEloquent::make(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'),
+                })->ignore($this->client?->getKey())->withCustomTranslation('validation.client_name_already_exists'),
             ],
             'is_archived' => [
                 'boolean',

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

@@ -29,10 +29,10 @@ class InvitationStoreRequest extends FormRequest
             'email' => [
                 'required',
                 'email',
-                (new UniqueEloquent(OrganizationInvitation::class, 'email', function (Builder $builder): Builder {
+                UniqueEloquent::make(OrganizationInvitation::class, 'email', function (Builder $builder): Builder {
                     /** @var Builder<OrganizationInvitation> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }))->withCustomTranslation('validation.invitation_already_exists'),
+                })->withCustomTranslation('validation.invitation_already_exists'),
             ],
             'role' => [
                 'required',

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

@@ -31,6 +31,7 @@ class MemberUpdateRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
+                'max:2147483647',
             ],
         ];
     }

app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php

@@ -30,6 +30,10 @@ class OrganizationUpdateRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
+                'max:2147483647',
+            ],
+            'employees_can_see_billable_rates' => [
+                'boolean',
             ],
         ];
     }

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

@@ -20,6 +20,7 @@ class ProjectIndexRequest extends FormRequest
             'page' => [
                 'integer',
                 'min:1',
+                'max:2147483647',
             ],
             'archived' => [
                 'string',

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

@@ -32,16 +32,16 @@ class ProjectStoreRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                (new UniqueEloquent(Project::class, 'name', function (Builder $builder): Builder {
+                UniqueEloquent::make(Project::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }))->withCustomTranslation('validation.project_name_already_exists'),
+                })->withCustomTranslation('validation.project_name_already_exists'),
             ],
             'color' => [
                 'required',
                 'string',
                 'max:255',
-                new ColorRule(),
+                new ColorRule,
             ],
             'is_billable' => [
                 'required',
@@ -51,13 +51,22 @@ class ProjectStoreRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
+                'max:2147483647',
             ],
+            // ID of the client
             'client_id' => [
                 'nullable',
-                new ExistsEloquent(Client::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
+            ],
+            // Estimated time in seconds
+            'estimated_time' => [
+                'nullable',
+                'integer',
+                'min:0',
+                'max:2147483647',
             ],
         ];
     }
@@ -68,4 +77,11 @@ class ProjectStoreRequest extends FormRequest
 
         return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
     }
+
+    public function getEstimatedTime(): ?int
+    {
+        $input = $this->input('estimated_time');
+
+        return $input !== null && $input !== 0 ? (int) $this->input('estimated_time') : null;
+    }
 }

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

@@ -32,16 +32,16 @@ class ProjectUpdateRequest extends FormRequest
                 'required',
                 'string',
                 'max:255',
-                (new UniqueEloquent(Project::class, 'name', function (Builder $builder): Builder {
+                UniqueEloquent::make(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'),
+                })->ignore($this->project?->getKey())->withCustomTranslation('validation.project_name_already_exists'),
             ],
             'color' => [
                 'required',
                 'string',
                 'max:255',
-                new ColorRule(),
+                new ColorRule,
             ],
             'is_billable' => [
                 'required',
@@ -52,15 +52,23 @@ class ProjectUpdateRequest extends FormRequest
             ],
             'client_id' => [
                 'nullable',
-                new ExistsEloquent(Client::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             'billable_rate' => [
                 'nullable',
                 'integer',
                 'min:0',
+                'max:2147483647',
+            ],
+            // Estimated time in seconds
+            'estimated_time' => [
+                'nullable',
+                'integer',
+                'min:0',
+                'max:2147483647',
             ],
         ];
     }
@@ -78,4 +86,11 @@ class ProjectUpdateRequest extends FormRequest
 
         return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
     }
+
+    public function getEstimatedTime(): ?int
+    {
+        $input = $this->input('estimated_time');
+
+        return $input !== null && $input !== 0 ? (int) $this->input('estimated_time') : null;
+    }
 }

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

@@ -26,16 +26,16 @@ class ProjectMemberStoreRequest extends FormRequest
         return [
             'member_id' => [
                 'required',
-                'uuid',
-                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             'billable_rate' => [
                 'nullable',
                 'integer',
                 'min:0',
+                'max:2147483647',
             ],
         ];
     }

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

@@ -25,6 +25,7 @@ class ProjectMemberUpdateRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
+                'max:2147483647',
             ],
         ];
     }

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

@@ -29,10 +29,10 @@ class TagStoreRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                (new UniqueEloquent(Tag::class, 'name', function (Builder $builder): Builder {
+                UniqueEloquent::make(Tag::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }))->withCustomTranslation('validation.tag_name_already_exists'),
+                })->withCustomTranslation('validation.tag_name_already_exists'),
             ],
         ];
     }

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

@@ -30,10 +30,10 @@ class TagUpdateRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                (new UniqueEloquent(Tag::class, 'name', function (Builder $builder): Builder {
+                UniqueEloquent::make(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'),
+                })->ignore($this->tag?->getKey())->withCustomTranslation('validation.tag_name_already_exists'),
             ],
         ];
     }

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

@@ -27,8 +27,7 @@ class TaskIndexRequest extends FormRequest
     {
         return [
             'project_id' => [
-                'uuid',
-                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     $builder = $builder->whereBelongsTo($this->organization, 'organization');
 
@@ -37,7 +36,7 @@ class TaskIndexRequest extends FormRequest
                     }
 
                     return $builder;
-                }),
+                })->uuid(),
             ],
             'done' => [
                 'string',

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

@@ -31,18 +31,32 @@ class TaskStoreRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                (new UniqueEloquent(Task::class, 'name', function (Builder $builder): Builder {
+                UniqueEloquent::make(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'),
+                })->withCustomTranslation('validation.task_name_already_exists'),
             ],
             'project_id' => [
                 'required',
-                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
+            ],
+            // Estimated time in seconds
+            'estimated_time' => [
+                'nullable',
+                'integer',
+                'min:0',
+                'max:2147483647',
             ],
         ];
     }
+
+    public function getEstimatedTime(): ?int
+    {
+        $input = $this->input('estimated_time');
+
+        return $input !== null && $input !== 0 ? (int) $this->input('estimated_time') : null;
+    }
 }

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

@@ -30,14 +30,21 @@ class TaskUpdateRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                (new UniqueEloquent(Task::class, 'name', function (Builder $builder): Builder {
+                UniqueEloquent::make(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'),
+                })->ignore($this->task?->getKey())->withCustomTranslation('validation.task_name_already_exists'),
             ],
             'is_done' => [
                 'boolean',
             ],
+            // Estimated time in seconds
+            'estimated_time' => [
+                'nullable',
+                'integer',
+                'min:0',
+                'max:2147483647',
+            ],
         ];
     }
 
@@ -47,4 +54,11 @@ class TaskUpdateRequest extends FormRequest
 
         return $this->boolean('is_done');
     }
+
+    public function getEstimatedTime(): ?int
+    {
+        $input = $this->input('estimated_time');
+
+        return $input !== null && $input !== 0 ? (int) $this->input('estimated_time') : null;
+    }
 }

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

@@ -45,11 +45,10 @@ class TimeEntryAggregateRequest extends FormRequest
             // Filter by member ID
             'member_id' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // Filter by multiple member IDs, member IDs are OR combined, but AND combined with the member_id parameter
             'member_ids' => [
@@ -58,21 +57,19 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'member_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
 
             // Filter by user ID
             'user_id' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(User::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(User::class, null, function (Builder $builder): Builder {
                     /** @var Builder<User> $builder */
                     return $builder->belongsToOrganization($this->organization);
-                }),
+                })->uuid(),
             ],
             // Filter by project IDs, project IDs are OR combined
             'project_ids' => [
@@ -81,11 +78,10 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'project_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // Filter by client IDs, client IDs are OR combined
             'client_ids' => [
@@ -94,11 +90,10 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'client_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Client::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // Filter by tag IDs, tag IDs are AND combined
             'tag_ids' => [
@@ -107,11 +102,10 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'tag_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -120,10 +114,9 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'task_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [

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

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\TimeEntry;
+
+use App\Models\Organization;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * @property Organization $organization Organization from model binding
+ */
+class TimeEntryDestroyMultipleRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule>>
+     */
+    public function rules(): array
+    {
+        return [
+            'ids' => [
+                'required',
+                'array',
+            ],
+            'ids.*' => [
+                'string',
+                'uuid',
+            ],
+        ];
+    }
+}

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

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
+use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
@@ -30,11 +31,10 @@ class TimeEntryIndexRequest extends FormRequest
             // Filter by member ID
             'member_id' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // Filter by multiple member IDs, member IDs are OR combined, but AND combined with the member_id parameter
             'member_ids' => [
@@ -43,11 +43,22 @@ class TimeEntryIndexRequest extends FormRequest
             ],
             'member_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
+            ],
+            // Filter by client IDs, client IDs are OR combined
+            'client_ids' => [
+                'array',
+                'min:1',
+            ],
+            'client_ids.*' => [
+                'string',
+                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Client> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter by project IDs, project IDs are OR combined
             'project_ids' => [
@@ -56,11 +67,10 @@ class TimeEntryIndexRequest extends FormRequest
             ],
             'project_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // Filter by tag IDs, tag IDs are AND combined
             'tag_ids' => [
@@ -69,11 +79,10 @@ class TimeEntryIndexRequest extends FormRequest
             ],
             'tag_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -82,11 +91,10 @@ class TimeEntryIndexRequest extends FormRequest
             ],
             'task_ids.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [
@@ -117,6 +125,12 @@ class TimeEntryIndexRequest extends FormRequest
                 'min:1',
                 'max:500',
             ],
+            // Skip the first n time entries (default: 0)
+            'offset' => [
+                'integer',
+                'min:0',
+                'max:2147483647',
+            ],
             // Filter makes sure that only time entries of a whole date are returned
             'only_full_dates' => [
                 'string',
@@ -129,4 +143,14 @@ class TimeEntryIndexRequest extends FormRequest
     {
         return $this->input('only_full_dates', 'false') === 'true';
     }
+
+    public function getLimit(): int
+    {
+        return $this->has('limit') ? (int) $this->validated('limit', 100) : 100;
+    }
+
+    public function getOffset(): int
+    {
+        return $this->has('offset') ? (int) $this->validated('offset', 0) : 0;
+    }
 }

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

@@ -31,36 +31,33 @@ class TimeEntryStoreRequest extends FormRequest
             'member_id' => [
                 'required',
                 'string',
-                'uuid',
-                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             'project_id' => [
                 'nullable',
                 'string',
-                'uuid',
                 'required_with:task_id',
-                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // ID of the task that the time entry should belong to
             'task_id' => [
                 'nullable',
                 'string',
-                'uuid',
-                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
-                (new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
+                })->uuid(),
+                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization')
                         ->where('project_id', $this->input('project_id'));
-                }))->withMessage(__('validation.task_belongs_to_project')),
+                })->uuid()->withMessage(__('validation.task_belongs_to_project')),
             ],
             // Start of time entry (ISO 8601 format, UTC timezone)
             'start' => [
@@ -71,7 +68,7 @@ class TimeEntryStoreRequest extends FormRequest
             'end' => [
                 'nullable',
                 'date_format:Y-m-d\TH:i:s\Z',
-                'after:start',
+                'after_or_equal:start',
             ],
             // Whether time entry is billable
             'billable' => [
@@ -90,12 +87,10 @@ class TimeEntryStoreRequest extends FormRequest
                 'array',
             ],
             'tags.*' => [
-                'string',
-                'uuid',
-                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
         ];
     }

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

@@ -42,37 +42,34 @@ class TimeEntryUpdateMultipleRequest extends FormRequest
             // ID of the organization member that the time entry should belong to
             'changes.member_id' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // ID of the project that the time entry should belong to
             'changes.project_id' => [
                 'nullable',
                 'string',
-                'uuid',
                 'required_with:task_id',
-                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // ID of the task that the time entry should belong to
             'changes.task_id' => [
                 'nullable',
                 'string',
-                'uuid',
-                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
-                (new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
+                })->uuid(),
+                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization')
                         ->where('project_id', $this->input('changes.project_id'));
-                }))->withMessage(__('validation.task_belongs_to_project')),
+                })->uuid()->withMessage(__('validation.task_belongs_to_project')),
             ],
             // Whether time entry is billable
             'changes.billable' => [
@@ -91,11 +88,10 @@ class TimeEntryUpdateMultipleRequest extends FormRequest
             ],
             'changes.tags.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
         ];
     }

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

@@ -30,37 +30,34 @@ class TimeEntryUpdateRequest extends FormRequest
             // ID of the organization member that the time entry should belong to
             'member_id' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Member> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // ID of the project that the time entry should belong to
             'project_id' => [
                 'nullable',
                 'string',
-                'uuid',
                 'required_with:task_id',
-                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
             // ID of the task that the time entry should belong to
             'task_id' => [
                 'nullable',
                 'string',
-                'uuid',
-                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
-                (new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
+                })->uuid(),
+                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization')
                         ->where('project_id', $this->input('project_id'));
-                }))->withMessage(__('validation.task_belongs_to_project')),
+                })->uuid()->withMessage(__('validation.task_belongs_to_project')),
             ],
             // Start of time entry (ISO 8601 format, UTC timezone)
             'start' => [
@@ -70,7 +67,7 @@ class TimeEntryUpdateRequest extends FormRequest
             'end' => [
                 'nullable',
                 'date_format:Y-m-d\TH:i:s\Z',
-                'after:start',
+                'after_or_equal:start',
             ],
             // Whether time entry is billable
             'billable' => [
@@ -89,11 +86,10 @@ class TimeEntryUpdateRequest extends FormRequest
             ],
             'tags.*' => [
                 'string',
-                'uuid',
-                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
+                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                }),
+                })->uuid(),
             ],
         ];
     }

app/Http/Resources/PaginatedResourceCollection.php

@@ -4,6 +4,4 @@ declare(strict_types=1);
 
 namespace App\Http\Resources;
 
-interface PaginatedResourceCollection
-{
-}
+interface PaginatedResourceCollection {}

app/Http/Resources/V1/Organization/OrganizationResource.php

@@ -13,6 +13,20 @@ use Illuminate\Http\Request;
  */
 class OrganizationResource extends BaseResource
 {
+    private bool $showBillableRate;
+
+    /**
+     * Create a new resource instance.
+     *
+     * @return void
+     */
+    public function __construct(Organization $resource, bool $showBillableRate)
+    {
+        parent::__construct($resource);
+
+        $this->showBillableRate = $showBillableRate;
+    }
+
     /**
      * Transform the resource into an array.
      *
@@ -28,7 +42,9 @@ class OrganizationResource extends BaseResource
             /** @var bool $color Personal organizations automatically created after registration */
             'is_personal' => $this->resource->personal_team,
             /** @var int|null $billable_rate Billable rate in cents per hour */
-            'billable_rate' => $this->resource->billable_rate,
+            'billable_rate' => $this->showBillableRate ? $this->resource->billable_rate : null,
+            /** @var bool $employees_can_see_billable_rates Can members of the organization with role "employee" see the billable rates */
+            'employees_can_see_billable_rates' => $this->resource->employees_can_see_billable_rates,
         ];
     }
 }

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

@@ -5,14 +5,39 @@ declare(strict_types=1);
 namespace App\Http\Resources\V1\Project;
 
 use App\Http\Resources\PaginatedResourceCollection;
+use App\Models\Project;
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Pagination\LengthAwarePaginator;
 
 class ProjectCollection extends ResourceCollection implements PaginatedResourceCollection
 {
+    private bool $showBillableRates;
+
     /**
-     * The resource that this resource collects.
-     *
-     * @var string
+     * @param  LengthAwarePaginator<Project>  $resource
      */
-    public $collects = ProjectResource::class;
+    public function __construct($resource, bool $showBillableRates)
+    {
+        parent::__construct($resource);
+        $this->showBillableRates = $showBillableRates;
+    }
+
+    protected function collects(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * Transform the resource collection into an array.
+     *
+     * @return array<array<string, string|bool|int|null>>
+     */
+    public function toArray(Request $request): array
+    {
+        return $this->collection->map(function (Project $project) use ($request): array {
+            return (new ProjectResource($project, $this->showBillableRates))
+                ->toArray($request);
+        })->all();
+    }
 }

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

@@ -13,6 +13,15 @@ use Illuminate\Http\Request;
  */
 class ProjectResource extends BaseResource
 {
+    private bool $showBillableRate;
+
+    public function __construct(Project $resource, bool $showBillableRate)
+    {
+        parent::__construct($resource);
+
+        $this->showBillableRate = $showBillableRate;
+    }
+
     /**
      * Transform the resource into an array.
      *
@@ -32,9 +41,13 @@ class ProjectResource extends BaseResource
             /** @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,
+            'billable_rate' => $this->showBillableRate ? $this->resource->billable_rate : null,
             /** @var bool $is_billable Project time entries billable default */
             'is_billable' => $this->resource->is_billable,
+            /** @var int|null $estimated_time Estimated time in seconds */
+            'estimated_time' => $this->resource->estimated_time,
+            /** @var int $spent_time Spent time on this project in seconds (sum of the duration of all associated time entries, excl. still running time entries) */
+            'spent_time' => $this->resource->spent_time,
         ];
     }
 }

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

@@ -30,6 +30,10 @@ class TaskResource extends BaseResource
             'is_done' => $this->resource->is_done,
             /** @var string $project_id ID of the project */
             'project_id' => $this->resource->project_id,
+            /** @var int|null $estimated_time Estimated time in seconds */
+            'estimated_time' => $this->resource->estimated_time,
+            /** @var int $spent_time Spent time on this task in seconds (sum of the duration of all associated time entries, excl. still running time entries) */
+            'spent_time' => $this->resource->spent_time,
             /** @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/TimeEntry/TimeEntryCollection.php

@@ -4,9 +4,10 @@ declare(strict_types=1);
 
 namespace App\Http\Resources\V1\TimeEntry;
 
+use App\Http\Resources\PaginatedResourceCollection;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
-class TimeEntryCollection extends ResourceCollection
+class TimeEntryCollection extends ResourceCollection implements PaginatedResourceCollection
 {
     /**
      * The resource that this resource collects.

app/Jobs/RecalculateSpentTimeForProject.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Jobs;
+
+use App\Models\Project;
+use Exception;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class RecalculateSpentTimeForProject implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    public Project $project;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(Project $project)
+    {
+        $this->project = $project;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @throws Exception
+     */
+    public function handle(): void
+    {
+        $this->project->setComputedAttributeValue('spent_time');
+        if ($this->project->isDirty()) {
+            $this->project->save();
+        }
+    }
+}

app/Jobs/RecalculateSpentTimeForTask.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Jobs;
+
+use App\Models\Task;
+use Exception;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class RecalculateSpentTimeForTask implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    public Task $task;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(Task $task)
+    {
+        $this->task = $task;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @throws Exception
+     */
+    public function handle(): void
+    {
+        $this->task->setComputedAttributeValue('spent_time');
+        if ($this->task->isDirty()) {
+            $this->task->save();
+        }
+    }
+}

app/Listeners/RemovePlaceholder.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Listeners;
 
 use App\Models\Member;
+use App\Models\User;
 use App\Service\UserService;
 use Illuminate\Database\Eloquent\Builder;
 use Laravel\Jetstream\Events\TeamMemberAdded;
@@ -19,7 +20,8 @@ class RemovePlaceholder
         /** @var UserService $userService */
         $userService = app(UserService::class);
         $placeholders = Member::query()
-            ->whereHas('user', function (Builder $query) use ($event) {
+            ->whereHas('user', function (Builder $query) use ($event): void {
+                /** @var Builder<User> $query */
                 $query->where('is_placeholder', '=', true)
                     ->where('email', '=', $event->user->email);
             })

app/Models/Audit.php

@@ -29,5 +29,6 @@ use OwenIt\Auditing\Models\Audit as PackageAuditModel;
  */
 class Audit extends PackageAuditModel
 {
+    /** @use HasFactory<AuditFactory> */
     use HasFactory;
 }

app/Models/Client.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\ClientFactory;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -12,7 +13,6 @@ 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;
 
 /**
@@ -29,8 +29,11 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class Client extends Model implements AuditableContract
 {
-    use Auditable;
+    use CustomAuditable;
+
+    /** @use HasFactory<ClientFactory> */
     use HasFactory;
+
     use HasUuids;
 
     /**
@@ -40,6 +43,7 @@ class Client extends Model implements AuditableContract
      */
     protected $casts = [
         'name' => 'string',
+        'archived_at' => 'datetime',
     ];
 
     /**

app/Models/Concerns/CustomAuditable.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models\Concerns;
+
+use OwenIt\Auditing\Auditable;
+
+trait CustomAuditable
+{
+    use Auditable;
+
+    /**
+     * @var array<string>|null
+     */
+    protected ?array $auditEvents = null;
+
+    public function disableAuditing(): void
+    {
+        $this->auditEvents = [];
+    }
+}

app/Models/FailedJob.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use Database\Factories\FailedJobFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
@@ -16,6 +17,7 @@ use Illuminate\Support\Carbon;
  */
 class FailedJob extends Model
 {
+    /** @use HasFactory<FailedJobFactory> */
     use HasFactory;
 
     /**

app/Models/Member.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\MemberFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -11,7 +12,6 @@ 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;
 
 /**
@@ -29,8 +29,11 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class Member extends JetstreamMembership implements AuditableContract
 {
-    use Auditable;
+    use CustomAuditable;
+
+    /** @use HasFactory<MemberFactory> */
     use HasFactory;
+
     use HasUuids;
 
     /**

app/Models/Organization.php

@@ -4,11 +4,13 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Models\Concerns\CustomAuditable;
 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\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Carbon;
@@ -18,7 +20,6 @@ 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;
 
 /**
@@ -28,6 +29,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property string $currency
  * @property int|null $billable_rate
  * @property string $user_id
+ * @property bool $employees_can_see_billable_rates
  * @property User $owner
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
@@ -41,8 +43,11 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class Organization extends JetstreamTeam implements AuditableContract
 {
-    use Auditable;
+    use CustomAuditable;
+
+    /** @use HasFactory<OrganizationFactory> */
     use HasFactory;
+
     use HasUuids;
 
     /**
@@ -54,6 +59,7 @@ class Organization extends JetstreamTeam implements AuditableContract
         'name' => 'string',
         'personal_team' => 'boolean',
         'currency' => 'string',
+        'employees_can_see_billable_rates' => 'boolean',
     ];
 
     /**
@@ -110,7 +116,7 @@ class Organization extends JetstreamTeam implements AuditableContract
      */
     public function users(): BelongsToMany
     {
-        return $this->belongsToMany(Jetstream::userModel(), Jetstream::membershipModel())
+        return $this->belongsToMany(User::class, Member::class)
             ->withPivot([
                 'id',
                 'role',
@@ -120,6 +126,24 @@ class Organization extends JetstreamTeam implements AuditableContract
             ->as('membership');
     }
 
+    /**
+     * Get the owner of the team.
+     *
+     * @return BelongsTo<User, Organization>
+     */
+    public function owner(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+
+    /**
+     * @return HasMany<Member>
+     */
+    public function members(): HasMany
+    {
+        return $this->hasMany(Member::class);
+    }
+
     /**
      * @return BelongsToMany<User>
      */

app/Models/OrganizationInvitation.php

@@ -4,14 +4,13 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Models\Concerns\CustomAuditable;
 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;
 
 /**
@@ -27,8 +26,11 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class OrganizationInvitation extends JetstreamTeamInvitation implements AuditableContract
 {
-    use Auditable;
+    use CustomAuditable;
+
+    /** @use HasFactory<OrganizationInvitationFactory> */
     use HasFactory;
+
     use HasUuids;
 
     /**
@@ -55,7 +57,7 @@ class OrganizationInvitation extends JetstreamTeamInvitation implements Auditabl
      */
     public function organization(): BelongsTo
     {
-        return $this->belongsTo(Jetstream::teamModel(), 'organization_id');
+        return $this->belongsTo(Organization::class, 'organization_id');
     }
 
     /**
@@ -65,6 +67,6 @@ class OrganizationInvitation extends JetstreamTeamInvitation implements Auditabl
      */
     public function team(): BelongsTo
     {
-        return $this->belongsTo(Jetstream::teamModel(), 'organization_id');
+        return $this->belongsTo(Organization::class, 'organization_id');
     }
 }

app/Models/Project.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\ProjectFactory;
 use Illuminate\Database\Eloquent\Builder;
@@ -14,7 +15,8 @@ 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 Illuminate\Support\Facades\DB;
+use Korridor\LaravelComputedAttributes\ComputedAttributes;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
@@ -27,6 +29,8 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property bool $is_public
  * @property bool $is_billable
  * @property-read bool $is_archived
+ * @property int|null $estimated_time
+ * @property int $spent_time
  * @property Carbon|null $archived_at
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
@@ -40,8 +44,12 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class Project extends Model implements AuditableContract
 {
-    use Auditable;
+    use ComputedAttributes;
+    use CustomAuditable;
+
+    /** @use HasFactory<ProjectFactory> */
     use HasFactory;
+
     use HasUuids;
 
     /**
@@ -52,6 +60,9 @@ class Project extends Model implements AuditableContract
     protected $casts = [
         'name' => 'string',
         'color' => 'string',
+        'archived_at' => 'datetime',
+        'estimated_time' => 'integer',
+        'spent_time' => 'integer',
     ];
 
     /**
@@ -63,6 +74,68 @@ class Project extends Model implements AuditableContract
         'is_billable' => false,
     ];
 
+    /**
+     * The attributes that are computed. (f.e. for performance reasons)
+     * These attributes can be regenerated at any time.
+     *
+     * @var string[]
+     */
+    protected array $computed = [
+        'spent_time',
+    ];
+
+    /**
+     * Attributes to exclude from the Audit.
+     *
+     * @var array<string>
+     */
+    protected array $auditExclude = [
+        'spent_time',
+    ];
+
+    public function getSpentTimeComputed(): ?int
+    {
+        if ($this->hasAttribute('spent_time_computed')) {
+            return $this->attributes['spent_time_computed'] === null ? 0 : (int) $this->attributes['spent_time_computed'];
+        } else {
+            /** @var object{ spent_time: string } $result */
+            $result = $this->timeEntries()
+                ->whereNotNull('end')
+                ->selectRaw('sum(extract(epoch from ("end" - start))) as spent_time')
+                ->first();
+
+            return (int) $result->spent_time;
+        }
+    }
+
+    /**
+     * This scope will be applied during the computed property generation with artisan computed-attributes:generate.
+     *
+     * @param  Builder<Project>  $builder
+     * @param  array<string>  $attributes  Attributes that will be generated.
+     * @return Builder<Project>
+     */
+    public function scopeComputedAttributesGenerate(Builder $builder, array $attributes): Builder
+    {
+        if (in_array('spent_time', $attributes, true)) {
+            $builder->withAggregate('timeEntries as spent_time_computed', DB::raw('extract(epoch from ("end" - start))'), 'sum');
+        }
+
+        return $builder;
+    }
+
+    /**
+     * This scope will be applied during the computed property validation with artisan computed-attributes:validate.
+     *
+     * @param  Builder<Project>  $builder
+     * @param  array<string>  $attributes  Attributes that will be validated.
+     * @return Builder<Project>
+     */
+    public function scopeComputedAttributesValidate(Builder $builder, array $attributes): Builder
+    {
+        return $this->scopeComputedAttributesGenerate($builder, $attributes);
+    }
+
     /**
      * @return BelongsTo<Organization, Project>
      */

app/Models/ProjectMember.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\ProjectMemberFactory;
 use Illuminate\Database\Eloquent\Builder;
@@ -11,7 +12,6 @@ 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;
 
 /**
@@ -31,8 +31,11 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class ProjectMember extends Model implements AuditableContract
 {
-    use Auditable;
+    use CustomAuditable;
+
+    /** @use HasFactory<ProjectMemberFactory> */
     use HasFactory;
+
     use HasUuids;
 
     /**

app/Models/Tag.php

@@ -4,13 +4,13 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\TagFactory;
 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;
 
 /**
@@ -25,8 +25,11 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class Tag extends Model implements AuditableContract
 {
-    use Auditable;
+    use CustomAuditable;
+
+    /** @use HasFactory<TagFactory> */
     use HasFactory;
+
     use HasUuids;
 
     /**

app/Models/Task.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\TaskFactory;
 use Illuminate\Database\Eloquent\Builder;
@@ -14,7 +15,8 @@ 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 Illuminate\Support\Facades\DB;
+use Korridor\LaravelComputedAttributes\ComputedAttributes;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
@@ -23,6 +25,8 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property string $project_id
  * @property string $organization_id
  * @property Carbon|null $done_at
+ * @property int|null $estimated_time
+ * @property int $spent_time
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
  * @property-read Project $project
@@ -34,8 +38,12 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class Task extends Model implements AuditableContract
 {
-    use Auditable;
+    use ComputedAttributes;
+    use CustomAuditable;
+
+    /** @use HasFactory<TaskFactory> */
     use HasFactory;
+
     use HasUuids;
 
     /**
@@ -45,9 +53,72 @@ class Task extends Model implements AuditableContract
      */
     protected $casts = [
         'name' => 'string',
+        'estimated_time' => 'integer',
         'done_at' => 'datetime',
     ];
 
+    /**
+     * The attributes that are computed. (f.e. for performance reasons)
+     * These attributes can be regenerated at any time.
+     *
+     * @var string[]
+     */
+    protected array $computed = [
+        'spent_time',
+    ];
+
+    /**
+     * Attributes to exclude from the Audit.
+     *
+     * @var array<string>
+     */
+    protected array $auditExclude = [
+        'spent_time',
+    ];
+
+    public function getSpentTimeComputed(): ?int
+    {
+        if ($this->hasAttribute('spent_time_computed')) {
+            return $this->attributes['spent_time_computed'] === null ? 0 : (int) $this->attributes['spent_time_computed'];
+        } else {
+            /** @var object{ spent_time: string } $result */
+            $result = $this->timeEntries()
+                ->whereNotNull('end')
+                ->selectRaw('sum(extract(epoch from ("end" - start))) as spent_time')
+                ->first();
+
+            return (int) $result->spent_time;
+        }
+    }
+
+    /**
+     * This scope will be applied during the computed property generation with artisan computed-attributes:generate.
+     *
+     * @param  Builder<Task>  $builder
+     * @param  array<string>  $attributes  Attributes that will be generated.
+     * @return Builder<Task>
+     */
+    public function scopeComputedAttributesGenerate(Builder $builder, array $attributes): Builder
+    {
+        if (in_array('spent_time', $attributes, true)) {
+            $builder->withAggregate('timeEntries as spent_time_computed', DB::raw('extract(epoch from ("end" - start))'), 'sum');
+        }
+
+        return $builder;
+    }
+
+    /**
+     * This scope will be applied during the computed property validation with artisan computed-attributes:validate.
+     *
+     * @param  Builder<Task>  $builder
+     * @param  array<string>  $attributes  Attributes that will be validated.
+     * @return Builder<Task>
+     */
+    public function scopeComputedAttributesValidate(Builder $builder, array $attributes): Builder
+    {
+        return $this->scopeComputedAttributesGenerate($builder, $attributes);
+    }
+
     /**
      * @return BelongsTo<Project, Task>
      */

app/Models/TimeEntry.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use App\Service\BillableRateService;
 use Carbon\CarbonInterval;
@@ -12,9 +13,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\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Carbon;
 use Korridor\LaravelComputedAttributes\ComputedAttributes;
-use OwenIt\Auditing\Auditable;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
@@ -47,9 +48,12 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class TimeEntry extends Model implements AuditableContract
 {
-    use Auditable;
     use ComputedAttributes;
+    use CustomAuditable;
+
+    /** @use HasFactory<TimeEntryFactory> */
     use HasFactory;
+
     use HasUuids;
 
     /**
@@ -76,6 +80,16 @@ class TimeEntry extends Model implements AuditableContract
      */
     protected array $computed = [
         'billable_rate',
+        'client_id',
+    ];
+
+    /**
+     * Attributes to exclude from the Audit.
+     *
+     * @var array<string>
+     */
+    protected array $auditExclude = [
+        'billable_rate',
     ];
 
     public function getBillableRateComputed(): ?int
@@ -83,6 +97,44 @@ class TimeEntry extends Model implements AuditableContract
         return app(BillableRateService::class)->getBillableRateForTimeEntry($this);
     }
 
+    public function getClientIdComputed(): ?string
+    {
+        return $this->project_id === null ? null : $this->project->client_id;
+    }
+
+    /**
+     * This scope will be applied during the computed property generation with artisan computed-attributes:generate.
+     *
+     * @param  Builder<TimeEntry>  $builder
+     * @param  array<string>  $attributes  Attributes that will be generated.
+     * @return Builder<TimeEntry>
+     */
+    public function scopeComputedAttributesGenerate(Builder $builder, array $attributes): Builder
+    {
+        if (in_array('client_id', $attributes, true)) {
+            $builder->with([
+                'project' => function (Relation $builder): void {
+                    /** @var Builder<Project> $builder */
+                    $builder->select('id', 'client_id');
+                },
+            ]);
+        }
+
+        return $builder;
+    }
+
+    /**
+     * This scope will be applied during the computed property validation with artisan computed-attributes:validate.
+     *
+     * @param  Builder<TimeEntry>  $builder
+     * @param  array<string>  $attributes  Attributes that will be validated.
+     * @return Builder<TimeEntry>
+     */
+    public function scopeComputedAttributesValidate(Builder $builder, array $attributes): Builder
+    {
+        return $this->scopeComputedAttributesGenerate($builder, $attributes);
+    }
+
     public function getDuration(): ?CarbonInterval
     {
         return $this->end === null ? null : $this->start->diffAsCarbonInterval($this->end);

app/Models/User.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Models;
 
 use App\Enums\Weekday;
+use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\UserFactory;
 use Filament\Models\Contracts\FilamentUser;
@@ -25,7 +26,6 @@ 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;
 
 /**
@@ -57,9 +57,12 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class User extends Authenticatable implements AuditableContract, FilamentUser, MustVerifyEmail
 {
-    use Auditable;
+    use CustomAuditable;
     use HasApiTokens;
+
+    /** @use HasFactory<UserFactory> */
     use HasFactory;
+
     use HasProfilePhoto;
     use HasTeams;
     use HasUuids;

app/Providers/AppServiceProvider.php

@@ -28,7 +28,6 @@ use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Foundation\Application;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\ServiceProvider;
@@ -81,23 +80,23 @@ class AppServiceProvider extends ServiceProvider
         });
 
         // Scramble
-        Scramble::extendOpenApi(function (OpenApi $openApi) {
+        Scramble::extendOpenApi(function (OpenApi $openApi): void {
             $openApi->secure(
                 SecurityScheme::oauth2()
-                    ->flow('authorizationCode', function (OAuthFlow $flow) {
+                    ->flow('authorizationCode', function (OAuthFlow $flow): void {
                         $flow
                             ->authorizationUrl('https://solidtime.test/oauth/authorize');
                     })
             );
         });
 
-        if (config('app.force_https', false) || App::isProduction()) {
+        if (config('app.force_https', false)) {
             URL::forceScheme('https');
-            request()->server->set('HTTPS', request()->header('X-Forwarded-Proto', 'https') === 'https' ? 'on' : 'off');
+            request()->server->set('HTTPS', 'on');
         }
 
         $this->app->scoped(PermissionStore::class, function (Application $app): PermissionStore {
-            return new PermissionStore();
+            return new PermissionStore;
         });
 
         // Extensions

app/Providers/Filament/AdminPanelProvider.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Providers\Filament;
 
 use App\Filament\Widgets\ActiveUserOverview;
+use App\Filament\Widgets\ServerOverview;
 use App\Filament\Widgets\TimeEntriesCreated;
 use App\Filament\Widgets\TimeEntriesImported;
 use App\Filament\Widgets\UserRegistrations;
@@ -44,11 +45,13 @@ class AdminPanelProvider extends PanelProvider
             ])
             ->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
             ->widgets([
+                ServerOverview::class,
                 ActiveUserOverview::class,
                 UserRegistrations::class,
                 TimeEntriesCreated::class,
                 TimeEntriesImported::class,
             ])
+            ->viteTheme('resources/css/filament/admin/theme.css')
             ->plugins([
                 EnvironmentIndicatorPlugin::make()
                     ->color(fn () => match (App::environment()) {

app/Providers/FortifyServiceProvider.php

@@ -65,7 +65,7 @@ class FortifyServiceProvider extends ServiceProvider
             return Limit::perMinute(5)->by($request->session()->get('login.id'));
         });
 
-        $this->app->instance(LoginResponse::class, new CustomLoginResponse());
-        $this->app->instance(TwoFactorLoginResponse::class, new CustomTwoFactorLoginResponse());
+        $this->app->instance(LoginResponse::class, new CustomLoginResponse);
+        $this->app->instance(TwoFactorLoginResponse::class, new CustomTwoFactorLoginResponse);
     }
 }

app/Providers/JetstreamServiceProvider.php

@@ -122,8 +122,10 @@ class JetstreamServiceProvider extends ServiceProvider
             'members:view',
             'members:invite-placeholder',
             'members:change-ownership',
+            'members:make-placeholder',
             'members:update',
             'members:delete',
+            'billing',
         ])->description('Owner users can perform any action. There is only one owner per organization.');
 
         Jetstream::role(Role::Admin->value, 'Administrator', [

app/Providers/RouteServiceProvider.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Providers;
 
+use App\Http\Controllers\Web\HealthCheckController;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Http\Request;
@@ -36,7 +37,13 @@ class RouteServiceProvider extends ServiceProvider
                 : Limit::perMinute(60)->by($request->ip());
         });
 
-        $this->routes(function () {
+        $this->routes(function (): void {
+            Route::middleware('health-check')
+                ->group(function (): void {
+                    Route::get('health-check/up', [HealthCheckController::class, 'up']);
+                    Route::get('health-check/debug', [HealthCheckController::class, 'debug']);
+                });
+
             Route::middleware('api')
                 ->prefix('api')
                 ->name('api.')

app/Service/ApiService.php

@@ -0,0 +1,93 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Models\Audit;
+use App\Models\Client;
+use App\Models\Organization;
+use App\Models\Project;
+use App\Models\ProjectMember;
+use App\Models\Task;
+use App\Models\TimeEntry;
+use App\Models\User;
+use Exception;
+use Illuminate\Support\Facades\Http;
+use Log;
+
+class ApiService
+{
+    private const string API_URL = 'https://app.solidtime.io/api/v1';
+
+    public function checkForUpdate(): ?string
+    {
+        try {
+            $response = Http::asJson()
+                ->timeout(3)
+                ->connectTimeout(2)
+                ->post(self::API_URL.'/ping/version', [
+                    'version' => config('app.version'),
+                    'build' => config('app.build'),
+                    'url' => config('app.url'),
+                ]);
+
+            if ($response->status() === 200 && isset($response->json()['version']) && is_string($response->json()['version'])) {
+                return $response->json()['version'];
+            } else {
+                Log::warning('Failed to check for update', [
+                    'status' => $response->status(),
+                    'body' => $response->body(),
+                ]);
+
+                return null;
+            }
+        } catch (\Throwable $e) {
+            Log::warning('Failed to check for update', [
+                'message' => $e->getMessage(),
+            ]);
+
+            return null;
+        }
+    }
+
+    public function telemetry(): bool
+    {
+        try {
+            $response = Http::asJson()
+                ->timeout(3)
+                ->connectTimeout(2)
+                ->post(self::API_URL.'/ping/telemetry', [
+                    'version' => config('app.version'),
+                    'build' => config('app.build'),
+                    'url' => config('app.url'),
+                    // telemetry data
+                    'user_count' => User::count(),
+                    'organization_count' => Organization::count(),
+                    'audit_count' => Audit::count(),
+                    'project_count' => Project::count(),
+                    'project_member_count' => ProjectMember::count(),
+                    'client_count' => Client::count(),
+                    'task_count' => Task::count(),
+                    'time_entry_count' => TimeEntry::count(),
+                ]);
+
+            if ($response->status() === 200) {
+                return true;
+            } else {
+                Log::warning('Failed send telemetry data', [
+                    'status' => $response->status(),
+                    'body' => $response->body(),
+                ]);
+
+                return false;
+            }
+        } catch (Exception $e) {
+            Log::warning('Failed send telemetry data', [
+                'message' => $e->getMessage(),
+            ]);
+
+            return false;
+        }
+    }
+}

app/Service/BillableRateService.php

@@ -28,9 +28,9 @@ class BillableRateService
             ->where('billable', '=', true)
             ->where('organization_id', '=', $project->organization_id)
             ->whereBelongsTo($project, 'project')
-            ->whereDoesntHave('member', function (Builder $query) use ($project) {
+            ->whereDoesntHave('member', function (Builder $query) use ($project): void {
                 /** @var Builder<Member> $query */
-                $query->whereHas('projectMembers', function (Builder $query) use ($project) {
+                $query->whereHas('projectMembers', function (Builder $query) use ($project): void {
                     /** @var Builder<ProjectMember> $query */
                     $query->whereBelongsTo($project, 'project')
                         ->whereNotNull('billable_rate');
@@ -62,7 +62,7 @@ class BillableRateService
         TimeEntry::query()
             ->where('billable', '=', true)
             ->where('organization_id', '=', $organization->getKey())
-            ->whereDoesntHave('member', function (Builder $builder) {
+            ->whereDoesntHave('member', function (Builder $builder): void {
                 /** @var Builder<Member> $builder */
                 $builder->whereNotNull('billable_rate');
             })