Skip to content
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

Jump to bottom

MAUT-11289 : Segments: New (not)between date filter #347

Merged
merged 12 commits into from
Jun 14, 2024
Merged

MAUT-11289 : Segments: New (not)between date filter #347

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
65d3969
added between/not between operator for date type field
dadarya0 May 28, 2024
ad49089
fix sonar issue
dadarya0 May 28, 2024
1901df0
add functional test case
dadarya0 May 29, 2024
0ada11a
fix syntax
dadarya0 May 29, 2024
0637479
fix issue for development branch failing
dadarya0 May 29, 2024
35cc85d
Merge branch 'staging' into MAUT-11289
fedys May 30, 2024
15f11b9
Update Helper/QueryFilterHelper.php
dadarya0 Jun 4, 2024
2d5f8a8
fixc s
dadarya0 Jun 4, 2024
ca7c87b
fix same for merged filter too
dadarya0 Jun 5, 2024
2927c1a
change variable names
dadarya0 Jun 5, 2024
6bac694
Merge remote-tracking branch 'origin/staging' into MAUT-11289
dadarya0 Jun 12, 2024
2b0907a
fix not beetween issue
dadarya0 Jun 12, 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
2 changes: 1 addition & 1 deletion CustomFieldType/DateTimeType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function getEntityClass(): string
public function getOperators(): array
{
$allOperators = parent::getOperators();
$allowedOperators = array_flip(['=', '!=', 'gt', 'gte', 'lt', 'lte', 'empty', '!empty']);
$allowedOperators = array_flip(['=', '!=', 'gt', 'gte', 'lt', 'lte', 'empty', '!empty', 'between', '!between']);

return array_intersect_key($allOperators, $allowedOperators);
}
Expand Down
2 changes: 1 addition & 1 deletion CustomFieldType/DateType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public function getEntityClass(): string
public function getOperators(): array
{
$allOperators = parent::getOperators();
$allowedOperators = array_flip(['=', '!=', 'gt', 'gte', 'lt', 'lte', 'empty', '!empty']);
$allowedOperators = array_flip(['=', '!=', 'gt', 'gte', 'lt', 'lte', 'empty', '!empty', 'between', '!between']);

return array_intersect_key($allOperators, $allowedOperators);
}
Expand Down
25 changes: 22 additions & 3 deletions Helper/QueryFilterHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ public function addCustomFieldValueExpressionFromSegmentFilter(
$tableAlias,
$filter,
$valueParameter,
$filterAlreadyNegated
$filterAlreadyNegated,
$filter->getParameterValue()
);

$this->addOperatorExpression(
Expand Down Expand Up @@ -157,14 +158,17 @@ private function addOperatorExpression(
/**
* Form the logical expression needed to limit the CustomValue's value for given operator.
*
* @param mixed $filterParameterValue
*
* @return CompositeExpression|string
*/
private function getCustomValueValueExpression(
SegmentQueryBuilder $customQuery,
string $tableAlias,
ContactSegmentFilter $filter,
string $valueParameter,
bool $alreadyNegated = false
bool $alreadyNegated = false,
$filterParameterValue = null
) {
$operator = $filter->getOperator();
if ($alreadyNegated) {
Expand Down Expand Up @@ -228,6 +232,19 @@ private function getCustomValueValueExpression(
);

break;
case 'between':
case 'notBetween':
if (is_array($filterParameterValue)) {
$expression = $customQuery->expr()->{$operator}(
$tableAlias.'_value.value',
array_map(function (mixed $val) use ($customQuery): mixed {
return is_numeric($val) && intval($val) === $val ?
$val : $customQuery->expr()->literal($val);
}, array_values($filterParameterValue))
);
break;
}
// no break
dadarya0 marked this conversation as resolved.
Show resolved Hide resolved
default:
$expression = $customQuery->expr()->{$operator}(
$tableAlias.'_value.value',
Expand Down Expand Up @@ -445,7 +462,9 @@ private function getMergeExpression(
$qb,
$alias,
$filter,
$valueParameter
$valueParameter,
false,
$filter->getParameterValue()
);
}

Expand Down
17 changes: 17 additions & 0 deletions Tests/Functional/Helper/QueryFilterHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,23 @@ public function testGetCustomValueValueExpression(): void
]
);

$this->assertMatchWhere(
"test_value.value BETWEEN '2024-05-15 00:00:00' AND '2024-05-24 23:59:59'",
[
'glue' => 'and',
'field' => 'cmf_'.$this->getFixtureById('custom_object_product')->getId(),
'object' => 'custom_object',
'type' => 'datetime',
'operator' => 'between',
'properties' => [
'filter' => [
'date_from' => 'May 15, 2024',
'date_to' => 'May 24, 2024',
],
],
]
);

$this->assertMatchWhere(
'test_value.value IS NULL',
[
Expand Down
Loading