Support external-id and edtf property types for faceted search

Fixes #276

Both external-id and edtf properties use StringValue internally, so the
DataValueTranslator already handles their values. The missing piece was
that these datatype IDs were not included in the match statements of
SearchIndexFieldsBuilder and ListFacetQueryBuilder, causing their facets
to be silently ignored.

With this change, both types are indexed as keywords and supported for
list facets. Range facets for edtf are not yet supported, as that would
require converting EDTF strings to dates at index time.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: JeroenDeDauw

src/Persistence/Search/Query/ListFacetQueryBuilder.php

@@ -36,7 +36,7 @@ public function buildQuery( FacetConfig $config, PropertyConstraints $constraint
 		}
 
 		return match ( $this->dataTypeLookup->getDataTypeIdForProperty( $config->propertyId ) ) {
-			'string' => $this->buildStringQuery( $name, $values ),
+			'string', 'external-id', 'edtf' => $this->buildStringQuery( $name, $values ),
 			'wikibase-item' => $this->buildStringQuery( $name, $values ),
 			'quantity' => $this->buildQuantityQuery( $name, $values ),
 			'time' => $this->buildTimeQuery( $name, $values ),

src/Persistence/Search/SearchIndexFieldsBuilder.php

@@ -53,7 +53,7 @@ private function getFieldTypeForPropertyId( PropertyId $propertyId ): ?string {
 	private function getFieldTypeForDataTypeId( string $dataTypeId ): ?string {
 		return match ( $dataTypeId ) {
 			'quantity' => SearchIndexField::INDEX_TYPE_NUMBER,
-			'string' => SearchIndexField::INDEX_TYPE_KEYWORD,
+			'string', 'external-id', 'edtf' => SearchIndexField::INDEX_TYPE_KEYWORD,
 			'time' => SearchIndexField::INDEX_TYPE_DATETIME,
 			'wikibase-item' => SearchIndexField::INDEX_TYPE_KEYWORD,
 			default => null

tests/phpunit/Persistence/Search/Query/ListFacetQueryBuilderTest.php

@@ -25,6 +25,8 @@ class ListFacetQueryBuilderTest extends TestCase {
 	private const STRING_PROPERTY = 'P200';
 	private const TIME_PROPERTY = 'P300';
 	private const ITEM_PROPERTY = 'P400';
+	private const EXTERNAL_ID_PROPERTY = 'P500';
+	private const EDTF_PROPERTY = 'P600';
 
 	public function testBuildsQueryForStringList(): void {
 		$query = $this->newFacetQueryBuilder()->buildQuery(
@@ -55,7 +57,9 @@ private function newDataTypeLookup(): InMemoryDataTypeLookup {
 			self::QUANTITY_PROPERTY => 'quantity',
 			self::STRING_PROPERTY => 'string',
 			self::TIME_PROPERTY => 'time',
-			self::ITEM_PROPERTY => 'wikibase-item'
+			self::ITEM_PROPERTY => 'wikibase-item',
+			self::EXTERNAL_ID_PROPERTY => 'external-id',
+			self::EDTF_PROPERTY => 'edtf'
 		];
 
 		foreach ( $types as $pId => $type ) {
@@ -169,6 +173,38 @@ public function testBuildsAnyValueQuery(): void {
 		);
 	}
 
+	public function testBuildsQueryForExternalIdList(): void {
+		$query = $this->newFacetQueryBuilder()->buildQuery(
+			$this->newListFacetConfig( self::EXTERNAL_ID_PROPERTY ),
+			new PropertyConstraints(
+				new NumericPropertyId( self::EXTERNAL_ID_PROPERTY ),
+				orSelectedValues: [ 'ID-001', 'ID-002' ]
+			)
+		);
+
+		$this->assertIsTermsQueryWithParams(
+			self::EXTERNAL_ID_PROPERTY,
+			[ 'ID-001', 'ID-002' ],
+			$query
+		);
+	}
+
+	public function testBuildsQueryForEdtfList(): void {
+		$query = $this->newFacetQueryBuilder()->buildQuery(
+			$this->newListFacetConfig( self::EDTF_PROPERTY ),
+			new PropertyConstraints(
+				new NumericPropertyId( self::EDTF_PROPERTY ),
+				orSelectedValues: [ '1850', '1920-03-15' ]
+			)
+		);
+
+		$this->assertIsTermsQueryWithParams(
+			self::EDTF_PROPERTY,
+			[ '1850', '1920-03-15' ],
+			$query
+		);
+	}
+
 	public function testBuildsNullQueryWhenListIsEmpty(): void {
 		$query = $this->newFacetQueryBuilder()->buildQuery(
 			$this->newListFacetConfig( self::STRING_PROPERTY ),

tests/phpunit/Persistence/Search/SearchIndexFieldsBuilderTest.php

@@ -66,7 +66,9 @@ private function newDataTypeLookup(): InMemoryDataTypeLookup {
 			'P100' => 'quantity',
 			'P200' => 'string',
 			'P300' => 'time',
-			'P400' => 'wikibase-item'
+			'P400' => 'wikibase-item',
+			'P500' => 'external-id',
+			'P600' => 'edtf'
 		];
 
 		foreach ( $types as $pId => $type ) {
@@ -132,6 +134,42 @@ private function newProperty( string $id, string $dataType ): Property {
 		return new Property( new NumericPropertyId( $id ), null, $dataType );
 	}
 
+	public function testCreatesKeywordFieldForExternalIdProperty(): void {
+		$builder = $this->newBuilder(
+			new Config(
+				itemTypeProperty: new NumericPropertyId( 'P1' ),
+				facets: new FacetConfigList(
+					$this->newFacetConfig( 'Q1', 'P500' )
+				)
+			)
+		);
+
+		$fields = $builder->createFieldObjects();
+
+		$this->assertEquals(
+			new AggregatableKeywordIndexField( 'wbfs_P500', SearchIndexField::INDEX_TYPE_KEYWORD, $this->cirrusSearch->getConfig() ),
+			$fields['wbfs_P500']
+		);
+	}
+
+	public function testCreatesKeywordFieldForEdtfProperty(): void {
+		$builder = $this->newBuilder(
+			new Config(
+				itemTypeProperty: new NumericPropertyId( 'P1' ),
+				facets: new FacetConfigList(
+					$this->newFacetConfig( 'Q1', 'P600' )
+				)
+			)
+		);
+
+		$fields = $builder->createFieldObjects();
+
+		$this->assertEquals(
+			new AggregatableKeywordIndexField( 'wbfs_P600', SearchIndexField::INDEX_TYPE_KEYWORD, $this->cirrusSearch->getConfig() ),
+			$fields['wbfs_P600']
+		);
+	}
+
 	public function testDoesNotReturnFieldsForMissingProperties(): void {
 		$builder = $this->newBuilder(
 			new Config(