Deprecated "By" queries removed. More connection resolver cleanup.

kidunot89 · kidunot89 · commit f5f3de1de869 · 2020-03-27T12:18:06.000-04:00
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
     },
     "autoload": {
         "files":[
-            "includes/connection/common-post-type-args.php",
+            "includes/connection/wc-cpt-connection-args.php",
             "includes/functions.php"
         ],
         "psr-4": {
diff --git a/includes/connection/class-coupons.php b/includes/connection/class-coupons.php
@@ -65,7 +65,7 @@ public static function get_connection_config( $args = array() ): array {
 	 */
 	public static function get_connection_args(): array {
 		return array_merge(
-			get_common_post_type_args(),
+			get_wc_cpt_connection_args(),
 			array(
 				'code' => array(
 					'type'        => 'String',
diff --git a/includes/connection/class-orders.php b/includes/connection/class-orders.php
@@ -72,7 +72,7 @@ public static function get_connection_args( $access = 'public' ): array {
 		switch ( $access ) {
 			case 'private':
 				return array_merge(
-					get_common_post_type_args(),
+					get_wc_cpt_connection_args(),
 					array(
 						'statuses'    => array(
 							'type'        => array( 'list_of' => 'OrderStatusEnum' ),
diff --git a/includes/connection/class-products.php b/includes/connection/class-products.php
@@ -274,6 +274,6 @@ public static function get_connection_args(): array {
 			);
 		}
 
-		return array_merge( get_common_post_type_args(), $args );
+		return array_merge( get_wc_cpt_connection_args(), $args );
 	}
 }
diff --git a/includes/connection/class-refunds.php b/includes/connection/class-refunds.php
@@ -66,7 +66,7 @@ public static function get_connection_config( $args = array() ): array {
 	 */
 	public static function get_connection_args(): array {
 		return array_merge(
-			get_common_post_type_args(),
+			get_wc_cpt_connection_args(),
 			array(
 				'statuses' => array(
 					'type'        => array( 'list_of' => 'String' ),
diff --git a/includes/connection/wc-cpt-connection-args.php b/includes/connection/wc-cpt-connection-args.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Define common arguments for post-type connections.
+ * Define common connection arguments for CPT connections.
  *
  * @package WPGraphQL\WooCommerce\Connection
  * @since 0.2.2
@@ -9,11 +9,11 @@
 namespace WPGraphQL\WooCommerce\Connection;
 
 /**
- * Returns argument definitions for argument common on all post-type connections.
+ * Returns argument definitions for argument common on CPT connections.
  *
  * @return array
  */
-function get_common_post_type_args(): array {
+function get_wc_cpt_connection_args(): array {
 	return array(
 		'search'      => array(
 			'type'        => 'String',
diff --git a/includes/data/connection/class-cart-item-connection-resolver.php b/includes/data/connection/class-cart-item-connection-resolver.php
@@ -22,9 +22,9 @@
  */
 class Cart_Item_Connection_Resolver extends AbstractConnectionResolver {
 	/**
-	 * Include shared connection functions.
+	 * Include Db Loader connection common functions.
 	 */
-	use WC_Connection_Functions;
+	use WC_Db_Loader_Common;
 
 	const PREFIX = 'CI';
 
@@ -132,8 +132,7 @@ public function get_offset() {
 	/**
 	 * Create cursor for downloadable item node.
 	 *
-	 * @param array  $node  Cart item.
-	 * @param string $key   Cart item key.
+	 * @param string $id  Cart item key.
 	 *
 	 * @return string
 	 */
@@ -151,14 +150,15 @@ public function get_ids() {
 	}
 
 	/**
-	 * Wrapper for "WC_Connection_Functions::is_valid_cart_item_offset()"
+	 * Check if cart item key is valid by confirming the validity of 
+	 * the cart item in the cart encoded into cart item key.
 	 *
-	 * @param integer $offset Post ID.
+	 * @param string $offset  Cart item key.
 	 *
 	 * @return bool
 	 */
 	public function is_valid_offset( $offset ) {
-		return $this->is_valid_cart_item_offset( $offset );
+		return ! empty( $this->source->get_cart_item( $offset ) );
 	}
 
 	/**
diff --git a/includes/data/connection/class-coupon-connection-resolver.php b/includes/data/connection/class-coupon-connection-resolver.php
@@ -21,9 +21,9 @@
  */
 class Coupon_Connection_Resolver extends AbstractConnectionResolver {
 	/**
-	 * Include shared connection functions.
+	 * Include CPT Loader connection common functions.
 	 */
-	use WC_Connection_Functions;
+	use WC_CPT_Loader_Common;
 
 	/**
 	 * The name of the post type, or array of post types the connection resolver is resolving for
diff --git a/includes/data/connection/class-customer-connection-resolver.php b/includes/data/connection/class-customer-connection-resolver.php
@@ -18,11 +18,6 @@
  * Class Customer_Connection_Resolver
  */
 class Customer_Connection_Resolver extends AbstractConnectionResolver {
-	/**
-	 * Include shared connection functions.
-	 */
-	use WC_Connection_Functions;
-
 	/**
 	 * Return the name of the loader to be used with the connection resolver
 	 *
@@ -224,13 +219,21 @@ public function sanitize_input_fields( array $where_args ) {
 	}
 
 	/**
-	 * Wrapper for "WC_Connection_Functions::is_valid_user_offset()"
+	 * Determine whether or not the the offset is valid, i.e the user corresponding to the offset exists.
+	 * Offset is equivalent to user_id. So this function is equivalent
+	 * to checking if the user with the given ID exists.
 	 *
-	 * @param integer $offset User ID.
+	 * @param integer $offset  User ID.
 	 *
 	 * @return bool
 	 */
 	public function is_valid_offset( $offset ) {
-		return $this->is_valid_user_offset( $offset );
+		global $wpdb;
+
+		if ( ! empty( wp_cache_get( $offset, 'users' ) ) ) {
+			return true;
+		}
+
+		return $wpdb->get_var( $wpdb->prepare( "SELECT EXISTS (SELECT 1 FROM $wpdb->users WHERE ID = %d)", $offset ) );
 	}
 }
diff --git a/includes/data/connection/class-downloadable-item-connection-resolver.php b/includes/data/connection/class-downloadable-item-connection-resolver.php
@@ -23,9 +23,9 @@
  */
 class Downloadable_Item_Connection_Resolver extends AbstractConnectionResolver {
 	/**
-	 * Include shared connection functions.
+	 * Include Db Loader connection common functions.
 	 */
-	use WC_Connection_Functions;
+	use WC_Db_Loader_Common;
 
 	const PREFIX = 'DI';
 
@@ -172,8 +172,7 @@ public function get_offset() {
 	/**
 	 * Create cursor for downloadable item node.
 	 *
-	 * @param array  $node  Cart item.
-	 * @param string $key   Cart item key.
+	 * @param string $id  Downloadable item ID.
 	 *
 	 * @return string
 	 */
@@ -211,7 +210,7 @@ public function is_valid_offset( $offset ) {
 	 *
 	 * @return bool
 	 */
-	protected function is_valid_model( array $model ) {
+	protected function is_valid_model( $model ) {
 		return isset( $model ) && ! empty( $model['download_id'] );
 	}
 }
diff --git a/includes/data/connection/class-order-connection-resolver.php b/includes/data/connection/class-order-connection-resolver.php
@@ -21,9 +21,9 @@
  */
 class Order_Connection_Resolver extends AbstractConnectionResolver {
 	/**
-	 * Include shared connection functions.
+	 * Include CPT Loader connection common functions.
 	 */
-	use WC_Connection_Functions;
+	use WC_CPT_Loader_Common;
 
 	/**
 	 * The name of the post type, or array of post types the connection resolver is resolving for
diff --git a/includes/data/connection/class-product-connection-resolver.php b/includes/data/connection/class-product-connection-resolver.php
@@ -24,9 +24,9 @@
  */
 class Product_Connection_Resolver extends AbstractConnectionResolver {
 	/**
-	 * Include shared connection functions.
+	 * Include CPT Loader connection common functions.
 	 */
-	use WC_Connection_Functions;
+	use WC_CPT_Loader_Common;
 
 	/**
 	 * The name of the post type, or array of post types the connection resolver is resolving for
diff --git a/includes/data/connection/class-refund-connection-resolver.php b/includes/data/connection/class-refund-connection-resolver.php
@@ -22,9 +22,9 @@
  */
 class Refund_Connection_Resolver extends AbstractConnectionResolver {
 	/**
-	 * Include shared connection functions.
+	 * Include CPT Loader connection common functions.
 	 */
-	use WC_Connection_Functions;
+	use WC_CPT_Loader_Common;
 
 	/**
 	 * The name of the post type, or array of post types the connection resolver is resolving for
diff --git a/includes/data/connection/trait-wc-cpt-loader-common.php b/includes/data/connection/trait-wc-cpt-loader-common.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * Defines reusable functions for all connection.
+ * Defines generic functions for to be used in connections that process creates using the CPT Loader.
  *
  * @package WPGraphQL\WooCommerce\Data\Connection
- * @since 0.3.3
+ * @since 0.5.0
  */
 
 namespace WPGraphQL\WooCommerce\Data\Connection;
 
 use WPGraphQL\WooCommerce\Data\Factory;
 
 /**
- * Trait WC_Connection_Functions
+ * Trait WC_CPT_Loader_Common
  */
-trait WC_Connection_Functions {
+trait WC_CPT_Loader_Common {
 	/**
 	 * Determine whether or not the the offset is valid, i.e the post corresponding to the offset exists.
 	 * Offset is equivalent to post_id. So this function is equivalent
@@ -33,38 +33,6 @@ public function is_valid_post_offset( $offset ) {
 		return $wpdb->get_var( $wpdb->prepare( "SELECT EXISTS (SELECT 1 FROM $wpdb->posts WHERE ID = %d)", $offset ) );
 	}
 
-	/**
-	 * Determine whether or not the the offset is valid, i.e the cart item corresponding to the offset exists.
-	 * Offset is equivalent to a cart item key. So this function is equivalent
-	 * to checking if the cart item with the given key exists.
-	 *
-	 * @param string $offset  Cart item key.
-	 *
-	 * @return bool
-	 */
-	public function is_valid_cart_item_offset( $offset ) {
-		return ! empty( $this->source->get_cart_item( $offset ) );
-	}
-
-	/**
-	 * Determine whether or not the the offset is valid, i.e the user corresponding to the offset exists.
-	 * Offset is equivalent to user_id. So this function is equivalent
-	 * to checking if the user with the given ID exists.
-	 *
-	 * @param integer $offset  User ID.
-	 *
-	 * @return bool
-	 */
-	public function is_valid_user_offset( $offset ) {
-		global $wpdb;
-
-		if ( ! empty( wp_cache_get( $offset, 'users' ) ) ) {
-			return true;
-		}
-
-		return $wpdb->get_var( $wpdb->prepare( "SELECT EXISTS (SELECT 1 FROM $wpdb->users WHERE ID = %d)", $offset ) );
-	}
-
 	/**
 	 * Sanitizes common post-type connection query input.
 	 *
@@ -148,28 +116,4 @@ public function sanitize_common_inputs( array $input ) {
 	public function get_cpt_model_by_id( $id ) {
 		return $this->loader->resolve_model( get_post_type( $id ), $id );
 	}
-
-	/**
-	 * Given an offset and prefix, a cursor is returned
-	 *
-	 * @param string         $prefix Salt.
-	 * @param string|integer $offset Connection offset.
-	 *
-	 * @return string
-	 */
-	protected function offset_to_cursor( $prefix, $offset ) {
-		return base64_encode( "{$prefix}:{$offset}" );
-	}
-
-	/**
-	 * Given a valid cursor and prefix, the offset is returned
-	 *
-	 * @param string $prefix Salt.
-	 * @param string $cursor Cursor.
-	 *
-	 * @return string|integer
-	 */
-	protected function cursor_to_offset( $prefix, $cursor ) {
-		return substr( base64_decode( $cursor ), strlen( $prefix . ':' ) );
-	}
 }
diff --git a/includes/data/connection/trait-wc-db-loader-common.php b/includes/data/connection/trait-wc-db-loader-common.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Defines generic functions for to be used in connections that process creates using the Db Loader.
+ *
+ * @package WPGraphQL\WooCommerce\Data\Connection
+ * @since 0.5.0
+ */
+
+namespace WPGraphQL\WooCommerce\Data\Connection;
+
+use WPGraphQL\WooCommerce\Data\Factory;
+
+/**
+ * Trait WC_Db_Loader_Common
+ */
+trait WC_Db_Loader_Common {
+	/**
+	 * Given an offset and prefix, a cursor is returned
+	 *
+	 * @param string         $prefix Salt.
+	 * @param string|integer $offset Connection offset.
+	 *
+	 * @return string
+	 */
+	public function offset_to_cursor( $prefix, $offset ) {
+		return base64_encode( "{$prefix}:{$offset}" );
+	}
+
+	/**
+	 * Given a valid cursor and prefix, the offset is returned
+	 *
+	 * @param string $prefix Salt.
+	 * @param string $cursor Cursor.
+	 *
+	 * @return string|integer
+	 */
+	public function cursor_to_offset( $prefix, $cursor ) {
+		return substr( base64_decode( $cursor ), strlen( $prefix . ':' ) );
+	}
+}
diff --git a/includes/data/loader/class-wc-cpt-loader.php b/includes/data/loader/class-wc-cpt-loader.php
@@ -145,14 +145,18 @@ function ( $split, \WP_Query $query ) {
 			$parent_id   = null;
 			
 			// Resolve post author for future capability checks.
-			if ( 'shop_order' === $post_type ) {
-				$customer_id = get_post_meta( $key, '_customer_user', true );
-				if ( ! empty( $customer_id ) ) {
-					$this->context->getLoader( 'wc_customer' )->buffer( [ $customer_id ] );
-				}
-			} elseif ( 'product_variation' === $post_type || 'shop_refund' === $post_type ) {
-				$parent_id = get_post_field( 'post_parent', $key );
-				$this->buffer( [ $parent_id ] );
+			switch ( $post_type ) {
+				case 'shop_order':
+					$customer_id = get_post_meta( $key, '_customer_user', true );
+					if ( ! empty( $customer_id ) ) {
+						$this->context->getLoader( 'wc_customer' )->buffer( [ $customer_id ] );
+					}
+					break;
+				case 'product_variation':
+				case 'shop_refund':
+					$parent_id = get_post_field( 'post_parent', $key );
+					$this->buffer( [ $parent_id ] );
+					break;
 			}
 
 			/**
diff --git a/includes/data/loader/class-wc-db-loader.php b/includes/data/loader/class-wc-db-loader.php
@@ -143,10 +143,6 @@ public function load_tax_rate_from_id( $id ) {
 			return new Tax_Rate( $rate );
 		} else {
 			return null;
-			// throw new UserError(
-			// 	/* translators: %s: Tax rate ID */
-			// 	sprintf( __( 'No Tax Rate assigned to ID %s was found ', 'wp-graphql-woocommerce' ), $id )
-			// );
 		}
 	}
 }
diff --git a/includes/type/interface/class-product.php b/includes/type/interface/class-product.php
diff --git a/includes/type/object/class-coupon-type.php b/includes/type/object/class-coupon-type.php
diff --git a/tests/wpunit/ProductQueriesTest.php b/tests/wpunit/ProductQueriesTest.php
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php

Original file line number	Diff line number	Diff line change
`@@ -274,6 +274,6 @@ public static function get_connection_args(): array {`
`274`	`274`	`);`
`275`	`275`	`}`
`276`	`276`
`277`		`- return array_merge( get_common_post_type_args(), $args );`
	`277`	`+ return array_merge( get_wc_cpt_connection_args(), $args );`
`278`	`278`	`}`
`279`	`279`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@`
`23`	`23`	`*/`
`24`	`24`	`class Downloadable_Item_Connection_Resolver extends AbstractConnectionResolver {`
`25`	`25`	`/**`
`26`		`- * Include shared connection functions.`
	`26`	`+ * Include Db Loader connection common functions.`
`27`	`27`	`*/`
`28`		`- use WC_Connection_Functions;`
	`28`	`+ use WC_Db_Loader_Common;`
`29`	`29`
`30`	`30`	`const PREFIX = 'DI';`
`31`	`31`
`@@ -172,8 +172,7 @@ public function get_offset() {`
`172`	`172`	`/**`
`173`	`173`	`* Create cursor for downloadable item node.`
`174`	`174`	`*`
`175`		`- * @param array $node Cart item.`
`176`		`- * @param string $key Cart item key.`
	`175`	`+ * @param string $id Downloadable item ID.`
`177`	`176`	`*`
`178`	`177`	`* @return string`
`179`	`178`	`*/`
`@@ -211,7 +210,7 @@ public function is_valid_offset( $offset ) {`
`211`	`210`	`*`
`212`	`211`	`* @return bool`
`213`	`212`	`*/`
`214`		`- protected function is_valid_model( array $model ) {`
	`213`	`+ protected function is_valid_model( $model ) {`
`215`	`214`	`return isset( $model ) && ! empty( $model['download_id'] );`
`216`	`215`	`}`
`217`	`216`	`}`