Update Analytics class to address code review feedback.

google · Jul 24, 2020 · 2a0eb8f · 2a0eb8f
1 parent 4a9c944
commit 2a0eb8f
Showing 1 changed file with 39 additions and 20 deletions.
diff --git a/includes/Modules/Analytics.php b/includes/Modules/Analytics.php
@@ -854,7 +854,17 @@ protected function create_data_request( Data_Request $data ) {
 					return true;
 				};
 			case 'GET:report':
-				$request_args = array( 'page' => $data['url'] );
+				$request_args = array();
+
+				if ( empty( $data['metrics'] ) ) {
+					/* translators: %s: Missing parameter name */
+					return new WP_Error( 'missing_required_param', sprintf( __( 'Request parameter is empty: %s.', 'google-site-kit' ), 'metrics' ), array( 'status' => 400 ) );
+				}
+
+				if ( ! empty( $data['url'] ) ) {
+					$request_args['page'] = $data['url'];
+				}
+
 				if ( ! empty( $data['limit'] ) ) {
 					$request_args['row_limit'] = $data['limit'];
 				}
@@ -931,7 +941,7 @@ function ( $date_range ) {
 				$request->setDateRanges( $date_ranges );
 
 				$metrics = $data['metrics'];
-				if ( ! empty( $metrics ) && ( is_string( $metrics ) || is_array( $metrics ) ) ) {
+				if ( is_string( $metrics ) || is_array( $metrics ) ) {
 					if ( is_string( $metrics ) ) {
 						$metrics = explode( ',', $data['metrics'] );
 					} elseif ( is_array( $metrics ) && ! wp_is_numeric_array( $metrics ) ) { // If single object is passed.
@@ -968,29 +978,38 @@ function ( $metric_def ) {
 				$orderby = $data['orderby'];
 				if ( ! empty( $orderby ) && is_array( $orderby ) ) {
 					// When just object is passed we need to convert it to an array of objects.
-					if ( ! is_array( $orderby[0] ) ) {
+					if ( ! wp_is_numeric_array( $orderby[0] ) ) {
 						$orderby = array( $orderby );
 					}
 
-					$orderby = array_map(
-						function ( $order_def ) {
-							$order_def = array_merge(
-								array(
-									'fieldName' => '',
-									'sortOrder' => '',
-								),
-								(array) $order_def
-							);
-							$order_by  = new Google_Service_AnalyticsReporting_OrderBy();
-							$order_by->setFieldName( $order_def['fieldName'] );
-							$order_by->setSortOrder( $order_def['sortOrder'] );
-
-							return $order_by;
-						},
-						$orderby
+					$orderby = array_filter(
+						array_map(
+							function ( $order_def ) {
+								$order_def = array_merge(
+									array(
+										'fieldName' => '',
+										'sortOrder' => 'DESCENDING',
+									),
+									(array) $order_def
+								);
+
+								if ( empty( $order_def['fieldName'] ) ) {
+									return null;
+								}
+
+								$order_by = new Google_Service_AnalyticsReporting_OrderBy();
+								$order_by->setFieldName( $order_def['fieldName'] );
+								$order_by->setSortOrder( $order_def['sortOrder'] );
+
+								return $order_by;
+							},
+							$orderby
+						)
 					);
 
-					$request->setOrderBys( $orderby );
+					if ( ! empty( $orderby ) ) {
+						$request->setOrderBys( $orderby );
+					}
 				}
 
 				// Batch reports requests.