Refactoring. Removing super_archives.queries

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