Merge remote-tracking branch 'origin/master' into swaggerlikeus

Conflicts:
	data/database.py
	endpoints/api.py
	endpoints/common.py
	templates/base.html
	test/data/test.db
	test/specs.py

endpoints/api/user.py

@@ -1,5 +1,6 @@
 import logging
 import stripe
+import json
 
 from flask import request
 from flask.ext.login import logout_user
@@ -8,7 +9,7 @@ from flask.ext.principal import identity_changed, AnonymousIdentity
 from app import app
 from endpoints.api import (ApiResource, nickname, resource, validate_json_request, request_error,
                            log_action, internal_only, NotFound, Unauthorized, require_user_admin,
-                           require_user_read, InvalidToken, require_scope)
+                           require_user_read, InvalidToken, require_scope, format_date)
 from endpoints.api.subscribe import subscribe
 from endpoints.common import common_login
 from data import model
@@ -60,6 +61,15 @@ def user_view(user):
   }
 
 
+def notification_view(notification):
+  return {
+    'organization': notification.target.username if notification.target.organization else None,
+    'kind': notification.kind.name,
+    'created': format_date(notification.created),
+    'metadata': json.loads(notification.metadata_json),
+  }
+
+
 @resource('/v1/user/')
 class User(ApiResource):
   """ Operations related to users. """
@@ -364,3 +374,15 @@ class Recovery(ApiResource):
     code = model.create_reset_password_email_code(email)
     send_recovery_email(email, code.code)
     return 'Created', 201
+
+
+@resource('/v1/user/notifications')
+@internal_only
+class UserNotificationList(ApiResource):
+  @require_user_admin
+  @nickname('listUserNotifications')
+  def get(self):
+    notifications = model.list_notifications(get_authenticated_user())
+    return {
+      'notifications': [notification_view(notification) for notification in notifications]
+    }