Merge pull request #85 from django-oscar/search-child-upc

[FEAT] Search for child upc should return parent product

Author: viggo-devries

oscar_elasticsearch/search/fixtures/catalogue/catalogue.json

@@ -89,6 +89,40 @@
         "is_discountable": true
     }
 },
+{
+    "model": "catalogue.product",
+    "pk": 6,
+    "fields": {
+        "structure": "parent",
+        "upc": "jk4000",
+        "parent": null,
+        "title": "sixty eight",
+        "slug": "sixty-eight",
+        "description": "<p style=\"margin: 0px; font-stretch: normal; font-size: 12px; line-height: normal; font-family: Helvetica;\">Nullam sapien eros, facilisis vel, eleifend non, auctor dapibus, pede.</p>",
+        "product_class": 2,
+        "rating": null,
+        "date_created": "2018-11-16T08:28:11.730Z",
+        "date_updated": "2018-11-16T08:37:39.853Z",
+        "is_discountable": true
+    }
+},
+{
+    "model": "catalogue.product",
+    "pk": 7,
+    "fields": {
+        "structure": "child",
+        "upc": "kq8000",
+        "parent": 6,
+        "title": "forty five",
+        "slug": "forty-five",
+        "description": "<p style=\"margin: 0px; font-stretch: normal; font-size: 12px; line-height: normal; font-family: Helvetica;\">Nullam sapien eros, facilisis vel, eleifend non, auctor dapibus, pede.</p>",
+        "product_class": 2,
+        "rating": null,
+        "date_created": "2018-11-16T08:28:11.730Z",
+        "date_updated": "2018-11-16T08:37:39.853Z",
+        "is_discountable": true
+    }
+},
 {
     "model": "catalogue.category",
     "pk": 1,
@@ -147,6 +181,14 @@
         "category": 1
     }
 },
+{
+    "model": "catalogue.productcategory",
+    "pk": 5,
+    "fields": {
+        "product": 6,
+        "category": 1
+    }
+},
 {
     "model": "catalogue.productattribute",
     "pk": 1,
@@ -846,6 +888,22 @@
         "date_updated": "2018-11-16T08:28:11.797Z"
     }
 },
+{
+    "model": "partner.stockrecord",
+    "pk": 5,
+    "fields": {
+        "product": 7,
+        "partner": 1,
+        "partner_sku": "jik090",
+        "price_currency": "EUR",
+        "price": "12.00",
+        "num_in_stock": 34,
+        "num_allocated": null,
+        "low_stock_threshold": 8,
+        "date_created": "2018-11-16T08:28:11.797Z",
+        "date_updated": "2018-11-16T08:28:11.797Z"
+    }
+},
 {
     "model": "partner.partner",
     "pk": 1,

oscar_elasticsearch/search/mappings/products/mappings.py

@@ -148,6 +148,7 @@ def string_attrs(self):
         if self.source.structure == Product.PARENT:
             for child in self.source.children:
                 attrs.append(child.title)
+                attrs.append(child.upc)
                 attrs.extend([str(a) for a in child.attributes.values()])
 
         return attrs

oscar_elasticsearch/search/tests.py

@@ -61,6 +61,17 @@ def test_search_suggestion(self):
         response = self.client.get("%s?q=prods" % url)
         self.assertEqual(response.context["suggestion"], "produ")
 
+    def test_child_upc_search_suggests_parent(self):
+        url = reverse("search:search")
+        # searching for child upc
+        response = self.client.get("%s?q=kq8000" % url)
+        self.assertEqual(response.context["paginator"].count, 1)
+        self.assertEqual(response.context["paginator"].instances[0].upc, "jk4000")
+        # searching for child title
+        response = self.client.get("%s?q=forty" % url)
+        self.assertEqual(response.context["paginator"].count, 1)
+        self.assertEqual(response.context["paginator"].instances[0].upc, "jk4000")
+
     def test_browse(self):
         url = reverse("catalogue:index")
         response = self.client.get(url)