Skip to content

Update Filter.php implementing IN filter and correct NOT_CONTAINS #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update Filter.php implementing IN filter and correct NOT_CONTAINS #21

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c5d9ba
implement 'IN' Filter
alansgonzaga Oct 2, 2023
c0bed94
Correcting 'NOT_CONTAINS' filter
alansgonzaga Oct 2, 2023
694f84f
Update Filter.php
alansgonzaga Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/Filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Filter

private $likeOperator = 'LIKE';

public function __construct(public string $field, public ?string $value = null, public ?string $matchMode = self::CONTAINS)
public function __construct(public string $field, public $value = null, public ?string $matchMode = self::CONTAINS)
{
$this->likeOperator = \DB::connection()->getPDO()->getAttribute(\PDO::ATTR_DRIVER_NAME) == 'pgsql' ? 'ILIKE' : 'LIKE';
}
Expand Down Expand Up @@ -114,14 +114,14 @@ private function applyWhere(Builder &$q, string $field, ?bool $or = false)
case self::NOT_CONTAINS:
if ($or) {
if(!$jsonField) {
$q->orWhere($field, "NOT" . $this->likeOperator, "%" . $this->value . "%");
$q->orWhere($field, "NOT " . $this->likeOperator, "%" . $this->value . "%");
}
else {
$q->orWhereRaw('LOWER('.$jsonField[0].'->>"$.'.$jsonField[1].'") NOT '.$this->likeOperator.' ?', mb_strtolower("%" . $this->value . "%"));
}
} else {
if(!$jsonField) {
$q->where($field, "NOT" . $this->likeOperator, "%" . $this->value . "%");
$q->where($field, "NOT " . $this->likeOperator, "%" . $this->value . "%");
}
else {
$q->whereRaw('LOWER('.$jsonField[0].'->>"$.'.$jsonField[1].'") NOT '.$this->likeOperator.' ?', mb_strtolower("%" . $this->value . "%"));
Expand Down Expand Up @@ -180,7 +180,11 @@ private function applyWhere(Builder &$q, string $field, ?bool $or = false)
}
break;
case self::IN:
//TODO: Implement
if ($or) {
$q->orWhereIn($field, $this->value);
} else {
$q->whereIn($field, $this->value);
}
break;
case self::LESS_THAN:
if ($or) {
Expand Down