Implements partial instanciation of LeObjects + utility classmethod for LeRelation

EditorialModel/fieldtypes/leo.py

@@ -20,16 +20,13 @@ class EmFieldType(GenericFieldType):
             if not hasattr(value, 'lodel_id'):
                 return (None, ValueError("The LeType instance given has no lodel_id !"))
         return (value, None)
-
+    
+    ## @brief If field value is an integer, returns a partially instanciated LeObject (only with an ID)
     def construct_data(self, lec, fname, datas):
+        import leapi.lecrud as lecrud
         if isinstance(datas[fname], int):
             leobject = lecrud._LeCrud.name2class('LeObject')
-            qfilter = '{uid_name} = {uid}'.format(
-                uid_name = leobject.uidname(),
-                uid = datas[fname],
-            )
-
-            return leobject.get([qfilter])
+            return leobject.get(datas[fname])
         else:
             return datas[fname]
     

leapi/leobject.py

@@ -32,11 +32,36 @@ class _LeObject(_LeCrud):
     
     ## @brief Stores the fields name associated with fieldtype of the fields that are common to every LeObject
     _leo_fieldtypes = dict()
+    
+    ## @brief Instanciate a partial LeObject with a lodel_id
+    # @note use the get_instance method to fetch datas and instanciate a concret LeObject
+    def __init__(self, lodel_id):
+        #Warning ! Handles only single pk
+        uid_fname, uid_ft = list(self._uid_fieldtype.items())[0]
+        new_id, err = uid_ft.check_data_value(lodel_id)
+        if not (err is None):
+            raise err
+        setattr(self, uid_fname, lodel_id)
+    
+    ## @return Corresponding populated LeObject
+    def get_instance(self):
+        uid_fname = self.uidname()
+        qfilter = '{uid_fname} = {uid}'.format(uid_fname = uid_fname, uid = getattr(self, uid_fname))
+        return leobject.get([qfilter])[0]
+    
+    ## @brief Dirty & quick comparison implementation
+    def __cmp__(self, other):
+        uid_fname = self.uidname()
+        if not hasattr(other, uid_fname):
+            return False
+        return getattr(self, uid_fname) == getattr(other, uid_fname)
+        
+    ## @brief Quick str cast method implementation
+    def __str__(self):
+        return "<%s lodel_id=%d>"%(self.__class__, getattr(self, self.uidname()))
 
-    ## @brief Instantiate with a Model and a DataSource
-    # @param **kwargs dict : datas usefull to instanciate a _LeObject
-    def __init__(self, **kwargs):
-        raise NotImplementedError("Abstract constructor")
+    def __repr__(self):
+        return self.__str__()
     
     ## @brief Given a ME uid return the corresponding LeClass or LeType class
     # @return a LeType or LeClass child class

leapi/lerelation.py

@@ -20,6 +20,17 @@ class _LeRelation(lecrud._LeCrud):
     def __init__(self, rel_id, **kwargs):
        pass 
  
+    @classmethod
+    def sup_filter(self, leo):
+        if isinstance(leo, _LeObject):
+            return ('lesup', '=', leo)
+
+    @classmethod
+    def sub_filter(self, leo):
+        if isinstance(leo, _LeObject):
+            return ('lesub', '=', leo)
+
+
     @classmethod
     def fieldtypes(cls):
         rel_ft = dict()
@@ -33,6 +44,7 @@ class _LeRelation(lecrud._LeCrud):
     def _prepare_relational_fields(cls, field):
         return lecrud.LeApiQueryError("Relational field '%s' given but %s doesn't is not a LeObject"%(field,cls.__name__))
 
+
             
 
 ## @brief Abstract class to handle hierarchy relations