Cleaned up handling of files "Recipient authority"

Author: rimi-itk

README.md

@@ -35,6 +35,17 @@ drush os2forms-fordelingskomponent
 
 to see the list of Drush commands provided by the module.
 
+## Generatings submissions
+
+For testing and development, it may be useful to generate a number/lot of submissions on a webform. The
+[Webform](https://www.drupal.org/project/webform) and [Devel](https://www.drupal.org/project/devel) modules can help us
+do this:
+
+``` shell
+drush pm:install webform_devel devel_generate
+drush webform:generate --help
+```
+
 ---
 
 ``` shell name=key-create-sf2900_certificate

drush.services.yml

@@ -36,7 +36,7 @@ services:
     arguments:
       - '@Drupal\os2forms_fordelingskomponent\Helper\FordelingskomponentHelper'
       - '@Drupal\os2forms_fordelingskomponent\Settings'
-      - '@entity_type.manager'
+      - "@entity_type.manager"
       - '@Drupal\os2forms_fordelingskomponent\Helper\WebformHelperSF2900'
     tags:
       - { name: console.command }

src/Form/SettingsForm.php

@@ -101,7 +101,7 @@ private function buildFormSender(): array {
     $section[SenderSettings::ROUTING_MYNDIGHED] = [
       '#type' => 'textfield',
       '#title' => $this->t('Routing myndighed'),
-      // '#required' => TRUE,
+      '#required' => TRUE,
       '#default_value' => $settings->routingMyndighed,
       '#description' => $this->t('Default routing myndighed (CVR). May be overwritten by handler settings.'),
     ];

src/Helper/FordelingskomponentHelper.php

@@ -755,10 +755,14 @@ private function buildTriggerFile(
 
     $infRef = $handlerSettings->distributionObject->files->filspecifikation;
     $senderItSystem = $handlerSettings->sender->registreringItSystem;
-    $senderAuthority = 'urn:oio:cvr-nr:' . $handlerSettings->sender->routingMyndighed;
+    $senderAuthority = sprintf('urn:oio:cvr-nr:%08d', $handlerSettings->sender->routingMyndighed);
 
     $recipientItSystem = trim((string) ($recipientItSystem ?? $handlerSettings->distributionObject->files->recipientItSystem));
-    $recipientAuthority = 'urn:oio:cvr-nr:' . $handlerSettings->distributionObject->files->recipientAuthority;
+    $recipientAuthority = trim($handlerSettings->distributionObject->files->recipientAuthority);
+    if ('' === $recipientAuthority) {
+      $recipientAuthority = $handlerSettings->sender->routingMyndighed;
+    }
+    $recipientAuthority = sprintf('urn:oio:cvr-nr:%08d', $recipientAuthority);
 
     $routingInfo = (new SFTPDynamicRoutingInfoType())
       ->setInfRef($infRef)

src/Plugin/WebformHandler/WebformHandlerSF2900.php

@@ -279,14 +279,34 @@ private function buildConfigurationFormDistributionObject(): array {
       ],
     ];
 
+    $section[DistributionObjectSettings::FILES][DistributionObjectFilesSettings::RECIPIENT_AUTHORITY_OVERRIDE] = [
+      '#title' => $this->t('Set %recipient_authority', [
+        '%recipient_authority' => $this->t('Recipient authority'),
+      ]),
+      '#type' => 'checkbox',
+      '#default_value' => $settings->files->recipientAuthorityOverride,
+      '#description' => $this->t('If %recipient_authority is not set here, the global %routing_myndighed_label value (@routing_myndighed_value) will be used.', [
+        '%recipient_authority' => $this->t('Recipient authority'),
+        '%routing_myndighed_label' => $this->t('Routing myndighed'),
+        '@routing_myndighed_value' => $this->settingsService->getSenderSettings()->routingMyndighed,
+      ]),
+    ];
     $section[DistributionObjectSettings::FILES][DistributionObjectFilesSettings::RECIPIENT_AUTHORITY] = [
       '#title' => $this->t('Recipient authority'),
       '#type' => 'textfield',
       '#attributes' => [
         'pattern' => DistributionObjectFilesSettings::RECIPIENT_AUTHORITY_PATTERN,
       ],
       '#default_value' => $settings->files->recipientAuthority,
-      '#description' => $this->t('CVR for recipient'),
+      '#description' => $this->t('CVR for recipient.'),
+      '#states' => [
+        'visible' => [
+          ':input[name="settings[' . DistributionObjectSettings::NAME . '][' . DistributionObjectSettings::FILES . '][' . DistributionObjectFilesSettings::RECIPIENT_AUTHORITY_OVERRIDE . ']"]' => ['checked' => TRUE],
+        ],
+        'required' => [
+          ':input[name="settings[' . DistributionObjectSettings::NAME . '][' . DistributionObjectSettings::FILES . '][' . DistributionObjectFilesSettings::RECIPIENT_AUTHORITY_OVERRIDE . ']"]' => ['checked' => TRUE],
+        ],
+      ],
     ];
     $setStates($section[DistributionObjectSettings::FILES][DistributionObjectFilesSettings::RECIPIENT_AUTHORITY], [
       DistributionObjectSettings::DISTRIBUTION_TYPE_FORMULAR,

src/Settings/DistributionObjectSettings/FilesSettings.php

@@ -20,6 +20,9 @@ class FilesSettings extends AbstractSettings {
   public const string RECIPIENT_IT_SYSTEM_LOOK_UP = 'recipient_it_system_look_up';
   public bool $recipientItSystemLookUp = TRUE;
 
+  public const string RECIPIENT_AUTHORITY_OVERRIDE = 'recipient_authority_override';
+  public bool $recipientAuthorityOverride = FALSE;
+
   public const string RECIPIENT_AUTHORITY_PATTERN = self::CVR_PATTERN;
   public const string RECIPIENT_AUTHORITY = 'recipient_authority';
   public ?string $recipientAuthority = '';