Skip to content

filterByXXXX use generic filterBy method #32

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
thomasbeaujean merged 1 commit into from
Jun 17, 2025
Merged

filterByXXXX use generic filterBy method #32

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions src/Resources/views/Generator/ColumnTemplate.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@

public static function filterBy{{ column }}(
QueryBuilder $qb,
$value,
mixed $value,
$operator = Comparison::EQ,
$entityName = self::NAME,
$columnName = '{{ columnDql }}',
string $columnNamePrefix = '',
string $columnNameSuffix = '',
): QueryBuilder {
if ($value === null) {
if (Comparison::NEQ === $operator) {
$qb->andWhere($entityName.'.'.$columnName.' IS NOT NULL');
} else {
$qb->andWhere($entityName.'.'.$columnName.' IS NULL');
}
} else {
//get a uniq index
$index = static::getParameterIndex();
$parameterName = $columnName.$index;

$qb->andWhere($entityName.'.'.$columnName.$operator.':'.$parameterName);
$qb->setParameter($parameterName, $value);
}

return $qb;
return self::filterBy(
qb: $qb,
columnName: $columnName,
operator: $operator,
value: $value,
entityName: $entityName,
);
}

public static function filterIn{{ column }}(
Expand Down
20 changes: 15 additions & 5 deletions src/Resources/views/Generator/TopRepositoryTemplate.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,18 +332,28 @@ class {{ entityClassname }}Base extends {{ extendClass }}{% if useInterfaces %}
QueryBuilder $qb,
string $columnName,
string $operator,
string $value,
mixed $value,
?string $entityName = null,
string $columnNamePrefix = '',
string $columnNameSuffix = '',
): QueryBuilder {
if (null === $entityName) {
$entityName = self::NAME;
}

$index = static::getParameterIndex();
$parameterName = $columnName.$index;
if ($value === null) {
if (Comparison::NEQ === $operator) {
$qb->andWhere($entityName.'.'.$columnName.' IS NOT NULL');
} else {
$qb->andWhere($entityName.'.'.$columnName.' IS NULL');
}
} else {
$index = static::getParameterIndex();
$parameterName = $columnName.$index;

$qb->andWhere($entityName.'.'.$columnName.' '.$operator.' :'.$parameterName);
$qb->setParameter($parameterName, $value);
$qb->andWhere($columnNamePrefix.$entityName.'.'.$columnName.' '.$columnNameSuffix.' '.$operator.' :'.$parameterName);
$qb->setParameter($parameterName, $value);
}

return $qb;
}
Expand Down
101 changes: 45 additions & 56 deletions tests/Repository/MyClassRepositoryBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,18 +314,28 @@ public static function filterBy(
QueryBuilder $qb,
string $columnName,
string $operator,
string $value,
mixed $value,
?string $entityName = null,
string $columnNamePrefix = '',
string $columnNameSuffix = '',
): QueryBuilder {
if (null === $entityName) {
$entityName = self::NAME;
}

$index = static::getParameterIndex();
$parameterName = $columnName.$index;
if ($value === null) {
if (Comparison::NEQ === $operator) {
$qb->andWhere($entityName.'.'.$columnName.' IS NOT NULL');
} else {
$qb->andWhere($entityName.'.'.$columnName.' IS NULL');
}
} else {
$index = static::getParameterIndex();
$parameterName = $columnName.$index;

$qb->andWhere($entityName.'.'.$columnName.' '.$operator.' :'.$parameterName);
$qb->setParameter($parameterName, $value);
$qb->andWhere($columnNamePrefix.$entityName.'.'.$columnName.' '.$columnNameSuffix.' '.$operator.' :'.$parameterName);
$qb->setParameter($parameterName, $value);
}

return $qb;
}
Expand All @@ -352,27 +362,20 @@ public static function filterIn(

public static function filterById(
QueryBuilder $qb,
$value,
mixed $value,
$operator = Comparison::EQ,
$entityName = self::NAME,
$columnName = 'id',
string $columnNamePrefix = '',
string $columnNameSuffix = '',
): QueryBuilder {
if ($value === null) {
if (Comparison::NEQ === $operator) {
$qb->andWhere($entityName.'.'.$columnName.' IS NOT NULL');
} else {
$qb->andWhere($entityName.'.'.$columnName.' IS NULL');
}
} else {
//get a uniq index
$index = static::getParameterIndex();
$parameterName = $columnName.$index;

$qb->andWhere($entityName.'.'.$columnName.$operator.':'.$parameterName);
$qb->setParameter($parameterName, $value);
}

return $qb;
return self::filterBy(
qb: $qb,
columnName: $columnName,
operator: $operator,
value: $value,
entityName: $entityName,
);
}

public static function filterInId(
Expand Down Expand Up @@ -504,27 +507,20 @@ public function deleteById(

public static function filterByNumber(
QueryBuilder $qb,
$value,
mixed $value,
$operator = Comparison::EQ,
$entityName = self::NAME,
$columnName = 'number',
string $columnNamePrefix = '',
string $columnNameSuffix = '',
): QueryBuilder {
if ($value === null) {
if (Comparison::NEQ === $operator) {
$qb->andWhere($entityName.'.'.$columnName.' IS NOT NULL');
} else {
$qb->andWhere($entityName.'.'.$columnName.' IS NULL');
}
} else {
//get a uniq index
$index = static::getParameterIndex();
$parameterName = $columnName.$index;

$qb->andWhere($entityName.'.'.$columnName.$operator.':'.$parameterName);
$qb->setParameter($parameterName, $value);
}

return $qb;
return self::filterBy(
qb: $qb,
columnName: $columnName,
operator: $operator,
value: $value,
entityName: $entityName,
);
}

public static function filterInNumber(
Expand Down Expand Up @@ -656,27 +652,20 @@ public function deleteByNumber(

public static function filterByName(
QueryBuilder $qb,
$value,
mixed $value,
$operator = Comparison::EQ,
$entityName = self::NAME,
$columnName = 'name',
string $columnNamePrefix = '',
string $columnNameSuffix = '',
): QueryBuilder {
if ($value === null) {
if (Comparison::NEQ === $operator) {
$qb->andWhere($entityName.'.'.$columnName.' IS NOT NULL');
} else {
$qb->andWhere($entityName.'.'.$columnName.' IS NULL');
}
} else {
//get a uniq index
$index = static::getParameterIndex();
$parameterName = $columnName.$index;

$qb->andWhere($entityName.'.'.$columnName.$operator.':'.$parameterName);
$qb->setParameter($parameterName, $value);
}

return $qb;
return self::filterBy(
qb: $qb,
columnName: $columnName,
operator: $operator,
value: $value,
entityName: $entityName,
);
}

public static function filterInName(
Expand Down
101 changes: 45 additions & 56 deletions tests/Service/ExpectedMyClassRepositoryBase.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,18 +314,28 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S
QueryBuilder $qb,
string $columnName,
string $operator,
string $value,
mixed $value,
?string $entityName = null,
string $columnNamePrefix = '',
string $columnNameSuffix = '',
): QueryBuilder {
if (null === $entityName) {
$entityName = self::NAME;
}

$index = static::getParameterIndex();
$parameterName = $columnName.$index;
if ($value === null) {
if (Comparison::NEQ === $operator) {
$qb->andWhere($entityName.'.'.$columnName.' IS NOT NULL');
} else {
$qb->andWhere($entityName.'.'.$columnName.' IS NULL');
}
} else {
$index = static::getParameterIndex();
$parameterName = $columnName.$index;

$qb->andWhere($entityName.'.'.$columnName.' '.$operator.' :'.$parameterName);
$qb->setParameter($parameterName, $value);
$qb->andWhere($columnNamePrefix.$entityName.'.'.$columnName.' '.$columnNameSuffix.' '.$operator.' :'.$parameterName);
$qb->setParameter($parameterName, $value);
}

return $qb;
}
Expand All @@ -352,27 +362,20 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S

public static function filterById(
QueryBuilder $qb,
$value,
mixed $value,
$operator = Comparison::EQ,
$entityName = self::NAME,
$columnName = 'id',
string $columnNamePrefix = '',
string $columnNameSuffix = '',
): QueryBuilder {
if ($value === null) {
if (Comparison::NEQ === $operator) {
$qb->andWhere($entityName.'.'.$columnName.' IS NOT NULL');
} else {
$qb->andWhere($entityName.'.'.$columnName.' IS NULL');
}
} else {
//get a uniq index
$index = static::getParameterIndex();
$parameterName = $columnName.$index;

$qb->andWhere($entityName.'.'.$columnName.$operator.':'.$parameterName);
$qb->setParameter($parameterName, $value);
}

return $qb;
return self::filterBy(
qb: $qb,
columnName: $columnName,
operator: $operator,
value: $value,
entityName: $entityName,
);
}

public static function filterInId(
Expand Down Expand Up @@ -504,27 +507,20 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S

public static function filterByNumber(
QueryBuilder $qb,
$value,
mixed $value,
$operator = Comparison::EQ,
$entityName = self::NAME,
$columnName = 'number',
string $columnNamePrefix = '',
string $columnNameSuffix = '',
): QueryBuilder {
if ($value === null) {
if (Comparison::NEQ === $operator) {
$qb->andWhere($entityName.'.'.$columnName.' IS NOT NULL');
} else {
$qb->andWhere($entityName.'.'.$columnName.' IS NULL');
}
} else {
//get a uniq index
$index = static::getParameterIndex();
$parameterName = $columnName.$index;

$qb->andWhere($entityName.'.'.$columnName.$operator.':'.$parameterName);
$qb->setParameter($parameterName, $value);
}

return $qb;
return self::filterBy(
qb: $qb,
columnName: $columnName,
operator: $operator,
value: $value,
entityName: $entityName,
);
}

public static function filterInNumber(
Expand Down Expand Up @@ -656,27 +652,20 @@ class MyClassRepositoryBase extends \Doctrine\Bundle\DoctrineBundle\Repository\S

public static function filterByName(
QueryBuilder $qb,
$value,
mixed $value,
$operator = Comparison::EQ,
$entityName = self::NAME,
$columnName = 'name',
string $columnNamePrefix = '',
string $columnNameSuffix = '',
): QueryBuilder {
if ($value === null) {
if (Comparison::NEQ === $operator) {
$qb->andWhere($entityName.'.'.$columnName.' IS NOT NULL');
} else {
$qb->andWhere($entityName.'.'.$columnName.' IS NULL');
}
} else {
//get a uniq index
$index = static::getParameterIndex();
$parameterName = $columnName.$index;

$qb->andWhere($entityName.'.'.$columnName.$operator.':'.$parameterName);
$qb->setParameter($parameterName, $value);
}

return $qb;
return self::filterBy(
qb: $qb,
columnName: $columnName,
operator: $operator,
value: $value,
entityName: $entityName,
);
}

public static function filterInName(
Expand Down
Loading