[16.0][FIX] shopinvader_search_engine: Fix categories into products

shopinvader_product/schemas/product.py

@@ -46,7 +46,9 @@ def from_product_product(cls, odoo_rec):
             variant_count=odoo_rec.product_variant_count,
             categories=[
                 ShortProductCategory.from_product_category(shopinvader_category)
-                for shopinvader_category in odoo_rec.shopinvader_categ_ids
+                for shopinvader_category in odoo_rec.shopinvader_categ_ids.sorted(
+                    "level"
+                )
             ],
             sku=odoo_rec.default_code or None,
             variant_attributes=odoo_rec.variant_attributes,

shopinvader_search_engine/models/product_category.py

@@ -23,13 +23,17 @@ class ProductCategory(models.Model):
     @api.depends("parent_id", "parent_id.se_binding_ids")
     def _compute_parent_category(self):
         for record in self:
-            record.shopinvader_parent_id = record.parent_id._filter_by_index()
+            record.shopinvader_parent_id = (
+                record.parent_id._filter_by_bound_in_same_lang()
+            )
 
     @api.depends_context("index_id")
     @api.depends("child_id", "child_id.se_binding_ids")
     def _compute_child_category(self):
         for record in self:
-            record.shopinvader_child_ids = record.child_id._filter_by_index()
+            record.shopinvader_child_ids = (
+                record.child_id._filter_by_bound_in_same_lang()
+            )
 
     def _get_parent(self):
         self.ensure_one()

shopinvader_search_engine/models/product_template.py

@@ -10,13 +10,13 @@ class ProductTemplate(models.Model):
     def _get_categories(self):
         self.ensure_one()
         categories = super()._get_categories()
-        categories = categories._filter_by_index()
+        categories = categories._filter_by_bound_in_same_lang()
         return categories
 
     @api.model
     def _get_parent_categories(self, categ_ids):
         categories = super()._get_parent_categories(categ_ids)
-        categories = categories._filter_by_index()
+        categories = categories._filter_by_bound_in_same_lang()
         return categories
 
     @api.depends_context("index_id")

shopinvader_search_engine/models/se_indexable_record.py

@@ -16,3 +16,25 @@ def _filter_by_index(self):
                 in rec.se_binding_ids.mapped("index_id").ids
             )
         return records
+
+    def _filter_by_bound_in_same_lang(self):
+        """
+        This methods will fiter the records to only keep the ones that are bound
+        to the same lang as the current one for the current index backend.
+        :return: recordset
+        """
+        records = self
+        index_id = self.env.context.get("index_id", False)
+        if index_id:
+            index = self.env["se.index"].browse(index_id)
+            lang_id = index.lang_id
+            all_index_same_lang = index.backend_id.index_ids.filtered(
+                lambda idx, lang=lang_id: idx.lang_id == lang
+            )
+            valid_indexes = set(all_index_same_lang.ids)
+            records = records.filtered(
+                lambda rec, valid_indexes=valid_indexes: valid_indexes.intersection(
+                    set(rec.se_binding_ids.mapped("index_id").ids)
+                )
+            )
+        return records

shopinvader_search_engine/tests/common.py

@@ -57,10 +57,12 @@ def _prepare_index_values(cls, backend=None):
     def setup_records(cls, backend=None):
         backend = backend or cls.backend
         # create an index for category model
-        cls.se_index = cls.se_index_model.create(cls._prepare_index_values(backend))
+        cls.se_categ_index = cls.se_index_model.create(
+            cls._prepare_index_values(backend)
+        )
         # create a binding + category alltogether
         cls.category = cls.env["product.category"].create({"name": "Test category"})
-        cls.category_binding = cls.category._add_to_index(cls.se_index)
+        cls.category_binding = cls.category._add_to_index(cls.se_categ_index)
 
 
 class TestProductBindingMixin:
@@ -81,14 +83,16 @@ def _prepare_index_values(cls, tst_cls, backend=None):
     def setup_records(cls, tst_cls, backend=None):
         backend = backend or tst_cls.backend
         # create an index for product model
