shopinvader_sale_schema: rebase and adapt schema due to rename

sebastienbeau · sebastienbeau · commit 797a9ade6cdc · 2023-11-06T12:14:30.000+01:00
diff --git a/shopinvader_api_cart/README.rst b/shopinvader_api_cart/README.rst
@@ -2,12 +2,12 @@
 Shopinvader API Cart
 ====================
 
-..
+.. 
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:792f0721582c562cc8cfe12901de4f14675b05872328b4a45740e6d36d03c3ba
+   !! source digest: sha256:fb9cf2727f9362d01ff445db7b0f4fec146b5ae940dc86bcd86f93f32d67f3db
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/shopinvader_api_cart/schemas/__init__.py b/shopinvader_api_cart/schemas/__init__.py
@@ -2,7 +2,7 @@
     CartTransaction,
     CartSyncInput,
     CartUpdateInput,
-    ShippingUpdateInfo,
+    DeliveryUpdateInfo,
     InvoicingUpdateInfo,
 )
 from .sale import Sale
diff --git a/shopinvader_api_cart/schemas/cart.py b/shopinvader_api_cart/schemas/cart.py
@@ -16,7 +16,7 @@ class CartSyncInput(StrictExtendableBaseModel):
     transactions: List[CartTransaction]
 
 
-class ShippingUpdateInfo(StrictExtendableBaseModel):
+class DeliveryUpdateInfo(StrictExtendableBaseModel):
     address_id: int
 
 
@@ -26,7 +26,7 @@ class InvoicingUpdateInfo(StrictExtendableBaseModel):
 
 class CartUpdateInput(StrictExtendableBaseModel):
     client_order_ref: str | None = None
-    delivery: ShippingUpdateInfo | None = None
+    delivery: DeliveryUpdateInfo | None = None
     invoicing: InvoicingUpdateInfo | None = None
     note: str | None = None
 
diff --git a/shopinvader_api_cart/static/description/index.html b/shopinvader_api_cart/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Shopinvader API Cart</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:792f0721582c562cc8cfe12901de4f14675b05872328b4a45740e6d36d03c3ba
+!! source digest: sha256:fb9cf2727f9362d01ff445db7b0f4fec146b5ae940dc86bcd86f93f32d67f3db
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/shopinvader/odoo-shopinvader/tree/16.0/shopinvader_api_cart"><img alt="shopinvader/odoo-shopinvader" src="https://img.shields.io/badge/github-shopinvader%2Fodoo--shopinvader-lightgray.png?logo=github" /></a></p>
 <p>This addon adds a web API on top of the sale.order model to ease the creation of
