fix billable default when starting time entry from recently tracked tasks

.env.ci

@@ -6,13 +6,12 @@ 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
@@ -21,21 +20,26 @@ DB_TEST_PASSWORD=root
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+FILESYSTEM_DISK=local
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
-# Mail
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
 MAIL_MAILER=log
 MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
-# Filesystems
-FILESYSTEM_DISK=local
-PUBLIC_FILESYSTEM_DISK=public
-
-# Services
-GOTENBERG_URL=http://0.0.0.0:3000
+S3_ACCESS_KEY_ID=
+S3_SECRET_ACCESS_KEY=
+S3_REGION=us-east-1
+S3_BUCKET=
+S3_USE_PATH_STYLE_ENDPOINT=false
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=

.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,7 +31,12 @@ QUEUE_CONNECTION=sync
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
-# Mail
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
 MAIL_MAILER=smtp
 MAIL_HOST=mailpit
 MAIL_PORT=1025
@@ -49,7 +54,7 @@ PUSHER_PORT=443
 PUSHER_SCHEME=https
 PUSHER_APP_CLUSTER=mt1
 
-# Filesystems
+# Storage
 FILESYSTEM_DISK=s3
 PUBLIC_FILESYSTEM_DISK=s3
 S3_ACCESS_KEY_ID=sail
@@ -60,9 +65,6 @@ 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,6 +1,4 @@
 APP_NAME=solidtime
-APP_VERSION=0.0.0
-APP_BUILD=0
 VITE_APP_NAME=solidtime
 APP_ENV=production
 APP_DEBUG=false

.github/FUNDING.yml

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

.github/workflows/build-private.yml

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

@@ -0,0 +1,90 @@
+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,8 +3,6 @@ on:
     branches:
       - main
       - develop
-    tags:
-      - '*'
   pull_request:
     paths:
       - '.github/workflows/build-public.yml'
@@ -25,49 +23,9 @@ 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
+        run: cp .env.production .env
 
       - name: "Install dependencies"
         uses: php-actions/composer@v6

.github/workflows/phpunit.yml

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

@@ -28,11 +28,6 @@ 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. 
@@ -40,8 +35,6 @@ 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:rfc,strict',
+                'email',
                 'max:255',
-                UniqueEloquent::make(User::class, 'email', function (Builder $builder): Builder {
+                new UniqueEloquent(User::class, 'email', function (Builder $builder): Builder {
                     /** @var Builder<User> $builder */
                     return $builder->where('is_placeholder', '=', false);
                 }),

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -35,7 +35,7 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
                 'required',
                 'email',
                 'max:255',
-                UniqueEloquent::make(User::class, 'email')->ignore($user->id)->query(function (Builder $query) {
+                (new UniqueEloquent(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

@@ -71,10 +71,10 @@ class AddOrganizationMember implements AddsTeamMembers
             'email' => [
                 'required',
                 'email',
-                ExistsEloquent::make(User::class, 'email', function (Builder $builder) {
+                (new ExistsEloquent(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',

app/Console/Commands/SelfHost/SelfHostCheckForUpdateCommand.php

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

app/Console/Commands/SelfHost/SelfHostTelemetryCommand.php

@@ -1,44 +0,0 @@
-<?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/Kernel.php

@@ -17,14 +17,6 @@ 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

@@ -1,35 +0,0 @@
-<?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/ProjectMemberRole.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enums;
+
+enum ProjectMemberRole: string
+{
+    case Manager = 'manager';
+    case Normal = 'normal';
+}

app/Enums/TimeEntryAggregationType.php

@@ -4,12 +4,8 @@ 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';
@@ -21,16 +17,6 @@ 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/Exceptions/Api/FeatureIsNotAvailableInFreePlanApiException.php

@@ -1,10 +0,0 @@
-<?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

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

app/Extensions/Scramble/PaginatedResourceCollectionTypeToSchema.php

@@ -5,7 +5,6 @@ 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;
@@ -45,49 +44,39 @@ class PaginatedResourceCollectionTypeToSchema extends TypeToSchemaExtension
             return null;
         }
 
-        $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']);
-        }
+        $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']);
 
-        return $newType;
+        return $type;
     }
 
     /**

app/Filament/Resources/OrganizationResource.php

@@ -70,7 +70,6 @@ class OrganizationResource extends Resource
                         'nullable',
                         'integer',
                         'gt:0',
-                        'max:2147483647',
                     ])
                     ->numeric(),
                 Forms\Components\DateTimePicker::make('created_at')

app/Filament/Resources/ProjectMemberResource.php

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

app/Filament/Resources/ProjectResource.php

@@ -45,7 +45,6 @@ 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 ?string $heading = 'A Registrations';
+    protected static ?string $heading = 'A Registrations';
 
     protected function getCards(): array
     {

app/Filament/Widgets/ServerOverview.php

@@ -1,38 +0,0 @@
-<?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/OrganizationController.php

@@ -4,7 +4,6 @@ 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;
@@ -24,9 +23,7 @@ class OrganizationController extends Controller
     {
         $this->checkPermission($organization, 'organizations:view');
 
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
-
-        return new OrganizationResource($organization, $showBillableRate);
+        return new OrganizationResource($organization);
     }
 
     /**
@@ -42,9 +39,6 @@ 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();
 
@@ -52,6 +46,6 @@ class OrganizationController extends Controller
             $billableRateService->updateTimeEntriesBillableRateForOrganization($organization);
         }
 
-        return new OrganizationResource($organization, true);
+        return new OrganizationResource($organization);
     }
 }

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

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Api\V1;
 
-use App\Enums\Role;
+use App\Enums\ProjectMemberRole;
 use App\Exceptions\Api\EntityStillInUseApiException;
 use App\Http\Requests\V1\Project\ProjectIndexRequest;
 use App\Http\Requests\V1\Project\ProjectStoreRequest;
@@ -14,9 +14,10 @@ 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\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Carbon;
@@ -52,6 +53,12 @@ class ProjectController extends Controller
 
         if (! $canViewAllProjects) {
             $projectsQuery->visibleByEmployee($user);
+            $projectsQuery->with([
+                'members' => function (HasMany $query): void {
+                    /** @var Builder<ProjectMember> $query */
+                    $query->whereBelongsTo($this->user(), 'user');
+                },
+            ]);
         }
         $filterArchived = $request->getFilterArchived();
         if ($filterArchived === 'true') {
@@ -62,9 +69,15 @@ class ProjectController extends Controller
 
         $projects = $projectsQuery->paginate(config('app.pagination_per_page_default'));
 
-        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
+        foreach ($projects->items() as $project) {
+            if ($canViewAllProjects) {
+                $project->setAttribute('limited_visibility', false);
+            } else {
+                $project->setAttribute('limited_visibility', $project->members->firstWhere('user_id', $this->user()->id)?->role !== ProjectMemberRole::Manager);
+            }
+        }
 
-        return new ProjectCollection($projects, $showBillableRate);
+        return new ProjectCollection($projects);
     }
 
     /**
@@ -77,13 +90,30 @@ class ProjectController extends Controller
     public function show(Organization $organization, Project $project): JsonResource
     {
         $this->checkPermission($organization, 'projects:view', $project);
+        $canViewAllProjects = $this->hasPermission($organization, 'projects:view:all');
 
-        // 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([
+            'members' => function (HasMany $query): void {
+                /** @var Builder<ProjectMember> $query */
+                $query->whereBelongsTo($this->user(), 'user');
+            },
+        ]);
+
+        if (! $canViewAllProjects) {
+            if (! $project->is_public && $project->members->firstWhere('user_id', '=', $this->user()->id) === null) {
+                throw new AuthorizationException('No access to project');
+            }
+        }
+
+        if ($canViewAllProjects) {
+            $project->setAttribute('limited_visibility', false);
+        } else {
+            $project->setAttribute('limited_visibility', $project->members->firstWhere('user_id', $this->user()->id)?->role !== ProjectMemberRole::Manager);
+        }
 
         $project->load('organization');
 
-        return new ProjectResource($project, true);
+        return new ProjectResource($project);
     }
 
     /**
@@ -108,7 +138,9 @@ class ProjectController extends Controller
         $project->organization()->associate($organization);
         $project->save();
 
-        return new ProjectResource($project, true);
+        $project->setAttribute('limited_visibility', false);
+
+        return new ProjectResource($project);
     }
 
     /**
@@ -131,25 +163,17 @@ class ProjectController extends Controller
             $project->estimated_time = $request->getEstimatedTime();
         }
         $oldBillableRate = $project->billable_rate;
-        $clientIdChanged = false;
         $project->billable_rate = $request->getBillableRate();
-        if ($project->client_id !== $request->input('client_id')) {
-            $project->client_id = $request->input('client_id');
-            $clientIdChanged = true;
-        }
+        $project->client_id = $request->input('client_id');
         $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, true);
+        $project->setAttribute('limited_visibility', false);
+
+        return new ProjectResource($project);
     }
 
     /**

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

@@ -72,6 +72,7 @@ class ProjectMemberController extends Controller
         }
 
         $projectMember = new ProjectMember;
+        $projectMember->role = $request->getRole();
         $projectMember->billable_rate = $request->getBillableRate();
         $projectMember->member()->associate($member);
         $projectMember->user()->associate($member->user);
@@ -95,11 +96,17 @@ class ProjectMemberController extends Controller
     public function update(Organization $organization, ProjectMember $projectMember, ProjectMemberUpdateRequest $request, BillableRateService $billableRateService): JsonResource
     {
         $this->checkPermission($organization, 'project-members:update', projectMember: $projectMember);
-        $oldBillableRate = $projectMember->billable_rate;
-        $projectMember->billable_rate = $request->getBillableRate();
+        $hasBillableRate = $request->has('billable_rate');
+        if ($hasBillableRate) {
+            $oldBillableRate = $projectMember->billable_rate;
+            $projectMember->billable_rate = $request->getBillableRate();
+        }
+        if ($request->getRole() !== null) {
+            $projectMember->role = $request->getRole();
+        }
         $projectMember->save();
 
-        if ($oldBillableRate !== $request->getBillableRate()) {
+        if ($hasBillableRate && $oldBillableRate !== $request->getBillableRate()) {
             $billableRateService->updateTimeEntriesBillableRateForProjectMember($projectMember);
         }
 

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

@@ -4,15 +4,9 @@ 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;
@@ -26,29 +20,15 @@ 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
 {
@@ -61,13 +41,11 @@ class TimeEntryController extends Controller
     }
 
     /**
-     * Get time entries in organization
+     * Get all 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
@@ -82,16 +60,27 @@ class TimeEntryController extends Controller
             $this->checkPermission($organization, 'time-entries:view:all');
         }
 
-        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member);
+        $timeEntriesQuery = TimeEntry::query()
+            ->whereBelongsTo($organization, 'organization')
+            ->orderBy('start', 'desc');
 
-        $totalCount = $timeEntriesQuery->count();
+        $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'));
 
-        $limit = $request->getLimit();
+        $limit = $request->has('limit') ? (int) $request->input('limit', 100) : 100;
         if ($limit > 1000) {
             $limit = 1000;
         }
         $timeEntriesQuery->limit($limit);
-        $timeEntriesQuery->skip($request->getOffset());
 
         $timeEntries = $timeEntriesQuery->get();
 
@@ -125,121 +114,7 @@ class TimeEntryController extends Controller
             }
         }
 
-        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): 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;
-        }
-        $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) {
-                throw new PdfRendererIsNotConfiguredException;
-            }
-            $viewFile = file_get_contents(resource_path('views/reports/time-entry-index.blade.php'));
-            if ($viewFile === false) {
-                throw new \LogicException('View file not found');
-            }
-            $html = Blade::render($viewFile, ['timeEntries' => $timeEntriesQuery->get()]);
-            $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-index-footer.blade.php'));
-            if ($footerViewFile === false) {
-                throw new \LogicException('View file not found');
-            }
-            $footerHtml = Blade::render($footerViewFile);
-            $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()
-                ->pdfa('PDF/A-3b')
-                ->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)),
-        ]);
+        return new TimeEntryCollection($timeEntries);
     }
 
     /**
@@ -274,7 +149,7 @@ class TimeEntryController extends Controller
      *
      * @throws AuthorizationException
      */
