From 57fbf031512f502233d5bf4ba64f5f2bafa0d105 Mon Sep 17 00:00:00 2001
From: root <root@space.tiweb-host.com>
Date: Sun, 19 Jul 2026 22:15:57 +0000
Subject: [PATCH 1/3] Fix building DM halve showing Halve again after first use
 (#1331)

Mirror shipyard queue behavior: track dm_halved on building queues, show
Complete after the first halve, and add completeBuilding endpoint.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 app/Http/Controllers/FacilitiesController.php |  47 +++++++
 app/Models/BuildingQueue.php                  |   2 +
 app/Services/BuildingQueueService.php         |   1 +
 app/Services/HalvingService.php               | 119 ++++++++++++++++++
 .../Queue/BuildingQueueViewModel.php          |   4 +-
 ...00001_add_dm_fields_to_building_queues.php |  28 +++++
 .../buildqueue/building-active.blade.php      |  40 ++++--
 routes/web.php                                |   1 +
 tests/Unit/HalvingServiceTest.php             |  78 ++++++++++++
 9 files changed, 307 insertions(+), 13 deletions(-)
 create mode 100644 database/migrations/2026_07_19_000001_add_dm_fields_to_building_queues.php

diff --git a/app/Http/Controllers/FacilitiesController.php b/app/Http/Controllers/FacilitiesController.php
index d6e7e0ed4..1ab868cc6 100644
--- a/app/Http/Controllers/FacilitiesController.php
+++ b/app/Http/Controllers/FacilitiesController.php
@@ -147,6 +147,53 @@ public function halveBuilding(Request $request, PlayerService $player, HalvingSe
         }
     }
 
