Allow connecting post to many threads

boards/migrations/0007_auto_20150205_1247.py

@@ -0,0 +1,30 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    def thread_to_threads(apps, schema_editor):
+        Post = apps.get_model('boards', 'Post')
+        for post in Post.objects.all():
+            post.threads.add(post.thread_new)
+
+    dependencies = [
+        ('boards', '0006_auto_20150201_2130'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='post',
+            name='threads',
+            field=models.ManyToManyField(to='boards.Thread'),
+            preserve_default=True,
+        ),
+        migrations.RunPython(thread_to_threads),
+        migrations.RemoveField(
+            model_name='post',
+            name='thread_new',
+        ),
+    ]

boards/migrations/0008_auto_20150205_1304.py

@@ -0,0 +1,19 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0007_auto_20150205_1247'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='threads',
+            field=models.ManyToManyField(to='boards.Thread', db_index=True),
+        ),
+    ]

boards/admin.py

@@ -10,7 +10,7 b' class PostAdmin(admin.ModelAdmin):'
     list_filter = ('pub_time',)
     search_fields = ('id', 'title', 'text')
     exclude = ('referenced_posts', 'refmap')
-    readonly_fields = ('poster_ip', 'thread_new')
+    readonly_fields = ('poster_ip', 'threads')
 
     def ban_poster(self, request, queryset):
         bans = 0

boards/models/post.py

@@ -90,11 +90,11 b' class PostManager(models.Manager):'
         post = self.create(title=title,
                            text=pre_text,
                            pub_time=posting_time,
-                           thread_new=thread,
                            poster_ip=ip,
                            poster_user_agent=UNKNOWN_UA,  # TODO Get UA at
                            # last!
                            last_edit_time=posting_time)
+        post.threads.add(thread)
 
         logger = logging.getLogger('boards.post.create')
 
@@ -212,8 +212,6 b' class Post(models.Model, Viewable):'
     poster_ip = models.GenericIPAddressField()
     poster_user_agent = models.TextField()
 
-    thread_new = models.ForeignKey('Thread', null=True, default=None,
-                                   db_index=True)
     last_edit_time = models.DateTimeField()
 
     referenced_posts = models.ManyToManyField('Post', symmetrical=False,
@@ -221,6 +219,7 b' class Post(models.Model, Viewable):'
                                               blank=True, related_name='rfp+',
                                               db_index=True)
     refmap = models.TextField(null=True, blank=True)
+    threads = models.ManyToManyField('Thread', db_index=True)
 
     def __str__(self):
         return 'P#{}/{}'.format(self.id, self.title)
@@ -300,15 +299,19 b' class Post(models.Model, Viewable):'
 
         return link
 
+    # TODO This must be removed after full transition to multiple threads
     def get_thread(self):
+        return self.get_threads().first()
+
+    def get_threads(self):
         """
         Gets post's thread.
         """
 
-        return self.thread_new
+        return self.threads
 
     def get_referenced_posts(self):
-        return self.referenced_posts.only('id', 'thread_new')
+        return self.referenced_posts.only('id', 'threads')
 
     def get_view(self, moderator=False, need_open_link=False,
                  truncated=False, *args, **kwargs):
@@ -389,7 +392,7 b' class Post(models.Model, Viewable):'
                 post_json['image_preview'] = post_image.image.url_200x150
             if include_last_update:
                 post_json['bump_time'] = datetime_to_epoch(
-                    self.thread_new.bump_time)
+                    self.get_thread().bump_time)
             return post_json
 
     def send_to_websocket(self, request, recursive=True):
@@ -422,7 +425,7 b' class Post(models.Model, Viewable):'
 
                 # If post is in this thread, its thread was already notified.
                 # Otherwise, notify its thread separately.
-                if ref_post.thread_new_id != thread_id:
+                if ref_post.get_thread().id != thread_id:
                     ref_post.send_to_websocket(request, recursive=False)
 
     def save(self, force_insert=False, force_update=False, using=None,

boards/models/thread.py

@@ -120,7 +120,7 b' class Thread(models.Model):'
         Gets sorted thread posts
         """
 
-        query = Post.objects.filter(thread_new=self)
+        query = Post.objects.filter(threads__in=[self])
         query = query.order_by('pub_time').prefetch_related('images')
         if view_fields_only:
             query = query.defer('poster_user_agent')

boards/tests/test_api.py

@@ -18,7 +18,7 b' class ApiTest(TestCase):'
 
         # Check the exact timestamp post was added
         empty_response = api.api_get_threaddiff(
-            MockRequest(), str(opening_post.thread_new.id), str(last_edit_time))
+            MockRequest(), str(opening_post.get_thread().id), str(last_edit_time))
         diff = simplejson.loads(empty_response.content)
         self.assertEqual(0, len(diff['added']),
                          'There must be no added posts in the diff.')
@@ -27,11 +27,11 b' class ApiTest(TestCase):'
 
         reply = Post.objects.create_post(title='',
                                          text='[post]%d[/post]\ntext' % opening_post.id,
-                                         thread=opening_post.thread_new)
+                                         thread=opening_post.get_thread())
 
         # Check the timestamp before post was added
         response = api.api_get_threaddiff(
-            MockRequest(), str(opening_post.thread_new.id), str(last_edit_time))
+            MockRequest(), str(opening_post.get_thread().id), str(last_edit_time))
         diff = simplejson.loads(response.content)
         self.assertEqual(1, len(diff['added']),
                          'There must be 1 added posts in the diff.')
@@ -39,7 +39,7 b' class ApiTest(TestCase):'
                          'There must be 1 updated posts in the diff.')
 
         empty_response = api.api_get_threaddiff(MockRequest(),
-                                            str(opening_post.thread_new.id),
+                                            str(opening_post.get_thread().id),
                                             str(datetime_to_epoch(reply.last_edit_time)))
         diff = simplejson.loads(empty_response.content)
         self.assertEqual(0, len(diff['added']),

boards/views/api.py

@@ -48,10 +48,10 b' def api_get_threaddiff(request, thread_i'
         'updated': [],
         'last_update': None,
     }
-    added_posts = Post.objects.filter(thread_new=thread,
+    added_posts = Post.objects.filter(threads__in=[thread],
                                       pub_time__gt=filter_time) \
         .order_by('pub_time')
-    updated_posts = Post.objects.filter(thread_new=thread,
+    updated_posts = Post.objects.filter(threads__in=[thread],
                                         pub_time__lte=filter_time,
                                         last_edit_time__gt=filter_time)
 

boards/views/thread/thread.py

@@ -37,7 +37,7 b' class ThreadView(BaseBoardView, PostMixi'
 
     def get(self, request, post_id, form: PostForm=None):
         try:
-            opening_post = Post.objects.filter(id=post_id).only('thread_new')[0]
+            opening_post = Post.objects.filter(id=post_id).first()
         except IndexError:
             raise Http404