Oprava změny kapacity na neomezenou, zobrazení času přihlášení (#790)

Author: jan-stanek

app/AdminModule/ProgramModule/Components/ProgramAttendeesGridControl.php

@@ -18,10 +18,13 @@
 use App\Model\Settings\Settings;
 use App\Model\User\Commands\RegisterProgram;
 use App\Model\User\Commands\UnregisterProgram;
+use App\Model\User\Queries\UserRegisteredProgramAtQuery;
 use App\Model\User\Repositories\UserRepository;
 use App\Model\User\User;
 use App\Services\CommandBus;
 use App\Services\ISettingsService;
+use App\Services\QueryBus;
+use App\Utils\Helpers;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Nette\Application\AbortException;
@@ -56,6 +59,8 @@ class ProgramAttendeesGridControl extends Control
 
     private CommandBus $commandBus;
 
+    private QueryBus $queryBus;
+
     private ISettingsService $settingsService;
 
     private EntityManagerInterface $em;
@@ -66,13 +71,15 @@ public function __construct(
         UserRepository $userRepository,
         Session $session,
         CommandBus $commandBus,
+        QueryBus $queryBus,
         ISettingsService $settingsService,
         EntityManagerInterface $em
     ) {
         $this->translator        = $translator;
         $this->programRepository = $programRepository;
         $this->userRepository    = $userRepository;
         $this->commandBus        = $commandBus;
+        $this->queryBus          = $queryBus;
         $this->settingsService   = $settingsService;
         $this->em                = $em;
 
@@ -125,7 +132,7 @@ public function createComponentProgramAttendeesGrid(string $name): void
             $grid->addColumnText('displayName', 'admin.program.blocks.attendees.column.name')
                 ->setFilterText();
 
-            $grid->addColumnText('attends', 'admin.program.blocks.attendees.column.attends', 'pa')
+            $grid->addColumnText('attends', 'admin.program.blocks.attendees.column.attends')
                 ->setRenderer(function (User $user) {
                     return $user->isAttendee($this->program)
                         ? $this->translator->translate('admin.common.yes')
@@ -143,7 +150,7 @@ public function createComponentProgramAttendeesGrid(string $name): void
                 })
                 ->setTranslateOptions();
 
-            $grid->addColumnText('alternates', 'admin.program.blocks.attendees.column.alternates', 'pa')
+            $grid->addColumnText('alternates', 'admin.program.blocks.attendees.column.alternates')
                 ->setRenderer(function (User $user) {
                     return $user->isAlternate($this->program)
                         ? $this->translator->translate('admin.common.yes')
@@ -161,6 +168,13 @@ public function createComponentProgramAttendeesGrid(string $name): void
                 })
                 ->setTranslateOptions();
 
+            $grid->addColumnDateTime('registeredAt', 'admin.program.blocks.attendees.column.registered_at')
+                ->setRenderer(function (User $user) {
+                    $registeredAt = $this->queryBus->handle(new UserRegisteredProgramAtQuery($user, $this->program));
+
+                    return $registeredAt === null ? null : $registeredAt->format(Helpers::DATETIME_FORMAT);
+                });
+
             $grid->setDefaultFilter(['attends' => 'yes'], false);
 
             if ($user->isAllowed(SrsResource::USERS, Permission::MANAGE)) {

app/AdminModule/ProgramModule/Forms/BlockFormFactory.php

@@ -269,15 +269,18 @@ public function processForm(Form $form, stdClass $values): void
             $subevent = $this->subeventRepository->findImplicit();
         }
 
-        $category  = $values->category !== '' ? $this->categoryRepository->findById($values->category) : null;
-        $lectors   = $this->userRepository->findUsersByIds($values->lectors);
-        $capacity  = $values->capacity !== '' ? $values->capacity : null;
-        $mandatory = $values->mandatory ? ($values->autoRegistered ? ProgramMandatoryType::AUTO_REGISTERED : ProgramMandatoryType::MANDATORY) : ProgramMandatoryType::VOLUNTARY;
+        $category          = $values->category !== '' ? $this->categoryRepository->findById($values->category) : null;
+        $lectors           = $this->userRepository->findUsersByIds($values->lectors);
+        $capacity          = $values->capacity !== '' ? $values->capacity : null;
+        $alternatesAllowed = $capacity !== null && $values->alternatesAllowed;
+        $mandatory         = $values->mandatory
+            ? ($values->autoRegistered ? ProgramMandatoryType::AUTO_REGISTERED : ProgramMandatoryType::MANDATORY)
+            : ProgramMandatoryType::VOLUNTARY;
 
         $blockOld = null;
 
         if ($this->block === null) {
-            $this->block = new Block($values->name, $values->duration, $capacity, $values->alternatesAllowed, $mandatory);
+            $this->block = new Block($values->name, $values->duration, $capacity, $alternatesAllowed, $mandatory);
             $this->block->setSubevent($subevent);
             $this->block->setCategory($category);
             $this->block->setLectors($lectors);
@@ -293,7 +296,7 @@ public function processForm(Form $form, stdClass $values): void
             $this->block->setLectors($lectors);
             $this->block->setDuration($values->duration);
             $this->block->setCapacity($capacity);
-            $this->block->setAlternatesAllowed($values->alternatesAllowed);
+            $this->block->setAlternatesAllowed($alternatesAllowed);
             $this->block->setMandatory($mandatory);
             $this->block->setPerex($values->perex);
             $this->block->setDescription($values->description);

app/Model/Program/Events/Subscribers/BlockUpdatedEventListener.php

@@ -119,24 +119,13 @@ public function __invoke(BlockUpdatedEvent $event): void
                 }
             }
 
-            // odhlaseni nahradniku, pokud jsou nahradnici zakazani
-            if (! $alternatesAllowed && $alternatesAllowedOld) {
-                foreach ($block->getPrograms() as $program) {
-                    $programAlternates = $this->queryBus->handle(new ProgramAlternatesQuery($program));
-
-                    foreach ($programAlternates as $user) {
-                        $this->commandBus->handle(new UnregisterProgram($user, $program));
-                    }
-                }
-            }
-
-            // prihlaseni nahradniku na program, pokud se navysi kapacita
-            if ($alternatesAllowed && $capacity > $capacityOld) {
+            // prihlaseni nahradniku na program, pokud se navysi kapacita nebo se zmeni na neomezenou
+            if ($alternatesAllowedOld && ($capacity > $capacityOld || $capacity === null)) {
                 foreach ($block->getPrograms() as $program) {
                     $program = $em->getRepository(Program::class)->find($program->getId(), LockMode::PESSIMISTIC_WRITE);
                     assert($program instanceof Program);
 
-                    while ($program->getAttendeesCount() < $capacity) {
+                    while ($capacity === null || $program->getAttendeesCount() < $capacity) {
                         $user = $this->userRepository->findProgramFirstAlternate($program);
                         if ($user === null) {
                             break;
@@ -146,6 +135,17 @@ public function __invoke(BlockUpdatedEvent $event): void
                     }
                 }
             }
+
+            // odhlaseni nahradniku, pokud jsou nahradnici zakazani
+            if (! $alternatesAllowed && $alternatesAllowedOld) {
+                foreach ($block->getPrograms() as $program) {
+                    $programAlternates = $this->queryBus->handle(new ProgramAlternatesQuery($program));
+
+                    foreach ($programAlternates as $user) {
+                        $this->commandBus->handle(new UnregisterProgram($user, $program));
+                    }
+                }
+            }
         });
     }
 }

