correct comments, remove unused var (assigned_id), allow null admin_link

Author: corentinbettiol

bugboard/management/commands/updatebbdb.py

@@ -303,7 +303,6 @@ def update_task_details(self, id_project, t):
                 local_task_id=t["local_task_id"],
                 priority_id=t["priority_id"],
                 priority=t.get("priority_id", None),
-                assigned_to_id=t["assigned_to_id"],
                 status_id=t["status_id"],
                 status=t.get("status_id", None),
                 description=t["description"],

bugboard/migrations/0012_remove_task_assigned_to_id.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0b1 on 2019-10-22 09:47
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bugboard', '0011_auto_20191016_1548'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='task',
+            name='assigned_to_id',
+        ),
+    ]

bugboard/migrations/0013_auto_20191022_1404.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0b1 on 2019-10-22 12:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bugboard', '0012_remove_task_assigned_to_id'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='task',
+            name='admin_link',
+            field=models.URLField(default='#', max_length=70, null=True),
+        ),
+    ]

bugboard/models.py

@@ -49,15 +49,14 @@ class Task(models.Model):
     local_task_id = models.IntegerField(null=True)
     priority_id = models.IntegerField(null=True)
     priority = models.CharField(max_length=20, null=True)
-    assigned_to_id = models.IntegerField(null=True)
     status = models.CharField(max_length=20, null=True)
     status_id = models.IntegerField(null=True)
     description = models.TextField(null=True)
     external_id = models.IntegerField(null=True)
     requester_id = models.IntegerField(null=True)
     requester_email = models.EmailField(max_length=254, null=True)
     due_at = models.DateTimeField(null=True)
-    admin_link = models.URLField(max_length=70, default="#")
+    admin_link = models.URLField(max_length=70, default="#", null=True)
     assignee = models.ManyToManyField("Member")
     tag = models.ManyToManyField("Tag")
     comment = models.ManyToManyField("Comment")

bugboard/views.py

@@ -53,9 +53,9 @@ class CommentedView(generic.ListView):
         Task.objects
         .exclude(comment=None)  # exclude tasks with no comments
         .annotate(last_com=Max("comment__created_at"))  # add last com in queryset
-        .annotate(last_comment_member=Subquery(newest.values('member__member')[:1]))  # add last com mail
-        .exclude(last_comment_member=True)  # exclude when last com contain out url in email (member)
-        .order_by("-last_com")  # order by last com
+        .annotate(last_comment_member=Subquery(newest.values('member__member')[:1]))  # add last com status
+        .exclude(last_comment_member=True)  # exclude comments from kapt members (status var)
+        .order_by("-last_com")  # order by last com first
     )
 
     def get_context_data(self, **kwargs):