Download as
Browse Code »

Commit 708d97c2ce578b1cf8107b557e289e179df3d983

Authored by Sergio Oliveira
1 parent bfb24ce4
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Refactoring. Removing super_archives.queries

Showing 9 changed files with 69 additions and 76 deletions   Show diff stats
TODO.rst
  Diff comments   View file @708d97c
... ... @@ -52,6 +52,7 @@ Interface
52 52 Outros
53 53 =======
54 54  
  55 +* Contabilizar votos dentro do modelo de mensagem. Com a implementação atual ordenar uma thread por votos é uma operação muito cara.
55 56 * Utilizar SOLR para listar documentos relevantes ao inves de thread.score
56 57 * Escrever casos de teste
57 58 * Criacao de repositorios distribuidos pela interface do colab
... ...
src/home/views.py
  Diff comments   View file @708d97c
... ... @@ -4,16 +4,18 @@ from collections import OrderedDict
4 4 from django.shortcuts import render
5 5 from django.utils import timezone
6 6  
7   -from haystack.query import SearchQuerySet
8   -from super_archives import queries
9 7 from search.utils import trans
  8 +from haystack.query import SearchQuerySet
  9 +
  10 +from super_archives.models import Thread
10 11  
11 12  
12 13 def index(request):
13 14 """Index page view"""
14 15  
15   - latest_threads = queries.get_latest_threads()
16   - hottest_threads = queries.get_hottest_threads()
  16 +
  17 + latest_threads = Thread.objects.all()[:6]
  18 + hottest_threads = Thread.highest_score.from_haystack()[:6]
