Merge pull request #1398 from glogiotatidis/generate-all-bundles-if-d…

…ist-changes

[Fix #1394] Re-generate all bundles when DistBundle updates.

snippets/base/management/commands/generate_bundles.py

@@ -34,7 +34,10 @@ def handle(self, *args, **options):
             self.stdout.write(
                 'Generating bundles with Jobs modified on or after {}'.format(options['timestamp'])
             )
-            total_jobs = Job.objects.filter(snippet__modified__gte=options['timestamp'])
+            total_jobs = Job.objects.filter(
+                Q(snippet__modified__gte=options['timestamp']) |
+                Q(distribution__distributionbundle__modified__gte=options['timestamp'])
+            ).distinct()
 
         if not total_jobs:
             self.stdout.write('Nothing to do…')

snippets/base/tests/test_commands.py

@@ -5,6 +5,7 @@
 from django.conf import settings
 from django.core.management import call_command
 from django.core.management.base import CommandError
+from django.db.models import Q
 from django.test.utils import override_settings
 
 from snippets.base import models
@@ -291,17 +292,20 @@ def setUp(self):
 
     def test_generate_all(self):
         with patch('snippets.base.management.commands.generate_bundles.Job') as job_mock:
-            job_mock.objects.all.return_value = []
+            job_mock.objects.all.return_value = models.Job.objects.none()
             call_command('generate_bundles', stdout=Mock())
         job_mock.objects.all.assert_called()
         job_mock.objects.filter.assert_not_called()
 
     def test_generate_after_timestamp(self):
         with patch('snippets.base.management.commands.generate_bundles.Job') as job_mock:
-            job_mock.objects.filter.return_value = []
+            job_mock.objects.filter.return_value = models.Job.objects.none()
             call_command('generate_bundles', timestamp='2019-01-01', stdout=Mock())
         job_mock.objects.all.assert_not_called()
-        job_mock.objects.filter.assert_called_with(snippet__modified__gte='2019-01-01')
+        job_mock.objects.filter.assert_called_with(
+            Q(snippet__modified__gte='2019-01-01') |
+            Q(distribution__distributionbundle__modified__gte='2019-01-01')
+        )
 
     @override_settings(MEDIA_BUNDLES_PREGEN_ROOT='pregen')
     def test_generation(self):