GQL: Remove the type field from statement valueType

Bug: T404834
Change-Id: Ifd3dba4d8719323588ac87d62b778d574941a89b

Author: dima koushha

repo/WikibaseRepo.datatypes.php

@@ -307,10 +307,6 @@
 				return new ObjectType( [
 					'name' => 'StringValue',
 					'fields' => [
-						'type' => [
-							'type' => Type::nonNull( Type::string() ),
-							'resolve' => fn() => 'value',
-						],
 						'content' => [
 							'type' => Type::nonNull( Type::string() ),
 							'resolve' => fn( Value $v ) => $v->content->getValue(),
@@ -475,10 +471,6 @@
 				return new ObjectType( [
 					'name' => 'ItemValue',
 					'fields' => [
-						'type' => [
-							'type' => Type::nonNull( Type::string() ),
-							'resolve' => fn() => 'value',
-						],
 						'content' => [
 							'type' => Type::nonNull( new ObjectType( [
 								'name' => 'ValueItem',

repo/domains/reuse/src/Domain/Model/Value.php

@@ -3,31 +3,16 @@
 namespace Wikibase\Repo\Domains\Reuse\Domain\Model;
 
 use DataValues\DataValue;
-use InvalidArgumentException;
 
 /**
  * @license GPL-2.0-or-later
  */
 class Value {
 
-	public const TYPE_VALUE = 'value';
-	public const TYPE_NO_VALUE = 'novalue';
-	public const TYPE_SOME_VALUE = 'somevalue';
-
 	/**
-	 * @param string $valueType
 	 * @param DataValue|null $content Guaranteed to be non-null if value type is "value", always null otherwise.
 	 */
-	public function __construct( public readonly string $valueType, public readonly ?DataValue $content = null ) {
-		if ( !in_array( $valueType, [ self::TYPE_VALUE, self::TYPE_SOME_VALUE, self::TYPE_NO_VALUE ] ) ) {
-			throw new InvalidArgumentException( '$valueType must be one of "value", "somevalue", "novalue"' );
-		}
-		if ( $valueType === self::TYPE_VALUE && !$content ) {
-			throw new InvalidArgumentException( '$value must not be null if $valueType is "value"' );
-		}
-		if ( $valueType !== self::TYPE_VALUE && $content ) {
-			throw new InvalidArgumentException( "There must not be a value if \$valueType is '$valueType'" );
-		}
+	public function __construct( public readonly ?DataValue $content = null ) {
 	}
 
 }

repo/domains/reuse/src/Domain/Services/StatementReadModelConverter.php

@@ -64,7 +64,6 @@ private function convertSnakToPropertyValuePair( Snak $snak ): PropertyValuePair
 		return new PropertyValuePair(
 			new PredicateProperty( $snak->getPropertyId(), $dataType ),
 			new Value(
-				$snak->getType(),
 				$snak instanceof PropertyValueSnak ? $snak->getDataValue() : null
 			)
 		);

repo/domains/reuse/src/Infrastructure/GraphQL/Schema/Schema.php

@@ -131,7 +131,7 @@ private function statementType(): ObjectType {
 					'type' => Type::nonNull( $this->predicatePropertyType ),
 					'resolve' => fn( Statement $statement ) => $statement->property,
 				],
-				'value' => Type::nonNull( $this->valueType ),
+				'value' => $this->valueType,
 			],
 		] );
 	}

repo/domains/reuse/src/Infrastructure/GraphQL/Schema/ValueType.php

@@ -20,8 +20,8 @@ public function __construct() {
 		$config = [
 			'types' => array_values( $valueTypes ),
 			'resolveType' => fn( Value $v ) => $v->content != null && $v->content instanceof StringValue
-				? $valueTypes[ 'VT:string' ]
-				: $valueTypes[ 'PT:wikibase-item' ],
+					? $valueTypes[ 'VT:string' ]
+					: $valueTypes[ 'PT:wikibase-item' ],
 		];
 		parent::__construct( $config );
 	}

repo/domains/reuse/src/Infrastructure/GraphQL/schema.graphql

@@ -27,7 +27,7 @@ type Statement {
   rank: Rank!
   qualifiers(propertyId: String!): [PropertyValuePair]!
   property: PredicateProperty!
-  value: Value!
+  value: Value
 }
 
 enum Rank {
@@ -50,12 +50,10 @@ type PredicateProperty {
 union Value = StringValue | ItemValue
 
 type StringValue {
-  type: String!
   content: String!
 }
 
 type ItemValue {
-  type: String!
   content: ValueItem!
 }
 

repo/domains/reuse/tests/phpunit/Infrastructure/DataAccess/EntityLookupItemsBatchRetrieverTest.php

@@ -211,11 +211,6 @@ public function testGetItemWithStatementsWithValue(): void {
 			$statementWithStringValue[0]->id->getSerialization()
 		);
 
-		$this->assertSame(
-			'value',
-			$statementWithStringValue[0]->value->valueType
-		);
-
 		$this->assertSame(
 			'stringValue',
 			$statementWithStringValue[0]->value->content->getValue()
@@ -226,11 +221,6 @@ public function testGetItemWithStatementsWithValue(): void {
 			$statementWithItemValue[0]->id->getSerialization()
 		);
 
-		$this->assertSame(
-			'value',
-			$statementWithItemValue[0]->value->valueType
-		);
-
 		$this->assertSame(
 			$itemValueItemId,
 			$statementWithItemValue[0]->value->content->getEntityId()->getSerialization()

repo/domains/reuse/tests/phpunit/Infrastructure/GraphQL/GraphQLServiceTest.php

@@ -83,19 +83,21 @@ public function queryProvider(): Generator {
 		$sitelinkSiteId = self::ALLOWED_SITELINK_SITES[0];
 		$otherSiteId = self::ALLOWED_SITELINK_SITES[1];
 		$sitelinkTitle = 'Potato';
-		$statementPropertyId = 'P1';
+		$statementWithStringValuePropertyId = 'P1';
 		$qualifierPropertyId = 'P2';
-		$statement2PropertyId = 'P3';
+		$statementWithItemValuePropertyId = 'P3';
+		$statementWithNoValuePropertyId = 'P4';
+		$statementWithSomeValueValuePropertyId = 'P5';
 		$unusedPropertyId = 'P9999';
 		$qualifierStringValue = 'qualifierStringValue';
 		$statementStringValue = 'statementStringValue';
-		$statement = NewStatement::forProperty( ( $statementPropertyId ) )
+		$statementWithStringValue = NewStatement::forProperty( ( $statementWithStringValuePropertyId ) )
 			->withGuid( "$itemId\$bed933b7-4207-d679-7571-3630cfb49d7f" )
 			->withRank( 1 )
 			->withQualifier( new NumericPropertyId( $qualifierPropertyId ), new StringValue( $qualifierStringValue ) )
 			->withValue( $statementStringValue )
 			->build();
-		$statement2 = NewStatement::forProperty( ( $statement2PropertyId ) )
+		$statementWithItemValue = NewStatement::forProperty( ( $statementWithItemValuePropertyId ) )
 			->withGuid( "$itemId\$bed933b7-4207-d679-7571-3630cfb49d8f" )
 			->withValue( new ItemId( $itemValueItemId ) )
 			->build();
@@ -106,7 +108,7 @@ public function queryProvider(): Generator {
 		self::$sitelinkSite->setGlobalId( $sitelinkSiteId );
 
 		self::$statementProperty = new Property(
-			new NumericPropertyId( $statementPropertyId ),
+			new NumericPropertyId( $statementWithStringValuePropertyId ),
 			new Fingerprint( new TermList( [ new Term( 'en', 'statement prop' ) ] ) ),
 			'string',
 		);
@@ -121,8 +123,8 @@ public function queryProvider(): Generator {
 			->andDescription( 'en', $enDescription )
 			->andAliases( 'en', $enAliases )
 			->andSiteLink( $sitelinkSiteId, $sitelinkTitle )
-			->andStatement( $statement )
-			->andStatement( $statement2 )
+			->andStatement( $statementWithStringValue )
+			->andStatement( $statementWithItemValue )
 			->build();
 
 		$item2Id = 'Q321';
@@ -171,7 +173,7 @@ public function queryProvider(): Generator {
 		];
 		yield 'statement with id and rank' => [
 			"{ item(id: \"$itemId\") {
-				$statementPropertyId: statements(propertyId: \"$statementPropertyId\") {
+				$statementWithStringValuePropertyId: statements(propertyId: \"$statementWithStringValuePropertyId\") {
 					id
 					rank
 					property { id dataType }
@@ -181,12 +183,12 @@ public function queryProvider(): Generator {
 			[
 				'data' => [
 					'item' => [
-						$statementPropertyId => [
+						$statementWithStringValuePropertyId => [
 							[
-								'id' => $statement->getGuid(),
+								'id' => $statementWithStringValue->getGuid(),
 								'rank' => 'normal',
 								'property' => [
-									'id' => $statementPropertyId,
+									'id' => $statementWithStringValuePropertyId,
 									'dataType' => 'string',
 								],
 							],
@@ -198,10 +200,10 @@ public function queryProvider(): Generator {
 		];
 		yield 'statement with qualifier' => [
 			"{ item(id: \"$itemId\") {
-			 	statements(propertyId: \"$statementPropertyId\") {
+			 	statements(propertyId: \"$statementWithStringValuePropertyId\") {
 			 		$qualifierPropertyId: qualifiers(propertyId: \"$qualifierPropertyId\") {
 			 			property { id dataType } 
-			 			value { ...on StringValue { type content } }
+			 			value { ...on StringValue { content } }
 			 		}
 			 		$unusedPropertyId: qualifiers(propertyId: \"$unusedPropertyId\") {
 			 			property { id }
@@ -220,7 +222,6 @@ public function queryProvider(): Generator {
 											'dataType' => 'string',
 										],
 										'value' => [
-											'type' => 'value',
 											'content' => $qualifierStringValue,
 										],
 									],
@@ -234,28 +235,26 @@ public function queryProvider(): Generator {
 		];
 		yield 'statements with StringValue and ItemValue' => [
 			"{ item(id: \"$itemId\") {
-				$statementPropertyId: statements(propertyId: \"$statementPropertyId\") {
-					value { ...on StringValue{ type content } } 
+				$statementWithStringValuePropertyId: statements(propertyId: \"$statementWithStringValuePropertyId\") {
+					value { ...on StringValue{ content } } 
 				}
-				$statement2PropertyId: statements(propertyId: \"$statement2PropertyId\") {
-					value { ...on ItemValue{ type content { id } } }
+				$statementWithItemValuePropertyId: statements(propertyId: \"$statementWithItemValuePropertyId\") {
+					value { ...on ItemValue{ content { id } } }
 				}
 			} }",
 			[
 				'data' => [
 					'item' => [
-						$statementPropertyId => [
+						$statementWithStringValuePropertyId => [
 							[
 								'value' => [
-									'type' => 'value',
 									'content' => $statementStringValue,
 								],
 							],
 						],
-						$statement2PropertyId => [
+						$statementWithItemValuePropertyId => [
 							[
 								'value' => [
-									'type' => 'value',
 									'content' => [ 'id' => $itemValueItemId ],
 								],
 							],
@@ -266,7 +265,7 @@ public function queryProvider(): Generator {
 		];
 		yield 'labels of predicate properties' => [
 			"{ item(id: \"$itemId\") {
-				statements(propertyId: \"{$statementPropertyId}\") {
+				statements(propertyId: \"{$statementWithStringValuePropertyId}\") {
 					property {
 						label(languageCode: \"en\")
 					}