BUGFIX: Prevent exception in overview when ContentReleaseMetadata is not available

Author: Sebobo

Classes/BackendUi/Dto/ContentReleaseOverviewRow.php

@@ -14,7 +14,7 @@
 class ContentReleaseOverviewRow
 {
     private ContentReleaseIdentifier $contentReleaseIdentifier;
-    private ContentReleaseMetadata $metadata;
+    private ?ContentReleaseMetadata $metadata;
     private int $enumeratedDocumentNodesCount;
     private int $iterationsCount;
     private int $errorCount;
@@ -23,7 +23,7 @@ class ContentReleaseOverviewRow
     private bool $isActive;
     private float $releaseSize;
 
-    public function __construct(ContentReleaseIdentifier $contentReleaseIdentifier, ContentReleaseMetadata $metadata,
+    public function __construct(ContentReleaseIdentifier $contentReleaseIdentifier, ?ContentReleaseMetadata $metadata,
                                 int $enumeratedDocumentNodesCount, int $iterationsCount, int $errorCount,
                                 float $progress, int $renderedUrlCount, bool $isActive, float $releaseSize)
     {
@@ -38,73 +38,46 @@ public function __construct(ContentReleaseIdentifier $contentReleaseIdentifier,
         $this->releaseSize = $releaseSize;
     }
 
-    /**
-     * @return ContentReleaseMetadata
-     */
-    public function getMetadata(): ContentReleaseMetadata
+    public function getMetadata(): ?ContentReleaseMetadata
     {
         return $this->metadata;
     }
 
-    /**
-     * @return ContentReleaseIdentifier
-     */
     public function getContentReleaseIdentifier(): ContentReleaseIdentifier
     {
         return $this->contentReleaseIdentifier;
     }
 
-    /**
-     * @return int
-     */
     public function getEnumeratedDocumentNodesCount(): int
     {
         return $this->enumeratedDocumentNodesCount;
     }
 
-    /**
-     * @return int
-     */
     public function getIterationsCount(): int
     {
         return $this->iterationsCount;
     }
 
-    /**
-     * @return int
-     */
     public function getErrorCount(): int
     {
         return $this->errorCount;
     }
 
-    /**
-     * @return float
-     */
     public function getProgress(): float
     {
         return $this->progress;
     }
 
-    /**
-     * @return int
-     */
     public function getRenderedUrlCount(): int
     {
         return $this->renderedUrlCount;
     }
 
-    /**
-     * @return bool
-     */
     public function isActive(): bool
     {
         return $this->isActive;
     }
 
-    /**
-     * @return float
-     */
     public function getReleaseSize(): float
     {
         return $this->releaseSize;

Classes/Core/Domain/Dto/ContentReleaseBatchResult.php

@@ -3,6 +3,7 @@
 namespace Flowpack\DecoupledContentStore\Core\Domain\Dto;
 
 use Flowpack\DecoupledContentStore\Core\Domain\ValueObject\ContentReleaseIdentifier;
+use Flowpack\DecoupledContentStore\PrepareContentRelease\Dto\ContentReleaseMetadata;
 use Neos\Flow\Annotations as Flow;
 
 /**
@@ -20,15 +21,14 @@ private function __construct(array $results)
         $this->results = $results;
     }
 
-
     public static function createFromArray(array $in): self
     {
         return new self($in);
     }
 
     public function getResultForContentRelease(ContentReleaseIdentifier $contentReleaseIdentifier)
     {
-        return $this->results[$contentReleaseIdentifier->jsonSerialize()];
+        return $this->results[(string)$contentReleaseIdentifier] ?? null;
     }
 
-}
+}

Classes/PrepareContentRelease/Infrastructure/RedisContentReleaseService.php

@@ -104,7 +104,7 @@ public function fetchMetadataForContentReleases(RedisInstanceIdentifier $redisIn
             }
             $res = $redisPipeline->exec();
             foreach ($batchedReleaseIdentifiers as $i => $releaseIdentifier) {
-                $result[$releaseIdentifier->jsonSerialize()] = ContentReleaseMetadata::fromJsonString($res[$i], $releaseIdentifier);
+                $result[(string)$releaseIdentifier] = $res[$i] ? ContentReleaseMetadata::fromJsonString($res[$i], $releaseIdentifier) : null;
             }
         }
         return ContentReleaseBatchResult::createFromArray($result);