Enhanced description for Clockify imports

.env.ci

@@ -6,12 +6,13 @@ APP_URL=http://localhost
 APP_FORCE_HTTPS=false
 SESSION_SECURE_COOKIE=false
 
+# Logging
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
+# Database
 DB_CONNECTION=pgsql_test
-
 DB_TEST_HOST=127.0.0.1
 DB_TEST_PORT=5432
 DB_TEST_DATABASE=laravel
@@ -20,26 +21,21 @@ DB_TEST_PASSWORD=root
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-FILESYSTEM_DISK=local
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
-MEMCACHED_HOST=127.0.0.1
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
+# Mail
 MAIL_MAILER=log
 MAIL_FROM_ADDRESS="hello@example.com"
 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
+# Filesystems
+FILESYSTEM_DISK=local
+PUBLIC_FILESYSTEM_DISK=public
+
+# Services
+GOTENBERG_URL=http://0.0.0.0:3000
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=

.env.example

@@ -4,15 +4,15 @@ APP_KEY=base64:UNQNf1SXeASNkWux01Rj8EnHYx8FO0kAxWNDwktclkk=
 APP_DEBUG=true
 APP_URL=https://solidtime.test
 AUDITING_ENABLED=true
-
 SUPER_ADMINS=admin@example.com
 
+# Logging
 LOG_CHANNEL=single
 LOG_DEPRECATIONS_CHANNEL=deprecation
 LOG_LEVEL=debug
 
+# Database
 DB_CONNECTION=pgsql
-
 DB_HOST=pgsql
 DB_PORT=5432
 DB_DATABASE=laravel
@@ -31,12 +31,7 @@ QUEUE_CONNECTION=sync
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
-MEMCACHED_HOST=127.0.0.1
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
+# Mail
 MAIL_MAILER=smtp
 MAIL_HOST=mailpit
 MAIL_PORT=1025
@@ -54,7 +49,7 @@ PUSHER_PORT=443
 PUSHER_SCHEME=https
 PUSHER_APP_CLUSTER=mt1
 
-# Storage
+# Filesystems
 FILESYSTEM_DISK=s3
 PUBLIC_FILESYSTEM_DISK=s3
 S3_ACCESS_KEY_ID=sail
@@ -65,6 +60,9 @@ S3_URL=http://storage.solidtime.test/local
 S3_ENDPOINT=http://storage.solidtime.test
 S3_USE_PATH_STYLE_ENDPOINT=true
 
+# Services
+GOTENBERG_URL=http://gotenberg:3000
+
 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/FUNDING.yml

@@ -0,0 +1 @@
+github: solidtime-io

.github/workflows/build-private.yml

@@ -20,15 +20,55 @@ jobs:
     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:

.github/workflows/build-public-release.yml

@@ -1,90 +0,0 @@
-on:
-  push:
-    tags:
-      - '*'
-  pull_request:
-    paths:
-      - '.github/workflows/build-public.yml'
-      - 'docker/prod/**'
-  workflow_dispatch:
-
-name: Build - Public (Release)
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
-    timeout-minutes: 90
-
-    steps:
-      - name: "Check out code"
-        uses: actions/checkout@v4
-
-      - name: "Copy .env template for production"
-        run: cp .env.production .env
-
-      - name: "Install dependencies"
-        uses: php-actions/composer@v6
-        if: steps.cache-vendor.outputs.cache-hit != 'true' # Skip if cache hit
-        with:
-          command: install
-          only_args: --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
-          php_version: 8.3
-
-      - name: "Use Node.js"
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20.x'
-
-      - name: "Install npm dependencies"
-        run: npm ci
-
-      - name: "Build"
-        run: npm run build
-
-      - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v3
-        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
-            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
-
-      - name: "Build and push"
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/prod/Dockerfile
-          build-args: |
-            DOCKER_FILES_BASE_PATH=docker/prod/
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.github/workflows/build-public.yml

@@ -3,6 +3,8 @@ on:
     branches:
       - main
       - develop
+    tags:
+      - '*'
   pull_request:
     paths:
       - '.github/workflows/build-public.yml'
@@ -23,9 +25,49 @@ jobs:
     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

.github/workflows/phpunit.yml

@@ -20,7 +20,15 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-
+      gotenberg:
+        image: gotenberg/gotenberg:8
+        ports:
+          - 3000:3000
+        options: >-
+          --health-cmd "curl --silent --fail http://localhost:3000/health"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v4

README.md

@@ -13,7 +13,7 @@ solidtime is a modern open-source time tracking application for Freelancers and
 
  - Time tracking: Track your time with a modern and easy-to-use interface
  - Projects: Create and manage projects and assign project members
- - Tasks: Create and manage tasks and assign tasks to project members
+ - Tasks: Create and manage tasks and assign tasks to projects
  - Clients: Create and manage clients and assign clients to projects
  - Billable rates: Set billable rates for projects, project members, organization members and organizations 
  - Multiple organizations: Create and manage multiple organizations with one account