+    /**
+     * Complete a building queue item instantly using Dark Matter.
+     *
+     * @param Request $request
+     * @param PlayerService $player
+     * @param HalvingService $halvingService
+     * @return JsonResponse
+     */
+    public function completeBuilding(Request $request, PlayerService $player, HalvingService $halvingService): JsonResponse
+    {
+        try {
+            $queueItemId = (int)$request->input('queue_item_id');
+
+            if ($queueItemId <= 0) {
+                return response()->json([
+                    'success' => false,
+                    'error' => true,
+                    'message' => 'Invalid queue item ID',
+                    'newAjaxToken' => csrf_token(),
+                ]);
+            }
+
+            $result = $halvingService->completeBuilding(
+                $player->getUser(),
+                $queueItemId,
+                $player->planets->current()
+            );
+
+            session()->flash('success', __('You have successfully accelerated the order.'));
+
+            return response()->json([
+                'success' => true,
+                'error' => false,
+                'newAjaxToken' => csrf_token(),
+                'cost' => $result['cost'],
+                'new_balance' => $result['new_balance'],
+            ]);
+        } catch (Exception $e) {
+            return response()->json([
+                'success' => false,
+                'error' => true,
+                'message' => $e->getMessage(),
+                'newAjaxToken' => csrf_token(),
+            ]);
+        }
+    }
+
     /**
      * Start repairs for the wreck field.
      *
diff --git a/app/Models/BuildingQueue.php b/app/Models/BuildingQueue.php
index fec45b424..3349731b9 100644
--- a/app/Models/BuildingQueue.php
+++ b/app/Models/BuildingQueue.php
@@ -22,6 +22,8 @@
  * @property float $deuterium
  * @property int $building
  * @property int $processed
+ * @property int $dm_halved
+ * @property int $dm_completed
  * @property int $canceled
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
diff --git a/app/Services/BuildingQueueService.php b/app/Services/BuildingQueueService.php
index 1b9d9a3a8..00f735803 100644
--- a/app/Services/BuildingQueueService.php
+++ b/app/Services/BuildingQueueService.php
@@ -282,6 +282,7 @@ public function retrieveQueue(PlanetService $planet): BuildingQueueListViewModel
                 $item['building'],
                 $item['object_level_target'],
                 $is_downgrade,
+                (bool)($item['dm_halved'] ?? false),
             );
 
             $list[] = $viewModel;
diff --git a/app/Services/HalvingService.php b/app/Services/HalvingService.php
index 71134d9eb..015033e83 100644
--- a/app/Services/HalvingService.php
+++ b/app/Services/HalvingService.php
@@ -170,6 +170,10 @@ public function halveBuilding(User $user, int $queueItemId, PlanetService $plane
                 throw new Exception('Queue item not found or already completed');
             }
 
+            if ($queueItem->dm_halved) {
+                throw new Exception('Queue item has already been halved. Use Complete to finish instantly.');
+            }
+
             // Calculate new time values
             // Cost is based on remaining time, reduction is 50% of original time
             $timeValues = $this->calculateNewTimeValues(
@@ -201,6 +205,7 @@ public function halveBuilding(User $user, int $queueItemId, PlanetService $plane
 
             // Update queue item time_end
             $queueItem->time_end = $timeValues['new_time_end'];
+            $queueItem->dm_halved = 1;
             $queueItem->save();
 
             return [
@@ -215,6 +220,93 @@ public function halveBuilding(User $user, int $queueItemId, PlanetService $plane
         return $result;
     }
 
+    /**
+     * Complete a building queue item instantly using Dark Matter.
+     *
+     * This is used when the building has already been halved once. Instead of halving
+     * again, the queue is completed immediately.
+     *
+     * @param User $user The user performing the completion
+     * @param int $queueItemId The building queue item ID
+     * @param PlanetService $planet The planet service
+     * @return array{success: bool, cost: int, new_balance: int}
+     * @throws Exception If insufficient Dark Matter or invalid queue item
+     */
+    public function completeBuilding(User $user, int $queueItemId, PlanetService $planet): array
+    {
+        /** @var array{success: bool, cost: int, new_balance: int} $result */
+        $result = DB::transaction(function () use ($user, $queueItemId, $planet) {
+            // Lock user row for Dark Matter balance
+            $lockedUser = User::where('id', $user->id)->lockForUpdate()->first();
+            if (!$lockedUser) {
+                throw new Exception('User not found');
+            }
+
+            // Lock and retrieve queue item
+            $queueItem = BuildingQueue::where('id', $queueItemId)
+                ->where('planet_id', $planet->getPlanetId())
+                ->where('processed', 0)
+                ->where('canceled', 0)
+                ->where('building', 1)
+                ->lockForUpdate()
+                ->first();
+
+            if (!$queueItem) {
+                throw new Exception('Queue item not found or already completed');
+            }
+
+            // Calculate cost based on remaining time
+            $currentTime = $this->getCurrentTimestamp();
+            $remainingTime = (int)$queueItem->time_end - $currentTime;
+
+            if ($remainingTime <= 0) {
+                throw new Exception('Queue item already completed');
+            }
+
+            $cost = $this->calculateHalvingCost($remainingTime, 'building');
+
+            // Check balance
+            if ($lockedUser->dark_matter < $cost) {
+                throw new Exception("Insufficient Dark Matter. Required: {$cost}, Available: {$lockedUser->dark_matter}");
+            }
+
+            // Debit Dark Matter
+            $lockedUser->dark_matter -= $cost;
+            $lockedUser->save();
+
+            // Record transaction
+            $object = ObjectService::getObjectById($queueItem->object_id);
+            $description = "Completing building: {$object->title} on planet {$planet->getPlanetName()} (ID: {$planet->getPlanetId()})";
+            $this->transactionService->recordTransaction(
+                $lockedUser,
+                -$cost,
+                DarkMatterTransactionType::HALVING->value,
+                $description,
+                $lockedUser->dark_matter
+            );
+
+            $originalTimeEnd = (int)$queueItem->time_end;
+
+            // Set time_end to now so the building queue processor grants the level immediately.
+            $queueItem->time_end = $currentTime;
+            if ((int)$queueItem->time_start > $currentTime) {
+                $queueItem->time_start = $currentTime;
+            }
+            $queueItem->dm_completed = 1;
+            $queueItem->save();
+
+            $this->updateFutureBuildingQueueItems($planet->getPlanetId(), $originalTimeEnd, $currentTime);
+
+            return [
+                'success' => true,
+                'cost' => $cost,
+                'new_balance' => $lockedUser->dark_matter,
+            ];
+        });
+
+        return $result;
+    }
+
     /**
      * Halve a research queue item.
      *
@@ -627,4 +719,31 @@ private function updateFutureQueueItems(int $planetId, int $oldTimeEnd, int $new
                 'time_end'   => DB::raw("time_end - {$timeReduction}"),
             ]);
     }
+
+    /**
+     * Update future building queue items for this planet to advance their time_start and time_end
+     * equally based on a issued halving/completing time reduction.
+     *
+     * @param int $planetId    Planet whose building queue should be updated
+     * @param int $oldTimeEnd  Original time_end of the modified item (before the change)
+     * @param int $newTimeEnd  New time_end of the modified item (after the change)
+     * @return void
+     */
+    private function updateFutureBuildingQueueItems(int $planetId, int $oldTimeEnd, int $newTimeEnd): void
+    {
+        if ($newTimeEnd >= $oldTimeEnd) {
+            return;
+        }
+
+        $timeReduction = $oldTimeEnd - $newTimeEnd;
+
+        BuildingQueue::where('planet_id', $planetId)
+            ->where('processed', 0)
+            ->where('canceled', 0)
+            ->where('time_start', '>=', $oldTimeEnd)
+            ->update([
+                'time_start' => DB::raw("time_start - {$timeReduction}"),
+                'time_end'   => DB::raw("time_end - {$timeReduction}"),
+            ]);
+    }
 }
