Changed the overrides of the Reference class methods

lodel/leapi/datahandlers/reference.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from .field_data_handler import FieldDataHandler
-
+from lodel.leapi.datahandlers.field_data_handler import FieldDataHandler
+from lodel.editorial_model.components import EmClass
 
 class Reference(FieldDataHandler):
 
@@ -11,8 +11,26 @@ class Reference(FieldDataHandler):
     def __init__(self, allowed=True, internal=False, **kwargs):
         self.allowed = allowed
         self.internal = internal
+        if not self.is_ref_valid():
+            raise ValueError("The target of the reference is not valid")
         super().__init__(internal=self.internal, **kwargs)
 
     ## @brief gets the target of the reference
-    def get_related(self):
-        return self._target
+    def get_relateds(self):
+        return self._refs
+
+    ## @brief checks if the target is valid
+    def is_ref_valid(self):
+        relateds = self.get_relateds()
+        if not isinstance(relateds, self._refs_class):
+            return False
+
+        if isinstance(relateds, EmClass):
+            relateds = [relateds]
+
+        for related in relateds:
+            if not isinstance(related, EmClass):
+                return False
+
+        return True
+

lodel/leapi/datahandlers/references/Dict.py

@@ -1,8 +1,30 @@
 # -*- coding: utf-8 -*-
-from ..reference import Reference
+from lodel.leapi.datahandlers.reference import Reference
+from lodel.editorial_model.components import EmClass
 
 
 class Dict(Reference):
 
-    def __init__(self):
-        pass
+    ## @brief instanciates a dict reference
+    # @param emclasses dict : Dict of EmClass objects
+    # @param allowed bool
+    # @param internal bool : if False, the field is not internal
+    # @param kwargs : Other named arguments
+    def __init__(self, emclasses, allowed=True, internal=False, **kwargs):
+        self._refs = set(emclasses)
+        self._refs_class = dict
+        super().__init__(allowed=allowed, internal=internal, **kwargs)
+
+    ## @brief checks if the given target is valid
+    # @return bool
+    def is_target_valid(self):
+        relateds = self.get_relateds()
+
+        if not isinstance(relateds, self._refs_class):
+            return False
+
+        for related in relateds.values():
+            if not isinstance(related, EmClass):
+                return False
+
+        return True

lodel/leapi/datahandlers/references/Link.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from ..reference import Reference
+from lodel.leapi.datahandlers.reference import Reference
+from lodel.editorial_model.components import EmClass
 
 
 class Link(Reference):
@@ -10,7 +11,6 @@ class Link(Reference):
     # @param internal bool : if False, the field is not internal
     # @param kwargs : Other named arguments
     def __init__(self, emclass, allowed=True, internal=False, **kwargs):
-        self._target = emclass
+        self._refs = emclass
+        self._refs_class = EmClass
         super().__init__(allowed=allowed, internal=internal, **kwargs)
-
-

lodel/leapi/datahandlers/references/List.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from ..reference import Reference
+from lodel.leapi.datahandlers.reference import Reference
 
 
 class List(Reference):
@@ -7,5 +7,6 @@ class List(Reference):
     ## @brief instanciates a list reference
     # @param emclasses list : linked emclasses objects
     def __init__(self, emclasses, allowed=True, internal=False, **kwargs):
-        self._target = emclasses
+        self._refs = emclasses
+        self._refs_class = list
         super().__init__(self, allowed=allowed, internal=internal, **kwargs)

lodel/leapi/datahandlers/references/Set.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from ..reference import Reference
+from lodel.leapi.datahandlers.reference import Reference
 
 
 class Set(Reference):
@@ -10,6 +10,6 @@ class Set(Reference):
     # @param internal bool : if False, the field is not internal
     # @param kwargs : Other named arguments
     def __init__(self, emclasses, allowed=True, internal=False, **kwargs):
-        self._target = set(emclasses)
+        self._refs = set(emclasses)
+        self._refs_class = set
         super().__init__(allowed=allowed, internal=internal, **kwargs)
-

lodel/leapi/datahandlers/relation.py

@@ -4,5 +4,6 @@ from .field_data_handler import FieldDataHandler
 
 class Relation(FieldDataHandler):
 
-    def __init__(self):
-        self.backref_fieldname=''
+    def __init__(self, fieldname, reference):
+        self.backref_fieldname = fieldname
+        self.reference = reference