#645 Search by series (#648)

* #645  Search by series

* #645  Fix code style

stroyprombeton/models.py

@@ -79,6 +79,23 @@ def get_series(self) -> models.QuerySet:
         )
 
 
+class SeriesQuerySet(models.QuerySet):
+
+    def bind_fields(self):
+        """Prefetch or select typical related fields to reduce sql queries count."""
+        return self.select_related('page')
+
+    def active(self):
+        return self.filter(page__is_active=True)
+
+
+class SeriesManager(models.Manager.from_queryset(SeriesQuerySet)):
+    """Get all products of given category by Category's id or instance."""
+
+    def active(self):
+        return self.get_queryset().active()
+
+
 # @todo #510:60m  Create Series navigation.
 #  See the parent's task body for details about navigation.
 #  This task depends on Series page creation.
@@ -89,6 +106,8 @@ class Series(pages.models.PageMixin):
     It's like Category, but has no hierarchy.
     """
 
+    objects = SeriesManager()
+
     SLUG_HASH_SIZE = 5
     SLUG_MAX_LENGTH = 50
 

stroyprombeton/tests/tests_views.py

@@ -566,6 +566,10 @@ def test_robots_success(self):
         self.assertEqual(self.response.status_code, 200)
 
 
+# @todo #60m:  Create arch for the Search tests.
+#  Create code, that will be able to test search
+#  by dataset presented in pattern "term -> results".
+#  Maybe hypothesis lib will be helpful for it.
 @tag('fast')
 class Search(TestCase):
     """Test all search methods: search page and autocompletes."""
@@ -613,15 +617,15 @@ def test_search_by_product_name(self):
         first = soup.find(class_='table-link')
         self.assertEqual(product.name, first.text.strip())
 
-    def test_search_by_id(self):
+    def test_id_results(self):
         """Search view should return redirect on model page, if id was received as term."""
         product = models.Product.objects.first()
         self.assertContains(
             self.search(term=str(product.id)),
             product.name,
         )
 
-    def test_search_has_results(self):
+    def test_some_results(self):
         """Search page should contain at least one result for right term."""
         response = self.search(term=self.TERM)
         self.assertEqual(response.status_code, 200)
@@ -631,7 +635,17 @@ def test_search_has_results(self):
         self.assertContains(response, '<title>')
         self.assertContains(response, '<td class="table-td table-name">')
 
-    def test_search_no_results(self):
+    def test_series_results(self):
+        """Search page should contain at least one result for right term."""
+        response = self.search(term='Serie')
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, _('Series'))
+        # search page should contain not only results.
+        # But markup, menu links and so on.
+        self.assertContains(response, '<title>')
+        self.assertContains(response, '<td class="table-td table-name">')
+
+    def test_no_results(self):
         """Search page should not contain results for wrong term."""
         response = self.search(term=self.WRONG_TERM)
         self.assertEqual(response.status_code, 200)

stroyprombeton/views/search.py

@@ -14,7 +14,14 @@ class Search(search_views.SearchView):
             name='category',
             qs=stb_models.Category.objects.active(),
             # ignore CPDBear
-            fields=['name', 'specification'],
+            fields=['name'],
+            min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
+        ),
+        search_engine.Search(
+            name='series',
+            qs=stb_models.Series.objects.active(),
+            # ignore CPDBear
+            fields=['name'],
             min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
         ),
         search_engine.Search(
@@ -59,6 +66,13 @@ class Autocomplete(search_views.AutocompleteView):
 
     # ignore CPDBear
     search_entities = [
+        search_engine.Search(
+            name='category',
+            qs=stb_models.Category.objects.active(),
+            # ignore CPDBear
+            fields=['name'],
+            min_similarity=settings.TRIGRAM_MIN_SIMILARITY,
+        ),
         search_engine.Search(
             name='product',
             qs=stb_models.Option.objects.active(),