@@ -28,6 +28,11 @@ We also have an examples repository [here](https://github.com/solidtime-io/self-
 
 If you do not want to self-host solidtime or try it out you can sign up for [solidtime cloud](https://www.solidtime.io/)
 
+## Issues & Feature Requests
+
+If you find any **bugs in solidtime**, please feel free to [**open an issue**](https://github.com/solidtime-io/solidtime/issues/new) in this repository, with instructions on how to reproduce the bug. 
+If you have a **feature request**, please [**create a discussion**](https://github.com/solidtime-io/solidtime/discussions/new?category=feature-requests) in this repository.
+
 ## Contributing
 
 This project is in a very early stage. The structure and APIs are still subject to change and not stable. 
@@ -35,6 +40,8 @@ Therefore, we do not currently accept any contributions, unless you are a member
 
 As soon as we feel comfortable enough that the application structure is stable enough, we will open up the project for contributions.
 
+We do accept contributions in the [documentation repository](https://github.com/solidtime-io/docs) f.e. to add new self-hosting guides.
+
 ## Security
 
 Looking to report a vulnerability? Please refer our [SECURITY.md](./SECURITY.md) file.

app/Actions/Fortify/CreateNewUser.php

@@ -43,9 +43,9 @@ class CreateNewUser implements CreatesNewUsers
             'email' => [
                 'required',
                 'string',
-                'email',
+                'email:rfc,strict',
                 '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);
                 }),
@@ -82,7 +82,7 @@ class CreateNewUser implements CreatesNewUsers
         }
         $user = null;
         $organization = null;
-        DB::transaction(function () use (&$user, &$organization, $input, $timezone, $startOfWeek, $currency) {
+        DB::transaction(function () use (&$user, &$organization, $input, $timezone, $startOfWeek, $currency): void {
             $user = User::create([
                 'name' => $input['name'],
                 'email' => $input['email'],

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,10 +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',
@@ -93,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/Console/Commands/Report/ReportSetExpiredToPrivateCommand.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands\Report;
+
+use App\Models\Report;
+use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Carbon;
+use LogicException;
+
+class ReportSetExpiredToPrivateCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'report:set-expired-to-private '.
+        ' { --dry-run : Do not actually save anything to the database, just output what would happen }';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Makes public reports private if the public_until date has passed.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $this->comment('Makes public reports private if the public_until date has passed...');
+        $dryRun = (bool) $this->option('dry-run');
+        if ($dryRun) {
+            $this->comment('Running in dry-run mode. Nothing will be saved to the database.');
+        }
+
+        $resetReports = 0;
+        Report::query()
+            ->where('public_until', '<', Carbon::now())
+            ->orderBy('created_at', 'asc')
+            ->chunk(500, function (Collection $reports) use ($dryRun, &$resetReports): void {
+                /** @var Collection<int, Report> $reports */
+                foreach ($reports as $report) {
+                    $publicUntil = $report->public_until;
+                    if ($publicUntil === null) {
+                        throw new LogicException('public_until should not be null');
+                    }
+                    $this->info('Make report "'.$report->name.'" ('.$report->getKey().') private, expired: '.
+                        $publicUntil->toIso8601ZuluString().' ('.$publicUntil->diffForHumans().')');
+                    $resetReports++;
+                    if (! $dryRun) {
+                        $report->is_public = false;
+                        $report->share_secret = null;
+                        $report->save();
+                    }
+                }
+            });
+
+        $this->comment('Finished setting '.$resetReports.' expired reports to private...');
+
+        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/SelfHostGenerateKeysCommand.php

@@ -18,6 +18,7 @@ class SelfHostGenerateKeysCommand extends Command
      */
     protected $signature = 'self-host:generate-keys
                 { --length=4096 : The length of the passport private key }
+                { --multi-line : Whether to output the keys in multiple lines }
                 { --format=env : The format of the output (env, yaml) }';
 
     /**
@@ -34,6 +35,7 @@ class SelfHostGenerateKeysCommand extends Command
     {
         $format = $this->option('format');
         $key = RSA::createKey((int) $this->option('length'));
+        $multiLine = (bool) $this->option('multi-line');
 
         $publicKey = (string) $key->getPublicKey();
         $privateKey = (string) $key;
@@ -41,12 +43,17 @@ class SelfHostGenerateKeysCommand extends Command
 
         if ($format === 'env') {
             $this->line('APP_KEY="'.$appKey.'"');
-            $this->line('PASSPORT_PRIVATE_KEY="'.$privateKey.'"');
-            $this->line('PASSPORT_PUBLIC_KEY="'.$publicKey.'"');
+            if ($multiLine) {
+                $this->line('PASSPORT_PRIVATE_KEY="'.Str::replace("\r\n", "\n", $privateKey).'"');
+                $this->line('PASSPORT_PUBLIC_KEY="'.Str::replace("\r\n", "\n", $publicKey).'"');
+            } else {
+                $this->line('PASSPORT_PRIVATE_KEY="'.Str::replace("\r\n", '\n', $privateKey).'"');
+                $this->line('PASSPORT_PUBLIC_KEY="'.Str::replace("\r\n", '\n', $publicKey).'"');
+            }
         } elseif ($format === 'yaml') {
             $this->line('APP_KEY: "'.$appKey.'"');
-            $this->line("PASSPORT_PRIVATE_KEY: |\n  ".Str::replace("\n", "\n  ", $privateKey));
-            $this->line("PASSPORT_PUBLIC_KEY: |\n  ".Str::replace("\n", "\n  ", $publicKey));
+            $this->line("PASSPORT_PRIVATE_KEY: |\n  ".Str::replace("\r\n", "\n  ", $privateKey));
+            $this->line("PASSPORT_PUBLIC_KEY: |\n  ".Str::replace("\r\n", "\n  ", $publicKey));
         } else {
             $this->error('Invalid format');
 

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

@@ -54,7 +54,7 @@ class TimeEntrySendStillRunningMailsCommand extends Command
                 $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/ExportFormat.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enums;
+
+use Maatwebsite\Excel\Excel;
+
+enum ExportFormat: string
+{
+    case CSV = 'csv';
+    case PDF = 'pdf';
+    case XLSX = 'xlsx';
+    case ODS = 'ods';
+
+    public function getFileExtension(): string
+    {
+        return match ($this) {
+            self::CSV => 'csv',
+            self::PDF => 'pdf',
+            self::XLSX => 'xlsx',
+            self::ODS => 'ods',
+        };
+    }
+
+    public function getExportPackageType(): string
+    {
+        return match ($this) {
+            self::CSV => Excel::CSV,
+            self::PDF => Excel::MPDF,
+            self::XLSX => Excel::XLSX,
+            self::ODS => Excel::ODS,
+        };
+    }
+}

app/Enums/TimeEntryAggregationType.php

@@ -4,8 +4,12 @@ declare(strict_types=1);
 
 namespace App\Enums;
 
+use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
+
 enum TimeEntryAggregationType: string
 {
+    use LaravelEnumHelper;
+
     case Day = 'day';
     case Week = 'week';
     case Month = 'month';
@@ -17,6 +21,16 @@ enum TimeEntryAggregationType: string
     case Billable = 'billable';
     case Description = 'description';
 
+    public static function fromInterval(TimeEntryAggregationTypeInterval $timeEntryAggregationTypeInterval): TimeEntryAggregationType
+    {
+        return match ($timeEntryAggregationTypeInterval) {
+            TimeEntryAggregationTypeInterval::Day => TimeEntryAggregationType::Day,
+            TimeEntryAggregationTypeInterval::Week => TimeEntryAggregationType::Week,
+            TimeEntryAggregationTypeInterval::Month => TimeEntryAggregationType::Month,
+            TimeEntryAggregationTypeInterval::Year => TimeEntryAggregationType::Year,
+        };
+    }
+
     public function toInterval(): ?TimeEntryAggregationTypeInterval
     {
         return match ($this) {

app/Enums/Weekday.php

@@ -4,10 +4,13 @@ declare(strict_types=1);
 
 namespace App\Enums;
 
+use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
 use Illuminate\Support\Carbon;
 
 enum Weekday: string
 {
+    use LaravelEnumHelper;
+
     case Monday = 'monday';
     case Tuesday = 'tuesday';
     case Wednesday = 'wednesday';

app/Exceptions/Api/FeatureIsNotAvailableInFreePlanApiException.php

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

app/Exceptions/Api/PdfRendererIsNotConfiguredException.php

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

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/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/Widgets/ActiveUserOverview.php

@@ -14,7 +14,7 @@ class ActiveUserOverview extends BaseWidget
 {
     protected static ?int $sort = 1;
 
-    protected static ?string $heading = 'A Registrations';
+    protected ?string $heading = 'A Registrations';
 
     protected function getCards(): array
     {

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/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;
 
@@ -43,4 +44,9 @@ class Controller extends \App\Http\Controllers\Controller
     {
         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/MemberController.php

@@ -131,6 +131,8 @@ class MemberController extends Controller
     }
 
     /**
+     * Make a member a placeholder member
+     *
      * @throws AuthorizationException|CanNotRemoveOwnerFromOrganization
      */
     public function makePlaceholder(Organization $organization, Member $member, MemberService $memberService): JsonResponse

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);
     }
 
     /**
@@ -95,10 +102,14 @@ class ProjectController extends Controller
         $project->is_billable = (bool) $request->input('is_billable');
         $project->billable_rate = $request->getBillableRate();
         $project->client_id = $request->input('client_id');
+        $project->is_public = $request->getIsPublic();
+        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 +128,32 @@ class ProjectController extends Controller
         if ($request->has('is_archived')) {
             $project->archived_at = $request->getIsArchived() ? Carbon::now() : null;
         }
+        if ($request->has('is_public')) {
+            $project->is_public = $request->boolean('is_public');
+        }
+        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 +174,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/Public/ReportController.php

@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1\Public;
+
+use App\Enums\TimeEntryAggregationType;
+use App\Http\Controllers\Api\V1\Controller;
+use App\Http\Resources\V1\Report\DetailedWithDataReportResource;
+use App\Models\Report;
+use App\Models\TimeEntry;
+use App\Service\Dto\ReportPropertiesDto;
+use App\Service\TimeEntryAggregationService;
+use App\Service\TimeEntryFilter;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Http\Request;
+
+class ReportController extends Controller
+{
+    /**
+     * Get report by a share secret
+     *
+     * This endpoint is public and does not require authentication. The report must be public and not expired.
+     * The report is considered expired if the `public_until` field is set and the date is in the past.
+     * The report is considered public if the `is_public` field is set to `true`.
+     *
+     * @operationId getPublicReport
+     */
+    public function show(Request $request, TimeEntryAggregationService $timeEntryAggregationService): DetailedWithDataReportResource
+    {
+        $shareSecret = $request->header('X-Api-Key');
+        if (! is_string($shareSecret)) {
+            throw new ModelNotFoundException;
+        }
+
+        $report = Report::query()
+            ->with([
+                'organization',
+            ])
+            ->where('share_secret', '=', $shareSecret)
+            ->where('is_public', '=', true)
+            ->where(function (Builder $builder): void {
+                /** @var Builder<Report> $builder */
+                $builder->whereNull('public_until')
+                    ->orWhere('public_until', '>', now());
+            })
+            ->firstOrFail();
+        /** @var ReportPropertiesDto $properties */
+        $properties = $report->properties;
+
+        $timeEntriesQuery = TimeEntry::query()
+            ->whereBelongsTo($report->organization, 'organization');
+
+        $filter = new TimeEntryFilter($timeEntriesQuery);
+        $filter->addStart($properties->start);
+        $filter->addEnd($properties->end);
+        $filter->addActive($properties->active);
+        $filter->addBillable($properties->billable);
+        $filter->addMemberIdsFilter($properties->memberIds?->toArray());
+        $filter->addProjectIdsFilter($properties->projectIds?->toArray());
+        $filter->addTagIdsFilter($properties->tagIds?->toArray());
+        $filter->addTaskIdsFilter($properties->taskIds?->toArray());
+        $filter->addClientIdsFilter($properties->clientIds?->toArray());
+        $timeEntriesQuery = $filter->get();
+
+        $data = $timeEntryAggregationService->getAggregatedTimeEntriesWithDescriptions(
+            $timeEntriesQuery->clone(),
+            $report->properties->group,
+            $report->properties->subGroup,
+            $report->properties->timezone,
+            $report->properties->weekStart,
+            false,
+            $report->properties->start,
+            $report->properties->end,
+        );
+        $historyData = $timeEntryAggregationService->getAggregatedTimeEntriesWithDescriptions(
+            $timeEntriesQuery->clone(),
+            TimeEntryAggregationType::fromInterval($report->properties->historyGroup),
+            null,
+            $report->properties->timezone,
+            $report->properties->weekStart,
+            true,
+            $report->properties->start,
+            $report->properties->end,
+        );
+
+        return new DetailedWithDataReportResource($report, $data, $historyData);
+    }
+}

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

@@ -0,0 +1,172 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Api\V1;
+
+use App\Enums\Weekday;
+use App\Http\Requests\V1\Report\ReportStoreRequest;
+use App\Http\Requests\V1\Report\ReportUpdateRequest;
+use App\Http\Resources\V1\Report\DetailedReportResource;
+use App\Http\Resources\V1\Report\ReportCollection;
+use App\Http\Resources\V1\Report\ReportResource;
+use App\Models\Organization;
+use App\Models\Report;
+use App\Service\Dto\ReportPropertiesDto;
+use App\Service\ReportService;
+use App\Service\TimezoneService;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\JsonResponse;
+
+class ReportController extends Controller
+{
+    /**
+     * @throws AuthorizationException
+     */
+    protected function checkPermission(Organization $organization, string $permission, ?Report $report = null): void
+    {
+        parent::checkPermission($organization, $permission);
+        if ($report !== null && $report->organization_id !== $organization->id) {
+            throw new AuthorizationException('Report does not belong to organization');
+        }
+    }
+
+    /**
+     * Get reports
+     *
+     * @return ReportCollection<ReportResource>
+     *
+     * @throws AuthorizationException
+     *
+     * @operationId getReports
+     */
+    public function index(Organization $organization): ReportCollection
+    {
+        $this->checkPermission($organization, 'reports:view');
+
+        $reports = Report::query()
+            ->orderBy('created_at', 'desc')
+            ->whereBelongsTo($organization, 'organization')
+            ->paginate(config('app.pagination_per_page_default'));
+
+        return new ReportCollection($reports);
+    }
+
+    /**
+     * Get report
+     *
+     * @throws AuthorizationException
+     *
+     * @operationId getReport
+     */
+    public function show(Organization $organization, Report $report): DetailedReportResource
+    {
+        $this->checkPermission($organization, 'reports:view', $report);
+
+        return new DetailedReportResource($report);
+    }
+
+    /**
+     * Create report
+     *
+     * @throws AuthorizationException
+     *
+     * @operationId createReport
+     */
+    public function store(Organization $organization, ReportStoreRequest $request, TimezoneService $timezoneService, ReportService $reportService): DetailedReportResource
+    {
+        $this->checkPermission($organization, 'reports:create');
+        $user = $this->user();
+
+        $report = new Report;
+        $report->name = $request->getName();
+        $report->description = $request->getDescription();
+        $isPublic = $request->getIsPublic();
+        $report->is_public = $isPublic;
+        $properties = new ReportPropertiesDto;
+        $properties->group = $request->getPropertyGroup();
+        $properties->subGroup = $request->getPropertySubGroup();
+        $properties->historyGroup = $request->getPropertyHistoryGroup();
+        $properties->start = $request->getPropertyStart();
+        $properties->end = $request->getPropertyEnd();
+        $properties->active = $request->getPropertyActive();
+        $properties->setMemberIds($request->input('properties.member_ids', null));
+        $properties->billable = $request->getPropertyBillable();
+        $properties->setClientIds($request->input('properties.client_ids', null));
+        $properties->setProjectIds($request->input('properties.project_ids', null));
+        $properties->setTagIds($request->input('properties.tag_ids', null));
+        $properties->setTaskIds($request->input('properties.task_ids', null));
+        $properties->weekStart = $request->has('properties.week_start') ? Weekday::from($request->input('properties.week_start')) : $user->week_start;
+        $timezone = $user->timezone;
+        if ($request->has('properties.timezone')) {
+            if ($timezoneService->isValid($request->input('properties.timezone'))) {
+                $timezone = $request->input('properties.timezone');
+            }
+            if ($timezoneService->mapLegacyTimezone($request->input('properties.timezone')) !== null) {
+                $timezone = $timezoneService->mapLegacyTimezone($request->input('properties.timezone'));
+            }
+        }
+        $properties->timezone = $timezone;
+        $report->properties = $properties;
+        if ($isPublic) {
+            $report->share_secret = $reportService->generateSecret();
+            $report->public_until = $request->getPublicUntil();
+        } else {
+            $report->share_secret = null;
+            $report->public_until = null;
+        }
+        $report->organization()->associate($organization);
+        $report->save();
+
+        return new DetailedReportResource($report);
+    }
+
+    /**
+     * Update report
+     *
+     * @throws AuthorizationException
+     *
+     * @operationId updateReport
+     */
+    public function update(Organization $organization, Report $report, ReportUpdateRequest $request, ReportService $reportService): DetailedReportResource
+    {
+        $this->checkPermission($organization, 'reports:update', $report);
+
+        if ($request->has('name')) {
+            $report->name = $request->getName();
+        }
+        if ($request->has('description')) {
+            $report->description = $request->getDescription();
+        }
+        if ($request->has('is_public') && $request->getIsPublic() !== $report->is_public) {
+            $isPublic = $request->getIsPublic();
+            $report->is_public = $isPublic;
+            if ($isPublic) {
+                $report->share_secret = $reportService->generateSecret();
+                $report->public_until = $request->getPublicUntil();
+            } else {
+                $report->share_secret = null;
+                $report->public_until = null;
+            }
+        }
+        $report->save();
+
+        return new DetailedReportResource($report);
+    }
+
+    /**
+     * Delete report
+     *
+     * @throws AuthorizationException
+     *
+     * @operationId deleteReport
+     */
+    public function destroy(Organization $organization, Report $report): JsonResponse
+    {
+        $this->checkPermission($organization, 'reports:delete', $report);
+
+        $report->delete();
+
+        return response()->json(null, 204);
+    }
+}

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

@@ -79,6 +79,9 @@ class TaskController extends Controller
         $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

@@ -4,28 +4,51 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Enums\ExportFormat;
+use App\Exceptions\Api\FeatureIsNotAvailableInFreePlanApiException;
+use App\Exceptions\Api\PdfRendererIsNotConfiguredException;
 use App\Exceptions\Api\TimeEntryCanNotBeRestartedApiException;
 use App\Exceptions\Api\TimeEntryStillRunningApiException;
+use App\Http\Requests\V1\TimeEntry\TimeEntryAggregateExportRequest;
 use App\Http\Requests\V1\TimeEntry\TimeEntryAggregateRequest;
+use App\Http\Requests\V1\TimeEntry\TimeEntryDestroyMultipleRequest;
+use App\Http\Requests\V1\TimeEntry\TimeEntryIndexExportRequest;
 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\ReportExport\TimeEntriesDetailedCsvExport;
+use App\Service\ReportExport\TimeEntriesDetailedExport;
+use App\Service\ReportExport\TimeEntriesReportExport;
 use App\Service\TimeEntryAggregationService;
 use App\Service\TimeEntryFilter;
 use App\Service\TimezoneService;
+use Gotenberg\Exceptions\GotenbergApiErrored;
+use Gotenberg\Exceptions\NoOutputFileInResponse;
+use Gotenberg\Gotenberg;
+use Gotenberg\Stream;
+use GuzzleHttp\Client;
 use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\File;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use Maatwebsite\Excel\Facades\Excel;
+use Spatie\TemporaryDirectory\TemporaryDirectory;
 
 class TimeEntryController extends Controller
 {
@@ -38,11 +61,13 @@ class TimeEntryController extends Controller
     }
 
     /**
-     * Get all time entries in organization
+     * Get time entries in organization
      *
      * 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
@@ -57,27 +82,16 @@ class TimeEntryController extends Controller
             $this->checkPermission($organization, 'time-entries:view:all');
         }
 
-        $timeEntriesQuery = TimeEntry::query()
-            ->whereBelongsTo($organization, 'organization')
-            ->orderBy('start', 'desc');
+        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member);
 
-        $filter = new TimeEntryFilter($timeEntriesQuery);
-        $filter->addStartFilter($request->input('start'));
-        $filter->addEndFilter($request->input('end'));
-        $filter->addActiveFilter($request->input('active'));
-        $filter->addMemberIdFilter($member);
-        $filter->addMemberIdsFilter($request->input('member_ids'));
-        $filter->addProjectIdsFilter($request->input('project_ids'));
-        $filter->addTagIdsFilter($request->input('tag_ids'));
-        $filter->addTaskIdsFilter($request->input('task_ids'));
-        $filter->addClientIdsFilter($request->input('client_ids'));
-        $filter->addBillableFilter($request->input('billable'));
+        $totalCount = $timeEntriesQuery->count();
 
-        $limit = $request->has('limit') ? (int) $request->input('limit', 100) : 100;
+        $limit = $request->getLimit();
         if ($limit > 1000) {
             $limit = 1000;
         }
         $timeEntriesQuery->limit($limit);
+        $timeEntriesQuery->skip($request->getOffset());
 
         $timeEntries = $timeEntriesQuery->get();
 
@@ -111,7 +125,149 @@ class TimeEntryController extends Controller
             }
         }
 
-        return new TimeEntryCollection($timeEntries);
+        return (new TimeEntryCollection($timeEntries))
+            ->additional([
+                'meta' => [
+                    'total' => $totalCount,
+                ],
+            ]);
+    }
+
+    /**
+     * @return Builder<TimeEntry>
+     */
+    private function getTimeEntriesQuery(Organization $organization, TimeEntryIndexRequest|TimeEntryIndexExportRequest $request, ?Member $member): Builder
+    {
+        $timeEntriesQuery = TimeEntry::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->orderBy('start', 'desc');
+
+        $filter = new TimeEntryFilter($timeEntriesQuery);
+        $filter->addStartFilter($request->input('start'));
+        $filter->addEndFilter($request->input('end'));
+        $filter->addActiveFilter($request->input('active'));
+        $filter->addMemberIdFilter($member);
+        $filter->addMemberIdsFilter($request->input('member_ids'));
+        $filter->addProjectIdsFilter($request->input('project_ids'));
+        $filter->addTagIdsFilter($request->input('tag_ids'));
+        $filter->addTaskIdsFilter($request->input('task_ids'));
+        $filter->addClientIdsFilter($request->input('client_ids'));
+        $filter->addBillableFilter($request->input('billable'));
+
+        return $filter->get();
+    }
+
+    /**
+     * Export time entries in organization
+     *
+     * @throws AuthorizationException|PdfRendererIsNotConfiguredException|FeatureIsNotAvailableInFreePlanApiException
+     *
+     * @operationId exportTimeEntries
+     */
+    public function indexExport(Organization $organization, TimeEntryIndexExportRequest $request, TimeEntryAggregationService $timeEntryAggregationService): JsonResponse
+    {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
+            $this->checkPermission($organization, 'time-entries:view:own');
+        } else {
+            $this->checkPermission($organization, 'time-entries:view:all');
+        }
+        $debug = $request->getDebug();
+        $format = $request->getFormatValue();
+        if ($format === ExportFormat::PDF && ! $this->canAccessPremiumFeatures($organization)) {
+            throw new FeatureIsNotAvailableInFreePlanApiException;
+        }
+        $user = $this->user();
+        $timezone = $user->timezone;
+
+        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member);
+        $timeEntriesQuery->with([
+            'task',
+            'client',
+            'project',
+            'user',
+            'tagsRelation',
+        ]);
+        $filename = 'time-entries-export-'.now()->format('Y-m-d_H-i-s').'.'.$format->getFileExtension();
+        $folderPath = 'exports';
+        $path = $folderPath.'/'.$filename;
+        if ($format === ExportFormat::CSV) {
+            $export = new TimeEntriesDetailedCsvExport(config('filesystems.private'), $folderPath, $filename, $timeEntriesQuery, 1000, $timezone);
+            $export->export();
+        } elseif ($format === ExportFormat::PDF) {
+            if (config('services.gotenberg.url') === null && ! $debug) {
+                throw new PdfRendererIsNotConfiguredException;
+            }
+            $viewFile = file_get_contents(resource_path('views/reports/time-entry-index/pdf.blade.php'));
+            if ($viewFile === false) {
+                throw new \LogicException('View file not found');
+            }
+            $aggregatedData = $timeEntryAggregationService->getAggregatedTimeEntries(
+                $timeEntriesQuery->clone()->reorder()->withOnly([]),
+                null,
+                null,
+                $user->timezone,
+                $user->week_start,
+                false,
+                null,
+                null
+            );
+            $html = Blade::render($viewFile, [
+                'timeEntries' => $timeEntriesQuery->get(),
+                'aggregatedData' => $aggregatedData,
+                'timezone' => $timezone,
+                'currency' => $organization->currency,
+                'start' => $request->getStart()->timezone($timezone),
+                'end' => $request->getEnd()->timezone($timezone),
+            ]);
+            $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-index/pdf-footer.blade.php'));
+            if ($footerViewFile === false) {
+                throw new \LogicException('View file not found');
+            }
+            $footerHtml = Blade::render($footerViewFile);
+            if ($debug) {
+                return response()->json([
+                    'html' => $html,
+                    'footer_html' => $footerHtml,
+                ]);
+            }
+
+            $client = new Client([
+                'auth' => config('services.gotenberg.basic_auth_username') !== null && config('services.gotenberg.basic_auth_password') !== null ? [
+                    config('services.gotenberg.basic_auth_username'),
+                    config('services.gotenberg.basic_auth_password'),
+                ] : null,
+            ]);
+            $request = Gotenberg::chromium(config('services.gotenberg.url'))
+                ->pdf()
+                ->assets(
+                    Stream::path(resource_path('pdf/Outfit-VariableFont_wght.ttf'), 'outfit.ttf'),
+                )
+                ->margins(0.39, 0.78, 0.39, 0.39)
+                ->paperSize('8.27', '11.7') // A4
+                ->footer(Stream::string('footer', $footerHtml))
+                ->html(Stream::string('body', $html));
+            $tempFolder = TemporaryDirectory::make();
+            $filenameTemp = Gotenberg::save($request, $tempFolder->path(), $client);
+            Storage::disk(config('filesystems.private'))
+                ->putFileAs($folderPath, new File($tempFolder->path($filenameTemp)), $filename);
+        } else {
+            Excel::store(
+                new TimeEntriesDetailedExport($timeEntriesQuery, $format, $timezone),
+                $path,
+                config('filesystems.private'),
+                $format->getExportPackageType(),
+                [
+                    'visibility' => 'private',
+                ]
+            );
+        }
+
+        return response()->json([
+            'download_url' => Storage::disk(config('filesystems.private'))
+                ->temporaryUrl($path, now()->addMinutes(5)),
+        ]);
     }
 
     /**
@@ -146,7 +302,7 @@ class TimeEntryController extends Controller
      *
      * @throws AuthorizationException
      */
-    public function aggregate(Organization $organization, TimeEntryAggregateRequest $request, TimeEntryAggregationService $aggregationService): array
+    public function aggregate(Organization $organization, TimeEntryAggregateRequest $request, TimeEntryAggregationService $timeEntryAggregationService): array
     {
         /** @var Member|null $member */
         $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
@@ -155,7 +311,158 @@ class TimeEntryController extends Controller
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
         }
+        $user = $this->user();
 
+        $group1Type = $request->getGroup();
+        $group2Type = $request->getSubGroup();
+        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
+
+        $aggregatedData = $timeEntryAggregationService->getAggregatedTimeEntries(
+            $timeEntriesAggregateQuery,
+            $group1Type,
+            $group2Type,
+            $user->timezone,
+            $user->week_start,
+            $request->getFillGapsInTimeGroups(),
+            $request->getStart(),
+            $request->getEnd()
+        );
+
+        return [
+            'data' => $aggregatedData,
+        ];
+    }
+
+    /**
+     * Export aggregated time entries in organization
+     *
+     * @operationId exportAggregatedTimeEntries
+     *
+     * @throws AuthorizationException
+     * @throws PdfRendererIsNotConfiguredException
+     * @throws GotenbergApiErrored
+     * @throws NoOutputFileInResponse
+     * @throws FeatureIsNotAvailableInFreePlanApiException
+     */
+    public function aggregateExport(Organization $organization, TimeEntryAggregateExportRequest $request, TimeEntryAggregationService $timeEntryAggregationService): JsonResponse
+    {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
+            $this->checkPermission($organization, 'time-entries:view:own');
+        } else {
+            $this->checkPermission($organization, 'time-entries:view:all');
+        }
+        $format = $request->getFormatValue();
+        if ($format === ExportFormat::PDF && ! $this->canAccessPremiumFeatures($organization)) {
+            throw new FeatureIsNotAvailableInFreePlanApiException;
+        }
+        $debug = $request->getDebug();
+        $user = $this->user();
+
+        $group = $request->getGroup();
+        $subGroup = $request->getSubGroup();
+        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
+
+        $aggregatedData = $timeEntryAggregationService->getAggregatedTimeEntriesWithDescriptions(
+            $timeEntriesAggregateQuery->clone(),
+            $group,
+            $subGroup,
+            $user->timezone,
+            $user->week_start,
+            false,
+            $request->getStart(),
+            $request->getEnd()
+        );
+        $dataHistoryChart = $timeEntryAggregationService->getAggregatedTimeEntries(
+            $timeEntriesAggregateQuery->clone(),
+            $request->getHistoryGroup(),
+            null,
+            $user->timezone,
+            $user->week_start,
+            true,
+            $request->getStart(),
+            $request->getEnd()
+        );
+        $currency = $organization->currency;
+        $timezone = app(TimezoneService::class)->getTimezoneFromUser($this->user());
+
+        $filename = 'time-entries-report-'.now()->format('Y-m-d_H-i-s').'.'.$format->getFileExtension();
+        $folderPath = 'exports';
+        $path = $folderPath.'/'.$filename;
+
+        if ($format === ExportFormat::PDF) {
+            if (config('services.gotenberg.url') === null && ! $debug) {
+                throw new PdfRendererIsNotConfiguredException;
+            }
+            $client = new Client([
+                'auth' => config('services.gotenberg.basic_auth_username') !== null && config('services.gotenberg.basic_auth_password') !== null ? [
+                    config('services.gotenberg.basic_auth_username'),
+                    config('services.gotenberg.basic_auth_password'),
+                ] : null,
+            ]);
+            $viewFile = file_get_contents(resource_path('views/reports/time-entry-aggregate/pdf.blade.php'));
+            if ($viewFile === false) {
+                throw new \LogicException('View file not found');
+            }
+            $html = Blade::render($viewFile, [
+                'aggregatedData' => $aggregatedData,
+                'dataHistoryChart' => $dataHistoryChart,
+                'currency' => $currency,
+                'group' => $group,
+                'subGroup' => $subGroup,
+                'start' => $request->getStart()->timezone($timezone),
+                'end' => $request->getEnd()->timezone($timezone),
+                'debug' => $debug,
+            ]);
+            $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-aggregate/pdf-footer.blade.php'));
+            if ($footerViewFile === false) {
+                throw new \LogicException('View file not found');
+            }
+            $footerHtml = Blade::render($footerViewFile);
+            if ($debug) {
+                return response()->json([
+                    'html' => $html,
+                    'footer_html' => $footerHtml,
+                ]);
+            }
+            $request = Gotenberg::chromium(config('services.gotenberg.url'))
+                ->pdf()
+                ->waitForExpression("window.status === 'ready'")
+                ->margins(0.39, 0.78, 0.39, 0.39)
+                ->paperSize('8.27', '11.7') // A4
+                ->footer(Stream::string('footer', $footerHtml))
+                ->assets(Stream::path(resource_path('pdf/echarts.min.js'), 'echarts.min.js'),
+                    Stream::path(resource_path('pdf/Outfit-VariableFont_wght.ttf'), 'outfit.ttf'),
+                )
+                ->html(Stream::string('body', $html));
+            $tempFolder = TemporaryDirectory::make();
+            $filenameTemp = Gotenberg::save($request, $tempFolder->path(), $client);
+            Storage::disk(config('filesystems.private'))
+                ->putFileAs($folderPath, new File($tempFolder->path($filenameTemp)), $filename);
+        } else {
+            Excel::store(
+                new TimeEntriesReportExport($aggregatedData, $format, $currency, $group, $subGroup),
+                $path,
+                config('filesystems.private'),
+                $format->getExportPackageType(),
+                [
+                    'visibility' => 'private',
+                ]
+            );
+        }
+
+        return response()->json([
+            'download_url' => Storage::disk(config('filesystems.private'))
+                ->temporaryUrl($path, now()->addMinutes(5)),
+        ]);
+    }
+
+    /**
+     * @return Builder<TimeEntry>
+     */
+    private function getTimeEntriesAggregateQuery(Organization $organization, TimeEntryAggregateRequest|TimeEntryAggregateExportRequest $request, ?Member $member): Builder
+    {
         $timeEntriesQuery = TimeEntry::query()
             ->whereBelongsTo($organization, 'organization');
 
@@ -170,27 +477,8 @@ class TimeEntryController extends Controller
         $filter->addTaskIdsFilter($request->input('task_ids'));
         $filter->addClientIdsFilter($request->input('client_ids'));
         $filter->addBillableFilter($request->input('billable'));
-        $timeEntriesQuery = $filter->get();
 
-        $user = $this->user();
-
-        $group1Type = $request->getGroup();
-        $group2Type = $request->getSubGroup();
-
-        $aggregatedData = $aggregationService->getAggregatedTimeEntries(
-            $timeEntriesQuery,
-            $group1Type,
-            $group2Type,
-            $user->timezone,
-            $user->week_start,
-            $request->getFillGapsInTimeGroups(),
-            $request->getStart(),
-            $request->getEnd()
-        );
-
-        return [
-            'data' => $aggregatedData,
-        ];
+        return $filter->get();
     }
 
     /**
@@ -215,7 +503,16 @@ class TimeEntryController extends Controller
             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;
+
+        if ($project !== null) {
+            RecalculateSpentTimeForProject::dispatch($project);
+        }
+        if ($task !== null) {
+            RecalculateSpentTimeForTask::dispatch($task);
+        }
 
         $timeEntry = new TimeEntry;
         $timeEntry->fill($request->validated());
@@ -250,16 +547,38 @@ class TimeEntryController extends Controller
             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,22 +598,37 @@ class TimeEntryController extends Controller
 
         $timeEntries = TimeEntry::query()
             ->whereBelongsTo($organization, 'organization')
+            ->with([
+                'project',
+                'task',
+            ])
             ->whereIn('id', $ids)
             ->get();
 
         $changes = $request->validated('changes');
 
+        if ($request->has('changes.description')) {
+            $changes['description'] = $request->input('changes.description') ?? '';
+        }
+
         if (isset($changes['member_id']) && ! $canAccessAll && $this->member($organization)->getKey() !== $changes['member_id']) {
             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;
         }
 
+        $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;
 
@@ -313,12 +647,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 +697,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/Web/HealthCheckController.php

@@ -45,16 +45,34 @@ class HealthCheckController extends Controller
 
         $dbTimezone = DB::select('show timezone;');
 
+        $response = [
+            'ip_address' => $ipAddress,
+            'url' => $request->url(),
+            'path' => $request->path(),
+            'hostname' => $hostname,
+            'timestamp' => Carbon::now()->timestamp,
+            'date_time_utc' => Carbon::now('UTC')->toDateTimeString(),
+            'date_time_app' => Carbon::now()->toDateTimeString(),
+            'timezone' => $dbTimezone[0]->TimeZone,
+            'secure' => $secure,
+            'is_trusted_proxy' => $isTrustedProxy,
+        ];
+
+        if (app()->hasDebugModeEnabled()) {
+            $response['app_debug'] = true;
+            $response['app_url'] = config('app.url');
+            $response['app_env'] = app()->environment();
+            $response['app_timezone'] = config('app.timezone');
+            $response['app_force_https'] = config('app.force_https');
+            $response['trusted_proxies'] = config('trustedproxy.proxies');
+            $headers = $request->headers->all();
+            if (isset($headers['cookie'])) {
+                $headers['cookie'] = '***';
+            }
+            $response['headers'] = $headers;
+        }
+
         return response()
-            ->json([
-                'ip_address' => $ipAddress,
-                'hostname' => $hostname,
-                'timestamp' => Carbon::now()->timestamp,
-                'date_time_utc' => Carbon::now('UTC')->toDateTimeString(),
-                'date_time_app' => Carbon::now()->toDateTimeString(),
-                'timezone' => $dbTimezone[0]->TimeZone,
-                'secure' => $secure,
-                'is_trusted_proxy' => $isTrustedProxy,
-            ]);
+            ->json($response);
     }
 }

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,10 +32,10 @@ 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',
@@ -51,21 +51,46 @@ 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',
+            ],
+            // Whether the project is public
+            'is_public' => [
+                'boolean',
             ],
         ];
     }
 
+    public function getIsPublic(): bool
+    {
+        return $this->has('is_public') && $this->boolean('is_public');
+    }
+
     public function getBillableRate(): ?int
     {
         $input = $this->input('billable_rate');
 
         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,10 +32,10 @@ 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',
@@ -50,17 +50,28 @@ class ProjectUpdateRequest extends FormRequest
             'is_archived' => [
                 'boolean',
             ],
+            'is_public' => [
+                'boolean',
+            ],
             '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 +89,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/Report/ReportStoreRequest.php

@@ -0,0 +1,208 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\Report;
+
+use App\Enums\TimeEntryAggregationType;
+use App\Enums\TimeEntryAggregationTypeInterval;
+use App\Enums\Weekday;
+use App\Models\Organization;
+use Illuminate\Contracts\Validation\Rule as LegacyValidationRule;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Carbon;
+use Illuminate\Validation\Rule;
+
+/**
+ * @property Organization $organization Organization from model binding
+ */
+class ReportStoreRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule|LegacyValidationRule>>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => [
+                'required',
+                'string',
+                'max:255',
+            ],
+            'description' => [
+                'nullable',
+                'string',
+            ],
+            'is_public' => [
+                'required',
+                'boolean',
+            ],
+            // After this date the report will be automatically set to private (is_public=false) (ISO 8601 format, UTC timezone)
+            'public_until' => [
+                'nullable',
+                'date_format:Y-m-d\TH:i:s\Z',
+                'after:now',
+            ],
+            'properties' => [
+                'required',
+                'array',
+            ],
+            'properties.start' => [
+                'required',
+                'date_format:Y-m-d\TH:i:s\Z',
+            ],
+            'properties.end' => [
+                'required',
+                'date_format:Y-m-d\TH:i:s\Z',
+            ],
+            'properties.active' => [
+                'nullable',
+                'boolean',
+            ],
+            'properties.member_ids' => [
+                'nullable',
+                'array',
+            ],
+            'properties.member_ids.*' => [
+                'string',
+                'uuid',
+            ],
+            'properties.billable' => [
+                'nullable',
+                'boolean',
+            ],
+            'properties.client_ids' => [
+                'nullable',
+                'array',
+            ],
+            'properties.client_ids.*' => [
+                'string',
+                'uuid',
+            ],
+            // Filter by project IDs, project IDs are OR combined
+            'properties.project_ids' => [
+                'nullable',
+                'array',
+            ],
+            'properties.project_ids.*' => [
+                'string',
+                'uuid',
+            ],
+            // Filter by tag IDs, tag IDs are OR combined
+            'properties.tag_ids' => [
+                'nullable',
+                'array',
+            ],
+            'properties.tag_ids.*' => [
+                'string',
+                'uuid',
+            ],
+            'properties.task_ids' => [
+                'nullable',
+                'array',
+            ],
+            'properties.task_ids.*' => [
+                'string',
+                'uuid',
+            ],
+            'properties.group' => [
+                'required',
+                Rule::enum(TimeEntryAggregationType::class),
+            ],
+            'properties.sub_group' => [
+                'required',
+                Rule::enum(TimeEntryAggregationType::class),
+            ],
+            'properties.history_group' => [
+                'required',
+                Rule::enum(TimeEntryAggregationTypeInterval::class),
+            ],
+            'properties.week_start' => [
+                'nullable',
+                Rule::enum(Weekday::class),
+            ],
+            'properties.timezone' => [
+                'nullable',
+                'timezone:all',
+            ],
+        ];
+    }
+
+    public function getName(): string
+    {
+        return (string) $this->input('name');
+    }
+
+    public function getDescription(): ?string
+    {
+        return $this->input('description');
+    }
+
+    public function getIsPublic(): bool
+    {
+        return (bool) $this->input('is_public');
+    }
+
+    public function getPublicUntil(): ?Carbon
+    {
+        $publicUntil = $this->input('public_until');
+
+        return $publicUntil === null ? null : Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $publicUntil);
+    }
+
+    public function getPropertyStart(): Carbon
+    {
+        $start = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('properties.start'));
+        if ($start === null) {
+            throw new \LogicException('Start date validation is not working');
+        }
+
+        return $start;
+    }
+
+    public function getPropertyEnd(): Carbon
+    {
+        $end = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('properties.end'));
+        if ($end === null) {
+            throw new \LogicException('End date validation is not working');
+        }
+
+        return $end;
+    }
+
+    public function getPropertyActive(): ?bool
+    {
+        if ($this->has('properties.active') && $this->input('properties.active') !== null) {
+            return (bool) $this->input('properties.active');
+        }
+
+        return null;
+    }
+
+    public function getPropertyBillable(): ?bool
+    {
+        if ($this->has('properties.billable') && $this->input('properties.billable') !== null) {
+            return (bool) $this->input('properties.billable');
+        }
+
+        return null;
+    }
+
+    public function getPropertyGroup(): TimeEntryAggregationType
+    {
+        return TimeEntryAggregationType::from($this->input('properties.group'));
+    }
+
+    public function getPropertySubGroup(): TimeEntryAggregationType
+    {
+        return TimeEntryAggregationType::from($this->input('properties.sub_group'));
+    }
+
+    public function getPropertyHistoryGroup(): TimeEntryAggregationTypeInterval
+    {
+        return TimeEntryAggregationTypeInterval::from($this->input('properties.history_group'));
+    }
+}

