From 32915bad8aba427b4359c33ecec19e4bcda8e4f5 Mon Sep 17 00:00:00 2001 From: GerardPaligot Date: Sat, 12 Mar 2016 22:29:29 +0100 Subject: [PATCH 1/2] fix(api): Creates a post in a PM with messages. Closes #3442 --- zds/mp/api/permissions.py | 4 ++-- zds/mp/api/tests.py | 21 +++++++++++++++++++-- zds/mp/api/views.py | 17 +++++++---------- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/zds/mp/api/permissions.py b/zds/mp/api/permissions.py index 0d6c099610..eb5125d1c8 100644 --- a/zds/mp/api/permissions.py +++ b/zds/mp/api/permissions.py @@ -24,14 +24,14 @@ def has_permission(self, request, view): return private_topic.is_participant(request.user) -class IsAloneInPrivatePost(permissions.BasePermission): +class IsNotAloneInPrivatePost(permissions.BasePermission): """ Custom permission to know if a member is the only participant in a private topic. """ def has_permission(self, request, view): private_topic = get_object_or_404(PrivateTopic, pk=view.kwargs.get('pk_ptopic')) - return private_topic.participants.count() == 0 + return not private_topic.alone() class IsLastPrivatePostOfCurrentUser(permissions.BasePermission): diff --git a/zds/mp/api/tests.py b/zds/mp/api/tests.py index fcf71b9e39..d56a43cf6f 100644 --- a/zds/mp/api/tests.py +++ b/zds/mp/api/tests.py @@ -620,6 +620,7 @@ def setUp(self): authenticate_client(self.client, client_oauth2, self.profile.user.username, 'hostel77') self.private_topic = PrivateTopicFactory(author=self.profile.user) + self.private_topic.participants.add(ProfileFactory().user) caches[extensions_api_settings.DEFAULT_USE_CACHE].clear() @@ -832,16 +833,32 @@ def test_create_post_with_bad_topic_id(self): response = self.client.post(reverse('api-mp-message-list', args=[99999]), data) self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) - def test_create_post(self): + def test_create_post_in_a_private_topic_with_messages(self): """ - Creates a post in a topic + Creates a post in a private topic with existing messages. """ + PrivatePostFactory(author=self.profile.user, privatetopic=self.private_topic, position_in_topic=1) + participant = ProfileFactory() + self.private_topic.participants.add(participant.user) + PrivatePostFactory(author=participant.user, privatetopic=self.private_topic, position_in_topic=2) + data = { 'text': 'Welcome to this private post!' } response = self.client.post(reverse('api-mp-message-list', args=[self.private_topic.id]), data) self.assertEqual(response.status_code, status.HTTP_201_CREATED) + def test_create_post_without_any_participant(self): + """ + Creates a post in a topic without any participant. + """ + data = { + 'text': 'Welcome to this private post!' + } + private_topic = PrivateTopicFactory(author=self.profile.user) + response = self.client.post(reverse('api-mp-message-list', args=[private_topic.id]), data) + self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) + class PrivatePostDetailAPI(APITestCase): def setUp(self): diff --git a/zds/mp/api/views.py b/zds/mp/api/views.py index cb7cca39e7..a13c245cbf 100644 --- a/zds/mp/api/views.py +++ b/zds/mp/api/views.py @@ -16,7 +16,7 @@ from zds.api.DJRF3xPaginationKeyBit import DJRF3xPaginationKeyBit from zds.mp.api.permissions import IsParticipant, IsParticipantFromPrivatePost, IsLastPrivatePostOfCurrentUser, \ - IsAloneInPrivatePost, IsAuthor + IsAuthor, IsNotAloneInPrivatePost from zds.mp.api.serializers import PrivateTopicSerializer, PrivateTopicUpdateSerializer, PrivateTopicCreateSerializer, \ PrivatePostSerializer, PrivatePostUpdateSerializer, PrivatePostCreateSerializer from zds.mp.commons import LeavePrivateTopic, MarkPrivateTopicAsRead @@ -372,21 +372,18 @@ def post(self, request, *args, **kwargs): """ return self.create(request, *args, **kwargs) + def get_permissions(self): + permission_classes = [IsAuthenticated, IsParticipantFromPrivatePost, DRYPermissions, ] + if self.request.method == 'POST': + permission_classes.append(IsNotAloneInPrivatePost) + return [permission() for permission in permission_classes] + def get_serializer_class(self): if self.request.method == 'GET': return PrivatePostSerializer elif self.request.method == 'POST': return PrivatePostCreateSerializer - def get_permissions(self): - permission_classes = [IsAuthenticated, IsParticipantFromPrivatePost, ] - if self.request.method == 'GET': - permission_classes.append(DRYPermissions) - elif self.request.method == 'POST': - permission_classes.append(IsAloneInPrivatePost) - permission_classes.append(DRYPermissions) - return [permission() for permission in permission_classes] - def get_queryset(self): return PrivatePost.objects.get_message_of_a_private_topic(self.kwargs.get('pk_ptopic')) From 0fb9c029f7f53d74bd368192a5ee39918b880816 Mon Sep 17 00:00:00 2001 From: artragis Date: Sat, 19 Mar 2016 15:44:39 +0100 Subject: [PATCH 2/2] avoid bad pdf generation on tests --- zds/tutorialv2/tests/tests_views.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/zds/tutorialv2/tests/tests_views.py b/zds/tutorialv2/tests/tests_views.py index 40f3ba3455..bc298704b5 100644 --- a/zds/tutorialv2/tests/tests_views.py +++ b/zds/tutorialv2/tests/tests_views.py @@ -20,13 +20,14 @@ SubCategoryFactory, PublishedContentFactory, tricky_text_content, BetaContentFactory from zds.tutorialv2.models.models_database import PublishableContent, Validation, PublishedContent, ContentReaction, \ ContentRead -from zds.tutorialv2.publication_utils import publish_content from zds.gallery.factories import UserGalleryFactory from zds.gallery.models import Image from zds.forum.factories import ForumFactory, CategoryFactory from zds.forum.models import Topic, Post, TopicFollowed, TopicRead from zds.mp.models import PrivateTopic from django.utils.encoding import smart_text + +from zds.tutorialv2.publication_utils import publish_content, Publicator, PublicatorRegistery from zds.utils.models import HelpWriting, CommentDislike, CommentLike, Alert from zds.utils.factories import HelpWritingFactory from zds.utils.templatetags.interventions import interventions_topics @@ -46,6 +47,13 @@ overrided_zds_app['content']['extra_content_generation_policy'] = "SYNC" +@PublicatorRegistery.register("pdf") +class FakePDFPublicator(Publicator): + def publish(self, md_file_path, base_name, **kwargs): + with open(md_file_path[:-2] + "pdf", "w") as f: + f.write("plouf") + + @override_settings(MEDIA_ROOT=os.path.join(BASE_DIR, 'media-test')) @override_settings(ZDS_APP=overrided_zds_app) class ContentTests(TestCase):