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.
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.
New integration test should be sufficient.
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
For further good practices have a look at our review guidelines.