app/Http/Requests/V1/Report/ReportUpdateRequest.php

@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\Report;
+
+use App\Models\Organization;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Carbon;
+
+/**
+ * @property Organization $organization Organization from model binding
+ */
+class ReportUpdateRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule>>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => [
+                'string',
+                'max:255',
+            ],
+            'description' => [
+                'nullable',
+                'string',
+            ],
+            'is_public' => [
+                'boolean',
+            ],
+            'public_until' => [
+                'nullable',
+                'date_format:Y-m-d\TH:i:s\Z',
+                'after:now',
+            ],
+        ];
+    }
+
+    public function getName(): string
+    {
+        return (string) $this->input('name');
+    }
+
+    public function getDescription(): ?string
+    {
+        return $this->input('description');
+    }
+
+    public function getIsPublic(): bool
+    {
+        return (bool) $this->input('is_public');
+    }
+
+    public function getPublicUntil(): ?Carbon
+    {
+        $publicUntil = $this->input('public_until');
+
+        return $publicUntil === null ? null : Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $publicUntil);
+    }
+}

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/TimeEntryAggregateExportRequest.php

@@ -0,0 +1,214 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\TimeEntry;
+
+use App\Enums\ExportFormat;
+use App\Enums\TimeEntryAggregationType;
+use App\Enums\TimeEntryAggregationTypeInterval;
+use App\Models\Client;
+use App\Models\Member;
+use App\Models\Organization;
+use App\Models\Project;
+use App\Models\Tag;
+use App\Models\Task;
+use App\Models\User;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Carbon;
+use Illuminate\Validation\Rule;
+use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
+
+/**
+ * @property Organization $organization
+ */
+class TimeEntryAggregateExportRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
+     */
+    public function rules(): array
+    {
+        return [
+            // Data format of the export
+            'format' => [
+                'required',
+                'string',
+                Rule::enum(ExportFormat::class),
+            ],
+            // Type of first grouping
+            'group' => [
+                'required',
+                Rule::enum(TimeEntryAggregationType::class),
+            ],
+            // Type of second grouping
+            'sub_group' => [
+                'required',
+                Rule::enum(TimeEntryAggregationType::class),
+            ],
+            // Type of grouping of the historic aggregation (time chart)
+            'history_group' => [
+                'required',
+                'nullable',
+                Rule::enum(TimeEntryAggregationTypeInterval::class),
+            ],
+
+            // Filter by member ID
+            'member_id' => [
+                'string',
+                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' => [
+                'array',
+                'min:1',
+            ],
+            'member_ids.*' => [
+                'string',
+                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',
+                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' => [
+                'array',
+                'min:1',
+            ],
+            'project_ids.*' => [
+                'string',
+                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' => [
+                '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 tag IDs, tag IDs are OR combined
+            'tag_ids' => [
+                'array',
+                'min:1',
+            ],
+            'tag_ids.*' => [
+                'string',
+                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' => [
+                'array',
+                'min:1',
+            ],
+            'task_ids.*' => [
+                'string',
+                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' => [
+                'required',
+                'string',
+                'date_format:Y-m-d\TH:i:s\Z',
+                'before:end',
+            ],
+            // Filter only time entries that have a start date before the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
+            'end' => [
+                'required',
+                'string',
+                'date_format:Y-m-d\TH:i:s\Z',
+            ],
+            // Filter by active status (active means has no end date, is still running)
+            'active' => [
+                'string',
+                'in:true,false',
+            ],
+            // Filter by billable status
+            'billable' => [
+                'string',
+                'in:true,false',
+            ],
+            'fill_gaps_in_time_groups' => [
+                'string',
+                'in:true,false',
+            ],
+            'debug' => [
+                'string',
+                'in:true,false',
+            ],
+        ];
+    }
+
+    public function getDebug(): bool
+    {
+        return $this->input('debug') === 'true';
+    }
+
+    public function getGroup(): TimeEntryAggregationType
+    {
+        return TimeEntryAggregationType::from($this->input('group'));
+    }
+
+    public function getSubGroup(): TimeEntryAggregationType
+    {
+        return TimeEntryAggregationType::from($this->input('sub_group'));
+    }
+
+    public function getHistoryGroup(): TimeEntryAggregationType
+    {
+        return TimeEntryAggregationType::fromInterval(TimeEntryAggregationTypeInterval::from($this->input('history_group')));
+    }
+
+    public function getStart(): Carbon
+    {
+        $start = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('start'), 'UTC');
+        if ($start === null) {
+            throw new \LogicException('Start date validation is not working');
+        }
+
+        return $start;
+    }
+
+    public function getEnd(): Carbon
+    {
+        $end = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('end'), 'UTC');
+        if ($end === null) {
+            throw new \LogicException('End date validation is not working');
+        }
+
+        return $end;
+    }
+
+    public function getFormatValue(): ExportFormat
+    {
+        return ExportFormat::from($this->validated('format'));
+    }
+}

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

