Merge branch 'master' into refactor-views-project-versions

Author: stsewd

common

@@ -17,7 +17,6 @@
     BuildCommandViewSet,
     BuildViewSet,
     DomainViewSet,
-    NotificationViewSet,
     ProjectViewSet,
     RemoteOrganizationViewSet,
     RemoteRepositoryViewSet,
@@ -31,7 +30,6 @@
 router.register(r'command', BuildCommandViewSet, basename='buildcommandresult')
 router.register(r'version', VersionViewSet, basename='version')
 router.register(r'project', ProjectViewSet, basename='project')
-router.register(r'notification', NotificationViewSet, basename='emailhook')
 router.register(r'domain', DomainViewSet, basename='domain')
 router.register(r'sphinx_domain', SphinxDomainAPIView, basename='sphinxdomain')
 router.register(

readthedocs/api/v2/urls.py

@@ -292,15 +292,6 @@ class BuildCommandViewSet(UserSelectViewSet):
     model = BuildCommandResult
 
 
-class NotificationViewSet(viewsets.ReadOnlyModelViewSet):
-    permission_classes = (permissions.IsAuthenticated, RelatedProjectIsOwner)
-    renderer_classes = (JSONRenderer,)
-    model = EmailHook
-
-    def get_queryset(self):
-        return self.model.objects.api(self.request.user)
-
-
 class DomainViewSet(UserSelectViewSet):
     permission_classes = [APIRestrictedPermission]
     renderer_classes = (JSONRenderer,)

readthedocs/api/v2/views/model_views.py

@@ -115,15 +115,6 @@ class BuildSerializer(FlexFieldsModelSerializer):
     state = BuildStateSerializer(source='*')
     _links = BuildLinksSerializer(source='*')
 
-    expandable_fields = dict(
-        config=(
-            BuildConfigSerializer,
-            dict(
-                source='config',
-            ),
-        ),
-    )
-
     class Meta:
         model = Build
         fields = [
@@ -140,6 +131,10 @@ class Meta:
             '_links',
         ]
 
+        expandable_fields = {
+            'config': (BuildConfigSerializer, {'source': 'config'})
+        }
+
     def get_finished(self, obj):
         if obj.date and obj.length:
             return obj.date + datetime.timedelta(seconds=obj.length)
@@ -215,15 +210,6 @@ class VersionSerializer(FlexFieldsModelSerializer):
     urls = VersionURLsSerializer(source='*')
     _links = VersionLinksSerializer(source='*')
 
-    expandable_fields = dict(
-        last_build=(
-            BuildSerializer,
-            dict(
-                source='last_build',
-            ),
-        ),
-    )
-
     class Meta:
         model = Version
         fields = [
@@ -241,6 +227,12 @@ class Meta:
             '_links',
         ]
 
+        expandable_fields = {
+            'last_build': (
+                BuildSerializer, {'source': 'last_build'}
+            )
+        }
+
     def get_downloads(self, obj):
         downloads = obj.get_downloads()
         data = {}
@@ -448,18 +440,6 @@ class ProjectSerializer(FlexFieldsModelSerializer):
     created = serializers.DateTimeField(source='pub_date')
     modified = serializers.DateTimeField(source='modified_date')
 
-    expandable_fields = dict(
-        active_versions=(
-            VersionSerializer,
-            dict(
-                # NOTE: this has to be a Model method, can't be a
-                # ``SerializerMethodField`` as far as I know
-                source='active_versions',
-                many=True,
-            ),
-        ),
-    )
-
     class Meta:
         model = Project
         fields = [
@@ -489,6 +469,18 @@ class Meta:
             '_links',
         ]
 
+        expandable_fields = {
+            'active_versions': (
+                VersionSerializer,
+                {
+                    # NOTE: this has to be a Model method, can't be a
+                    # ``SerializerMethodField`` as far as I know
+                    'source': 'active_versions',
+                    'many': True,
+                }
+            )
+        }
+
     def get_homepage(self, obj):
         # Overridden only to return ``None`` when the project_url is ``''``
         return obj.project_url or None

readthedocs/api/v3/serializers.py

@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 import pytest
-from django.conf import settings
 from rest_framework.test import APIClient
 
+
 try:
     # TODO: this file is read/executed even when called from ``readthedocsinc``,
     # so it's overriding the options that we are defining in the ``conftest.py``

conftest.py renamed to readthedocs/conftest.py

@@ -27,12 +27,18 @@
     ProjectAdvertisingUpdate,
     ProjectDashboard,
     ProjectDelete,
+    ProjectNotications,
+    ProjectNoticationsDelete,
+    ProjectRedirects,
+    ProjectRedirectsDelete,
     ProjectUpdate,
+    ProjectUsersCreateList,
+    ProjectUsersDelete,
     ProjectVersionDeleteHTML,
     ProjectVersionDetail,
+    SearchAnalytics,
 )
 
-
 urlpatterns = [
     url(r'^$', ProjectDashboard.as_view(), name='projects_dashboard'),
     url(
@@ -78,20 +84,24 @@
         name='projects_delete',
     ),
     url(
-        r'^(?P<project_slug>[-\w]+)/users/$', private.project_users,
+        r'^(?P<project_slug>[-\w]+)/users/$',
+        ProjectUsersCreateList.as_view(),
         name='projects_users',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/users/delete/$',
-        private.project_users_delete, name='projects_users_delete',
+        ProjectUsersDelete.as_view(),
+        name='projects_users_delete',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/notifications/$',
-        private.project_notifications, name='projects_notifications',
+        ProjectNotications.as_view(),
+        name='projects_notifications',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/notifications/delete/$',
-        private.project_notifications_delete, name='projects_notification_delete',
+        ProjectNoticationsDelete.as_view(),
+        name='projects_notification_delete',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/translations/$',
@@ -103,20 +113,23 @@
         name='projects_translations_delete',
     ),
     url(
-        r'^(?P<project_slug>[-\w]+)/redirects/$', private.project_redirects,
+        r'^(?P<project_slug>[-\w]+)/redirects/$',
+        ProjectRedirects.as_view(),
         name='projects_redirects',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/redirects/delete/$',
-        private.project_redirects_delete, name='projects_redirects_delete',
+        ProjectRedirectsDelete.as_view(),
+        name='projects_redirects_delete',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/advertising/$',
         ProjectAdvertisingUpdate.as_view(), name='projects_advertising',
     ),
     url(
         r'^(?P<project_slug>[-\w]+)/search-analytics/$',
-        private.search_analytics_view, name='projects_search_analytics',
+        SearchAnalytics.as_view(),
+        name='projects_search_analytics',
     ),
 ]