2283: Fix event <> feeditem mapping error

migrations/Version20240918103538.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20240918103538 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE event DROP feed_item_id');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE event ADD feed_item_id VARCHAR(255) DEFAULT NULL');
+    }
+}

src/Entity/Event.php

@@ -71,10 +71,6 @@ class Event implements IndexItemInterface, EditableEntityInterface
     #[ORM\ManyToOne(inversedBy: 'events')]
     private ?Feed $feed = null;
 
-    /** @deprecated field kept to allow mapping of already imported events. Replaced by FeedItem relation. */
-    #[ORM\Column(length: 255, nullable: true)]
-    private ?string $feedItemId = null;
-
     #[ORM\OneToOne(mappedBy: 'event', cascade: ['persist', 'remove'])]
     private ?FeedItem $feedItem = null;
 

src/Factory/EventFactory.php

@@ -35,10 +35,10 @@ public function createOrUpdate(FeedItemData $item, FeedItem $feedItemEntity): Ev
         if (is_null($feed)) {
             throw new FactoryException('Missing feed in event factory');
         }
-        $event = $this->getEvent(['feed' => $feed, 'feedItemId' => $item->id]);
-
         $editedBy = $feed->getUser() ?? $feed;
 
+        $event = $feedItemEntity->getEvent();
+
         if (is_null($event)) {
             $event = new Event();
 
@@ -87,7 +87,8 @@ private function setValues(Event $entity, FeedItem $feedItemEntity, FeedItemData
             ->setExcerpt($item->excerpt)
             ->setFeedItem($feedItemEntity)
             ->setPublicAccess($item->publicAccess)
-            ->setFeed($feed);
+            ->setFeed($feed)
+            ->setFeedItem($feedItemEntity);
 
         $description = $entity->getDescription();
 

src/MessageHandler/EventHandler.php

@@ -36,7 +36,6 @@ public function __invoke(EventMessage $message): void
         try {
             $event = $this->eventFactory->createOrUpdate($feedItemData, $feedItemEntity);
 
-            $feedItemEntity->setEvent($event);
             $this->entityManager->persist($feedItemEntity);
             $this->entityManager->flush();
 

src/MessageHandler/FeedItemDataHandler.php

@@ -5,7 +5,6 @@
 use App\Entity\FeedItem;
 use App\Message\FeedItemDataMessage;
 use App\Message\FeedItemNormalizationMessage;
-use App\Repository\EventRepository;
 use App\Repository\FeedItemRepository;
 use App\Repository\FeedRepository;
 use App\Service\Feeds\Mapper\FeedMapperInterface;
@@ -22,7 +21,6 @@ public function __construct(
         private FeedMapperInterface $feedMapper,
         private FeedRepository $feedRepository,
         private FeedItemRepository $feedItemRepository,
-        private EventRepository $eventRepository,
     ) {
     }
 
@@ -45,12 +43,6 @@ public function __invoke(FeedItemDataMessage $message): void
                 $feedItemEntity = new FeedItem($feed, $feedItemData->id, $message->getData());
             }
 
-            // Map previously imported events.
-            $event = $this->eventRepository->findOneBy(['feed' => $feed, 'feedItemId' => $feedItemData->id]);
-            if (null !== $event) {
-                $feedItemEntity->setEvent($event);
-            }
-
             $feedItemEntity->setLastSeenAt();
             $this->feedItemRepository->save($feedItemEntity, true);