@@ -32,12 +32,13 @@ class TimeEntryAggregateRequest extends FormRequest
     public function rules(): array
     {
         return [
+            // Type of first grouping
             'group' => [
                 'nullable',
-                'required_with:group_2',
+                'required_with:sub_group',
                 Rule::enum(TimeEntryAggregationType::class),
             ],
-
+            // Type of second grouping
             'sub_group' => [
                 'nullable',
                 Rule::enum(TimeEntryAggregationType::class),
@@ -45,11 +46,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 +58,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 +79,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,24 +91,22 @@ 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
+            // Filter by tag IDs, tag IDs are OR combined
             'tag_ids' => [
                 'array',
                 'min:1',
             ],
             '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 +115,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/TimeEntryIndexExportRequest.php

@@ -0,0 +1,173 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\TimeEntry;
+
+use App\Enums\ExportFormat;
+use App\Models\Member;
+use App\Models\Organization;
+use App\Models\Project;
+use App\Models\Tag;
+use App\Models\Task;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+use Illuminate\Validation\Rule;
+use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
+
+/**
+ * @property Organization $organization
+ */
+class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
+     */
+    public function rules(): array
+    {
+        return [
+            'format' => [
+                'required',
+                'string',
+                Rule::enum(ExportFormat::class),
+            ],
+            // Filter by member ID
+            'member_id' => [
+                'string',
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Member> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
+            ],
+            // Filter by multiple member IDs, member IDs are OR combined, but AND combined with the member_id parameter
+            'member_ids' => [
+                'array',
+                'min:1',
+            ],
+            'member_ids.*' => [
+                'string',
+                'uuid',
+                new ExistsEloquent(Member::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Member> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
+            ],
+            // Filter by project IDs, project IDs are OR combined
+            'project_ids' => [
+                'array',
+                'min:1',
+            ],
+            'project_ids.*' => [
+                'string',
+                'uuid',
+                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Project> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
+            ],
+            // Filter by tag IDs, tag IDs are OR combined
+            'tag_ids' => [
+                'array',
+                'min:1',
+            ],
+            'tag_ids.*' => [
+                'string',
+                'uuid',
+                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Tag> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
+            ],
+            // Filter by task IDs, task IDs are OR combined
+            'task_ids' => [
+                'array',
+                'min:1',
+            ],
+            'task_ids.*' => [
+                'string',
+                'uuid',
+                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Task> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
+            ],
+            // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
+            'start' => [
+                'required',
+                'string',
+                'date_format:Y-m-d\TH:i:s\Z',
+                'before:end',
+            ],
+            // Filter only time entries that have a start date before the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
+            'end' => [
+                'required',
+                'string',
+                'date_format:Y-m-d\TH:i:s\Z',
+            ],
+            // Filter by active status (active means has no end date, is still running)
+            'active' => [
+                'string',
+                'in:true,false',
+            ],
+            // Filter by billable status
+            'billable' => [
+                'string',
+                'in:true,false',
+            ],
+            // Limit the number of returned time entries (default: 150)
+            'limit' => [
+                'integer',
+                'min:1',
+                'max:500',
+            ],
+            // Filter makes sure that only time entries of a whole date are returned
+            'only_full_dates' => [
+                'string',
+                'in:true,false',
+            ],
+            'debug' => [
+                'string',
+                'in:true,false',
+            ],
+        ];
+    }
+
+    public function getDebug(): bool
+    {
+        return $this->input('debug', 'false') === 'true';
+    }
+
+    public function getStart(): Carbon
+    {
+        $start = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('start'), 'UTC');
+        if ($start === null) {
+            throw new \LogicException('Start date validation is not working');
+        }
+
+        return $start;
+    }
+
+    public function getEnd(): Carbon
+    {
+        $end = Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('end'), 'UTC');
+        if ($end === null) {
+            throw new \LogicException('End date validation is not working');
+        }
+
+        return $end;
+    }
+
+    public function getOnlyFullDates(): bool
+    {
+        return $this->input('only_full_dates', 'false') === 'true';
+    }
+
+    public function getFormatValue(): ExportFormat
+    {
+        return ExportFormat::from($this->validated('format'));
+    }
+}

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,24 +67,22 @@ 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
+            // Filter by tag IDs, tag IDs are OR combined
             'tag_ids' => [
                 'array',
                 'min:1',
             ],
             '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' => [
@@ -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' => [
@@ -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/V1/Member/PersonalMembershipResource.php

@@ -28,6 +28,8 @@ class PersonalMembershipResource extends BaseResource
                 'id' => $this->resource->organization->id,
                 /** @var string $name Name of organization */
                 'name' => $this->resource->organization->name,
+                /** @var string $currency Currency code (ISO 4217) of organization */
+                'currency' => $this->resource->organization->currency,
             ],
             /** @var string $role Role */
             'role' => $this->resource->role,

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,11 @@ 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,
+            /** @var string $currency Currency code (ISO 4217) */
+            'currency' => $this->resource->currency,
         ];
     }
 }

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,15 @@ 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,
+            /** @var bool $is_public Whether the project is public */
+            'is_public' => $this->resource->is_public,
         ];
     }
 }

