refactor: Формат записи параметров атрибутов

Author: GingerTe

src/mellophone/client.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 import warnings
 import xml.etree.ElementTree as ET
 from http import HTTPStatus
@@ -227,9 +228,15 @@ def _require_user(user: Dict[str, Any]) -> Dict[str, Any]:
         """Проверяет и нормализует payload пользователя для API-вызовов."""
         if not user:
             raise ValueError("user data cannot be empty")
-        payload = dict(user)
-        if "password" in payload:
-            payload["pwd"] = payload.pop("password")
+        payload: Dict[str, Any] = {}
+        for key, val in list(user.items())[:]:
+            if key == "password":
+                key = "pwd"
+            elif isinstance(val, (list, dict)):
+                val = json.dumps(val, ensure_ascii=False)
+            elif val is None:
+                val = ""
+            payload[key] = val
         return payload
 
     @staticmethod

tests/integration/test_client_flows.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 from typing import Dict
 from uuid import uuid4
 
@@ -119,9 +120,11 @@ def test_it_user_additional_fields(mode: str, integration_client: Mellophone) ->
         "field_float": 4.5,
         "field_bool": False,
         "field_none": None,
-        "field_empty_str": "",
-        "field_empty_list": [],
+        "field_str_empty": "",
+        "field_list_empty": [],
         "field_list": ["org1"],
+        "field_dict": {"org1": {"name": "google", "age": 15}},
+        "field_dict_empty": {},
     }
     update_payload = {
         "sid": sid,
@@ -141,18 +144,23 @@ def test_it_user_additional_fields(mode: str, integration_client: Mellophone) ->
         users_after_create = users_from_list(invoke(integration_client, mode, "get_user_list", gp="not_defined"))
         created_user = next((user for user in users_after_create if user.get("sid") == sid), None)
         assert created_user is not None
-        for key in filter(lambda x: x not in ('password', 'pwd'), create_payload):
+        for key in ("field_str", "field_int", "field_float", "field_bool", "field_str_empty"):
             assert created_user.get(key) == str(create_payload[key])
 
+        for key in ("field_list", "field_list_empty", "field_dict", "field_dict_empty"):
+            assert created_user.get(key) == json.dumps(create_payload[key], ensure_ascii=False)
+            assert json.loads(created_user.get(key)) == create_payload[key]
+
+        assert created_user.get("field_none") == ""
+
         invoke(integration_client, mode, "update_user", sid, update_payload)
         assert_credentials_invalid(integration_client, mode, login, pwd_1)
         assert_credentials_valid(integration_client, mode, login, pwd_2, sid)
 
         users_after_update = users_from_list(invoke(integration_client, mode, "get_user_list", gp="not_defined"))
         updated_user = next((user for user in users_after_update if user.get("sid") == sid), None)
         assert updated_user is not None
-        for key in filter(lambda x: x not in ('password', 'pwd'), update_payload):
-            assert updated_user.get(key) == str(update_payload[key])
+        for key in ("field_str", "field_int", "field_float", "field_bool"):
+            assert updated_user.get(key) == str(update_payload[key]), key
     finally:
-        ...
-        # invoke(integration_client, mode, "delete_user", sid)
+        invoke(integration_client, mode, "delete_user", sid)