FEATURE Add timeable node visibility - Legacy Migration of node data

neos · Jan 9, 2024 · a1fff72 · a1fff72
1 parent f555f21
commit a1fff72
Show file tree

Hide file tree

Showing 3 changed files with 177 additions and 13 deletions.
diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php
@@ -461,31 +461,33 @@ private function dispatch(Severity $severity, string $message, mixed ...$args):
      */
     private function isNodeHidden(array $nodeDataRow): bool
     {
-        $now = new \DateTimeImmutable();
-
         // Already hidden
         if ($nodeDataRow['hidden']) {
             return true;
         }
 
+        $now = new \DateTimeImmutable();
+        $hiddenAfterDateTime = $nodeDataRow['hiddenafterdatetime'] ? new \DateTimeImmutable($nodeDataRow['hiddenafterdatetime']) : null;
+        $hiddenBeforeDateTime = $nodeDataRow['hiddenbeforedatetime'] ? new \DateTimeImmutable($nodeDataRow['hiddenbeforedatetime']) : null;
+
         // Hidden after a date time, without getting already re-enabled by hidden before date time - afterward
-        if ($nodeDataRow['hiddenafterdatetime'] != null
-            && $nodeDataRow['hiddenafterdatetime'] <= $now
+        if ($hiddenAfterDateTime != null
+            && $hiddenAfterDateTime < $now
             && (
-                $nodeDataRow['hiddenbeforedatetime'] == null
-                || $nodeDataRow['hiddenbeforedatetime'] > $now
-                || $nodeDataRow['hiddenbeforedatetime'] < $nodeDataRow['hiddenafterdatetime']
+                $hiddenBeforeDateTime == null
+                || $hiddenBeforeDateTime > $now
+                || $hiddenBeforeDateTime<= $hiddenAfterDateTime
             )
         ) {
             return true;
         }
 
         // Hidden before a date time, without getting enabled by hidden after date time - before
-        if ($nodeDataRow['hiddenbeforedatetime'] != null
-            && $nodeDataRow['hiddenbeforedatetime'] > $now
+        if ($hiddenBeforeDateTime != null
+            && $hiddenBeforeDateTime > $now
             && (
-                $nodeDataRow['hiddenafterdatetime'] == null
-                || $nodeDataRow['hiddenafterdatetime'] > $nodeDataRow['hiddenbeforedatetime']
+                $hiddenAfterDateTime == null
+                || $hiddenAfterDateTime > $hiddenBeforeDateTime
             )
         ) {
             return true;

diff --git a/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php
@@ -108,8 +108,8 @@ public function iHaveTheFollowingNodeDataRows(TableNode $nodeDataRows): void
                 'properties' => !empty($row['Properties']) ? $row['Properties'] : '{}',
                 'dimensionvalues' => !empty($row['Dimension Values']) ? $row['Dimension Values'] : '{}',
                 'hiddeninindex' => $row['Hidden in index'] ?? '0',
-                'hiddenbeforedatetime' => $row['Hidden before DateTime'] ?? null,
-                'hiddenafterdatetime' => $row['Hidden before DateTime'] ?? null,
+                'hiddenbeforedatetime' =>  !empty($row['Hidden before DateTime']) ? ($row['Hidden before DateTime']): null,
+                'hiddenafterdatetime' =>  !empty($row['Hidden after DateTime']) ? ($row['Hidden after DateTime']) : null,
                 'hidden' => $row['Hidden'] ?? '0',
             ];
         }, $nodeDataRows->getHash());