-    public function aggregate(Organization $organization, TimeEntryAggregateRequest $request, TimeEntryAggregationService $timeEntryAggregationService): array
+    public function aggregate(Organization $organization, TimeEntryAggregateRequest $request, TimeEntryAggregationService $aggregationService): array
     {
         /** @var Member|null $member */
         $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
@@ -283,146 +158,7 @@ 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;
-        }
-        $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) {
-                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-index.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),
-            ]);
-            $footerViewFile = file_get_contents(resource_path('views/reports/time-entry-index-footer.blade.php'));
-            if ($footerViewFile === false) {
-                throw new \LogicException('View file not found');
-            }
-            $footerHtml = Blade::render($footerViewFile);
-            $request = Gotenberg::chromium(config('services.gotenberg.url'))
-                ->pdf()
-                ->pdfa('PDF/A-3b')
-                ->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 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');
 
@@ -437,8 +173,27 @@ class TimeEntryController extends Controller
         $filter->addTaskIdsFilter($request->input('task_ids'));
         $filter->addClientIdsFilter($request->input('client_ids'));
         $filter->addBillableFilter($request->input('billable'));
+        $timeEntriesQuery = $filter->get();
 
-        return $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,
+        ];
     }
 
     /**
@@ -567,10 +322,6 @@ class TimeEntryController extends Controller
 
         $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;
         }
@@ -611,10 +362,6 @@ class TimeEntryController extends Controller
             $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);
             }
@@ -672,66 +419,4 @@ class TimeEntryController extends Controller
         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,34 +45,16 @@ 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($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,
+            ]);
     }
 }

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

@@ -20,7 +20,6 @@ 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',
-                UniqueEloquent::make(Client::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Client::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->withCustomTranslation('validation.client_name_already_exists'),
+                }))->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',
-                UniqueEloquent::make(Client::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Client::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Client> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->ignore($this->client?->getKey())->withCustomTranslation('validation.client_name_already_exists'),
+                }))->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',
-                UniqueEloquent::make(OrganizationInvitation::class, 'email', function (Builder $builder): Builder {
+                (new UniqueEloquent(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,7 +31,6 @@ class MemberUpdateRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
             ],
         ];
     }

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

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

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

@@ -20,7 +20,6 @@ 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',
-                UniqueEloquent::make(Project::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Project::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->withCustomTranslation('validation.project_name_already_exists'),
+                }))->withCustomTranslation('validation.project_name_already_exists'),
             ],
             'color' => [
                 'required',
@@ -51,22 +51,20 @@ class ProjectStoreRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
             ],
             // ID of the client
             'client_id' => [
                 'nullable',
-                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(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',
             ],
         ];
     }

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

@@ -32,10 +32,10 @@ class ProjectUpdateRequest extends FormRequest
                 'required',
                 'string',
                 'max:255',
-                UniqueEloquent::make(Project::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Project::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->ignore($this->project?->getKey())->withCustomTranslation('validation.project_name_already_exists'),
+                }))->ignore($this->project?->getKey())->withCustomTranslation('validation.project_name_already_exists'),
             ],
             'color' => [
                 'required',
@@ -52,23 +52,21 @@ class ProjectUpdateRequest extends FormRequest
             ],
             'client_id' => [
                 'nullable',
-                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(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',
             ],
         ];
     }

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

@@ -4,11 +4,13 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\ProjectMember;
 
+use App\Enums\ProjectMemberRole;
 use App\Models\Member;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
@@ -19,23 +21,28 @@ class ProjectMemberStoreRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
      */
     public function rules(): array
     {
         return [
             'member_id' => [
                 'required',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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',
+            ],
+            'role' => [
+                'required',
+                'string',
+                Rule::enum(ProjectMemberRole::class),
             ],
         ];
     }
@@ -46,4 +53,9 @@ class ProjectMemberStoreRequest extends FormRequest
 
         return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
     }
+
+    public function getRole(): ProjectMemberRole
+    {
+        return ProjectMemberRole::from($this->validated('role'));
+    }
 }

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

@@ -4,9 +4,11 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\ProjectMember;
 
+use App\Enums\ProjectMemberRole;
 use App\Models\Organization;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 /**
  * @property Organization $organization Organization from model binding
@@ -16,7 +18,7 @@ class ProjectMemberUpdateRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
      */
     public function rules(): array
     {
@@ -25,7 +27,10 @@ class ProjectMemberUpdateRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
+            ],
+            'role' => [
+                'string',
+                Rule::enum(ProjectMemberRole::class),
             ],
         ];
     }
@@ -34,6 +39,11 @@ class ProjectMemberUpdateRequest extends FormRequest
     {
         $input = $this->input('billable_rate');
 
-        return $input !== null && $input !== 0 ? (int) $this->input('billable_rate') : null;
+        return $input !== null && ((int) $input) !== 0 ? (int) $this->validated('billable_rate') : null;
+    }
+
+    public function getRole(): ?ProjectMemberRole
+    {
+        return $this->has('role') ? ProjectMemberRole::from($this->validated('role')) : null;
     }
 }

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

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

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

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

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

@@ -31,24 +31,23 @@ class TaskStoreRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                UniqueEloquent::make(Task::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Task::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->where('project_id', '=', $this->input('project_id'));
-                })->withCustomTranslation('validation.task_name_already_exists'),
+                }))->withCustomTranslation('validation.task_name_already_exists'),
             ],
             'project_id' => [
                 'required',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(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',
             ],
         ];
     }

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

@@ -30,10 +30,10 @@ class TaskUpdateRequest extends FormRequest
                 'string',
                 'min:1',
                 'max:255',
-                UniqueEloquent::make(Task::class, 'name', function (Builder $builder): Builder {
+                (new UniqueEloquent(Task::class, 'name', function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->where('project_id', '=', $this->task->project_id);
-                })->ignore($this->task?->getKey())->withCustomTranslation('validation.task_name_already_exists'),
+                }))->ignore($this->task?->getKey())->withCustomTranslation('validation.task_name_already_exists'),
             ],
             'is_done' => [
                 'boolean',
@@ -43,7 +43,6 @@ class TaskUpdateRequest extends FormRequest
                 'nullable',
                 'integer',
                 'min:0',
-                'max:2147483647',
             ],
         ];
     }

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

@@ -1,193 +0,0 @@
-<?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 [
-            'format' => [
-                'required',
-                'string',
-                Rule::enum(ExportFormat::class),
-            ],
-            'group' => [
-                'required',
-                Rule::enum(TimeEntryAggregationType::class),
-            ],
-
-            'sub_group' => [
-                'required',
-                Rule::enum(TimeEntryAggregationType::class),
-            ],
-
-            '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',
-            ],
-        ];
-    }
-
-    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
-    {
-        return Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('start'), 'UTC');
-    }
-
-    public function getEnd(): Carbon
-    {
-        return Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('end'), 'UTC');
-    }
-
-    public function getFormatValue(): ExportFormat
-    {
-        return ExportFormat::from($this->validated('format'));
-    }
-}

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

@@ -45,10 +45,11 @@ class TimeEntryAggregateRequest extends FormRequest
             // Filter by member ID
             'member_id' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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' => [
