Set actual identifier from lookup on lookup result

Author: rimi-itk

src/Plugin/os2web/DataLookup/DatafordelerCVR.php

@@ -80,7 +80,7 @@ public function lookup(string $param): CompanyLookupResult {
     $cvrResult = new CompanyLookupResult();
     if ($result && isset($result->virksomhed) && !empty((array) $result->virksomhed)) {
       $cvrResult->setSuccessful();
-      $cvrResult->setCvr($param);
+      $cvrResult->setCvr($result->virksomhed->CVRNummer);
 
       if ($result->virksomhedsnavn) {
         $cvrResult->setName($result->virksomhedsnavn->vaerdi);

src/Plugin/os2web/DataLookup/ServiceplatformenCPR.php

@@ -164,6 +164,7 @@ public function lookup(string $cpr): CprLookupResult {
     // If all goes well, we return an address array.
     if ($result['status']) {
       $cprResult->setSuccessful();
+      // @todo Use a value from from $result to set CPR. But which key?
       $cprResult->setCpr($cpr);
       $cprResult->setName($result['adresseringsnavn'] ?? '');
       $cprResult->setStreet($result['vejadresseringsnavn'] ?? '');

src/Plugin/os2web/DataLookup/ServiceplatformenCPRExtended.php

@@ -125,9 +125,9 @@ public function lookup(string $cpr, $fetchChildren = TRUE, $allowCprTestModeRepl
     // If all goes well, we return an address array.
     if ($result['status']) {
       $cprResult->setSuccessful();
-      $cprResult->setCpr($cpr);
 
       $persondata = $result['persondata'];
+      $cprResult->setCpr($persondata->personnummer);
 
       if ($persondata->status) {
         if ($persondata->status->status == self::CPR_STATUS_DEAD) {

src/Plugin/os2web/DataLookup/ServiceplatformenCVR.php

@@ -120,7 +120,7 @@ public function lookup(string $param): CompanyLookupResult {
     $cvrResult = new CompanyLookupResult();
     if ($result['status']) {
       $cvrResult->setSuccessful();
-      $cvrResult->setCvr($param);
+      $cvrResult->setCvr($result['cvr']);
 
       $cvrResult->setName($result['company_name']);
       $cvrResult->setStreet($result['company_street']);