diff --git a/shopinvader_api_cart/tests/test_shopinvader_api_cart.py b/shopinvader_api_cart/tests/test_shopinvader_api_cart.py
@@ -427,7 +427,7 @@ def test_update(self) -> None:
         partner = self.default_fastapi_authenticated_partner
         address = self.env["res.partner"].create(
             {
-                "name": "Shipping",
+                "name": "Delivery",
                 "parent_id": partner.id,
                 "type": "delivery",
             }
diff --git a/shopinvader_schema_sale/README.rst b/shopinvader_schema_sale/README.rst
@@ -7,7 +7,7 @@ Shopinvader Schema Sale
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:b7a7593ab3d956ea3e0a59974fce3318d7fd7e9edd070764e31f1e45bd469489
+   !! source digest: sha256:c8b7462f165d2fa1cabd4ae45966b2757853a772179d780733500f730d8de274
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
@@ -23,7 +23,7 @@ Shopinvader Schema Sale
 |badge1| |badge2| |badge3|
 
 This addon adds pydantic schemas that represents Addresses.
-It introduces BillingAddress and ShippingAddress as sub classes of Address.
+It introduces InvoicingAddress and DeliveryAddress as sub classes of Address.
 It has been designed and thought to be used in shopinvader services.
 
 .. IMPORTANT::
diff --git a/shopinvader_schema_sale/readme/DESCRIPTION.rst b/shopinvader_schema_sale/readme/DESCRIPTION.rst
@@ -1,3 +1,3 @@
 This addon adds pydantic schemas that represents Addresses.
-It introduces BillingAddress and ShippingAddress as sub classes of Address.
+It introduces InvoicingAddress and DeliveryAddress as sub classes of Address.
 It has been designed and thought to be used in shopinvader services.
diff --git a/shopinvader_schema_sale/schemas/__init__.py b/shopinvader_schema_sale/schemas/__init__.py
@@ -1,4 +1,4 @@
-from .shipping import ShippingInfo
+from .delivery import DeliveryInfo
 from .invoicing import InvoicingInfo
 from .sale_order_line import SaleOrderLine
 from .amount import SaleAmount
diff --git a/shopinvader_schema_sale/schemas/delivery.py b/shopinvader_schema_sale/schemas/delivery.py
@@ -4,14 +4,14 @@
 
 
 from odoo.addons.extendable_fastapi import StrictExtendableBaseModel
-from odoo.addons.shopinvader_schema_address.schemas import ShippingAddress
+from odoo.addons.shopinvader_schema_address.schemas import DeliveryAddress
 
 
-class ShippingInfo(StrictExtendableBaseModel):
-    address: ShippingAddress | None = None
+class DeliveryInfo(StrictExtendableBaseModel):
+    address: DeliveryAddress | None = None
 
     @classmethod
     def from_sale_order(cls, odoo_rec):
         return cls.model_construct(
-            address=(ShippingAddress.from_res_partner(odoo_rec.partner_shipping_id))
+            address=(DeliveryAddress.from_res_partner(odoo_rec.partner_shipping_id))
         )
diff --git a/shopinvader_schema_sale/schemas/invoicing.py b/shopinvader_schema_sale/schemas/invoicing.py
@@ -4,14 +4,14 @@
 
 
 from odoo.addons.extendable_fastapi import StrictExtendableBaseModel
-from odoo.addons.shopinvader_schema_address.schemas import BillingAddress
+from odoo.addons.shopinvader_schema_address.schemas import InvoicingAddress
 
 
 class InvoicingInfo(StrictExtendableBaseModel):
-    address: BillingAddress | None = None
+    address: InvoicingAddress | None = None
 
     @classmethod
     def from_sale_order(cls, odoo_rec):
         return cls.model_construct(
-            address=(BillingAddress.from_res_partner(odoo_rec.partner_invoice_id))
+            address=(InvoicingAddress.from_res_partner(odoo_rec.partner_invoice_id))
         )
diff --git a/shopinvader_schema_sale/schemas/sale_order.py b/shopinvader_schema_sale/schemas/sale_order.py
@@ -11,9 +11,9 @@
 from odoo.addons.extendable_fastapi import StrictExtendableBaseModel
 
 from .amount import SaleAmount
+from .delivery import DeliveryInfo
 from .invoicing import InvoicingInfo
 from .sale_order_line import SaleOrderLine
-from .shipping import ShippingInfo
 
 
 class Sale(StrictExtendableBaseModel):
@@ -25,7 +25,7 @@ class Sale(StrictExtendableBaseModel):
     date_commitment: datetime | None = None
     lines: List[SaleOrderLine]
     amount: SaleAmount | None = None
-    shipping: ShippingInfo | None = None
+    delivery: DeliveryInfo | None = None
     invoicing: InvoicingInfo | None = None
     typology: str
     note: str | None = None
@@ -44,7 +44,7 @@ def from_sale_order(cls, odoo_rec):
                 SaleOrderLine.from_sale_order_line(line) for line in odoo_rec.order_line
             ],
             amount=SaleAmount.from_sale_order(odoo_rec),
-            shipping=ShippingInfo.from_sale_order(odoo_rec),
+            delivery=DeliveryInfo.from_sale_order(odoo_rec),
             invoicing=InvoicingInfo.from_sale_order(odoo_rec),
             note=odoo_rec.note or None,
         )
diff --git a/shopinvader_schema_sale/static/description/index.html b/shopinvader_schema_sale/static/description/index.html
@@ -367,11 +367,11 @@ <h1 class="title">Shopinvader Schema Sale</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:b7a7593ab3d956ea3e0a59974fce3318d7fd7e9edd070764e31f1e45bd469489
+!! source digest: sha256:c8b7462f165d2fa1cabd4ae45966b2757853a772179d780733500f730d8de274
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/shopinvader/odoo-shopinvader/tree/16.0/shopinvader_schema_sale"><img alt="shopinvader/odoo-shopinvader" src="https://img.shields.io/badge/github-shopinvader%2Fodoo--shopinvader-lightgray.png?logo=github" /></a></p>
 <p>This addon adds pydantic schemas that represents Addresses.
-It introduces BillingAddress and ShippingAddress as sub classes of Address.
+It introduces InvoicingAddress and DeliveryAddress as sub classes of Address.
 It has been designed and thought to be used in shopinvader services.</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`CartTransaction,`
`3`	`3`	`CartSyncInput,`
`4`	`4`	`CartUpdateInput,`
`5`		`- ShippingUpdateInfo,`
	`5`	`+ DeliveryUpdateInfo,`
`6`	`6`	`InvoicingUpdateInfo,`
`7`	`7`	`)`
`8`	`8`	`from .sale import Sale`
Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ def test_update(self) -> None:`
`427`	`427`	`partner = self.default_fastapi_authenticated_partner`
`428`	`428`	`address = self.env["res.partner"].create(`
`429`	`429`	`{`
`430`		`- "name": "Shipping",`
	`430`	`+ "name": "Delivery",`
`431`	`431`	`"parent_id": partner.id,`
`432`	`432`	`"type": "delivery",`
`433`	`433`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from .shipping import ShippingInfo`
	`1`	`+from .delivery import DeliveryInfo`
`2`	`2`	`from .invoicing import InvoicingInfo`
`3`	`3`	`from .sale_order_line import SaleOrderLine`
`4`	`4`	`from .amount import SaleAmount`