Handle types correctly for Gramps 6.0

Author: DavidMStraub

gramps_webapi/api/resources/util.py

@@ -55,7 +55,7 @@
 )
 
 # from gramps.gen.lib.serialize import to_json
-from gramps.gen.lib.json_utils import object_to_string, remove_object
+from gramps.gen.lib.json_utils import object_to_dict, object_to_string, remove_object
 from gramps.gen.lib.primaryobj import BasicPrimaryObject as GrampsObject
 from gramps.gen.plug import BasePluginManager
 from gramps.gen.relationship import get_relationship_calculator
@@ -950,36 +950,36 @@ def fix_object_dict(object_dict: dict, class_name: Optional[str] = None):
         ):
             if isinstance(v, str):
                 if class_name == "Family":
-                    d_out[k] = {
-                        "_class": f"{class_name}RelType",
-                        "string": xml_to_locale(f"{class_name}RelType", v),
-                    }
+                    _class = "FamilyRelType"
+                    obj = gramps.gen.lib.__dict__[_class]()
+                    obj.set_from_xml_str(v)
+                    d_out[k] = object_to_dict(obj)
                 elif class_name == "RepoRef":
-                    d_out[k] = {
-                        "_class": "SourceMediaType",
-                        "string": xml_to_locale("SourceMediaType", v),
-                    }
+                    _class = "SourceMediaType"
+                    obj = gramps.gen.lib.__dict__[_class]()
+                    obj.set_from_xml_str(v)
+                    d_out[k] = object_to_dict(obj)
                 else:
-                    d_out[k] = {
-                        "_class": f"{class_name}Type",
-                        "string": xml_to_locale(f"{class_name}Type", v),
-                    }
+                    _class = f"{class_name}Type"
+                    obj = gramps.gen.lib.__dict__[_class]()
+                    obj.set_from_xml_str(v)
+                    d_out[k] = object_to_dict(obj)
             else:
                 d_out[k] = v
         elif k == "role":
             if isinstance(v, str):
-                d_out[k] = {
-                    "_class": "EventRoleType",
-                    "string": xml_to_locale("EventRoleType", v),
-                }
+                _class = "EventRoleType"
+                obj = gramps.gen.lib.__dict__[_class]()
+                obj.set_from_xml_str(v)
+                d_out[k] = object_to_dict(obj)
             else:
                 d_out[k] = v
         elif k == "origintype":
             if isinstance(v, str):
-                d_out[k] = {
-                    "_class": "NameOriginType",
-                    "string": xml_to_locale("NameOriginType", v),
-                }
+                _class = "NameOriginType"
+                obj = gramps.gen.lib.__dict__[_class]()
+                obj.set_from_xml_str(v)
+                d_out[k] = object_to_dict(obj)
             else:
                 d_out[k] = v
         elif k in ["rect", "mother_handle", "father_handle", "famc"] and not v:

tests/test_endpoints/test_post.py

@@ -708,3 +708,42 @@ def test_add_people_quota_objects(self):
             self.client.delete(f"/api/people/{handle}", headers=headers)
         rv = self.client.post("/api/objects/", json=people[:4], headers=headers)
         assert rv.status_code == 405
+
+    def test_objects_add_person_types(self):
+        """Add a person and check that types are handled correctly even
+        when using incomplete dicts."""
+        handle_person = make_handle()
+        person = {
+            "handle": handle_person,
+            "primary_name": {
+                "surname_list": [
+                    {
+                        "surname": "Doe",
+                    }
+                ],
+                "first_name": "John",
+                "type": "Married Name",
+            },
+            "gender": 1,
+        }
+        headers = get_headers(self.client, "admin", "123")
+        rv = self.client.post("/api/people/", headers=headers)
+        rv = self.client.get("/api/people/", headers=headers)
+        handles = [obj["handle"] for obj in rv.json]
+        # delete existing people
+        for handle in handles:
+            self.client.delete(f"/api/people/{handle}", headers=headers)
+        rv = self.client.post("/api/people/", json=person, headers=headers)
+        self.assertEqual(rv.status_code, 201)
+        # check return value
+        out = rv.json
+        assert len(out) == 1
+        rv = self.client.get(
+            f"/api/people/{handle_person}?extend=event_ref_list&locale=de",
+            headers=headers,
+        )
+        assert rv.status_code == 200
+        person_dict = rv.json
+        assert person_dict["primary_name"]["first_name"] == "John"
+        assert person_dict["primary_name"]["surname_list"][0]["surname"] == "Doe"
+        assert person_dict["primary_name"]["type"] == "Married Name"