@@ -57,19 +58,21 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'member_ids.*' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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 {
+                'uuid',
+                new ExistsEloquent(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' => [
@@ -78,10 +81,11 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'project_ids.*' => [
                 'string',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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' => [
@@ -90,22 +94,24 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'client_ids.*' => [
                 'string',
-                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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
+            // Filter by tag IDs, tag IDs are AND combined
             'tag_ids' => [
                 'array',
                 'min:1',
             ],
             'tag_ids.*' => [
                 'string',
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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' => [
@@ -114,9 +120,10 @@ class TimeEntryAggregateRequest extends FormRequest
             ],
             'task_ids.*' => [
                 'string',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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

@@ -1,34 +0,0 @@
-<?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

@@ -1,143 +0,0 @@
-<?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\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' => [
-                'nullable',
-                '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' => [
-                'nullable',
-                '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',
-            ],
-        ];
-    }
-
-    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,7 +4,6 @@ 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;
@@ -31,10 +30,11 @@ class TimeEntryIndexRequest extends FormRequest
             // Filter by member ID
             'member_id' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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,22 +43,11 @@ class TimeEntryIndexRequest extends FormRequest
             ],
             'member_ids.*' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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' => [
@@ -67,22 +56,24 @@ class TimeEntryIndexRequest extends FormRequest
             ],
             'project_ids.*' => [
                 'string',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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 OR combined
+            // Filter by tag IDs, tag IDs are AND combined
             'tag_ids' => [
                 'array',
                 'min:1',
             ],
             'tag_ids.*' => [
                 'string',
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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' => [
@@ -91,10 +82,11 @@ class TimeEntryIndexRequest extends FormRequest
             ],
             'task_ids.*' => [
                 'string',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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' => [
@@ -125,12 +117,6 @@ 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',
@@ -143,14 +129,4 @@ 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,33 +31,36 @@ class TimeEntryStoreRequest extends FormRequest
             'member_id' => [
                 'required',
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(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',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                }),
+                (new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization')
                         ->where('project_id', $this->input('project_id'));
-                })->uuid()->withMessage(__('validation.task_belongs_to_project')),
+                }))->withMessage(__('validation.task_belongs_to_project')),
             ],
             // Start of time entry (ISO 8601 format, UTC timezone)
             'start' => [
@@ -87,10 +90,12 @@ class TimeEntryStoreRequest extends FormRequest
                 'array',
             ],
             'tags.*' => [
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                'string',
+                'uuid',
+                new ExistsEloquent(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,34 +42,37 @@ class TimeEntryUpdateMultipleRequest extends FormRequest
             // ID of the organization member that the time entry should belong to
             'changes.member_id' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(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',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                }),
+                (new ExistsEloquent(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'));
-                })->uuid()->withMessage(__('validation.task_belongs_to_project')),
+                }))->withMessage(__('validation.task_belongs_to_project')),
             ],
             // Whether time entry is billable
             'changes.billable' => [
@@ -88,10 +91,11 @@ class TimeEntryUpdateMultipleRequest extends FormRequest
             ],
             'changes.tags.*' => [
                 'string',
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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,34 +30,37 @@ class TimeEntryUpdateRequest extends FormRequest
             // ID of the organization member that the time entry should belong to
             'member_id' => [
                 'string',
-                ExistsEloquent::make(Member::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(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',
-                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                new ExistsEloquent(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',
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
-                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                }),
+                (new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Task> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization')
                         ->where('project_id', $this->input('project_id'));
-                })->uuid()->withMessage(__('validation.task_belongs_to_project')),
+                }))->withMessage(__('validation.task_belongs_to_project')),
             ],
             // Start of time entry (ISO 8601 format, UTC timezone)
             'start' => [
@@ -86,10 +89,11 @@ class TimeEntryUpdateRequest extends FormRequest
             ],
             'tags.*' => [
                 'string',
-                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                'uuid',
+                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Tag> $builder */
                     return $builder->whereBelongsTo($this->organization, 'organization');
-                })->uuid(),
+                }),
             ],
         ];
     }

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

@@ -13,20 +13,6 @@ 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.
      *
@@ -42,9 +28,7 @@ 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->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,
+            'billable_rate' => $this->resource->billable_rate,
         ];
     }
 }

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

@@ -5,39 +5,14 @@ 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;
-
     /**
-     * @param  LengthAwarePaginator<Project>  $resource
-     */
-    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.
+     * The resource that this resource collects.
      *
-     * @return array<array<string, string|bool|int|null>>
+     * @var string
      */
-    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();
-    }
+    public $collects = ProjectResource::class;
 }

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

@@ -13,15 +13,6 @@ 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.
      *
@@ -29,6 +20,8 @@ class ProjectResource extends BaseResource
      */
     public function toArray(Request $request): array
     {
+        $limitedVisibility = is_bool($this->resource->getAttributeValue('limited_visibility')) ? $this->resource->getAttributeValue('limited_visibility') : true;
+
         return [
             /** @var string $id ID of project */
             'id' => $this->resource->id,
@@ -41,13 +34,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->showBillableRate ? $this->resource->billable_rate : null,
+            'billable_rate' => $limitedVisibility ? null : $this->resource->billable_rate,
             /** @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,
+            'estimated_time' => $limitedVisibility ? null : $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,
+            'spent_time' => $limitedVisibility ? null : $this->resource->spent_time,
+            /** @var bool $limited_visibility */
+            'limited_visibility' => $limitedVisibility,
         ];
     }
 }

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

@@ -29,6 +29,8 @@ class ProjectMemberResource extends BaseResource
             'member_id' => $this->resource->member_id,
             /** @var string $project_id ID of the project */
             'project_id' => $this->resource->project_id,
+            /** @var string $role Role of the project member */
+            'role' => $this->resource->role->value,
         ];
     }
 }

app/Http/Resources/V1/TimeEntry/TimeEntryCollection.php

