Added index

diff --git a/tweet/migrations/0008_auto_20160218_2208.py b/tweet/migrations/0008_auto_20160218_2208.py
new file mode 100644 (file)
index 0000000..90377d9
--- /dev/null
+++ b/tweet/migrations/0008_auto_20160218_2208.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-02-18 22:08
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tweet', '0007_auto_20160205_1132'),
+    ]
+
+    operations = [
+        migrations.AlterIndexTogether(
+            name='tweet',
+            index_together=set([('conforms_to_terms', 'id'), ('conforms_to_terms', 'created_at')]),
+        ),
+    ]

diff --git a/tweet/models.py b/tweet/models.py
index 9240bc7265255db601367f0cd7d506e8f4ed483e..ec72eb8b7ff9185e7ca9b0fcc8a9f0d61c7b999b 100644 (file)
--- a/tweet/models.py
+++ b/tweet/models.py
@@ -60,6 +60,10 @@ class Tweet(models.Model):
 
     class Meta:
         db_table = "tweet"
+        index_together = [
+            ['conforms_to_terms', 'created_at'],
+            ['conforms_to_terms', 'id'],
+        ]
 
     @staticmethod
     def from_status(status):

diff --git a/tweet/views.py b/tweet/views.py
index 4b4587a66663877476b9c9872d1917b5c38725ea..4ef0bc0bc2cbf5533a82455f8c9cde9c2f9fd8d1 100644 (file)
--- a/tweet/views.py
+++ b/tweet/views.py
@@ -123,8 +123,8 @@ def list_stream(request):
     except EmptyPage:
         tweet = paginator.page(paginator.num_pages)
 
-    hourly_tweets = Tweet.objects.filter(created_at__gt = timezone.now() - datetime.timedelta(hours=1)).count()
-    daily_tweets = Tweet.objects.filter(created_at__gt = timezone.now() - datetime.timedelta(days=1)).count()
+    hourly_tweets = Tweet.objects.filter(conforms_to_terms = True, created_at__gt = timezone.now() - datetime.timedelta(hours=1)).count()
+    daily_tweets = Tweet.objects.filter(conforms_to_terms = True, created_at__gt = timezone.now() - datetime.timedelta(days=1)).count()
     return render(request, 'tweet/list_stream.html', {'tweets':tweets,
         'terms':terms, 'hourly': hourly_tweets, 'daily': daily_tweets, 
         'total': total_tweets})