Merge c83ee67 into bb1d8e6

Author: rtibbles

contentcuration/contentcuration/models.py

@@ -303,8 +303,6 @@ def check_space(self, size, checksum):
 
     def check_channel_space(self, channel):
         active_files = self.get_user_active_files()
-        active_size = float(active_files.aggregate(used=Sum('file_size'))['used'] or 0)
-
         staging_tree_id = channel.staging_tree.tree_id
         channel_files = self.files\
                             .filter(contentnode__tree_id=staging_tree_id)\
@@ -313,7 +311,7 @@ def check_channel_space(self, channel):
                             .exclude(checksum__in=active_files.values_list('checksum', flat=True))
         staged_size = float(channel_files.aggregate(used=Sum('file_size'))['used'] or 0)
 
-        if self.get_available_space(active_files=active_files) < (active_size + staged_size):
+        if self.get_available_space(active_files=active_files) < (staged_size):
             raise PermissionDenied(_('Out of storage! Request more space under Settings > Storage.'))
 
     def check_staged_space(self, size, checksum):

contentcuration/contentcuration/tests/views/test_views_base.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+"""
+Tests for contentcuration.views.internal functions.
+"""
+from django.core.urlresolvers import reverse_lazy
+
+from ..base import BaseAPITestCase
+from contentcuration.models import Channel
+from contentcuration.utils.db_tools import TreeBuilder
+
+
+class APIActivateChannelEndpointTestCase(BaseAPITestCase):
+    def test_200_post(self):
+        main_tree = TreeBuilder(user=self.user)
+        staging_tree = TreeBuilder(user=self.user)
+        self.channel.main_tree = main_tree.root
+        self.channel.staging_tree = staging_tree.root
+        self.channel.save()
+        response = self.post(
+            reverse_lazy("activate_channel"), {"channel_id": self.channel.id}
+        )
+        self.assertEqual(response.status_code, 200)
+
+    def test_404_no_permission(self):
+        new_channel = Channel.objects.create()
+        staging_tree = TreeBuilder(user=self.user, levels=1)
+        new_channel.staging_tree = staging_tree.root
+        new_channel.save()
+        response = self.post(
+            reverse_lazy("activate_channel"), {"channel_id": new_channel.id}
+        )
+        self.assertEqual(response.status_code, 404)
+
+    def test_200_no_change_in_space(self):
+        main_tree = TreeBuilder(user=self.user)
+        staging_tree = TreeBuilder(user=self.user)
+        self.channel.main_tree = main_tree.root
+        self.channel.staging_tree = staging_tree.root
+        self.channel.save()
+        self.user.disk_space = self.user.get_space_used(active_files=self.user.get_user_active_files())
+        self.user.save()
+        response = self.post(
+            reverse_lazy("activate_channel"), {"channel_id": self.channel.id}
+        )
+        self.assertEqual(response.status_code, 200)

contentcuration/contentcuration/views/base.py

@@ -14,8 +14,8 @@
 from django.db.models import Q
 from django.db.models import Subquery
 from django.http import HttpResponse
-from django.http import HttpResponseBadRequest
 from django.http import HttpResponseForbidden
+from django.http import HttpResponseNotFound
 from django.shortcuts import redirect
 from django.shortcuts import render
 from django.urls import is_valid_path
@@ -324,14 +324,15 @@ def accessible_channels(request, channel_id):
     return Response(map(map_channel_data, channels_data))
 
 
+@api_view(['POST'])
+@authentication_classes((SessionAuthentication,))
+@permission_classes((IsAuthenticated,))
 def activate_channel_endpoint(request):
-    if request.method != "POST":
-        return HttpResponseBadRequest(
-            "Only POST requests are allowed on this endpoint."
-        )
-
     data = json.loads(request.body)
-    channel = Channel.objects.get(pk=data["channel_id"])
+    try:
+        channel = Channel.filter_edit_queryset(Channel.objects.all(), request.user).get(pk=data["channel_id"])
+    except Channel.DoesNotExist:
+        return HttpResponseNotFound("Channel not found")
     changes = []
     try:
         change = activate_channel(channel, request.user)