#65: optimize search #37
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DenTray
requested changes
Jul 6, 2022
src/Traits/SearchTrait.php
Outdated
Comment on lines
36
to
37
| 'from', | ||
| 'to' |
There was a problem hiding this comment.
are these reserved filters?
src/Traits/SearchTrait.php
Outdated
|
|
||
| if (!empty($this->filter)) { | ||
| foreach ($this->filter as $field => $values) { | ||
| if (!in_array($field, $this->reservedFilters) && is_array($values) || !in_array($field, $this->reservedFilters) && is_string($values)) { |
There was a problem hiding this comment.
Suggested change
| if (!in_array($field, $this->reservedFilters) && is_array($values) || !in_array($field, $this->reservedFilters) && is_string($values)) { | |
| if (!in_array($field, $this->reservedFilters) && (is_array($values) || is_string($values)) { |
src/Traits/SearchTrait.php
Outdated
Comment on lines
106
to
122
| protected function filter($postfix, $where, $field, $values) | ||
| { | ||
| $fieldWithoutPostfix = Str::replace($postfix, '', $field); | ||
|
|
||
| if (!is_array($values) || !Arr::isAssoc($values)) { | ||
| $this->query->{$where}($fieldWithoutPostfix, Arr::wrap($values)); | ||
| } else { | ||
| foreach ($values as $relationFiled => $value) { | ||
| $fieldWithRelation = $fieldWithoutPostfix . '.' . $relationFiled; | ||
| } | ||
|
|
||
| $this->applyWhereCallback($this->query, $fieldWithRelation, function (&$query, $conditionField) use ($value, $where) { | ||
| $query->{$where}($conditionField, Arr::wrap($value)); | ||
| }); | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
something strange happens here, let's implement simple logic
public function searchQuery(array $filter): self
{
// some initial logic
foreach($filters as $fieldName => $value) {
if ($isNotReserverFilter || Str::endWith($field, 'in_list')) {
$field = Str::replace($field, 'in_list', '');
$this->filterBy($field, $value);
} elseif (Str::endWith($field, 'not_in_list')) {
$this->query->whereNotIn($field, $value);
} elseif (Str::endWith($field, '_from')) {
$field = Str::replace($field, '_from', '');
$this->filterFrom($field, $value);
} elseif (Str::endWith($field, '_to')) {
$field = Str::replace($field, '_to', '');
$this->filterTo($field, $value);
}
}
}
DenTray
requested changes
Jul 8, 2022
src/Traits/SearchTrait.php
Outdated
|
|
||
| $this->filter = $filter; | ||
|
|
||
| if (!empty($filter)) { |
There was a problem hiding this comment.
let's set the default value for the $filter argument to [] it will allow to skip thid check for empty
src/Traits/SearchTrait.php
Outdated
| foreach($filter as $fieldName => $value) { | ||
| $isNotReservedFilter = (!in_array($fieldName, $this->reservedFilters)); | ||
|
|
||
| $isValidValue = (is_array($value) || is_string($value) || is_integer($value) || is_double($value) || is_bool($value)); |
There was a problem hiding this comment.
please remove as we discussed
DenTray
requested changes
Jul 11, 2022
src/Traits/SearchTrait.php
Outdated
Comment on lines
120
to
121
| $this->filter[$field] = $value; | ||
| $this->filterFrom($field, true, $field); |
There was a problem hiding this comment.
Suggested change
| $this->filter[$field] = $value; | |
| $this->filterFrom($field, true, $field); | |
| $this->filterFrom($field, false, $fieldName); |
src/Traits/SearchTrait.php
Outdated
| $this->filterTo($field, true, $field); | ||
| } elseif ($isNotReservedFilter || Str::endsWith($fieldName, '_in_list')) { | ||
| $field = Str::replace('_in_list', '', $fieldName); | ||
| $this->filter[$field] = $value; |
There was a problem hiding this comment.
Suggested change
| $this->filter[$field] = $value; |
DenTray
requested changes
Jul 12, 2022
src/Traits/SearchTrait.php
Outdated
| return $this; | ||
| } | ||
|
|
||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.