Merge pull request #4 from edrep/fix/cache-key-query-params

Include request query in cache key

Author: Sammyjo20

src/Traits/AlwaysCacheResponses.php

@@ -85,9 +85,10 @@ public function bootAlwaysCacheResponses(SaloonRequest $request): void
     protected function cacheKey(SaloonRequest $request, array $headers): string
     {
         $requestUrl = $request->getFullRequestUrl();
+        $requestQuery = $request->getQuery();
         $className = get_class($request);
 
-        return json_encode(compact('requestUrl', 'className', 'headers'), JSON_THROW_ON_ERROR);
+        return json_encode(compact('requestUrl', 'requestQuery', 'className', 'headers'), JSON_THROW_ON_ERROR);
     }
 
     /**

tests/Feature/CacheTest.php

@@ -91,6 +91,35 @@
     expect($filesystem->fileExists($hash))->toBeTrue();
 });
 
+test('query parameters are used in the cache key', function () use ($filesystem) {
+    $mockClient = new MockClient([
+        MockResponse::make(['name' => 'Sam']),
+        MockResponse::make(['name' => 'Sam']),
+        MockResponse::make(['name' => 'Sam']),
+    ]);
+
+    $requestA = new CachedUserRequest();
+    $requestA->addQuery('name', 'Sam');
+    $responseA = $requestA->send($mockClient);
+
+    expect($responseA->isCached())->toBeFalse();
+    expect($responseA->json())->toEqual(['name' => 'Sam']);
+    expect($responseA->status())->toEqual(200);
+
+    $requestB = new CachedUserRequest();
+    $requestB->addQuery('name', 'Sam');
+    $responseB = $requestB->send($mockClient);
+
+    expect($responseB->isCached())->toBeTrue();
+    expect($responseB->json())->toEqual(['name' => 'Sam']);
+    expect($responseB->status())->toEqual(200);
+
+    $requestC = new CachedUserRequest();
+    $responseC = $requestC->send($mockClient);
+
+    expect($responseC->isCached())->toBeFalse();
+});
+
 test('the generation of the custom key can be overwritten', function () use ($filesystem) {
     $mockClient = new MockClient([
         MockResponse::make(['name' => 'Sam']),