IBX-11687: Fixed ContentTypeDomainMapper to not unset the default field value

src/lib/Repository/Mapper/ContentTypeDomainMapper.php

@@ -425,8 +425,9 @@ public function buildSPIFieldDefinitionFromUpdateStruct(
 
         $spiFieldDefinition->fieldTypeConstraints->validators = $validatorConfiguration;
         $spiFieldDefinition->fieldTypeConstraints->fieldSettings = $fieldSettings;
+        $defaultValue = $fieldDefinitionUpdateStruct->defaultValue ?? $fieldDefinition->defaultValue;
         $spiFieldDefinition->defaultValue = $fieldType->toPersistenceValue(
-            $fieldType->acceptValue($fieldDefinitionUpdateStruct->defaultValue)
+            $fieldType->acceptValue($defaultValue)
         );
 
         return $spiFieldDefinition;

tests/integration/Core/Repository/ContentTypeServiceTest.php

@@ -2440,6 +2440,30 @@ public function testUpdateFieldDefinitionWithEmptyStruct()
         );
     }
 
+    public function testUpdateFieldDefinitionPreservesDefaultValueWhenNotInUpdateStruct(): void
+    {
+        $repository = $this->getRepository();
+        $contentTypeService = $repository->getContentTypeService();
+
+        $contentTypeDraft = $this->createContentTypeDraft();
+        $fieldDefinition = $contentTypeDraft->getFieldDefinition('body');
+
+        self::assertNotNull($fieldDefinition);
+        self::assertNotNull($fieldDefinition->defaultValue);
+        self::assertSame(2, $fieldDefinition->position);
+
+        $updateStruct = $contentTypeService->newFieldDefinitionUpdateStruct();
+        $updateStruct->position = 100;
+
+        $contentTypeService->updateFieldDefinition($contentTypeDraft, $fieldDefinition, $updateStruct);
+        $contentTypeDraft = $contentTypeService->loadContentTypeDraft($contentTypeDraft->id);
+        $updatedFieldDefinition = $contentTypeDraft->getFieldDefinition('body');
+
+        self::assertNotNull($updatedFieldDefinition);
+        self::assertEquals($fieldDefinition->defaultValue, $updatedFieldDefinition->defaultValue);
+        self::assertSame(100, $updatedFieldDefinition->position);
+    }
+
     /**
      * Test for the updateFieldDefinition() method with already defined field identifier.
      *

tests/lib/Repository/Mapper/ContentTypeDomainMapperTest.php

@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\Core\Repository\Mapper;
+
+use Ibexa\Contracts\Core\FieldType\FieldType as FieldTypeInterface;
+use Ibexa\Contracts\Core\Persistence\Content\FieldValue;
+use Ibexa\Contracts\Core\Persistence\Content\Language\Handler as SPILanguageHandler;
+use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as SPITypeHandler;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionUpdateStruct;
+use Ibexa\Core\FieldType\FieldTypeRegistry;
+use Ibexa\Core\FieldType\TextLine\Value as TextLineValue;
+use Ibexa\Core\Repository\Mapper\ContentTypeDomainMapper;
+use Ibexa\Core\Repository\Values\ContentType\FieldDefinition;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @covers \Ibexa\Core\Repository\Mapper\ContentTypeDomainMapper
+ */
+final class ContentTypeDomainMapperTest extends TestCase
+{
+    private ContentTypeDomainMapper $mapper;
+
+    /** @var \Ibexa\Core\FieldType\FieldTypeRegistry&\PHPUnit\Framework\MockObject\MockObject */
+    private FieldTypeRegistry $fieldTypeRegistry;
+
+    protected function setUp(): void
+    {
+        $this->fieldTypeRegistry = $this->createMock(FieldTypeRegistry::class);
+
+        $this->mapper = new ContentTypeDomainMapper(
+            $this->createMock(SPITypeHandler::class),
+            $this->createMock(SPILanguageHandler::class),
+            $this->fieldTypeRegistry,
+        );
+    }
+
+    public function testBuildSPIFieldDefinitionFromUpdateStructPreservesDefaultValueWhenNotSet(): void
+    {
+        $existingDefaultValue = new TextLineValue('Foo');
+        $persistedValue = new FieldValue(['data' => 'Foo']);
+
+        $this->configureFieldTypeRegistry($existingDefaultValue, $persistedValue);
+
+        $updateStruct = new FieldDefinitionUpdateStruct();
+        $updateStruct->position = 100;
+
+        $spiFieldDefinition = $this->mapper->buildSPIFieldDefinitionFromUpdateStruct(
+            $updateStruct,
+            $this->buildFieldDefinition($existingDefaultValue),
+            'eng-GB'
+        );
+
+        self::assertSame($persistedValue, $spiFieldDefinition->defaultValue);
+        self::assertSame(100, $spiFieldDefinition->position);
+    }
+
+    public function testBuildSPIFieldDefinitionFromUpdateStructOverridesDefaultValueWhenExplicitlySet(): void
+    {
+        $newDefaultValue = new TextLineValue('Bar');
+        $persistedValue = new FieldValue(['data' => 'Bar']);
+
+        $this->configureFieldTypeRegistry($newDefaultValue, $persistedValue);
+
+        $updateStruct = new FieldDefinitionUpdateStruct();
+        $updateStruct->defaultValue = $newDefaultValue;
+
+        $spiFieldDefinition = $this->mapper->buildSPIFieldDefinitionFromUpdateStruct(
+            $updateStruct,
+            $this->buildFieldDefinition(new TextLineValue('Foo')),
+            'eng-GB'
+        );
+
+        self::assertSame($persistedValue, $spiFieldDefinition->defaultValue);
+    }
+
+    private function buildFieldDefinition(TextLineValue $defaultValue): FieldDefinition
+    {
+        return new FieldDefinition([
+            'id' => 1,
+            'identifier' => 'my_name',
+            'fieldTypeIdentifier' => 'ezstring',
+            'defaultValue' => $defaultValue,
+            'isTranslatable' => false,
+            'isRequired' => false,
+            'isInfoCollector' => false,
+            'isThumbnail' => false,
+            'isSearchable' => true,
+            'position' => 1,
+        ]);
+    }
+
+    private function configureFieldTypeRegistry(TextLineValue $expectedInput, FieldValue $persistedValue): void
+    {
+        $fieldType = $this->createMock(FieldTypeInterface::class);
+        $fieldType->method('validateValidatorConfiguration')->willReturn([]);
+        $fieldType->method('validateFieldSettings')->willReturn([]);
+        $fieldType->method('isSearchable')->willReturn(true);
+        $fieldType
+            ->expects(self::once())
+            ->method('acceptValue')
+            ->with($expectedInput)
+            ->willReturn($expectedInput);
+        $fieldType
+            ->expects(self::once())
+            ->method('toPersistenceValue')
+            ->with($expectedInput)
+            ->willReturn($persistedValue);
+
+        $this->fieldTypeRegistry->method('getFieldType')->with('ezstring')->willReturn($fieldType);
+    }
+}