Issue #18: Use deepcopy in to_dict method to prevent values of ``…

…udm_properties`` from being updated in objects which are copied.

HISTORY.rst

@@ -2,6 +2,11 @@
 History
 =======
 
+2.2.1 (2022-12-15)
+------------------
+
+* Use deepcopy in ``to_dict`` method to prevent values of ``udm_properties`` from being updated in objects which are copied.
+
 2.2.0 (2022-10-13)
 --------------------
 

Makefile

@@ -38,7 +38,7 @@ START_UCS_CONTAINER = docker run --detach --name "$(UCS_CONTAINER)" --hostname=m
 UCS_CONTAINER_IP_CMD = . docker/common.sh && docker_container_ip $(UCS_CONTAINER)
 GET_OPENAPI_SCHEMA_UDM = . docker/common.sh && get_openapi_schema "$(UCS_CONTAINER)"
 
-KELVIN_IMG = docker.software-univention.de/ucsschool-kelvin-rest-api:1.8.0
+KELVIN_IMG = docker.software-univention.de/ucsschool-kelvin-rest-api:1.8.1
 KELVIN_CONTAINER = $(shell . docker/common.sh && echo "$$KELVIN_CONTAINER")
 KELVIN_API_LOG_FILE = $(shell . docker/common.sh && echo "$$KELVIN_API_LOG_FILE")
 KELVIN_IMG_EXISTS = . docker/common.sh && docker_img_exists "$(KELVIN_IMG)"

VERSION.txt

@@ -1 +1 @@
-2.2.0
+2.2.1

docker/common.sh

@@ -16,7 +16,7 @@ export UDM_ONLY_TARGET_DOCKER_IMG_VERSION="${UDM_ONLY_TARGET_DOCKER_IMG}:${UCS_R
 export UDM_ONLY_TARGET_DOCKER_IMG_LATEST="${UDM_ONLY_TARGET_DOCKER_IMG}:${UCS_REPOS}-latest"
 
 export KELVIN_CONTAINER=kelvin-api
-export KELVIN_REST_API_VERSION="1.8.0"
+export KELVIN_REST_API_VERSION="1.8.1"
 export KELVIN_REST_API_IMG="${DOCKER_REGISTRY}/ucsschool-kelvin-rest-api:${KELVIN_REST_API_VERSION}"
 export KELVIN_API_LOG_FILE="/var/log/univention/ucsschool-kelvin-rest-api/http.log"
 

tests/test_user.py

@@ -524,3 +524,15 @@ async def test_reload(
         await ldap_access.modify(obj.dn, {"givenName": [(ldap3.MODIFY_REPLACE, [first_name_new])]})
         await obj.reload()
         assert obj.firstname == first_name_new
+
+
+@pytest.mark.asyncio
+async def test_as_json(kelvin_session_kwargs, new_school_user):
+    user = await new_school_user()
+    async with Session(**kelvin_session_kwargs) as session:
+        old_obj: User = await UserResource(session=session).get(school=user.school, name=user.name)
+        old_obj.udm_properties["title"] = "before"
+
+        new_user = User(**old_obj.as_dict(), session=session)
+        new_user.udm_properties["title"] = "after"
+        assert old_obj.udm_properties["title"] != new_user.udm_properties["title"]

ucsschool/kelvin/client/base.py

@@ -26,7 +26,7 @@
 # License with the Debian GNU/Linux or Univention distribution in file
 # /usr/share/common-licenses/AGPL-3; if not, see
 # <http://www.gnu.org/licenses/>.
-
+import copy
 import logging
 from abc import ABC
 from typing import Any, AsyncIterator, Dict, Iterable, List, TypeVar
@@ -140,7 +140,8 @@ async def delete(self) -> None:
 
     def as_dict(self) -> Dict[str, Any]:
         attrs = self._kelvin_attrs + ["dn", "url"]
-        return dict((attr, getattr(self, attr)) for attr in attrs)
+        _dict_repr = copy.deepcopy(dict((attr, getattr(self, attr)) for attr in attrs))
+        return _dict_repr
 
     @classmethod
     def _from_kelvin_response(cls, response: Dict[str, Any]) -> KelvinObjectType: