Implements delete() and update() methods in LeType and _LeObject

leobject/leobject.py

@@ -59,43 +59,37 @@ class _LeObject(object):
         letype,leclass = cls._prepare_targets(letype)
         if letype is None:
             raise ValueError("letype argument cannot be None")
-        return cls._datasource.insert(letype, leclass, datas)
 
-    ## @brief update an existing LeObject
-    # @param lodel_id int | (int): lodel_id of the object(s) where to apply changes
-    # @param data dict: dictionnary of field:value to save
-    # @param update_filters string | (string): list of string of update filters
-    # @return okay bool: True on success, it will raise on failure
-    def update(self, lodel_id, data, update_filters=None):
-        if not lodel_id:
-            lodel_id = ()
-        elif isinstance(lodel_id, int):
-            lodel_id = (lodel_id)
-
-        try:
-            checked_data = self._check_data(data)
-            datasource_filters = self._prepare_filters(update_filters)
-            okay = self.datasource.update(lodel_id, checked_data, datasource_filters)
-        except:
-            raise
-        return okay
-
-    ## @brief delete an existing LeObject
-    # @param lodel_id int | (int): lodel_id of the object(s) to delete
-    # @param delete_filters string | (string): list of string of delete filters
-    # @return okay bool: True on success, it will raise on failure
-    def delete(self, lodel_id, delete_filters=None):
-        if not lodel_id:
-            lodel_id = ()
-        elif isinstance(lodel_id, int):
-            lodel_id = (lodel_id)
-
-        try:
-            datasource_filters = self._prepare_filters(delete_filters)
-            okay = self.datasource.delete(lodel_id, datasource_filters)
-        except:
-            raise
-        return okay
+        for data in datas:
+            letype.check_datas_or_raise(data, complete = True)
+
+        return cls._datasource.insert(letype, leclass, datas)
+    
+    ## @brief Delete LeObjects given filters
+    # @param cls
+    # @param letype LeType|str : LeType child class or name
+    # @param leclass LeClass|str : LeClass child class or name
+    # @param filters list : list of filters (see @ref leobject_filters)
+    # @return bool
+    @classmethod
+    def delete(cls, letype, leclass, filters):
+        filters,relationnal_filters = leobject.leobject._LeObject._prepare_filters(filters, cls, cls._leclass)
+        letype, leclass = cls._prepare_targets(letype, leclass)
+        return cls._datasource(letype, leclass, filters, relationnal_filters)
+    
+    ## @brief Update LeObjects given filters and datas
+    # @param cls
+    # @param letype LeType|str : LeType child class or name
+    # @param leclass LeClass|str : LeClass child class or name
+    # @param filters list : list of filters (see @ref leobject_filters)
+    @classmethod
+    def update(cls, letype, leclass, filters, datas):
+        filters,relationnal_filters = leobject.leobject._LeObject._prepare_filters(filters, cls, cls._leclass)
+        letype, leclass = cls._prepare_targets(letype, leclass)
+        if letype is None:
+            raise ValueError("Argument letype cannot be None")
+        letype.check_datas_or_raise(datas, False)
+        return cls._datasource(letype, leclass, filters, relationnal_filters, datas)
 
     ## @brief make a search to retrieve a collection of LeObject
     # @param query_filters list : list of string of query filters (or tuple (FIELD, OPERATOR, VALUE) ) see @ref leobject_filters
@@ -105,7 +99,7 @@ class _LeObject(object):
     # @return responses ({string:*}): a list of dict with field:value
     def get(self, query_filters, field_list = None, typename = None, classname = None):
 
-        letype,leclass = self._prepare_target(typename, classname)
+        letype,leclass = self._prepare_targets(typename, classname)
 
         #Fetching LeType
         if typename is None:

leobject/letype.py

@@ -10,13 +10,14 @@
 #
 # @note LeObject will be generated by leobject.lefactory.LeFactory
 
-from Lodel.utils.classinstancemethod import classinstancemethod
+import leobject
 from leobject.leclass import LeClass
 from leobject.leobject import LeObjectError
+from Lodel.utils.classinstancemethod import classinstancemethod
 
 ## @brief Represent an EmType data instance
 # @note Is not a derivated class of LeClass because the concrete class will be a derivated class from LeClass
-class LeType(object):
+class LeType(leobject.leobject._LeObject):
     
     ## @brief Stores selected fields with key = name
     _fields = list()
@@ -68,33 +69,37 @@ class LeType(object):
             
 
     ## @brief Delete the LeType from Db
-    # @note equivalent to LeType::delete(this.lodel_id)
+    # @note equivalent to LeType::delete(filters=['lodel_id = %s'%self.lodel_id)
     @classinstancemethod
     def delete(self):
-        return self.__class__.delete(('lodel_id','=',self.lodel_id))
+        return self.__class__.delete([('lodel_id','=',self.lodel_id)])
     
     ## @brief Delete a LeType from the datasource
-    # @param filters list : List of filters
+    # @param filters list : list of filters (see @ref leobject_filters)
     # @param cls
     # @return True if deleted False if not existing
     # @throw InvalidArgumentError if invalid parameters
     # @throw Leo exception if the lodel_id identify an object from another type
     @delete.classmethod
     def delete(cls, filters):
-        pass
+        return super(LeType, cls).delete(letype, leclass, filters)
         
 
     @classinstancemethod
     ## @brief Update a LeType in db
     def update(self):
-        pass
+        return self.__class__.update(filters=[('lodel_id', '=', self.lodel_id)], datas = self.datas)
+        
 
     @update.classmethod
     ## @brief Update some LeType in db
     # @param datas : keys are lodel_id and value are dict of fieldname => value
-    # @throw Some exception for some errors in datas
-    def update(cls, datas):
-        pass
+    # @param filters list : list of filters (see @ref leobject_filters)
+    # @param cls
+    # return bool
+    def update(cls, filters, datas):
+        return super(LeType, cls).update(letype = cls, leclass = cls._leclass, filters = filters, datas = datas)
+        
 
     ## @brief Insert a new LeType in the datasource
     # @param **datas list : A list of dict containing the datas
@@ -103,10 +108,7 @@ class LeType(object):
     # @throw InvalidArgumentError if invalid argument
     @classmethod
     def insert(cls, datas):
-        for data in datas:
-            cls.check_datas_or_raise(data, complete=True)
-        super(LeType, cls).insert(letype=cls, datas=datas)
-        pass
+        return super(LeType, cls).insert(letype=cls, datas=datas)
     
     ## @brief Check that datas are valid for this type
     # @param datas dict : key == field name value are field values