update search version & fixe extract result data

Author: Quentin Bontemps

composer.json

@@ -12,7 +12,7 @@
       "email": "q.bontemps@gmail.com"
     }
   ],
-  "version": "1.0.0",
+  "version": "1.0.1",
   "require-dev": {
     "phpunit/phpunit": "^5.0"
   },

src/MondialRelay/ApiClient.php

@@ -24,18 +24,18 @@ public function findDeliveryPoints(array $request)
     {
         try {
             $request = $this->decorateRequest($request);
-            $result = $this->client->WSI3_PointRelais_Recherche($request);
+            $result = $this->client->WSI4_PointRelais_Recherche($request);
             $pointFactory = new PointFactory();
-            $this->checkResponse('WSI3_PointRelais_Recherche', $result);
+            $this->checkResponse('WSI4_PointRelais_Recherche', $result);
             $delivery_points = [];
-            if (!property_exists($result->WSI3_PointRelais_RechercheResult->PointsRelais, 'PointRelais_Details')) {
+            if (!property_exists($result->WSI4_PointRelais_RechercheResult->PointsRelais, 'PointRelais_Details')) {
                 return $delivery_points;
             }
-            if (is_object($result->WSI3_PointRelais_RechercheResult->PointsRelais->PointRelais_Details)) {
-                $delivery_points[] = $pointFactory->create($result->WSI3_PointRelais_RechercheResult->PointsRelais->PointRelais_Details);
+            if (is_object($result->WSI4_PointRelais_RechercheResult->PointsRelais->PointRelais_Details)) {
+                $delivery_points[] = $pointFactory->create($result->WSI4_PointRelais_RechercheResult->PointsRelais->PointRelais_Details);
                 return $delivery_points;
             }
-            foreach ($result->WSI3_PointRelais_RechercheResult->PointsRelais->PointRelais_Details as $destination_point) {
+            foreach ($result->WSI4_PointRelais_RechercheResult->PointsRelais->PointRelais_Details as $destination_point) {
                 $delivery_points[] = $pointFactory->create($destination_point);
             }
             return $delivery_points;

src/MondialRelay/Point/PointFactory.php

@@ -12,30 +12,63 @@
  */
 class PointFactory
 {
+
     public function create($response)
     {
         $bussines_hours = (new BussinessHoursFactory())->create($response);
+
         return new Point(
             $response->Num,
             str_replace(",", ".", $response->Latitude),
             str_replace(",", ".", $response->Longitude),
             $response->CP,
-            [
-                trim($response->LgAdr1),
-                trim($response->LgAdr2),
-                trim($response->LgAdr3),
-                trim($response->LgAdr4)
-            ],
+            $this->extractAddress($response),
             $response->Ville,
             $response->Pays,
-            [
-                $response->Localisation1,
-                $response->Localisation2
-            ],
+            $this->extractLocalisation($response),
             $response->TypeActivite,
             $response->Information,
             $bussines_hours
         );
+    }
+
+    protected function extractAddress($response)
+    {
+        $address = [];
+        $attributes = [
+            'LgAdr1',
+            'LgAdr2',
+            'LgAdr3',
+            'LgAdr4',
+        ];
+
+        foreach ($attributes as $attribute)
+        {
+            if (property_exists($response, $attribute))
+            {
+                $address[] = trim($response->{$attribute});
+            }
+        }
+
+        return $address;
+    }
+
+    protected function extractLocalisation($response)
+    {
+        $localisation = [];
+        $attributes = [
+            'Localisation1',
+            'Localisation2',
+        ];
+
+        foreach ($attributes as $attribute)
+        {
+            if (property_exists($response, $attribute))
+            {
+                $localisation[] = trim($response->{$attribute});
+            }
+        }
 
+        return $address;
     }
 }