app/Http/Resources/V1/Report/DetailedReportResource.php

@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\V1\Report;
+
+use App\Http\Resources\V1\BaseResource;
+use App\Models\Report;
+use Illuminate\Http\Request;
+
+/**
+ * @property Report $resource
+ */
+class DetailedReportResource extends BaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, string|bool|int|null|array<string, string|bool|int|null|array<int, string>>>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            /** @var string $id ID of the report */
+            'id' => $this->resource->id,
+            /** @var string $name Name */
+            'name' => $this->resource->name,
+            /** @var string|null $email Description */
+            'description' => $this->resource->description,
+            /** @var bool $is_public Whether the report can be accessed via an external link */
+            'is_public' => $this->resource->is_public,
+            /** @var string|null $public_until Date until the report is public */
+            'public_until' => $this->resource->public_until?->toIso8601ZuluString(),
+            /** @var string|null $shareable_link Get link to access the report externally, not set if the report is private */
+            'shareable_link' => $this->resource->getShareableLink(),
+            'properties' => [
+                /** @var string $group Type of first grouping */
+                'group' => $this->resource->properties->group->value,
+                /** @var string $sub_group Type of second grouping */
+                'sub_group' => $this->resource->properties->subGroup->value,
+                /** @var string $history_group Type of grouping of the historic aggregation (time chart) */
+                'history_group' => $this->resource->properties->historyGroup->value,
+                /** @var string $start Start date of the report */
+                'start' => $this->resource->properties->start->toIso8601ZuluString(),
+                /** @var string $end End date of the report */
+                'end' => $this->resource->properties->end->toIso8601ZuluString(),
+                /** @var bool|null $active Whether the report is active */
+                'active' => $this->resource->properties->active,
+                /** @var array<string>|null $member_ids Filter by multiple member IDs, member IDs are OR combined */
+                'member_ids' => $this->resource->properties->memberIds?->toArray(),
+                /** @var bool|null $billable Filter by billable status */
+                'billable' => $this->resource->properties->billable,
+                /** @var array<string>|null $client_ids Filter by client IDs, client IDs are OR combined */
+                'client_ids' => $this->resource->properties->clientIds?->toArray(),
+                /** @var array<string>|null $project_ids Filter by project IDs, project IDs are OR combined */
+                'project_ids' => $this->resource->properties->projectIds?->toArray(),
+                /** @var array<string>|null $tags_ids Filter by tag IDs, tag IDs are OR combined */
+                'tag_ids' => $this->resource->properties->tagIds?->toArray(),
+                /** @var array<string>|null $task_ids Filter by task IDs, task IDs are OR combined */
+                'task_ids' => $this->resource->properties->taskIds?->toArray(),
+            ],
+            /** @var string $created_at Date when the report was created */
+            'created_at' => $this->resource->created_at?->toIso8601ZuluString(),
+            /** @var string $updated_at Date when the report was last updated */
+            'updated_at' => $this->resource->updated_at?->toIso8601ZuluString(),
+        ];
+    }
+}

