Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

fix filtering of joined/referenced fields, add custom types support #48

Closed
wants to merge 1 commit into from
Closed

fix filtering of joined/referenced fields, add custom types support #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 46 additions & 0 deletions src/Filter/ORM/AbstractFilter.php
View file
Open in desktop
Expand Up @@ -86,4 +86,50 @@ protected function typeCastField($metadata, $field, $value, $format, $doNotTypec

return $value;
}

protected function getTypeCastParams($queryBuilder, $metadata, $fieldName, $alias)
{
/** @var \Doctrine\ORM\Mapping\ClassMetadata $metadata */
Copy link

Choose a reason for hiding this comment

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

These comment docs should go above the function, yes?

/** @var \Doctrine\ORM\QueryBuilder $queryBuilder */
/** @var \Doctrine\ORM\Query\Expr\Join $joinObj */
$typeCastMetaData = $this->getMetadataForAlias($queryBuilder, $metadata, $alias);
if ($typeCastMetaData->hasField($fieldName)) {
$typeCastFieldName = $fieldName;
} else {
$typeCastFieldName = $typeCastMetaData->getSingleAssociationReferencedJoinColumnName($fieldName); //remote
$typeCastMetaData = $queryBuilder->getEntityManager()->getMetadataFactory()->getMetadataFor(
$typeCastMetaData->getAssociationTargetClass($fieldName)
);
}

return [$typeCastMetaData, $typeCastFieldName];
}

protected function getMetadataForAlias($queryBuilder, $metadata, $alias)
{
/** @var \Doctrine\ORM\Mapping\ClassMetadata $metadata */
/** @var \Doctrine\ORM\QueryBuilder $queryBuilder */
/** @var \Doctrine\ORM\Query\Expr\Join $joinObj */
$joinObj = null;
foreach ($queryBuilder->getDQLPart('join') as $joinPart) {
/** @var \Doctrine\ORM\Query\Expr\Join $obj */
foreach ($joinPart as $obj) {
if ($obj->getAlias() == $alias) {
$joinObj = $obj;
break 2;
}
}
}

if ($joinObj) {
[$parentAlias, $joinField] = explode('.', $joinObj->getJoin());
$parentMetadata = $this->getMetadataForAlias($queryBuilder, $metadata, $parentAlias);

return $queryBuilder->getEntityManager()->getMetadataFactory()->getMetadataFor(
$parentMetadata->getAssociationTargetClass($joinField)
);
} else {
return $metadata;
}
}
}
11 changes: 7 additions & 4 deletions src/Filter/ORM/Between.php
View file
Open in desktop
Expand Up @@ -26,10 +26,13 @@ public function filter($queryBuilder, $metadata, $option)
$option['alias'] = 'row';
}

[$typeCastMetaData, $typeCastFieldName] = $this->getTypeCastParams($queryBuilder, $metadata, $option['field'], $option['alias']);
$fieldType = $typeCastMetaData->getTypeOfField($typeCastFieldName);

$format = isset($option['format']) ? $option['format'] : null;

$from = $this->typeCastField($metadata, $option['field'], $option['from'], $format);
$to = $this->typeCastField($metadata, $option['field'], $option['to'], $format);
$from = $this->typeCastField($typeCastMetaData, $typeCastFieldName, $option['from'], $format);
$to = $this->typeCastField($typeCastMetaData, $typeCastFieldName, $option['to'], $format);

$fromParameter = uniqid('a1');
$toParameter = uniqid('a2');
Expand All @@ -43,7 +46,7 @@ public function filter($queryBuilder, $metadata, $option)
sprintf(':%s', $toParameter)
)
);
$queryBuilder->setParameter($fromParameter, $from);
$queryBuilder->setParameter($toParameter, $to);
$queryBuilder->setParameter($fromParameter, $from, $fieldType);
$queryBuilder->setParameter($toParameter, $to, $fieldType);
}
}
7 changes: 5 additions & 2 deletions src/Filter/ORM/Equals.php
View file
Open in desktop
Expand Up @@ -26,19 +26,22 @@ public function filter($queryBuilder, $metadata, $option)
$option['alias'] = 'row';
}

[$typeCastMetaData, $typeCastFieldName] = $this->getTypeCastParams($queryBuilder, $metadata, $option['field'], $option['alias']);
$fieldType = $typeCastMetaData->getTypeOfField($typeCastFieldName);

$format = null;
if (isset($option['format'])) {
$format = $option['format'];
}

$value = $this->typeCastField($metadata, $option['field'], $option['value'], $format);
$value = $this->typeCastField($typeCastMetaData, $typeCastFieldName, $option['value'], $format);
Copy link

