Merge pull request #178 from wp-graphql/fix/177-taxonomy-field-not-handling-objects-properly

fix: Taxonomy field returns incorrect data if set to store objects instead of IDs

Author: jasonbahl

composer.lock

@@ -33,23 +33,35 @@ public static function register_field_type(): void {
 								$values = $value;
 							}
 
-							$ids = array_map(
-								static function ( $id ) {
-									return absint( $id );
-								},
-								$values
+							$ids = array_filter(
+								array_map(
+									static function ( $value ) {
+										$id = $value;
+										if ( is_array( $value ) && isset( $value['term_id'] ) ) {
+											$id = $value['term_id'];
+										}
+										if ( isset( $value->term_id ) ) {
+											$id = $value->term_id;
+										}
+
+										$id = absint( $id );
+										return ! empty( $id ) ? $id : null;
+									},
+									$values
+								) 
 							);
 
 							if ( empty( $ids ) ) {
 								return null;
 							}
 
 							// set the default ordering if not overridden by args input on the field
-							$args['where']['include'] = $ids;
+							$args['where']['include'] = array_values( $ids );
 							$args['where']['orderby'] = $args['where']['orderby'] ?? 'include';
 							$args['where']['order']   = $args['where']['order'] ?? 'ASC';
-
-							return ( new TermObjectConnectionResolver( $root, $args, $context, $info ) )->get_connection();
+							$args['first']            = count( $ids );
+							$resolver                 = new TermObjectConnectionResolver( $root, $args, $context, $info, 'any' );
+							return $resolver->get_connection();
 						},
 					];
 

src/FieldType/Taxonomy.php

@@ -393,5 +393,88 @@ interfaces {
 		wp_delete_term( $category_2_id, 'category' );
 	}
 
+	public function testTaxonomyFieldReturnsExpectedNodeWhenObjectIsSavedInsteadOfId() {
+
+		register_taxonomy( 'test_taxonomy', 'post', [
+			'show_in_graphql' => true,
+			'graphql_single_name' => 'TestCustomTaxonomy',
+			'graphql_plural_name' => 'TestCustomTaxonomies',
+		] );
+
+		$term_object = self::factory()->term->create_and_get( [
+			'taxonomy' => 'test_taxonomy',
+			'name' => 'Test Term',
+		] );
+
+		$field_key = $this->register_acf_field([
+			'type' => 'taxonomy',
+			'name' => 'taxonomy_field_test',
+			'show_in_graphql' => true,
+			'graphql_field_name' => 'testTaxonomyField',
+			'required' => 1,
+			'taxonomy' => 'category',
+			'add_term' => 0,
+			'save_terms' => 0,
+			'load_terms' => 0,
+			'return_format' => 'object',
+			'field_type' => 'select',
+			'multiple' => 0,
+			'bidirectonal' => 0,
+			'bidirectional_target' => [],
+		], [
+			'name' => 'Post Taxonomy Test',
+			'graphql_field_name' => 'TaxonomyFieldTest',
+			'location' => [
+				[
+					[
+						'param' => 'post_type',
+						'operator' => '==',
+						'value' => 'post',
+					]
+				]
+			],
+			'graphql_types' => [ 'Post' ],
+		]);
+
+		update_field( $field_key, $term_object->term_id, $this->published_post->ID );
+
+		$query = '
+		query GetPostAndTaxonomyField( $id: ID! ){
+		  post(id:$id idType:DATABASE_ID) {
+		    id
+		    title
+		      taxonomyFieldTest {
+		        testTaxonomyField {
+		          nodes {
+		            __typename
+		            databaseId
+		          }
+		        }
+		      }
+           }
+        }';
+
+		$variables = [
+			'id' => $this->published_post->ID,
+		];
+
+		$actual = $this->graphql([
+			'query'     => $query,
+			'variables' => $variables,
+		]);
+
+		self::assertQuerySuccessful( $actual, [
+			$this->expectedNode( 'post.taxonomyFieldTest.testTaxonomyField.nodes', [
+				'__typename' => 'TestCustomTaxonomy',
+				'databaseId' => $term_object->term_id,
+			], 0 ),
+		]);
+
+		// cleanup
+		wp_delete_term( $term_object->term_id, 'test_taxonomy' );
+		unregister_taxonomy( 'test_taxonomy' );
+
+	}
+
 
 }