app/Http/Resources/V1/Report/DetailedWithDataReportResource.php

@@ -0,0 +1,136 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\V1\Report;
+
+use App\Http\Resources\V1\BaseResource;
+use App\Models\Report;
+use Illuminate\Http\Request;
+
+/**
+ * @property Report $resource
+ *
+ * @phpstan-type Data array{
+ *          grouped_type: string|null,
+ *          grouped_data: null|array<array{
+ *              key: string|null,
+ *              description: string|null,
+ *              color: string|null,
+ *              seconds: int,
+ *              cost: int,
+ *              grouped_type: string|null,
+ *              grouped_data: null|array<array{
+ *                  key: string|null,
+ *                  description: string|null,
+ *                  color: string|null,
+ *                  seconds: int,
+ *                  cost: int,
+ *                  grouped_type: null,
+ *                  grouped_data: null
+ *              }>
+ *          }>,
+ *          seconds: int,
+ *          cost: int
+ *    }
+ */
+class DetailedWithDataReportResource extends BaseResource
+{
+    /**
+     * @var Data
+     */
+    private array $data;
+
+    /**
+     * @var Data
+     */
+    private array $historyData;
+
+    /**
+     * @param  Data  $data
+     * @param  Data  $historyData
+     */
+    public function __construct(Report $resource, array $data, array $historyData)
+    {
+        parent::__construct($resource);
+        $this->data = $data;
+        $this->historyData = $historyData;
+    }
+
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, string|bool|int|null|Data|array<string, string|bool|int|null|array<int, string>>>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            /** @var string $name Name */
+            'name' => $this->resource->name,
+            /** @var string|null $email Description */
+            'description' => $this->resource->description,
+            /** @var string|null $public_until Date until the report is public */
+            'public_until' => $this->resource->public_until?->toIso8601ZuluString(),
+            /** @var string $currency Currency code (ISO 4217) */
+            'currency' => $this->resource->organization->currency,
+            'properties' => [
+                /** @var string $group Type of first grouping */
+                'group' => $this->resource->properties->group->value,
+                /** @var string $sub_group Type of second grouping */
+                'sub_group' => $this->resource->properties->subGroup->value,
+                /** @var string $history_group Type of grouping of the historic aggregation (time chart) */
+                'history_group' => $this->resource->properties->historyGroup->value,
+                /** @var string $start Start date of the report */
+                'start' => $this->resource->properties->start->toIso8601ZuluString(),
+                /** @var string $end End date of the report */
+                'end' => $this->resource->properties->end->toIso8601ZuluString(),
+            ],
+            /** @var array{
+             *        grouped_type: string|null,
+             *        grouped_data: null|array<array{
+             *            key: string|null,
+             *            description: string|null,
+             *            color: string|null,
+             *            seconds: int,
+             *            cost: int,
+             *            grouped_type: string|null,
+             *            grouped_data: null|array<array{
+             *                key: string|null,
+             *                description: string|null,
+             *                color: string|null,
+             *                seconds: int,
+             *                cost: int,
+             *                grouped_type: null,
+             *                grouped_data: null
+             *            }>
+             *        }>,
+             *        seconds: int,
+             *        cost: int
+             *  } $data Aggregated data
+             */
+            'data' => $this->data,
+            /** @var array{
+             *        grouped_type: string|null,
+             *        grouped_data: null|array<array{
+             *            key: string|null,
+             *            description: string|null,
+             *            seconds: int,
+             *            cost: int,
+             *            grouped_type: string|null,
+             *            grouped_data: null|array<array{
+             *                key: string|null,
+             *                description: string|null,
+             *                seconds: int,
+             *                cost: int,
+             *                grouped_type: null,
+             *                grouped_data: null
+             *            }>
+             *        }>,
+             *        seconds: int,
+             *        cost: int
+             *  } $history_data Historic aggregated data
+             */
+            'history_data' => $this->historyData,
+        ];
+    }
+}

app/Http/Resources/V1/Report/ReportCollection.php

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

app/Http/Resources/V1/Report/ReportResource.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\V1\Report;
+
+use App\Http\Resources\V1\BaseResource;
+use App\Models\Report;
+use Illuminate\Http\Request;
+
+/**
+ * @property Report $resource
+ */
+class ReportResource extends BaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, string|bool|int|null|array<string>>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            /** @var string $id ID of the report */
+            'id' => $this->resource->id,
+            /** @var string $name Name */
+            'name' => $this->resource->name,
+            /** @var string|null $email Description */
+            'description' => $this->resource->description,
+            /** @var bool $is_public Whether the report can be accessed via an external link */
+            'is_public' => $this->resource->is_public,
+            /** @var string|null $public_until Date until the report is public */
+            'public_until' => $this->resource->public_until?->toIso8601ZuluString(),
+            /** @var string|null $shareable_link Get link to access the report externally, not set if the report is private */
+            'shareable_link' => $this->resource->getShareableLink(),
+            /** @var string $created_at Date when the report was created */
+            'created_at' => $this->resource->created_at?->toIso8601ZuluString(),
+            /** @var string $updated_at Date when the report was last updated */
+            'updated_at' => $this->resource->updated_at?->toIso8601ZuluString(),
+        ];
+    }
+}

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/Models/Organization.php

@@ -29,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
@@ -58,6 +59,7 @@ class Organization extends JetstreamTeam implements AuditableContract
         'name' => 'string',
         'personal_team' => 'boolean',
         'currency' => 'string',
+        'employees_can_see_billable_rates' => 'boolean',
     ];
 
     /**

app/Models/Project.php

@@ -15,6 +15,8 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Carbon;
+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,6 +44,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class Project extends Model implements AuditableContract
 {
+    use ComputedAttributes;
     use CustomAuditable;
 
     /** @use HasFactory<ProjectFactory> */
@@ -56,6 +61,8 @@ class Project extends Model implements AuditableContract
         'name' => 'string',
         'color' => 'string',
         'archived_at' => 'datetime',
