Просмотр исходного кода

remove old /read/ edge from threads api

Rafał Pitoń 8 лет назад
Родитель
Сommit
7814f366ca
2 измененных файлов с 3 добавлено и 49 удалено
  1. 3 28
      misago/threads/api/threads.py
  2. 0 21
      misago/threads/tests/test_threads_api.py

+ 3 - 28
misago/threads/api/threads.py

@@ -6,17 +6,11 @@ from rest_framework import viewsets
 from rest_framework.decorators import detail_route, list_route
 from rest_framework.response import Response
 
-from misago.acl import add_acl
-from misago.categories.models import THREADS_ROOT_NAME, Category
-from misago.categories.permissions import allow_browse_category, allow_see_category
-from misago.core.shortcuts import get_int_or_404, get_object_or_404
-from misago.readtracker.categoriestracker import read_category
+from misago.categories.models import THREADS_ROOT_NAME
+from misago.core.shortcuts import get_int_or_404
 
-from ..models import Post, Subscription, Thread
+from ..models import Post, Thread
 from ..moderation import threads as moderation
-from ..permissions.threads import can_start_thread
-from ..subscriptions import make_subscription_aware
-from ..threadtypes import trees_map
 from ..viewmodels.thread import ForumThread
 from .postingendpoint import PostingEndpoint
 from .threadendpoints.editor import thread_start_editor
@@ -109,25 +103,6 @@ class ThreadViewSet(ViewSet):
     def threads_merge(self, request):
         return threads_merge_endpoint(request)
 
-    @list_route(methods=['post'])
-    def read(self, request):
-        if request.query_params.get('category'):
-            threads_tree_id = trees_map.get_tree_id_for_root(THREADS_ROOT_NAME)
-
-            category_id = get_int_or_404(request.query_params.get('category'))
-            category = get_object_or_404(Category,
-                id=category_id,
-                tree_id=threads_tree_id,
-            )
-
-            allow_see_category(request.user, category)
-            allow_browse_category(request.user, category)
-        else:
-            category = Category.objects.root_category()
-
-        read_category(request.user, category)
-        return Response({'detail': 'ok'})
-
     @list_route(methods=['get'])
     def editor(self, request):
         return thread_start_editor(request)

+ 0 - 21
misago/threads/tests/test_threads_api.py

@@ -188,24 +188,3 @@ class ThreadDeleteApiTests(ThreadsApiTestCase):
 
         response = self.client.delete(self.api_link)
         self.assertEqual(response.status_code, 403)
-
-
-class ThreadsReadApiTests(ThreadsApiTestCase):
-    def setUp(self):
-        super(ThreadsReadApiTests, self).setUp()
-        self.api_link = '/api/threads/read/'
-
-    def test_read_all_threads(self):
-        """api sets all threads as read"""
-        response = self.client.post(self.api_link)
-        self.assertEqual(response.status_code, 200)
-
-        self.assertEqual(self.user.categoryread_set.count(), 1)
-
-    def test_read_threads_in_category(self):
-        """api sets threads in category as read"""
-        response = self.client.post(
-            '%s?category=%s' % (self.api_link, self.category.pk))
-        self.assertEqual(response.status_code, 200)
-
-        self.assertEqual(self.user.categoryread_set.count(), 1)