Merge PR #1408 into 16.0

Signed-off-by lmignon

.pre-commit-config.yaml

@@ -51,7 +51,6 @@ exclude: |
   ^shopinvader_pos/|
   ^shopinvader_price_per_qty/|
   ^shopinvader_product_attribute_set/|
-  ^shopinvader_product_brand/|
   ^shopinvader_product_brand_image/|
   ^shopinvader_product_brand_tag/|
   ^shopinvader_product_manufactured_for/|

setup/shopinvader_product_brand/odoo/addons/shopinvader_product_brand

@@ -0,0 +1 @@
+../../../../shopinvader_product_brand

setup/shopinvader_product_brand/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

setup/shopinvader_search_engine_product_brand/odoo/addons/shopinvader_search_engine_product_brand

@@ -0,0 +1 @@
+../../../../shopinvader_search_engine_product_brand

setup/shopinvader_search_engine_product_brand/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

shopinvader_product_brand/__init__.py

@@ -1 +1,2 @@
 from . import models
+from . import schemas

shopinvader_product_brand/__manifest__.py

@@ -6,30 +6,25 @@
 {
     "name": "Shopinvader Product Brand",
     "summary": "Shopinvader product Brand",
-    "version": "14.0.1.3.1",
+    "version": "16.0.1.0.0",
     "category": "Shopinvader",
     "website": "https://github.com/shopinvader/odoo-shopinvader",
     "author": " Akretion",
     "license": "AGPL-3",
     "application": False,
-    "installable": False,
-    "external_dependencies": {
-        "python": [],
-        "bin": [],
-    },
+    "installable": True,
     "depends": [
+        # OCA
         "product_brand",
-        # To avoid too much glue module we directly depend of shopinvader_search_engine
-        # if someone really need this module without the search part please do a PR
-        "shopinvader_search_engine",
+        # Shopinvader
+        "shopinvader_base_url",
+        "shopinvader_product",
+        "shopinvader_product_seo",
     ],
     "data": [
         "views/product_brand_view.xml",
-        "views/shopinvader_brand_view.xml",
-        "views/shopinvader_backend_view.xml",
-        "data/ir_export_brand.xml",
-        "data/ir_export_product.xml",
-        "security/ir.model.access.csv",
     ],
     "demo": [],
+    "external_dependencies": {"python": ["extendable_pydantic>=1.2.0"]},
+    "development_status": "Alpha",
 }

shopinvader_product_brand/models/__init__.py

@@ -1,4 +1 @@
-from . import shopinvader_brand
 from . import product_brand
-from . import shopinvader_product
-from . import shopinvader_backend

shopinvader_product_brand/models/product_brand.py

@@ -6,16 +6,11 @@
 
 
 class ProductBrand(models.Model):
-    _inherit = "product.brand"
+    _name = "product.brand"
+    _inherit = ["product.brand", "seo.title.mixin", "abstract.url"]
 
-    shopinvader_bind_ids = fields.One2many(
-        "shopinvader.brand",
-        "record_id",
-        string="Shopinvader Binding",
-        context={"active_test": False},
-    )
-    active = fields.Boolean(default=True, inverse="_inverse_active")
-
-    def _inverse_active(self):
-        brands = self.filtered(lambda p: not p.active)
-        brands.mapped("shopinvader_bind_ids").write({"active": False})
+    active = fields.Boolean(default=True)
+    sequence = fields.Integer()
+    meta_description = fields.Char()
+    meta_keywords = fields.Char()
+    short_description = fields.Text()

shopinvader_product_brand/readme/CONTRIBUTORS.rst

@@ -1,2 +1,3 @@
 * Sebastien BEAU <[email protected]>
 * Simone Orsi <[email protected]>
+* Marie Lejeune <[email protected]>

shopinvader_product_brand/readme/DESCRIPTION.rst

@@ -1,3 +1,12 @@
-This module allow you to manage brand on your `Shopinvader`_ website
+This module focus on the serialization of brand information into JSON objects
+in the context of the `Shopinvader`_ project. These information are mainly used
+to be made available for a `Shopinvader`_ website through an export to search
+engine indexation services like ElasticSearch / OpenSearch.
+
+* It defines a new specific Pydantic model to be used to serialize a *product.brand*
+  record into a JSON object.
+
+* It extends the ProductProduct Pydantic model to add the brand information in the
+  JSON exported for a product.product record.
 
 .. _Shopinvader: https://shopinvader.com

shopinvader_product_brand/schemas/__init__.py

@@ -0,0 +1,2 @@
+from .brand import ProductBrand
+from .product import ProductTemplate

shopinvader_product_brand/schemas/brand.py

@@ -0,0 +1,32 @@
+# Copyright 2023 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from extendable_pydantic import StrictExtendableBaseModel
+
+
+class ProductBrand(StrictExtendableBaseModel):
+    id: int
+    name: str
+    sequence: int | None = None
+    description: str | None = None
+    short_description: str | None = None
+    meta_description: str | None = None
+    meta_keywords: str | None = None
+    seo_title: str | None = None
+    url_key: str | None = None
+    redirect_url_key: str | None = None
+
+    @classmethod
+    def from_product_brand(cls, odoo_rec):
+        return cls.model_construct(
+            id=odoo_rec.id,
+            name=odoo_rec.name,
+            sequence=odoo_rec.sequence or None,
+            description=odoo_rec.description or None,
+            short_description=odoo_rec.short_description or None,
+            meta_description=odoo_rec.meta_description or None,
+            meta_keywords=odoo_rec.meta_keywords or None,
+            seo_title=odoo_rec.seo_title or None,
+            url_key=odoo_rec.url_key or None,
+            redirect_url_key=odoo_rec.redirect_url_key or None,
+        )

shopinvader_product_brand/schemas/product.py

@@ -0,0 +1,22 @@
+# Copyright 2023 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo.addons.shopinvader_product.schemas import (
+    ProductTemplate as BaseProductTemplate,
+)
+
+from . import ProductBrand
+
+
+class ProductTemplate(BaseProductTemplate, extends=True):
+    brand: ProductBrand | None = None
+
+    @classmethod
+    def from_product_template(cls, odoo_rec):
+        obj = super().from_product_template(odoo_rec)
+        obj.brand = (
+            ProductBrand.from_product_brand(odoo_rec.product_brand_id)
+            if odoo_rec.product_brand_id
+            else None
+        )
+        return obj