F merge missing list datatype

Summary

For #151 (closed). Does not fix the actual problem because this is a CloseWon't Fix (or has to be fixed in the crawler) but raises a better error message instead.

Focus

Check that the correct error message is shown.

Test Environment

Unit tests 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)
• 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)
• 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

@@ -37,7 +37,7 @@ from subprocess import call
 from typing import Optional, Any, Dict, List
 
 from caosdb.common.datatype import (BOOLEAN, DATETIME, DOUBLE, FILE, INTEGER,
-                                    REFERENCE, TEXT, is_reference)
+                                    LIST, REFERENCE, TEXT, is_reference)
 from caosdb.common.models import (Container, Entity, File, Property, Query,
                                   Record, RecordType, execute_query,
                                   get_config, SPECIAL_ATTRIBUTES)
@@ -442,6 +442,16 @@ def merge_entities(entity_a: Entity, entity_b: Entity, merge_references_with_emp
                         setattr(entity_a.get_property(key), attribute,
                                 diff_r2["properties"][key][attribute])
                     elif force:
+                        if attribute == "value":
+                            # Very special case of a property that has a scalar
+                            # datatype being fored to a list value without
+                            # having been assigned the correct datatype before.
+                            if isinstance(diff_r2["properties"][key][attribute], list):
+                                if ((entity_a.get_property(key).datatype is not None) and
+                                        (not entity_a.get_property(key).datatype.startswith("LIST<"))):
+                                    entity_a.get_property(key).datatype = LIST(
+                                        entity_a.get_property(key).datatype)
+
                         setattr(entity_a.get_property(key), attribute,
                                 diff_r2["properties"][key][attribute])
                     else: