Draft: FIX: do not replace prop during merge

Summary

compare_entities is now case insensitive with respect to property and recordtype names

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

CI

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/linkahead/apiutils.py

@@ -588,8 +588,10 @@ def merge_entities(entity_a: Entity,
                 raise NotImplementedError()
 
             for attribute in ("datatype", "unit", "value"):
+                # attribute is in r2
                 if (attribute in diff_r2["properties"][key] and
                         diff_r2["properties"][key][attribute] is not None):
+                    # but not in r1
                     if (attribute not in diff_r1["properties"][key] or
                             diff_r1["properties"][key][attribute] is None):
                         setattr(entity_a.get_property(key), attribute,
@@ -597,6 +599,7 @@ def merge_entities(entity_a: Entity,
                     elif force:
                         setattr(entity_a.get_property(key), attribute,
                                 diff_r2["properties"][key][attribute])
+                    # attribute in r1 but no "force"
                     else:
                         raise_error = True
                         if merge_id_with_resolved_entity is True and attribute == "value":
@@ -616,8 +619,6 @@ def merge_entities(entity_a: Entity,
                             else:
                                 same = _same_id_as_resolved_entity(this, that)
                             if same is True:
-                                setattr(entity_a.get_property(key), attribute,
-                                        diff_r2["properties"][key][attribute])
                                 raise_error = False
                         if raise_error is True:
                             raise EntityMergeConflictError(