diff --git a/app/ViewModels/Queue/BuildingQueueViewModel.php b/app/ViewModels/Queue/BuildingQueueViewModel.php
index fd0197801..449b5dc0b 100644
--- a/app/ViewModels/Queue/BuildingQueueViewModel.php
+++ b/app/ViewModels/Queue/BuildingQueueViewModel.php
@@ -17,6 +17,7 @@ class BuildingQueueViewModel extends QueueViewModel
      * @param bool $building
      * @param int $level_target
      * @param bool $is_downgrade
+     * @param bool $dm_halved
      */
     public function __construct(
         int $id,
@@ -25,7 +26,8 @@ public function __construct(
         int $time_total,
         public bool $building,
         public int $level_target,
-        public bool $is_downgrade = false
+        public bool $is_downgrade = false,
+        public bool $dm_halved = false,
     ) {
         parent::__construct($id, $object, $time_countdown, $time_total);
     }
diff --git a/database/migrations/2026_07_19_000001_add_dm_fields_to_building_queues.php b/database/migrations/2026_07_19_000001_add_dm_fields_to_building_queues.php
new file mode 100644
index 000000000..04f011e58
--- /dev/null
+++ b/database/migrations/2026_07_19_000001_add_dm_fields_to_building_queues.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class () extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('building_queues', function (Blueprint $table) {
+            $table->tinyInteger('dm_halved')->default(0)->after('processed');
+            $table->tinyInteger('dm_completed')->default(0)->after('dm_halved');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('building_queues', function (Blueprint $table) {
+            $table->dropColumn(['dm_halved', 'dm_completed']);
+        });
+    }
+};
diff --git a/resources/views/ingame/shared/buildqueue/building-active.blade.php b/resources/views/ingame/shared/buildqueue/building-active.blade.php
index 02a108d55..124f37d0e 100644
--- a/resources/views/ingame/shared/buildqueue/building-active.blade.php
+++ b/resources/views/ingame/shared/buildqueue/building-active.blade.php
@@ -45,24 +45,40 @@
             <td colspan="2">
                 @php
                     $halvingService = app(\OGame\Services\HalvingService::class);
-                    $halvingCost = $halvingService->calculateHalvingCost($build_active->time_total, 'building');
+                    $halvingCost = $halvingService->calculateHalvingCost($build_active->time_countdown, 'building');
+                    $wouldComplete = $build_active->dm_halved;
                 @endphp
-                <a class="build-faster dark_highlight tooltipLeft js_hideTipOnMobile building "
-                   title="Reduces construction time by 50% of the total construction time."
-                   href="javascript:void(0);"
-                   rel="{{ route('facilities.halvebuilding') }}?queue_item_id={{ $build_active->id }}">
-                    <div class="build-faster-img" alt="Halve time"></div>
-                    <span class="build-txt">Halve time</span>
-                    <span class="dm_cost">Costs: {{ number_format($halvingCost) }} DM</span>
-                </a>
+                @if ($wouldComplete)
+                    <a class="build-faster dark_highlight tooltipLeft js_hideTipOnMobile building tpd-hideOnClickOutside"
+                       title="@lang('Instantly completes the current building construction.')"
+                       href="javascript:void(0);"
+                       rel="{{ route('facilities.completebuilding') }}?queue_item_id={{ $build_active->id }}">
+                        <div class="build-finish-img" alt="@lang('Complete')"></div>
+                        <span class="build-txt">@lang('Complete')</span>
+                        <span class="dm_cost">@lang('Costs: :amount DM', ['amount' => number_format($halvingCost)])</span>
+                    </a>
+                @else
+                    <a class="build-faster dark_highlight tooltipLeft js_hideTipOnMobile building tpd-hideOnClickOutside"
+                       title="@lang('Reduces construction time by 50% of the total construction time.')"
+                       href="javascript:void(0);"
+                       rel="{{ route('facilities.halvebuilding') }}?queue_item_id={{ $build_active->id }}">
+                        <div class="build-faster-img" alt="@lang('Halve time')"></div>
+                        <span class="build-txt">@lang('Halve time')</span>
+                        <span class="dm_cost">@lang('Costs: :amount DM', ['amount' => number_format($halvingCost)])</span>
+                    </a>
+                @endif
             </td>
         </tr>
         </tbody>
     </table>
     <script type="text/javascript">
-        var cancelBuildListEntryUrl = '{{ route('resources.cancelbuildrequest') }}';
-        var questionbuilding = 'Do you want to reduce the construction time of the current construction project by 50% of the total construction time for <span style="font-weight: bold;">{{ number_format($halvingCost) }} Dark Matter</span>?';
+        @if ($wouldComplete)
+        var questionbuilding = '{!! __('Do you want to immediately complete the construction order for :dm_cost?', ['dm_cost' => '<span style="font-weight: bold;">' . number_format($halvingCost) . ' ' . __('Dark Matter') . '</span>']) !!}';
+        @else
+        var questionbuilding = '{!! __('Do you want to reduce the construction time of the current construction project by 50% of the total construction time (:time_reduction) for :dm_cost?', ['time_reduction' => \OGame\Facades\AppUtil::formatTimeDuration(intdiv($build_active->time_total, 2)), 'dm_cost' => '<span style="font-weight: bold;">' . number_format($halvingCost) . ' ' . __('Dark Matter') . '</span>']) !!}';
+        @endif
         var pricebuilding = {{ $halvingCost }};
+        var cancelBuildListEntryUrl = '{{ route('resources.cancelbuildrequest') }}';
         var referrerPage = $.deparam.querystring().page;
 
         new CountdownTimer('buildingCountdown', {{ $build_active->time_countdown }}, '{{ url()->current() }}', null, true, 3)
@@ -88,4 +104,4 @@ function cancelbuilding(id, listId, question) {
         </tr>
         </tbody>
     </table>
-@endif
\ No newline at end of file
+@endif
diff --git a/routes/web.php b/routes/web.php
index 65dc6074b..81a5eef18 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -86,6 +86,7 @@
     Route::post('/facilities/downgrade', [FacilitiesController::class, 'downgradeBuildRequest'])->name('facilities.downgrade');
     Route::post('/facilities/cancel-buildrequest', [FacilitiesController::class, 'cancelBuildRequest'])->name('facilities.cancelbuildrequest');
     Route::post('/ajax/facilities/halve-building', [FacilitiesController::class, 'halveBuilding'])->name('facilities.halvebuilding');
+    Route::post('/ajax/facilities/complete-building', [FacilitiesController::class, 'completeBuilding'])->name('facilities.completebuilding');
     Route::post('/ajax/facilities/start-repairs', [FacilitiesController::class, 'startRepairs'])->name('facilities.startrepairs');
     Route::post('/ajax/facilities/complete-repairs', [FacilitiesController::class, 'completeRepairs'])->name('facilities.completerepairs');
     Route::post('/ajax/facilities/burn-wreck-field', [FacilitiesController::class, 'burnWreckField'])->name('facilities.burnwreckfield');
diff --git a/tests/Unit/HalvingServiceTest.php b/tests/Unit/HalvingServiceTest.php
index 6cd41111e..d883e2492 100644
--- a/tests/Unit/HalvingServiceTest.php
+++ b/tests/Unit/HalvingServiceTest.php
@@ -273,6 +273,9 @@ public function testDarkMatterDeductionCorrectness(): void
         $this->assertEquals($initialBalance - $result['cost'], $newBalance, 'Balance should be reduced by exactly the halving cost');
         $this->assertGreaterThanOrEqual(750, $result['cost'], 'Cost should be at least minimum 750 DM');
         $this->assertLessThanOrEqual(72000, $result['cost'], 'Cost should not exceed max 72000 DM for building');
+
+        $queueItem->refresh();
+        $this->assertEquals(1, (int)$queueItem->dm_halved, 'dm_halved flag should be set');
     }
 
     /**
@@ -568,6 +571,81 @@ public function testOperationIsolation(): void
         }
     }
 
+    /**
+     * Test that a second building halve attempt is rejected (can only halve once).
+     */
+    public function testDoubleBuildingHalvingIsRejected(): void
+    {
+        $user = User::find($this->currentUserId);
+        $user->dark_matter = 200000;
+        $user->save();
+
+        $this->addBuildingToQueue();
+
+        $queueItem = BuildingQueue::where('planet_id', $this->planetService->getPlanetId())
+            ->where('building', 1)
+            ->where('processed', 0)
+            ->first();
+
+        $this->assertNotNull($queueItem, 'Queue item should exist');
+
+        $this->halvingService->halveBuilding($user, $queueItem->id, $this->planetService);
+
+        $queueItem->refresh();
+        $this->assertEquals(1, (int)$queueItem->dm_halved, 'dm_halved should be set after first halve');
+
+        $user->refresh();
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('already been halved');
+
+        $this->halvingService->halveBuilding($user, $queueItem->id, $this->planetService);
+    }
+
+    /**
+     * Test completing a building after halving finishes the queue item.
+     */
+    public function testCompleteBuildingAfterHalve(): void
+    {
+        $user = User::find($this->currentUserId);
+        $user->dark_matter = 200000;
+        $user->save();
+
+        $this->addBuildingToQueue();
+
+        $queueItem = BuildingQueue::where('planet_id', $this->planetService->getPlanetId())
+            ->where('building', 1)
+            ->where('processed', 0)
+            ->first();
+
+        $this->assertNotNull($queueItem, 'Queue item should exist');
+
+        $levelBefore = $this->planetService->getObjectLevel('metal_mine');
+
+        $this->halvingService->halveBuilding($user, $queueItem->id, $this->planetService);
+
+        $user->refresh();
+        $balanceBeforeComplete = $user->dark_matter;
+
+        $queueItem->refresh();
+        $remainingTime = (int)$queueItem->time_end - (int)\Carbon\Carbon::now()->timestamp;
+        $expectedCost = $this->halvingService->calculateHalvingCost($remainingTime, 'building');
+
+        $result = $this->halvingService->completeBuilding($user, $queueItem->id, $this->planetService);
+
+        $user->refresh();
+        $this->assertEquals($balanceBeforeComplete - $expectedCost, $user->dark_matter, 'DM should be deducted for completion');
+        $this->assertEquals($expectedCost, $result['cost'], 'Completion cost should match remaining time');
+
+        $this->planetService->updateBuildingQueue();
+        $this->planetService->reloadPlanet();
+
+        $this->assertEquals($levelBefore + 1, $this->planetService->getObjectLevel('metal_mine'), 'Building should be completed');
+
+        $queueItem->refresh();
+        $this->assertEquals(1, (int)$queueItem->processed, 'Queue item should be processed');
+        $this->assertEquals(1, (int)$queueItem->dm_completed, 'dm_completed flag should be set');
+    }
+
     /**
      * Helper method to set up shipyard prerequisites and add units to queue.
      *

From 9cb5ed1c4d43c69e0c0b95b0a3f32a0593fd3523 Mon Sep 17 00:00:00 2001
From: root <root@space.tiweb-host.com>
Date: Fri, 24 Jul 2026 22:04:27 +0000
Subject: [PATCH 2/3] test: update building DM flow to halve-then-complete

Align HalvingIntegrationTest with one-halve-then-complete behavior so
CI no longer expects a second building halve to succeed.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 tests/Feature/HalvingIntegrationTest.php | 55 +++++++++++++-----------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/tests/Feature/HalvingIntegrationTest.php b/tests/Feature/HalvingIntegrationTest.php
index 5d0ff2485..38702f4ab 100644
--- a/tests/Feature/HalvingIntegrationTest.php
+++ b/tests/Feature/HalvingIntegrationTest.php
@@ -189,20 +189,15 @@ public function testUnitHalvingEndToEnd(): void
     }
 
     /**
-     * Test double halving completes task immediately.
+     * Buildings can only be halved once; a second halve is rejected and Complete finishes the job.
      */
-    /**
-     * Test double halving for short duration tasks completes instantly.
-     *
-     * Each halve reduces remaining time by 50% of ORIGINAL construction time,
-     * capped at max reduction (48h for building).
-     */
-    public function testDoubleHalvingCompletesTask(): void
+    public function testBuildingHalveThenCompleteFinishesTask(): void
     {
         $user = $this->findCurrentUser();
         $user->dark_matter = 200000;
         $user->save();
 
+        $levelBefore = $this->planetService->getObjectLevel('metal_mine');
         $this->addResourceBuildRequest('metal_mine');
 
         $queueItem = BuildingQueue::where('planet_id', $this->planetService->getPlanetId())
@@ -222,26 +217,38 @@ public function testDoubleHalvingCompletesTask(): void
 
         $response1->assertStatus(200);
         $this->assertTrue($response1->json('success'), 'First halving should succeed');
+        $this->assertLessThan($originalDuration, $response1->json('remaining_time'), 'First halve should reduce remaining time');
 
-        $remainingAfterFirst = $response1->json('remaining_time');
+        $queueItem->refresh();
+        $this->assertEquals(1, (int)$queueItem->dm_halved, 'dm_halved flag should be set after first halve');
 
-        // If task is short enough (original <= 96h), second halve should complete it
-        if ($originalDuration <= 345600) { // 96 hours in seconds
-            // Second halve should complete the task
-            $response2 = $this->post('/ajax/facilities/halve-building', [
-                '_token' => csrf_token(),
-                'queue_item_id' => $queueItem->id,
-            ]);
+        // Second halve must be rejected — use Complete instead
+        $response2 = $this->post('/ajax/facilities/halve-building', [
+            '_token' => csrf_token(),
+            'queue_item_id' => $queueItem->id,
+        ]);
 
-            $response2->assertStatus(200);
-            $responseData = $response2->json();
+        $response2->assertStatus(200);
+        $this->assertFalse($response2->json('success'), 'Second halving should be rejected');
+        $this->assertStringContainsString('already been halved', (string)$response2->json('message'));
 
-            $this->assertTrue($responseData['success'], 'Second halving should succeed');
-            $this->assertLessThanOrEqual(1, $responseData['remaining_time'], 'Remaining time should be near zero after double halving');
-        } else {
-            // For very long tasks, just verify first halve reduced time
-            $this->assertLessThan($originalDuration, $remainingAfterFirst, 'First halve should reduce remaining time');
-        }
+        // Complete finishes the building instantly
+        $response3 = $this->post('/ajax/facilities/complete-building', [
+            '_token' => csrf_token(),
+            'queue_item_id' => $queueItem->id,
+        ]);
+
+        $response3->assertStatus(200);
+        $this->assertTrue($response3->json('success'), 'Complete should succeed after first halve');
+
+        $this->planetService->updateBuildingQueue();
+        $this->planetService->reloadPlanet();
+
+        $this->assertEquals($levelBefore + 1, $this->planetService->getObjectLevel('metal_mine'), 'Building should be completed');
+
+        $queueItem->refresh();
+        $this->assertEquals(1, (int)$queueItem->processed, 'Queue item should be processed');
+        $this->assertEquals(1, (int)$queueItem->dm_completed, 'dm_completed flag should be set');
     }
 
     /**

From bd3722ff70ee5594f1f0e624bb3a1db8bb1fc61e Mon Sep 17 00:00:00 2001
From: root <root@space.tiweb-host.com>
Date: Fri, 24 Jul 2026 22:18:43 +0000
Subject: [PATCH 3/3] test: use findCurrentUser in building DM unit tests

Satisfy PHPStan level 8 nullability checks after the rebase onto main.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 tests/Unit/HalvingServiceTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Unit/HalvingServiceTest.php b/tests/Unit/HalvingServiceTest.php
index d883e2492..578512e74 100644
--- a/tests/Unit/HalvingServiceTest.php
+++ b/tests/Unit/HalvingServiceTest.php
@@ -576,7 +576,7 @@ public function testOperationIsolation(): void
      */
     public function testDoubleBuildingHalvingIsRejected(): void
     {
-        $user = User::find($this->currentUserId);
+        $user = $this->findCurrentUser();
         $user->dark_matter = 200000;
         $user->save();
 
@@ -606,7 +606,7 @@ public function testDoubleBuildingHalvingIsRejected(): void
      */
     public function testCompleteBuildingAfterHalve(): void
     {
-        $user = User::find($this->currentUserId);
+        $user = $this->findCurrentUser();
         $user->dark_matter = 200000;
         $user->save();