Merge from master

debian/changelog

 xivo-dao (2020.12.00) xivo-freya; urgency=medium
 
   * Bump target version to 2020.12
+  * 3386 Add delete labels api
 
  -- tmourier <tmourier@avencall.com>  Mon, 06 Jul 2020 14:47:46 +0200
 

xivo_dao/resources/labels/dao.py

@@ -39,6 +39,17 @@ def create(label):
     Session.flush()
     return label
 
+def create(label):
+    Session.add(label)
+    Session.flush()
+    return label
+
+
+def delete(label):
+    Session.delete(label)
+    Session.flush()
+
+
 def search(**parameters):
     rows, total = label_search.search(Session, parameters)
     return SearchResult(total, rows)

xivo_dao/resources/labels/tests/test_dao.py

@@ -16,11 +16,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 from hamcrest import assert_that, equal_to
 
+from xivo_dao.alchemy.labels import Labels
+from xivo_dao.resources.labels import dao as label_dao
 from xivo_dao.resources.utils.search import SearchResult
 from xivo_dao.tests.test_dao import DAOTestCase
-from xivo_dao.resources.labels import dao as label_dao
-from xivo_dao.resources.user import dao as user_dao
-from xivo_dao.alchemy.labels import Labels
 
 
 class TestLabelExist(DAOTestCase):
@@ -68,3 +67,13 @@ class TestLabelExist(DAOTestCase):
 
         assert_that(result[1][0].users_count, equal_to(1))
         assert_that(result, equal_to(expected))
+
+    def test_delete_label(self):
+        label_row = self.add_label()
+
+        label_dao.delete(label_row)
+
+        expected = SearchResult(total=0, items=[])
+        result = label_dao.search()
+
+        assert_that(result, equal_to(expected))