Prevent query builder from overwriting scopes

[jonerickson]

This PR is directly related to #256. Due to applyIncludesToQuery being after any of the filtering/scoping for a search endpoint, if your scope eager loads any of the same relationships as in the include parameter, the scope is overwritten and thus no longer applies. This PR simply reorders the query modifiers so that your explicit scope declarations will always take precedence.

Endpoint: /api/tasks/search?include=users
Scope:

public function scopeSomething(Builder $query): void
{
    $query->with(['users' => fn($query) => do something ]);
}

Scope would not be applied since the include is also eager loading the relationship and would take precedence.

[alexzarbn]

Hi @jonerickson,

Thank you for spotting this issue! Could you please include an integration test that covers that scenario as well?

[jonerickson]

Tests added. If you remove the scope, or change the query modifiers in QueryBuilder.php back to the original ordering, the test will fail as the dates will result to default ordering.

[jonerickson]

Any update @alexzarbn?