+        'estimated_time' => 'integer',
+        'spent_time' => 'integer',
     ];
 
     /**
@@ -67,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/Report.php

@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use App\Models\Concerns\HasUuids;
+use App\Service\Dto\ReportPropertiesDto;
+use Database\Factories\ReportFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Carbon;
+
+/**
+ * @property string $id
+ * @property string $name
+ * @property string|null $description
+ * @property string $organization_id
+ * @property bool $is_public
+ * @property Carbon|null $public_until
+ * @property string|null $share_secret
+ * @property ReportPropertiesDto $properties
+ * @property-read Organization $organization
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ *
+ * @method static ReportFactory factory()
+ */
+class Report extends Model
+{
+    /** @use HasFactory<ReportFactory> */
+    use HasFactory;
+
+    use HasUuids;
+
+    /**
+     * The attributes that should be cast.
+     *
+     * @var array<string, string>
+     */
+    protected $casts = [
+        'is_public' => 'bool',
+        'public_until' => 'datetime',
+        'properties' => ReportPropertiesDto::class,
+    ];
+
+    public function getShareableLink(): ?string
+    {
+        if ($this->is_public && $this->share_secret !== null) {
+            return route('shared-report').'#'.$this->share_secret;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return BelongsTo<Organization, Report>
+     */
+    public function organization(): BelongsTo
+    {
+        return $this->belongsTo(Organization::class, 'organization_id');
+    }
+}

app/Models/Tag.php

@@ -7,11 +7,14 @@ namespace App\Models;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\TagFactory;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Carbon;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
+use Staudenmeir\EloquentJsonRelations\HasJsonRelationships;
+use Staudenmeir\EloquentJsonRelations\Relations\HasManyJson;
 
 /**
  * @property string $id
@@ -19,6 +22,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property string $organization_id
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
+ * @property-read Collection<TimeEntry> $timeEntries
  * @property-read Organization $organization
  *
  * @method static TagFactory factory()
@@ -30,6 +34,7 @@ class Tag extends Model implements AuditableContract
     /** @use HasFactory<TagFactory> */
     use HasFactory;
 
+    use HasJsonRelationships;
     use HasUuids;
 
     /**
@@ -48,4 +53,14 @@ class Tag extends Model implements AuditableContract
     {
         return $this->belongsTo(Organization::class, 'organization_id');
     }
+
+    /**
+     * Warning: This relation based on a JSON column. Please make sure that there are no performance issues, before using it.
+     *
+     * @return HasManyJson<TimeEntry, $this>
+     */
+    public function timeEntries(): HasManyJson
+    {
+        return $this->hasManyJson(TimeEntry::class, 'tags');
+    }
 }

app/Models/Task.php

@@ -15,6 +15,8 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Carbon;
+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,6 +38,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  */
 class Task extends Model implements AuditableContract
 {
+    use ComputedAttributes;
     use CustomAuditable;
 
     /** @use HasFactory<TaskFactory> */
@@ -48,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

@@ -10,12 +10,16 @@ use App\Service\BillableRateService;
 use Carbon\CarbonInterval;
 use Database\Factories\TimeEntryFactory;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Carbon;
 use Korridor\LaravelComputedAttributes\ComputedAttributes;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
+use Staudenmeir\EloquentJsonRelations\HasJsonRelationships;
+use Staudenmeir\EloquentJsonRelations\Relations\BelongsToJson;
 
 /**
  * @property string $id
@@ -41,6 +45,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property-read Client|null $client
  * @property string|null $task_id
  * @property-read Task|null $task
+ * @property-read Collection<Tag> $tagsRelation
  *
  * @method Builder<TimeEntry> hasTag(Tag $tag)
  * @method static TimeEntryFactory factory()
@@ -53,6 +58,7 @@ class TimeEntry extends Model implements AuditableContract
     /** @use HasFactory<TimeEntryFactory> */
     use HasFactory;
 
+    use HasJsonRelationships;
     use HasUuids;
 
     /**
@@ -79,6 +85,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
@@ -86,6 +102,44 @@ class TimeEntry extends Model implements AuditableContract
         return app(BillableRateService::class)->getBillableRateForTimeEntry($this);
     }
 
+    public function getClientIdComputed(): ?string
+    {
+        return $this->project_id === null || $this->project === 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);
@@ -148,4 +202,14 @@ class TimeEntry extends Model implements AuditableContract
     {
         return $this->belongsTo(Client::class, 'client_id');
     }
+
+    /**
+     * Warning: This relation based on a JSON column. Please make sure that there are no performance issues, before using it.
+     *
+     * @return BelongsToJson<Tag, $this>
+     */
+    public function tagsRelation(): BelongsToJson
+    {
+        return $this->belongsToJson(Tag::class, 'tags');
+    }
 }

app/Models/User.php

@@ -25,7 +25,9 @@ use Illuminate\Support\Facades\Storage;
 use Laravel\Fortify\TwoFactorAuthenticatable;
 use Laravel\Jetstream\HasProfilePhoto;
 use Laravel\Jetstream\HasTeams;
+use Laravel\Passport\AuthCode;
 use Laravel\Passport\HasApiTokens;
+use Laravel\Passport\Token;
 use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
 
 /**
@@ -178,6 +180,22 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
         return $this->hasMany(ProjectMember::class, 'user_id');
     }
 
+    /**
+     * @return HasMany<Token>
+     */
+    public function accessTokens(): HasMany
+    {
+        return $this->hasMany(Token::class);
+    }
+
+    /**
+     * @return HasMany<AuthCode>
+     */
+    public function authCodes(): HasMany
+    {
+        return $this->hasMany(AuthCode::class);
+    }
+
     /**
      * @param  Builder<User>  $builder
      */

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,19 +80,20 @@ 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');
+            request()->headers->set('X-Forwarded-Proto', 'https');
         }
 
         $this->app->scoped(PermissionStore::class, function (Application $app): PermissionStore {

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/JetstreamServiceProvider.php

@@ -126,6 +126,10 @@ class JetstreamServiceProvider extends ServiceProvider
             'members:update',
             'members:delete',
             'billing',
+            'reports:view',
+            'reports:create',
+            'reports:update',
+            'reports:delete',
         ])->description('Owner users can perform any action. There is only one owner per organization.');
 
         Jetstream::role(Role::Admin->value, 'Administrator', [
@@ -170,6 +174,10 @@ class JetstreamServiceProvider extends ServiceProvider
             'members:view',
             'members:update',
             'members:invite-placeholder',
+            'reports:view',
+            'reports:create',
+            'reports:update',
+            'reports:delete',
         ])->description('Administrator users can perform any action, except accessing the billing dashboard.');
 
         Jetstream::role(Role::Manager->value, 'Manager', [
@@ -206,6 +214,10 @@ class JetstreamServiceProvider extends ServiceProvider
             'organizations:view',
             'invitations:view',
             'members:view',
+            'reports:view',
+            'reports:create',
+            'reports:update',
+            'reports:delete',
         ])->description('Managers have full access to all projects, time entries, ect. but cannot manage the organization (add/remove member, edit the organization, ect.).');
 
         Jetstream::role(Role::Employee->value, 'Employee', [

app/Providers/RouteServiceProvider.php

@@ -37,9 +37,9 @@ class RouteServiceProvider extends ServiceProvider
                 : Limit::perMinute(60)->by($request->ip());
         });
 
