OS-245 adding P-number lookup

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* Adding Datafordeler P-number lookup
+
 ## [3.2.0] - 2026-05-29
 
 * [PR-32](https://github.com/OS2web/os2web_datalookup/pull/32)

src/LookupResult/CompanyLookupResult.php

@@ -37,70 +37,70 @@ class CompanyLookupResult {
    *
    * @var string
    */
-  protected string $cvr;
+  protected string $cvr = '';
+
+  /**
+   * The P-Number number.
+   *
+   * @var string
+   */
+  protected string $pNumber = '';
 
   /**
    * Company name.
    *
    * @var string
    */
-  protected string $name;
+  protected string $name = '';
 
   /**
    * Street of the person.
    *
    * @var string
    */
-  protected string $street;
+  protected string $street = '';
 
   /**
    * Street house number of the person.
    *
    * @var string
    */
-  protected string $houseNr;
+  protected string $houseNr = '';
 
   /**
    * Floor number of the person.
    *
    * @var string
    */
-  protected string $floor;
+  protected string $floor = '';
 
   /**
    * Apartment number of the person.
    *
    * @var string
    */
-  protected string $apartmentNr;
+  protected string $apartmentNr = '';
 
   /**
    * Postal code of the person.
    *
    * @var string
    */
-  protected string $postalCode;
+  protected string $postalCode = '';
 
   /**
    * City of the person.
    *
    * @var string
    */
-  protected string $city;
+  protected string $city = '';
 
   /**
    * Municipality code of the person.
    *
    * @var string
    */
-  protected string $municipalityCode;
-
-  /**
-   * Address of the person.
-   *
-   * @var string
-   */
-  protected string $address;
+  protected string $municipalityCode = '';
 
   /**
    * Check the state of successful.
@@ -162,6 +162,26 @@ public function setCvr(string $cpr): void {
     $this->cvr = $cpr;
   }
 
+  /**
+   * Get P-Number number.
+   *
+   * @return string
+   *   P-Number.
+   */
+  public function getPnumber(): string {
+    return $this->pNumber;
+  }
+
+  /**
+   * Set P-Number number.
+   *
+   * @param string $pNumber
+   *   P-Number.
+   */
+  public function setPnumber(string $pNumber): void {
+    $this->pNumber = $pNumber;
+  }
+
   /**
    * Get name.
    *
@@ -329,17 +349,21 @@ public function setMunicipalityCode(string $municipalityCode): void {
    *   The address.
    */
   public function getAddress(): string {
-    return $this->address;
-  }
+    $address = $this->getStreet();
+    if ($this->getHouseNr()) {
+      $address .= ' ' . $this->getHouseNr();
+    }
+    if ($this->getFloor()) {
+      $address .= ' ' . $this->getFloor();
+    }
+    if ($this->getApartmentNr()) {
+      $address .= ' ' . $this->getApartmentNr();
+    }
+    if ($this->getPostalCode() && $this->getCity()) {
+      $address .= ', ' . $this->getPostalCode() . ' ' . $this->getCity();
+    }
 
-  /**
-   * Set address.
-   *
-   * @param string $address
-   *   The address to set.
-   */
-  public function setAddress(string $address): void {
-    $this->address = $address;
+    return $address;
   }
 
   /**
@@ -352,6 +376,14 @@ public function setAddress(string $address): void {
    *   The field value or the empty string if the field does not exist.
    */
   public function getFieldValue(string $field): mixed {
+    $calculatedFields = [
+      $this::ADDRESS => fn() => $this->getAddress(),
+    ];
+
+    if (isset($calculatedFields[$field])) {
+      return $calculatedFields[$field]();
+    }
+
     if (property_exists($this, $field) && isset($this->{$field})) {
       return $this->{$field};
     }

src/Plugin/os2web/DataLookup/DatafordelerCVR.php

@@ -127,23 +127,6 @@ public function lookup(string $param): CompanyLookupResult {
         $city = $address->CVRAdresse_postdistrikt ?? $cvrResult->getPostalCode();
         $cvrResult->setCity($city);
         $cvrResult->setMunicipalityCode($address->CVRAdresse_kommunekode ?? '');
-
-        // Composing full address in one line.
-        $address = $cvrResult->getStreet();
-        if ($cvrResult->getHouseNr()) {
-          $address .= ' ' . $cvrResult->getHouseNr();
-        }
-        if ($cvrResult->getFloor()) {
-          $address .= ' ' . $cvrResult->getFloor();
-        }
-        if ($cvrResult->getApartmentNr()) {
-          $address .= ' ' . $cvrResult->getApartmentNr();
-        }
-        if ($cvrResult->getPostalCode() && $cvrResult->getCity()) {
-          $address .= ', ' . $cvrResult->getPostalCode() . ' ' . $cvrResult->getCity();
-        }
-
-        $cvrResult->setAddress($address);
       }
     }
     else {