update synchro script

Author: bailletced

scripts/synchro2.py scripts/synchro-old.py

@@ -2,10 +2,10 @@
 
 namespace App\Core\Infrastructure\ElasticSearch\Service;
 
-use App\FieldHolder\Community\Domain\Model\Community;
-use App\FieldHolder\Community\Domain\Repository\CommunityRepositoryInterface;
 use App\Core\Domain\Search\Helper\SearchHelperInterface;
 use App\Core\Domain\Search\Service\SearchServiceInterface;
+use App\FieldHolder\Community\Domain\Model\Community;
+use App\FieldHolder\Community\Domain\Repository\CommunityRepositoryInterface;
 use App\Shared\Domain\Enum\SearchIndex;
 use Symfony\Component\Uid\Uuid;
 

scripts/synchro.py

@@ -4,11 +4,11 @@
 
 namespace App\Core\Infrastructure\Symfony\Command;
 
+use App\Core\Domain\Search\Helper\SearchHelperInterface;
+use App\Field\Domain\Enum\FieldCommunity;
 use App\FieldHolder\Community\Domain\Enum\CommunityType;
 use App\FieldHolder\Community\Domain\Model\Community;
 use App\FieldHolder\Community\Domain\Repository\CommunityRepositoryInterface;
-use App\Core\Domain\Search\Helper\SearchHelperInterface;
-use App\Field\Domain\Enum\FieldCommunity;
 use App\Shared\Domain\Enum\SearchIndex;
 use Doctrine\Common\Collections\Collection;
 use Symfony\Component\Console\Attribute\AsCommand;

src/Core/Infrastructure/ElasticSearch/Service/OfficialElasticSearchService.php

@@ -4,15 +4,15 @@
 
 use ApiPlatform\Validator\Exception\ValidationException;
 use App\Agent\Domain\Model\Agent;
-use App\FieldHolder\Community\Domain\Model\Community;
-use App\FieldHolder\Community\Domain\Repository\CommunityRepositoryInterface;
 use App\Field\Domain\Enum\FieldCommunity;
 use App\Field\Domain\Enum\FieldPlace;
 use App\Field\Domain\Exception\FieldEntityNotFoundException;
 use App\Field\Domain\Exception\FieldInvalidNameException;
 use App\Field\Domain\Exception\FieldUnicityViolationException;
 use App\Field\Domain\Model\Field;
 use App\Field\Domain\Repository\FieldRepositoryInterface;
+use App\FieldHolder\Community\Domain\Model\Community;
+use App\FieldHolder\Community\Domain\Repository\CommunityRepositoryInterface;
 use App\FieldHolder\Place\Domain\Model\Place;
 use App\FieldHolder\Place\Domain\Repository\PlaceRepositoryInterface;
 use Symfony\Bundle\SecurityBundle\Security;