@@ -4,10 +4,9 @@ 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 implements PaginatedResourceCollection
+class TimeEntryCollection extends ResourceCollection
 {
     /**
      * The resource that this resource collects.

app/Models/Organization.php

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

app/Models/ProjectMember.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Enums\ProjectMemberRole;
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\ProjectMemberFactory;
@@ -22,6 +23,7 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property string $user_id User ID (legacy)
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
+ * @property ProjectMemberRole $role
  * @property-read Project $project
  * @property-read Member $member
  * @property-read User $user
@@ -45,6 +47,7 @@ class ProjectMember extends Model implements AuditableContract
      */
     protected $casts = [
         'billable_rate' => 'int',
+        'role' => ProjectMemberRole::class,
     ];
 
     /**

app/Models/Tag.php

@@ -7,14 +7,11 @@ 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
@@ -22,7 +19,6 @@ use Staudenmeir\EloquentJsonRelations\Relations\HasManyJson;
  * @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()
@@ -34,7 +30,6 @@ class Tag extends Model implements AuditableContract
     /** @use HasFactory<TagFactory> */
     use HasFactory;
 
-    use HasJsonRelationships;
     use HasUuids;
 
     /**
@@ -53,14 +48,4 @@ 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/TimeEntry.php

@@ -10,16 +10,12 @@ 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
@@ -45,7 +41,6 @@ use Staudenmeir\EloquentJsonRelations\Relations\BelongsToJson;
  * @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()
@@ -58,7 +53,6 @@ class TimeEntry extends Model implements AuditableContract
     /** @use HasFactory<TimeEntryFactory> */
     use HasFactory;
 
-    use HasJsonRelationships;
     use HasUuids;
 
     /**
@@ -85,7 +79,6 @@ class TimeEntry extends Model implements AuditableContract
      */
     protected array $computed = [
         'billable_rate',
-        'client_id',
     ];
 
     /**
@@ -102,44 +95,6 @@ class TimeEntry extends Model implements AuditableContract
         return app(BillableRateService::class)->getBillableRateForTimeEntry($this);
     }
 
-    public function getClientIdComputed(): ?string
-    {
-        return $this->project_id === null ? null : $this->project->client_id;
-    }
-
-    /**
-     * This scope will be applied during the computed property generation with artisan computed-attributes:generate.
-     *
-     * @param  Builder<TimeEntry>  $builder
-     * @param  array<string>  $attributes  Attributes that will be generated.
-     * @return Builder<TimeEntry>
-     */
-    public function scopeComputedAttributesGenerate(Builder $builder, array $attributes): Builder
-    {
-        if (in_array('client_id', $attributes, true)) {
-            $builder->with([
-                'project' => function (Relation $builder): void {
-                    /** @var Builder<Project> $builder */
-                    $builder->select('id', 'client_id');
-                },
-            ]);
-        }
-
-        return $builder;
-    }
-
-    /**
-     * This scope will be applied during the computed property validation with artisan computed-attributes:validate.
-     *
-     * @param  Builder<TimeEntry>  $builder
-     * @param  array<string>  $attributes  Attributes that will be validated.
-     * @return Builder<TimeEntry>
-     */
-    public function scopeComputedAttributesValidate(Builder $builder, array $attributes): Builder
-    {
-        return $this->scopeComputedAttributesGenerate($builder, $attributes);
-    }
-
     public function getDuration(): ?CarbonInterval
     {
         return $this->end === null ? null : $this->start->diffAsCarbonInterval($this->end);
@@ -202,14 +157,4 @@ 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,9 +25,7 @@ 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;
 
 /**
@@ -180,22 +178,6 @@ 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,6 +28,7 @@ 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;
@@ -90,10 +91,9 @@ class AppServiceProvider extends ServiceProvider
             );
         });
 
-        if (config('app.force_https', false)) {
+        if (config('app.force_https', false) || App::isProduction()) {
             URL::forceScheme('https');
-            request()->server->set('HTTPS', 'on');
-            request()->headers->set('X-Forwarded-Proto', 'https');
+            request()->server->set('HTTPS', request()->header('X-Forwarded-Proto', 'https') === 'https' ? 'on' : 'off');
         }
 
         $this->app->scoped(PermissionStore::class, function (Application $app): PermissionStore {

app/Providers/Filament/AdminPanelProvider.php

@@ -5,7 +5,6 @@ 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;
@@ -45,13 +44,11 @@ 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/Service/ApiService.php

@@ -1,93 +0,0 @@
-<?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/BillingContract.php

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

app/Service/DashboardService.php

@@ -47,24 +47,22 @@ class DashboardService
     {
         $result = [];
         $windowSize = 24 / $windows;
-        $end = Carbon::now($timeZone)->startOfDay()->addDay()->subHours(3)->utc()->toDateTimeString();
+        $end = Carbon::now($timeZone)->endOfDay()->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 = $dateUtc->copy();
+            $tempDate = $date->copy();
             $start = $tempDate->copy()->utc()->toDateTimeString();
             $tempWindows = [];
             for ($j = 0; $j < $windows; $j++) {
-                $tempWindow = $tempDate->toDateTimeString();
+                $tempWindow = $tempDate->utc()->toDateTimeString();
                 $tempWindows[] = $tempWindow;
                 $tempDate->addHours($windowSize);
             }
             $result[$dateString] = $tempWindows;
             $date->subDay();
-            $dateUtc->subDay();
         }
 
         return [

app/Service/DeletionService.php

@@ -144,7 +144,6 @@ class DeletionService
             ->get();
 
         foreach ($members as $member) {
-            /** @var Member $member */
             if ($member->role === Role::Owner->value && $member->organization->users()->count() > 1) {
                 throw new CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers;
             }
@@ -155,13 +154,10 @@ class DeletionService
             if ($member->role === Role::Owner->value) {
                 $this->deleteOrganization($member->organization, false, $user);
             } else {
-                $this->memberService->makeMemberToPlaceholder($member, false);
+                $this->memberService->makeMemberToPlaceholder($member);
             }
         }
 
-        $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/Export/ExportService.php

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

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -47,8 +47,6 @@ 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,7 +112,6 @@ abstract class DefaultImporter implements ImporterContract
             'billable_rate' => [
                 'nullable',
                 'integer',
-                'max:2147483647',
             ],
         ], beforeSave: function (Project $project): void {
             if ($project->billable_rate === 0) {
@@ -126,7 +125,6 @@ abstract class DefaultImporter implements ImporterContract
             'billable_rate' => [
                 'nullable',
                 'integer',
-                'max:2147483647',
             ],
         ], beforeSave: function (ProjectMember $projectMember): void {
             if ($projectMember->billable_rate === 0) {

app/Service/Import/Importers/SolidtimeImporter.php

@@ -60,8 +60,6 @@ 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');
@@ -69,8 +67,6 @@ 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');
@@ -78,8 +74,6 @@ 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');
@@ -87,8 +81,6 @@ 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');
@@ -96,8 +88,6 @@ 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');
@@ -105,8 +95,6 @@ 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');
@@ -114,8 +102,6 @@ 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');
@@ -123,8 +109,6 @@ 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([

app/Service/Import/Importers/TogglTimeEntriesImporter.php

@@ -47,8 +47,6 @@ class TogglTimeEntriesImporter 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/IntervalService.php

@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service;
-
-use Carbon\CarbonInterval;
-
-class IntervalService
-{
-    public function format(CarbonInterval $interval): string
-    {
-        $interval->cascade();
-
-        return ((int) floor($interval->totalHours)).':'.$interval->format('%I:%S');
-    }
-}

app/Service/MemberService.php

@@ -44,7 +44,7 @@ class MemberService
         }
     }
 
-    public function makeMemberToPlaceholder(Member $member, bool $makeSureUserHasAtLeastOneOrganization = true): void
+    public function makeMemberToPlaceholder(Member $member): void
     {
         $user = $member->user;
         $placeholderUser = $user->replicate();
@@ -56,8 +56,6 @@ class MemberService
         $member->save();
 
         $this->userService->assignOrganizationEntitiesToDifferentMember($member->organization, $user, $placeholderUser, $member);
-        if ($makeSureUserHasAtLeastOneOrganization) {
-            $this->userService->makeSureUserHasAtLeastOneOrganization($user);
-        }
+        $this->userService->makeSureUserHasAtLeastOneOrganization($user);
     }
 }

app/Service/ReportExport/CsvExport.php

@@ -1,118 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service\ReportExport;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\File;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Storage;
-use League\Csv\Writer;
-use Spatie\TemporaryDirectory\TemporaryDirectory;
-
-/**
- * @template T of Model
- */
-abstract class CsvExport
-{
-    private string $disk;
-
-    private string $filename;
-
-    private int $chunk;
-
-    /**
-     * @var string[]
-     */
-    public const array HEADER = [];
-
-    /**
-     * @var Builder<T>
-     */
-    private Builder $builder;
-
-    private string $folderPath;
-
-    protected const string CARBON_FORMAT = 'Y-m-d\TH:i:sP';
-
-    /**
-     * @param  Builder<T>  $builder
-     */
-    public function __construct(string $disk, string $folderPath, string $filename, Builder $builder, int $chunk)
-    {
-
-        $this->disk = $disk;
-        $this->filename = $filename;
-        $this->chunk = $chunk;
-        $this->builder = $builder;
-        $this->folderPath = $folderPath;
-    }
-
-    /**
-     * @param  T  $model
-     * @return array<string, string|float|Carbon|null>
-     */
-    abstract public function mapRow(Model $model): array;
-
-    /**
-     * @throws \League\Csv\CannotInsertRecord
-     * @throws \League\Csv\Exception
-     * @throws \League\Csv\UnavailableStream
-     */
-    public function export(): void
-    {
-        $tempDirectory = TemporaryDirectory::make();
-        $writer = Writer::createFromPath($tempDirectory->path($this->filename), 'w+');
-        $writer->setDelimiter(',');
-        $writer->setEnclosure('"');
-        $writer->setEscape('');
-        $writer->insertOne(static::HEADER);
-
-        $this->builder->chunk($this->chunk, function (Collection $models) use ($writer): void {
-            foreach ($models as $model) {
-                $data = $this->mapRow($model);
-                $row = $this->convertRow($data);
-                $this->validateRow($row);
-
-                $writer->insertOne(array_values($row));
-            }
-        });
-        Storage::disk($this->disk)->putFileAs($this->folderPath, new File($tempDirectory->path($this->filename)), $this->filename);
-        $tempDirectory->delete();
-    }
-
-    /**
-     * @param  array<string, string|float|Carbon|null>  $data
-     * @return array<string, string>
-     */
-    private function convertRow(array $data): array
-    {
-        $convertedRow = [];
-        foreach ($data as $key => $value) {
-            if ($value instanceof Carbon) {
-                $convertedRow[$key] = $value->format(static::CARBON_FORMAT);
-            } elseif (is_float($value)) {
-                $convertedRow[$key] = (string) $value;
-            } elseif ($value === null) {
-                $convertedRow[$key] = '';
-            } else {
-                $convertedRow[$key] = $value;
-            }
-        }
-
-        return $convertedRow;
-    }
-
-    /**
-     * @param  array<string, string>  $row
-     */
-    private function validateRow(array $row): void
-    {
-        if (array_keys($row) !== static::HEADER) {
-            throw new \LogicException('Invalid row');
-        }
-    }
-}

app/Service/ReportExport/TimeEntriesDetailedCsvExport.php

@@ -1,64 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service\ReportExport;
-
-use App\Models\TimeEntry;
-use App\Service\IntervalService;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * @extends CsvExport<TimeEntry>
- */
-class TimeEntriesDetailedCsvExport extends CsvExport
-{
-    public const array HEADER = [
-        'Description',
-        'Task',
-        'Project',
-        'Client',
-        'User',
-        'Start',
-        'End',
-        'Duration',
-        'Duration (decimal)',
-        'Billable',
-        'Tags',
-    ];
-
-    protected const string CARBON_FORMAT = 'Y-m-d H:i:s';
-
-    private string $timezone;
-
-    public function __construct(string $disk, string $folderPath, string $filename, Builder $builder, int $chunk, string $timezone)
-    {
-        parent::__construct($disk, $folderPath, $filename, $builder, $chunk);
-
-        $this->timezone = $timezone;
-    }
-
-    /**
-     * @param  TimeEntry  $model
-     */
-    public function mapRow(Model $model): array
-    {
-        $interval = app(IntervalService::class);
-        $duration = $model->getDuration();
-
-        return [
-            'Description' => $model->description,
-            'Task' => $model->task?->name,
-            'Project' => $model->project?->name,
-            'Client' => $model->client?->name,
-            'User' => $model->user->name,
-            'Start' => $model->start->timezone($this->timezone),
-            'End' => $model->end->timezone($this->timezone),
-            'Duration' => $duration !== null ? $interval->format($model->getDuration()) : null,
-            'Duration (decimal)' => $duration?->totalHours,
-            'Billable' => $model->billable ? 'Yes' : 'No',
-            'Tags' => $model->tagsRelation->pluck('name')->implode(', '),
-        ];
-    }
-}

app/Service/ReportExport/TimeEntriesDetailedExport.php

@@ -1,151 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service\ReportExport;
-
-use App\Enums\ExportFormat;
-use App\Models\TimeEntry;
-use App\Service\IntervalService;
-use Illuminate\Database\Eloquent\Builder;
-use LogicException;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Maatwebsite\Excel\Concerns\WithColumnFormatting;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithStyles;
-use PhpOffice\PhpSpreadsheet\Shared\Date;
-use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
-use PhpOffice\PhpSpreadsheet\Style\Style;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-
-/**
- * @implements WithMapping<TimeEntry>
- */
-class TimeEntriesDetailedExport implements FromQuery, ShouldAutoSize, WithColumnFormatting, WithHeadings, WithMapping, WithStyles
-{
-    use Exportable;
-
-    /**
-     * @var Builder<TimeEntry>
-     */
-    private Builder $builder;
-
-    private ExportFormat $exportFormat;
-
-    private string $timezone;
-
-    /**
-     * @param  Builder<TimeEntry>  $builder
-     */
-    public function __construct(Builder $builder, ExportFormat $exportFormat, string $timezone)
-    {
-        $this->builder = $builder;
-        $this->exportFormat = $exportFormat;
-        $this->timezone = $timezone;
-    }
-
-    /**
-     * @return Builder<TimeEntry>
-     */
-    public function query(): Builder
-    {
-        return $this->builder;
-    }
-
-    /**
-     * @return array<string, string>
-     */
-    public function columnFormats(): array
-    {
-        if ($this->exportFormat === ExportFormat::XLSX) {
-            return [
-                'F' => 'yyyy-mm-dd hh:mm:ss',
-                'G' => 'yyyy-mm-dd hh:mm:ss',
-                'I' => NumberFormat::FORMAT_NUMBER_00,
-            ];
-        } elseif ($this->exportFormat === ExportFormat::ODS) {
-            return [
-                'I' => NumberFormat::FORMAT_NUMBER_00,
-            ];
-        } else {
-            throw new LogicException('Unsupported export format.');
-        }
-
-    }
-
-    /**
-     * @return array<int|string, array<string, array<string, bool>>>
-     */
-    public function styles(Worksheet $sheet): array
-    {
-        return [
-            // Style the first row as bold text.
-            1 => ['font' => ['bold' => true]],
-        ];
-    }
-
-    /**
-     * @return string[]
-     */
-    public function headings(): array
-    {
-        return [
-            'Description',
-            'Task',
-            'Project',
-            'Client',
-            'User',
-            'Start',
-            'End',
-            'Duration',
-            'Duration (decimal)',
-            'Billable',
-            'Tags',
-        ];
-    }
-
-    /**
-     * @param  TimeEntry  $model
-     * @return array<int, string|float|null>
-     */
-    public function map($model): array
-    {
-        $interval = app(IntervalService::class);
-        $duration = $model->getDuration();
-
-        if ($this->exportFormat === ExportFormat::XLSX) {
-            return [
-                $model->description,
-                $model->task?->name,
-                $model->project?->name,
-                $model->client?->name,
-                $model->user->name,
-                Date::dateTimeToExcel($model->start->timezone($this->timezone)),
-                $model->end !== null ? Date::dateTimeToExcel($model->end->timezone($this->timezone)) : null,
-                $duration !== null ? $interval->format($duration) : null,
-                $duration?->totalHours,
-                $model->billable ? 'Yes' : 'No',
-                $model->tagsRelation->pluck('name')->implode(', '),
-            ];
-        } elseif ($this->exportFormat === ExportFormat::ODS) {
-            return [
-                $model->description,
-                $model->task?->name,
-                $model->project?->name,
-                $model->client?->name,
-                $model->user->name,
-                $model->start->timezone($this->timezone)->format('Y-m-d H:i:s'),
-                $model->end?->timezone($this->timezone)?->format('Y-m-d H:i:s'),
-                $duration !== null ? (int) floor($duration->totalHours).':'.$duration->format('%I:%S') : null,
-                $duration?->totalHours,
-                $model->billable ? 'Yes' : 'No',
-                $model->tagsRelation->pluck('name')->implode(', '),
-            ];
-        } else {
-            throw new LogicException('Unsupported export format.');
-        }
-    }
-}

app/Service/ReportExport/TimeEntriesReportExport.php

@@ -1,100 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Service\ReportExport;
-
-use App\Enums\ExportFormat;
-use App\Enums\TimeEntryAggregationType;
-use Illuminate\View\View;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromView;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Maatwebsite\Excel\Concerns\WithCustomCsvSettings;
-
-class TimeEntriesReportExport implements FromView, ShouldAutoSize, WithCustomCsvSettings
-{
-    use Exportable;
-
-    /**
-     * @var array{
-     *        grouped_type: string|null,
-     *        grouped_data: null|array<array{
-     *            key: string|null,
-     *            seconds: int,
-     *            cost: int,
-     *            grouped_type: string|null,
-     *            grouped_data: null|array<array{
-     *                key: string|null,
-     *                seconds: int,
-     *                cost: int,
-     *                grouped_type: null,
-     *                grouped_data: null
-     *            }>
-     *        }>,
-     *        seconds: int,
-     *        cost: int
-     *  }
-     */
-    private array $data;
-
-    private ExportFormat $exportFormat;
-
-    private string $currency;
-
-    private TimeEntryAggregationType $group;
-
-    private TimeEntryAggregationType $subGroup;
-
-    /**
-     * @param array{
-     *         grouped_type: string|null,
-     *         grouped_data: null|array<array{
-     *             key: string|null,
-     *             seconds: int,
-     *             cost: int,
-     *             grouped_type: string|null,
-     *             grouped_data: null|array<array{
-     *                 key: string|null,
-     *                 seconds: int,
-     *                 cost: int,
-     *                 grouped_type: null,
-     *                 grouped_data: null
-     *             }>
-     *         }>,
-     *         seconds: int,
-     *         cost: int
-     *   } $data
-     */
-    public function __construct(array $data, ExportFormat $exportFormat, string $currency, TimeEntryAggregationType $group, TimeEntryAggregationType $subGroup)
-    {
-        $this->data = $data;
-        $this->exportFormat = $exportFormat;
-        $this->currency = $currency;
-        $this->group = $group;
-        $this->subGroup = $subGroup;
-    }
-
-    public function view(): View
-    {
-        return view('reports.time-entry-aggregate-index-excel', [
-            'data' => $this->data,
-            'currency' => $this->currency,
-            'group' => $this->group,
-            'subGroup' => $this->subGroup,
-            'exportFormat' => $this->exportFormat,
-        ]);
-    }
-
-    /**
-     * @return array<string, string>
-     */
-    public function getCsvSettings(): array
-    {
-        return [
-            'delimiter' => ',',
-            'enclosure' => '"',
-            'escape_character' => '',
-        ];
-    }
-}

app/Service/TimeEntryAggregationService.php

@@ -7,11 +7,7 @@ namespace App\Service;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
 use App\Enums\Weekday;
-use App\Models\Client;
-use App\Models\Project;
-use App\Models\Task;
 use App\Models\TimeEntry;
-use App\Models\User;
 use Carbon\CarbonTimeZone;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -139,118 +135,6 @@ class TimeEntryAggregationService
         ];
     }
 
