Merge pull request #76 from itk-dev/feature/digital-post-submission-l…

…ogging Fixed submission logging
OS2Forms · Dec 5, 2023 · a62008d · a62008d
2 parents 2c47532 + 068cb52
commit a62008d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- [#76](https://github.com/OS2Forms/os2forms/pull/76)
+  Fixed digital post logging on submissions.
 - [#74](https://github.com/OS2Forms/os2forms/pull/74)
   Allow composite elements in Maestro notification recipient
 - [#73](https://github.com/OS2Forms/os2forms/pull/73a)

diff --git a/modules/os2forms_digital_post/os2forms_digital_post.services.yml b/modules/os2forms_digital_post/os2forms_digital_post.services.yml
@@ -5,7 +5,7 @@ services:
 
   logger.channel.os2forms_digital_post_submission:
     parent: logger.channel_base
-    arguments: [ 'os2forms_digital_post_submission' ]
+    arguments: [ 'webform_submission' ]
 
   Drupal\os2forms_digital_post\Helper\Settings:
     arguments:

diff --git a/modules/os2forms_digital_post/src/Helper/WebformHelperSF1601.php b/modules/os2forms_digital_post/src/Helper/WebformHelperSF1601.php
@@ -217,6 +217,7 @@ public function log($level, $message, array $context = []): void {
    */
   public function createJob(WebformSubmissionInterface $webformSubmission, array $handlerConfiguration): ?Job {
     $context = [
+      'handler_id' => 'os2forms_digital_post',
       'webform_submission' => $webformSubmission,
     ];
 
@@ -230,15 +231,13 @@ public function createJob(WebformSubmissionInterface $webformSubmission, array $
       $queue->enqueueJob($job);
       $context['@queue'] = $queue->id();
       $this->notice('Job for sending digital post add to the queue @queue.', $context + [
-        'handler_id' => 'os2forms_digital_post',
         'operation' => 'digital post queued for sending',
       ]);
 
       return $job;
     }
     catch (\Exception $exception) {
       $this->error('Error creating job for sending digital post.', $context + [
-        'handler_id' => 'os2forms_digital_post',
         'operation' => 'digital post failed',
       ]);
       return NULL;
@@ -253,6 +252,10 @@ public function createJob(WebformSubmissionInterface $webformSubmission, array $
   public function processJob(Job $job): JobResult {
     $payload = $job->getPayload();
 
+    $context = [
+      'handler_id' => 'os2forms_digital_post',
+      'operation' => 'digital post send',
+    ];
     try {
       $submissionId = $payload['submissionId'];
       $submission = $this->loadSubmission($submissionId);
@@ -267,21 +270,16 @@ public function processJob(Job $job): JobResult {
           $message));
       }
 
+      $context['webform_submission'] = $submission;
       $this->sendDigitalPost($submission, $payload['handlerConfiguration']);
 
-      $this->notice('Digital post sent', [
-        'handler_id' => 'os2forms_digital_post',
-        'operation' => 'digital post send',
-        'webform_submission' => $submission,
-      ]);
+      $this->notice('Digital post sent', $context);
 
       return JobResult::success();
     }
     catch (\Exception $e) {
-      $this->error('Error: @message', [
+      $this->error('Error: @message', $context + [
         '@message' => $e->getMessage(),
-        'handler_id' => 'os2forms_digital_post',
-        'operation' => 'digital post send',
       ]);
 
       return JobResult::failure($e->getMessage());