@@ -39,7 +39,6 @@ public function __construct(
      */
     public function upsertFields(Place|Community $entity, array $fieldPayloads): void
     {
-
         /** @var Agent $agent */
         $agent = $this->security->getUser();
 
@@ -49,6 +48,11 @@ public function upsertFields(Place|Community $entity, array $fieldPayloads): voi
                 Community::class => FieldCommunity::tryFrom($fieldPayload->name),
                 default => null,
             };
+            $aliases = match ($entity::class) {
+                Place::class => FieldPlace::ALIASES,
+                Community::class => FieldCommunity::ALIASES,
+                default => null,
+            };
             if (null === $enumValue) {
                 throw new FieldInvalidNameException($fieldPayload->name);
             }
@@ -61,21 +65,21 @@ public function upsertFields(Place|Community $entity, array $fieldPayloads): voi
             $value = $this->maybeTransformEntities($enumValue, $fieldPayload->value);
             if (Community::class === $entity::class) {
                 $field->community = $entity;
-                if (FieldCommunity::PARENT_WIKIDATA_ID === $enumValue) {
-                    $fieldPayload->name = FieldCommunity::PARENT_COMMUNITY_ID->value;
-                }
             } else {
                 $field->place = $entity;
             }
 
+            if (in_array($enumValue->name, array_keys($aliases))) {
+                $fieldPayload->name = $aliases[$enumValue->name]->value;
+            }
             $field->name = $fieldPayload->name;
             $field->value = $value;
             $field->engine = $fieldPayload->engine;
             $field->reliability = $fieldPayload->reliability;
             $field->source = $fieldPayload->source;
             $field->explanation = $fieldPayload->explanation;
             $field->touch();
-    
+
             // Unique constraints validation (TODO use custom Assert instead)
             if (null !== $field->value
                 && in_array($field->name, Field::UNIQUE_CONSTRAINTS, true)
@@ -148,8 +152,7 @@ private function maybeTransformEntities(FieldCommunity|FieldPlace $nameEnum, mix
 
             if ($nameEnum->name === FieldPlace::PARENT_WIKIDATA_IDS->name) {
                 $instances = $repo->withWikidataIds($value)->asCollection();
-            }
-            else {
+            } else {
                 $instances = $repo->ofIds(array_map(fn (string $id) => UuidV7::fromString($id), $value))->asCollection();
             }
 
@@ -163,8 +166,7 @@ private function maybeTransformEntities(FieldCommunity|FieldPlace $nameEnum, mix
             if ($nameEnum->name === FieldCommunity::PARENT_WIKIDATA_ID->name) {
                 assert(is_int($value));
                 $instance = $repo->withWikidataId($value)->asCollection()[0];
-            }
-            else {
+            } else {
                 // That's an object
                 assert(is_string($value));
                 $instance = $repo->ofId(Uuid::fromString($value));

src/Core/Infrastructure/Symfony/Command/WriteIndexesCommand.php

@@ -29,6 +29,10 @@ enum FieldCommunity: string
         self::REPLACES->value => 'Community[]',
     ];
 
+    public const ALIASES = [
+        self::PARENT_WIKIDATA_ID->name => self::PARENT_COMMUNITY_ID,
+    ];
+
     case NAME = 'name';
     case TYPE = 'type';
     case STATE = 'state';

src/Field/Application/FieldService.php

@@ -30,6 +30,10 @@ enum FieldPlace: string
         self::WIKIDATA_UPDATED_AT->value => Types::DATETIME_IMMUTABLE,
     ];
 
+    public const ALIASES = [
+        self::PARENT_WIKIDATA_IDS->name => self::PARENT_COMMUNITIES,
+    ];
+
     case NAME = 'name';
     case TYPE = 'type';
     case WEBSITE = 'website';

src/Field/Domain/Enum/FieldCommunity.php

@@ -3,14 +3,13 @@
 namespace App\Field\Domain\Model;
 
 use App\Agent\Domain\Model\Agent;
-use App\FieldHolder\Community\Domain\Model\Community;
 use App\Field\Domain\Enum\FieldCommunity;
 use App\Field\Domain\Enum\FieldEngine;
 use App\Field\Domain\Enum\FieldPlace;
 use App\Field\Domain\Enum\FieldReliability;
+use App\FieldHolder\Community\Domain\Model\Community;
 use App\FieldHolder\Place\Domain\Model\Place;
 use App\Shared\Infrastructure\Doctrine\Trait\DoctrineTimestampableTrait;
-use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
@@ -262,10 +261,10 @@ public function applyValue(): void
         }
 
         if ('datetimeVal' === $propertyName) {
-            $value = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $value);
+            $value = \DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $value);
         }
         if ('dateVal' === $propertyName) {
-            $value = DateTimeImmutable::createFromFormat('Y-m-d', $value);
+            $value = \DateTimeImmutable::createFromFormat('Y-m-d', $value);
         }
 
         $propertyAccessor = new PropertyAccessor();

src/Field/Domain/Enum/FieldPlace.php

@@ -5,11 +5,11 @@
 namespace App\Field\Infrastructure\Doctrine;
 
 use App\Agent\Domain\Model\Agent;
-use App\FieldHolder\Community\Domain\Enum\CommunityType;
-use App\FieldHolder\Community\Domain\Repository\CommunityRepositoryInterface;
 use App\Core\Domain\Search\Helper\SearchHelperInterface;
 use App\Field\Domain\Enum\FieldCommunity;
 use App\Field\Domain\Model\Field;
+use App\FieldHolder\Community\Domain\Enum\CommunityType;
+use App\FieldHolder\Community\Domain\Repository\CommunityRepositoryInterface;
 use App\Shared\Domain\Enum\SearchIndex;
 use Doctrine\Bundle\DoctrineBundle\Attribute\AsEntityListener;
 use Doctrine\ORM\Events;

src/Field/Domain/Model/Field.php

@@ -5,31 +5,27 @@
 use ApiPlatform\Metadata\Exception\ProblemExceptionInterface;
 use ApiPlatform\Validator\Exception\ValidationException;
 use App\Field\Domain\Model\Field;
