Merge OData query params at boot time so user overrides take precedence

Closes #2

Co-Authored-By: isama92 <isama92@users.noreply.github.com>

Author: mdpoulter

src/Concerns/HasODataQuery.php

@@ -4,7 +4,6 @@
 
 namespace SimpleSquid\SaloonOData\Concerns;
 
-use Saloon\Enums\PipeOrder;
 use Saloon\Http\PendingRequest;
 use SimpleSquid\SaloonOData\Enums\ODataVersion;
 use SimpleSquid\SaloonOData\ODataQueryBuilder;
@@ -23,8 +22,10 @@
  * applied consistently to all chained calls. (Pre-encoded `filterRaw()`
  * fragments are version-baked by the caller.)
  *
- * Registers a request middleware that merges the builder's rendered params
- * into the PendingRequest's query bag immediately before send.
+ * Merges the builder's rendered params into the PendingRequest's query bag
+ * at boot time — before Saloon's `MergeRequestProperties` step overlays
+ * `$request->query()` and `defaultQuery()`. This means user-set query
+ * params always take precedence over the builder for same-key conflicts.
  */
 trait HasODataQuery
 {
@@ -77,12 +78,6 @@ public function bootHasODataQuery(PendingRequest $pendingRequest): void
             }
         }
 
-        $pendingRequest->middleware()->onRequest(
-            static function (PendingRequest $request) use ($builder): void {
-                $request->query()->merge($builder->toArray());
-            },
-            'odata-merge-query',
-            PipeOrder::LAST,
-        );
+        $pendingRequest->query()->merge($builder->toArray());
     }
 }

tests/Feature/HasODataQueryTraitTest.php

@@ -34,6 +34,20 @@
     ]);
 });
 
+it('lets user query params override OData builder params for the same key', function (): void {
+    $mock = new MockClient([MockResponse::make([])]);
+    $connector = new TestConnector;
+    $connector->withMockClient($mock);
+
+    $request = new TestRequest;
+    $request->odataQuery()->top(10);
+    $request->query()->add('$top', '5');
+
+    $connector->send($request);
+
+    expect($mock->getLastPendingRequest()?->query()->get('$top'))->toBe('5');
+});
+
 it('does not override params explicitly added by the user', function (): void {
     $mock = new MockClient([MockResponse::make([])]);
     $connector = new TestConnector;

tests/Feature/SkipMiddlewareTest.php

@@ -7,7 +7,7 @@
 use SimpleSquid\SaloonOData\Tests\Fixtures\TestConnector;
 use SimpleSquid\SaloonOData\Tests\Fixtures\TestRequest;
 
-it('does not register middleware when no OData params and no attributes apply', function (): void {
+it('does not merge query params when no OData params and no attributes apply', function (): void {
     $mock = new MockClient([MockResponse::make([])]);
     $connector = new TestConnector;
     $connector->withMockClient($mock);