[NEW] lcc_comchain_base: add recipient_id to the activation function

Lokavaluto · Feb 6, 2024 · eda46eb · eda46eb
1 parent e0e5582
commit eda46eb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/lcc_comchain_base/datamodel/comchain.py b/lcc_comchain_base/datamodel/comchain.py
@@ -18,15 +18,6 @@ class ComchainRegisterInfo(Datamodel):
     message_key = fields.String(required=True)
 
 
-class ComchainActivateInfo(Datamodel):
-    _name = "comchain.activate.info"
-
-    address = fields.String(required=True)
-    type = fields.Integer(required=True)
-    credit_min = fields.Float(required=True)
-    credit_max = fields.Float(required=True)
-
-
 class ComchainActivateList(Datamodel):
     _name = "comchain.activate.list"
 

diff --git a/lcc_comchain_base/models/res_partner_backend.py b/lcc_comchain_base/models/res_partner_backend.py
@@ -90,9 +90,9 @@ def activate(self, params):
         self.write(
             {
                 "comchain_status": "active",
-                "comchain_type": "%s" % params.type,
-                "comchain_credit_min": params.credit_min,
-                "comchain_credit_max": params.credit_max,
+                "comchain_type": "%s" % params["type"],
+                "comchain_credit_min": params["credit_min"],
+                "comchain_credit_max": params["credit_max"],
             }
         )
 

diff --git a/lcc_comchain_base/services/comchain_services.py b/lcc_comchain_base/services/comchain_services.py
@@ -70,17 +70,28 @@ def register(self, params):
 
     @restapi.method(
         [(["/activate"], "POST")],
-        input_param=Datamodel("comchain.activate.list"),
     )
-    def activate(self, params):
+    def activate(self):
         """
         Activate comchain account on partners
 
         """
+        accounts = request.params["accounts"]
         wallet_obj = self.env["res.partner.backend"]
-        for account in params.accounts:
+        for account in accounts:
+            try:
+                account["recipient_id"] = int(account["recipient_id"])
+            except ValueError:
+                raise ValueError(
+                    "Invalid 'recipient_id´: %r (should be a number)",
+                    account["recipient_id"],
+                )
             wallet_id = wallet_obj.search(
-                [("comchain_id", "=", account.address)], limit=1
+                [
+                    ("comchain_id", "=", account["address"]),
+                    ("partner_id", "=", account["recipient_id"]),
+                ],
+                limit=1,
             )
             wallet_id.activate(account)