-        tst_cls.se_index = tst_cls.env["se.index"].create(
+        tst_cls.se_product_index = tst_cls.env["se.index"].create(
             cls._prepare_index_values(tst_cls, backend)
         )
         # create a binding + product alltogether
         tst_cls.product = tst_cls.env.ref(
             "shopinvader_product.product_product_chair_vortex_white"
         )
-        tst_cls.product_binding = tst_cls.product._add_to_index(tst_cls.se_index)
+        tst_cls.product_binding = tst_cls.product._add_to_index(
+            tst_cls.se_product_index
+        )
         tst_cls.product_expected = {
             "id": tst_cls.product.id,
             "name": tst_cls.product.name,

shopinvader_search_engine/tests/test_category_binding.py

@@ -27,7 +27,7 @@ def test_serialize_hierarchy_parent_not_in_index(self):
     def test_serialize_hierarchy_parent_in_index(self):
         parent_category = self._create_parent_category()
         self.category.invalidate_model()
-        parent_binding = parent_category._add_to_index(self.se_index)
+        parent_binding = parent_category._add_to_index(self.se_categ_index)
         self.category_binding.recompute_json()
         parent_data = self.category_binding.data["parent"]
         self.assertEqual(parent_data["id"], parent_category.id)

shopinvader_search_engine/tests/test_product_binding.py

@@ -1,7 +1,7 @@
 # Copyright 2023 ACSONE SA/NV
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from .common import TestProductBindingBase
+from .common import TestCategoryBindingBase, TestProductBindingBase
 
 
 class TestProductBinding(TestProductBindingBase):
@@ -17,35 +17,45 @@ def test_serialize(self):
         self.assertEqual(data["variant_attributes"], {"color": "blue"})
         self.assertEqual(data["price"], {})
 
-    def test_serialize_categories_not_in_index(self):
-        self.product_binding.recompute_json()
-        self.assertFalse(self.product_binding.data["categories"])
-
-    def test_serialize_categories_in_index(self):
-        self.product.categ_id._add_to_index(self.se_index)
-        self.product_binding.recompute_json()
-        self.assertEqual(len(self.product_binding.data["categories"]), 1)
-        category_data = self.product_binding.data["categories"][0]
-        self.assertEqual(category_data["id"], self.product.categ_id.id)
-        self.assertEqual(category_data["name"], self.product.categ_id.name)
-        self.assertEqual(category_data["level"], 0)
-
     def test_main_variant_index(self):
         variants = self.product.product_tmpl_id.product_variant_ids
         for variant in variants:
-            variant._add_to_index(self.se_index)
-        main_variant = variants.with_context(index_id=self.se_index.id).filtered("main")
+            variant._add_to_index(self.se_product_index)
+        main_variant = variants.with_context(
+            index_id=self.se_product_index.id
+        ).filtered("main")
         self.assertEqual(len(main_variant), 1)
         main_variant_binding = main_variant.se_binding_ids[0]
         main_variant_binding.recompute_json()
         self.assertTrue(main_variant_binding.data["main"])
 
         main_variant.se_binding_ids.unlink()
-        main_variant2 = variants.with_context(index_id=self.se_index.id).filtered(
-            "main"
-        )
+        main_variant2 = variants.with_context(
+            index_id=self.se_product_index.id
+        ).filtered("main")
         self.assertEqual(len(main_variant2), 1)
         self.assertNotEqual(main_variant, main_variant2)
         main_variant2_binding = main_variant2.se_binding_ids[0]
         main_variant2_binding.recompute_json()
         self.assertTrue(main_variant2_binding.data["main"])
+
+
+class TestProductCategBinding(TestProductBindingBase, TestCategoryBindingBase):
+    def test_serialize_categories_not_in_index(self):
+        self.product_binding.recompute_json()
+        self.assertFalse(self.product_binding.data["categories"])
+
+    def test_serialize_categories_in_index(self):
+        self.product.categ_id._add_to_index(self.se_categ_index)
+        self.product_binding.recompute_json()
+        self.assertEqual(len(self.product_binding.data["categories"]), 1)
+        category_data = self.product_binding.data["categories"][0]
+        self.assertEqual(category_data["id"], self.product.categ_id.id)
+        self.assertEqual(category_data["name"], self.product.categ_id.name)
+        self.assertEqual(category_data["level"], 0)
+
+    def test_serialize_categories_in_index_other_lang(self):
+        self.se_categ_index.lang_id = self.env.ref("base.lang_fr").id
+        self.product.categ_id._add_to_index(self.se_categ_index)
+        self.product_binding.recompute_json()
+        self.assertFalse(self.product_binding.data["categories"])

shopinvader_search_engine_product_seo/tests/test_product_seo_title.py

@@ -15,7 +15,7 @@ class TestProductBinding(BaseTestProductBinding):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.product = cls.product.with_context(index_id=cls.se_index.id)
+        cls.product = cls.product.with_context(index_id=cls.se_product_index.id)
 
     def test_suffix_empty(self):
         """