Make update for data field is deep in telegram_bots/hub app (#233)

Author: EXG1O

telegram_bots/hub/serializers/database_record.py

@@ -1,5 +1,7 @@
 from rest_framework import fields, serializers
 
+from utils.deep_merge import deep_merge_data
+
 from ...models import DatabaseRecord
 from ...serializers.mixins import TelegramBotMixin
 
@@ -14,27 +16,15 @@ def run_validation(self, data: Any = fields.empty) -> dict[str, Any]:
     def update(
         self, records: list[DatabaseRecord], validated_data: dict[str, Any]
     ) -> list[DatabaseRecord]:
-        new_data: Any = validated_data['data']
+        new_data: Any | None = validated_data.get('data')
+
+        if new_data is None:
+            return records
 
         for record in records:
-            if self.partial:
-                data: dict[str, Any] | list[Any] = record.data.copy()
-
-                if isinstance(data, dict):
-                    data.update(
-                        new_data
-                        if isinstance(new_data, dict)
-                        else {'new_data': new_data}
-                    )
-                elif isinstance(data, list):
-                    if isinstance(new_data, list):
-                        data.extend(new_data)
-                    else:
-                        data.append(new_data)
-
-                record.data = data
-            else:
-                record.data = new_data
+            record.data = (
+                deep_merge_data(record.data, new_data) if self.partial else new_data
+            )
 
         DatabaseRecord.objects.bulk_update(records, fields=['data'])
 
@@ -62,7 +52,14 @@ def create(self, validated_data: dict[str, Any]) -> DatabaseRecord:
     def update(
         self, record: DatabaseRecord, validated_data: dict[str, Any]
     ) -> DatabaseRecord:
-        record.data = validated_data.get('data', record.data)
+        new_data: Any | None = validated_data.get('data')
+
+        if new_data is None:
+            return record
+
+        record.data = (
+            deep_merge_data(record.data, new_data) if self.partial else new_data
+        )
         record.save(update_fields=['data'])
 
         return record

utils/deep_merge.py

@@ -0,0 +1,17 @@
+from typing import Any
+
+
+def deep_merge_data(target: Any, source: Any) -> Any:
+    if isinstance(target, dict) and isinstance(source, dict):
+        result: dict[str, Any] = target.copy()
+        result.update(
+            {
+                key: deep_merge_data(result[key], value) if key in result else value
+                for key, value in source.items()
+            }
+        )
+        return result
+    elif isinstance(target, list):
+        return target + (source if isinstance(source, list) else [source])
+
+    return source