Fixed the product page endpoint

Setono · Dec 6, 2024 · 5944839 · 5944839
1 parent 82ad9ad
commit 5944839
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 46 deletions.
diff --git a/src/Client/Endpoint/ProductEndpoint.php b/src/Client/Endpoint/ProductEndpoint.php
@@ -7,7 +7,7 @@
 use Setono\PeakWMS\DataTransferObject\Collection;
 use Setono\PeakWMS\DataTransferObject\PaginatedCollection;
 use Setono\PeakWMS\DataTransferObject\Product\Product;
-use Setono\PeakWMS\Request\Query\Product\PageQuery;
+use Setono\PeakWMS\Request\Query\KeySetPageQuery;
 
 /**
  * @extends Endpoint<Product>
@@ -29,9 +29,9 @@ final class ProductEndpoint extends Endpoint implements ProductEndpointInterface
     /**
      * @return PaginatedCollection<Product>
      */
-    public function getPage(PageQuery $query = null): PaginatedCollection
+    public function getPage(KeySetPageQuery $query = null): PaginatedCollection
     {
-        $query ??= PageQuery::create();
+        $query ??= KeySetPageQuery::create();
 
         /** @var class-string<PaginatedCollection<Product>> $signature */
         $signature = sprintf('%s<%s>', PaginatedCollection::class, self::getDataClass());
@@ -42,7 +42,7 @@ public function getPage(PageQuery $query = null): PaginatedCollection
             ->map(
                 $signature,
                 $this->createSource(
-                    $this->client->get($this->endpoint, $query),
+                    $this->client->get(sprintf('%s/keySet', $this->endpoint), $query),
                 )->map(['data' => 'items']),
             );
     }
@@ -66,16 +66,23 @@ public function getByProductId(string $productId): Collection
     /**
      * @return \Generator<Product>
      */
-    public function iterate(PageQuery $query = null): \Generator
+    public function iterate(KeySetPageQuery $query = null): \Generator
     {
-        $query ??= PageQuery::create();
+        $query ??= KeySetPageQuery::create();
 
         do {
             $collection = $this->getPage($query);
 
-            yield from $collection;
+            $lastId = null;
 
-            $query->incrementPage();
+            foreach ($collection as $item) {
+                yield $item;
+                $lastId = $item->id;
+            }
+
+            if (null !== $lastId) {
+                $query->setLastId($lastId);
+            }
         } while (!$collection->empty());
     }
 

diff --git a/src/Client/Endpoint/ProductEndpointInterface.php b/src/Client/Endpoint/ProductEndpointInterface.php
@@ -7,7 +7,7 @@
 use Setono\PeakWMS\DataTransferObject\Collection;
 use Setono\PeakWMS\DataTransferObject\PaginatedCollection;
 use Setono\PeakWMS\DataTransferObject\Product\Product;
-use Setono\PeakWMS\Request\Query\Product\PageQuery;
+use Setono\PeakWMS\Request\Query\KeySetPageQuery;
 
 /**
  * @extends EndpointInterface<Product>
@@ -19,7 +19,7 @@ interface ProductEndpointInterface extends EndpointInterface, CreatableEndpointI
     /**
      * @return PaginatedCollection<Product>
      */
-    public function getPage(PageQuery $query = null): PaginatedCollection;
+    public function getPage(KeySetPageQuery $query = null): PaginatedCollection;
 
     /**
      * @return Collection<Product>
@@ -29,5 +29,5 @@ public function getByProductId(string $productId): Collection;
     /**
      * @return iterable<Product>
      */
-    public function iterate(PageQuery $query = null): iterable;
+    public function iterate(KeySetPageQuery $query = null): iterable;
 }
diff --git a/src/Request/Query/Product/PageQuery.php b/src/Request/Query/Product/PageQuery.php