add base authorization to person search + improve search ordering

This commit is contained in:
2021-11-15 11:17:03 +00:00
parent 4ba93bb709
commit 8296d60cb6
22 changed files with 317 additions and 151 deletions

View File

@@ -0,0 +1,40 @@
<?php
namespace Chill\PersonBundle\DataFixtures\Helper;
use Chill\PersonBundle\Entity\Person;
use Doctrine\ORM\EntityManagerInterface;
trait PersonRandomHelper
{
private array $randPersons = [];
private ?int $countPersons = null;
protected function getRandomPerson(EntityManagerInterface $em): Person
{
$fetchBy = 5;
if (null === $this->countPersons) {
$qb = $em->createQueryBuilder();
$this->countPersons = $qb->select('count(p)')
->from(Person::class, 'p')
->getQuery()
->getSingleScalarResult()
;
}
if ([] === $this->randPersons) {
$qb = $em->createQueryBuilder();
$this->randPersons = $qb
->select('p')
->from(Person::class, 'p')
->getQuery()
->setFirstResult(\random_int(0, $this->countPersons - $fetchBy))
->setMaxResults($fetchBy)
->getResult()
;
}
return \array_pop($this->randPersons);
}
}

View File

@@ -262,7 +262,7 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con
$manager->persist($accompanyingPeriod);
echo "add person'".$person->__toString()."'\n";
$this->addReference(self::PERSON, $person);
$this->addReference(self::PERSON.$person->getId(), $person);
}
private function getRandomUser(): User

View File

@@ -10,7 +10,26 @@ use Doctrine\Persistence\ObjectManager;
class LoadRelations extends Fixture implements FixtureGroupInterface
{
public const RELATIONS = 'relations';
public const RELATION_KEY = 'relations';
public const RELATIONS = [
['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fille']],
['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fils']],
['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fille']],
['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fils']],
['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Frère']],
['title' => ['fr' => 'Soeur'], 'reverseTitle' => ['fr' => 'Soeur']],
['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Soeur']],
['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-frère']],
['title' => ['fr' => 'Demi-soeur'], 'reverseTitle' => ['fr' => 'Demi-soeur']],
['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-soeur']],
['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Neveu']],
['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Nièce']],
['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Neveu']],
['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Nièce']],
];
public static function getGroups(): array
{
@@ -19,37 +38,17 @@ class LoadRelations extends Fixture implements FixtureGroupInterface
public function load(ObjectManager $manager)
{
$relations = [
['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fille']],
['title' => ['fr' => 'Mère'], 'reverseTitle' => ['fr' => 'Fils']],
['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fille']],
['title' => ['fr' => 'Père'], 'reverseTitle' => ['fr' => 'Fils']],
['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Frère']],
['title' => ['fr' => 'Soeur'], 'reverseTitle' => ['fr' => 'Soeur']],
['title' => ['fr' => 'Frère'], 'reverseTitle' => ['fr' => 'Soeur']],
['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-frère']],
['title' => ['fr' => 'Demi-soeur'], 'reverseTitle' => ['fr' => 'Demi-soeur']],
['title' => ['fr' => 'Demi-frère'], 'reverseTitle' => ['fr' => 'Demi-soeur']],
['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Neveu']],
['title' => ['fr' => 'Oncle'], 'reverseTitle' => ['fr' => 'Nièce']],
['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Neveu']],
['title' => ['fr' => 'Tante'], 'reverseTitle' => ['fr' => 'Nièce']],
];
foreach($relations as $value){
foreach (self::RELATIONS as $key => $value){
print "Creating a new relation type: relation" . $value['title']['fr'] . "reverse relation: " . $value['reverseTitle']['fr'] . "\n";
$relation = new Relation();
$relation->setTitle($value['title'])
->setReverseTitle($value['reverseTitle']);
$manager->persist($relation);
$this->addReference(self::RELATIONS, $relation);
$this->addReference(self::RELATION_KEY.$key, $relation);
}
$manager->flush();
}
}

View File

@@ -3,17 +3,24 @@ declare(strict_types=1);
namespace Chill\PersonBundle\DataFixtures\ORM;
use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
use Chill\MainBundle\Entity\User;
use Chill\PersonBundle\DataFixtures\Helper\PersonRandomHelper;
use Doctrine\Bundle\FixturesBundle\Fixture;
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\Persistence\ObjectManager;
use Chill\PersonBundle\DataFixtures\ORM\LoadPeople;
use Chill\PersonBundle\DataFixtures\ORM\LoadRelations;
use Chill\PersonBundle\Entity\Relationships\Relationship;
class LoadRelationships extends Fixture implements DependentFixtureInterface
{
use PersonRandomHelper;
private EntityManagerInterface $em;
public function __construct(EntityManagerInterface $em)
{
$this->em = $em;
}
public function getDependencies()
{
@@ -21,16 +28,33 @@ class LoadRelationships extends Fixture implements DependentFixtureInterface
LoadPeople::class,
LoadRelations::class
];
}
public function load(ObjectManager $manager)
{
$relationship = new Relationship;
$relationship->setFromPerson($this->getReference(LoadPeople::PERSON));
$relationship->setToPerson($this->getReference(LoadPeople::PERSON));
$relationship->setRelation($this->getReference(LoadRelations::RELATIONS));
$relationship->setReverse((bool)random_int(0, 1));
for ($i = 0; $i < 15; $i++) {
$user = $this->getRandomUser();
$date = new \DateTimeImmutable();
$relationship = (new Relationship())
->setFromPerson($this->getRandomPerson($this->em))
->setToPerson($this->getRandomPerson($this->em))
->setRelation($this->getReference(LoadRelations::RELATION_KEY.
\random_int(0, count(LoadRelations::RELATIONS) - 1)))
->setReverse((bool) random_int(0, 1))
->setCreatedBy($user)
->setUpdatedBy($user)
->setCreatedAt($date)
->setUpdatedAt($date)
;
$manager->persist($relationship);
}
$manager->flush();
}
}
private function getRandomUser(): User
{
$userRef = array_rand(LoadUsers::$refs);
return $this->getReference($userRef);
}
}