5104: Require event organizer

CHANGELOG.md

@@ -8,6 +8,8 @@ See [keep a changelog] for information about writing changes to this log.
 
 ## [Unreleased]
 
+- Updated fixtures. Made event organizer required.
+
 ## [1.2.2] - 2025-10-07
 
 - [PR-73](https://github.com/itk-dev/event-database-imports/pull/73) Set deploy user for rabbitmq container
@@ -119,7 +121,9 @@ 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.2.0...HEAD
+[Unreleased]: https://github.com/itk-dev/event-database-imports/compare/1.2.2...HEAD
+[1.2.2]: https://github.com/itk-dev/event-database-imports/compare/1.2.1...1.2.2
+[1.2.1]: https://github.com/itk-dev/event-database-imports/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/itk-dev/event-database-imports/compare/1.1.6...1.2.0
 [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

config/packages/security.yaml

@@ -11,7 +11,7 @@ security:
 
     firewalls:
         dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            pattern: ^/(admin/)?(_(profiler|wdt))|^/(css|images|js)/
             security: false
         image_resolver:
             pattern: ^/images/cache/resolve

public/scripts/form-scroll-to-error.js

@@ -0,0 +1,9 @@
+document.addEventListener('ea.form.error', function (event) {
+    const form = event.detail.form;
+    const firstInvalid = form.querySelector(':invalid:not(:disabled)');
+
+    if (firstInvalid) {
+        firstInvalid.scrollIntoView({ behavior: 'smooth', block: 'center' });
+        firstInvalid.focus({ preventScroll: true });
+    }
+});

src/Command/Event/FixEventsWithoutOrganizerCommand.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Command\Event;
+
+use App\Repository\EventRepository;
+use App\Repository\UserRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+#[AsCommand(
+    name: 'app:event:fix-without-organizer',
+    description: 'Set organization on events without organizer based on the creating user\'s organization'
+)]
+final class FixEventsWithoutOrganizerCommand extends Command
+{
+    public function __construct(
+        private readonly EventRepository $eventRepository,
+        private readonly UserRepository $userRepository,
+        private readonly EntityManagerInterface $entityManager,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this->addOption('dry-run', null, InputOption::VALUE_NONE, 'Show what would be changed without persisting');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+        $dryRun = $input->getOption('dry-run');
+
+        if ($dryRun) {
+            $io->note('Running in dry-run mode. No changes will be persisted.');
+        }
+
+        $events = $this->eventRepository->findBy(['organization' => null]);
+
+        if (0 === \count($events)) {
+            $io->success('No events found without an organization.');
+
+            return Command::SUCCESS;
+        }
+
+        $io->info(sprintf('Found %d event(s) without an organization.', \count($events)));
+
+        $fixed = 0;
+        $skipped = [];
+
+        foreach ($events as $event) {
+            $createdBy = $event->getCreatedBy();
+
+            if ('' === $createdBy) {
+                $skipped[] = [$event->getId(), $event->getTitle(), 'Not created by a user'];
+                continue;
+            }
+
+            $user = $this->userRepository->findOneBy(['mail' => $createdBy]);
+
+            if (null === $user) {
+                $skipped[] = [$event->getId(), $event->getTitle(), sprintf('User "%s" not found', $createdBy)];
+                continue;
+            }
+
+            $organizations = $user->getOrganizations();
+
+            if (1 !== $organizations->count()) {
+                $skipped[] = [$event->getId(), $event->getTitle(), sprintf('User "%s" has %d organizations', $createdBy, $organizations->count())];
+                continue;
+            }
+
+            $organization = $organizations->first();
+            $event->setOrganization($organization);
+            ++$fixed;
+
+            $io->text(sprintf('Event #%d "%s" → Organization "%s"', $event->getId(), $event->getTitle(), $organization));
+        }
+
+        if (\count($skipped) > 0) {
+            $io->section('Skipped events');
+            $io->table(['ID', 'Title', 'Reason'], $skipped);
+        }
+
+        if ($fixed > 0 && !$dryRun) {
+            $this->entityManager->flush();
+        }
+
+        $io->success(sprintf('%s %d event(s).', $dryRun ? 'Would fix' : 'Fixed', $fixed));
+
+        return Command::SUCCESS;
+    }
+}

src/Command/User/ListUsersWithoutOrganizationCommand.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Command\User;
+
+use App\Repository\UserRepository;
+use App\Types\UserRoles;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+#[AsCommand(
+    name: 'app:user:list-without-organization',
+    description: 'List users below editor role who have no organization'
+)]
+final class ListUsersWithoutOrganizationCommand extends Command
+{
+    public function __construct(
+        private readonly UserRepository $userRepository,
+    ) {
+        parent::__construct();
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+
+        $editorOrAbove = [
+            UserRoles::ROLE_EDITOR->value,
+            UserRoles::ROLE_ADMIN->value,
+            UserRoles::ROLE_SUPER_ADMIN->value,
+        ];
+
+        $qb = $this->userRepository->createQueryBuilder('u')
+            ->leftJoin('u.organizations', 'o')
+            ->where('o.id IS NULL');
+
+        // Roles are stored as a JSON array in the database, so we use `LIKE` to checks if a role is in the array.
+        foreach ($editorOrAbove as $i => $role) {
+            $qb->andWhere("u.roles NOT LIKE :role{$i}")
+                ->setParameter("role{$i}", "%\"{$role}\"%");
+        }
+
+        $users = $qb->orderBy('u.name', 'ASC')
+            ->getQuery()
+            ->getResult();
+
+        if (0 === \count($users)) {
+            $io->success('No users found matching the criteria.');
+
+            return Command::SUCCESS;
+        }
+
+        $rows = array_map(fn ($user) => [
+            $user->getId(),
+            $user->getName(),
+            $user->getMail(),
+            implode(', ', $user->getRoles()),
+            $user->isEnabled() ? 'Yes' : 'No',
+        ], $users);
+
+        $io->table(
+            ['ID', 'Name', 'Email', 'Roles', 'Enabled'],
+            $rows,
+        );
+
+        $io->note(sprintf('Found %d user(s) without an organization who are not at least editor.', \count($users)));
+
+        return Command::SUCCESS;
+    }
+}

src/Controller/Admin/DashboardController.php

@@ -149,6 +149,8 @@ public function configureUserMenu(UserInterface $user): UserMenu
 
     public function configureAssets(): Assets
     {
-        return Assets::new()->addCssFile('/admin/styles/admin.css');
+        return Assets::new()
+            ->addCssFile('/admin/styles/admin.css')
+            ->addJsFile('/scripts/form-scroll-to-error.js');
     }
 }