diff --git a/src/caosdb/apiutils.py b/src/caosdb/apiutils.py index 9d8d751ef37d9129209f4ea3f30fe442451cdc29..8714a6832c06590658e7a95b31a6f001097ed0e3 100644 --- a/src/caosdb/apiutils.py +++ b/src/caosdb/apiutils.py @@ -727,14 +727,14 @@ def merge_entities(entity_a: Entity, entity_b: Entity): for key in diff_r2["properties"]: if key in diff_r1["properties"]: if ("importance" in diff_r1["properties"][key] and - "importance" in diff_r2["properties"][key]): + "importance" in diff_r2["properties"][key]): if (diff_r1["properties"][key]["importance"] != - diff_r2["properties"][key]["importance"]): + diff_r2["properties"][key]["importance"]): raise NotImplementedError() elif ("importance" in diff_r1["properties"][key] or "importance" in diff_r2["properties"][key]): raise NotImplementedError() - + for attribute in ("datatype", "unit", "value"): if diff_r1["properties"][key][attribute] is None: setattr(entity_a.get_property(key), attribute, diff --git a/unittests/test_apiutils.py b/unittests/test_apiutils.py index 6ce53a24398631df38a4370d78e3c0570230966b..1dab18a321ad2c0229a79fe7a462a2e39487311f 100644 --- a/unittests/test_apiutils.py +++ b/unittests/test_apiutils.py @@ -231,6 +231,7 @@ def test_compare_special_properties(): assert len(diff_r1["properties"]) == 0 assert len(diff_r2["properties"]) == 0 + def test_copy_entities(): r = db.Record(name="A") r.add_parent(name="B")