Merge branch 'release/1.1.6'

Author: turegjorup

.gitignore

@@ -29,6 +29,7 @@ node_modules/
 ###> phpunit/phpunit ###
 /phpunit.xml
 .phpunit.result.cache
+coverage
 ###< phpunit/phpunit ###
 
 ###> liip/imagine-bundle ###

CHANGELOG.md

@@ -8,6 +8,12 @@ See [keep a changelog] for information about writing changes to this log.
 
 ## [Unreleased]
 
+## [1.1.6] - 2025-03-27
+
+- Fix special char handling in event excerpt field, fix wrong chars in existing excerpt fields
+- Fix start/end not required for occurrences in EasyAdmin
+- Set "updated at" to newest of either entity or entity relations when indexing
+
 ## [1.1.5] - 2025-03-12
 
 - Add labels to Woodpecker workflow
@@ -95,7 +101,8 @@ See [keep a changelog] for information about writing changes to this log.
 - Consolidate scheduled feed import and index populate in one command
 
 [keep a changelog]: https://keepachangelog.com/en/1.1.0/
-[unreleased]: https://github.com/itk-dev/event-database-imports/compare/1.1.5...HEAD
+[unreleased]: https://github.com/itk-dev/event-database-imports/compare/1.1.6...HEAD
+[1.1.6]: https://github.com/itk-dev/event-database-imports/releases/tag/1.1.6
 [1.1.5]: https://github.com/itk-dev/event-database-imports/releases/tag/1.1.5
 [1.1.4]: https://github.com/itk-dev/event-database-imports/releases/tag/1.1.4
 [1.1.3]: https://github.com/itk-dev/event-database-imports/releases/tag/1.1.3

migrations/Version20250327102139.php

@@ -0,0 +1,57 @@
+<?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 Version20250326151430 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Convert HTML character entities in excerpt fields to their actual characters';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // Get all records that have excerpt fields containing '&' (indicating HTML entities)
+        $qb = $this->connection->createQueryBuilder();
+        $records = $qb->select('e.id', 'e.excerpt')
+            ->from('event', 'e')
+            ->where($qb->expr()->like('e.excerpt', ':pattern'))
+            ->setParameter('pattern', '%&%')
+            ->executeQuery()
+            ->fetchAllAssociative();
+
+        // Process each record
+        foreach ($records as $record) {
+            if (null === $record['excerpt']) {
+                continue;  // Skip if excerpt is null
+            }
+
+            // Decode HTML entities using PHP's native function
+            $decodedExcerpt = html_entity_decode($record['excerpt'], ENT_QUOTES | ENT_HTML5);
+
+            // Only update if something changed
+            if ($decodedExcerpt !== $record['excerpt']) {
+                $this->connection->createQueryBuilder()
+                    ->update('event', 'e')
+                    ->set('e.excerpt', ':excerpt')
+                    ->where('e.id = :id')
+                    ->setParameter('excerpt', $decodedExcerpt)
+                    ->setParameter('id', $record['id'])
+                    ->executeStatement();
+            }
+        }
+    }
+
+    public function down(Schema $schema): void
+    {
+        // No need to revert this change as it just formats data without functional changes
+    }
+}

phpstan-baseline.neon

@@ -246,12 +246,6 @@ parameters:
 			count: 1
 			path: src/Repository/VocabularyRepository.php
 
-		-
-			message: '#^Call to an undefined method App\\Service\\Indexing\\IndexItemInterface\:\:getEvent\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: src/Service/Indexing/IndexingDailyOccurrences.php
-
 		-
 			message: '#^Call to an undefined method Symfony\\Component\\Serializer\\SerializerInterface\:\:normalize\(\)\.$#'
 			identifier: method.notFound
@@ -288,12 +282,6 @@ parameters:
 			count: 1
 			path: src/Service/Indexing/IndexingLocations.php
 