17 19  
18 20 count_types = OrderedDict()
19 21 six_months = timezone.now() - timezone.timedelta(days=180)
... ... @@ -25,7 +27,7 @@ def index(request):
25 27  
26 28 context = {
27 29 'hottest_threads': hottest_threads[:6],
28   - 'latest_threads': latest_threads[:6],
  30 + 'latest_threads': latest_threads,
29 31 'type_count': count_types,
30 32 'latest_results': SearchQuerySet().all().order_by(
31 33 '-modified', '-created'
... ...
src/rss/feeds.py
  Diff comments   View file @708d97c
... ... @@ -7,7 +7,6 @@ from django.utils.translation import ugettext as _
7 7 from haystack.query import SearchQuerySet
8 8  
9 9 from super_archives.models import Thread
10   -from super_archives import queries
11 10  
12 11  
13 12 class LatestThreadsFeeds(Feed):
... ... @@ -15,7 +14,7 @@ class LatestThreadsFeeds(Feed):
15 14 link = '/rss/threads/latest/'
16 15  
17 16 def items(self):
18   - return queries.get_latest_threads()[:20]
  17 + return Thread.objects.all()[:20]
19 18  
20 19 def item_link(self, item):
21 20 return item.latest_message.url
... ... @@ -34,7 +33,7 @@ class HottestThreadsFeeds(Feed):
34 33 link = '/rss/threads/hottest/'
35 34  
36 35 def items(self):
37   - return queries.get_hottest_threads()[:20]
  36 + return Thread.highest_score.all()[:20]
38 37  
39 38 def item_link(self, item):
40 39 return item.latest_message.url
... ...
src/search/forms.py
  Diff comments   View file @708d97c
... ... @@ -158,7 +158,4 @@ class ColabSearchForm(SearchForm):
158 158 if self.cleaned_data['filename']:
159 159 sqs = sqs.filter(filename=self.cleaned_data['filename'])
160 160  
161   - if self.load_all:
162   - sqs = sqs.load_all()
163   -
164 161 return sqs
... ...
src/super_archives/managers.py 0 → 100644
  Diff comments   View file @708d97c
... ... @@ -0,0 +1,44 @@
  1 +
  2 +from django.db import models
  3 +
  4 +from haystack.query import SearchQuerySet
  5 +
  6 +
  7 +class NotSpamManager(models.Manager):
  8 + """Only return objects which are not marked as spam."""
  9 +
  10 + def get_query_set(self):
  11 + return super(NotSpamManager, self).get_query_set().exclude(spam=True)
  12 +
  13 +
  14 +class HighestScore(NotSpamManager):
  15 + def get_query_set(self):
  16 + queryset = super(HighestScore, self).get_query_set()
  17 + return queryset.order_by('-score', '-latest_message__received_time')
  18 +
  19 + def from_haystack(self):
  20 + return SearchQuerySet().filter(type='thread')
  21 +
  22 +
  23 +class MostVotedManager(NotSpamManager):
  24 + def get_query_set(self):
  25 + """Query for the most voted messages sorting by the sum of
  26 + voted and after by date."""
  27 +
  28 + queryset = super(MostVotedManager, self).get_query_set()
  29 +
  30 + sql = """
  31 + SELECT
  32 + count(sav.id)
  33 + FROM
  34 + super_archives_vote AS sav
  35 + WHERE
  36 + super_archives_message.id = sav.message_id
  37 + """
  38 +
  39 + messages = queryset.extra(
  40 + select={
  41 + 'vote_count': sql,
  42 + }
  43 + )
  44 + return messages.order_by('-vote_count', 'received_time')
... ...
src/super_archives/models.py
  Diff comments   View file @708d97c
... ... @@ -16,6 +16,7 @@ from haystack.query import SearchQuerySet
16 16 from taggit.managers import TaggableManager
17 17 from hitcounter.models import HitCounterModelMixin
18 18  
  19 +from .managers import NotSpamManager, MostVotedManager, HighestScore
19 20 from .utils import blocks
20 21 from .utils.etiquetador import etiquetador
21 22  
... ... @@ -23,13 +24,6 @@ from .utils.etiquetador import etiquetador
23 24 User = get_user_model()
24 25  
25 26  
26   -class NotSpamManager(models.Manager):
27   - """Only return objects which are not marked as spam."""
28   -
29   - def get_query_set(self):
30   - return super(NotSpamManager, self).get_query_set().exclude(spam=True)
31   -
32   -
33 27 class EmailAddressValidation(models.Model):
34 28 address = models.EmailField(unique=True)
35 29 user = models.ForeignKey(User, null=True,
... ... @@ -116,6 +110,7 @@ class Thread(models.Model, HitCounterModelMixin):
116 110 score = models.IntegerField(default=0, verbose_name=_(u"Score"), help_text=_(u"Thread score"))
117 111 spam = models.BooleanField(default=False)
118 112  
  113 + highest_score = HighestScore()
119 114 all_objects = models.Manager()
120 115 objects = NotSpamManager()
121 116 tags = TaggableManager()
... ... @@ -252,6 +247,7 @@ class Message(models.Model):
252 247  
253 248 all_objects = models.Manager()
254 249 objects = NotSpamManager()
  250 + most_voted = MostVotedManager()
255 251  
256 252 class Meta:
257 253 verbose_name = _(u"Message")
... ...
src/super_archives/queries.py
View file @bfb24ce
... ... @@ -1,45 +0,0 @@
1   -
2   -from django.core.exceptions import ObjectDoesNotExist
3   -from .models import Thread, Vote, Message
4   -
5   -
6   -def get_messages_by_date():
7   - return Message.objects.order_by('received_time')
8   -
9   -
10   -def get_messages_by_voted():
11   - """Query for the most voted messages sorting by the sum of
12   - voted and after by date."""
13   -
14   - sql = """
15   - SELECT
16   - count(sav.id)
17   - FROM
18   - super_archives_vote AS sav
19   - WHERE
20   - super_archives_message.id = sav.message_id
21   - """
22   - messages = Message.objects.extra(
23   - select={
24   - 'vote_count': sql,
25   - }
26   - )
27   - return messages.order_by('-vote_count', 'received_time')
28   -
29   -
30   -def get_first_message_in_thread(mailinglist, thread_token):
31   - query = get_messages_by_date()
32   - query = query.filter(thread__mailinglist__name=mailinglist)
33   - try:
34   - query = query.filter(thread__subject_token=thread_token)[0]
35   - except IndexError:
36   - raise ObjectDoesNotExist
37   - return query
38   -
39   -
40   -def get_latest_threads():
41   - return Thread.objects.order_by('-latest_message__received_time')
42   -
43   -
44   -def get_hottest_threads():
45   - return Thread.objects.order_by('-score', '-latest_message__received_time')
src/super_archives/views.py
  Diff comments   View file @708d97c
... ... @@ -20,30 +20,30 @@ from django.shortcuts import render, redirect
20 20  
21 21 from haystack.query import SearchQuerySet
22 22  
23   -from . import queries
24 23 from .utils.email import send_verification_email
25   -from .models import MailingList, Thread, EmailAddress, EmailAddressValidation
  24 +from .models import MailingList, Thread, EmailAddress, \
  25 + EmailAddressValidation, Message
26 26  
27 27  
28 28 class ThreadView(View):
29 29 http_method_names = [u'get', u'post']
30 30  
31 31 def get(self, request, mailinglist, thread_token):
32   - try:
33   - first_message = queries.get_first_message_in_thread(mailinglist,
34   - thread_token)
35   - except ObjectDoesNotExist:
36   - raise http.Http404
37 32  
38 33 thread = Thread.objects.get(subject_token=thread_token,
39 34 mailinglist__name=mailinglist)
40 35 thread.hit(request)
41 36  
  37 + try:
  38 + first_message = thread.message_set.first()
  39 + except ObjectDoesNotExist:
  40 + raise http.Http404
  41 +
42 42 order_by = request.GET.get('order')
43 43 if order_by == 'voted':
44   - msgs_query = queries.get_messages_by_voted()
  44 + msgs_query = Message.most_voted
45 45 else:
46   - msgs_query = queries.get_messages_by_date()
  46 + msgs_query = Message.objects
47 47  
48 48 msgs_query = msgs_query.filter(thread__subject_token=thread_token)
49 49 msgs_query = msgs_query.filter(thread__mailinglist__name=mailinglist)
... ...
src/templates/home.html
  Diff comments   View file @708d97c
... ... @@ -50,11 +50,10 @@
50 50 </a>
51 51 <ul class="message-list">
52 52 {% for thread in hottest_threads %}
53   - {% include "message-preview.html" with result=thread.latest_message %}
  53 + {% include "message-preview.html" with result=thread %}
54 54 {% endfor %}
55 55 </ul>
56   - <a class="column-align"
57   - href="{% url 'thread_list' %}?order=hottest">
  56 + <a href="{% url 'haystack_search' %}?type=thread">
58 57 {% trans "View more discussions..." %}
59 58 </a>
60 59 <div>&nbsp;</div>
... ... @@ -73,7 +72,7 @@
73 72 {% include "message-preview.html" with result=thread.latest_message %}
74 73 {% endfor %}
75 74 </ul>
76   - <a class="column-align" href="{% url 'thread_list' %}">
  75 + <a href="{% url 'haystack_search' %}?type=thread&order=latest">
77 76 {% trans "View more discussions..." %}
78 77 </a>
79 78 <div>&nbsp;</div>
... ...