From b0cb5be93e2251856f4d5635557ee08b5ce411e9 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 13 Oct 2024 19:29:17 +0200
Subject: [PATCH] TASK: Introduce `ContentRepository::catchupProjections`

... and remove `CatchUpTriggerWithSynchronousOption` which is currently hardcoded to `true`
---
 .../RaceTrackerCatchUpHook.php                |  1 -
 .../Classes/ContentRepository.php             |  9 +++
 ...cessProjectionCatchUpCommandController.php | 37 ---------
 .../CatchUpTriggerWithSynchronousOption.php   | 79 -------------------
 .../SubprocessProjectionCatchUpTrigger.php    | 43 ----------
 ...processProjectionCatchUpTriggerFactory.php | 22 ------
 6 files changed, 9 insertions(+), 182 deletions(-)
 delete mode 100644 Neos.ContentRepositoryRegistry/Classes/Command/SubprocessProjectionCatchUpCommandController.php
 delete mode 100644 Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/CatchUpTriggerWithSynchronousOption.php
 delete mode 100644 Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/SubprocessProjectionCatchUpTrigger.php
 delete mode 100644 Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/SubprocessProjectionCatchUpTriggerFactory.php

diff --git a/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHook.php b/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHook.php
index 3309f99d17d..039156ef9da 100644
--- a/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHook.php
+++ b/Neos.ContentRepository.BehavioralTests/Classes/ProjectionRaceConditionTester/RaceTrackerCatchUpHook.php
@@ -18,7 +18,6 @@
 use Neos\ContentRepository\BehavioralTests\ProjectionRaceConditionTester\Dto\TraceEntryType;
 use Neos\ContentRepository\Core\EventStore\EventInterface;
 use Neos\ContentRepository\Core\Projection\CatchUpHookInterface;
-use Neos\ContentRepositoryRegistry\Factory\ProjectionCatchUpTrigger\SubprocessProjectionCatchUpTrigger;
 use Neos\EventStore\Model\EventEnvelope;
 use Neos\Flow\Annotations as Flow;
 
diff --git a/Neos.ContentRepository.Core/Classes/ContentRepository.php b/Neos.ContentRepository.Core/Classes/ContentRepository.php
index d1262979d40..66e68ced477 100644
--- a/Neos.ContentRepository.Core/Classes/ContentRepository.php
+++ b/Neos.ContentRepository.Core/Classes/ContentRepository.php
@@ -200,6 +200,15 @@ public function catchUpProjection(string $projectionClassName, CatchUpOptions $o
         $catchUpHook?->onAfterCatchUp();
     }
 
