From c9706122a2c0ebf8c08b8b959d6ad2beb76e1622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 5 Jun 2014 17:51:52 +0200 Subject: [PATCH] Removing things from the votes __init__ file --- taiga/projects/api.py | 20 +++++++++++--------- taiga/projects/issues/api.py | 16 +++++++++------- taiga/projects/votes/__init__.py | 7 ------- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/taiga/projects/api.py b/taiga/projects/api.py index 2756c65f..9d140e34 100644 --- a/taiga/projects/api.py +++ b/taiga/projects/api.py @@ -40,7 +40,9 @@ from . import serializers from . import models from . import permissions from . import services -from . import votes +from .votes.utils import attach_votescount_to_queryset +from .votes import services as votes_service +from .votes import serializers as votes_serializers class ProjectAdminViewSet(ModelCrudViewSet): @@ -50,7 +52,7 @@ class ProjectAdminViewSet(ModelCrudViewSet): def get_queryset(self): qs = models.Project.objects.all() - qs = votes.attach_votescount_to_queryset(qs, as_field="stars_count") + qs = attach_votescount_to_queryset(qs, as_field="stars_count") return qs def pre_save(self, obj): @@ -71,7 +73,7 @@ class ProjectViewSet(ModelCrudViewSet): def get_queryset(self): qs = models.Project.objects.all() - qs = votes.attach_votescount_to_queryset(qs, as_field="stars_count") + qs = attach_votescount_to_queryset(qs, as_field="stars_count") qs = qs.filter(Q(owner=self.request.user) | Q(members=self.request.user)) return qs.distinct() @@ -84,13 +86,13 @@ class ProjectViewSet(ModelCrudViewSet): @detail_route(methods=['post'], permission_classes=(IsAuthenticated,)) def star(self, request, pk=None): project = self.get_object() - votes.add_vote(project, user=request.user) + votes_service.add_vote(project, user=request.user) return Response(status=status.HTTP_200_OK) @detail_route(methods=['post'], permission_classes=(IsAuthenticated,)) def unstar(self, request, pk=None): project = self.get_object() - votes.remove_vote(project, user=request.user) + votes_service.remove_vote(project, user=request.user) return Response(status=status.HTTP_200_OK) @detail_route(methods=['get']) @@ -328,13 +330,13 @@ class ProjectTemplateViewSet(ModelCrudViewSet): class FansViewSet(ModelCrudViewSet): - serializer_class = votes.serializers.VoterSerializer - list_serializer_class = votes.serializers.VoterSerializer + serializer_class = votes_serializers.VoterSerializer + list_serializer_class = votes_serializers.VoterSerializer permission_classes = (IsAuthenticated,) def get_queryset(self): project = models.Project.objects.get(pk=self.kwargs.get("project_id")) - return votes.get_voters(project) + return votes_service.get_voters(project) class StarredViewSet(ModelCrudViewSet): @@ -343,4 +345,4 @@ class StarredViewSet(ModelCrudViewSet): permission_classes = (IsAuthenticated,) def get_queryset(self): - return votes.get_voted(self.kwargs.get("user_id"), model=models.Project) + return votes_service.get_voted(self.kwargs.get("user_id"), model=models.Project) diff --git a/taiga/projects/issues/api.py b/taiga/projects/issues/api.py index 3f2cb8f4..393057c3 100644 --- a/taiga/projects/issues/api.py +++ b/taiga/projects/issues/api.py @@ -29,7 +29,9 @@ from taiga.base.api import ModelCrudViewSet from taiga.projects.mixins.notifications import NotificationSenderMixin -from .. import votes +from taiga.projects.votes.utils import attach_votescount_to_queryset +from taiga.projects.votes import services as votes_service +from taiga.projects.votes import serializers as votes_serializers from . import models from . import permissions from . import serializers @@ -116,7 +118,7 @@ class IssueViewSet(NotificationSenderMixin, ModelCrudViewSet): def get_queryset(self): qs = self.model.objects.all() - qs = votes.attach_votescount_to_queryset(qs, as_field="votes_count") + qs = attach_votescount_to_queryset(qs, as_field="votes_count") return qs def pre_save(self, obj): @@ -149,21 +151,21 @@ class IssueViewSet(NotificationSenderMixin, ModelCrudViewSet): @detail_route(methods=['post'], permission_classes=(IsAuthenticated,)) def upvote(self, request, pk=None): issue = self.get_object() - votes.add_vote(issue, user=request.user) + votes_service.add_vote(issue, user=request.user) return Response(status=status.HTTP_200_OK) @detail_route(methods=['post'], permission_classes=(IsAuthenticated,)) def downvote(self, request, pk=None): issue = self.get_object() - votes.remove_vote(issue, user=request.user) + votes_service.remove_vote(issue, user=request.user) return Response(status=status.HTTP_200_OK) class VotersViewSet(ModelCrudViewSet): - serializer_class = votes.serializers.VoterSerializer - list_serializer_class = votes.serializers.VoterSerializer + serializer_class = votes_serializers.VoterSerializer + list_serializer_class = votes_serializers.VoterSerializer permission_classes = (IsAuthenticated,) def get_queryset(self): issue = models.Issue.objects.get(pk=self.kwargs.get("issue_id")) - return votes.get_voters(issue) + return votes_service.get_voters(issue) diff --git a/taiga/projects/votes/__init__.py b/taiga/projects/votes/__init__.py index cfa9356b..e69de29b 100644 --- a/taiga/projects/votes/__init__.py +++ b/taiga/projects/votes/__init__.py @@ -1,7 +0,0 @@ -from .services import add_vote -from .services import remove_vote -from .services import get_voters -from .services import get_votes -from .services import get_voted -from .utils import attach_votescount_to_queryset -from . import serializers