Introduce gramps_object_from_dict

Author: DavidMStraub

gramps_webapi/api/resources/base.py

@@ -45,10 +45,10 @@
 from ..search import SearchIndexer, get_search_indexer, get_semantic_search_indexer
 from ..util import (
     check_quota_people,
-    from_json_legacy,
     get_db_handle,
     get_locale_for_language,
     get_tree_from_jwt_or_fail,
+    gramps_object_from_dict,
     update_usage_people,
     use_args,
 )
@@ -163,7 +163,7 @@ def _parse_object(self) -> GrampsObject:
             abort_with_message(400, f"Error while processing object: {exc}")
         if not validate_object_dict(obj_dict):
             abort_with_message(400, "Schema validation failed")
-        return from_json_legacy(json.dumps(obj_dict))
+        return gramps_object_from_dict(obj_dict)
 
     def has_handle(self, handle: str) -> bool:
         """Check if the handle exists in the database."""

gramps_webapi/api/resources/objects.py

@@ -41,9 +41,9 @@
 from ..util import (
     abort_with_message,
     check_quota_people,
-    from_json_legacy,
     get_db_handle,
     get_tree_from_jwt,
+    gramps_object_from_dict,
     update_usage_people,
     use_args,
 )
@@ -71,7 +71,7 @@ def _parse_objects(self) -> Sequence[GrampsObject]:
                 abort_with_message(400, "Error processing objects")
             if not validate_object_dict(obj_dict):
                 abort_with_message(400, "Validation error while processing objects")
-            obj = from_json_legacy(json.dumps(obj_dict))
+            obj = gramps_object_from_dict(obj_dict)
             objects.append(obj)
         return objects
 

gramps_webapi/api/tasks.py

@@ -32,7 +32,7 @@
 from gramps.gen.db import DbTxn
 from gramps.gen.db.base import DbReadBase
 from gramps.gen.errors import HandleError
-from gramps.gen.lib.json_utils import data_to_object, object_to_dict
+from gramps.gen.lib.json_utils import object_to_dict
 from gramps.gen.merge.diff import diff_items
 
 from gramps_webapi.api.search.indexer import SearchIndexer, SemanticSearchIndexer
@@ -57,9 +57,9 @@
     abort_with_message,
     check_quota_people,
     close_db,
-    complete_gramps_object_dict,
     get_config,
     get_db_outside_request,
+    gramps_object_from_dict,
     send_email,
     update_usage_people,
     upgrade_gramps_database,
@@ -493,7 +493,7 @@ def process_transactions(
                     abort_with_message(409, "Object has changed")
                 new_data = item["new"]
                 if new_data:
-                    new_obj = data_to_object(complete_gramps_object_dict(new_data))
+                    new_obj = gramps_object_from_dict(new_data)
                 if trans_type == "delete":
                     handle_delete(trans, class_name, handle)
                     if (

gramps_webapi/api/util.py

@@ -66,7 +66,7 @@
 from gramps.gen.db.exceptions import DbUpgradeRequiredError
 from gramps.gen.dbstate import DbState
 from gramps.gen.errors import HandleError
-from gramps.gen.lib.json_utils import object_to_dict
+from gramps.gen.lib.json_utils import data_to_object, object_to_dict
 from gramps.gen.proxy import PrivateProxyDb
 from gramps.gen.proxy.private import sanitize_media
 from gramps.gen.proxy.proxybase import ProxyDbBase
@@ -826,3 +826,11 @@ def complete_gramps_object_dict(data: dict[str, Any]):
         if key not in data:
             data[key] = value
     return data
+
+
+def gramps_object_from_dict(data: dict[str, Any]):
+    """Instantiate a Gramps object from a dictionary.
+
+    The dictionary can be incomplete, i.e. not contain all properties of
+    the object class."""
+    return data_to_object(complete_gramps_object_dict(data))

tests/test_endpoints/test_transactions.py

@@ -398,3 +398,48 @@ def test_missing_gramps_id(self):
             "/api/transactions/?background=1", json=trans, headers=headers
         )
         self.assertEqual(rv.status_code, 400)
+
+    def test_gramps60_issue(self):
+        """Test for an issue that occurred after upgrading to Gramps 6.0"""
+        obj_dict = {
+            "handle": "fe171ce847937f3212613fb24c1",
+            "change": 1746095141,
+            "private": False,
+            "tag_list": [],
+            "gramps_id": "E4403",
+            "citation_list": [],
+            "note_list": [],
+            "media_list": [],
+            "attribute_list": [],
+            "date": {
+                "format": None,
+                "calendar": 0,
+                "modifier": 0,
+                "quality": 0,
+                "dateval": [2, 2, 1991, False],
+                "text": "1991-02-02",
+                "sortval": 2448290,
+                "newyear": 0,
+                "_class": "Date",
+            },
+            "place": "",
+            "_class": "Event",
+            "type": {"_class": "EventType", "value": 11, "string": ""},
+            "description": "Testereignis",
+        }
+        trans = [
+            {
+                "type": "add",
+                "_class": "Event",
+                "handle": obj_dict["handle"],
+                "old": None,
+                "new": obj_dict,
+            }
+        ]
+        headers = get_headers(self.client, "editor", "123")
+        # add
+        rv = self.client.post("/api/transactions/", json=trans, headers=headers)
+        assert rv.status_code == 200
+        rv = self.client.get(f"/api/events/{obj_dict['handle']}", headers=headers)
+        assert rv.status_code == 200
+        assert rv.json["type"] == "Adopted"