-		-
-			message: '#^Call to an undefined method App\\Service\\Indexing\\IndexItemInterface\:\:getEvent\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: src/Service/Indexing/IndexingOccurrences.php
-
 		-
 			message: '#^Call to an undefined method Symfony\\Component\\Serializer\\SerializerInterface\:\:normalize\(\)\.$#'
 			identifier: method.notFound

src/Controller/Admin/EmbedOccurrenceCrudController.php

@@ -29,9 +29,11 @@ public function configureFields(string $pageName): iterable
             FormField::addFieldset('Dates')
                 ->setLabel(new TranslatableMessage('admin.occurrence.dates.headline')),
             DateTimeField::new('start')
+                ->setHtmlAttribute('required', 'required')
                 ->setLabel(new TranslatableMessage('admin.occurrence.dates.start'))
                 ->setColumns(6),
             DateTimeField::new('end')
+                ->setHtmlAttribute('required', 'required')
                 ->setLabel(new TranslatableMessage('admin.occurrence.dates.end'))
                 ->setColumns(6),
 

src/Entity/Occurrence.php

@@ -13,6 +13,7 @@
 use Gedmo\Timestampable\Traits\TimestampableEntity;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\SerializedPath;
+use Symfony\Component\Validator\Constraints as Assert;
 
 #[ORM\Entity(repositoryClass: OccurrenceRepository::class)]
 class Occurrence implements IndexItemInterface, EditableEntityInterface
@@ -28,12 +29,17 @@ class Occurrence implements IndexItemInterface, EditableEntityInterface
     #[SerializedPath('[entityId]')]
     private ?int $id = null;
 
-    #[ORM\Column]
+    #[ORM\Column(nullable: false)]
     #[Groups([IndexNames::Events->value, IndexNames::Occurrences->value])]
     private ?\DateTimeImmutable $start = null;
 
-    #[ORM\Column]
+    #[ORM\Column(nullable: false)]
     #[Groups([IndexNames::Events->value, IndexNames::Occurrences->value])]
+    #[Assert\DateTime]
+    #[Assert\Expression(
+        'this.getStart() < this.getEnd()',
+        message: 'The start date must be before the end date'
+    )]
     private ?\DateTimeImmutable $end = null;
 
     #[ORM\Column(length: 255, nullable: true)]

src/EventSubscriber/EasyAdminSubscriber.php

@@ -84,7 +84,6 @@ private function handleNormalization(object $entity): void
 
             $excerpt = $entity->getExcerpt();
             if (!empty($excerpt)) {
-                $excerpt = $this->contentNormalizer->sanitize($excerpt);
                 $excerpt = $this->contentNormalizer->trimLength($excerpt, Event::EXCERPT_MAX_LENGTH);
                 $entity->setExcerpt($excerpt);
             } elseif (!is_null($description)) {

src/Service/Indexing/IndexingDailyOccurrences.php

@@ -2,6 +2,7 @@
 
 namespace App\Service\Indexing;
 
+use App\Entity\DailyOccurrence;
 use App\Model\Indexing\IndexFieldTypes;
 use App\Model\Indexing\IndexNames;
 use Elastic\Elasticsearch\Client;
@@ -25,6 +26,13 @@ public function __construct(
 
     public function serialize(IndexItemInterface $item): array
     {
+        if (!$item instanceof DailyOccurrence) {
+            throw new \InvalidArgumentException('Item must be an instance of DailyOccurrence.');
+        }
+
+        $updatedAt = $this->getUpdatedAt($item);
+        $item->setUpdatedAt($updatedAt);
+
         $contextBuilder = (new ObjectNormalizerContextBuilder())
             ->withGroups([IndexNames::Occurrences->value]);
         $contextBuilder = (new DateTimeNormalizerContextBuilder())
@@ -39,4 +47,24 @@ public function serialize(IndexItemInterface $item): array
 
         return $data;
     }
+
+    private function getUpdatedAt(DailyOccurrence $occurrence): \DateTime
+    {
+        $updatedAt = $occurrence->getUpdatedAt();
+        $event = $occurrence->getEvent();
+
+        $updatedAt = max($updatedAt, $event->getOrganization()?->getUpdatedAt());
+        $updatedAt = max($updatedAt, $event->getLocation()?->getUpdatedAt());
+        $updatedAt = max($updatedAt, $event->getImage()?->getUpdatedAt());
+
+        foreach ($event->getPartners() as $partner) {
+            $updatedAt = max($updatedAt, $partner->getUpdatedAt());
+        }
+
+        foreach ($event->getOccurrences() as $occurrence) {
+            $updatedAt = max($updatedAt, $occurrence->getUpdatedAt());
+        }
+
+        return $updatedAt;
+    }
 }

src/Service/Indexing/IndexingEvents.php

@@ -32,6 +32,9 @@ public function serialize(IndexItemInterface $item): array
             throw new \InvalidArgumentException('Item must be an instance of Event.');
         }
 
