Merge lp:~peterm-ubuntu/resource-centre/rest-fix into lp:resource-centre

[Peter Mahnke]

## Done

- Created the /event rest api endpoint with custom fields
- Added custom user fields to the /users rest api endpoint

## QA

- Check out this branch locally, or try on insights.canonicalwebteam.com
- View the api in your web browser at:
  - [event](https://insights.canonicalwebteam.com/wp-json/wp/v2/event?_embed=True&id=6180)
    - see that the endpoint exists and the custom fields are there:
```
    "_event_location": "Vancouver, BC",
    "_event_venue": "Vancouver Convention Center",
    "_event_registration": "https://www.openstack.org/summit/vancouver-2015/",
    "_start_day": "18",
    "_start_month": "05",
    "_start_year": "2015",
    "_end_day": "22",
    "_end_month": "06",
    "_end_year": "2016",
```
  - [user](https://insights.canonicalwebteam.com/wp-json/wp/v2/users?_embed&slug=john-zannos)
    - see that the custom fields are there:
```
    "user_job_title": "Vice President of Cloud Alliances",
    "user_website_title": "",
    "user_google": "102884954828153486904",
    "user_twitter": "",
    "user_facebook": "",
    "user_photo": "/wp-content/uploads/index.jpg",
    "user_location": "",
```

[Anthony Dillon (ya-bo-ng)]

Great stuff. Although it seems the `id` does not filter the feed by the single post. For example: http://insights.canonicalwebteam.com/wp-json/wp/v2/event?_embed=True&id=6180 returns all the events not just the data for the 6180 event.

I think we need some logic in the event function to return all or a single post if the id exists. Also the events feed takes a long time. I think we need to limit the results.

[Anthony Dillon (ya-bo-ng)]

review: Needs Fixing

[Anthony Dillon (ya-bo-ng)]

After discussing on IRC we will use the slug to return details of events and use per_page by default to limit the returned feed.

review: Approve

=== modified file 'functions/event-posts.php'
--- functions/event-posts.php	2015-06-11 12:42:22 +0000
+++ functions/event-posts.php	2018-03-21 20:24:37 +0000
@@ -7,6 +7,9 @@
 Author: Devin Price
 Author URI: http://www.wptheming.com
 License: GPLv2 or later
+
+Updated - 21 March 2018 by Peter Mahnke
+Added to the rest api as /wp-json/wp/v2/event?_embed=True
 */
 
 /**
@@ -48,9 +51,10 @@
 		'capability_type' => 'post',
 		'rewrite' => array("slug" => "event"), // Permalinks format
 		'menu_position' => 5,
-        'menu_icon' => get_stylesheet_directory_uri() . '/static/img/admin/calendar-day.png',
+    'menu_icon' => get_stylesheet_directory_uri() . '/static/img/admin/calendar-day.png',
+    'show_in_rest' => true,
 		'has_archive' => true
-	); 
+	);
 
 	register_post_type( 'event', $args );
 }
@@ -58,6 +62,40 @@
 add_action( 'init', 'ep_eventposts' );
 
 /**
+  * Updated - 21 March 2018
+  * add custom fields to rest api
+**/
+add_action( 'rest_api_init', 'slug_register_fields' );
+function slug_register_fields() {
+    foreach(
+        array(
+            '_event_location',
+            '_event_venue',
+            '_event_registration',
+            '_start_day',
+            '_start_month',
+            '_start_year',
+            '_end_day',
+            '_end_month',
+            '_end_year'
+        ) as $field
+    ) {
+        register_rest_field( 'event',
+            $field,
+            array(
+                'get_callback'    => 'slug_get_event_data',
+                'update_callback' => null,
+                'schema'          => null,
+            )
+        );
+    }
+}
+function slug_get_event_data( $object, $field_name, $request ) {
+    return get_post_meta( $object[ 'id' ], $field_name, true );
+}
+
+
+/**
  * Adds event post metaboxes for start time and end time
  * http://codex.wordpress.org/Function_Reference/add_meta_box
  *
@@ -102,15 +140,15 @@
 	if ( empty( $year ) ) {
 		$year = gmdate( 'Y', $time_adj );
 	}
-	
+
 	$hour = get_post_meta($post->ID, $metabox_id . '_hour', true);
- 
+
     if ( empty($hour) ) {
         $hour = gmdate( 'H', $time_adj );
     }
- 
+
     $min = get_post_meta($post->ID, $metabox_id . '_minute', true);
- 
+
     if ( empty($min) ) {
         $min = '00';
     }
@@ -129,7 +167,7 @@
     echo '<input type="text" name="' . $metabox_id . '_year" value="' . $year . '" size="4" maxlength="4" /> ';
     //echo '<input type="text" name="' . $metabox_id . '_hour" value="' . $hour . '" size="2" maxlength="2"/>:';
     //echo '<input type="text" name="' . $metabox_id . '_minute" value="' . $min . '" size="2" maxlength="2" />';
- 
+
 }
 
 function ept_event_location() {
@@ -181,11 +219,11 @@
 
 	// OK, we're authenticated: we need to find and save the data
 	// We'll put it into an array to make it easier to loop though
-	
+
 	$metabox_ids = array( '_start', '_end' );
 
 	foreach ($metabox_ids as $key ) {
-	    
+
 		$aa = $_POST[$key . '_year'];
 		$mm = $_POST[$key . '_month'];
 		$jj = $_POST[$key . '_day'];
@@ -200,7 +238,7 @@
 		$hh = ($hh > 23 ) ? 23 : $hh;
 		$mn = sprintf('%02d',$mn);
 		$mn = ($mn > 59 ) ? 59 : $mn;
-		
+
 		$events_meta[$key . '_year'] = $aa;
 		$events_meta[$key . '_month'] = $mm;
 		$events_meta[$key . '_day'] = $jj;
@@ -208,16 +246,16 @@
 		$events_meta[$key . '_minute'] = $mn;
 		$events_meta[$key . '_eventtimestamp'] = $aa . $mm . $jj . $hh . $mn;
 	}
-    
+
     	// Save Locations Meta
-    	
-    	 $events_meta['_event_location'] = $_POST['_event_location'];	
+
+    	 $events_meta['_event_location'] = $_POST['_event_location'];
          // Save venue Meta
-    	
-    	 $events_meta['_event_venue'] = $_POST['_event_venue'];	
+
+    	 $events_meta['_event_venue'] = $_POST['_event_venue'];
          // Save registration Meta
-    	
-    	 $events_meta['_event_registration'] = $_POST['_event_registration'];	
+
+    	 $events_meta['_event_registration'] = $_POST['_event_registration'];
          // Add values of $events_meta as custom fields
 
 	foreach ( $events_meta as $key => $value ) { // Cycle through the $events_meta array!
@@ -240,7 +278,7 @@
  */
 
 // Get the Month Abbreviation
- 
+
 function eventposttype_get_the_month_abbr($month) {
     global $wp_locale;
     for ( $i = 1; $i < 13; $i = $i +1 ) {
@@ -249,9 +287,9 @@
                 }
     return $monthabbr;
 }
- 
+
 // Display the date
- 
+
 function eventposttype_get_the_event_date() {
     global $post;
     $eventdate = '';
@@ -274,13 +312,13 @@
 
 /**
  * Customize Event Query using Post Meta
- * 
+ *
  * @link http://www.billerickson.net/customize-the-wordpress-query/
  * @param object $query data
  *
  */
 function be_event_query( $query ) {
-	
+
 	if( $query->is_main_query() && !$query->is_feed() && !is_admin() && $query->is_post_type_archive( 'event' ) ) {
 		$meta_query = array(
 			array(
@@ -300,4 +338,4 @@
 
 add_action( 'pre_get_posts', 'be_event_query' );
 
-?>
\ No newline at end of file
+?>

=== modified file 'functions/profile.php'
--- functions/profile.php	2014-02-27 09:41:50 +0000
+++ functions/profile.php	2018-03-21 20:24:37 +0000
@@ -19,16 +19,48 @@
     $contactmethods['location'] = 'Location (Indicate your city and country. Eg. London, United Kingdom)';
     //add user image
     //$contactmethods['user_photo'] = 'User photo';
- 
+
     return $contactmethods;
     }
     add_filter('user_contactmethods','user_profiles',10,1);
- 
+
 add_action( 'show_user_profile', 'my_show_extra_profile_fields' );
 add_action( 'edit_user_profile', 'my_show_extra_profile_fields' );
 
 add_action( 'register_form', 'ts_show_extra_register_fields' );
 
+/**
+  * updated - 21 March 2018
+  * add custom user fields to the user to rest api
+  * /wp-json/wp/v2/users?_embed=True ...
+**/
+add_action( 'rest_api_init', 'user_register_fields' );
+function user_register_fields() {
+    foreach( array (
+    'user_job_title',
+    'user_website_title',
+    'user_google',
+    'user_twitter',
+    'user_facebook',
+    'user_photo',
+    'user_location'
+    ) as $field ) {
+        register_rest_field( 'user',
+            $field,
+            array(
+                'get_callback'    => 'user_get_contact_data',
+                'update_callback' => null,
+                'schema'          => null,
+              )
+            );
+          }
+        }
+function user_get_contact_data( $user, $field_name, $request ) {
+  return get_user_meta( $user['id'], $field_name, true );
+}
+
+
+
 function my_show_extra_profile_fields( $user ) { ?>
 <h3>Extra profile information</h3>
 <table class="form-table">
@@ -59,7 +91,7 @@
 	if(current_user_can('edit_posts', $user_id ))
 		update_usermeta( $user_id, 'displayonteam', $_POST['displayonteam'] );
 	update_usermeta( $user_id, 'guestblogger', $_POST['guestblogger'] );
-}    
+}
 // end of adding custom fields to WP user profile
 
 // removing WP user profile fields
@@ -79,8 +111,8 @@
 }
 // end removing WP user profile fields
 
-// remove user bio html filtering 
+// remove user bio html filtering
 remove_filter('pre_user_description', 'wp_filter_kses');
-// end remove user bio html filtering 
+// end remove user bio html filtering
 
-?>
\ No newline at end of file
+?>