cast database results to int so we don't have to do it client-side

ibericode · May 17, 2021 · 6063d0a · 6063d0a
1 parent 0439834
commit 6063d0a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/assets/src/js/components/chart.js b/assets/src/js/components/chart.js
@@ -120,8 +120,8 @@ export default class Chart extends Component {
           continue
         }
 
-        map[key].pageviews += parseInt(data[i].pageviews)
-        map[key].visitors += parseInt(data[i].visitors)
+        map[key].pageviews += data[i].pageviews
+        map[key].visitors += data[i].visitors
 
         if (map[key].pageviews > yMax) {
           yMax = map[key].pageviews

diff --git a/assets/src/js/components/totals.js b/assets/src/js/components/totals.js
@@ -74,8 +74,8 @@ export default class Totals extends Component {
         }
       }).then(data => {
         data.forEach(r => {
-          visitors += parseInt(r.visitors)
-          pageviews += parseInt(r.pageviews)
+          visitors += r.visitors
+          pageviews += r.pageviews
         })
       }),
 
@@ -87,8 +87,8 @@ export default class Totals extends Component {
         }
       }).then(data => {
         data.forEach(r => {
-          visitorsPrevious += parseInt(r.visitors)
-          pageviewsPrevious += parseInt(r.pageviews)
+          visitorsPrevious += r.visitors
+          pageviewsPrevious += r.pageviews
         })
       })
     ]).then(() => {

diff --git a/src/class-rest.php b/src/class-rest.php
@@ -114,7 +114,11 @@ public function get_stats( \WP_REST_Request $request ) {
 		$end_date   = isset( $params['end_date'] ) ? $params['end_date'] : gmdate( 'Y-m-d', time() + get_option( 'gmt_offset', 0 ) * HOUR_IN_SECONDS );
 		$sql        = $wpdb->prepare( "SELECT date, visitors, pageviews FROM {$wpdb->prefix}koko_analytics_site_stats s WHERE s.date >= %s AND s.date <= %s", array( $start_date, $end_date ) );
 		$result     = $wpdb->get_results( $sql );
-		return $result;
+		return is_array( $result ) ? array_map(function ( $row ) {
+			$row->pageviews = (int) $row->pageviews;
+			$row->visitors = (int) $row->visitors;
+			return $row;
+		}, $result) : $result;
 	}
 
 	public function get_posts( \WP_REST_Request $request ) {
@@ -131,11 +135,12 @@ public function get_posts( \WP_REST_Request $request ) {
 		}
 
 		// add permalink to each result
-		foreach ( $results as $i => $row ) {
-			$results[ $i ]->post_permalink = get_permalink( $row->id );
-		}
-
-		return $results;
+		return array_map( function( $row ) {
+			$row->post_permalink = get_permalink( $row->id );
+			$row->pageviews = (int) $row->pageviews;
+			$row->visitors = (int) $row->visitors;
+			return $row;
+		}, $results);
 	}
 
 	public function get_referrers( \WP_REST_Request $request ) {