+        $updatedAt = $this->getUpdatedAt($item);
+        $item->setUpdatedAt($updatedAt);
+
         $contextBuilder = (new ObjectNormalizerContextBuilder())
             ->withGroups([IndexNames::Events->value]);
         $contextBuilder = (new DateTimeNormalizerContextBuilder())
@@ -61,4 +64,23 @@ public function serialize(IndexItemInterface $item): array
 
         return $data;
     }
+
+    private function getUpdatedAt(Event $event): \DateTime
+    {
+        $updatedAt = $event->getUpdatedAt();
+
+        $updatedAt = max($updatedAt, $event->getOrganization()?->getUpdatedAt());
+        $updatedAt = max($updatedAt, $event->getLocation()?->getUpdatedAt());
+        $updatedAt = max($updatedAt, $event->getImage()?->getUpdatedAt());
+
+        foreach ($event->getPartners() as $partner) {
+            $updatedAt = max($updatedAt, $partner->getUpdatedAt());
+        }
+
+        foreach ($event->getOccurrences() as $occurrence) {
+            $updatedAt = max($updatedAt, $occurrence->getUpdatedAt());
+        }
+
+        return $updatedAt;
+    }
 }

src/Service/Indexing/IndexingOccurrences.php

@@ -2,6 +2,7 @@
 
 namespace App\Service\Indexing;
 
+use App\Entity\Occurrence;
 use App\Model\Indexing\IndexFieldTypes;
 use App\Model\Indexing\IndexNames;
 use Elastic\Elasticsearch\Client;
@@ -25,6 +26,13 @@ public function __construct(
 
     public function serialize(IndexItemInterface $item): array
     {
+        if (!$item instanceof Occurrence) {
+            throw new \InvalidArgumentException('Item must be an instance of Occurrence.');
+        }
+
+        $updatedAt = $this->getUpdatedAt($item);
+        $item->setUpdatedAt($updatedAt);
+
         $contextBuilder = (new ObjectNormalizerContextBuilder())
             ->withGroups([IndexNames::Occurrences->value]);
         $contextBuilder = (new DateTimeNormalizerContextBuilder())
@@ -39,4 +47,24 @@ public function serialize(IndexItemInterface $item): array
 
         return $data;
     }
+
+    private function getUpdatedAt(Occurrence $occurrence): \DateTime
+    {
+        $updatedAt = $occurrence->getUpdatedAt();
+        $event = $occurrence->getEvent();
+
+        $updatedAt = max($updatedAt, $event->getOrganization()?->getUpdatedAt());
+        $updatedAt = max($updatedAt, $event->getLocation()?->getUpdatedAt());
+        $updatedAt = max($updatedAt, $event->getImage()?->getUpdatedAt());
+
+        foreach ($event->getPartners() as $partner) {
+            $updatedAt = max($updatedAt, $partner->getUpdatedAt());
+        }
+
+        foreach ($event->getOccurrences() as $occurrence) {
+            $updatedAt = max($updatedAt, $occurrence->getUpdatedAt());
+        }
+
+        return $updatedAt;
+    }
 }