Browse Source

Make sure old task deleted from the job

pull/16/head
Nafies Luthfi 7 years ago
parent
commit
402941aac9
  1. 5
      app/Http/Controllers/Projects/TasksController.php
  2. 4
      tests/Feature/ManageJobsTest.php

5
app/Http/Controllers/Projects/TasksController.php

@ -2,6 +2,7 @@
namespace App\Http\Controllers\Projects; namespace App\Http\Controllers\Projects;
use DB;
use App\Entities\Projects\Job; use App\Entities\Projects\Job;
use App\Entities\Projects\Task; use App\Entities\Projects\Task;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
@ -84,7 +85,11 @@ class TasksController extends Controller
$job->description = $task->description; $job->description = $task->description;
$job->project_id = $oldJob->project_id; $job->project_id = $oldJob->project_id;
$job->worker_id = $oldJob->worker_id; $job->worker_id = $oldJob->worker_id;
DB::beginTransaction();
$job->save(); $job->save();
$task->delete();
DB::commit();
flash(__('task.upgraded_to_job'), 'success'); flash(__('task.upgraded_to_job'), 'success');

4
tests/Feature/ManageJobsTest.php

@ -230,5 +230,9 @@ class ManageJobsTest extends TestCase
'name' => 'This is a Task', 'name' => 'This is a Task',
'description' => 'Task description.', 'description' => 'Task description.',
]); ]);
$this->dontSeeInDatabase('tasks', [
'id' => $task->id,
]);
} }
} }
Loading…
Cancel
Save