-        $this->routes(function () {
+        $this->routes(function (): void {
             Route::middleware('health-check')
-                ->group(function () {
+                ->group(function (): void {
                     Route::get('health-check/up', [HealthCheckController::class, 'up']);
                     Route::get('health-check/debug', [HealthCheckController::class, 'debug']);
                 });

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');
             })

app/Service/BillingContract.php

@@ -22,7 +22,7 @@ class BillingContract
      */
     public function hasSubscription(Organization $organization): bool
     {
-        return false;
+        return true;
     }
 
     /**

app/Service/ColorService.php

@@ -33,8 +33,12 @@ class ColorService
 
     private const string VALID_REGEX = '/^#[0-9a-f]{6}$/';
 
-    public function getRandomColor(): string
+    public function getRandomColor(?string $seed = null): string
     {
+        if ($seed !== null) {
+            srand(crc32($seed));
+        }
+
         return self::COLORS[array_rand(self::COLORS)];
     }
 

app/Service/DashboardService.php

@@ -47,22 +47,24 @@ class DashboardService
     {
         $result = [];
         $windowSize = 24 / $windows;
-        $end = Carbon::now($timeZone)->endOfDay()->subHours(3)->utc()->toDateTimeString();
+        $end = Carbon::now($timeZone)->startOfDay()->addDay()->subHours(3)->utc()->toDateTimeString();
         $start = Carbon::now($timeZone)->subDays($days)->startOfDay()->utc()->toDateTimeString();
 
         $date = Carbon::now($timeZone)->startOfDay();
+        $dateUtc = Carbon::now($timeZone)->startOfDay()->utc();
         for ($i = 0; $i < $days; $i++) {
             $dateString = $date->format('Y-m-d');
-            $tempDate = $date->copy();
+            $tempDate = $dateUtc->copy();
             $start = $tempDate->copy()->utc()->toDateTimeString();
             $tempWindows = [];
             for ($j = 0; $j < $windows; $j++) {
-                $tempWindow = $tempDate->utc()->toDateTimeString();
+                $tempWindow = $tempDate->toDateTimeString();
                 $tempWindows[] = $tempWindow;
                 $tempDate->addHours($windowSize);
             }
             $result[$dateString] = $tempWindows;
             $date->subDay();
+            $dateUtc->subDay();
         }
 
         return [

app/Service/DeletionService.php

@@ -35,7 +35,7 @@ class DeletionService
     public function deleteOrganization(Organization $organization, bool $inTransaction = true, ?User $ignoreUser = null): void
     {
         if ($inTransaction) {
-            DB::transaction(function () use ($organization) {
+            DB::transaction(function () use ($organization): void {
                 $this->deleteOrganization($organization, false);
             });
 
@@ -123,7 +123,7 @@ class DeletionService
     public function deleteUser(User $user, bool $inTransaction = true): void
     {
         if ($inTransaction) {
-            DB::transaction(function () use ($user) {
+            DB::transaction(function () use ($user): void {
                 $this->deleteUser($user, false);
             });
 
@@ -144,6 +144,7 @@ class DeletionService
             ->get();
 
         foreach ($members as $member) {
+            /** @var Member $member */
             if ($member->role === Role::Owner->value && $member->organization->users()->count() > 1) {
                 throw new CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers;
             }
@@ -154,10 +155,13 @@ class DeletionService
             if ($member->role === Role::Owner->value) {
                 $this->deleteOrganization($member->organization, false, $user);
             } else {
-                $this->memberService->makeMemberToPlaceholder($member);
+                $this->memberService->makeMemberToPlaceholder($member, false);
             }
         }
 
+        $user->accessTokens()->delete();
+        $user->authCodes()->delete();
+
         // Note: Since the deletion of the profile photo is not reversible via a database rollback this needs to be done last
         $user->deleteProfilePhoto();
 

app/Service/Dto/ReportPropertiesDto.php

@@ -0,0 +1,217 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Dto;
+
+use App\Enums\TimeEntryAggregationType;
+use App\Enums\TimeEntryAggregationTypeInterval;
+use App\Enums\Weekday;
+use Illuminate\Contracts\Database\Eloquent\Castable;
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
+
+class ReportPropertiesDto implements Castable
+{
+    public TimeEntryAggregationType $group;
+
+    public TimeEntryAggregationType $subGroup;
+
+    public TimeEntryAggregationTypeInterval $historyGroup;
+
+    public Weekday $weekStart;
+
+    public string $timezone;
+
+    public Carbon $start;
+
+    public Carbon $end;
+
+    public ?bool $active = null;
+
+    /**
+     * @var Collection<int, string>|null
+     */
+    public ?Collection $memberIds = null;
+
+    public ?bool $billable = null;
+
+    /**
+     * @var Collection<int, string>|null
+     */
+    public ?Collection $clientIds = null;
+
+    /**
+     * @var Collection<int, string>|null
+     */
+    public ?Collection $projectIds = null;
+
+    /**
+     * @var Collection<int, string>|null
+     */
+    public ?Collection $tagIds = null;
+
+    /**
+     * @var Collection<int, string>|null
+     */
+    public ?Collection $taskIds = null;
+
+    /**
+     * Get the caster class to use when casting from / to this cast target.
+     *
+     * @param  array<string, mixed>  $arguments
+     * @return CastsAttributes<ReportPropertiesDto, ReportPropertiesDto>
+     */
+    public static function castUsing(array $arguments): CastsAttributes
+    {
+        return new class implements CastsAttributes
+        {
+            private const array REQUIRED_PROPERTIES = [
+                'group',
+                'subGroup',
+                'historyGroup',
+                'weekStart',
+                'timezone',
+                'start',
+                'end',
+                'active',
+                'memberIds',
+                'billable',
+                'clientIds',
+                'projectIds',
+                'tagIds',
+                'taskIds',
+            ];
+
+            public function get(Model $model, string $key, mixed $value, array $attributes): ReportPropertiesDto
+            {
+                if (! is_string($value)) {
+                    throw new \InvalidArgumentException('The given value is not a string');
+                }
+                $data = json_decode($value, false);
+                if ($data === null) {
+                    throw new \InvalidArgumentException('The given value is not a JSON string');
+                }
+                foreach (self::REQUIRED_PROPERTIES as $property) {
+                    if (! property_exists($data, $property)) {
+                        throw new \InvalidArgumentException('The given JSON string does not contain the required property "'.$property.'"');
+                    }
+                }
+                $dto = new ReportPropertiesDto;
+                $dto->end = $data->end !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $data->end) : null;
+                $dto->start = $data->start !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $data->start) : null;
+                $dto->active = $data->active;
+                $dto->memberIds = $data->memberIds !== null ? ReportPropertiesDto::idArrayToCollection($data->memberIds) : null;
+                $dto->billable = $data->billable;
+                $dto->clientIds = $data->clientIds !== null ? ReportPropertiesDto::idArrayToCollection($data->clientIds) : null;
+                $dto->projectIds = $data->projectIds !== null ? ReportPropertiesDto::idArrayToCollection($data->projectIds) : null;
+                $dto->tagIds = $data->tagIds !== null ? ReportPropertiesDto::idArrayToCollection($data->tagIds) : null;
+                $dto->taskIds = $data->taskIds ? ReportPropertiesDto::idArrayToCollection($data->taskIds) : null;
+                $dto->group = TimeEntryAggregationType::from($data->group);
+                $dto->subGroup = TimeEntryAggregationType::from($data->subGroup);
+                $dto->historyGroup = TimeEntryAggregationTypeInterval::from($data->historyGroup);
+                $dto->weekStart = Weekday::from($data->weekStart);
+                $dto->timezone = $data->timezone;
+
+                return $dto;
+            }
+
+            /**
+             * @param  ReportPropertiesDto  $value
+             */
+            public function set(Model $model, string $key, mixed $value, array $attributes): string
+            {
+                if (! ($value instanceof ReportPropertiesDto)) {
+                    throw new \InvalidArgumentException('The given value is not an instance of ReportPropertiesDto');
+                }
+
+                $data = (object) [
+                    'end' => $value->end->toIso8601ZuluString(),
+                    'start' => $value->start->toIso8601ZuluString(),
+                    'active' => $value->active,
+                    'memberIds' => $value->memberIds?->toArray(),
+                    'billable' => $value->billable,
+                    'clientIds' => $value->clientIds?->toArray(),
+                    'projectIds' => $value->projectIds?->toArray(),
+                    'tagIds' => $value->tagIds?->toArray(),
+                    'taskIds' => $value->taskIds?->toArray(),
+                    'group' => $value->group->value,
+                    'subGroup' => $value->subGroup->value,
+                    'historyGroup' => $value->historyGroup->value,
+                    'weekStart' => $value->weekStart->value,
+                    'timezone' => $value->timezone,
+                ];
+
+                $jsonString = json_encode($data);
+                if ($jsonString === false) {
+                    throw new \InvalidArgumentException('Could not encode the given data to a JSON string');
+                }
+
+                return $jsonString;
+            }
+        };
+    }
+
+    /**
+     * @param  array<mixed>  $ids
+     * @return Collection<int, string>
+     */
+    public static function idArrayToCollection(array $ids): Collection
+    {
+        $collection = new Collection;
+        foreach ($ids as $id) {
+            if (! is_string($id)) {
+                throw new \InvalidArgumentException('The given ID is not a string');
+            }
+            if (! Str::isUuid($id)) {
+                throw new \InvalidArgumentException('The given ID is not a valid UUID');
+            }
+            $collection->push($id);
+        }
+
+        return $collection;
+    }
+
+    /**
+     * @param  array<mixed>|null  $memberIds
+     */
+    public function setMemberIds(?array $memberIds): void
+    {
+        $this->memberIds = $memberIds !== null ? ReportPropertiesDto::idArrayToCollection($memberIds) : null;
+    }
+
+    /**
+     * @param  array<mixed>|null  $clientIds
+     */
+    public function setClientIds(?array $clientIds): void
+    {
+        $this->clientIds = $clientIds !== null ? ReportPropertiesDto::idArrayToCollection($clientIds) : null;
+    }
+
+    /**
+     * @param  array<mixed>|null  $projectIds
+     */
+    public function setProjectIds(?array $projectIds): void
+    {
+        $this->projectIds = $projectIds !== null ? ReportPropertiesDto::idArrayToCollection($projectIds) : null;
+    }
+
+    /**
+     * @param  array<mixed>|null  $tagIds
+     */
+    public function setTagIds(?array $tagIds): void
+    {
+        $this->tagIds = $tagIds !== null ? ReportPropertiesDto::idArrayToCollection($tagIds) : null;
+    }
+
+    /**
+     * @param  array<mixed>|null  $taskIds
+     */
+    public function setTaskIds(?array $taskIds): void
+    {
+        $this->taskIds = $taskIds !== null ? ReportPropertiesDto::idArrayToCollection($taskIds) : null;
+    }
+}

app/Service/Export/ExportService.php

@@ -47,6 +47,9 @@ class ExportService
         // Organizations
         try {
             $writer = Writer::createFromPath($temporaryDirectory->path('organizations.csv'), 'w+');
+            $writer->setDelimiter(',');
+            $writer->setEnclosure('"');
+            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'name',
@@ -66,6 +69,9 @@ class ExportService
 
             // Organization invitations
             $writer = Writer::createFromPath($temporaryDirectory->path('organization_invitations.csv'), 'w+');
+            $writer->setDelimiter(',');
+            $writer->setEnclosure('"');
+            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'email',
@@ -91,6 +97,9 @@ class ExportService
 
             // Time entries
             $writer = Writer::createFromPath($temporaryDirectory->path('time_entries.csv'), 'w+');
+            $writer->setDelimiter(',');
+            $writer->setEnclosure('"');
+            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'description',
@@ -139,6 +148,9 @@ class ExportService
 
             // Clients
             $writer = Writer::createFromPath($temporaryDirectory->path('clients.csv'), 'w+');
+            $writer->setDelimiter(',');
+            $writer->setEnclosure('"');
+            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'name',
@@ -164,6 +176,9 @@ class ExportService
 
             // Projects
             $writer = Writer::createFromPath($temporaryDirectory->path('projects.csv'), 'w+');
+            $writer->setDelimiter(',');
+            $writer->setEnclosure('"');
+            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'name',
@@ -199,6 +214,9 @@ class ExportService
 
             // Project members
             $writer = Writer::createFromPath($temporaryDirectory->path('project_members.csv'), 'w+');
+            $writer->setDelimiter(',');
+            $writer->setEnclosure('"');
+            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'billable_rate',
@@ -226,6 +244,9 @@ class ExportService
 
             // Members
             $writer = Writer::createFromPath($temporaryDirectory->path('members.csv'), 'w+');
+            $writer->setDelimiter(',');
+            $writer->setEnclosure('"');
+            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'user_id',
@@ -260,6 +281,9 @@ class ExportService
 
             // Tasks
             $writer = Writer::createFromPath($temporaryDirectory->path('tasks.csv'), 'w+');
+            $writer->setDelimiter(',');
+            $writer->setEnclosure('"');
+            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'name',
@@ -287,6 +311,9 @@ class ExportService
 
             // Tags
             $writer = Writer::createFromPath($temporaryDirectory->path('tags.csv'), 'w+');
+            $writer->setDelimiter(',');
+            $writer->setEnclosure('"');
+            $writer->setEscape('');
             $writer->insertOne([
                 'id',
                 'name',

app/Service/Import/ImportService.php

@@ -31,10 +31,13 @@ class ImportService
         $lock = Cache::lock('import:'.$organization->getKey(), config('octane.max_execution_time', 60) + 1);
 
         if ($lock->get()) {
-            DB::transaction(function () use (&$importer, &$data, &$timezone) {
-                $importer->importData($data, $timezone);
-            });
-            $lock->release();
+            try {
+                DB::transaction(function () use (&$importer, &$data, &$timezone): void {
+                    $importer->importData($data, $timezone);
+                });
+            } finally {
+                $lock->release();
+            }
         } else {
             throw new ImportException('Import is already in progress');
         }

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -47,6 +47,8 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
             $reader = Reader::createFromString($data);
             $reader->setHeaderOffset(0);
             $reader->setDelimiter(',');
+            $reader->setEnclosure('"');
+            $reader->setEscape('');
             $header = $reader->getHeader();
             $this->validateHeader($header);
             $records = $reader->getRecords();

app/Service/Import/Importers/DefaultImporter.php

@@ -112,8 +112,9 @@ abstract class DefaultImporter implements ImporterContract
             'billable_rate' => [
                 'nullable',
                 'integer',
+                'max:2147483647',
             ],
-        ], beforeSave: function (Project $project) {
+        ], beforeSave: function (Project $project): void {
             if ($project->billable_rate === 0) {
                 $project->billable_rate = null;
             }
@@ -125,8 +126,9 @@ abstract class DefaultImporter implements ImporterContract
             'billable_rate' => [
                 'nullable',
                 'integer',
+                'max:2147483647',
             ],
-        ], beforeSave: function (ProjectMember $projectMember) {
+        ], beforeSave: function (ProjectMember $projectMember): void {
             if ($projectMember->billable_rate === 0) {
                 $projectMember->billable_rate = null;
             }

app/Service/Import/Importers/SolidtimeImporter.php

@@ -60,6 +60,8 @@ class SolidtimeImporter extends DefaultImporter
             $clientsReader = Reader::createFromPath($temporaryDirectory->path('clients.csv'));
             $clientsReader->setHeaderOffset(0);
             $clientsReader->setDelimiter(',');
+            $clientsReader->setEnclosure('"');
+            $clientsReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('members.csv'))) {
                 throw new ImportException('File "members.csv" missing in ZIP');
@@ -67,6 +69,8 @@ class SolidtimeImporter extends DefaultImporter
             $membersReader = Reader::createFromPath($temporaryDirectory->path('members.csv'));
             $membersReader->setHeaderOffset(0);
             $membersReader->setDelimiter(',');
+            $membersReader->setEnclosure('"');
+            $membersReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('organization_invitations.csv'))) {
                 throw new ImportException('File "organization_invitations.csv" missing in ZIP');
@@ -74,6 +78,8 @@ class SolidtimeImporter extends DefaultImporter
             $organizationInvitationsReader = Reader::createFromPath($temporaryDirectory->path('organization_invitations.csv'));
             $organizationInvitationsReader->setHeaderOffset(0);
             $organizationInvitationsReader->setDelimiter(',');
+            $organizationInvitationsReader->setEnclosure('"');
+            $organizationInvitationsReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('project_members.csv'))) {
                 throw new ImportException('File "project_members.csv" missing in ZIP');
@@ -81,6 +87,8 @@ class SolidtimeImporter extends DefaultImporter
             $projectMembersReader = Reader::createFromPath($temporaryDirectory->path('project_members.csv'));
             $projectMembersReader->setHeaderOffset(0);
             $projectMembersReader->setDelimiter(',');
+            $projectMembersReader->setEnclosure('"');
+            $projectMembersReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('projects.csv'))) {
                 throw new ImportException('File "projects.csv" missing in ZIP');
@@ -88,6 +96,8 @@ class SolidtimeImporter extends DefaultImporter
             $projectsReader = Reader::createFromPath($temporaryDirectory->path('projects.csv'));
             $projectsReader->setHeaderOffset(0);
             $projectsReader->setDelimiter(',');
+            $projectsReader->setEnclosure('"');
+            $projectsReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('tags.csv'))) {
                 throw new ImportException('File "tags.csv" missing in ZIP');
@@ -95,6 +105,8 @@ class SolidtimeImporter extends DefaultImporter
             $tagsReader = Reader::createFromPath($temporaryDirectory->path('tags.csv'));
             $tagsReader->setHeaderOffset(0);
             $tagsReader->setDelimiter(',');
+            $tagsReader->setEnclosure('"');
+            $tagsReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('tasks.csv'))) {
                 throw new ImportException('File "tasks.csv" missing in ZIP');
@@ -102,6 +114,8 @@ class SolidtimeImporter extends DefaultImporter
             $tasksReader = Reader::createFromPath($temporaryDirectory->path('tasks.csv'));
             $tasksReader->setHeaderOffset(0);
             $tasksReader->setDelimiter(',');
+            $tasksReader->setEnclosure('"');
+            $tasksReader->setEscape('');
 
             if (! file_exists($temporaryDirectory->path('time_entries.csv'))) {
                 throw new ImportException('File "time_entries.csv" missing in ZIP');
@@ -109,6 +123,8 @@ class SolidtimeImporter extends DefaultImporter
             $timeEntriesReader = Reader::createFromPath($temporaryDirectory->path('time_entries.csv'));
             $timeEntriesReader->setHeaderOffset(0);
             $timeEntriesReader->setDelimiter(',');
+            $timeEntriesReader->setEnclosure('"');
+            $timeEntriesReader->setEscape('');
 
             foreach ($clientsReader as $client) {
                 $this->clientImportHelper->getKey([