Merge pull request #136 from itk-dev/feature/token-retry

Added retry task controller action

Author: rimi-itk

os2forms_forloeb.routing.yml

@@ -7,3 +7,13 @@ os2forms_forloeb.forloeb_task_console_controller_execute:
     _permission: 'access content'
   options:
     no_cache: TRUE
+
+os2forms_forloeb.forloeb_task_console_controller_execute_retry:
+  path: 'os2forms-forloeb/execute-task-retry'
+  defaults:
+    _controller: '\Drupal\os2forms_forloeb\Controller\ForloebTaskConsoleController::retry'
+    _title: 'Task not yet ready'
+  requirements:
+    _permission: 'access content'
+  options:
+    no_cache: TRUE

src/Controller/ForloebTaskConsoleController.php

@@ -5,6 +5,7 @@
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Url;
 use Drupal\maestro\Engine\MaestroEngine;
 use Drupal\maestro\Utility\TaskHandler;
@@ -19,6 +20,8 @@
  */
 class ForloebTaskConsoleController extends ControllerBase {
 
+  use StringTranslationTrait;
+
   /**
    * Update manager service.
    *
@@ -82,6 +85,12 @@ public function execute() {
     $token = $this->requestStack->getCurrentRequest()->query->get('os2forms-forloeb-ws-token', '');
     if ($token) {
       $queueRecord = $this->forloebTaskConsole->getQueueIdByWebformSubmissionToken($token);
+      if (empty($queueRecord)) {
+        return new RedirectResponse(
+          Url::fromRoute('os2forms_forloeb.forloeb_task_console_controller_execute_retry',
+          ['referrer' => \Drupal::request()->getRequestUri()])->toString()
+        );
+      }
     }
     else {
       // For empty token there is user last task from taskconsole queue.
@@ -150,4 +159,18 @@ public function execute() {
     return new RedirectResponse($redirect_to->toString());
   }
 
+  /**
+   * Show message about task not yet ready.
+   *
+   * @return array
+   *   The render array.
+   */
+  public function retry() {
+    $referrer = $this->requestStack->getCurrentRequest()->query->get('referrer', '#');
+
+    return [
+      '#markup' => $this->t('Your task is not yet ready. Please <a href=":referrer">try again</a> in 5 minutes.', [':referrer' => $referrer]),
+    ];
+  }
+
 }