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.

CHANGELOG.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed ###
 - If the `parents` key is used in a cfood at a lower level for a Record that
   already has a Parent (because it was explicitly given or the default Parent),
-  the old Parent(s) are now overwritten with the value belonging to the 
+  the old Parent(s) are now overwritten with the value belonging to the
   `parents` key.
 - If a registered identifiable states, that a reference by a Record with parent
   RT1 is needed, then now also references from Records that have a child of RT1
@@ -24,9 +24,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed ###
 
 ### Fixed ###
+
 * Empty Records can now be created (https://gitlab.com/caosdb/caosdb-crawler/-/issues/27)
 * [#58](https://gitlab.com/caosdb/caosdb-crawler/-/issues/58) Documentation builds API docs in pipeline now.
-* [#117](https://gitlab.indiscale.com/caosdb/src/caosdb-crawler/-/issues/117) `replace_variable` does no longer unnecessarily change the type. Values stored in variables in a CFood can have now other types.
+* [#117](https://gitlab.indiscale.com/caosdb/src/caosdb-crawler/-/issues/117)
+  `replace_variable` does no longer unnecessarily change the type. Values stored
+  in variables in a CFood can have now other types.
+* [indiscale#113](https://gitlab.indiscale.com/caosdb/src/caosdb-crawler/-/issues/113)
+  Resolving referenced entities fails in some corner cases. The crawler now
+  handles cases correctly in which entities retrieved from the server have to be
+  merged with local entities that both reference another, already existing
+  entity
 
 ### Security ###
 
@@ -43,7 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Creation of CrawlerRun Records that contain status information about data
   integration of the crawler if the `pycaosdb.ini` contains a `[caoscrawler]`
   with `create_crawler_status_records=True`.
-- The Crawler `synchronize` function now takes list of RecordType names. 
+- The Crawler `synchronize` function now takes list of RecordType names.
   Records that have the given names as parents are excluded from inserts or
   updates
 - `Crawler.synchronize` now takes an optional `path_for_authorized_run` argument