Merge "Search: Leave out "language":"qid" from matched results"

Author: jenkins-bot

repo/domains/search/specs/global/schema-parts.json

@@ -25,7 +25,7 @@
 			"text": { "type": "string" }
 		},
 		"additionalProperties": false,
-		"required": [ "type", "language", "text" ]
+		"required": [ "type", "text" ]
 	},
 	"SearchItemResult": {
 		"type": "object",

repo/domains/search/src/Infrastructure/DataAccess/InLabelSearchEngine.php

@@ -70,7 +70,9 @@ private function convertResult( string $resultClass ): callable {
 				: null,
 			new MatchedData(
 				$result->getMatchedTermType(),
-				$result->getMatchedTerm()->getLanguageCode(),
+				$result->getMatchedTerm()->getLanguageCode() === 'qid' ?
+					null :
+					$result->getMatchedTerm()->getLanguageCode(),
 				$result->getMatchedTerm()->getText()
 			)
 		);

repo/domains/search/src/RouteHandlers/SimpleItemSearchRouteHandler.php

@@ -93,11 +93,11 @@ private function formatResults( ItemSearchResults $results ): array {
 					'language' => $result->getDescription()->getLanguageCode(),
 					'value' => $result->getDescription()->getText(),
 				] : null,
-				'match' => [
+				'match' => array_filter( [
 					'type' => $result->getMatchedData()->getType(),
 					'language' => $result->getMatchedData()->getLanguageCode(),
 					'text' => $result->getMatchedData()->getText(),
-				],
+				] ),
 			],
 			iterator_to_array( $results )
 		);

repo/domains/search/src/RouteHandlers/SimplePropertySearchRouteHandler.php

@@ -93,11 +93,11 @@ private function formatResults( PropertySearchResults $results ): array {
 					'language' => $result->getDescription()->getLanguageCode(),
 					'value' => $result->getDescription()->getText(),
 				] : null,
-				'match' => [
+				'match' => array_filter( [
 					'type' => $result->getMatchedData()->getType(),
 					'language' => $result->getMatchedData()->getLanguageCode(),
 					'text' => $result->getMatchedData()->getText(),
-				],
+				] ),
 			],
 			iterator_to_array( $results )
 		);

repo/domains/search/tests/mocha/api-testing/SimpleItemSearchTest.js

@@ -139,6 +139,20 @@ describe( 'Simple item search', () => {
 			} ] );
 		} );
 
+		it( 'finds an item by Q-ID', async () => {
+			const response = await newSearchRequest( 'en', item1.id )
+				.assertValidRequest()
+				.makeRequest();
+
+			expect( response ).to.have.status( 200 );
+			assert.deepEqual( response.body.results, [ {
+				id: item1.id,
+				'display-label': { language: 'en', value: item1Label },
+				description: { language: 'en', value: item1Description },
+				match: { type: 'entityId', text: item1.id }
+			} ] );
+		} );
+
 		it( 'finds nothing if no items match', async () => {
 			const response = await newSearchRequest( 'en', utils.uniq( 40 ) )
 				.assertValidRequest()

repo/domains/search/tests/mocha/api-testing/SimplePropertySearchTest.js

@@ -126,6 +126,20 @@ describe( 'Simple property search', () => {
 			} ] );
 		} );
 
+		it( 'finds a property by P-ID', async () => {
+			const response = await newSearchRequest( 'en', property1.id )
+				.assertValidRequest()
+				.makeRequest();
+
+			expect( response ).to.have.status( 200 );
+			assert.deepEqual( response.body.results, [ {
+				id: property1.id,
+				'display-label': { language: 'en', value: property1.labels.en },
+				description: { language: 'en', value: property1.descriptions.en },
+				match: { type: 'entityId', text: property1.id }
+			} ] );
+		} );
+
 		it( 'finds nothing if no properties match', async () => {
 			const response = await newSearchRequest( 'en', utils.uniq( 40 ) )
 				.assertValidRequest()

repo/domains/search/tests/mocha/openapi-validation/SimpleItemSearchTest.js

@@ -20,9 +20,10 @@ function newSearchRequest( language, searchTerm ) {
 
 describe( 'Simple item search', () => {
 	const itemEnLabel = utils.title( 'english-label' );
+	let item;
 
 	before( async () => {
-		await createItem( { labels: { en: itemEnLabel } } );
+		item = await createItem( { labels: { en: itemEnLabel } } );
 
 		await wiki.runAllJobs();
 		await new Promise( ( resolve ) => {
@@ -50,6 +51,16 @@ describe( 'Simple item search', () => {
 		expect( response ).to.satisfyApiSchema;
 	} );
 
+	it( '200 - search response by ID (without language match)', async () => {
+		const response = await newSearchRequest( 'en', item.id )
+			.assertValidRequest()
+			.makeRequest();
+
+		expect( response ).to.have.status( 200 );
+		assert.lengthOf( response.body.results, 1 );
+		expect( response ).to.satisfyApiSchema;
+	} );
+
 	it( '400 - invalid language code', async () => {
 		const response = await newSearchRequest( 'not_a_valid_language', utils.uniq( 40 ) )
 			.assertInvalidRequest()

repo/domains/search/tests/mocha/openapi-validation/SimplePropertySearchTest.js

@@ -20,9 +20,10 @@ function newSearchRequest( language, searchTerm ) {
 
 describe( 'Simple property search', () => {
 	const propertyEnLabel = utils.title( 'english-label' );
+	let property;
 
 	before( async () => {
-		await createProperty( {
+		property = await createProperty( {
 			data_type: 'string',
 			labels: { en: propertyEnLabel }
 		} );
@@ -53,6 +54,16 @@ describe( 'Simple property search', () => {
 		expect( response ).to.satisfyApiSchema;
 	} );
 
+	it( '200 - search response by ID (without language match)', async () => {
+		const response = await newSearchRequest( 'en', property.id )
+			.assertValidRequest()
+			.makeRequest();
+
+		expect( response ).to.have.status( 200 );
+		assert.lengthOf( response.body.results, 1 );
+		expect( response ).to.satisfyApiSchema;
+	} );
+
 	it( '400 - invalid language code', async () => {
 		const response = await newSearchRequest( 'not_a_valid_language', utils.uniq( 40 ) )
 			.assertInvalidRequest()

repo/rest-api/src/openapi.json

@@ -33715,7 +33715,6 @@
                             "additionalProperties": false,
                             "required": [
                               "type",
-                              "language",
                               "text"
                             ]
                           }
@@ -33950,7 +33949,6 @@
                             "additionalProperties": false,
                             "required": [
                               "type",
-                              "language",
                               "text"
                             ]
                           }
@@ -43164,7 +43162,6 @@
                         "additionalProperties": false,
                         "required": [
                           "type",
-                          "language",
                           "text"
                         ]
                       }
@@ -43339,7 +43336,6 @@
                         "additionalProperties": false,
                         "required": [
                           "type",
-                          "language",
                           "text"
                         ]
                       }