OS2FORMS-359 adding address, provided available fields as const

Author: stankut

src/LookupResult/CprLookupResult.php

@@ -4,6 +4,18 @@
 
 class CprLookupResult {
 
+  const CPR = 'cpr';
+  const NAME = 'name';
+  const STREET = 'street';
+  const HOUSE_NR = 'houseNr';
+  const FLOOR = 'floor';
+  const APARTMENT_NR = 'apartmentNr';
+  const POSTAL_CODE = 'postalCode';
+  const CITY = 'city';
+  const MUNICIPALITY_CODE = 'municipalityCode';
+  const ADDRESS = 'address';
+  const CO_NAME = 'coName';
+
   /**
    * Is request successful.
    *
@@ -81,6 +93,13 @@ class CprLookupResult {
    */
   protected $municipalityCode;
 
+  /**
+   * Address of the person.
+   *
+   * @var string
+   */
+  protected $address;
+
   /**
    * CO Name of the person.
    *
@@ -249,6 +268,20 @@ public function setMunicipalityCode(string $municipalityCode): void {
     $this->municipalityCode = $municipalityCode;
   }
 
+  /**
+   * @return string
+   */
+  public function getAddress(): string {
+    return $this->address;
+  }
+
+  /**
+   * @param string $address
+   */
+  public function setAddress(string $address): void {
+    $this->address = $address;
+  }
+
   /**
    * @return string
    */
@@ -277,4 +310,27 @@ public function setNameAddressProtected(bool $nameAddressProtected): void {
     $this->nameAddressProtected = $nameAddressProtected;
   }
 
+  /**
+   * Returns the value of the provided field.
+   *
+   * @param $field
+   *   Field name;
+   */
+
+  /**
+   * Returns the value of the provided field.
+   *
+   * @param $field
+   *   Field name.
+   *
+   * @return mixed
+   */
+  public function getFieldValue($field) {
+    if (property_exists($this, $field)) {
+      return $this->{$field};
+    }
+
+    return '';
+  }
+
 }

src/Plugin/os2web/DataLookup/ServiceplatformenCPR.php

@@ -176,6 +176,7 @@ public function lookup($cpr) {
       $cprResult->setPostalCode($result['postnummer'] ?? '');
       $cprResult->setCity($result['postdistrikt'] ?? '');
       $cprResult->setMunicipalityCode($result['kommunekode'] ?? '');
+      $cprResult->setAddress($cprResult->getStreet() . ' ' . $cprResult->getHouseNr() . ', ' . $cprResult->getFloor() . ', ' . $cprResult->getApartmentNr());
       $cprResult->setCoName($result['conavn'] ?? '');
       $cprResult->setNameAddressProtected($result['navneOgAdressebeskyttelse'] ?? '');
     }

src/Plugin/os2web/DataLookup/ServiceplatformenCPRExtended.php

@@ -109,6 +109,7 @@ public function lookup($cpr) {
         $cprResult->setPostalCode($address->aktuelAdresse->postnummer ?? '');
         $cprResult->setCity($address->aktuelAdresse->postdistrikt ?? '');
         $cprResult->setMunicipalityCode($address->aktuelAdresse->kommunekode ?? '');
+        $cprResult->setAddress($address->aktuelAdresse->standardadresse ?? '');
       }
 
       // Leaving empty, no information in webservice.