Changeset 10548

Timestamp:

01/04/2021 11:41:00 PM (6 years ago)

Author:

iandunn

Message:

Events: Create permenant function for pinning one-off events.

This will make tasks like r10527 easier and quicker in the future.

Location:

sites/trunk/api.wordpress.org/public_html/events/1.0

Files:

• index.php (modified) (2 diffs)
• tests/test-index-phpunit.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

@@ -236 +236 @@
 
                 $events = pin_next_online_wordcamp( $events, $_SERVER['HTTP_USER_AGENT'], time() );
-
                 $events = pin_next_workshop_discussion_group( $events, $_SERVER['HTTP_USER_AGENT'] );
-
+                $events = pin_one_off_events( $events, time() );
                 $events = remove_duplicate_events( $events );
-
-                // tmp remove, only here b/c last minute
-                if ( time() < strtotime( 'December 18, 2020' ) ) {
-                        array_unshift( $events, array(
-                                'type'                 => 'wordcamp',
-                                'title'                => 'State of the Word',
-                                'url'                  => 'https://wordpress.org/news/2020/12/state-of-the-word-2020/',
-                                'meetup'               => '',
-                                'meetup_url'           => '',
-                                'date'                 => '2020-12-17 00:00:00',
-                                'end_date'             => '2020-12-17 23:00:00',
-                                'start_unix_timestamp' => 1608195600,
-                                'end_unix_timestamp'   => 1608267600,
-
-                                'location' => array(
-                                        'location'  => 'Online',
-                                        'country'   => 'US',
-                                        'latitude'  => 29.768241024468665,
-                                        'longitude' => -95.36765276500797,
-                                ),
-                        ) );
-                }
 
                 // Internal location data cannot be exposed in the response, see get_location().
@@ -1529 +1506 @@
 
 /**
+ * Pin one-off events.
+ */
+function pin_one_off_events( $events, $current_time ) {
+        if ( $current_time < strtotime( 'December 18, 2020' ) ) {
+                array_unshift( $events, array(
+                        'type'                 => 'wordcamp',
+                        'title'                => 'State of the Word',
+                        'url'                  => 'https://wordpress.org/news/2020/12/state-of-the-word-2020/',
+                        'meetup'               => '',
+                        'meetup_url'           => '',
+                        'date'                 => '2020-12-17 00:00:00',
+                        'end_date'             => '2020-12-17 23:00:00',
+                        'start_unix_timestamp' => 1608195600,
+                        'end_unix_timestamp'   => 1608267600,
+
+                        'location' => array(
+                                'location'  => 'Online',
+                                'country'   => 'US',
+                                'latitude'  => 29.768241024468665,
+                                'longitude' => -95.36765276500797,
+                        ),
+                ) );
+        }
+
+        return $events;
+}
+
+/**
  * Remove duplicate events, based on the URL.
  *

sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index-phpunit.php

@@ -3 +3 @@
 namespace Dotorg\API\Events\Tests;
 use PHPUnit\Framework\TestCase;
-use function Dotorg\API\Events\{ get_events, get_location, build_response, is_client_core };
+use function Dotorg\API\Events\{ get_events, get_location, build_response, is_client_core, pin_one_off_events };
 
 /**
@@ -1051 +1051 @@
 
         /**
+         * @covers ::pin_one_off_events
+         *
+         * @group unit
+         */
+        function test_pin_one_off_events() {
+                $seed_events = array();
+
+                // Don't forget to update the values here when they're updated in the FUT.
+                $actual_events_before_expiration = pin_one_off_events( $seed_events, strtotime( 'December 17, 2020' ) );
+                $actual_events_after_expiration  = pin_one_off_events( $seed_events, strtotime( 'December 18, 2020' ) );
+
+                $this->assertIsArray( $actual_events_after_expiration );
+                $this->assertEmpty( $actual_events_after_expiration );
+
+                $this->assertIsArray( $actual_events_before_expiration );
+                $this->assertSame( 'State of the Word', $actual_events_before_expiration[0]['title'] );
+        }
+
+        /**
          * @covers ::is_client_core
          *