-use Exception;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 final class FieldHolderUpsertService
 {
-    public function __construct(
-        private DenormalizerInterface $denormalizer,
-    ) {
-    }
-
-    public function getFieldByName(array $fields, string $fieldName): mixed
+    /**
+     * @param Field[] $fields
+     */
+    public function getFieldByName(array $fields, string $fieldName): ?Field
     {
-        $result = array_values(array_filter($fields, 
-            fn (array $field) => $field['name'] === $fieldName
+        $result = array_values(array_filter($fields,
+            fn (Field $field) => $field->name === $fieldName
         ));
 
         return count($result) > 0 ? $result[0] : null;
     }
 
-    public function handleError(object $entity, Exception $e, callable $detachCallback): string
+    public function handleError(object $entity, \Exception $e, callable $detachCallback): string
     {
         foreach ($entity->fields as $field) {
             call_user_func($detachCallback, $field);
-            call_user_func($detachCallback, $entity);
         }
+        call_user_func($detachCallback, $entity);
 
         if ($e instanceof ValidationException) {
             return $e->getMessage();
@@ -40,11 +36,4 @@ public function handleError(object $entity, Exception $e, callable $detachCallba
 
         return $e->getMessage();
     }
-
-    public function arrayToFields(array $fields) : array {
-        return array_map(
-            fn (array $field) => $this->denormalizer->denormalize($field, Field::class),
-            $fields
-        );
-    }
 }

src/Field/Infrastructure/Doctrine/DoctrineFieldListener.php

@@ -26,6 +26,12 @@ class Community extends FieldHolder
     #[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
     public ?Uuid $id = null;
 
+    /**
+     * @var Collection<int, Field>
+     */
+    #[ORM\OneToMany(targetEntity: Field::class, mappedBy: 'community')]
+    public Collection $fields;
+
     /**
      * @var Collection<int, Field>
      */

src/FieldHolder/Application/FieldHolderUpsertService.php

@@ -28,6 +28,9 @@ public function withType(string $type): static;
 
     public function withWikidataId(int $wikidataId): static;
 
+    /**
+     * @param array<int> $wikidataIds
+     */
     public function withWikidataIds(array $wikidataIds): static;
 
     public function withParentCommunityId(Uuid $parentId): static;

src/FieldHolder/Community/Domain/Model/Community.php

@@ -4,10 +4,12 @@
 
 namespace App\FieldHolder\Community\Infrastructure\ApiPlatform\Input;
 
-final class CommunityWikidataInput {
+use App\Field\Domain\Model\Field;
 
+final class CommunityWikidataInput
+{
     /**
-     * @param array<Field[]> $fields
+     * @var array<Field[]>
      */
     public array $wikidataEntities = [];
-}
+}

src/FieldHolder/Community/Domain/Repository/CommunityRepositoryInterface.php

@@ -11,17 +11,17 @@
 use ApiPlatform\Metadata\Patch;
 use ApiPlatform\Metadata\Post;
 use ApiPlatform\Metadata\Put;
+use App\Field\Domain\Model\Field;
+use App\Field\Infrastructure\ApiPlatform\Filter\FieldNameFilter;
+use App\Field\Infrastructure\ApiPlatform\Filter\FieldTypeFilter;
+use App\Field\Infrastructure\ApiPlatform\Filter\FieldWikidataIdFilter;
 use App\FieldHolder\Community\Domain\Model\Community;
 use App\FieldHolder\Community\Infrastructure\ApiPlatform\Input\CommunityWikidataInput;
 use App\FieldHolder\Community\Infrastructure\ApiPlatform\State\Processor\CreateCommunityProcessor;
 use App\FieldHolder\Community\Infrastructure\ApiPlatform\State\Processor\UpdateCommunityProcessor;
 use App\FieldHolder\Community\Infrastructure\ApiPlatform\State\Processor\UpsertCommunityProcessor;
 use App\FieldHolder\Community\Infrastructure\ApiPlatform\State\Provider\CommunityCollectionProvider;
 use App\FieldHolder\Community\Infrastructure\ApiPlatform\State\Provider\CommunityItemProvider;
-use App\Field\Domain\Model\Field;
-use App\Field\Infrastructure\ApiPlatform\Filter\FieldNameFilter;
-use App\Field\Infrastructure\ApiPlatform\Filter\FieldTypeFilter;
-use App\Field\Infrastructure\ApiPlatform\Filter\FieldWikidataIdFilter;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Uid\Uuid;
 

src/FieldHolder/Community/Infrastructure/ApiPlatform/Input/CommunityWikidataInput.php

@@ -6,10 +6,10 @@
 
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
+use App\Field\Application\FieldService;
 use App\FieldHolder\Community\Domain\Model\Community;
 use App\FieldHolder\Community\Domain\Repository\CommunityRepositoryInterface;
 use App\FieldHolder\Community\Infrastructure\ApiPlatform\Resource\CommunityResource;
-use App\Field\Application\FieldService;
 use App\Shared\Domain\Manager\TransactionManagerInterface;
 use Webmozart\Assert\Assert;
 

src/FieldHolder/Community/Infrastructure/ApiPlatform/Resource/CommunityResource.php

@@ -6,9 +6,9 @@
 
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
+use App\Field\Application\FieldService;
 use App\FieldHolder\Community\Domain\Repository\CommunityRepositoryInterface;
 use App\FieldHolder\Community\Infrastructure\ApiPlatform\Resource\CommunityResource;
-use App\Field\Application\FieldService;
 use App\Shared\Domain\Manager\TransactionManagerInterface;
 use Webmozart\Assert\Assert;