-    /**
-     * @param  Builder<TimeEntry>  $timeEntriesQuery
-     * @return 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
-     * }
-     */
-    public function getAggregatedTimeEntriesWithDescriptions(Builder $timeEntriesQuery, ?TimeEntryAggregationType $group1Type, ?TimeEntryAggregationType $group2Type, string $timezone, Weekday $startOfWeek, bool $fillGapsInTimeGroups, ?Carbon $start, ?Carbon $end): array
-    {
-        $aggregatedTimeEntries = $this->getAggregatedTimeEntries($timeEntriesQuery, $group1Type, $group2Type, $timezone, $startOfWeek, $fillGapsInTimeGroups, $start, $end);
-
-        $keysGroup1 = [];
-        $keysGroup2 = [];
-
-        if ($aggregatedTimeEntries['grouped_data'] !== null) {
-            foreach ($aggregatedTimeEntries['grouped_data'] as $group1) {
-                $keysGroup1[] = $group1['key'];
-                if ($group1['grouped_data'] !== null) {
-                    foreach ($group1['grouped_data'] as $group2) {
-                        $keysGroup2[] = $group2['key'];
-                    }
-                }
-            }
-        }
-
-        $descriptionMapGroup1 = $group1Type !== null ? $this->loadDescriptionMap($keysGroup1, $group1Type) : [];
-        $descriptionMapGroup2 = $group2Type !== null ? $this->loadDescriptionMap($keysGroup2, $group2Type) : [];
-
-        if ($aggregatedTimeEntries['grouped_data'] !== null) {
-            foreach ($aggregatedTimeEntries['grouped_data'] as $keyGroup1 => $group1) {
-                $aggregatedTimeEntries['grouped_data'][$keyGroup1]['description'] = $group1['key'] !== null ? ($descriptionMapGroup1[$group1['key']] ?? null) : null;
-                if ($aggregatedTimeEntries['grouped_data'][$keyGroup1]['grouped_data'] !== null) {
-                    foreach ($aggregatedTimeEntries['grouped_data'][$keyGroup1]['grouped_data'] as $keyGroup2 => $group2) {
-                        $aggregatedTimeEntries['grouped_data'][$keyGroup1]['grouped_data'][$keyGroup2]['description'] = $group2['key'] !== null ? ($descriptionMapGroup2[$group2['key']] ?? null) : null;
-                    }
-                }
-            }
-        }
-
-        /**
-         * @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
-         *  } $aggregatedTimeEntries
-         */
-
-        return $aggregatedTimeEntries;
-    }
-
-    /**
-     * @param  array<int, string>  $keys
-     * @return array<string, string>
-     */
-    private function loadDescriptionMap(array $keys, TimeEntryAggregationType $type): array
-    {
-        if ($type === TimeEntryAggregationType::Client) {
-            return Client::query()
-                ->whereIn('id', $keys)
-                ->pluck('name', 'id')
-                ->toArray();
-        } elseif ($type === TimeEntryAggregationType::User) {
-            return User::query()
-                ->whereIn('id', $keys)
-                ->pluck('name', 'id')
-                ->toArray();
-        } elseif ($type === TimeEntryAggregationType::Project) {
-            return Project::query()
-                ->whereIn('id', $keys)
-                ->pluck('name', 'id')
-                ->toArray();
-        } elseif ($type === TimeEntryAggregationType::Task) {
-            return Task::query()
-                ->whereIn('id', $keys)
-                ->pluck('name', 'id')
-                ->toArray();
-        } else {
-            return [];
-        }
-    }
-
     /**
      * @param array<array{
      *            key: string|null,

app/Service/TimeEntryFilter.php

@@ -133,11 +133,7 @@ class TimeEntryFilter
         if ($tagIds === null) {
             return $this;
         }
-        $this->builder->where(function (Builder $builder) use ($tagIds): void {
-            foreach ($tagIds as $tagId) {
-                $builder->orWhereJsonContains('tags', $tagId);
-            }
-        });
+        $this->builder->whereJsonContains('tags', $tagIds);
 
         return $this;
     }

composer.json

@@ -2,17 +2,16 @@
     "name": "solidtime-io/solidtime",
     "type": "project",
     "description": "An open-source time-tracking app",
+    "version": "0.0.1",
     "keywords": [],
     "license": "AGPL-3.0-or-later",
     "require": {
         "php": "8.3.*",
         "ext-zip": "*",
-        "brick/money": "^0.10.0",
-        "datomatic/laravel-enum-helper": "^2.0.0",
+        "brick/money": "^0.9.0",
         "dedoc/scramble": "dev-main",
         "filament/filament": "^3.2",
-        "flowframe/laravel-trend": "^0.3.0",
-        "gotenberg/gotenberg-php": "^2.8",
+        "flowframe/laravel-trend": "^0.2.0",
         "guzzlehttp/guzzle": "^7.2",
         "inertiajs/inertia-laravel": "^1.0",
         "korridor/laravel-computed-attributes": "^3.1",
@@ -22,18 +21,15 @@
         "laravel/octane": "^2.3",
         "laravel/passport": "^12.0",
         "laravel/tinker": "^2.8",
-        "league/csv": "^9.16.0",
         "league/flysystem-aws-s3-v3": "^3.0",
-        "maatwebsite/excel": "^3.1",
         "novadaemon/filament-pretty-json": "^2.2",
         "nwidart/laravel-modules": "^11.0.11",
         "owen-it/laravel-auditing": "^13.6",
         "pxlrbt/filament-environment-indicator": "^2.0",
         "spatie/temporary-directory": "^2.2",
-        "staudenmeir/eloquent-json-relations": "^1.1",
         "stechstudio/filament-impersonate": "^3.8",
         "tightenco/ziggy": "^2.1.0",
-        "tpetry/laravel-postgresql-enhanced": "^2.0.0",
+        "tpetry/laravel-postgresql-enhanced": "^1.0.0",
         "wikimedia/composer-merge-plugin": "^2.1.0"
     },
     "require-dev": {

config/app.php

@@ -18,11 +18,7 @@ return [
     |
     */
 
