From bbe7f75b0ded501a142fa65203e39ce38272bc1e Mon Sep 17 00:00:00 2001
From: miguelpadin <miguel.padin.dominguez@gmail.com>
Date: Wed, 22 Jun 2022 09:54:13 +0200
Subject: [PATCH] [REF] pms-api-rest: fix nested roues & add plurals

---
 .../services/pms_availability_plan_service.py  | 11 ++++++-----
 pms_api_rest/services/pms_pricelist_service.py | 18 +++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pms_api_rest/services/pms_availability_plan_service.py b/pms_api_rest/services/pms_availability_plan_service.py
index 8ad0b56d4..e7483fe0d 100644
--- a/pms_api_rest/services/pms_availability_plan_service.py
+++ b/pms_api_rest/services/pms_availability_plan_service.py
@@ -68,7 +68,7 @@ class PmsAvailabilityPlanService(Component):
         [
             (
                 [
-                    "/<int:availability_plan>/rules",
+                    "/<int:availability_plan>/availability-plan-rules",
                 ],
                 "GET",
             )
@@ -142,7 +142,7 @@ class PmsAvailabilityPlanService(Component):
         [
             (
                 [
-                    "/<int:availability_plan_id>/availability-plan-rule",
+                    "/<int:availability_plan_id>/availability-plan-rules",
                 ],
                 "POST",
             )
@@ -186,7 +186,7 @@ class PmsAvailabilityPlanService(Component):
         [
             (
                 [
-                    "/<int:availability_plan_id>/availability-plan-rule/",
+                    "/<int:availability_plan_id>/availability-plan-rules/<int:availability_plan_rule_id>",
                 ],
                 "PATCH",
             )
@@ -195,13 +195,14 @@ class PmsAvailabilityPlanService(Component):
         auth="jwt_api_pms",
     )
     def write_availability_plan_rule(
-        self, availability_plan_id, pms_avail_plan_rule_info
+        self, availability_plan_id, availability_plan_rule_id, pms_avail_plan_rule_info
     ):
         vals = dict()
         avail_rule = self.env["pms.availability.plan.rule"].search(
             [
-                ("id", "=", pms_avail_plan_rule_info.availabilityRuleId),
                 ("availability_plan_id", "=", availability_plan_id),
+                ("id", "=", availability_plan_rule_id),
+
             ]
         )
         if avail_rule:
diff --git a/pms_api_rest/services/pms_pricelist_service.py b/pms_api_rest/services/pms_pricelist_service.py
index 4c400adf9..bbf76713c 100644
--- a/pms_api_rest/services/pms_pricelist_service.py
+++ b/pms_api_rest/services/pms_pricelist_service.py
@@ -69,7 +69,7 @@ class PmsPricelistService(Component):
         [
             (
                 [
-                    "/<int:pricelist_id>",
+                    "/<int:pricelist_id>/pricelist-items",
                 ],
                 "GET",
             )
@@ -128,10 +128,9 @@ class PmsPricelistService(Component):
                         ),
                     )
 
-                    if item:
-                        pricelist_info.pricelistItemId = item.id
-                        price = re.findall(r"[+-]?\d+\.\d+", item.price)
-                        pricelist_info.price = float(price[0])
+                    pricelist_info.pricelistItemId = item.id
+                    price = re.findall(r"[+-]?\d+\.\d+", item.price)
+                    pricelist_info.price = float(price[0])
 
                     result.append(pricelist_info)
 
@@ -141,7 +140,7 @@ class PmsPricelistService(Component):
         [
             (
                 [
-                    "/<int:pricelist_id>/pricelist-item",
+                    "/<int:pricelist_id>/pricelist-items",
                 ],
                 "POST",
             )
@@ -176,7 +175,7 @@ class PmsPricelistService(Component):
         [
             (
                 [
-                    "/<int:pricelist_id>/pricelist-item",
+                    "/<int:pricelist_id>/pricelist-items/<int:pricelist_item_id>",
                 ],
                 "PATCH",
             )
@@ -184,11 +183,12 @@ class PmsPricelistService(Component):
         input_param=Datamodel("pms.pricelist.item.info", is_list=False),
         auth="jwt_api_pms",
     )
-    def write_pricelist_item(self, pricelist_id, pms_pricelist_item_info):
+    def write_pricelist_item(self, pricelist_id, pricelist_item_id, pms_pricelist_item_info):
+
         product_pricelist_item = self.env["product.pricelist.item"].search(
             [
-                ("id", "=", pms_pricelist_item_info.pricelistItemId),
                 ("pricelist_id", "=", pricelist_id),
+                ("id", "=", pricelist_item_id),
             ]
         )
         if product_pricelist_item and pms_pricelist_item_info.price: