Added checks for existing job

Author: martinyde

src/Controller/Controller.php

@@ -92,9 +92,16 @@ public function jobMessage(): array {
     $jobId = $this->requestStack->getCurrentRequest()->get('job_id');
     $job = $this->helper->getJobFromId($jobId);
 
+    if (empty($job)) {
+      $message = $this->t('Job not found');
+    }
+    else {
+      $message = $job->getMessage();
+    }
+
     $renderArray['content'] = [
       '#type' => 'markup',
-      '#markup' => '<p>' . $job->getMessage() . '</p>',
+      '#markup' => '<p>' . $message . '</p>',
     ];
 
     return $renderArray;

src/Form/RetryJob.php

@@ -57,6 +57,11 @@ public function getFormId(): string {
    */
   public function getQuestion(): TranslatableMarkup {
     $job = $this->helper->getJobFromId((string) $this->jobId);
+
+    if (empty($job)) {
+      return $this->t('Job not found');
+    }
+
     $webformId = $this->helper->getWebformIdFromQueue($job->getId());
 
     return $this->t('Are you sure you want to retry queue job related to Webform: @webformId, Submission id: @serialId', [
@@ -94,22 +99,22 @@ public function buildForm(array $form, FormStateInterface $form_state, int $job_
    */
   public function submitForm(array &$form, FormStateInterface $form_state): void {
     $job = $this->helper->getJobFromId((string) $this->jobId);
-    $queue_id = $job->getQueueId();
+    if (!empty($job)) {
+      $queue_id = $job->getQueueId();
 
-    $queue_storage = $this->entityTypeManager->getStorage('advancedqueue_queue');
-    /** @var \Drupal\advancedqueue\Entity\QueueInterface $queue */
-    $queue = $queue_storage->load($queue_id);
+      $queue_storage = $this->entityTypeManager->getStorage('advancedqueue_queue');
+      /** @var \Drupal\advancedqueue\Entity\QueueInterface $queue */
+      $queue = $queue_storage->load($queue_id);
 
-    $queue_backend = $queue->getBackend();
-    if ($queue_backend instanceof Database) {
-      $job = $this->helper->getJobFromId((string) $this->jobId);
+      $queue_backend = $queue->getBackend();
+      if ($queue_backend instanceof Database) {
+        if ($job->getState() != Job::STATE_FAILURE) {
+          throw new \InvalidArgumentException('Only failed jobs can be retried.');
+        }
 
-      if ($job->getState() != Job::STATE_FAILURE) {
-        throw new \InvalidArgumentException('Only failed jobs can be retried.');
+        $queue_backend->retryJob($job);
+        $form_state->setRedirectUrl($this->getCancelUrl());
       }
-
-      $queue_backend->retryJob($job);
-      $form_state->setRedirectUrl($this->getCancelUrl());
     }
   }
 

src/Helper/Helper.php

@@ -38,15 +38,18 @@ public function __construct(
    * @param string $jobId
    *   The job id.
    *
-   * @return \Drupal\advancedqueue\Job
+   * @return \Drupal\advancedqueue\Job|null
    *   A list of attributes related to a job.
    */
-  public function getJobFromId(string $jobId): Job {
+  public function getJobFromId(string $jobId): Job|NULL {
     $query = $this->connection->select('advancedqueue', 'a');
     $query->fields('a');
     $query->condition('job_id', $jobId, '=');
     $definition = $query->execute()->fetchAssoc();
 
+    if (empty($definition)) {
+      return NULL;
+    }
     // Match Job constructor id.
     $definition['id'] = $definition['job_id'];
 
@@ -67,6 +70,9 @@ public function getJobFromId(string $jobId): Job {
    */
   public function getSubmissionIdFromJob(string $jobId): ?int {
     $job = $this->getJobFromId($jobId);
+    if (empty($job)) {
+      return NULL;
+    }
     $payload = $job->getPayload();
 
     return $payload['submissionId'] ?? $payload['submission']['id'] ?? NULL;

src/Plugin/Action/RetryJob.php

@@ -86,6 +86,9 @@ public static function create(ContainerInterface $container, $configuration, $pl
    */
   public function execute(string $jobId = NULL): void {
     $job = $this->helper->getJobFromId($jobId);
+    if (empty($job)) {
+      return;
+    }
     $queue_id = $job->getQueueId();
 
     $queue_storage = $this->entityTypeManager->getStorage('advancedqueue_queue');

src/Plugin/views/field/AdvancedQueueBulkForm.php

@@ -169,6 +169,9 @@ public function viewsFormSubmit(&$form, FormStateInterface $form_state): void {
       foreach ($selected as $bulk_form_key) {
         // Skip execution if the user did not have access.
         $job = $this->helper->getJobFromId($bulk_form_key);
+        if (empty($job)) {
+          return;
+        }
         if ('failure' !== $job->getState()) {
           $this->messenger->addError($this->t('Element with webform submission id: @webform_submit_id already has state: @state', [
             '@webform_submit_id' => $this->helper->getSubmissionSerialIdFromJob($bulk_form_key),