From 0af125081a529fadff1ede20bbec8fd0450f8528 Mon Sep 17 00:00:00 2001
From: Mikkel Ricky <rimi@aarhus.dk>
Date: Mon, 24 Jan 2022 11:52:37 +0100
Subject: [PATCH] Handled address side

---
 .../WebformHandler/DigitalPostWebformHandler.php  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Plugin/WebformHandler/DigitalPostWebformHandler.php b/src/Plugin/WebformHandler/DigitalPostWebformHandler.php
index 67acc25..8e3a4d7 100644
--- a/src/Plugin/WebformHandler/DigitalPostWebformHandler.php
+++ b/src/Plugin/WebformHandler/DigitalPostWebformHandler.php
@@ -331,12 +331,19 @@ public function postSave(WebformSubmissionInterface $webform_submission, $update
     /** @var \Drupal\os2forms_cpr_lookup\CPR\CprServiceResult $cprSearchResult */
     $cprSearchResult = $this->cprService->search($submissionData[$this->configuration['cpr_element']]);
 
+    // We cannot use “side” (from address lookup via cpr) as “suiteIdentifier”
+    // when sending digital port. Therefore we append it to “floor” instead.
+    $floor = $cprSearchResult->getFloor();
+    if (!empty($cprSearchResult->getSide())) {
+      $floor .= ' '.$cprSearchResult->getSide();
+    }
+
     $recipient = [
       'name' => $cprSearchResult->getName(),
       'streetName' => $cprSearchResult->getStreetName(),
       'streetNumber' => $cprSearchResult->getHouseNumber(),
-      'floor' => $cprSearchResult->getFloor(),
-      'side' => $cprSearchResult->getSide(),
+      'floor' => $floor,
+      'side' => null,
       'postalCode' => $cprSearchResult->getPostalCode(),
       'city' => $cprSearchResult->getCity(),
     ];
@@ -363,8 +370,8 @@ public function postSave(WebformSubmissionInterface $webform_submission, $update
           null,
           $cprSearchResult->getStreetName(),
           $cprSearchResult->getHouseNumber(),
-          $cprSearchResult->getFloor(),
-          $cprSearchResult->getSide(),
+          $floor,
+          null,
           null,
           $cprSearchResult->getPostalCode(),
           null,