+    public function catchupProjections(): void
+    {
+        foreach ($this->projectionsAndCatchUpHooks->projections as $projection) {
+            // FIXME optimise by only loading required events once and not per projection
+            // see https://github.com/neos/neos-development-collection/pull/4988/
+            $this->catchUpProjection($projection::class, CatchUpOptions::create());
+        }
+    }
+
     public function setUp(): void
     {
         $this->eventStore->setup();
diff --git a/Neos.ContentRepositoryRegistry/Classes/Command/SubprocessProjectionCatchUpCommandController.php b/Neos.ContentRepositoryRegistry/Classes/Command/SubprocessProjectionCatchUpCommandController.php
deleted file mode 100644
index 6905c28646c..00000000000
--- a/Neos.ContentRepositoryRegistry/Classes/Command/SubprocessProjectionCatchUpCommandController.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Neos\ContentRepositoryRegistry\Command;
-
-use Neos\ContentRepository\Core\Projection\CatchUpOptions;
-use Neos\ContentRepository\Core\Projection\ProjectionInterface;
-use Neos\ContentRepository\Core\Projection\ProjectionStateInterface;
-use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
-use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
-use Neos\ContentRepositoryRegistry\Factory\ProjectionCatchUpTrigger\SubprocessProjectionCatchUpTrigger;
-use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Cli\CommandController;
-
-/**
- * See {@see SubprocessProjectionCatchUpTrigger} for the side calling this class
- * @internal
- */
-class SubprocessProjectionCatchUpCommandController extends CommandController
-{
-    /**
-     * @Flow\Inject
-     * @var ContentRepositoryRegistry
-     */
-    protected $contentRepositoryRegistry;
-
-    /**
-     * @param string $contentRepository Identifier of the content repository
-     * @param class-string<ProjectionInterface<ProjectionStateInterface>> $projectionClassName fully qualified class name of the projection to catch up
-     * @internal
-     */
-    public function catchupCommand(string $contentRepository, string $projectionClassName): void
-    {
-        $contentRepositoryInstance = $this->contentRepositoryRegistry->get(ContentRepositoryId::fromString($contentRepository));
-        $contentRepositoryInstance->catchUpProjection($projectionClassName, CatchUpOptions::create());
-    }
-}
diff --git a/Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/CatchUpTriggerWithSynchronousOption.php b/Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/CatchUpTriggerWithSynchronousOption.php
deleted file mode 100644
index d6b5342d1e9..00000000000
--- a/Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/CatchUpTriggerWithSynchronousOption.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Neos\ContentRepositoryRegistry\Factory\ProjectionCatchUpTrigger;
-
-use Neos\ContentRepository\Core\Projection\CatchUpOptions;
-use Neos\ContentRepository\Core\Projection\ProjectionCatchUpTriggerInterface;
-use Neos\ContentRepository\Core\Projection\Projections;
-use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
-use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
-use Neos\Flow\Annotations as Flow;
-
-/**
- * Pragmatic performance booster for some "batch" operations needed by the Neos UI.
- *
- * By calling {@see self::synchronously(\Closure)} in your code, all projection updates
- * run inside the synchronously closure will be executed **by YOUR process** (instead
- * of a separate process). This greatly speeds up performance for batch operations
- * like rebase.
- *
- * This will only work if you did not open a database transaction beforehand.
- *
- * We will hopefully get rid of this class at some point; by introducing a NodeAggregate
- * which will take care of constraint enforcement then.
- *
- * @deprecated remove me https://github.com/neos/neos-development-collection/pull/4988
- * @internal
- */
-class CatchUpTriggerWithSynchronousOption implements ProjectionCatchUpTriggerInterface
-{
-    /**
-     * @Flow\Inject
-     * @var ContentRepositoryRegistry
-     */
-    protected $contentRepositoryRegistry;
-
-    /**
-     * Hack by setting to true to be always sync mode: https://github.com/neos/neos-development-collection/pull/4988
-     */
-    private static bool $synchronousEnabled = true;
-
-    /**
-     * INTERNAL
-     */
-    public static function enableSynchronicityForSpeedingUpTesting(): void
-    {
-        self::$synchronousEnabled = true;
-    }
-
-    public static function synchronously(\Closure $fn): void
-    {
-        $previousValue = self::$synchronousEnabled;
-        self::$synchronousEnabled = true;
-        try {
-            $fn();
-        } finally {
-            self::$synchronousEnabled = $previousValue;
-        }
-    }
-
-    public function __construct(
-        private readonly ContentRepositoryId $contentRepositoryId,
-        private readonly SubprocessProjectionCatchUpTrigger $inner
-    ) {
-    }
-
-    public function triggerCatchUp(Projections $projections): void
-    {
-        if (self::$synchronousEnabled) {
-            $contentRepository = $this->contentRepositoryRegistry->get($this->contentRepositoryId);
-            foreach ($projections as $projection) {
-                $projectionClassName = get_class($projection);
-                $contentRepository->catchUpProjection($projectionClassName, CatchUpOptions::create());
-            }
-        } else {
-            $this->inner->triggerCatchUp($projections);
-        }
-    }
-}
diff --git a/Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/SubprocessProjectionCatchUpTrigger.php b/Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/SubprocessProjectionCatchUpTrigger.php
deleted file mode 100644
index f72541368a4..00000000000
--- a/Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/SubprocessProjectionCatchUpTrigger.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace Neos\ContentRepositoryRegistry\Factory\ProjectionCatchUpTrigger;
-
-use Neos\ContentRepository\Core\Projection\ProjectionCatchUpTriggerInterface;
-use Neos\ContentRepository\Core\Projection\Projections;
-use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
-use Neos\ContentRepositoryRegistry\Command\SubprocessProjectionCatchUpCommandController;
-use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Core\Booting\Scripts;
-
-/**
- * See {@see SubprocessProjectionCatchUpCommandController} for the inner part
- */
-class SubprocessProjectionCatchUpTrigger implements ProjectionCatchUpTriggerInterface
-{
-    /**
-     * @Flow\InjectConfiguration(package="Neos.Flow")
-     * @var array<string, mixed>
-     */
-    protected $flowSettings;
-
-    public function __construct(
-        private readonly ContentRepositoryId $contentRepositoryId
-    ) {
-    }
-
-    public function triggerCatchUp(Projections $projections): void
-    {
-        // modelled after https://github.com/neos/Neos.EventSourcing/blob/master/Classes/EventPublisher/JobQueueEventPublisher.php#L103
-        // and https://github.com/Flowpack/jobqueue-common/blob/master/Classes/Queue/FakeQueue.php
-        foreach ($projections as $projection) {
-            Scripts::executeCommandAsync(
-                'neos.contentrepositoryregistry:subprocessprojectioncatchup:catchup',
-                $this->flowSettings,
-                [
-                    'contentRepositoryIdentifier' => $this->contentRepositoryId->value,
-                    'projectionClassName' => get_class($projection)
-                ]
-            );
-        }
-    }
-}
diff --git a/Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/SubprocessProjectionCatchUpTriggerFactory.php b/Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/SubprocessProjectionCatchUpTriggerFactory.php
deleted file mode 100644
index 8695f517d82..00000000000
--- a/Neos.ContentRepositoryRegistry/Classes/Factory/ProjectionCatchUpTrigger/SubprocessProjectionCatchUpTriggerFactory.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace Neos\ContentRepositoryRegistry\Factory\ProjectionCatchUpTrigger;
-
-use Neos\ContentRepository\Core\Projection\ProjectionCatchUpTriggerInterface;
-use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
-use Neos\ContentRepositoryRegistry\Command\SubprocessProjectionCatchUpCommandController;
-
-/**
- * See {@see SubprocessProjectionCatchUpCommandController} for the inner part
- */
-class SubprocessProjectionCatchUpTriggerFactory implements ProjectionCatchUpTriggerFactoryInterface
-{
-    /** @param array<string, mixed> $options */
-    public function build(ContentRepositoryId $contentRepositoryId, array $options): ProjectionCatchUpTriggerInterface
-    {
-        return new CatchUpTriggerWithSynchronousOption(
-            $contentRepositoryId,
-            new SubprocessProjectionCatchUpTrigger($contentRepositoryId)
-        );
-    }
-}