Merge PR #14 into 16.0

Signed-off-by sebastienbeau

Author: shopinvader-git-bot

shopinvader_api_delivery_carrier/__manifest__.py

@@ -56,5 +56,7 @@
         "security/acl_product_product.xml",
         "security/acl_stock_picking.xml",
         "security/acl_stock_picking_type.xml",
+        "security/acl_stock_move.xml",
+        "security/acl_stock_move_line.xml",
     ],
 }

shopinvader_api_delivery_carrier/routers/delivery.py

@@ -17,22 +17,23 @@
 from odoo.addons.shopinvader_filtered_model.utils import FilteredModelAdapter
 from odoo.addons.stock.models.stock_picking import Picking as StockPicking
 
-from ..schemas import Picking
+from ..schemas import Picking, PickingSearch
 
 delivery_router = APIRouter(tags=["deliveries"])
 
 
 @delivery_router.get("/deliveries")
 def search(
+    params: Annotated[PickingSearch, Depends()],
     env: Annotated[api.Environment, Depends(authenticated_partner_env)],
     partner: Annotated["ResPartner", Depends(authenticated_partner)],
-    paging_: Annotated[Paging, Depends(paging)],
+    paging: Annotated[Paging, Depends(paging)],
 ) -> PagedCollection[Picking]:
     """Return all outgoing Deliveries for the authenticated partner."""
     count, pickings = (
         env["shopinvader_api_delivery_carrier.delivery_router.helper"]
         .new({"partner": partner})
-        ._search(paging_)
+        ._search(paging, params)
     )
     return PagedCollection[Picking](
         count=count, items=[Picking.from_picking(picking) for picking in pickings]
@@ -45,10 +46,11 @@ class ShopinvaderApiDeliveryRouterHelper(models.AbstractModel):
 
     partner = fields.Many2one("res.partner")
 
+    def _get_picking_sale_domain(self):
+        return [("typology", "=", "sale"), ("partner_id", "=", self.partner.id)]
+
     def _get_domain_adapter(self):
-        sales = self.env["sale.order"].search(
-            [("typology", "=", "sale"), ("partner_id", "=", self.partner.id)]
-        )
+        sales = self.env["sale.order"].search(self._get_picking_sale_domain())
         return [
             ("sale_id", "in", sales.ids),
             ("picking_type_id.code", "=", "outgoing"),
@@ -58,9 +60,9 @@ def _get_domain_adapter(self):
     def model_adapter(self) -> FilteredModelAdapter[StockPicking]:
         return FilteredModelAdapter[StockPicking](self.env, self._get_domain_adapter())
 
-    def _search(self, paging) -> tuple[int, StockPicking]:
+    def _search(self, paging, params) -> tuple[int, StockPicking]:
         return self.model_adapter.search_with_count(
-            [],
+            domain=params.to_odoo_domain(self.env),
             limit=paging.limit,
             offset=paging.offset,
         )

shopinvader_api_delivery_carrier/schemas/__init__.py

@@ -4,7 +4,7 @@
     DeliveryCarrierInput,
     DeliveryCarrierSearch,
 )
-from .picking import Picking
+from .picking import Picking, PickingSearch
 from .delivery import DeliveryInfo, DeliveryAmount
 from .amount import SaleAmount
 from .sale_line import SaleLine

shopinvader_api_delivery_carrier/schemas/picking.py

@@ -2,23 +2,116 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from datetime import datetime
+from enum import Enum
+from typing import Annotated
 
 from extendable_pydantic import StrictExtendableBaseModel
 from pydantic import Field
 
+from odoo import api
+from odoo.tools.float_utils import json_float_round
+
 from ..schemas import DeliveryCarrier
 
 
+class PickingState(str, Enum):
+    """Enum for picking states."""
+
+    draft = "draft"
+    waiting = "waiting"
+    confirmed = "confirmed"
+    assigned = "assigned"
+    done = "done"
+    cancel = "cancel"
+
+
+class PickingSearch(StrictExtendableBaseModel):
+    name: Annotated[
+        str | None,
+        Field(
+            description="Name of the picking. If not provided, all names are returned.",
+        ),
+    ] = None
+    state: Annotated[
+        PickingState | None,
+        Field(
+            description="State of the picking. If not provided, all states are returned.",
+        ),
+    ] = None
+    tracking_reference: Annotated[
+        str | None,
+        Field(
+            description="Tracking reference of the picking. If not provided, "
+            "all references are returned.",
+        ),
+    ] = None
+    carrier_id: Annotated[
+        int | None,
+        Field(
+            description="ID of the carrier. If not provided, all carriers are returned.",
+        ),
+    ] = None
+    sale_id: Annotated[
+        int | None,
+        Field(
+            description="ID of the sale order. If not provided, all sales are returned.",
+        ),
+    ] = None
+
+    def to_odoo_domain(self, env: api.Environment):
+        domain = []
+
+        if self.name:
+            domain.append(("name", "=", self.name))
+        if self.state:
+            domain.append(("state", "=", self.state.value))
+        if self.tracking_reference:
+            domain.append(("carrier_tracking_ref", "=", self.tracking_reference))
+        if self.carrier_id:
+            domain.append(("carrier_id", "=", self.carrier_id))
+        if self.sale_id:
+            domain.append(("sale_id", "=", self.sale_id))
+        return domain
+
+
+class PickingLine(StrictExtendableBaseModel):
+    product_id: int
+    product_name: str
+    state: str
+    qty: float
+    qty_done: float
+
+    @classmethod
+    def from_picking_line(cls, odoo_rec):
+        return cls.model_construct(
+            product_id=odoo_rec.product_id.id,
+            product_name=odoo_rec.product_id.name,
+            state=odoo_rec.state,
+            qty=json_float_round(
+                odoo_rec.product_uom_qty,
+                precision_digits=len(str(odoo_rec.product_uom.rounding).split(".")[1]),
+            ),
+            qty_done=json_float_round(
+                odoo_rec.quantity_done,
+                precision_digits=len(str(odoo_rec.product_uom.rounding).split(".")[1]),
+            ),
+        )
+
+
 class Picking(StrictExtendableBaseModel):
     delivery_id: int
     name: str
+    state: PickingState
     tracking_reference: str | None = None
+    tracking_url: str | None = None
     delivery_date: datetime | None = Field(
         None, description="Date done or Scheduled Date"
     )
     carrier: DeliveryCarrier | None = None
     sale_id: int | None = None
 
+    lines: list[PickingLine]
+
     @classmethod
     def from_picking(cls, odoo_rec):
         delivery_date = None
@@ -29,10 +122,13 @@ def from_picking(cls, odoo_rec):
         return cls.model_construct(
             delivery_id=odoo_rec.id,
             name=odoo_rec.name,
+            state=odoo_rec.state,
             tracking_reference=odoo_rec.carrier_tracking_ref or None,
+            tracking_url=odoo_rec.carrier_tracking_url or None,
             delivery_date=delivery_date,
             carrier=DeliveryCarrier.from_delivery_carrier(odoo_rec.carrier_id)
             if odoo_rec.carrier_id
             else None,
             sale_id=odoo_rec.sale_id.id or None,
+            lines=[PickingLine.from_picking_line(line) for line in odoo_rec.move_ids],
         )

shopinvader_api_delivery_carrier/security/acl_stock_move.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+    Copyright 2025 Akretion (http://www.akretion.com).
+    @author Florian Mounier <florian.mounier@akretion.com>
+    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+<odoo>
+
+    <record model="ir.model.access" id="shopinvader_stock_move_access_view">
+        <field name="name">stock.move shopinvader delivery user read access</field>
+        <field name="model_id" ref="stock.model_stock_move" />
+        <field
+            name="group_id"
+            ref="shopinvader_api_delivery_carrier.shopinvader_delivery_carrier_user_group"
+        />
+        <field name="perm_read" eval="1" />
+        <field name="perm_create" eval="0" />
+        <field name="perm_unlink" eval="0" />
+        <field name="perm_write" eval="0" />
+    </record>
+
+</odoo>

shopinvader_api_delivery_carrier/security/acl_stock_move_line.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+    Copyright 2025 Akretion (http://www.akretion.com).
+    @author Florian Mounier <florian.mounier@akretion.com>
+    License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+-->
+<odoo>
+
+    <record model="ir.model.access" id="shopinvader_stock_move_line_access_view">
+        <field name="name">stock.move.line shopinvader delivery user read access</field>
+        <field name="model_id" ref="stock.model_stock_move_line" />
+        <field
+            name="group_id"
+            ref="shopinvader_api_delivery_carrier.shopinvader_delivery_carrier_user_group"
+        />
+        <field name="perm_read" eval="1" />
+        <field name="perm_create" eval="0" />
+        <field name="perm_unlink" eval="0" />
+        <field name="perm_write" eval="0" />
+    </record>
+
+</odoo>

shopinvader_api_delivery_carrier/tests/test_search_deliveries.py

@@ -117,6 +117,14 @@ def _check_data_content(self, data, pickings):
                 )
             else:
                 self.assertFalse(current_data.get("delivery_date"))
+
+            self.assertEqual(len(current_data.get("lines")), len(picking.move_ids))
+            for line_data, line in zip(current_data.get("lines"), picking.move_ids):
+                self.assertEqual(line_data.get("product_id"), line.product_id.id)
+                self.assertEqual(line_data.get("product_name"), line.product_id.name)
+                self.assertEqual(line_data.get("state"), line.state)
+                self.assertEqual(line_data.get("qty"), line.product_uom_qty)
+                self.assertEqual(line_data.get("qty_done"), line.quantity_done)
         return True
 
     def test_get_picking_logged_without_sale(self):
@@ -172,3 +180,68 @@ def test_get_multi_picking(self):
         self.assertEqual(response.status_code, 200)
         info = response.json()
         self._check_data_content(info["items"], pickings)
+
+    def test_get_picking_search_name(self):
+        picking1 = self._create_picking(self.partner, sale=True)
+        self._create_picking(self.partner, sale=True)
+
+        with self._create_test_client(router=delivery_router) as test_client:
+            response: Response = test_client.get(
+                "/deliveries", params={"name": picking1.name}
+            )
+        self.assertEqual(response.status_code, 200)
+        info = response.json()
+        self._check_data_content(info["items"], picking1)
+
+    def test_get_picking_search_tracking_ref(self):
+        picking1 = self._create_picking(self.partner, sale=True)
+        self._create_picking(self.partner, sale=True)
+        self._fill_picking_optional_values(picking1)
+
+        with self._create_test_client(router=delivery_router) as test_client:
+            response: Response = test_client.get(
+                "/deliveries",
+                params={"tracking_reference": picking1.carrier_tracking_ref},
+            )
+        self.assertEqual(response.status_code, 200)
+        info = response.json()
+        self._check_data_content(info["items"], picking1)
+
+    def test_get_picking_search_sale_id(self):
+        picking1 = self._create_picking(self.partner, sale=True)
+        self._create_picking(self.partner, sale=True)
+        self._fill_picking_optional_values(picking1)
+
+        with self._create_test_client(router=delivery_router) as test_client:
+            response: Response = test_client.get(
+                "/deliveries", params={"sale_id": picking1.sale_id.id}
+            )
+        self.assertEqual(response.status_code, 200)
+        info = response.json()
+        self._check_data_content(info["items"], picking1)
+
+    def test_get_picking_search_carrier_id(self):
+        picking1 = self._create_picking(self.partner, sale=True)
+        self._create_picking(self.partner, sale=True)
+        self._fill_picking_optional_values(picking1)
+
+        with self._create_test_client(router=delivery_router) as test_client:
+            response: Response = test_client.get(
+                "/deliveries", params={"carrier_id": picking1.carrier_id.id}
+            )
+        self.assertEqual(response.status_code, 200)
+        info = response.json()
+        self._check_data_content(info["items"], picking1)
+
+    def test_get_picking_search_state(self):
+        picking1 = self._create_picking(self.partner, sale=True)
+        self._create_picking(self.partner, sale=True)
+        picking1.action_cancel()
+
+        with self._create_test_client(router=delivery_router) as test_client:
+            response: Response = test_client.get(
+                "/deliveries", params={"state": "cancel"}
+            )
+        self.assertEqual(response.status_code, 200)
+        info = response.json()
+        self._check_data_content(info["items"], picking1)