Merge pull request #1563 from hashtopolis/1542-bug-renaming-agent-causes-network-error

Added more validation for assigning agents

Author: s3inlc

src/inc/utils/AgentUtils.class.php

@@ -408,10 +408,17 @@ public static function assign(int $agentId, int $taskId, User $user): ?Assignmen
 
     $benchmark = 0;
     if (sizeof($assignments) > 0) {
+      if ($assignments[0]->getTaskId() === $taskId) {
+        throw new HttpError("Agent is already assigned to this task");
+      }
       for ($i = 1; $i < sizeof($assignments); $i++) { // clean up if required
         Factory::getAssignmentFactory()->delete($assignments[$i]);
       }
-      Factory::getAssignmentFactory()->mset($assignments[0], [Assignment::TASK_ID => $task->getId(), Assignment::BENCHMARK => $benchmark]);
+      $assignment = $assignments[0];
+      Factory::getAssignmentFactory()->mset($assignment, [Assignment::TASK_ID => $task->getId(), Assignment::BENCHMARK => $benchmark]);
+      $assignment->setTaskId($task->getId());
+      $assignment->setAgentId($agent->getId());
+      $assignment->setBenchmark($benchmark);
     }
     else {
       $assignment = new Assignment(null, $task->getId(), $agent->getId(), $benchmark);