Changed the leapidatasource's update_rank method according to the LeRelation.set_rank method's changes

DataSource/MySQL/leapidatasource.py

@@ -406,36 +406,20 @@ class LeDataSourceSQL(DummyDatasource):
         self._set_relation_rank(id_relation, rank)
 
     ## @brief Sets a new rank on a relation
-    # @param id_relation int: relation ID
-    # @param rank int|str|tuple : 'first', 'last', an integer value or a (operator, value) tuple (for the shifting)
-    # @throw leapi.leapi.LeObjectQueryError if id_relation doesn't exist
-    #
+    # @param le_relation LeRelation
+    # @param new_rank int: integer representing the absolute new rank
+    # @return True if success, False if failure
     # TODO Conserver cette méthode dans le datasource du fait des requêtes SQL. Elle est appelée par le set_rank de LeRelation
-    def update_rank(self, id_relation, rank):
-        ret = self.get_relation(id_relation, no_attr=True)
+    def update_rank(self, le_relation, rank):
+        ret = self.get_relation(le_relation.id_relation, no_attr=True)
         if not ret:
-            raise leapi.leapi.LeObjectQueryError("No relation with id_relation = %d" % id_relation)
+            raise leapi.leapi.LeObjectQueryError("No relation with id_relation = %d" % le_relation.id_relation)
         lesup = ret['lesup']
         lesub = ret['lesub']
         current_rank = ret['rank']
 
-        # In case we passed an (operator, value) tuple, we will recalculate the new rank
-        if isinstance(rank, tuple):
-            operator = rank[0]
-            step_value = rank[1]
-            rank = current_rank + step_value if operator == '+' else current_rank - step_value
-
-        rank = 1 if rank == 'first' or rank < 1 else rank
-        if current_rank == rank:
-            return True
-
         relations = self.get_related(lesup, lesub.__class__, get_sub=True)
 
-        if rank == 'last' or rank > len(relations):
-            rank = len(relations)
-            if current_rank == rank:
-                return True
-
         # insert the relation at the right position considering its new rank
         our_relation = relations.pop(current_rank)
         relations.insert(our_relation, rank)

leapi/lerelation.py

@@ -135,31 +135,6 @@ class _LeRelation(lecrud._LeCrud):
     def get_max_rank(self):
         pass
 
-    @classmethod
-    ## @brief checks if a rank value is valid
-    # @param rank str|int
-    # @return tuple|str|int The tuple is for the case using an operator and a step (i.e. '+x' => ('+','x'))
-    # @throw ValueError if the rank value or type is not valid
-    def _parse_rank(cls, rank):
-        if isinstance(rank, str):
-            if rank == 'first' or rank == 'last':
-                return rank
-            else:
-                compiled_regular_expression = re.compile('([+]?)([0-9]+)')
-                matching_groups = compiled_regular_expression.search(rank)
-                if matching_groups:
-                    return (matching_groups.group(1), matching_groups.group(2))
-                else:
-                    raise ValueError("Invalid rank value : %s" % rank)
-        elif isinstance(rank, int):
-            if rank < 1:
-                raise ValueError("Invalid rank value : %d" % rank)
-            else:
-                return rank
-        else:
-            raise ValueError("Invalid rank type : %s" % type(rank))
-
-
 ## @brief Abstract class to handle hierarchy relations
 class _LeHierarch(_LeRelation):
     

leapi/test/test_lerelation.py

@@ -77,13 +77,7 @@ class LeRelationTestCase(TestCase):
         dsmock.assert_called_once_with(LeHierarch, [('lesup', '=', Numero(42)), ('nature','=','"parent"')])
         dsmock.reset_mock()
 
-    def test_check_rank(self):
-        """ Testing set_rank method """
-        from dyncode import LeRelation
-        self.assertEqual(LeRelation._parse_rank('+2'), ('+', '2'))
-        self.assertTrue(LeRelation._parse_rank(3), 3)
-        self.assertRaises(ValueError,LeRelation._parse_rank, 'print')
-
+    
 class LeHierarch(LeRelationTestCase):
     
     @patch('DataSource.dummy.leapidatasource.DummyDatasource.select')