Merge pull request #285 from Ilhasoft/staging

Order by repository

bothub/common/migrations/0032_repository_total_updates.py

@@ -0,0 +1,31 @@
+# Generated by Django 2.1.5 on 2019-08-14 19:45
+
+from django.db import migrations, models
+
+from bothub.common.models import RepositoryUpdate
+from bothub.common.models import Repository
+
+
+def updateRepository(apps, schema_editor):
+    for update in RepositoryUpdate.objects.all().filter(
+        trained_at__isnull=False
+    ):
+        repository = Repository.objects.get(uuid=update.repository.uuid)
+        repository.total_updates += 1
+        repository.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0031_auto_20190502_1732'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='repository',
+            name='total_updates',
+            field=models.IntegerField(default=0, verbose_name='total updates'),
+        ),
+        migrations.RunPython(updateRepository),
+    ]

bothub/common/models.py

@@ -61,7 +61,7 @@ def order_by_relevance(self):
         return self \
             .annotate(votes_summ=models.Sum('votes__vote')) \
             .annotate(examples_sum=models.Sum('updates__added')) \
-            .order_by('-votes_summ', '-examples_sum', '-created_at')
+            .order_by('-total_updates', '-examples_sum', '-created_at')
 
     def supported_language(self, language):
         valid_examples = RepositoryExample.objects.filter(
@@ -175,6 +175,13 @@ class Meta:
         _('created at'),
         auto_now_add=True)
 
+    total_updates = models.IntegerField(
+        _('total updates'),
+        default=0,
+        blank=False,
+        null=False
+    )
+
     objects = RepositoryManager()
 
     nlp_train_url = '{}train/'.format(settings.BOTHUB_NLP_BASE_URL)
@@ -631,6 +638,8 @@ def save_training(self, bot_data):
 
         self.trained_at = timezone.now()
         self.bot_data = base64.b64encode(bot_data).decode('utf8')
+        self.repository.total_updates += 1
+        self.repository.save()
         self.save(
             update_fields=[
                 'trained_at',

bothub/common/tests.py

@@ -290,6 +290,7 @@ def test_last_trained_update(self):
         self.assertEqual(
             update_1,
             self.repository.last_trained_update())
+        self.assertEqual(self.repository.total_updates, 1)
 
     def test_available_languages(self):
         available_languages = self.repository.available_languages