feat: improve ui

This commit is contained in:
Maël Gangloff
2024-12-20 19:41:48 +01:00
parent 1dc16d769b
commit 425071bc23
6 changed files with 124 additions and 55 deletions

View File

@@ -4,6 +4,7 @@ namespace App\Repository;
use App\Entity\Entity;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\DBAL\Exception;
use Doctrine\Persistence\ManagerRegistry;
/**
@@ -16,6 +17,17 @@ class EntityRepository extends ServiceEntityRepository
parent::__construct($registry, Entity::class);
}
/**
* @throws Exception
*/
public function findByjCard(array $vCardArray): array
{
return $this->getEntityManager()->getConnection()
->prepare('SELECT * FROM entity WHERE j_Card @> :data')
->executeQuery(['data' => json_encode($vCardArray)])
->fetchAllAssociative();
}
// /**
// * @return Entity[] Returns an array of Entity objects
// */

View File

@@ -252,11 +252,11 @@ readonly class RDAPService
if (array_key_exists('entities', $res) && is_array($res['entities'])) {
foreach ($res['entities'] as $rdapEntity) {
if ((!array_key_exists('handle', $rdapEntity) || '' === $rdapEntity['handle']) && !array_key_exists('vcardArray', $rdapEntity)) {
continue;
}
$entity = $this->registerEntity($rdapEntity);
$this->em->persist($entity);
$this->em->flush();
$domainEntity = $this->domainEntityRepository->findOneBy([
'domain' => $domain,
'entity' => $entity,
@@ -323,14 +323,11 @@ readonly class RDAPService
}
foreach ($rdapNameserver['entities'] as $rdapEntity) {
if (!array_key_exists('handle', $rdapEntity) || '' === $rdapEntity['handle']) {
if ((!array_key_exists('handle', $rdapEntity) || '' === $rdapEntity['handle']) && !array_key_exists('vcardArray', $rdapEntity)) {
continue;
}
$entity = $this->registerEntity($rdapEntity);
$this->em->persist($entity);
$this->em->flush();
$nameserverEntity = $this->nameserverEntityRepository->findOneBy([
'nameserver' => $nameserver,
'entity' => $entity,
@@ -391,20 +388,31 @@ readonly class RDAPService
*/
private function registerEntity(array $rdapEntity): Entity
{
$conn = $this->em->getConnection();
$sql = 'SELECT * FROM entity WHERE j_Card @> :data';
$stmt = $conn->prepare($sql)->executeQuery(['data' => json_encode($rdapEntity['vcardArray'])]);
if (array_key_exists('vcardArray', $rdapEntity)) {
$result = $this->entityRepository->findByjCard($rdapEntity['vcardArray']);
$result = $stmt->fetchAllAssociative();
if (!array_key_exists('handle', $rdapEntity) || '' === $rdapEntity['handle']) {
if (count($result) > 0) {
$rdapEntity['handle'] = $result[0]['handle'];
} else {
$rdapEntity['handle'] = 'DW-NOHANDLE-'.hash('md5', json_encode($rdapEntity['vcardArray']));
}
} else {
if (count($result) > 0) {
$entity = $this->entityRepository->findOneBy(['handle' => $result[0]['handle']]);
$rdapEntity['handle'] = array_key_exists('handle', $rdapEntity) && '' !== $rdapEntity['handle']
? $rdapEntity['handle']
: (
count($result) > 0
? $result[0]['handle']
: 'DW-NOHANDLE-'.hash('md5', json_encode($rdapEntity)
)
);
if (null !== $entity) {
$domainEntities = $this->domainEntityRepository->findBy([
'entity' => $entity,
]);
$nameserverEntities = $this->nameserverEntityRepository->findBy([
'entity' => $entity,
]);
}
}
}
}
$entity = $this->entityRepository->findOneBy([
'handle' => $rdapEntity['handle'],
@@ -468,6 +476,23 @@ readonly class RDAPService
->setDeleted(false));
}
$this->em->persist($entity);
$this->em->flush();
if (isset($domainEntities)) {
/** @var DomainEntity[] $domainEntities */
foreach ($domainEntities as $domainEntity) {
$domainEntity->setEntity($entity);
}
}
if (isset($nameserverEntities)) {
/** @var NameserverEntity[] $nameserverEntities */
foreach ($nameserverEntities as $nameserverEntity) {
$nameserverEntity->setEntity($entity);
}
}
return $entity;
}