MultipleRef datahandlers bugfixes

In construct and check data

lodel/leapi/datahandlers/base_classes.py

@@ -399,41 +399,17 @@ class MultipleRef(Reference):
                 new_val.append(v)
             except (FieldValidationError) as f:
                 error_list.append(repr(v))
-        logger.warning("Provisoire pour faire les tests, à fixer")
-        if (len(error_list) > 0):
+        if len(error_list) > 0:
             raise FieldValidationError("MultipleRef have for invalid values [%s]  :" % (",".join(error_list)))
         return new_val
-
+    
+    ##@brief Construct a multiple ref data
     def construct_data(self, emcomponent, fname, datas, cur_value):
         cur_value = super().construct_data(emcomponent, fname, datas, cur_value)
-        if cur_value == 'None' or cur_value is None or cur_value == '':
-            return None
-        emcomponent_fields = emcomponent.fields()
-        data_handler = None
-        if fname in emcomponent_fields:
-            data_handler = emcomponent_fields[fname]
-        u_fname = emcomponent.uid_fieldname()
-        uidtype = emcomponent.field(u_fname[0]) if isinstance(u_fname, list) else emcomponent.field(u_fname)
-
-        if isinstance(cur_value, str):
-            value = cur_value.split(',')
-            l_value = [uidtype.cast_type(uid) for uid in value]
-        elif isinstance(cur_value, list):
-            l_value = list()
-            for value in cur_value:
-                if isinstance(value,str):
-                    l_value.append(uidtype.cast_type(value))
-                elif isinstance(value,uidtype.cast_type):
-                    l_value.append(value)
-                else:
-                    raise ValueError("The items must be of the same type, string or %s" % (emcomponent.__name__))
-        else:
-            l_value = None
-
-        if l_value is not None:
+        if cur_value is not None:
             if self.back_reference is not None:
                 br_class = self.back_reference[0]
-                for br_id in l_value:
+                for br_id in cur_value:
                     query_filters = list()
                     query_filters.append((br_class.uid_fieldname()[0], '=', br_id))
                     br_obj = br_class.get(query_filters)
@@ -443,7 +419,7 @@ class MultipleRef(Reference):
                             br_list = list()
                         if br_id not in br_list:
                             br_list.append(br_id)
-        return l_value
+        return cur_value
     
     ## @brief Checks the backreference, updates it if it is not complete
     # @param emcomponent EmComponent : An EmComponent child class instance

lodel/leapi/datahandlers/references.py

@@ -27,8 +27,11 @@ class List(MultipleRef):
     #@return value
     def _check_data_value(self, value):
         value = super()._check_data_value(value)
-        if not(isinstance(value, list) or isinstance(value, str)):
-            raise FieldValidationError("List or string expected for a set field")
+        try:
+            return list(value)
+        except Exception as e:
+            raise FieldValidationError("Given iterable is not castable in \
+a list : %s" % e)
         return value
 
 ##@brief Child class of MultipleRef where references are represented in the form of a python set
@@ -51,9 +54,11 @@ class Set(MultipleRef):
     #@return value
     def _check_data_value(self, value):
         value = super()._check_data_value(value)
-        if not (isinstance(value, set) or isinstance(value, str)):
-            raise FieldValidationError("Set or string expected for a set field")
-        return value
+        try:
+            return set(value)
+        except Exception as e:
+            raise FieldValidationError("Given iterable is not castable in \
+a set : %s" % e)
     
 ##@brief Child class of MultipleRef where references are represented in the form of a python dict
 class Map(MultipleRef):