Skip to content

Vsliv30 3515 creation time filter misbehaviour #57

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

Merged
merged 2 commits into from
Jul 11, 2024
Merged

Vsliv30 3515 creation time filter misbehaviour #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3df2183
Extended the Equals operator for Date(Time) filtering
hex494D49 Jul 9, 2024
e9a4e52
Apply fixes from StyleCI
StyleCIBot Jul 9, 2024
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
19 changes: 18 additions & 1 deletion src/SearchCallbacks/Equals.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,27 @@ public function execute(Builder $builder, string $column, CategorizedValues $val
}

if ($values->and) {
if ($this->isDate($this->searchParser->type) || $this->isDateTime($this->searchParser->type)) {
if ($this->isDate($this->searchParser->type)) {
foreach ($values->and as $andValue) {
$builder->orWhereDate($column, $andValue);
}
} elseif ($this->isDateTime($this->searchParser->type)) {
foreach ($values->and as $andValue) {
$dateTimeValue = new \DateTime($andValue);
$formattedDateTime = $dateTimeValue->format('Y-m-d H:i:s');

if ($dateTimeValue->format('s') === '00') {
$builder->orWhere(function ($query) use ($column, $formattedDateTime) {
$query->whereDate($column, '=', date('Y-m-d', strtotime($formattedDateTime)))
->whereTime($column, '>=', date('H:i', strtotime($formattedDateTime)))
->whereTime($column, '<', date('H:i', strtotime($formattedDateTime . ' +1 minute')));
Comment on lines +55 to +58
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and what if we strictly want to search by second = 0? :)

Copy link
Contributor Author

@hex494D49 hex494D49 Jul 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right, someone could search for '000' or '0000' as well :)) so let's change it to
if (preg_match('/^0+$/', $dateTimeValue->format('s'))) {...}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed, because it doesn't change things.
Seconds will always be 00 in this case, number of 0 was not the point... :)
The point is that FE only selects up to minutes (and adds 00 as seconds) - so this scenario works

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the number of zeros wasn't the point, why mention it ;) Since it was mentioned, I went one step further and satisfied those who would go crazy entering endless zeros ;)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not mention number of zeroes, but the fact that you can not find a record that strictly has 0 second. :)
for example: 2024-07-11 11:28:00

;)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we both understood each other in the first run and that's all that matters ;)

});
} else {
$builder->orWhere(function ($query) use ($column, $formattedDateTime) {
$query->where($column, '=', $formattedDateTime);
});
Comment on lines +61 to +63
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need for nesting.......
this is enough: $builder->orWhere($column, $formattedDateTime);

}
}
} else {
$builder->whereIn($column, $values->and);
}
Expand Down