-    'name' => 'solidtime',
-
-    'version' => env('APP_VERSION'),
-
-    'build' => env('APP_BUILD'),
+    'name' => env('APP_NAME', 'solidtime'),
 
     /*
     |--------------------------------------------------------------------------
@@ -65,7 +61,7 @@ return [
 
     'asset_url' => env('ASSET_URL'),
 
-    'force_https' => (bool) env('APP_FORCE_HTTPS', false),
+    'force_https' => env('APP_FORCE_HTTPS', false),
 
     /*
     |--------------------------------------------------------------------------

config/excel.php

@@ -1,382 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Maatwebsite\Excel\Excel;
-use PhpOffice\PhpSpreadsheet\Reader\Csv;
-
-return [
-    'exports' => [
-
-        /*
-        |--------------------------------------------------------------------------
-        | Chunk size
-        |--------------------------------------------------------------------------
-        |
-        | When using FromQuery, the query is automatically chunked.
-        | Here you can specify how big the chunk should be.
-        |
-        */
-        'chunk_size' => 1000,
-
-        /*
-        |--------------------------------------------------------------------------
-        | Pre-calculate formulas during export
-        |--------------------------------------------------------------------------
-        */
-        'pre_calculate_formulas' => false,
-
-        /*
-        |--------------------------------------------------------------------------
-        | Enable strict null comparison
-        |--------------------------------------------------------------------------
-        |
-        | When enabling strict null comparison empty cells ('') will
-        | be added to the sheet.
-        */
-        'strict_null_comparison' => false,
-
-        /*
-        |--------------------------------------------------------------------------
-        | CSV Settings
-        |--------------------------------------------------------------------------
-        |
-        | Configure e.g. delimiter, enclosure and line ending for CSV exports.
-        |
-        */
-        'csv' => [
-            'delimiter' => ',',
-            'enclosure' => '"',
-            'line_ending' => PHP_EOL,
-            'use_bom' => false,
-            'include_separator_line' => false,
-            'excel_compatibility' => false,
-            'output_encoding' => '',
-            'test_auto_detect' => true,
-        ],
-
-        /*
-        |--------------------------------------------------------------------------
-        | Worksheet properties
-        |--------------------------------------------------------------------------
-        |
-        | Configure e.g. default title, creator, subject,...
-        |
-        */
-        'properties' => [
-            'creator' => '',
-            'lastModifiedBy' => '',
-            'title' => '',
-            'description' => '',
-            'subject' => '',
-            'keywords' => '',
-            'category' => '',
-            'manager' => '',
-            'company' => '',
-        ],
-    ],
-
-    'imports' => [
-
-        /*
-        |--------------------------------------------------------------------------
-        | Read Only
-        |--------------------------------------------------------------------------
-        |
-        | When dealing with imports, you might only be interested in the
-        | data that the sheet exists. By default we ignore all styles,
-        | however if you want to do some logic based on style data
-        | you can enable it by setting read_only to false.
-        |
-        */
-        'read_only' => true,
-
-        /*
-        |--------------------------------------------------------------------------
-        | Ignore Empty
-        |--------------------------------------------------------------------------
-        |
-        | When dealing with imports, you might be interested in ignoring
-        | rows that have null values or empty strings. By default rows
-        | containing empty strings or empty values are not ignored but can be
-        | ignored by enabling the setting ignore_empty to true.
-        |
-        */
-        'ignore_empty' => false,
-
-        /*
-        |--------------------------------------------------------------------------
-        | Heading Row Formatter
-        |--------------------------------------------------------------------------
-        |
-        | Configure the heading row formatter.
-        | Available options: none|slug|custom
-        |
-        */
-        'heading_row' => [
-            'formatter' => 'slug',
-        ],
-
-        /*
-        |--------------------------------------------------------------------------
-        | CSV Settings
-        |--------------------------------------------------------------------------
-        |
-        | Configure e.g. delimiter, enclosure and line ending for CSV imports.
-        |
-        */
-        'csv' => [
-            'delimiter' => null,
-            'enclosure' => '"',
-            'escape_character' => '\\',
-            'contiguous' => false,
-            'input_encoding' => Csv::GUESS_ENCODING,
-        ],
-
-        /*
-        |--------------------------------------------------------------------------
-        | Worksheet properties
-        |--------------------------------------------------------------------------
-        |
-        | Configure e.g. default title, creator, subject,...
-        |
-        */
-        'properties' => [
-            'creator' => '',
-            'lastModifiedBy' => '',
-            'title' => '',
-            'description' => '',
-            'subject' => '',
-            'keywords' => '',
-            'category' => '',
-            'manager' => '',
-            'company' => '',
-        ],
-
-        /*
-       |--------------------------------------------------------------------------
-       | Cell Middleware
-       |--------------------------------------------------------------------------
-       |
-       | Configure middleware that is executed on getting a cell value
-       |
-       */
-        'cells' => [
-            'middleware' => [
-                //\Maatwebsite\Excel\Middleware\TrimCellValue::class,
-                //\Maatwebsite\Excel\Middleware\ConvertEmptyCellValuesToNull::class,
-            ],
-        ],
-
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Extension detector
-    |--------------------------------------------------------------------------
-    |
-    | Configure here which writer/reader type should be used when the package
-    | needs to guess the correct type based on the extension alone.
-    |
-    */
-    'extension_detector' => [
-        'xlsx' => Excel::XLSX,
-        'xlsm' => Excel::XLSX,
-        'xltx' => Excel::XLSX,
-        'xltm' => Excel::XLSX,
-        'xls' => Excel::XLS,
-        'xlt' => Excel::XLS,
-        'ods' => Excel::ODS,
-        'ots' => Excel::ODS,
-        'slk' => Excel::SLK,
-        'xml' => Excel::XML,
-        'gnumeric' => Excel::GNUMERIC,
-        'htm' => Excel::HTML,
-        'html' => Excel::HTML,
-        'csv' => Excel::CSV,
-        'tsv' => Excel::TSV,
-
-        /*
-        |--------------------------------------------------------------------------
-        | PDF Extension
-        |--------------------------------------------------------------------------
-        |
-        | Configure here which Pdf driver should be used by default.
-        | Available options: Excel::MPDF | Excel::TCPDF | Excel::DOMPDF
-        |
-        */
-        'pdf' => Excel::DOMPDF,
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Value Binder
-    |--------------------------------------------------------------------------
-    |
-    | PhpSpreadsheet offers a way to hook into the process of a value being
-    | written to a cell. In there some assumptions are made on how the
-    | value should be formatted. If you want to change those defaults,
-    | you can implement your own default value binder.
-    |
-    | Possible value binders:
-    |
-    | [x] Maatwebsite\Excel\DefaultValueBinder::class
-    | [x] PhpOffice\PhpSpreadsheet\Cell\StringValueBinder::class
-    | [x] PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder::class
-    |
-    */
-    'value_binder' => [
-        'default' => Maatwebsite\Excel\DefaultValueBinder::class,
-    ],
-
-    'cache' => [
-        /*
-        |--------------------------------------------------------------------------
-        | Default cell caching driver
-        |--------------------------------------------------------------------------
-        |
-        | By default PhpSpreadsheet keeps all cell values in memory, however when
-        | dealing with large files, this might result into memory issues. If you
-        | want to mitigate that, you can configure a cell caching driver here.
-        | When using the illuminate driver, it will store each value in the
-        | cache store. This can slow down the process, because it needs to
-        | store each value. You can use the "batch" store if you want to
-        | only persist to the store when the memory limit is reached.
-        |
-        | Drivers: memory|illuminate|batch
-        |
-        */
-        'driver' => 'memory',
-
-        /*
-        |--------------------------------------------------------------------------
-        | Batch memory caching
-        |--------------------------------------------------------------------------
-        |
-        | When dealing with the "batch" caching driver, it will only
-        | persist to the store when the memory limit is reached.
-        | Here you can tweak the memory limit to your liking.
-        |
-        */
-        'batch' => [
-            'memory_limit' => 60000,
-        ],
-
-        /*
-        |--------------------------------------------------------------------------
-        | Illuminate cache
-        |--------------------------------------------------------------------------
-        |
-        | When using the "illuminate" caching driver, it will automatically use
-        | your default cache store. However if you prefer to have the cell
-        | cache on a separate store, you can configure the store name here.
-        | You can use any store defined in your cache config. When leaving
-        | at "null" it will use the default store.
-        |
-        */
-        'illuminate' => [
-            'store' => null,
-        ],
-
-        /*
-        |--------------------------------------------------------------------------
-        | Cache Time-to-live (TTL)
-        |--------------------------------------------------------------------------
-        |
-        | The TTL of items written to cache. If you want to keep the items cached
-        | indefinitely, set this to null.  Otherwise, set a number of seconds,
-        | a \DateInterval, or a callable.
-        |
-        | Allowable types: callable|\DateInterval|int|null
-        |
-         */
-        'default_ttl' => 10800,
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Transaction Handler
-    |--------------------------------------------------------------------------
-    |
-    | By default the import is wrapped in a transaction. This is useful
-    | for when an import may fail and you want to retry it. With the
-    | transactions, the previous import gets rolled-back.
-    |
-    | You can disable the transaction handler by setting this to null.
-    | Or you can choose a custom made transaction handler here.
-    |
-    | Supported handlers: null|db
-    |
-    */
-    'transactions' => [
-        'handler' => 'db',
-        'db' => [
-            'connection' => null,
-        ],
-    ],
-
-    'temporary_files' => [
-
-        /*
-        |--------------------------------------------------------------------------
-        | Local Temporary Path
-        |--------------------------------------------------------------------------
-        |
-        | When exporting and importing files, we use a temporary file, before
-        | storing reading or downloading. Here you can customize that path.
-        | permissions is an array with the permission flags for the directory (dir)
-        | and the create file (file).
-        |
-        */
-        'local_path' => storage_path('framework/cache/laravel-excel'),
-
-        /*
-        |--------------------------------------------------------------------------
-        | Local Temporary Path Permissions
-        |--------------------------------------------------------------------------
-        |
-        | Permissions is an array with the permission flags for the directory (dir)
-        | and the create file (file).
-        | If omitted the default permissions of the filesystem will be used.
-        |
-        */
-        'local_permissions' => [
-            // 'dir'  => 0755,
-            // 'file' => 0644,
-        ],
-
-        /*
-        |--------------------------------------------------------------------------
-        | Remote Temporary Disk
-        |--------------------------------------------------------------------------
-        |
-        | When dealing with a multi server setup with queues in which you
-        | cannot rely on having a shared local temporary path, you might
-        | want to store the temporary file on a shared disk. During the
-        | queue executing, we'll retrieve the temporary file from that
-        | location instead. When left to null, it will always use
-        | the local path. This setting only has effect when using
-        | in conjunction with queued imports and exports.
-        |
-        */
-        'remote_disk' => null,
-        'remote_prefix' => null,
-
-        /*
-        |--------------------------------------------------------------------------
-        | Force Resync
-        |--------------------------------------------------------------------------
-        |
-        | When dealing with a multi server setup as above, it's possible
-        | for the clean up that occurs after entire queue has been run to only
-        | cleanup the server that the last AfterImportJob runs on. The rest of the server
-        | would still have the local temporary file stored on it. In this case your
-        | local storage limits can be exceeded and future imports won't be processed.
-        | To mitigate this you can set this config value to be true, so that after every
-        | queued chunk is processed the local temporary file is deleted on the server that
-        | processed it.
-        |
-        */
-        'force_resync_remote' => null,
-    ],
-];

config/scheduling.php

@@ -6,7 +6,5 @@ return [
 
     'tasks' => [
         'time_entry_send_still_running_mails' => (bool) env('SCHEDULING_TASK_TIME_ENTRY_SEND_STILL_RUNNING_MAILS', true),
-        'self_hosting_check_for_update' => (bool) env('SCHEDULING_TASK_SELF_HOSTING_CHECK_FOR_UPDATE', true),
-        'self_hosting_telemetry' => (bool) env('SCHEDULING_TASK_SELF_HOSTING_TELEMETRY', true),
     ],
 ];

config/services.php

@@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-    'gotenberg' => [
-        'url' => env('GOTENBERG_URL'),
-        'basic_auth_username' => env('GOTENBERG_BASIC_AUTH_USERNAME'),
-        'basic_auth_password' => env('GOTENBERG_BASIC_AUTH_PASSWORD'),
-    ],
-];

database/factories/OrganizationFactory.php

@@ -26,7 +26,6 @@ class OrganizationFactory extends Factory
             'billable_rate' => null,
             'user_id' => User::factory(),
             'personal_team' => true,
-            'employees_can_see_billable_rates' => false,
         ];
     }
 

