Merge pull request #17 from itk-dev/feature/optimize-database-queries

Updated personalized view

Author: jekuaitk

CHANGELOG.md

@@ -4,6 +4,8 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret.
 
 ## [Under udvikling]
 
+* Optimerede database forespørgsler i personalized view'et.
+
 ## [1.7.0] 2025-05-02
 
 * Updaterer minimal php version

src/Controller/Controller.php

@@ -105,19 +105,8 @@ public function render(): array {
    * @phpstan-return array<string, mixed>
    */
   public function myFormErrors(): array {
-    $webforms = $this->entityTypeManager->getStorage('webform')->loadMultiple();
-    $jobIds = [];
-    foreach ($webforms as $webform) {
-      if ($webform->access('update')) {
-        $formJobIds = $this->helper->getQueueJobIds($webform->id());
-        array_push($jobIds, ...$formJobIds);
-      }
-    }
-
-    $jobIds = array_unique($jobIds);
     $view = Views::getView('os2forms_failed_jobs_personalized');
     $view->setDisplay('block_1');
-    $view->setArguments([implode(',', $jobIds)]);
 
     $view->execute();
     $renderedView = $view->render() ?? ['#markup' => $this->t('No failed jobs')];

src/Helper/Helper.php

@@ -650,4 +650,23 @@ private function removeQueueSubmissionRelation(string $submissionId): void {
     }
   }
 
+  /**
+   * Get all webforms with update access.
+   *
+   * @phpstan-return array<int, mixed>
+   *
+   * @throws \Exception
+   */
+  public function getAllWebformsWithUpdateAccess(): array {
+    $webforms = [];
+
+    foreach ($this->entityTypeManager->getStorage('webform')->loadMultiple() as $webform) {
+      if ($webform->access('update')) {
+        $webforms[] = $webform->id();
+      }
+    }
+
+    return $webforms;
+  }
+
 }

src/Plugin/views/filter/SubmissionExistsGlobalFilter.php

@@ -59,21 +59,15 @@ public function query(): void {
     $query = $this->query;
     $table = array_key_first($query->tables);
 
-    $existsQuery = $this->connection->select('os2forms_failed_jobs_queue_submission_relation', 'o');
-    $existsQuery->fields('o', ['job_id']);
-    $jobIds = $existsQuery->execute()->fetchCol();
+    $webformSubQuery = $this->connection->select('webform', 'w')
+      ->fields('w', ['webform_id'])
+      ->condition('w.webform_id', $this->helper->getAllWebformsWithUpdateAccess(), 'IN');
 
-    foreach ($jobIds as $job) {
-      if ($this->helper->getSubmissionSerialIdFromJob($job) > 0) {
-        $jobs[] = $job;
-      }
-    }
-    if (empty($jobs)) {
-      // The 'IN' operator requires a non empty array.
-      $jobs = [0];
-    }
+    $jobIdsSubQuery = $this->connection->select('os2forms_failed_jobs_queue_submission_relation', 'r')
+      ->fields('r', ['job_id'])
+      ->condition('r.webform_id', $webformSubQuery, 'IN');
 
-    $query->addWhere($this->options['group'], $table . '.job_id', $jobs, 'IN');
+    $query->addWhere($this->options['group'], $table . '.job_id', $jobIdsSubQuery, 'IN');
   }
 
 }