OS2FORMS-358 CVR Datafordeler, error handling

Author: stankut

src/Plugin/os2web/DataLookup/DatafordelerCVR.php

@@ -7,6 +7,7 @@
 use Drupal\Core\Render\Markup;
 use Drupal\os2web_datalookup\LookupResult\CvrLookupResult;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
 use Psr\Http\Message\RequestInterface;
@@ -46,17 +47,11 @@ private function init() {
     $configuration = $this->getConfiguration();
 
     if ($webserviceUrl = $configuration['webserviceurl_live']) {
-      $handler = HandlerStack::create();
-      $handler->push(Middleware::mapRequest(function (RequestInterface $request) {
-        return $this->client->handleRequest($request);
-      }));
-
       $options = [
         'base_uri' => $webserviceUrl,
         'headers' => [
           'accept' => 'application/json',
         ],
-        'handler' => $handler,
       ];
       if ($certPath = $configuration['cert_path_live']) {
         $options['cert'] = $certPath;
@@ -152,14 +147,16 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
    * @inheritDoc
    */
   public function lookup($cvr) {
-//    $response = $this->httpClient->get('hentVirksomhedMedCVRNummer', ['query' => ['pCVRNummer' => $cvr]]);
-//    $result = json_decode((string) $response->getBody());
-
-    $json = '{"virksomhed":{"Id":"4001857899","CVRNummer":32342280,"virksomhedStartdato":"2011-07-01T00:00:00","registreringFra":"2020-01-22T08:55:32.000000+01:00","registreringsaktoer":"ERST","virkningFra":"2011-07-01T00:00:00","virkningsaktoer":"ERST","status":"aktiv","metadata":{"datafordelerOpdateringstid":"2020-08-21T11:22:13.541120+02:00"}},"virksomhedsnavn":{"vaerdi":"BELLCOM UDVIKLING ApS","registreringFra":"2020-01-22T08:55:32.000000+01:00","registreringsaktoer":"ERST","virkningFra":"2012-06-04T00:00:00","virkningsaktoer":"ERST","metadata":{"datafordelerOpdateringstid":"2020-08-21T15:13:51.837187+02:00"}},"telefonnummer":{},"e-mailadresse":{},"virksomhedsform":{"vaerdi":"80","vaerdiTekst":"Anpartsselskab","registreringFra":"2020-01-22T08:55:32.000000+01:00","registreringsaktoer":"ERST","virkningFra":"2011-07-01T00:00:00","virkningsaktoer":"ERST","metadata":{"datafordelerOpdateringstid":"2020-08-21T16:37:46.927773+02:00"}},"beliggenhedsadresse":{"adresse":"0a3f50bb-e658-32b8-e044-0003ba298018","CVRAdresse_vejkode":"1151","CVRAdresse_husnummerFra":"20","CVRAdresse_etagebetegnelse":"1","CVRAdresse_kommunekode":"621","CVRAdresse_kommunenavn":"KOLDING","CVRAdresse_postdistrikt":"Kolding","CVRAdresse_vejnavn":"Bredgade","CVRAdresse_postnummer":"6000","CVRAdresse_landekode":"DK","registreringFra":"2020-01-22T08:55:32.000000+01:00","registreringsaktoer":"ERST","virkningFra":"2018-12-07T00:00:00","virkningsaktoer":"ERST","metadata":{"datafordelerOpdateringstid":"2020-08-21T13:20:46.116972+02:00"}},"postadresse":{},"produktionsenheder":[{"pNummer":1016969288,"produktionsenhedsnavn":{"vaerdi":"BELLCOM UDVIKLING ApS"}}],"beskaeftigelse":[],"brancher":{"hovedbranche":{"vaerdi":"620100","vaerdiTekst":"Computerprogrammering","registreringFra":"2020-01-22T08:55:32.000000+01:00","registreringsaktoer":"ERST","virkningFra":"2011-07-01T00:00:00","virkningsaktoer":"ERST","metadata":{"datafordelerOpdateringstid":"2020-08-22T15:43:38.932137+02:00"}}},"reklamebeskyttet":{"vaerdi":true,"registreringFra":"2020-01-22T08:55:32.000000+01:00","re* Connection #0 to host s5-certservices.datafordeler.dk left intact gistreringsaktoer":"ERST","virkningFra":"2011-07-01T00:00:00","virkningsaktoer":"ERST","metadata":{"datafordelerOpdateringstid":"2020-08-21T15:59:07.841597+02:00"}},"kreditoplysninger":{},"dataleverandoer":{"vaerdi":"E&S","vaerdiTekst":"Erhvervsstyrelsen","registreringFra":"2020-01-22T08:55:32.000000+01:00","registreringsaktoer":"ERST","virkningFra":"2011-07-01T00:00:00","virkningsaktoer":"ERST"},"fuldtAnsvarligDeltagerRelation":[]}';
-    $result = json_decode($json);
+    try {
+      $response = $this->httpClient->get('hentVirksomhedMedCVRNummer', ['query' => ['pCVRNummer' => $cvr]]);
+      $result = json_decode((string) $response->getBody());
+    }
+    catch (ClientException $e) {
+      $result = $e->getMessage();
+    }
 
     $cvrResult = new CvrLookupResult();
-    if ($result && $result->virksomhed && !empty($result->virksomhed)) {
+    if ($result && isset($result->virksomhed) && !empty($result->virksomhed)) {
       $cvrResult->setSuccessful();
       $cvrResult->setCvr($cvr);
 
@@ -184,7 +181,9 @@ public function lookup($cvr) {
     }
     else {
       $cvrResult->setSuccessful(FALSE);
-      //$cvrResult->setErrorMessage($response->getBody());
+      if (is_string($result)) {
+        $cvrResult->setErrorMessage($result);
+      }
     }
 
     return $cvrResult;