Rename MergeQueue to MergeTask

mygpo/administration/tasks.py

@@ -4,7 +4,7 @@
 from mygpo.podcasts.models import Podcast
 from mygpo.celery import celery
 from mygpo.maintenance.merge import PodcastMerger
-from mygpo.maintenance.models import MergeQueue
+from mygpo.maintenance.models import MergeTask
 
 from celery.utils.log import get_task_logger
 logger = get_task_logger(__name__)
@@ -28,6 +28,6 @@ def merge_podcasts(podcast_ids, num_groups, queue_id=''):
     if queue_id:
         qid = uuid.UUID(queue_id)
         logger.info('Deleting merge queue entry {}'.format(qid))
-        MergeQueue.objects.filter(id=qid).delete()
+        MergeTask.objects.filter(id=qid).delete()
 
     return podcast

mygpo/administration/views.py

@@ -24,7 +24,7 @@
 from mygpo.administration.auth import require_staff
 from mygpo.administration.group import PodcastGrouper
 from mygpo.maintenance.merge import PodcastMerger, IncorrectMergeException
-from mygpo.maintenance.models import MergeQueue
+from mygpo.maintenance.models import MergeTask
 from mygpo.administration.clients import UserAgentStats, ClientStats
 from mygpo.administration.tasks import merge_podcasts
 from mygpo.utils import get_git_head
@@ -91,11 +91,11 @@ class MergeSelect(AdminView):
     template_name = 'admin/merge-select.html'
 
     def get(self, request):
-        queue_length = MergeQueue.objects.count()
+        queue_length = MergeTask.objects.count()
 
         use_queue = bool(request.GET.get('queue', False))
         if use_queue:
-            queue = MergeQueue.objects.first()
+            queue = MergeTask.objects.first()
             urls = [podcast.url for podcast in queue.podcasts]
             queue_id = queue.id.hex
 

mygpo/maintenance/admin.py

@@ -3,25 +3,25 @@
 from . import models
 
 
-class MergeQueueEntryInline(admin.TabularInline):
-    model = models.MergeQueueEntry
+class MergeTaskEntryInline(admin.TabularInline):
+    model = models.MergeTaskEntry
 
     fields = ['podcast', ]
     readonly_fields = ['podcast', ]
 
 
-@admin.register(models.MergeQueue)
-class MergeQueueAdmin(admin.ModelAdmin):
+@admin.register(models.MergeTask)
+class MergeTaskAdmin(admin.ModelAdmin):
 
-    model = models.MergeQueue
+    model = models.MergeTask
 
     readonly_fields = ['id', ]
     list_display = ['id', 'num_entries',]
 
     show_full_result_count = False
 
     inlines = [
-        MergeQueueEntryInline,
+        MergeTaskEntryInline,
     ]
 
     def num_entries(self, obj):

mygpo/maintenance/merge.py

@@ -237,7 +237,7 @@ def reassigned(obj, new):
     elif isinstance(obj, HistoryEntry):
         pass
 
-    elif isinstance(obj, models.MergeQueueEntry):
+    elif isinstance(obj, models.MergeTaskEntry):
         obj.delete()
         return True
 

mygpo/maintenance/migrations/0004_rename_mergetask.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-08-13 07:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maintenance', '0003_rel_name'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='MergeQueue',
+            new_name='MergeTask',
+        ),
+        migrations.RenameModel(
+            old_name='MergeQueueEntry',
+            new_name='MergeTaskEntry',
+        ),
+    ]

mygpo/maintenance/models.py

@@ -4,7 +4,7 @@
 from mygpo.podcasts.models import Podcast
 
 
-class MergeQueue(UUIDModel):
+class MergeTask(UUIDModel):
     """ A Group of podcasts that could be merged """
 
     @property
@@ -16,12 +16,12 @@ def podcasts(self):
         return podcasts
 
 
-class MergeQueueEntry(UUIDModel):
-    """ An entry in a MergeQueue """
+class MergeTaskEntry(UUIDModel):
+    """ An entry in a MergeTask """
 
     podcast = models.ForeignKey(Podcast, on_delete=models.CASCADE)
 
-    queue = models.ForeignKey(MergeQueue,
+    queue = models.ForeignKey(MergeTask,
                               on_delete=models.CASCADE,
                               related_name='entries',
                               related_query_name='entry')

mygpo/maintenance/tasks.py

@@ -38,7 +38,7 @@ def populate_merge_queue():
         mqs = _get_merge_queues(podcasts)
 
         if len(mqs) == 0:
-            mq = models.MergeQueue.objects.create(id=uuid.uuid4())
+            mq = models.MergeTask.objects.create(id=uuid.uuid4())
 
         if len(mqs) == 1:
             mq = mqs.pop()
@@ -53,15 +53,15 @@ def populate_merge_queue():
                 continue
 
             # add to merge queue
-            mqe = models.MergeQueueEntry.objects.create(
+            mqe = models.MergeTaskEntry.objects.create(
                 id=uuid.uuid4(),
                 podcast=podcast,
                 queue=mq,
             )
 
 
 def _get_merge_queues(podcasts):
-    mqs = models.MergeQueue.objects.filter(
+    mqs = models.MergeTask.objects.filter(
         mergequeueentry__podcast__in=podcasts,
     ).distinct()
     return set(mqs)