Merge pull request #488 from ptmcnally/5374-missing-prices

5374 missing prices

Author: ptmcnally

src/Traits/PageItems.php

@@ -139,4 +139,36 @@ public function updateEntity($entity)
                 return $this->loadEntity($responseBody->data);
             });
     }
+
+    /**
+     * Get child resources for a resource e.g GET resource/:id/$resourceName
+     * @param $id string ID of the resource to get child resources for
+     * @param $resourceName string name of the associated resource as specified in the route path
+     * @param $serializer \callback serializer to use for the child resource
+     * @param $filters
+     * @return array
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    public function getChildResources($id, $resourceName, $serializer, $filters = [])
+    {
+        $pageNumber = 0;
+        $items = [];
+        do {
+            $pageNumber++;
+            $page = $this->paginatedRequest(
+                $this->collectionPath . '/' . $id . '/' . $resourceName,
+                $pageNumber,
+                15,
+                $filters
+            );
+
+            $page->serializeWith($serializer);
+            $items = array_merge(
+                $items,
+                $page->getItems()
+            );
+        } while ($pageNumber < $page->totalPages());
+
+        return $items;
+    }
 }

src/eCloud/AffinityRuleClient.php

@@ -25,35 +25,16 @@ public function loadEntity($data)
         );
     }
 
+    /**
+     * @param $id
+     * @param $filters
+     * @return array
+     */
     public function getMembers($id, $filters = [])
     {
-        $page = $this->paginatedRequest($this->collectionPath . '/' . $id . '/members', 1, 15, $filters);
-
-        if ($page->totalItems() == 0) {
-            return [];
-        }
-
-        $loadEntity = function ($data) {
+        return $this->getChildResources($id, 'members', function ($data) {
             return new AffinityRuleMember($this->apiToFriendly($data, AffinityRuleMember::$entityMap));
-        };
-
-        $page->serializeWith($loadEntity);
-
-        $items = $page->getItems();
-        if ($page->totalPages() == 1) {
-            return $items;
-        }
-
-        while ($page->pageNumber() < $page->totalPages()) {
-            $page = $this->getPage($page->pageNumber() + 1, 15, $filters);
-
-            $page->serializeWith($loadEntity);
-            $items = array_merge(
-                $items,
-                $page->getItems()
-            );
-        }
-        return $items;
+        }, $filters);
     }
 
     /**

src/eCloud/AvailabilityZoneClient.php

@@ -30,41 +30,10 @@ public function getEntityMap()
         ];
     }
 
-    /**
-     * Get an array of all products and prices for the availability zone
-     *
-     * @param int $id Region ID
-     * @param array $filters
-     * @return array
-     */
     public function getProducts($id, $filters = [])
     {
-        $page = $this->paginatedRequest($this->collectionPath . '/' . $id . '/prices', 1, 15, $filters);
-
-        if ($page->totalItems() == 0) {
-            return [];
-        }
-
-        $loadEntity = function ($data) {
+        return $this->getChildResources($id, 'prices', function ($data) {
             return new Product($this->apiToFriendly($data, Product::$entityMap));
-        };
-
-        $page->serializeWith($loadEntity);
-
-        $items = $page->getItems();
-        if ($page->totalPages() == 1) {
-            return $items;
-        }
-
-        while ($page->pageNumber() < $page->totalPages()) {
-            $page = $this->getPage($page->pageNumber() + 1, 15, $filters);
-
-            $page->serializeWith($loadEntity);
-            $items = array_merge(
-                $items,
-                $page->getItems()
-            );
-        }
-        return $items;
+        }, $filters);
     }
 }

src/eCloud/RegionClient.php

@@ -28,41 +28,10 @@ public function getEntityMap()
         ];
     }
 
-    /**
-     * Get an array of all products and prices for the region
-     *
-     * @param int $id Region ID
-     * @param array $filters
-     * @return array
-     */
     public function getProducts($id, $filters = [])
     {
-        $page = $this->paginatedRequest($this->collectionPath . '/' . $id . '/prices', 1, 15, $filters);
-
-        if ($page->totalItems() == 0) {
-            return [];
-        }
-
-        $loadEntity = function ($data) {
+        return $this->getChildResources($id, 'prices', function ($data) {
             return new Product($this->apiToFriendly($data, Product::$entityMap));
-        };
-
-        $page->serializeWith($loadEntity);
-
-        $items = $page->getItems();
-        if ($page->totalPages() == 1) {
-            return $items;
-        }
-
-        while ($page->pageNumber() < $page->totalPages()) {
-            $page = $this->getPage($page->pageNumber() + 1, 15, $filters);
-
-            $page->serializeWith($loadEntity);
-            $items = array_merge(
-                $items,
-                $page->getItems()
-            );
-        }
-        return $items;
+        }, $filters);
     }
 }