Choose a reason for hiding this comment

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

Metadata is a single word in Doctrine https://www.doctrine-project.org/projects/doctrine-orm/en/2.6/reference/metadata-drivers.html


$parameter = uniqid('a');
$queryBuilder->$queryType(
$queryBuilder
->expr()
->eq($option['alias'] . '.' . $option['field'], ':' . $parameter)
);
$queryBuilder->setParameter($parameter, $value);
$queryBuilder->setParameter($parameter, $value, $fieldType);
}
}
7 changes: 5 additions & 2 deletions src/Filter/ORM/GreaterThan.php
View file
Open in desktop
Expand Up @@ -26,16 +26,19 @@ public function filter($queryBuilder, $metadata, $option)
$option['alias'] = 'row';
}

[$typeCastMetaData, $typeCastFieldName] = $this->getTypeCastParams($queryBuilder, $metadata, $option['field'], $option['alias']);
$fieldType = $typeCastMetaData->getTypeOfField($typeCastFieldName);

$format = isset($option['format']) ? $option['format'] : null;

$value = $this->typeCastField($metadata, $option['field'], $option['value'], $format);
$value = $this->typeCastField($typeCastMetaData, $typeCastFieldName, $option['value'], $format);

$parameter = uniqid('a');
$queryBuilder->$queryType(
$queryBuilder
->expr()
->gt($option['alias'] . '.' . $option['field'], ':' . $parameter)
);
$queryBuilder->setParameter($parameter, $value);
$queryBuilder->setParameter($parameter, $value, $fieldType);
}
}
7 changes: 5 additions & 2 deletions src/Filter/ORM/GreaterThanOrEquals.php
View file
Open in desktop
Expand Up @@ -26,16 +26,19 @@ public function filter($queryBuilder, $metadata, $option)
$option['alias'] = 'row';
}

[$typeCastMetaData, $typeCastFieldName] = $this->getTypeCastParams($queryBuilder, $metadata, $option['field'], $option['alias']);
$fieldType = $typeCastMetaData->getTypeOfField($typeCastFieldName);

$format = isset($option['format']) ? $option['format'] : null;

$value = $this->typeCastField($metadata, $option['field'], $option['value'], $format);
$value = $this->typeCastField($typeCastMetaData, $typeCastFieldName, $option['value'], $format);

$parameter = uniqid('a');
$queryBuilder->$queryType(
$queryBuilder
->expr()
->gte($option['alias'] . '.' . $option['field'], ':' . $parameter)
);
$queryBuilder->setParameter($parameter, $value);
$queryBuilder->setParameter($parameter, $value, $fieldType);
}
}
9 changes: 6 additions & 3 deletions src/Filter/ORM/In.php
View file
Open in desktop
Expand Up @@ -26,13 +26,16 @@ public function filter($queryBuilder, $metadata, $option)
$option['alias'] = 'row';
}

[$typeCastMetaData, $typeCastFieldName] = $this->getTypeCastParams($queryBuilder, $metadata, $option['field'], $option['alias']);
$fieldType = $typeCastMetaData->getTypeOfField($typeCastFieldName);

$format = isset($option['format']) ? $option['format'] : null;

$queryValues = [];
foreach ($option['values'] as $value) {
$queryValues[] = $this->typeCastField(
$metadata,
$option['field'],
$typeCastMetaData,
$typeCastFieldName,
$value,
$format,
$doNotTypecastDatetime = true
Expand All @@ -45,6 +48,6 @@ public function filter($queryBuilder, $metadata, $option)
->expr()
->in($option['alias'] . '.' . $option['field'], ':' . $parameter)
);
$queryBuilder->setParameter($parameter, $queryValues);
$queryBuilder->setParameter($parameter, $queryValues, $fieldType);
}
}
7 changes: 5 additions & 2 deletions src/Filter/ORM/IsMemberOf.php
View file
Open in desktop
Expand Up @@ -31,19 +31,22 @@ public function filter($queryBuilder, $metadata, $option)
$option['alias'] = 'row';
}

[$typeCastMetaData, $typeCastFieldName] = $this->getTypeCastParams($queryBuilder, $metadata, $option['field'], $option['alias']);
$fieldType = $typeCastMetaData->getTypeOfField($typeCastFieldName);

$format = null;
if (isset($option['format'])) {
$format = $option['format'];
}

$value = $this->typeCastField($metadata, $option['field'], $option['value'], $format);
$value = $this->typeCastField($typeCastMetaData, $typeCastFieldName, $option['value'], $format);

