Ticket/aotech 6694 data validation

includes/client/cli/output/TaxonomyCount.php

@@ -39,7 +39,6 @@ private function output( $data, $message = '' ) {
 		$formatter  = new Formatter( $assoc_args );
 		$formatter->display_items( $data, true );
 
-		// \WP_CLI\Utils\format_items( 'table', $data['term_count_by_taxonomy'], array( 'taxonomy_name', 'number_of_terms' ) );
 		// \WP_CLI\Utils\format_items( 'table', $data['post_terms'], array( 'taxonomy', 'term', 'post_count' ) );
 		// \WP_CLI::line( "Unique taxonomies: {$data['unique_taxonomies']}" );
 	}
@@ -48,7 +47,7 @@ private function output( $data, $message = '' ) {
 	 * Prepare the data for rendering.
 	 *
 	 * @param array $data Data to prepare for rendering.
-	 *
+	 *Ø
 	 * @return array
 	 */
 	public function prepare( array $data ) {

includes/client/cli/output/TaxonomyRenderFactory.php

@@ -19,6 +19,8 @@ public static function create( string $key, array $data ) {
 		switch ( $key ) {
 			case 'count':
 				return new TaxonomyCount( $data );
+			case 'post_terms':
+				return new TaxonomySample( $data );
 			default:
 				return new \WP_Error( 'data_not_found', 'Taxonomy data provided for processing does not adhere to contract.' );
 		}

includes/client/cli/output/TaxonomySample.php

@@ -0,0 +1,26 @@
+<?php
+namespace Press_Sync\client\output;
+
+/**
+ * Class TaxonomySample
+ *
+ * @package Press_Sync\client\output
+ */
+class TaxonomySample extends AbstractOutput {
+	/**
+	 * Render data to the client.
+	 *
+	 * @since NEXT
+	 * @return mixed
+	 */
+	public function render() {
+		$this->output( $this->data['comparison'], 'Post counts by taxonomy term:' );
+	}
+	/**
+	 * @param array  $data
+	 * @param string $message
+	 */
+	public function output( array $data, $message = '' ) {
+		\WP_CLI\Utils\format_items( 'table', $data['term_count_by_taxonomy'], array( 'taxonomy_name', 'number_of_terms' ) );
+	}
+}

includes/validation/Taxonomy.php

@@ -16,7 +16,8 @@ class Taxonomy implements CountInterface {
 	 */
 	public function get_data() {
 		return array(
-			'count' => $this->get_count(),
+			'count'      => $this->get_count(),
+			'post_terms' => $this->get_post_count_by_taxonomy_term(),
 		);
 	}
 
@@ -67,43 +68,27 @@ public function get_post_count_by_taxonomy_term() {
 		$taxonomies = array();
 
 		foreach ( get_taxonomies() as $name => $taxonomy ) {
-			$taxonomies[ $name ] = array();
-			$taxonomy_terms      = get_terms( array(
-				'taxonomy'   => $taxonomy,
+			$term_query = new \WP_Term_Query( array(
+				'taxonomy'   => $name,
 				'hide_empty' => false,
 			) );
 
-			foreach ( $taxonomy_terms as $term ) {
-				$query = new \WP_Query(
-					array(
-						'fields'         => 'ids',
-						'post_type'      => 'any',
-						'posts_per_page' => - 1,
-						'tax_query'      => array(
-							array(
-								'taxonomy' => $taxonomy,
-								'field'    => 'slug',
-								'terms'    => $term->slug,
-							),
-						),
-					)
-				);
-
-				$taxonomies[ $name ][ $term->slug ] = count( $query->get_posts() );
+			$terms = $term_query->get_terms();
+
+			foreach ( $terms as $term ) {
+				$taxonomies[ $name ][ $term->slug ] = $term->count;
 
 				wp_reset_postdata();
 			}
 		}
 
 		$indexed_array = array();
 
-		foreach ( $taxonomies as $tax_name => $taxonomy ) {
+		foreach ( $taxonomies as $taxonomy_name => $taxonomy ) {
+			$indexed_array[ $taxonomy_name ] = array();
+
 			foreach ( $taxonomy as $term_name => $post_count ) {
-				$indexed_array[] = array(
-					'taxonomy'   => $tax_name,
-					'term'       => $term_name,
-					'post_count' => $post_count,
-				);
+				$indexed_array[ $taxonomy_name ][ $term_name ] = $post_count;
 			}
 		}
 
@@ -121,7 +106,6 @@ public function get_count() {
 		return array(
 			'unique_taxonomies'      => $this->get_unique_taxonomy_count(),
 			'term_count_by_taxonomy' => $this->get_term_count_by_taxonomy(),
-			'post_terms'             => $this->get_post_count_by_taxonomy_term(),
 		);
 	}
 

includes/validators/TaxonomyValidator.php

@@ -46,8 +46,14 @@ public function get_source_data() {
 	 * @since NEXT
 	 */
 	public function get_destination_data() {
+		$count = API::get_remote_data( 'validation/taxonomy/count' );
+
 		return array(
-			'count' => API::get_remote_data( 'validation/taxonomy/count' ),
+			'count' => array(
+				'unique_taxonomies'      => $count['unique_taxonomies'],
+				'term_count_by_taxonomy' => $count['term_count_by_taxonomy'],
+			),
+			'post_terms' => $count['post_terms'],
 		);
 	}
 
@@ -63,6 +69,7 @@ public function get_destination_data() {
 	public function get_comparison_data( array $source, array $destination ) {
 		return array(
 			'count' => $this->compare_count( $source['count'], $destination['count'] ),
+			'post_terms' => $this->compare_post_terms( $source['post_terms'], $destination['post_terms'] ),
 		);
 	}
 
@@ -102,4 +109,10 @@ private function compare_count( $source, $destination ) {
 
 		return $data;
 	}
+
+	private function compare_post_terms( $source, $destination ) {
+		$data = array();
+
+		return $data;
+	}
 }