lubiana/futtern
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 35 Packages Wiki Activity Actions

improve coverage, remove infection
All checks were successful
/ ls (pull_request) Successful in 1m30s
Details

Browse source
This commit is contained in:
lubiana 2025-01-26 11:48:16 +01:00
parent eaa723a58b
commit 0aa25d107b
Signed by: lubiana
SSH key fingerprint: SHA256:vW1EA0fRR3Fw+dD/sM0K+x3Il2gSry6YRYHqOeQwrfk
10 changed files with 160 additions and 1317 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/Form/MenuItemType.php
View file

@ -4,6 +4,7 @@ namespace App\Form;
use App\Entity\MenuItem;
use App\Repository\MenuItemRepository;
use Doctrine\DBAL\Types\TextType;
use Doctrine\ORM\QueryBuilder;
use Override;
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@ -13,6 +14,7 @@ use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Uid\Ulid;
use Symfony\Component\Validator\Constraints\NotBlank;
use function array_map;
use function assert;
@ -22,41 +24,21 @@ final class MenuItemType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$item = $options['data'];
assert($item instanceof MenuItem); // Ensure it's of the correct type
$vendorId = $item->getFoodVendor()?->getId(); // Use safe navigation operator in case FoodVendor is null
assert($item instanceof MenuItem);
$builder->add('name'); // Basic field
$builder->add('name', \Symfony\Component\Form\Extension\Core\Type\TextType::class, [
'constraints' => [
new NotBlank(),
new \Symfony\Component\Validator\Constraints\Length(['min' => 3]),
]
]);
$builder->add('aliases', EntityType::class, [
'class' => MenuItem::class,
'choice_label' => 'name',
'multiple' => true,
'expanded' => true,
'query_builder' => static function (MenuItemRepository $repository) use ($item, $vendorId): QueryBuilder {
$ids = $repository->createQueryBuilder('m')
->select('DISTINCT IDENTITY(m.aliasOf)')
->where('m.deletedAt IS NULL')
->andWhere('m.aliasOf IS NOT NULL')
->getquery();
$ids = $ids->getScalarResult();
$ids = array_map(static fn(array $id): Ulid => Ulid::fromBinary($id[1]), $ids);
// Build the main query with a NOT EXISTS constraint
$qb = $repository->createQueryBuilder('m');
$qb
->where('m.foodVendor = :vendorId')
->andWhere('m.deletedAt IS NULL')
->andWhere('m.id != :id');
foreach ($ids as $key => $id) {
$qb->andWhere("m.id != :idBy{$key}");
$qb->setParameter("idBy{$key}", $id, UlidType::NAME);
}
$qb
->orderBy('m.name', 'ASC')
->setParameter('vendorId', $vendorId, UlidType::NAME) // ULID or appropriate type
->setParameter('id', $item->getId()); // ULID or appropriate type
return $qb;
},
'query_builder' => static fn (MenuItemRepository $repository): QueryBuilder
=> $repository->getSuitableAliasQueryBuilder($item),
]);
}

49
src/Repository/MenuItemRepository.php
View file

@ -5,6 +5,8 @@ namespace App\Repository;
use App\Entity\MenuItem;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;
use Symfony\Bridge\Doctrine\Types\UlidType;
use Symfony\Component\Uid\Ulid;
/**
* @extends ServiceEntityRepository<MenuItem>
@ -16,28 +18,29 @@ final class MenuItemRepository extends ServiceEntityRepository
parent::__construct($registry, MenuItem::class);
}
// /**
// * @return MenuItem[] Returns an array of MenuItem objects
// */
// public function findByExampleField($value): array
// {
// return $this->createQueryBuilder('m')
// ->andWhere('m.exampleField = :val')
// ->setParameter('val', $value)
// ->orderBy('m.id', 'ASC')
// ->setMaxResults(10)
// ->getQuery()
// ->getResult()
// ;
// }
public function getSuitableAliasQueryBuilder(MenuItem $menuItem): \Doctrine\ORM\QueryBuilder
{
$ids = $this->createQueryBuilder('m')
->select('DISTINCT IDENTITY(m.aliasOf)')
->where('m.deletedAt IS NULL')
->andWhere('m.aliasOf IS NOT NULL')
->getquery();
$ids = $ids->getScalarResult();
$ids = array_map(static fn(array $id): Ulid => Ulid::fromBinary($id[1]), $ids);
// public function findOneBySomeField($value): ?MenuItem
// {
// return $this->createQueryBuilder('m')
// ->andWhere('m.exampleField = :val')
// ->setParameter('val', $value)
// ->getQuery()
// ->getOneOrNullResult()
// ;
// }
$qb = $this->createQueryBuilder('m');
$qb
->where('m.foodVendor = :vendorId')
->andWhere('m.deletedAt IS NULL')
->andWhere('m.id != :id');
foreach ($ids as $key => $id) {
$qb->andWhere("m.id != :idBy{$key}")
->setParameter("idBy{$key}", $id, UlidType::NAME);
}
$qb
->orderBy('m.name', 'ASC')
->setParameter('vendorId', $menuItem->getFoodVendor()->getId(), UlidType::NAME)
->setParameter('id', $menuItem->getId(), UlidType::NAME);
return $qb;
}
}