Merge pull request #1 from always-open/dev-sessions

Add Sessionstatus code

Author: qschmick

config/bwt-api.php

@@ -1,6 +1,6 @@
 <?php
 
 return [
-    'base_url' => env('BWT_API_BASE_URL', 'https://bwt.com/api/'),
+    'base_url' => env('BWT_API_BASE_URL', 'https://bwt.com/api'),
     'api_key' => env('BWT_API_KEY'),
 ];

phpstan.neon.dist

@@ -5,7 +5,8 @@ parameters:
     level: 5
     paths:
         - src
-        - database
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
-    checkModelProperties: true
+    checkModelProperties: true
+    ignoreErrors:
+        - '#Call to an undefined method Illuminate\\Http\\Client\\Response::getStatusCode\(\)#'

src/BwtApi.php

@@ -2,4 +2,7 @@
 
 namespace AlwaysOpen\BwtApi;
 
-class BwtApi {}
+class BwtApi
+{
+    public const BWT_AMAZON_ENGINE = 'bwt_amazon_product';
+}

src/BwtApiClient.php

@@ -4,6 +4,7 @@
 
 use AlwaysOpen\BwtApi\DTOs\Amazon\AmazonRequestCreationResponse;
 use AlwaysOpen\BwtApi\DTOs\Amazon\AmazonResults;
+use AlwaysOpen\BwtApi\DTOs\Amazon\AmazonSessionStatusResponse;
 use AlwaysOpen\BwtApi\DTOs\BatchRequest;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Promise\PromiseInterface;
@@ -23,8 +24,8 @@ public function __construct(
         ?string $baseUrl = null,
         ?string $apiKey = null,
     ) {
-        $this->baseUrl = $baseUrl ?? config('bwt-api.base_url', 'https://bwt.com/api/');
-        $this->apiKey = $apiKey ?? config('bwt-api.username') ?? '';
+        $this->baseUrl = $baseUrl ?? config('bwt-api.base_url', 'https://bwt.com/api');
+        $this->apiKey = $apiKey ?? config('bwt-api.api_key') ?? '';
     }
 
     protected function getAuthHeader(): array
@@ -61,6 +62,27 @@ protected function makeRequest(
         }, 2000);
     }
 
+    public function getAmazonSessionStatus(
+        string $id,
+    ): AmazonSessionStatusResponse {
+        try {
+            $response = $this->makeRequest(
+                'get',
+                $this->baseUrl .= "/$id",
+                null,
+                3,
+            );
+        } catch (Throwable $e) {
+            throw new RuntimeException('API request failed: '.$e->getMessage(), $e->getCode(), $e);
+        }
+
+        if (! $response->successful()) {
+            throw new RuntimeException('API request failed: '.$response->body(), $response->getStatusCode());
+        }
+
+        return AmazonSessionStatusResponse::from($response->json());
+    }
+
     public function getAmazonResults(
         string $id,
         int $limit = 1,
@@ -69,7 +91,7 @@ public function getAmazonResults(
         try {
             $response = $this->makeRequest(
                 'get',
-                $this->baseUrl .= "$id/results?limit=$limit&offset=$offset",
+                $this->baseUrl .= "/$id/results?limit=$limit&offset=$offset",
                 null,
                 3,
             );

src/DTOs/Amazon/AmazonResult.php

@@ -25,16 +25,16 @@ public function __construct(
         public readonly array $additional_details,
         public readonly array $additional_information,
         public readonly array $additional_technical_details,
-        public readonly string $manufacturer,
+        public readonly ?string $manufacturer,
         public readonly array $best_sellers_rank,
         public readonly array $category,
         public readonly string|int|null $variations,
         public readonly string|int|null $past_month_sales,
-        public readonly array $images,
-        public readonly string $storefront,
+        public readonly ?array $images,
+        public readonly ?string $storefront,
         public readonly ?string $merchant_id,
         public readonly ?string $storefront_url,
-        public readonly string $stock,
+        public readonly ?string $stock,
         public readonly string $condition,
         public readonly string|int|float|null $price,
         public readonly string|int|float|null $sale_price,
@@ -52,7 +52,7 @@ public function __construct(
         /* @var AmazonResultOffer[] $offers */
         #[DataCollectionOf(AmazonResultOffer::class)]
         public readonly ?array $offers,
-        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
         public readonly ?Carbon $collected_at,
         public readonly ?string $exception,
     ) {}

src/DTOs/Amazon/AmazonResults.php

@@ -2,11 +2,13 @@
 
 namespace AlwaysOpen\BwtApi\DTOs\Amazon;
 
+use Spatie\LaravelData\Attributes\DataCollectionOf;
 use Spatie\LaravelData\Data;
 
 class AmazonResults extends Data
 {
     public function __construct(
+        #[DataCollectionOf(AmazonResult::class)]
         public readonly ?array $items,
         public readonly ?int $limit,
         public readonly ?int $offset,

src/DTOs/Amazon/AmazonSessionStatusResponse.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace AlwaysOpen\BwtApi\DTOs\Amazon;
+
+use Carbon\Carbon;
+use Spatie\LaravelData\Attributes\WithCast;
+use Spatie\LaravelData\Casts\DateTimeInterfaceCast;
+use Spatie\LaravelData\Data;
+
+class AmazonSessionStatusResponse extends Data
+{
+    public function __construct(
+        public readonly int $status,
+        public readonly string $message,
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
+        public readonly ?Carbon $created_at,
+        #[WithCast(DateTimeInterfaceCast::class, format: ['Y-m-d H:i:s', 'Y-m-d\TH:i:s\+H:i', 'Y-m-d H:i:s.u'])]
+        public readonly ?Carbon $finished_at,
+    ) {}
+}

src/DTOs/Amazon/ProductRequestItem.php

@@ -1,16 +1,17 @@
 <?php
 
-namespace AlwaysOpen\BwtApi\DTOs;
+namespace AlwaysOpen\BwtApi\DTOs\Amazon;
 
+use AlwaysOpen\BwtApi\Enums\ScrapingModes;
 use Spatie\LaravelData\Data;
 
 class ProductRequestItem extends Data
 {
     public function __construct(
         public readonly string $requested_asin,
         public readonly string $region,
-        public readonly string $postal_code,
-        public readonly int $scraping_mode,
+        public readonly string $postal_code = '00000',
+        public readonly int $scraping_mode = ScrapingModes::INVENTORY->value,
         public readonly ?int $max_offer_pages = null,
     ) {}
 }

src/DTOs/BatchRequest.php

@@ -2,6 +2,7 @@
 
 namespace AlwaysOpen\BwtApi\DTOs;
 
+use AlwaysOpen\BwtApi\DTOs\Amazon\ProductRequestItem;
 use Spatie\LaravelData\Data;
 
 class BatchRequest extends Data

tests/Feature/BwtApiClientTest.php

@@ -11,7 +11,7 @@ class BwtApiClientTest extends BaseTest
     public function test_amazon_response()
     {
         Http::fake([
-            'bwt.com/api/123/results?limit=1&offset=0' => Http::response($this->getFixtureJsonContent('job_results.json'), 200),
+            'https://bwt.com/api/123/results?limit=1&offset=0' => Http::response($this->getFixtureJsonContent('job_results.json'), 200),
         ]);
 
         $client = new BwtApiClient;