Fix .dockerignore

.github/VOUCHED.td

@@ -1,23 +0,0 @@
-# Vouched contributors for solidtime.
-#
-# One handle per line, without the leading @, sorted alphabetically.
-# Prefix a handle with - to denounce them, optionally followed by a reason.
-# Format reference: https://github.com/mitchellh/vouch
-#
-# Maintainers do not need to edit this file by hand. Comment "vouch @user",
-# "unvouch @user" or "denounce @user <reason>" on any issue, pull request or
-# discussion and the vouch workflows will update this file.
-#
-# Collaborators with write access and bots are always allowed and do not need
-# an entry here.
-#
-# Seeded 2026-07-25 from the authors of every merged pull request.
-
-agross
-candideu
-KasparRosin
-korridor
-Onatcer
-ShrootBuck
-smileBeda
-utlark

.github/workflows/vouch-check-pr.yml

@@ -1,75 +0,0 @@
-name: Vouch (check PR)
-
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-  issue_comment:
-    types: [created]
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    if: >-
-      github.event_name == 'pull_request_target' ||
-      (github.event_name == 'issue_comment' &&
-       github.event.issue.pull_request &&
-       contains(github.event.comment.body, '/recheck'))
-
-    steps:
-      # Pull requests of 50 changed lines or fewer skip the vouch requirement.
-      - name: "Measure diff size"
-        id: size
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPO: ${{ github.repository }}
-          PR: ${{ github.event.pull_request.number || github.event.issue.number }}
-
-          # Changes to these files do not count towards the 50-line limit.
-          # One extended regex per line, matched against the whole repo-relative
-          # path, so use a leading .* to match a file in any directory.
-          IGNORED: |
-            package-lock\.json
-            composer\.lock
-            tests/.*
-            e2e/.*
-            .*\.(test|spec)\.(ts|js|vue)
-
-        run: |
-          set -euo pipefail
-          # An empty list yields "^()$", which matches no filename. grep exits
-          # 1 on an empty list, so swallow that rather than fail the step.
-          join() { { grep -vE '^[[:space:]]*$' || true; } | paste -sd'|' -; }
-          ignored="^($(join <<<"$IGNORED"))$"
-
-          total=$(gh api --paginate "repos/$REPO/pulls/$PR/files" \
-            --jq '.[] | [.filename, .additions + .deletions] | @tsv' |
-            awk -F'\t' -v ignored="$ignored" '
-              $1 ~ ignored { next }
-                           { n += $2 }
-              END { print n+0 }')
-          echo "total=$total" >> "$GITHUB_OUTPUT"
-          echo "Countable diff size: $total line(s)"
-
-      - name: "Small patch (denounced users still blocked)"
-        if: fromJSON(steps.size.outputs.total) <= 50
-        uses: mitchellh/vouch/action/check-pr@v1.5.0
-        with:
-          pr-number: ${{ github.event.pull_request.number || github.event.issue.number }}
-          auto-close: true
-          require-vouch: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Full vouch required"
-        if: fromJSON(steps.size.outputs.total) > 50
-        uses: mitchellh/vouch/action/check-pr@v1.5.0
-        with:
-          pr-number: ${{ github.event.pull_request.number || github.event.issue.number }}
-          auto-close: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/vouch-manage-by-discussion.yml

@@ -1,33 +0,0 @@
-name: Vouch (manage by discussion)
-
-# Same commands as vouch-manage-by-issue.yml, but for discussion comments.
-
-on:
-  discussion_comment:
-    types: [created]
-
-concurrency:
-  group: vouch-manage
-  cancel-in-progress: false
-
-permissions:
-  contents: write
-  discussions: write
-
-jobs:
-  manage:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v7
-
-      - name: "Apply vouch command"
-        uses: mitchellh/vouch/action/manage-by-discussion@v1.5.0
-        with:
-          discussion-number: ${{ github.event.discussion.number }}
-          comment-node-id: ${{ github.event.comment.node_id }}
-          roles: admin,maintain,write
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/vouch-manage-by-issue.yml

@@ -1,35 +0,0 @@
-name: Vouch (manage by issue)
-
-# Maintainers comment "vouch @user", "unvouch @user" or "denounce @user <reason>"
-# on any issue or pull request, and this workflow updates .github/VOUCHED.td.
-
-on:
-  issue_comment:
-    types: [created]
-
-concurrency:
-  group: vouch-manage
-  cancel-in-progress: false
-
-permissions:
-  contents: write
-  issues: write
-  pull-requests: write
-
-jobs:
-  manage:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v7
-
-      - name: "Apply vouch command"
-        uses: mitchellh/vouch/action/manage-by-issue@v1.5.0
-        with:
-          issue-id: ${{ github.event.issue.number }}
-          comment-id: ${{ github.event.comment.id }}
-          roles: admin,maintain,write
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CONTRIBUTING.md

@@ -12,22 +12,6 @@ In order to keep the issues of the repository clean we decided to only use them
 
 To respect your time and help us manage contributions effectively, please open an issue or start a discussion and wait for approval before submitting a pull request (PR). This does not apply to tiny fixes or changes however, please keep in mind that we might not merge PRs for various reasons. 
 
-### Vouched contributors
-
-Pull requests from authors who are not vouched are closed automatically. This lets us keep up with the volume of AI slop pull requests without a maintainer having to triage every one of them by hand.
-
-Your pull request is not affected if any of the following applies:
-
-- You have write access to this repository.
-- Someone with write access has vouched for you. The list lives in [.github/VOUCHED.td](.github/VOUCHED.td).
-- Your pull request changes 50 lines or fewer. Test files and lockfiles do not count towards that number, so a small fix that comes with tests still qualifies.
-
-To get vouched, open an issue or discussion before you start and explain how you intend to implement the change. We will discuss the approach with you, and only once we have agreed on the implementation does a maintainer comment `vouch @your-handle`, which puts you on the list from then on.
-
-Being vouched only stops your pull requests from being closed automatically. [Only work on approved issues](#only-work-on-approved-issues) still applies to every pull request you send.
-
-Contributors who abuse this are denounced, and their pull requests are closed regardless of size. 
-
 ### Contributor License Agreement
 
 You'll also notice that we’ve set up a [Contributor License Agreement (CLA)](https://cla-assistant.io/solidtime-io/solidtime), which must be signed before any PR can be merged. Don’t worry - the process is quick and only takes a few clicks.

README.md

@@ -39,8 +39,6 @@ Please open an issue or start a discussion and wait for approval before submitti
 
 **If you submit an AI slop pull request (especially without following the proper procedure), you will be banned from future contributions to solidtime.**
 
-To keep that manageable, pull requests from authors who are not vouched are closed automatically, unless they change 50 lines or fewer. To get vouched, open an issue or discussion first and explain how you intend to implement the change. Once we have agreed on the approach, we vouch for you. See [Vouched contributors](./CONTRIBUTING.md#vouched-contributors).
-
 Please read the [CONTRIBUTING.md](./CONTRIBUTING.md) before sumbitting a Pull Request.
 
 We do accept contributions in the [documentation repository](https://github.com/solidtime-io/docs) f.e. to add new self-hosting guides.

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

@@ -67,7 +67,7 @@ class TimeEntryController extends Controller
 
         $query = TimeEntry::query()
             ->where('organization_id', $organization->getKey())
-            ->where('member_id', $member->getKey())
+            ->where('user_id', $member->user_id)
             ->when($exclude !== null, function (Builder $q) use ($exclude): void {
                 $q->where('id', '!=', $exclude->getKey());
             })
@@ -107,8 +107,8 @@ class TimeEntryController extends Controller
     /**
      * Get time entries in organization
      *
-     * If you only need time entries for a specific user, you can filter by `member_id`.
-     * Users with the permission `time-entries:view:own` can only use this endpoint with their own member ID in the member_id filter.
+     * 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>
      *
@@ -118,17 +118,16 @@ class TimeEntryController extends Controller
      */
     public function index(Organization $organization, TimeEntryIndexRequest $request): JsonResource
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @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');
         }
 
         $canAccessPremiumFeatures = $this->canAccessPremiumFeatures($organization);
-        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $memberFilter, $canAccessPremiumFeatures);
+        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member, $canAccessPremiumFeatures);
 
         $totalCount = $timeEntriesQuery->count();
 
@@ -159,7 +158,7 @@ class TimeEntryController extends Controller
             if ($timeEntries->count() === 0) {
                 Log::warning('User has has more than '.$limit.' time entries on one date', [
                     'date' => $lastDate->toDateString(),
-                    'member_id' => $request->input('member_id'),
+                    'user_id' => $request->input('user_id'),
                     'auth_user_id' => Auth::id(),
                     'limit' => $limit,
                 ]);
@@ -222,10 +221,9 @@ class TimeEntryController extends Controller
      */
     public function indexExport(Organization $organization, TimeEntryIndexExportRequest $request, TimeEntryAggregationService $timeEntryAggregationService): JsonResponse
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @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');
@@ -242,7 +240,7 @@ class TimeEntryController extends Controller
         $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
         $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
 
-        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $memberFilter, $canAccessPremiumFeatures);
+        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member, $canAccessPremiumFeatures);
         $timeEntriesQuery->with([
             'task',
             'client',
@@ -265,7 +263,7 @@ class TimeEntryController extends Controller
             if ($viewFile === false) {
                 throw new \LogicException('View file not found');
             }
-            $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $memberFilter);
+            $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
             $aggregatedData = $timeEntryAggregationService->getAggregatedTimeEntries(
                 $timeEntriesAggregateQuery,
                 null,
@@ -372,10 +370,9 @@ class TimeEntryController extends Controller
      */
     public function aggregate(Organization $organization, TimeEntryAggregateRequest $request, TimeEntryAggregationService $timeEntryAggregationService): array
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @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');
@@ -386,7 +383,7 @@ class TimeEntryController extends Controller
 
         $group1Type = $request->getGroup();
         $group2Type = $request->getSubGroup();
-        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $memberFilter);
+        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
         $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
         $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
 
@@ -422,10 +419,9 @@ class TimeEntryController extends Controller
      */
     public function aggregateExport(Organization $organization, TimeEntryAggregateExportRequest $request, TimeEntryAggregationService $timeEntryAggregationService): JsonResponse
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @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');
@@ -441,7 +437,7 @@ class TimeEntryController extends Controller
 
         $group = $request->getGroup();
         $subGroup = $request->getSubGroup();
-        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $memberFilter);
+        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
         $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
         $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
 
