fix: External storage

ezsystems · Apr 4, 2024 · 2485639 · 2485639
1 parent aab5a45
commit 2485639
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/Mapper.php b/eZ/Publish/Core/Persistence/Legacy/Content/Mapper.php
@@ -57,6 +57,8 @@
  */
 class Mapper
 {
+    const EMPTY_FIELD_ID = -1;
+
     /**
      * FieldValue converter registry.
      *
@@ -76,14 +78,21 @@ class Mapper
      */
     private $contentTypeHandler;
 
+    /**
+     * @var StorageRegistry
+     */
+    private $storageRegistry;
+
     public function __construct(
         Registry $converterRegistry,
         LanguageHandler $languageHandler,
-        ContentTypeHandler $contentTypeHandler
+        ContentTypeHandler $contentTypeHandler,
+        StorageRegistry $storageRegistry
     ) {
         $this->converterRegistry = $converterRegistry;
         $this->languageHandler = $languageHandler;
         $this->contentTypeHandler = $contentTypeHandler;
+        $this->storageRegistry = $storageRegistry;
     }
 
     /**
@@ -310,10 +319,19 @@ private function buildContentObjects(
                 $missingVersionFieldDefinitions = $missingFieldDefinitions[$contentId][$versionId];
                 foreach ($missingVersionFieldDefinitions as $languageCode => $versionFieldDefinitions) {
                     foreach ($versionFieldDefinitions as $fieldDefinition) {
-                        $content->fields[] = $this->createEmptyField(
+                        $emptyField = $this->createEmptyField(
+                            $versionInfo,
                             $fieldDefinition,
                             $languageCode
                         );
+
+                        $externalStorage = $this->storageRegistry->getStorage($fieldDefinition->fieldType);
+                        if ($externalStorage->hasFieldData()) {
+                            $externalStorage->getFieldData($versionInfo, $emptyField, []);
+                        }
+
+                        $emptyField->id = null;
+                        $content->fields[] = $emptyField;
                     }
                 }
 
@@ -705,13 +723,15 @@ public function createRelationFromCreateStruct(RelationCreateStruct $struct)
         return $relation;
     }
 
-    private function createEmptyField(FieldDefinition $fieldDefinition, string $languageCode): Field
+    private function createEmptyField(VersionInfo $versionInfo, FieldDefinition $fieldDefinition, string $languageCode): Field
     {
         $field = new Field();
+        $field->id = self::EMPTY_FIELD_ID;
         $field->fieldDefinitionId = $fieldDefinition->id;
         $field->type = $fieldDefinition->fieldType;
         $field->value = $this->getDefaultValue($fieldDefinition);
         $field->languageCode = $languageCode;
+        $field->versionNo = $versionInfo->versionNo;
 
         return $field;
     }

diff --git a/eZ/Publish/Core/settings/storage_engines/legacy/content.yml b/eZ/Publish/Core/settings/storage_engines/legacy/content.yml
@@ -10,6 +10,7 @@ services:
             - "@ezpublish.persistence.legacy.field_value_converter.registry"
             - "@ezpublish.spi.persistence.legacy.language.handler"
             - '@ezpublish.spi.persistence.legacy.content_type.handler'
+            - "@ezpublish.persistence.external_storage_registry"
 
     ezpublish.persistence.legacy.content.gateway.inner:
         class: eZ\Publish\Core\Persistence\Legacy\Content\Gateway\DoctrineDatabase