Changeset 4857

Timestamp:

02/03/2017 03:24:52 PM (8 years ago)

Author:

iandunn

Message:

Official WordPress Events: Pull events from database cache for performance

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php (modified) (7 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/official-wordpress-events/official-wordpress-events.php

@@ -35 +35 @@
      * Shortcode
      * ==============
-     * Update shortcode to pull from cached DB entries instead of API directly. Probably remove caching from $this->remote_get()
      * Make meetups and wordcamps cut off on the same date, so it doesn't look like there aren't any meetups later in the year
      * Ability to feature a camp in a hero area
@@ -65 +64 @@
         global $wpdb;
 
-        $events = $this->get_all_events();
+        $events = $this->fetch_upcoming_events();
 
         foreach ( $events as $event ) {
@@ -121 +120 @@
     public function render_events() {
         $output = '';
-        $events = $this->group_events_by_date( $this->get_all_events() );
+        $events = $this->group_events_by_date( $this->get_cached_events() );
 
         if ( $events ) {
@@ -133 +132 @@
 
     /**
-     * Get all official events
+     * Get cached events from the local database
+     *
+     * @return array
+     */
+    protected function get_cached_events() {
+        global $wpdb;
+
+        $cached_events = array();
+
+        // Include yesterday's events because server timezone may be ahead of user's timezone
+        $raw_events = $wpdb->get_results( sprintf( "
+            SELECT *
+            FROM `%s`
+            WHERE date_utc >= SUBDATE( CURRENT_DATE(), 1 )
+            ORDER BY date_utc ASC
+            LIMIT 300",
+            self::EVENTS_TABLE
+        ) );
+
+        foreach ( $raw_events as $event ) {
+            $cached_events[] = new Official_WordPress_Event( array(
+                'id'              => $event->id,
+                'type'            => $event->type,
+                'source_id'       => $event->source_id,
+                'title'           => $event->title,
+                'url'             => $event->url,
+                'description'     => $event->description,
+                'num_attendees'   => $event->attendees,
+                'meetup_name'     => $event->meetup,
+                'meetup_url'      => $event->meetup_url,
+                'start_timestamp' => strtotime( $event->date_utc ),
+                'end_timestamp'   => strtotime( $event->end_date ),
+                'location'        => $event->location,
+                'country_code'    => $event->country,
+                'latitude'        => $event->latitude,
+                'longitude'       => $event->longitude,
+            ) );
+        }
+
+        return $cached_events;
+    }
+
+    /**
+     * Fetch all upcoming official events from various external APIs
      * 
      * @return array
      */
-    protected function get_all_events() {
+    protected function fetch_upcoming_events() {
         $events = array_merge( $this->get_wordcamp_events(), $this->get_meetup_events() );
-        usort( $events, array( $this, 'sort_events' ) );
 
         return $events;
-    }
-
-    /**
-     * Sort events based on start timestamp 
-     * 
-     * This is a callback for usort()
-     * 
-     * @param $a
-     * @param $b
-     * @return int
-     */
-    protected function sort_events( $a, $b ) {
-        if ( $a->start_timestamp == $b->start_timestamp ) {
-            return 0;
-        } else {
-            return $a->start_timestamp > $b->start_timestamp ? 1 : -1;
-        }
     }
 
@@ -536 +560 @@
      * Wrapper for wp_remote_get()
      *
-     * This adds caching and error logging/notification.
-     *
-     * @todo It'd be better to always display cached data, but trigger an asynchronous refresh when you detect it's
-     *       changed, so that the user is never waiting on it to refresh.
+     * This adds error logging/notification.
      *
      * @param string $url
@@ -550 +571 @@
 
         if ( $url ) {
-            $transient_key = 'owe_' . wp_hash( $url . print_r( $args, true ) );
-
-            if ( ! $response = get_transient( $transient_key ) ) {
                 $response = wp_remote_get( $url, $args );
 
@@ -587 +605 @@
                         wp_mail( $to, sprintf( '%s error for %s', __METHOD__, parse_url( site_url(), PHP_URL_HOST ) ), sanitize_text_field( $error ) );
                     }
-                } else {
-                    set_transient( $transient_key, $response, HOUR_IN_SECONDS );
                 }
 
                 $this->maybe_pause( wp_remote_retrieve_headers( $response ) );
-            }
         }