Merge branch 'master' into feature/avoid-double-save-on-name-and-address-protected-submission

Author: rimi-itk

CHANGELOG.md

@@ -12,6 +12,10 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 ## [Unreleased]
 
 - Avoid double-saving submissions when handling name and address protection.
+- [PR-191](https://github.com/OS2Forms/os2forms/pull/191)
+  Re-throws exception to ensure failed status during Maestro notification job.
+- [PR-202](https://github.com/OS2Forms/os2forms/pull/202)
+  - Removed non-digits from recipient id in Maestro digital post notifications.
 - [PR-189](https://github.com/OS2Forms/os2forms/pull/189)
   - Added support for MeMo 1.2 and added additional validation of MeMo actions.
 

modules/os2forms_forloeb/src/MaestroHelper.php

@@ -205,7 +205,14 @@ public function processJob(Job $job): JobResult {
 
     $submission = $this->webformSubmissionStorage->load($submissionID);
 
-    $this->sendNotification($notificationType, $submission, $templateTask, $maestroQueueID);
+    try {
+      $this->sendNotification($notificationType, $submission, $templateTask, $maestroQueueID);
+    }
+    catch (\Exception $e) {
+      // Logging is done by the sendNotification method.
+      // The job should be considered failed.
+      return JobResult::failure($e->getMessage());
+    }
 
     return JobResult::success();
   }
@@ -261,12 +268,15 @@ private function sendNotification(
       }
     }
     catch (\Exception $exception) {
+      // Log with context and rethrow exception.
       $this->error('Error sending notification: @message', $context + [
         '@message' => $exception->getMessage(),
         'handler_id' => 'os2forms_forloeb',
         'operation' => 'notification failed',
         'exception' => $exception,
       ]);
+
+      throw $exception;
     }
   }
 
@@ -389,7 +399,10 @@ private function sendNotificationDigitalPost(
       $senderLabel = $subject;
       $messageLabel = $subject;
 
-      $recipientLookupResult = $this->digitalPostHelper->lookupRecipient($recipient);
+      // Remove all non-digits from recipient identifier.
+      $recipientIdentifier = preg_replace('/[^\d]+/', '', $recipient);
+
+      $recipientLookupResult = $this->digitalPostHelper->lookupRecipient($recipientIdentifier);
       $actions = [
         (new Action())
           ->setActionCode(SF1601::ACTION_SELVBETJENING)