From afa4bc461ca03df88399f4b50ad03d7a2a404f70 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 6 Sep 2025 13:26:10 +1000 Subject: [PATCH] Fixes for tests --- app/Repositories/TaskRepository.php | 7 ------- tests/Unit/TaskRepositoryBulkUpdateTest.php | 16 ++++++++-------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/app/Repositories/TaskRepository.php b/app/Repositories/TaskRepository.php index ebd8f16b3f..e34ac8723a 100644 --- a/app/Repositories/TaskRepository.php +++ b/app/Repositories/TaskRepository.php @@ -434,21 +434,14 @@ class TaskRepository extends BaseRepository public function bulkUpdate(\Illuminate\Database\Eloquent\Builder $models, string $column, mixed $new_value): void { -nlog("xx"); - nlog($models->pluck('id')); -nlog("yy"); // First, filter out tasks that have been invoiced $models->whereNull('invoice_id'); - nlog($models->pluck('id')); - if(stripos($column, '_id') !== false) { $new_value = $this->decodePrimaryKey($new_value); } - nlog("setting column = " . $column . " to " . $new_value); - if ($column === 'project_id') { // Handle project_id updates with client_id synchronization $project = Project::withTrashed() diff --git a/tests/Unit/TaskRepositoryBulkUpdateTest.php b/tests/Unit/TaskRepositoryBulkUpdateTest.php index 1153dc2eae..53779af14a 100644 --- a/tests/Unit/TaskRepositoryBulkUpdateTest.php +++ b/tests/Unit/TaskRepositoryBulkUpdateTest.php @@ -102,7 +102,7 @@ class TaskRepositoryBulkUpdateTest extends TestCase $models = Task::whereIn('id', [$task1->id, $task2->id]); // Bulk update project_id - $this->taskRepository->bulkUpdate($models, 'project_id', $otherProject->id); + $this->taskRepository->bulkUpdate($models, 'project_id', $otherProject->hashed_id); // Refresh models from database $task1->refresh(); @@ -164,7 +164,7 @@ class TaskRepositoryBulkUpdateTest extends TestCase $models = Task::where('id', $task->id); // Bulk update client_id - $this->taskRepository->bulkUpdate($models, 'client_id', $newClient->id); + $this->taskRepository->bulkUpdate($models, 'client_id', $newClient->hashed_id); // Refresh model from database $task->refresh(); @@ -197,7 +197,7 @@ class TaskRepositoryBulkUpdateTest extends TestCase $models = Task::whereIn('id', [$task1->id, $task2->id]); // Bulk update assigned_user_id - $this->taskRepository->bulkUpdate($models, 'assigned_user_id', $this->testUser->id); + $this->taskRepository->bulkUpdate($models, 'assigned_user_id', $this->testUser->hashed_id); // Refresh models from database $task1->refresh(); @@ -238,7 +238,7 @@ class TaskRepositoryBulkUpdateTest extends TestCase $models = Task::whereIn('id', [$invoicedTask->id, $regularTask->id]); // Bulk update assigned_user_id - $this->taskRepository->bulkUpdate($models, 'assigned_user_id', $this->testUser->id); + $this->taskRepository->bulkUpdate($models, 'assigned_user_id', $this->testUser->hashed_id); // Refresh models from database $invoicedTask->refresh(); @@ -269,7 +269,7 @@ class TaskRepositoryBulkUpdateTest extends TestCase $models = Task::where('id', $task->id); // Bulk update project_id (should work with soft deleted project) - $this->taskRepository->bulkUpdate($models, 'project_id', $this->testProject->id); + $this->taskRepository->bulkUpdate($models, 'project_id', $this->testProject->hashed_id); // Refresh model from database $task->refresh(); @@ -324,7 +324,7 @@ class TaskRepositoryBulkUpdateTest extends TestCase $startTime = microtime(true); // Bulk update assigned_user_id - $this->taskRepository->bulkUpdate($models, 'assigned_user_id', $this->testUser->id); + $this->taskRepository->bulkUpdate($models, 'assigned_user_id', $this->testUser->hashed_id); $endTime = microtime(true); $executionTime = $endTime - $startTime; @@ -345,7 +345,7 @@ class TaskRepositoryBulkUpdateTest extends TestCase $models = Task::where('id', 99999); // This should not throw an error - $this->taskRepository->bulkUpdate($models, 'assigned_user_id', $this->testUser->id); + $this->taskRepository->bulkUpdate($models, 'assigned_user_id', $this->testUser->hashed_id); // No assertions needed - just ensuring no exceptions are thrown $this->assertTrue(true); @@ -369,7 +369,7 @@ class TaskRepositoryBulkUpdateTest extends TestCase $models = Task::where('id', $task->id); // Bulk update project_id (should work with soft deleted project) - $this->taskRepository->bulkUpdate($models, 'project_id', $this->testProject->id); + $this->taskRepository->bulkUpdate($models, 'project_id', $this->testProject->hashed_id); // Refresh model from database $task->refresh();