WIP: clean code

akretion · Feb 13, 2024 · 993d33c · 993d33c
1 parent 9cb6675
commit 993d33c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/shopinvader_api_cart/schemas/__init__.py b/shopinvader_api_cart/schemas/__init__.py
@@ -1,5 +1,4 @@
 from .cart import (
-    CartTransactionOption,
     CartTransaction,
     CartSyncInput,
     CartUpdateInput,

diff --git a/shopinvader_api_cart/schemas/cart.py b/shopinvader_api_cart/schemas/cart.py
@@ -6,24 +6,14 @@
 
 from extendable_pydantic import StrictExtendableBaseModel
 
-
-class CartTransactionOption(StrictExtendableBaseModel):
-    """Optionnal information for transaction"""
-
-    @classmethod
-    def _prepare_from_sale_line(cls, line):
-        return {}
-
-    @classmethod
-    def from_sale_line(cls, line):
-        return cls.model_validate(cls._prepare_from_line(line))
+from odoo.addons.shopinvader_schema_sale.schemas.sale_line_option import SaleLineOption
 
 
 class CartTransaction(StrictExtendableBaseModel):
     uuid: UUID | None = None
     qty: float
     product_id: int
-    options: CartTransactionOption | None = None
+    options: SaleLineOption | None = None
 
 
 class CartSyncInput(StrictExtendableBaseModel, extra="ignore"):

diff --git a/shopinvader_schema_sale/schemas/sale_line.py b/shopinvader_schema_sale/schemas/sale_line.py
@@ -4,6 +4,7 @@
 from extendable_pydantic import StrictExtendableBaseModel
 
 from .amount import SaleLineAmount
+from .sale_line_option import SaleLineOption
 
 
 class SaleLine(StrictExtendableBaseModel):
@@ -12,6 +13,7 @@ class SaleLine(StrictExtendableBaseModel):
     name: str
     amount: SaleLineAmount | None = None
     qty: float
+    options: SaleLineOption | None = None
 
     @classmethod
     def from_sale_order_line(cls, odoo_rec):
@@ -21,4 +23,5 @@ def from_sale_order_line(cls, odoo_rec):
             name=odoo_rec.name,
             amount=SaleLineAmount.from_sale_order_line(odoo_rec),
             qty=odoo_rec.product_uom_qty,
+            options=SaleLineOption.from_sale_order_line(odoo_rec),
         )
diff --git a/shopinvader_schema_sale/schemas/sale_line_option.py b/shopinvader_schema_sale/schemas/sale_line_option.py
@@ -7,9 +7,9 @@
 
 class SaleLineOption(StrictExtendableBaseModel):
     @classmethod
-    def _prepare_from_sale_line(cls, line):
+    def _prepare_from_sale_order_line(cls, line):
         return {}
 
     @classmethod
-    def from_sale_line(cls, line):
-        return cls.model_validate(cls._prepare_from_sale_line(line))
+    def from_sale_order_line(cls, line):
+        return cls.model_validate(cls._prepare_from_sale_order_line(line))