$parameter = uniqid('a');
$queryBuilder->$queryType(
$queryBuilder
->expr()
->isMemberOf(':' . $parameter, $option['alias'] . '.' . $option['field'])
);
$queryBuilder->setParameter($parameter, $value);
$queryBuilder->setParameter($parameter, $value, $fieldType);
}
}
7 changes: 5 additions & 2 deletions src/Filter/ORM/LessThan.php
View file
Open in desktop
Expand Up @@ -26,19 +26,22 @@ public function filter($queryBuilder, $metadata, $option)
$option['alias'] = 'row';
}

[$typeCastMetaData, $typeCastFieldName] = $this->getTypeCastParams($queryBuilder, $metadata, $option['field'], $option['alias']);
$fieldType = $typeCastMetaData->getTypeOfField($typeCastFieldName);

$format = null;
if (isset($option['format'])) {
$format = $option['format'];
}

$value = $this->typeCastField($metadata, $option['field'], $option['value'], $format);
$value = $this->typeCastField($typeCastMetaData, $typeCastFieldName, $option['value'], $format);

$parameter = uniqid('a');
$queryBuilder->$queryType(
$queryBuilder
->expr()
->lt($option['alias'] . '.' . $option['field'], ":$parameter")
);
$queryBuilder->setParameter($parameter, $value);
$queryBuilder->setParameter($parameter, $value, $fieldType);
}
}
7 changes: 5 additions & 2 deletions src/Filter/ORM/LessThanOrEquals.php
View file
Open in desktop
Expand Up @@ -26,16 +26,19 @@ public function filter($queryBuilder, $metadata, $option)
$option['alias'] = 'row';
}

[$typeCastMetaData, $typeCastFieldName] = $this->getTypeCastParams($queryBuilder, $metadata, $option['field'], $option['alias']);
$fieldType = $typeCastMetaData->getTypeOfField($typeCastFieldName);

$format = isset($option['format']) ? $option['format'] : null;

$value = $this->typeCastField($metadata, $option['field'], $option['value'], $format);
$value = $this->typeCastField($typeCastMetaData, $typeCastFieldName, $option['value'], $format);

$parameter = uniqid('a');
$queryBuilder->$queryType(
$queryBuilder
->expr()
->lte($option['alias'] . '.' . $option['field'], ':' . $parameter)
);
$queryBuilder->setParameter($parameter, $value);
$queryBuilder->setParameter($parameter, $value, $fieldType);
}
}
7 changes: 5 additions & 2 deletions src/Filter/ORM/NotEquals.php
View file
Open in desktop
Expand Up @@ -26,16 +26,19 @@ public function filter($queryBuilder, $metadata, $option)
$option['alias'] = 'row';
}

[$typeCastMetaData, $typeCastFieldName] = $this->getTypeCastParams($queryBuilder, $metadata, $option['field'], $option['alias']);
$fieldType = $typeCastMetaData->getTypeOfField($typeCastFieldName);

$format = isset($option['format']) ? $option['format'] : null;

$value = $this->typeCastField($metadata, $option['field'], $option['value'], $format);
$value = $this->typeCastField($typeCastMetaData, $typeCastFieldName, $option['value'], $format);

$parameter = uniqid('a');
$queryBuilder->$queryType(
$queryBuilder
->expr()
->neq($option['alias'] . '.' . $option['field'], ':' . $parameter)
);
$queryBuilder->setParameter($parameter, $value);
$queryBuilder->setParameter($parameter, $value, $fieldType);
}
}
9 changes: 6 additions & 3 deletions src/Filter/ORM/NotIn.php
View file
Open in desktop
Expand Up @@ -26,13 +26,16 @@ public function filter($queryBuilder, $metadata, $option)
$option['alias'] = 'row';
}

[$typeCastMetaData, $typeCastFieldName] = $this->getTypeCastParams($queryBuilder, $metadata, $option['field'], $option['alias']);
$fieldType = $typeCastMetaData->getTypeOfField($typeCastFieldName);

$format = isset($option['format']) ? $option['format'] : null;

$queryValues = [];
foreach ($option['values'] as $value) {
$queryValues[] = $this->typeCastField(
$metadata,
$option['field'],
$typeCastMetaData,
$typeCastFieldName,
$value,
$format,
$doNotTypecastDatetime = true
Expand All @@ -45,6 +48,6 @@ public function filter($queryBuilder, $metadata, $option)
->expr()
->notIn($option['alias'] . '.' . $option['field'], ':' . $parameter)
);
$queryBuilder->setParameter($parameter, $queryValues);
$queryBuilder->setParameter($parameter, $queryValues, $fieldType);
}
}