GQL: Enable fetch statements with valueType

dima koushha · dima koushha · commit dbdabf2d6229 · 2025-10-22T12:24:37.000+02:00
Bug: T404834 Change-Id: I36d64315732925d7c83fe2301e2b96deda2a5819
diff --git a/repo/domains/reuse/src/Domain/Model/PropertyValuePair.php b/repo/domains/reuse/src/Domain/Model/PropertyValuePair.php
@@ -7,7 +7,11 @@
  */
 class PropertyValuePair {
 
-	public function __construct( public readonly PredicateProperty $property, public readonly Value $value ) {
+	public function __construct(
+		public readonly PredicateProperty $property,
+		public readonly ?Value $value,
+		public readonly ValueType $valueType,
+	) {
 	}
 
 }
diff --git a/repo/domains/reuse/src/Domain/Model/Rank.php b/repo/domains/reuse/src/Domain/Model/Rank.php
@@ -7,7 +7,8 @@
 
 /**
  * @license GPL-2.0-or-later
- */class Rank {
+ */
+class Rank {
 
 	private const RANKS = [
 		StatementWriteModel::RANK_DEPRECATED,
diff --git a/repo/domains/reuse/src/Domain/Model/Statement.php b/repo/domains/reuse/src/Domain/Model/Statement.php
@@ -14,7 +14,8 @@ public function __construct(
 		public readonly Rank $rank,
 		public readonly Qualifiers $qualifiers,
 		public readonly PredicateProperty $property,
-		public readonly Value $value
+		public readonly ?Value $value,
+		public readonly ValueType $valueType
 	) {
 	}
 
diff --git a/repo/domains/reuse/src/Domain/Model/Value.php b/repo/domains/reuse/src/Domain/Model/Value.php
@@ -9,10 +9,7 @@
  */
 class Value {
 
-	/**
-	 * @param DataValue|null $content Guaranteed to be non-null if value type is "value", always null otherwise.
-	 */
-	public function __construct( public readonly ?DataValue $content = null ) {
+	public function __construct( public readonly DataValue $content ) {
 	}
 
 }
diff --git a/repo/domains/reuse/src/Domain/Model/ValueType.php b/repo/domains/reuse/src/Domain/Model/ValueType.php
@@ -0,0 +1,25 @@
+<?php declare( strict_types=1 );
+
+namespace Wikibase\Repo\Domains\Reuse\Domain\Model;
+
+use InvalidArgumentException;
+
+/**
+ * @license GPL-2.0-or-later
+ */
+enum ValueType: string {
+	case TYPE_VALUE = 'value';
+	case TYPE_NO_VALUE = 'novalue';
+	case TYPE_SOME_VALUE = 'somevalue';
+
+	public static function fromString( string $type ): self {
+		return match ( $type ) {
+			self::TYPE_VALUE->value => self::TYPE_VALUE,
+			self::TYPE_SOME_VALUE->value => self::TYPE_SOME_VALUE,
+			self::TYPE_NO_VALUE->value => self::TYPE_NO_VALUE,
+			default => throw new InvalidArgumentException(
+				'valueType must be one of "value", "somevalue", "novalue"'
+			),
+		};
+	}
+}
diff --git a/repo/domains/reuse/src/Domain/Services/StatementReadModelConverter.php b/repo/domains/reuse/src/Domain/Services/StatementReadModelConverter.php
@@ -16,6 +16,7 @@
 use Wikibase\Repo\Domains\Reuse\Domain\Model\Rank;
 use Wikibase\Repo\Domains\Reuse\Domain\Model\Statement;
 use Wikibase\Repo\Domains\Reuse\Domain\Model\Value;
+use Wikibase\Repo\Domains\Reuse\Domain\Model\ValueType;
 
 /**
  * @license GPL-2.0-or-later
@@ -42,6 +43,7 @@ public function convert( StatementWriteModel $inputStatement ): Statement {
 			$this->convertQualifiers( $inputStatement->getQualifiers() ),
 			$mainPropertyValuePair->property,
 			$mainPropertyValuePair->value,
+			ValueType::fromString( $inputStatement->getMainSnak()->getType() ),
 		);
 	}
 
@@ -63,9 +65,8 @@ private function convertSnakToPropertyValuePair( Snak $snak ): PropertyValuePair
 
 		return new PropertyValuePair(
 			new PredicateProperty( $snak->getPropertyId(), $dataType ),
-			new Value(
-				$snak instanceof PropertyValueSnak ? $snak->getDataValue() : null
-			)
+			$snak instanceof PropertyValueSnak ? new Value( $snak->getDataValue() ) : null,
+			ValueType::fromString( $snak->getType() ),
 		);
 	}
 
diff --git a/repo/domains/reuse/src/Infrastructure/GraphQL/Schema/PropertyValuePairType.php b/repo/domains/reuse/src/Infrastructure/GraphQL/Schema/PropertyValuePairType.php
@@ -11,17 +11,25 @@
  */
 class PropertyValuePairType extends ObjectType {
 
-	public function __construct( PredicatePropertyType $predicateType, ValueType $valueType ) {
+	public function __construct(
+		PredicatePropertyType $predicateType,
+		ValueType $valueType,
+		ValueTypeType $valueTypeType
+	) {
 		$config = [
 			'fields' => [
 				'property' => [
 					'type' => Type::nonNull( $predicateType ),
 					'resolve' => fn( PropertyValuePair $rootValue ) => $rootValue->property,
 				],
 				'value' => [
-					'type' => Type::nonNull( $valueType ),
+					'type' => $valueType,
 					'resolve' => fn( PropertyValuePair $rootValue ) => $rootValue->value,
 				],
+				'valueType' => [
+					'type' => Type::nonNull( $valueTypeType ),
+					'resolve' => fn( PropertyValuePair $rootValue ) => $rootValue->valueType,
+				],
 			],
 		];
 		parent::__construct( $config );
diff --git a/repo/domains/reuse/src/Infrastructure/GraphQL/Schema/Schema.php b/repo/domains/reuse/src/Infrastructure/GraphQL/Schema/Schema.php
@@ -24,6 +24,7 @@ public function __construct(
 		private readonly PredicatePropertyType $predicatePropertyType,
 		private readonly PropertyValuePairType $propertyValuePairType,
 		private readonly ValueType $valueType,
+		private readonly ValueTypeType $valueTypeType,
 	) {
 		parent::__construct( [
 			'query' => new ObjectType( [
@@ -132,6 +133,10 @@ private function statementType(): ObjectType {
 					'resolve' => fn( Statement $statement ) => $statement->property,
 				],
 				'value' => $this->valueType,
+				'valueType' => [
+					'type' => Type::nonNull( $this->valueTypeType ),
+					'resolve' => fn( Statement $statement ) => $statement->valueType,
+				],
 			],
 		] );
 	}
diff --git a/repo/domains/reuse/src/Infrastructure/GraphQL/Schema/ValueType.php b/repo/domains/reuse/src/Infrastructure/GraphQL/Schema/ValueType.php
@@ -19,7 +19,7 @@ public function __construct() {
 		);
 		$config = [
 			'types' => array_values( $valueTypes ),
-			'resolveType' => fn( Value $v ) => $v->content != null && $v->content instanceof StringValue
+			'resolveType' => fn( Value $v ) => $v->content instanceof StringValue
 					? $valueTypes[ 'VT:string' ]
 					: $valueTypes[ 'PT:wikibase-item' ],
 		];
diff --git a/repo/domains/reuse/src/Infrastructure/GraphQL/Schema/ValueTypeType.php b/repo/domains/reuse/src/Infrastructure/GraphQL/Schema/ValueTypeType.php
@@ -0,0 +1,31 @@
+<?php declare( strict_types=1 );
+
+namespace Wikibase\Repo\Domains\Reuse\Infrastructure\GraphQL\Schema;
+
+use GraphQL\Type\Definition\EnumType;
+use Wikibase\Repo\Domains\Reuse\Domain\Model\ValueType;
+
+/**
+ * @license GPL-2.0-or-later
+ */
+class ValueTypeType extends EnumType {
+
+	public function __construct() {
+		$config = [
+			'name' => 'ValueType',
+			'values' => [
+				'novalue' => [
+					'value' => ValueType::TYPE_NO_VALUE,
+				],
+				'somevalue' => [
+					'value' => ValueType::TYPE_SOME_VALUE,
+				],
+				'value' => [
+					'value' => ValueType::TYPE_VALUE,
+				],
+			],
+		];
+		parent::__construct( $config );
+	}
+
+}
diff --git a/repo/domains/reuse/src/Infrastructure/GraphQL/schema.graphql b/repo/domains/reuse/src/Infrastructure/GraphQL/schema.graphql
@@ -28,6 +28,7 @@ type Statement {
   qualifiers(propertyId: String!): [PropertyValuePair]!
   property: PredicateProperty!
   value: Value
+  valueType: ValueType!
 }
 
 enum Rank {
@@ -38,7 +39,8 @@ enum Rank {
 
 type PropertyValuePair {
   property: PredicateProperty!
-  value: Value!
+  value: Value
+  valueType: ValueType!
 }
 
 type PredicateProperty {
@@ -60,3 +62,9 @@ type ItemValue {
 type ValueItem {
   id: String!
 }
+
+enum ValueType {
+  novalue
+  somevalue
+  value
+}
diff --git a/repo/domains/reuse/src/WbReuse.ServiceWiring.php b/repo/domains/reuse/src/WbReuse.ServiceWiring.php
@@ -16,6 +16,7 @@
 use Wikibase\Repo\Domains\Reuse\Infrastructure\GraphQL\Schema\Schema;
 use Wikibase\Repo\Domains\Reuse\Infrastructure\GraphQL\Schema\SiteIdType;
 use Wikibase\Repo\Domains\Reuse\Infrastructure\GraphQL\Schema\ValueType;
+use Wikibase\Repo\Domains\Reuse\Infrastructure\GraphQL\Schema\ValueTypeType;
 use Wikibase\Repo\Domains\Reuse\WbReuse;
 use Wikibase\Repo\WikibaseRepo;
 
@@ -32,6 +33,7 @@
 			$languageCodeType,
 		);
 		$valueType = new ValueType();
+		$valueTypeType = new ValueTypeType();
 
 		return new Schema(
 			new ItemResolver(
@@ -51,8 +53,9 @@
 			),
 			$languageCodeType,
 			$predicatePropertyType,
-			new PropertyValuePairType( $predicatePropertyType, $valueType ),
-			$valueType
+			new PropertyValuePairType( $predicatePropertyType, $valueType, $valueTypeType ),
+			$valueType,
+			$valueTypeType
 		);
 	},
 	'WbReuse.GraphQLService' => function( MediaWikiServices $services ): GraphQLService {
diff --git a/repo/domains/reuse/tests/phpunit/Infrastructure/DataAccess/EntityLookupItemsBatchRetrieverTest.php b/repo/domains/reuse/tests/phpunit/Infrastructure/DataAccess/EntityLookupItemsBatchRetrieverTest.php
@@ -154,7 +154,6 @@ public function testGetItemsWithStatements(): void {
 			$statements[0]->property->dataType
 		);
 
-		// Include the value in the qualifier during property value implementation.
 		$qualifiers = $statements[0]->qualifiers->getQualifiersByPropertyId( $item1StatementQualifierPropertyId );
 		$this->assertCount( 1, $qualifiers );
 
@@ -163,6 +162,16 @@ public function testGetItemsWithStatements(): void {
 			$qualifiers[0]->property->id
 		);
 
+		$this->assertSame(
+			'stringValue',
+			$qualifiers[0]->value->content->getValue()
+		);
+
+		$this->assertSame(
+			'value',
+			$qualifiers[0]->valueType->value
+		);
+
 		$this->assertEquals( $this->item2Id, $batch->getItem( $this->item2Id )->id );
 		$this->assertNull( $batch->getItem( $this->deletedItem ) );
 	}
@@ -216,6 +225,11 @@ public function testGetItemWithStatementsWithValue(): void {
 			$statementWithStringValue[0]->value->content->getValue()
 		);
 
+		$this->assertSame(
+			'value',
+			$statementWithStringValue[0]->valueType->value
+		);
+
 		$this->assertSame(
 			$item1Statement2->getGuid(),
 			$statementWithItemValue[0]->id->getSerialization()
@@ -225,6 +239,11 @@ public function testGetItemWithStatementsWithValue(): void {
 			$itemValueItemId,
 			$statementWithItemValue[0]->value->content->getEntityId()->getSerialization()
 		);
+
+		$this->assertSame(
+			'value',
+			$statementWithItemValue[0]->valueType->value
+		);
 	}
 
 	private function newRetriever(
diff --git a/repo/domains/reuse/tests/phpunit/Infrastructure/GraphQL/GraphQLServiceTest.php b/repo/domains/reuse/tests/phpunit/Infrastructure/GraphQL/GraphQLServiceTest.php
@@ -87,7 +87,7 @@ public function queryProvider(): Generator {
 		$qualifierPropertyId = 'P2';
 		$statementWithItemValuePropertyId = 'P3';
 		$statementWithNoValuePropertyId = 'P4';
-		$statementWithSomeValueValuePropertyId = 'P5';
+		$statementWithSomeValuePropertyId = 'P5';
 		$unusedPropertyId = 'P9999';
 		$qualifierStringValue = 'qualifierStringValue';
 		$statementStringValue = 'statementStringValue';
@@ -102,6 +102,13 @@ public function queryProvider(): Generator {
 			->withValue( new ItemId( $itemValueItemId ) )
 			->build();
 
+		$statementWithNoValue = NewStatement::noValueFor( ( $statementWithNoValuePropertyId ) )
+			->withGuid( "$itemId\$bed933b7-4207-d679-7571-3630cfb49d9f" )
+			->build();
+		$statementWithSomeValue = NewStatement::someValueFor( ( $statementWithSomeValuePropertyId ) )
+			->withGuid( "$itemId\$bed933b7-4207-d679-7571-3630cfb49d6f" )
+			->build();
+
 		self::$sitelinkSite = new MediaWikiSite();
 		self::$sitelinkSite->setLinkPath( 'https://wiki.example/wiki/$1' );
 		$expectedSitelinkUrl = "https://wiki.example/wiki/$sitelinkTitle";
@@ -125,6 +132,8 @@ public function queryProvider(): Generator {
 			->andSiteLink( $sitelinkSiteId, $sitelinkTitle )
 			->andStatement( $statementWithStringValue )
 			->andStatement( $statementWithItemValue )
+			->andStatement( $statementWithNoValue )
+			->andStatement( $statementWithSomeValue )
 			->build();
 
 		$item2Id = 'Q321';
@@ -204,6 +213,7 @@ public function queryProvider(): Generator {
 			 		$qualifierPropertyId: qualifiers(propertyId: \"$qualifierPropertyId\") {
 			 			property { id dataType } 
 			 			value { ...on StringValue { content } }
+			 			valueType
 			 		}
 			 		$unusedPropertyId: qualifiers(propertyId: \"$unusedPropertyId\") {
 			 			property { id }
@@ -224,6 +234,7 @@ public function queryProvider(): Generator {
 										'value' => [
 											'content' => $qualifierStringValue,
 										],
+										'valueType' => 'value',
 									],
 								],
 								$unusedPropertyId => [],
@@ -237,9 +248,11 @@ public function queryProvider(): Generator {
 			"{ item(id: \"$itemId\") {
 				$statementWithStringValuePropertyId: statements(propertyId: \"$statementWithStringValuePropertyId\") {
 					value { ...on StringValue{ content } } 
+					valueType
 				}
 				$statementWithItemValuePropertyId: statements(propertyId: \"$statementWithItemValuePropertyId\") {
-					value { ...on ItemValue{ content { id } } }
+					value { ...on ItemValue{ content { id } } } 
+					valueType
 				}
 			} }",
 			[
@@ -250,13 +263,43 @@ public function queryProvider(): Generator {
 								'value' => [
 									'content' => $statementStringValue,
 								],
+								'valueType' => 'value',
 							],
 						],
 						$statementWithItemValuePropertyId => [
 							[
 								'value' => [
 									'content' => [ 'id' => $itemValueItemId ],
 								],
+								'valueType' => 'value',
+							],
+						],
+					],
+				],
+			],
+		];
+		yield 'statements with novalue and somevalue' => [
+			"{ item(id: \"$itemId\") {
+				$statementWithSomeValuePropertyId: statements(propertyId: \"$statementWithSomeValuePropertyId\") {
+					value { ...on StringValue{ content } } 
+					valueType
+				}
+				$statementWithNoValuePropertyId: statements(propertyId: \"$statementWithNoValuePropertyId\") {
+					valueType
+				}
+			} }",
+			[
+				'data' => [
+					'item' => [
+						$statementWithSomeValuePropertyId => [
+							[
+								'value' => null,
+								'valueType' => 'somevalue',
+							],
+						],
+						$statementWithNoValuePropertyId => [
+							[
+								'valueType' => 'novalue',
 							],
 						],
 					],

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,11 @@`
`7`	`7`	`*/`
`8`	`8`	`class PropertyValuePair {`
`9`	`9`
`10`		`- public function __construct( public readonly PredicateProperty $property, public readonly Value $value ) {`
	`10`	`+ public function __construct(`
	`11`	`+ public readonly PredicateProperty $property,`
	`12`	`+ public readonly ?Value $value,`
	`13`	`+ public readonly ValueType $valueType,`
	`14`	`+ ) {`
`11`	`15`	`}`
`12`	`16`
`13`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ public function __construct(`
`14`	`14`	`public readonly Rank $rank,`
`15`	`15`	`public readonly Qualifiers $qualifiers,`
`16`	`16`	`public readonly PredicateProperty $property,`
`17`		`- public readonly Value $value`
	`17`	`+ public readonly ?Value $value,`
	`18`	`+ public readonly ValueType $valueType`
`18`	`19`	`) {`
`19`	`20`	`}`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,7 @@`
`9`	`9`	`*/`
`10`	`10`	`class Value {`
`11`	`11`
`12`		`- /**`
`13`		`- * @param DataValue\|null $content Guaranteed to be non-null if value type is "value", always null otherwise.`
`14`		`- */`
`15`		`- public function __construct( public readonly ?DataValue $content = null ) {`
	`12`	`+ public function __construct( public readonly DataValue $content ) {`
`16`	`13`	`}`
`17`	`14`
`18`	`15`	`}`