app/Model/User/Queries/Handlers/UserRegisteredProgramAtQueryHandler.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model\User\Queries\Handlers;
+
+use App\Model\Program\Repositories\ProgramApplicationRepository;
+use App\Model\User\Queries\UserRegisteredProgramAtQuery;
+use DateTimeImmutable;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+
+class UserRegisteredProgramAtQueryHandler implements MessageHandlerInterface
+{
+    private ProgramApplicationRepository $programApplicationRepository;
+
+    public function __construct(ProgramApplicationRepository $programApplicationRepository)
+    {
+        $this->programApplicationRepository = $programApplicationRepository;
+    }
+
+    public function __invoke(UserRegisteredProgramAtQuery $query): ?DateTimeImmutable
+    {
+        $programApplication = $this->programApplicationRepository->findByUserAndProgram($query->getUser(), $query->getProgram());
+
+        return $programApplication === null ? null : $programApplication->getCreatedAt();
+    }
+}

app/Model/User/Queries/UserRegisteredProgramAtQuery.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model\User\Queries;
+
+use App\Model\Program\Program;
+use App\Model\User\User;
+
+class UserRegisteredProgramAtQuery
+{
+    private User $user;
+
+    private Program $program;
+
+    public function __construct(User $user, Program $program)
+    {
+        $this->user    = $user;
+        $this->program = $program;
+    }
+
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+    public function getProgram(): Program
+    {
+        return $this->program;
+    }
+}

app/lang/admin.cs_CZ.neon

@@ -247,6 +247,7 @@ program:
                 name: "Jméno"
                 attends: "Účastník"
                 alternates: "Náhradník"
+                registered_at: "Čas přihlášení"
 
             action:
                 register: "Přihlásit"
@@ -371,7 +372,7 @@ users:
     users_fee_remaining: "Zbývá doplatit"
     users_payment_method: "Platební metoda"
     users_variable_symbol: "Variabilní symbol"
-    users_roles_application_date: "Datum přihlášení"
+    users_roles_application_date: "Čas přihlášení"
     users_last_payment_date: "Datum poslední platby"
     users_payment_date: "Zaplaceno dne"
     users_application_date: "Odeslání přihlášky"
@@ -423,7 +424,7 @@ users:
     users_edit_roles_occupied: "Všechna místa v některé roli jsou obsazena."
     users_edit_roles_nonregistered: "Roli \"Nepřihlášený\" není možné nastavit, použijte odhlášení ze semináře."
 
-    users_applications_application_date: "Datum přihlášky"
+    users_applications_application_date: "Čas přihlášení"
     users_applications_roles: "Role"
     users_applications_subevents: "Podakce"
     users_applications_subevents_empty: "Musí být vybrána alespoň jedna podakce."

tests/integration/Program/Commands/SaveBlockHandlerTest.php

@@ -456,6 +456,16 @@ public function testChangeCapacity(): void
         $this->assertEquals(2, $program2->getAttendeesCount());
         $this->assertEquals(1, $program2->getAlternatesCount());
 
+        $blockOld = clone $block;
+        $block->setCapacity(null);
+        $block->setAlternatesAllowed(false);
+        $this->commandBus->handle(new SaveBlock($block, $blockOld));
+
+        $this->assertEquals(2, $program1->getAttendeesCount());
+        $this->assertEquals(0, $program1->getAlternatesCount());
+        $this->assertEquals(3, $program2->getAttendeesCount());
+        $this->assertEquals(0, $program2->getAlternatesCount());
+
         $blockOld = clone $block;
         $block->setCapacity(1);