Skip to content

Commit 6b8db1d

Browse files
committed
shopinvader_schema_sale: clean schema naming
1 parent b7074c6 commit 6b8db1d

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
This addon adds pydantic schemas that represents Addresses.
2-
It introduces BillingAddress and ShippingAddress as sub classes of Address.
2+
It introduces InvoicingAddress and DeliveryAddress as sub classes of Address.
33
It has been designed and thought to be used in shopinvader services.

shopinvader_schema_sale/schemas/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .shipping import ShippingInfo
1+
from .delivery import DeliveryInfo
22
from .invoicing import InvoicingInfo
33
from .sale_order_line import SaleOrderLine
44
from .amount import SaleAmount

shopinvader_schema_sale/schemas/shipping.py renamed to shopinvader_schema_sale/schemas/delivery.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55

66
from odoo.addons.extendable_fastapi import StrictExtendableBaseModel
7-
from odoo.addons.shopinvader_schema_address.schemas import ShippingAddress
7+
from odoo.addons.shopinvader_schema_address.schemas import DeliveryAddress
88

99

10-
class ShippingInfo(StrictExtendableBaseModel):
11-
address: ShippingAddress | None = None
10+
class DeliveryInfo(StrictExtendableBaseModel):
11+
address: DeliveryAddress | None = None
1212

1313
@classmethod
1414
def from_sale_order(cls, odoo_rec):
1515
return cls.model_construct(
16-
address=(ShippingAddress.from_res_partner(odoo_rec.partner_shipping_id))
16+
address=(DeliveryAddress.from_res_partner(odoo_rec.partner_shipping_id))
1717
)

shopinvader_schema_sale/schemas/invoicing.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55

66
from odoo.addons.extendable_fastapi import StrictExtendableBaseModel
7-
from odoo.addons.shopinvader_schema_address.schemas import BillingAddress
7+
from odoo.addons.shopinvader_schema_address.schemas import InvoicingAddress
88

99

1010
class InvoicingInfo(StrictExtendableBaseModel):
11-
address: BillingAddress | None = None
11+
address: InvoicingAddress | None = None
1212

1313
@classmethod
1414
def from_sale_order(cls, odoo_rec):
1515
return cls.model_construct(
16-
address=(BillingAddress.from_res_partner(odoo_rec.partner_invoice_id))
16+
address=(InvoicingAddress.from_res_partner(odoo_rec.partner_invoice_id))
1717
)

shopinvader_schema_sale/schemas/sale_order.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
from odoo.addons.extendable_fastapi import StrictExtendableBaseModel
88

99
from .amount import SaleAmount
10+
from .delivery import DeliveryInfo
1011
from .invoicing import InvoicingInfo
1112
from .sale_order_line import SaleOrderLine
12-
from .shipping import ShippingInfo
1313

1414

1515
class Sale(StrictExtendableBaseModel):
@@ -22,10 +22,8 @@ class Sale(StrictExtendableBaseModel):
2222
date_commitment: datetime | None = None
2323
lines: List[SaleOrderLine]
2424
amount: SaleAmount | None = None
25-
# TODO discuss about this (should we keep the same schema for this field)
26-
shipping: ShippingInfo | None = None
25+
delivery: DeliveryInfo | None = None
2726
invoicing: InvoicingInfo | None = None
28-
# TODO END
2927
typology: str
3028
note: str | None = None
3129

@@ -44,7 +42,7 @@ def from_sale_order(cls, odoo_rec):
4442
SaleOrderLine.from_sale_order_line(line) for line in odoo_rec.order_line
4543
],
4644
amount=SaleAmount.from_sale_order(odoo_rec),
47-
shipping=ShippingInfo.from_sale_order(odoo_rec),
45+
delivery=DeliveryInfo.from_sale_order(odoo_rec),
4846
invoicing=InvoicingInfo.from_sale_order(odoo_rec),
4947
note=odoo_rec.note or None,
5048
)

0 commit comments

Comments
 (0)