The changes made in this commit include:

- Modified `name` and `display_name` fields in `DataSourceFactory` to use a sequence with a prefix.
- Modified `name` and `display_name` fields in `SourceSubdivisionFactory` to use a sequence with a prefix.
- Modified `description` field in `SourceSubdivisionFactory` to generate fake text with a maximum of 250 characters.
- Modified `name` field in `GeographyFactory` to use a sequence with a prefix.
- Modified `name` field in `PathogenFactory` to use a sequence with a prefix.
- Modified `name` field in `SignalCategoryFactory` to use a sequence with a prefix.
- Modified `name` field in `SignalTypeFactory` to use a sequence with a prefix.
- Modified `name` field in `SignalFactory` to use a sequence with a prefix.
- Modified `short_description` and `description` fields in `SignalFactory` to generate fake text with a maximum of 500 characters.
- Added test cases for filtering and searching in `SignalListViewTest`.
- Added test cases for `SignalDetailViewTest`.
- Removed unnecessary code in `SignalsListView` view.

Author: BrainIsDead

src/datasources/factories.py

@@ -14,8 +14,8 @@ class DataSourceFactory(DjangoModelFactory):
     class Meta:
         model = DataSource
 
-    name = Sequence(lambda n: f'{n}')
-    display_name = Sequence(lambda n: f'{n}')
+    name = Sequence(lambda n: f'datasource_name_{n}')
+    display_name = Sequence(lambda n: f'datasource_display_name_{n}')
 
 
 class SourceSubdivisionFactory(DjangoModelFactory):
@@ -25,8 +25,8 @@ class SourceSubdivisionFactory(DjangoModelFactory):
     class Meta:
         model = SourceSubdivision
 
-    name = Sequence(lambda n: f'{n}')
-    display_name = Sequence(lambda n: f'{n}')
-    description = fake.text()
+    name = Sequence(lambda n: f'subdicision_name_{n}')
+    display_name = Sequence(lambda n: f'subdicision_display_name_{n}')
+    description = fake.text(max_nb_chars=250)
     db_source = fake.word()
     data_source = SubFactory(DataSourceFactory)

src/signals/factories.py

@@ -30,7 +30,7 @@ class GeographyFactory(DjangoModelFactory):
     class Meta:
         model = Geography
 
-    name = Sequence(lambda n: f'{n}')
+    name = Sequence(lambda n: f'geography_name_{n}')
 
 
 class PathogenFactory(DjangoModelFactory):
@@ -40,7 +40,7 @@ class PathogenFactory(DjangoModelFactory):
     class Meta:
         model = Pathogen
 
-    name = Sequence(lambda n: f'{n}')
+    name = Sequence(lambda n: f'pathogen_name_{n}')
 
 
 class SignalCategoryFactory(DjangoModelFactory):
@@ -50,7 +50,7 @@ class SignalCategoryFactory(DjangoModelFactory):
     class Meta:
         model = SignalCategory
 
-    name = Sequence(lambda n: f'{n}')
+    name = Sequence(lambda n: f'category_name_{n}')
 
 
 class SignalTypeFactory(DjangoModelFactory):
@@ -60,14 +60,14 @@ class SignalTypeFactory(DjangoModelFactory):
     class Meta:
         model = SignalType
 
-    name = Sequence(lambda n: f'{n}')
+    name = Sequence(lambda n: f'signal_type_name_{n}')
 
 
 class SignalFactory(DjangoModelFactory):
     """
     A factory for the Signal model.
     """
-    name = Sequence(lambda n: f'{n}')
+    name = Sequence(lambda n: f'signal_name_{n}')
     active = fake.boolean()
     short_description = fake.text(max_nb_chars=500)
     description = fake.text(max_nb_chars=500)

src/signals/tests.py

@@ -1,8 +1,12 @@
-from django.test import TestCase
+from unittest.mock import patch
+
+from django.test import TestCase, override_settings
 from django.urls import reverse
 from faker import Faker
 
+from base.models import Link
 from signals.factories import SignalFactory
+from signals.models import Signal
 
 fake = Faker()
 
@@ -26,8 +30,65 @@ def test_signal_list_view_context(self):
         self.assertTrue('paginator' in response.context)
         self.assertTrue('filter' in response.context)
 
-    def test_signal_list_view_filter_by_pathogen(self):
+    def test_signal_list_view_filters(self):
         signal = SignalFactory()
         response = self.client.get(reverse('signals'), {'pathogen': signal.pathogen.first().id})
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context['signals'].count(), 1)
+        self.assertEqual(response.context['filter'].qs.count(), 1)
+        self.assertEqual(response.context['filter'].qs.first(), signal)
+        response = self.client.get(reverse('signals'), {'available_geography': signal.available_geography.first().id})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['filter'].qs.count(), 1)
+        self.assertEqual(response.context['filter'].qs.first(), signal)
+        response = self.client.get(reverse('signals'), {'signal_type': signal.signal_type.first().id})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['filter'].qs.count(), 1)
+        self.assertEqual(response.context['filter'].qs.first(), signal)
+        response = self.client.get(reverse('signals'), {'category': signal.category.id})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['filter'].qs.count(), 1)
+        self.assertEqual(response.context['filter'].qs.first(), signal)
+        response = self.client.get(reverse('signals'), {'source': signal.source.id})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['filter'].qs.count(), 1)
+        self.assertEqual(response.context['filter'].qs.first(), signal)
+        response = self.client.get(reverse('signals'), {'time_label': signal.time_label})
+        self.assertEqual(response.status_code, 200)
+        for s in response.context['filter'].qs:
+            self.assertEqual(s.time_label, signal.time_label)
+
+    def test_signal_list_view_search(self):
+        name = fake.random_element(Signal.objects.all()).name
+        description_word = fake.random_element(fake.random_element(Signal.objects.all()).description.split(' ')).strip()
+        short_description_word = fake.random_element(fake.random_element(Signal.objects.all()).short_description.split(' ')).strip()
+        response = self.client.get(reverse('signals'), {'search': name})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['filter'].qs.count(), 1)
+        self.assertEqual(response.context['filter'].qs.first().name, name)
+        response = self.client.get(reverse('signals'), {'search': description_word})
+        self.assertEqual(response.status_code, 200)
+        for s in response.context['filter'].qs:
+            self.assertTrue(description_word in s.description)
+        response = self.client.get(reverse('signals'), {'search': short_description_word})
+        self.assertEqual(response.status_code, 200)
+        for s in response.context['filter'].qs:
+            self.assertTrue(short_description_word in s.short_description)
+
+
+@override_settings(CACHES={'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}})
+class SignalDetailViewTest(TestCase):
+
+    def setUp(self):
+        self.signal = SignalFactory()
+
+    def test_signal_detail_view(self):
+        with patch.object(Link, 'get_preview'):
+            response = self.client.get(reverse('signal', kwargs={'pk': self.signal.id}))
+            self.assertEqual(response.status_code, 200)
+            self.assertTemplateUsed(response, 'signals/signal_detail.html')
+
+    def test_signal_detail_view_context(self):
+        with patch.object(Link, 'get_preview'):
+            response = self.client.get(reverse('signal', kwargs={'pk': self.signal.id}))
+            self.assertTrue('signal' in response.context)
+            self.assertEqual(response.context['signal'], self.signal)

src/signals/views.py

@@ -16,8 +16,6 @@ class SignalsListView(ListView):
     def get_queryset(self):
         queryset = super().get_queryset()
         f = SignalFilter(self.request.GET, queryset=queryset)
-        for i in queryset:
-            i.get_base_diffs()
         return f.qs
 
     def get_context_data(self, **kwargs):