fix: add model classes to type configs to better support query analyzer ID tracking (#874)

* - remove several fields that are already registered by core when the post type is mapped to the schema

* devops: Tests updated and coupon "salt" restored

* chore: Linter & PHPStan compliance met

* chore: Linter & PHPStan compliance met

* devops: "self" replaced with "static" in cli tests

* chore: fix cleanup after rebasing

---------

Co-authored-by: Geoff Taylor <[email protected]>

Author: jasonbahl

codeception.dist.yml

@@ -67,6 +67,10 @@ modules:
     WPLoader:
       wpRootFolder: '%WP_CORE_DIR%'
       dbUrl: 'mysql://%DB_USER%:%DB_PASSWORD%@%DB_HOST%:%DB_PORT%/%DB_NAME%'
+      dbName: '%DB_NAME%'
+      dbHost: '%DB_HOST%'
+      dbUser: '%DB_USER%'
+      dbPassword: '%DB_PASSWORD%'
       tablePrefix: '%WP_TABLE_PREFIX%'
       domain: '%WORDPRESS_DOMAIN%'
       adminEmail: '%ADMIN_EMAIL%'

includes/class-core-schema-filters.php

@@ -123,6 +123,7 @@ public static function add_filters() {
 	public static function register_post_types( $args, $post_type ) {
 		if ( 'product' === $post_type ) {
 			$args['show_in_graphql']                  = true;
+			$args['model']                            = \WPGraphQL\WooCommerce\Model\Product::class;
 			$args['graphql_single_name']              = 'Product';
 			$args['graphql_plural_name']              = 'Products';
 			$args['graphql_kind']                     = 'interface';
@@ -358,6 +359,7 @@ public static function inject_union_type_resolver( $type, $value, $wp_union ) {
 	 * @return \WPGraphQL\Type\WPObjectType|null
 	 */
 	public static function inject_type_resolver( $type, $value ) {
+
 		$type_registry = \WPGraphQL::get_type_registry();
 		switch ( $type ) {
 			case 'Coupon':
@@ -367,6 +369,9 @@ public static function inject_type_resolver( $type, $value ) {
 					$type = $type_registry->get_type( $new_type );
 				}
 				break;
+			case 'ProductVariation':
+				$type = self::resolve_product_variation_type( $value );
+				break;
 			case 'Product':
 				$supported_types = WooGraphQL::get_enabled_product_types();
 				if ( in_array( $value->type, array_keys( $supported_types ), true ) ) {
@@ -433,6 +438,7 @@ public static function resolve_product_variation_type( $value ) {
 		$type_registry  = \WPGraphQL::get_type_registry();
 		$possible_types = WooGraphQL::get_enabled_product_variation_types();
 		$product_type   = $value->get_type();
+
 		if ( isset( $possible_types[ $product_type ] ) ) {
 			return $type_registry->get_type( $possible_types[ $product_type ] );
 		}

includes/model/class-customer.php

@@ -86,7 +86,7 @@ protected function init() {
 				},
 				'id'                    => function () {
 					return ( ! empty( $this->data->get_id() ) )
-						? Relay::toGlobalId( 'customer', $this->data->get_id() )
+						? Relay::toGlobalId( 'user', $this->data->get_id() )
 						: 'guest';
 				},
 				'databaseId'            => function () {

includes/model/class-product-variation.php

@@ -95,7 +95,7 @@ protected function init() {
 					return ! empty( $this->wc_data->get_id() ) ? $this->wc_data->get_id() : null;
 				},
 				'id'                => function () {
-					return ! empty( $this->ID ) ? Relay::toGlobalId( 'product_variation', "{$this->ID}" ) : null;
+					return ! empty( $this->ID ) ? Relay::toGlobalId( 'post', "{$this->ID}" ) : null;
 				},
 				'name'              => function () {
 					return ! empty( $this->wc_data->get_name() ) ? $this->wc_data->get_name() : null;
@@ -226,7 +226,7 @@ protected function init() {
 					return ! empty( $this->wc_data->get_parent_id() ) ? $this->wc_data->get_parent_id() : null;
 				},
 				'parentId'          => function () {
-					return ! empty( $this->wc_data->get_parent_id() ) ? Relay::toGlobalId( 'product', (string) $this->wc_data->get_parent_id() ) : null;
+					return ! empty( $this->wc_data->get_parent_id() ) ? Relay::toGlobalId( 'post', (string) $this->wc_data->get_parent_id() ) : null;
 				},
 				'shipping_class_id' => function () {
 					return ! empty( $this->wc_data->get_shipping_class_id() ) ? $this->wc_data->get_shipping_class_id() : null;

includes/model/class-product.php

@@ -196,7 +196,7 @@ protected function init() {
 					return ! empty( $this->wc_data->get_id() ) ? $this->wc_data->get_id() : null;
 				},
 				'id'                  => function () {
-					return ! empty( $this->ID ) ? Relay::toGlobalId( 'product', "{$this->ID}" ) : null;
+					return ! empty( $this->ID ) ? Relay::toGlobalId( 'post', "{$this->ID}" ) : null;
 				},
 				'type'                => function () {
 					return ! empty( $this->wc_data->get_type() ) ? $this->wc_data->get_type() : null;

includes/type/interface/class-product-variation.php

@@ -50,6 +50,7 @@ public static function register_interface(): void {
 			'SimpleProductVariation',
 			[
 				'eagerlyLoadType' => true,
+				'model'           => \WPGraphQL\WooCommerce\Model\Product_Variation::class,
 				'description'     => __( 'A product variation', 'wp-graphql-woocommerce' ),
 				'interfaces'      => [ 'Node', 'ProductVariation' ],
 				'fields'          => [],

includes/type/object/class-product-types.php

@@ -68,6 +68,7 @@ private static function register_simple_product_type() {
 			'SimpleProduct',
 			[
 				'eagerlyLoadType' => true,
+				'model'           => \WPGraphQL\WooCommerce\Model\Product::class,
 				'description'     => __( 'A simple product object', 'wp-graphql-woocommerce' ),
 				'interfaces'      => self::get_product_interfaces(
 					[
@@ -92,6 +93,7 @@ private static function register_variable_product_type() {
 			'VariableProduct',
 			[
 				'eagerlyLoadType' => true,
+				'model'           => \WPGraphQL\WooCommerce\Model\Product::class,
 				'description'     => __( 'A variable product object', 'wp-graphql-woocommerce' ),
 				'interfaces'      => self::get_product_interfaces(
 					[
@@ -116,6 +118,7 @@ private static function register_external_product_type() {
 			'ExternalProduct',
 			[
 				'eagerlyLoadType' => true,
+				'model'           => \WPGraphQL\WooCommerce\Model\Product::class,
 				'description'     => __( 'A external product object', 'wp-graphql-woocommerce' ),
 				'interfaces'      => self::get_product_interfaces( [ 'ProductWithPricing' ] ),
 				'fields'          => array_merge(
@@ -144,6 +147,7 @@ private static function register_group_product_type() {
 			'GroupProduct',
 			[
 				'eagerlyLoadType' => true,
+				'model'           => \WPGraphQL\WooCommerce\Model\Product::class,
 				'description'     => __( 'A group product object', 'wp-graphql-woocommerce' ),
 				'interfaces'      => self::get_product_interfaces( [ 'ProductWithPricing' ] ),
 				'fields'          => [
@@ -208,6 +212,7 @@ private static function register_unsupported_product_type() {
 			WooGraphQL::get_supported_product_type(),
 			[
 				'eagerlyLoadType' => true,
+				'model'           => \WPGraphQL\WooCommerce\Model\Product::class,
 				'description'     => __( 'A product object for a product type that is unsupported by the current API.', 'wp-graphql-woocommerce' ),
 				'interfaces'      => self::get_product_interfaces(
 					[

tests/_support/Helper/crud-helpers/cart.php

@@ -119,15 +119,15 @@ public function print_item_query( $key ) {
 			'key'         => $item['key'],
 			'product'     => array(
 				'node' => array(
-					'id'         => Relay::toGlobalId( 'product', $item['product_id'] ),
+					'id'         => Relay::toGlobalId( 'post', $item['product_id'] ),
 					'databaseId' => $item['product_id'],
 				),
 			),
 			'variation'   => ! empty( $variation )
 				? array(
 					'attributes' => $attributes,
 					'node'       => array(
-						'id'         => Relay::toGlobalId( 'product_variation', $item['variation_id'] ),
+						'id'         => Relay::toGlobalId( 'post', $item['variation_id'] ),
 						'databaseId' => $item['variation_id'],
 					),
 				)

tests/_support/Helper/crud-helpers/customer.php

@@ -10,7 +10,7 @@ public function __construct() {
 	}
 
 	public function to_relay_id( $id ) {
-		return Relay::toGlobalId( 'customer', $id );
+		return Relay::toGlobalId( 'user', $id );
 	}
 
 	public function create( $args = array() ) {

tests/_support/Helper/crud-helpers/order.php

@@ -205,7 +205,7 @@ public function print_query( $id ) {
 			'pricesIncludeTax'      => $data->get_prices_include_tax(),
 			'parent'                => null,
 			'customer'              => ! empty( $data->get_customer_id() )
-				? array( 'id' => Relay::toGlobalId( 'customer', $data->get_customer_id() ) )
+				? array( 'id' => Relay::toGlobalId( 'user', $data->get_customer_id() ) )
 				: null,
 			'customerIpAddress'     => ! empty( $data->get_customer_ip_address() )
 				? $data->get_customer_ip_address()