database/factories/ProjectFactory.php

@@ -11,7 +11,6 @@ use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Service\ColorService;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Carbon;
 
 /**
  * @extends Factory<Project>
@@ -47,21 +46,12 @@ class ProjectFactory extends Factory
         });
     }
 
-    public function billable(?int $billableRate = null): self
+    public function billable(): self
     {
-        return $this->state(function (array $attributes) use ($billableRate): array {
+        return $this->state(function (array $attributes): array {
             return [
                 'is_billable' => true,
-                'billable_rate' => $billableRate === null ? $this->faker->numberBetween(50, 1000) * 100 : $billableRate,
-            ];
-        });
-    }
-
-    public function createdAt(Carbon $createdAt): self
-    {
-        return $this->state(function (array $attributes) use ($createdAt): array {
-            return [
-                'created_at' => $createdAt,
+                'billable_rate' => $this->faker->numberBetween(50, 1000) * 100,
             ];
         });
     }

database/factories/ProjectMemberFactory.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Database\Factories;
 
+use App\Enums\ProjectMemberRole;
 use App\Models\Member;
 use App\Models\Project;
 use App\Models\ProjectMember;
@@ -24,12 +25,22 @@ class ProjectMemberFactory extends Factory
     {
         return [
             'billable_rate' => $this->faker->numberBetween(10, 10000) * 100,
+            'role' => ProjectMemberRole::Normal,
             'project_id' => Project::factory(),
             'user_id' => User::factory(),
             'member_id' => Member::factory(),
         ];
     }
 
+    public function role(ProjectMemberRole $role): self
+    {
+        return $this->state(function (array $attributes) use ($role) {
+            return [
+                'role' => $role,
+            ];
+        });
+    }
+
     /**
      * @deprecated Use forMember instead
      */

database/migrations/2024_09_30_155934_add_role_to_project_members_table.php

@@ -13,8 +13,8 @@ return new class extends Migration
      */
     public function up(): void
     {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->boolean('employees_can_see_billable_rates')->default(false);
+        Schema::table('project_members', function (Blueprint $table): void {
+            $table->string('role')->default('normal');
         });
     }
 
@@ -23,8 +23,8 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->dropColumn('employees_can_see_billable_rates');
+        Schema::table('project_members', function (Blueprint $table): void {
+            $table->dropColumn('role');
         });
     }
 };

database/migrations/2024_11_04_164807_add_foreign_key_to_organizations_and_members_table.php

@@ -1,93 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Query\Builder;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $foreignKeyProblems = DB::table('organizations')
-            ->select(['organizations.id', 'organizations.user_id'])
-            ->whereNotExists(function (Builder $query): void {
-                $query->select('id')
-                    ->from('users')
-                    ->whereColumn('organizations.user_id', 'users.id');
-            })
-            ->get();
-        foreach ($foreignKeyProblems as $foreignKeyProblem) {
-            Log::error('Organization with ID '.$foreignKeyProblem->id.' has non-existing owner with ID '.$foreignKeyProblem->user_id);
-        }
-        if ($foreignKeyProblems->count() > 0) {
-            throw new Exception('There are organizations with non-existing owners, check the logs for more information');
-        }
-        $foreignKeyProblems = DB::table('members')
-            ->select(['members.id', 'members.organization_id'])
-            ->whereNotExists(function (Builder $query): void {
-                $query->select('id')
-                    ->from('organizations')
-                    ->whereColumn('members.organization_id', 'organizations.id');
-            })
-            ->get();
-        foreach ($foreignKeyProblems as $foreignKeyProblem) {
-            Log::error('Member with ID '.$foreignKeyProblem->id.' has non-existing organization with ID '.$foreignKeyProblem->organization_id);
-        }
-        if ($foreignKeyProblems->count() > 0) {
-            throw new Exception('There are members with non-existing organizations, check the logs for more information');
-        }
-        $foreignKeyProblems = DB::table('members')
-            ->select(['members.id', 'members.user_id'])
-            ->whereNotExists(function (Builder $query): void {
-                $query->select('id')
-                    ->from('users')
-                    ->whereColumn('members.user_id', 'users.id');
-            })
-            ->get();
-        foreach ($foreignKeyProblems as $foreignKeyProblem) {
-            Log::error('Member with ID '.$foreignKeyProblem->id.' has non-existing user with ID '.$foreignKeyProblem->user_id);
-        }
-        if ($foreignKeyProblems->count() > 0) {
-            throw new Exception('There are members with non-existing users, check the logs for more information');
-        }
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->foreign('user_id')
-                ->references('id')
-                ->on('users')
-                ->onDelete('restrict')
-                ->onUpdate('cascade');
-        });
-        Schema::table('members', function (Blueprint $table): void {
-            $table->foreign('organization_id')
-                ->references('id')
-                ->on('organizations')
-                ->onDelete('restrict')
-                ->onUpdate('cascade');
-            $table->foreign('user_id')
-                ->references('id')
-                ->on('users')
-                ->onDelete('restrict')
-                ->onUpdate('cascade');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->dropForeign(['user_id']);
-        });
-        Schema::table('members', function (Blueprint $table): void {
-            $table->dropForeign(['organization_id']);
-            $table->dropForeign(['user_id']);
-        });
-    }
-};

