Draft: REFACTOR: Treat Entity and Id as equal

Summary

Focus

Point the reviewer to the core of the code change. Where should they start reading? What should they focus on (e.g. security, performance, maintainability, user-friendliness, compliance with the specs, finding more corner cases, concrete questions)?

Test Environment

How to set up a test environment for manual testing?

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.

src/caosdb/apiutils.py

@@ -178,6 +178,16 @@ def getCommitIn(folder):
     return get_commit_in(folder)
 
 
+def entity_and_id(this, that):
+    """
+    returns true iff exactly one of this and that is an Entity with an ID and the other is an
+    integer
+    """
+    return (
+        (isinstance(this, Entity) and this.id is not None and isinstance(that, int))
+        or (isinstance(this, int) and isinstance(that, Entity) and this.id is not None))
+
+
 def compare_entities(old_entity: Entity, new_entity: Entity, compare_referenced_records: bool = False):
     """Compare two entites.
 
@@ -279,6 +289,15 @@ def compare_entities(old_entity: Entity, new_entity: Entity, compare_referenced_
             if (prop.value != matching[0].value):
                 # basic comparison of value objects says they are different
                 same_value = False
+
+                # one Entity with ID and one int?
+                if (sufficient_id and ):
+                    if ((isinstance(matching[0].value, int)
+                         and prop.value.id == matching[0].value)
+                            or (isinstance(prop.value, int)
+                                and prop.value == matching[0].value.id)):
+                        same_value = True
+
                 if compare_referenced_records:
                     # scalar reference
                     if isinstance(prop.value, Entity) and isinstance(matching[0].value, Entity):