New f fix merge

Summary

Continuation of !120 (merged) that was weirdly merged, later reverted. this MR is still lacking documentation and explanation, esp. regarding the pending list. See #108 (closed).

After a closer look, this was actually the second half of the fix for #113 (closed). We postpone the merging of entities in case of unresolved reference properties.

Focus

The problem that is being solved is best described in the new integration test originally from !141 (merged). It describes the case of three records, an event, a basis, and a campaign. Both, event and campaign reference the basis, and event references campaign. Campaign and basis already exist on the server.

This is solved by postponing the merge, and by the new merge_id_with_resolved_entity argument of merge_entities.

Test Environment

New integration test should be sufficient.

Check List for the Author

Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines

• All automated tests pass
• Reference related issues
• Up-to-date CHANGELOG.md (or not necessary)
• Up-to-date JSON schema (or not necessary)
• Appropriate user and developer documentation (or not necessary)
  • How do I use the software? Assume "stupid" users.
  • How do I develop or debug the software? Assume novice developers.
• Annotations in code (Gitlab comments)
  • Intent of new code
  • Problems with old code
  • Why this implementation?

Check List for the Reviewer

• I understand the intent of this MR
• All automated tests pass
• Up-to-date CHANGELOG.md (or not necessary)
• Appropriate user and developer documentation (or not necessary)
• The test environment setup works and the intended behavior is reproducible in the test environment
• In-code documentation and comments are up-to-date.
• Check: Are there specifications? Are they satisfied?

For further good practices have a look at our review guidelines.

integrationtests/test_issues.py

@@ -20,6 +20,7 @@ from pytest import fixture, mark
 
 import caosdb as db
 from caosdb.cached import cache_clear
+from caosadvancedtools.models.parser import parse_model_from_string
 
 from caoscrawler.crawl import Crawler
 from caoscrawler.identifiable_adapters import CaosDBIdentifiableAdapter
@@ -208,3 +209,60 @@ def test_issue_83(clear_database):
     assert len(retrieved_referencing3.get_property(referenced_type.name).value) == 2
     assert retrieved_target1.id in retrieved_referencing3.get_property(referenced_type.name).value
     assert retrieved_target2.id in retrieved_referencing3.get_property(referenced_type.name).value
+
+
+def test_indiscale_113(clear_database):
+    """Somewhat mysterious failures to resolve references in
+    split_into_inserts_and_updates, see
+    https://gitlab.indiscale.com/caosdb/src/caosdb-crawler/-/issues/113
+
+    """
+
+    # Create and insert minimal datamodel
+    datamodel_str = """
+Event:
+  recommended_properties:
+    Basis:
+    Campaign:
+Basis:
+Campaign:
+  recommended_properties:
+    Basis:
+"""
+    model = parse_model_from_string(datamodel_str)
+    model.sync_data_model(noquestion=True)
+
+    # Register identifiables, everything is identified by name
+    ident = CaosDBIdentifiableAdapter()
+    ident.register_identifiable("Event", db.RecordType().add_parent(
+        name="Event").add_property(name="name"))
+    ident.register_identifiable("Basis", db.RecordType().add_parent(
+        name="Basis").add_property(name="name"))
+    ident.register_identifiable("Campaign", db.RecordType().add_parent(
+        name="Campaign").add_property(name="name"))
+
+    crawler = Crawler(identifiableAdapter=ident)
+
+    # Add records: event references basis and campaign, campaign references
+    # basis.
+    basis = db.Record(name="Poseidon").add_parent(name="Basis")
+    campaign = db.Record(name="POS386").add_parent(
+        name="Campaign").add_property(name="Basis", value=basis)
+    event = db.Record(name="GeoB13952").add_parent(name="Event")
+    event.add_property(name="Basis", value=basis)
+    event.add_property(name="Campaign", value=campaign)
+
+    # basis and campaign already exist in the db
+    db.Container().extend([basis, campaign]).insert()
+    # redefine to trigger resolving
+    basis = db.Record(name="Poseidon").add_parent(name="Basis")
+    campaign = db.Record(name="POS386").add_parent(
+        name="Campaign").add_property(name="Basis", value=basis)
+    recs = [event, basis, campaign]
+
+    ins, ups = crawler.synchronize(crawled_data=recs, unique_names=False)
+    # There is only one event to be inserted
+    assert len(ins) == 1
+    # Nothing to do for the existing ents
+    assert len(ups) == 0
+    assert ins[0].name == event.name