@@ -584,7 +580,7 @@ class TimeEntryController extends Controller
     {
         /** @var Member $member */
         $member = Member::query()->findOrFail($request->input('member_id'));
-        if ($member->getKey() === $this->member($organization)->getKey()) {
+        if ($member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:create:own');
         } else {
             $this->checkPermission($organization, 'time-entries:create:all');
@@ -631,10 +627,9 @@ class TimeEntryController extends Controller
      */
     public function update(Organization $organization, TimeEntry $timeEntry, TimeEntryUpdateRequest $request): JsonResource
     {
-        $member = $this->member($organization);
-        /** @var Member|null $newMember */
-        $newMember = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($timeEntry->member_id === $member->getKey() && ($newMember === null || $newMember->getKey() === $member->getKey())) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($timeEntry->member->user_id === Auth::id() && ($member === null || $member->user_id === Auth::id())) {
             $this->checkPermission($organization, 'time-entries:update:own', $timeEntry);
         } else {
             $this->checkPermission($organization, 'time-entries:update:all', $timeEntry);
@@ -666,10 +661,6 @@ class TimeEntryController extends Controller
         }
 
         $timeEntry->fill($request->validated());
-        if ($newMember !== null) {
-            $timeEntry->member()->associate($newMember);
-            $timeEntry->user()->associate($newMember->user);
-        }
         $timeEntry->description = $request->input('description', $timeEntry->description) ?? '';
         $timeEntry->setComputedAttributeValue('billable_rate');
         $timeEntry->save();
@@ -699,7 +690,6 @@ class TimeEntryController extends Controller
      */
     public function updateMultiple(Organization $organization, TimeEntryUpdateMultipleRequest $request): JsonResponse
     {
-        $member = $this->member($organization);
         $this->checkAnyPermission($organization, ['time-entries:update:all', 'time-entries:update:own']);
         $canAccessAll = $this->hasPermission($organization, 'time-entries:update:all');
 
@@ -724,9 +714,6 @@ class TimeEntryController extends Controller
             throw new AuthorizationException;
         }
 
-        /** @var Member|null $newMember */
-        $newMember = isset($changes['member_id']) ? Member::query()->findOrFail($changes['member_id']) : null;
-
         $project = null;
         $client = null;
         $overwriteClient = false;
@@ -753,7 +740,7 @@ class TimeEntryController extends Controller
 
                 continue;
             }
-            if (! $canAccessAll && $timeEntry->member_id !== $member->getKey()) {
+            if (! $canAccessAll && $timeEntry->user_id !== Auth::id()) {
                 $error->push($id);
 
                 continue;
@@ -763,10 +750,6 @@ class TimeEntryController extends Controller
             $oldTask = $timeEntry->task;
 
             $timeEntry->fill($changes);
-            if ($newMember !== null) {
-                $timeEntry->member()->associate($newMember);
-                $timeEntry->user_id = $newMember->user_id;
-            }
             // 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();
@@ -807,8 +790,7 @@ class TimeEntryController extends Controller
      */
     public function destroy(Organization $organization, TimeEntry $timeEntry): JsonResponse
     {
-        $member = $this->member($organization);
-        if ($timeEntry->member_id === $member->getKey()) {
+        if ($timeEntry->member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:delete:own', $timeEntry);
         } else {
             $this->checkPermission($organization, 'time-entries:delete:all', $timeEntry);
@@ -865,7 +847,7 @@ class TimeEntryController extends Controller
                 continue;
             }
 
-            if (! $canDeleteAll && $timeEntry->member_id !== $this->member($organization)->getKey()) {
+            if (! $canDeleteAll && $timeEntry->user_id !== Auth::id()) {
                 $error->push($id);
 
                 continue;

extensions/manifest.json

@@ -1,7 +1,7 @@
 {
     "Billing": {
         "repository": "solidtime-io/extension-billing",
-        "ref": "v0.0.3"
+        "ref": "v0.0.1"
     },
     "Services": {
         "repository": "solidtime-io/extension-services",

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

@@ -92,30 +92,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         $response->assertJsonPath('data.0.id', $timeEntry->getKey());
     }
 
-    public function test_index_endpoint_filters_by_member_id_instead_of_legacy_user_id(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:view:own',
-        ]);
-        $legacyUser = User::factory()->create();
-        $timeEntry = TimeEntry::factory()->forMember($data->member)->create([
-            'user_id' => $legacyUser->getKey(),
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.index', [
-            $data->organization->getKey(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $this->assertResponseCode($response, 200);
-        $response->assertJsonCount(1, 'data');
-        $response->assertJsonPath('data.0.id', $timeEntry->getKey());
-    }
-
     public function test_index_endpoint_fails_if_user_filter_is_from_different_organization(): void
     {
         // Arrange
@@ -150,10 +126,7 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         Passport::actingAs($data->user);
 
         // Act
-        $response = $this->getJson(route('api.v1.time-entries.index', [
-            $data->organization->getKey(),
-            'member_id' => $member->getKey(),
-        ]));
+        $response = $this->getJson(route('api.v1.time-entries.index', [$data->organization->getKey(), 'user_id' => $user->getKey()]));
 
         // Assert
         $this->assertResponseCode($response, 200);
@@ -1799,29 +1772,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
-    public function test_aggregate_endpoint_filters_by_member_id_instead_of_legacy_user_id(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:view:own',
-        ]);
-        $legacyUser = User::factory()->create();
-        TimeEntry::factory()->forMember($data->member)->startWithDuration(Carbon::now(), 100)->create([
-            'user_id' => $legacyUser->getKey(),
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->getJson(route('api.v1.time-entries.aggregate', [
-            $data->organization->getKey(),
-            'member_id' => $data->member->getKey(),
-        ]));
-
-        // Assert
-        $response->assertSuccessful();
-        $response->assertJsonPath('data.seconds', 100);
-    }
-
     public function test_aggregate_endpoint_groups_by_two_groups(): void
     {
         // Arrange
@@ -2869,32 +2819,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
-    public function test_update_endpoint_updates_user_id_when_member_id_changes(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:update:all',
-        ]);
-        $otherUser = User::factory()->create();
-        $otherMember = Member::factory()->forOrganization($data->organization)->forUser($otherUser)->role(Role::Employee)->create();
-        $timeEntry = TimeEntry::factory()->forMember($data->member)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->putJson(route('api.v1.time-entries.update', [$data->organization->getKey(), $timeEntry->getKey()]), [
-            'member_id' => $otherMember->getKey(),
-        ]);
-
-        // Assert
-        $response->assertValid();
-        $this->assertResponseCode($response, 200);
-        $this->assertDatabaseHas(TimeEntry::class, [
-            'id' => $timeEntry->getKey(),
-            'member_id' => $otherMember->getKey(),
-            'user_id' => $otherUser->getKey(),
-        ]);
-    }
-
     public function test_update_endpoint_can_update_project_and_automatically_set_client(): void
     {
         // Arrange
@@ -3231,40 +3155,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
-    public function test_destroy_multiple_uses_member_id_for_own_permission_checks(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:delete:own',
-        ]);
-        $otherUser = User::factory()->create();
-        $otherMember = Member::factory()->forOrganization($data->organization)->forUser($otherUser)->role(Role::Employee)->create();
-        $timeEntry = TimeEntry::factory()->forMember($otherMember)->create([
-            'user_id' => $data->user->getKey(),
-        ]);
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->deleteJson(route('api.v1.time-entries.destroy-multiple', [$data->organization->getKey()]), [
-            'ids' => [
-                $timeEntry->getKey(),
-            ],
-        ]);
-
-        // Assert
-        $response->assertValid();
-        $this->assertResponseCode($response, 200);
-        $response->assertExactJson([
-            'success' => [],
-            'error' => [
-                $timeEntry->getKey(),
-            ],
-        ]);
-        $this->assertDatabaseHas(TimeEntry::class, [
-            'id' => $timeEntry->getKey(),
-        ]);
-    }
-
     public function test_destroy_multiple_deletes_all_time_entries_and_fails_for_time_entries_of_other_users_and_and_other_organizations_with_all_time_entries_permission(): void
     {
         // Arrange
@@ -3676,46 +3566,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
-    public function test_update_multiple_uses_member_id_for_own_permission_checks(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:update:own',
-            'projects:view:all',
-        ]);
-        $otherUser = User::factory()->create();
-        $otherMember = Member::factory()->forOrganization($data->organization)->forUser($otherUser)->role(Role::Employee)->create();
-        $timeEntry = TimeEntry::factory()->forMember($otherMember)->create([
-            'user_id' => $data->user->getKey(),
-        ]);
-        $timeEntriesFake = TimeEntry::factory()->forOrganization($data->organization)->make();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->patchJson(route('api.v1.time-entries.update-multiple', [$data->organization->getKey()]), [
-            'ids' => [
-                $timeEntry->getKey(),
-            ],
-            'changes' => [
-                'description' => $timeEntriesFake->description,
-            ],
-        ]);
-
-        // Assert
-        $response->assertValid();
-        $this->assertResponseCode($response, 200);
-        $response->assertExactJson([
-            'success' => [],
-            'error' => [
-                $timeEntry->getKey(),
-            ],
-        ]);
-        $this->assertDatabaseHas(TimeEntry::class, [
-            'id' => $timeEntry->getKey(),
-            'description' => $timeEntry->description,
-        ]);
-    }
-
     public function test_update_multiple_updates_sets_description_to_empty_if_the_client_sends_null(): void
     {
         // Arrange
@@ -3762,51 +3612,6 @@ class TimeEntryEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
-    public function test_update_multiple_updates_user_id_when_member_id_changes(): void
-    {
-        // Arrange
-        $data = $this->createUserWithPermission([
-            'time-entries:update:all',
-        ]);
-        $otherUser = User::factory()->create();
-        $otherMember = Member::factory()->forOrganization($data->organization)->forUser($otherUser)->role(Role::Employee)->create();
-        $timeEntry1 = TimeEntry::factory()->forMember($data->member)->create();
-        $timeEntry2 = TimeEntry::factory()->forMember($data->member)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->patchJson(route('api.v1.time-entries.update-multiple', [$data->organization->getKey()]), [
-            'ids' => [
-                $timeEntry1->getKey(),
-                $timeEntry2->getKey(),
-            ],
-            'changes' => [
-                'member_id' => $otherMember->getKey(),
-            ],
-        ]);
-
-        // Assert
-        $response->assertValid();
-        $response->assertStatus(200);
-        $response->assertExactJson([
-            'success' => [
-                $timeEntry1->getKey(),
-                $timeEntry2->getKey(),
-            ],
-            'error' => [],
-        ]);
-        $this->assertDatabaseHas(TimeEntry::class, [
-            'id' => $timeEntry1->getKey(),
-            'member_id' => $otherMember->getKey(),
-            'user_id' => $otherUser->getKey(),
-        ]);
-        $this->assertDatabaseHas(TimeEntry::class, [
-            'id' => $timeEntry2->getKey(),
-            'member_id' => $otherMember->getKey(),
-            'user_id' => $otherUser->getKey(),
-        ]);
-    }
-
     public function test_update_multiple_updates_all_time_entries_and_fails_for_time_entries_of_other_users_and_and_other_organizations_with_all_time_entries_permission(): void
     {
         // Arrange