database/migrations/2024_11_04_170614_add_foreign_keys_to_oauth_tables.php

@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Query\Builder;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        DB::table('oauth_access_tokens')
-            ->whereNotNull('user_id')
-            ->whereNotExists(function (Builder $query): void {
-                $query->select('id')
-                    ->from('users')
-                    ->whereColumn('oauth_access_tokens.user_id', 'users.id');
-            })
-            ->delete();
-        DB::table('oauth_access_tokens')
-            ->whereNotExists(function (Builder $query): void {
-                $query->select('id')
-                    ->from('oauth_clients')
-                    ->whereColumn('oauth_access_tokens.client_id', 'oauth_clients.id');
-            })
-            ->delete();
-        Schema::table('oauth_access_tokens', function (Blueprint $table): void {
-            $table->foreign('user_id')
-                ->references('id')
-                ->on('users')
-                ->onDelete('restrict')
-                ->onUpdate('cascade');
-            $table->foreign('client_id')
-                ->references('id')
-                ->on('oauth_clients')
-                ->onDelete('restrict')
-                ->onUpdate('cascade');
-        });
-        DB::table('oauth_auth_codes')
-            ->whereNotExists(function (Builder $query): void {
-                $query->select('id')
-                    ->from('users')
-                    ->whereColumn('oauth_auth_codes.user_id', 'users.id');
-            })
-            ->delete();
-        DB::table('oauth_auth_codes')
-            ->whereNotExists(function (Builder $query): void {
-                $query->select('id')
-                    ->from('oauth_clients')
-                    ->whereColumn('oauth_auth_codes.client_id', 'oauth_clients.id');
-            })
-            ->delete();
-        Schema::table('oauth_auth_codes', function (Blueprint $table): void {
-            $table->foreign('user_id')
-                ->references('id')
-                ->on('users')
-                ->onDelete('restrict')
-                ->onUpdate('cascade');
-            $table->foreign('client_id')
-                ->references('id')
-                ->on('oauth_clients')
-                ->onDelete('restrict')
-                ->onUpdate('cascade');
-        });
-        DB::table('oauth_clients')
-            ->whereNotNull('user_id')
-            ->whereNotExists(function (Builder $query): void {
-                $query->select('id')
-                    ->from('users')
-                    ->whereColumn('oauth_clients.user_id', 'users.id');
-            })
-            ->delete();
-        Schema::table('oauth_clients', function (Blueprint $table): void {
-            $table->foreign('user_id')
-                ->references('id')
-                ->on('users')
-                ->onDelete('restrict')
-                ->onUpdate('cascade');
-        });
-        Schema::table('oauth_personal_access_clients', function (Blueprint $table): void {
-            $table->foreign('client_id')
-                ->references('id')
-                ->on('oauth_clients')
-                ->onDelete('restrict')
-                ->onUpdate('cascade');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('oauth_access_tokens', function (Blueprint $table): void {
-            $table->dropForeign(['user_id']);
-            $table->dropForeign(['client_id']);
-        });
-        Schema::table('oauth_auth_codes', function (Blueprint $table): void {
-            $table->dropForeign(['user_id']);
-            $table->dropForeign(['client_id']);
-        });
-        Schema::table('oauth_clients', function (Blueprint $table): void {
-            $table->dropForeign(['user_id']);
-        });
-        Schema::table('oauth_personal_access_clients', function (Blueprint $table): void {
-            $table->dropForeign(['client_id']);
-        });
-    }
-};

database/seeders/DatabaseSeeder.php

@@ -18,12 +18,6 @@ use App\Models\TimeEntry;
 use App\Models\User;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
-use Laravel\Passport\AuthCode;
-use Laravel\Passport\Client as PassportClient;
-use Laravel\Passport\ClientRepository;
-use Laravel\Passport\PersonalAccessClient;
-use Laravel\Passport\RefreshToken;
-use Laravel\Passport\Token;
 
 class DatabaseSeeder extends Seeder
 {
@@ -156,35 +150,10 @@ class DatabaseSeeder extends Seeder
         User::factory()->withPersonalOrganization()->create([
             'email' => 'admin@example.com',
         ]);
-
-        app(ClientRepository::class)->create(
-            null,
-            'desktop',
-            'solidtime://oauth/callback',
-            null,
-            false,
-            false,
-            false
-        );
     }
 
     private function deleteAll(): void
     {
-        // Laravel Passport tables
-        DB::table((new RefreshToken)->getTable())->delete();
-        DB::table((new Token)->getTable())->delete();
-        DB::table((new AuthCode)->getTable())->delete();
-        DB::table((new PersonalAccessClient)->getTable())->delete();
-        DB::table((new PassportClient)->getTable())->delete();
-
-        // Internal tables
-        DB::table('cache')->delete();
-        DB::table('cache_locks')->delete();
-        DB::table('jobs')->delete();
-        DB::table('failed_jobs')->delete();
-        DB::table('sessions')->delete();
-
-        // Application tables
         DB::table((new Audit)->getTable())->delete();
         DB::table((new TimeEntry)->getTable())->delete();
         DB::table((new Task)->getTable())->delete();
@@ -192,9 +161,8 @@ class DatabaseSeeder extends Seeder
         DB::table((new ProjectMember)->getTable())->delete();
         DB::table((new Project)->getTable())->delete();
         DB::table((new Client)->getTable())->delete();
-        DB::table((new Member)->getTable())->delete();
+        DB::table((new User)->getTable())->delete();
         DB::table((new OrganizationInvitation)->getTable())->delete();
         DB::table((new Organization)->getTable())->delete();
-        DB::table((new User)->getTable())->delete();
     }
 }

docker-compose.yml

@@ -189,13 +189,6 @@ services:
         entrypoint: /etc/minio/create_bucket.sh
         extra_hosts:
             - "storage.${NGINX_HOST_NAME}:${REVERSE_PROXY_IP:-10.100.100.10}"
-
-    gotenberg:
-        image: gotenberg/gotenberg:8
-        networks:
-            - sail
-        healthcheck:
-            test: ["CMD", "curl", "--silent", "--fail", "http://localhost:3000/health"]
 networks:
     reverse-proxy:
         name: "${NETWORK_NAME}"

docker/prod/Dockerfile

@@ -41,7 +41,6 @@ FROM composer:${COMPOSER_VERSION} AS vendor
 FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-php${PHP_VERSION}
 
 ARG DOCKER_FILES_BASE_PATH
-ARG TARGETPLATFORM
 
 LABEL maintainer="solidtime <hello@solidtime.io>"
 LABEL org.opencontainers.image.title="solidtime"
@@ -78,7 +77,6 @@ RUN apt-get update; \
     apt-get install -yqq --no-install-recommends --show-progress \
     apt-utils \
     curl \
-    gcc \
     wget \
     nano \
     ncdu \
@@ -135,16 +133,6 @@ RUN chown -R ${USER}:${USER} ${ROOT} /var/{log,run} \
 
 RUN cp ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini
 
-COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane-default.ini
-COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/php-arm.ini ${PHP_INI_DIR}/conf.d/99-octane-arm.ini
-
-RUN echo "TARGETPLATFORM is equal to ${TARGETPLATFORM}"
-RUN if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
-    rm ${PHP_INI_DIR}/conf.d/99-octane-default.ini; \
-    else \
-    rm ${PHP_INI_DIR}/conf.d/99-octane-arm.ini; \
-    fi
-
 USER ${USER}
 
 COPY --chown=${USER}:${USER} --from=vendor /usr/bin/composer /usr/bin/composer
@@ -170,6 +158,7 @@ COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/supervisord.con
 COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/octane/FrankenPHP/supervisord.frankenphp.conf /etc/supervisor/conf.d/
 COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/supervisord.*.conf /etc/supervisor/conf.d/
 COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/start-container /usr/local/bin/start-container
+COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/php.ini ${PHP_INI_DIR}/conf.d/99-octane.ini
 
 # FrankenPHP embedded PHP configuration
 COPY --chown=${USER}:${USER} ${DOCKER_FILES_BASE_PATH}deployment/php.ini /lib/php.ini

docker/prod/deployment/php-arm.ini

@@ -1,30 +0,0 @@
-[PHP]
-post_max_size = 100M
-upload_max_filesize = 100M
-expose_php = 0
-realpath_cache_size = 16M
-realpath_cache_ttl = 360
-max_input_time = 5
-
-[Opcache]
-opcache.enable = 1
-opcache.enable_cli = 1
-opcache.memory_consumption = 256M
-opcache.use_cwd = 0
-opcache.max_file_size = 0
-opcache.max_accelerated_files = 32531
-opcache.validate_timestamps = 0
-opcache.file_update_protection = 0
-opcache.interned_strings_buffer = 16
-opcache.file_cache = 60
-
-[JIT]
-opcache.jit_buffer_size = 128M
-opcache.jit = disable
-opcache.jit_prof_threshold = 0.001
-opcache.jit_max_root_traces = 2048
-opcache.jit_max_side_traces = 256
-
-[zlib]
-zlib.output_compression = On
-zlib.output_compression_level = 9