Added clean up of messages

Author: rimi-itk

src/Helper/BeskedfordelerHelper.php

@@ -6,6 +6,7 @@
 use Drupal\Core\Database\Connection;
 use Drupal\os2forms_digital_post\Exception\InvalidMessage;
 use Drupal\os2forms_digital_post\Model\Message;
+use Drupal\webform\WebformSubmissionInterface;
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\LoggerInterface;
 
@@ -73,7 +74,7 @@ public function loadMessage(string $messageUUID): ?Message {
       ->fields('m')
       ->condition('message_uuid', $messageUUID)
       ->execute()
-      ->fetchObject(Message::class) ?: NULL;
+      ->fetchObject(Message::class, []) ?: NULL;
   }
 
   /**
@@ -95,6 +96,23 @@ public function addBeskedfordelerMessage(string $messageUUID, string $beskedford
       ->execute();
   }
 
+  /**
+   * Delete messages for submissions.
+   *
+   * @param array|WebformSubmissionInterface[] $submissions
+   *   The submissions.
+   */
+  public function deleteMessages(array $submissions) {
+    $submissionIds = array_map(static function (WebformSubmissionInterface $submission) {
+      return $submission->id();
+    }, $submissions);
+
+    $this->database
+      ->delete(self::TABLE_NAME)
+      ->condition('submission_id', $submissionIds, 'IN')
+      ->execute();
+  }
+
   /**
    * Implements hook_schema().
    *

src/Helper/WebformHelperSF1601.php

@@ -359,4 +359,13 @@ public function processBeskedfordelerData(int $submissionId, array $data) {
     }
   }
 
+  /**
+   * Proxy for BeskedfordelerHelper::deleteMessages().
+   *
+   * @see BeskedfordelerHelper::deleteMessages()
+   */
+  public function deleteMessages(array $webformSubmissions) {
+    $this->beskedfordelerHelper->deleteMessages($webformSubmissions);
+  }
+
 }

src/Model/Message.php

@@ -41,7 +41,7 @@ class Message {
    *
    * @var string
    */
-  public string $beskedfordelerMessage;
+  public ?string $beskedfordelerMessage;
 
   /**
    * Called when using \PDO::FETCH_CLASS.

src/Plugin/WebformHandler/WebformHandlerSF1601.php

@@ -336,6 +336,20 @@ public function postSave(WebformSubmissionInterface $webformSubmission, $update
     $this->helper->createJob($webformSubmission, $this->configuration);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function postDelete(WebformSubmissionInterface $webformSubmission) {
+    $this->helper->deleteMessages([$webformSubmission]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postPurge(array $webformSubmissions) {
+    $this->helper->deleteMessages($webformSubmissions);
+  }
+
   /**
    * Display the invoked plugin method to end user.
    *