Laravel repository pattern add query - php

Question

I am making a repository pattern in Laravel, and I have made an AbstractRepository class which is extended by any repository to get the most used CRUD methods which can be shared.
Now I can extend the main functionality by adding additional methods to concrete repositories if I need some more complex queries.
For example:
public function eagerWhere($column, $value, $relation, $orderBy = 'name')
{
return Region::with($relation)->where($column, $value)->orderBy($orderBy);
}
Now the part I'm having trouble with is this part in the main code which uses my repository:
$regions = $this->regionRepository->eagerWhere('name', $term, 'country');
if ($includeCountry) { //<-- from here
$regions->orWhereHas('country', function ($query) use ($term) {
$query->where('name', 'LIKE', '%' . $term . '%');
});
}
How can I write that part in the repository so that ultimately I can make it look like:
$regions = $this->regionRepository->eagerWhere('name', $term, 'country');
if ($includeCountry) {
$regions->orWhereHas($term, 'country');
}
I tried copying that part of the code to repository, but then I can't chain methods because when $region is fetched, it is no longer considered to be a repository instance, but Eloquent one. And now it is expecting Eloquent method instead.

Answer 1

I think your level of abstractation its a bit mixed, since you are not abstracting the model itself also, but anyways. A solution might be like this :
public function eagerWhere($column, $value, $relation)
{
$builder = Region::with($relation)->where($column, $value);
return $builder
}
then:
$regions = $this->regionRepository->eagerWhere('name', $term, 'country');
if ($includeCountry) {
$regions->orWhereHas($term, 'country');
}
return $regions->orderBy('name')->get();

Answer 2

I didn't manage to do quite what I wanted, but the fix that was satisfying solution was to put the complete logic inside the method, so now I have this:
public function eagerWhereLike($column, $value, $relation, $searchOnRelation = false, $orderBy = 'name')
{
$regions = Region::with($relation)->where($column, 'LIKE', '%' . $value . '%')->orderBy($orderBy);
if ($searchOnRelation) {
$regions->orWhereHas($relation, function ($query) use ($column, $value) {
$query->where($column, 'LIKE', '%' . $value . '%');
});
}
return $regions;
}