c2cgeoportal-admin 2.6.0__py3-none-any.whl → 2.8.1.180__py3-none-any.whl

tests/test_layers_wms.py

@@ -14,16 +14,16 @@ def layer_wms_test_data(dbsession, transact):
 
     from c2cgeoportal_commons.models.main import LayerWMS, OGCServer
 
-    servers = [OGCServer(name="server_{}".format(i)) for i in range(0, 4)]
+    servers = [OGCServer(name=f"server_{i}") for i in range(0, 4)]
     for i, server in enumerate(servers):
-        server.url = "http://wms.geo.admin.ch_{}".format(i)
+        server.url = f"http://wms.geo.admin.ch_{i}"
         server.image_type = "image/jpeg" if i % 2 == 0 else "image/png"
 
     def layer_builder(i):
-        layer = LayerWMS(name="layer_wms_{}".format(i))
-        layer.layer = "layer_{}".format(i)
+        layer = LayerWMS(name=f"layer_wms_{i}")
+        layer.layer = f"layer_{i}"
         layer.public = 1 == i % 2
-        layer.geo_table = "geotable_{}".format(i)
+        layer.geo_table = f"geotable_{i}"
         layer.ogc_server = servers[i % 4]
         layer.style = "décontrasté"
         return layer
@@ -39,7 +39,6 @@ def layer_wms_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("layer_wms_test_data", "test_app")
 class TestLayerWMSViews(AbstractViewsTests):
-
     _prefix = "/admin/layers_wms"
 
     def test_index_rendering(self, test_app):
@@ -154,6 +153,8 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert form["public"].checked
 
     def test_edit(self, test_app, layer_wms_test_data, dbsession):
+        from c2cgeoportal_commons.models.main import Log, LogAction
+
         layer = layer_wms_test_data["layers"][0]
 
         form = self.get_item(test_app, layer.id).form
@@ -173,11 +174,11 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert str(layer.time_widget) == form["time_widget"].value
 
         interfaces = layer_wms_test_data["interfaces"]
-        assert set((interfaces[0].id, interfaces[2].id)) == set(i.id for i in layer.interfaces)
+        assert {interfaces[0].id, interfaces[2].id} == {i.id for i in layer.interfaces}
         self._check_interfaces(form, interfaces, layer)
 
         ras = layer_wms_test_data["restrictionareas"]
-        assert set((ras[0].id, ras[2].id)) == set(i.id for i in layer.restrictionareas)
+        assert {ras[0].id, ras[2].id} == {i.id for i in layer.restrictionareas}
         self._check_restrictionsareas(form, ras, layer)
 
         new_values = {
@@ -200,7 +201,7 @@ class TestLayerWMSViews(AbstractViewsTests):
 
         resp = form.submit("submit")
         assert str(layer.id) == re.match(
-            r"http://localhost{}/(.*)\?msg_col=submit_ok".format(self._prefix), resp.location
+            rf"http://localhost{self._prefix}/(.*)\?msg_col=submit_ok", resp.location
         ).group(1)
 
         dbsession.expire(layer)
@@ -209,13 +210,19 @@ class TestLayerWMSViews(AbstractViewsTests):
                 assert value == getattr(layer, key)
             else:
                 assert str(value or "") == str(getattr(layer, key) or "")
-        assert set([interfaces[1].id, interfaces[3].id]) == set(
-            [interface.id for interface in layer.interfaces]
-        )
-        assert set([ras[1].id, ras[3].id]) == set([ra.id for ra in layer.restrictionareas])
+        assert {interfaces[1].id, interfaces[3].id} == {interface.id for interface in layer.interfaces}
+        assert {ras[1].id, ras[3].id} == {ra.id for ra in layer.restrictionareas}
+
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.UPDATE
+        assert log.element_type == "layer_wms"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
 
     def test_submit_new(self, dbsession, test_app, layer_wms_test_data):
-        from c2cgeoportal_commons.models.main import LayerWMS
+        from c2cgeoportal_commons.models.main import LayerWMS, Log, LogAction
 
         resp = test_app.post(
             "/admin/layers_wms/new",
@@ -239,12 +246,20 @@ class TestLayerWMSViews(AbstractViewsTests):
             r"http://localhost/admin/layers_wms/(.*)\?msg_col=submit_ok", resp.location
         ).group(1)
 
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.INSERT
+        assert log.element_type == "layer_wms"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
+
     def test_duplicate(self, layer_wms_test_data, test_app, dbsession):
         from c2cgeoportal_commons.models.main import LayerWMS
 
         layer = layer_wms_test_data["layers"][3]
 
-        resp = test_app.get("/admin/layers_wms/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wms/{layer.id}/duplicate", status=200)
         form = resp.form
 
         assert "" == self.get_first_field_named(form, "id").value
@@ -260,11 +275,11 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert str(layer.time_mode) == form["time_mode"].value
         assert str(layer.time_widget) == form["time_widget"].value
         interfaces = layer_wms_test_data["interfaces"]
-        assert set((interfaces[3].id, interfaces[1].id)) == set(i.id for i in layer.interfaces)
+        assert {interfaces[3].id, interfaces[1].id} == {i.id for i in layer.interfaces}
         self._check_interfaces(form, interfaces, layer)
 
         ras = layer_wms_test_data["restrictionareas"]
-        assert set((ras[3].id, ras[0].id)) == set(i.id for i in layer.restrictionareas)
+        assert {ras[3].id, ras[0].id} == {i.id for i in layer.restrictionareas}
         self._check_restrictionsareas(form, ras, layer)
 
         self._check_dimensions(resp.html, layer.dimensions, duplicated=True)
@@ -289,12 +304,9 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert 0 == dbsession.query(LayerWMTS).filter(LayerWMTS.name == layer.name).count()
         assert 1 == dbsession.query(LayerWMS).filter(LayerWMS.name == layer.name).count()
 
-        resp = test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        resp = test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
         assert resp.json["success"]
-        assert (
-            "http://localhost/admin/layers_wmts/{}?msg_col=submit_ok".format(layer.id)
-            == resp.json["redirect"]
-        )
+        assert f"http://localhost/admin/layers_wmts/{layer.id}?msg_col=submit_ok" == resp.json["redirect"]
 
         assert 1 == dbsession.query(LayerWMTS).filter(LayerWMTS.name == layer.name).count()
         assert 0 == dbsession.query(LayerWMS).filter(LayerWMS.name == layer.name).count()
@@ -328,41 +340,43 @@ class TestLayerWMSViews(AbstractViewsTests):
     def test_convert_image_type_from_ogcserver(self, layer_wms_test_data, test_app):
         layer = layer_wms_test_data["layers"][3]
 
-        resp = test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        resp = test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
         assert resp.json["success"]
-        assert (
-            "http://localhost/admin/layers_wmts/{}?msg_col=submit_ok".format(layer.id)
-            == resp.json["redirect"]
-        )
+        assert f"http://localhost/admin/layers_wmts/{layer.id}?msg_col=submit_ok" == resp.json["redirect"]
 
         resp = test_app.get(resp.json["redirect"], status=200)
         assert "image/png" == resp.form["image_type"].value
 
         layer = layer_wms_test_data["layers"][2]
-        resp = test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        resp = test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
         assert resp.json["success"]
-        assert (
-            "http://localhost/admin/layers_wmts/{}?msg_col=submit_ok".format(layer.id)
-            == resp.json["redirect"]
-        )
+        assert f"http://localhost/admin/layers_wmts/{layer.id}?msg_col=submit_ok" == resp.json["redirect"]
 
         resp = test_app.get(resp.json["redirect"], status=200)
         assert "image/jpeg" == resp.form["image_type"].value
 
     def test_convert_without_wmts_defaults(self, test_app, layer_wms_test_data, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMTS
+        from c2cgeoportal_commons.models.main import LayerWMTS, Log, LogAction
 
         dbsession.delete(LayerWMTS.get_default(dbsession))
         layer = layer_wms_test_data["layers"][3]
-        test_app.post("/admin/layers_wms/{}/convert_to_wmts".format(layer.id), status=200)
+        test_app.post(f"/admin/layers_wms/{layer.id}/convert_to_wmts", status=200)
+
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.CONVERT_TO_WMTS
+        assert log.element_type == "layer_wms"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
 
     def test_unicity_validator(self, layer_wms_test_data, test_app):
         layer = layer_wms_test_data["layers"][2]
-        resp = test_app.get("/admin/layers_wms/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wms/{layer.id}/duplicate", status=200)
 
         resp = resp.form.submit("submit")
 
-        self._check_submission_problem(resp, "{} is already used.".format(layer.name))
+        self._check_submission_problem(resp, f"{layer.name} is already used.")
 
     def test_unicity_validator_does_not_matter_amongst_cousin(self, layer_wms_test_data, test_app, dbsession):
         from c2cgeoportal_commons.models.main import LayerGroup, LayerWMS
@@ -372,7 +386,7 @@ class TestLayerWMSViews(AbstractViewsTests):
         assert dbsession.query(LayerWMS).filter(LayerWMS.name == "layer_group_0").one_or_none() is None
 
         layer = layer_wms_test_data["layers"][2]
-        resp = test_app.get("/admin/layers_wms/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wms/{layer.id}/duplicate", status=200)
         self.set_first_field_named(resp.form, "name", "layer_group_0")
         resp = resp.form.submit("submit")
 
@@ -382,17 +396,25 @@ class TestLayerWMSViews(AbstractViewsTests):
         # assert str(layer.id) == re.match('http://localhost/admin/layers_wms/(.*)', resp.location).group(1)
 
     def test_delete(self, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import Layer, LayerWMS, TreeItem
+        from c2cgeoportal_commons.models.main import Layer, LayerWMS, Log, LogAction, TreeItem
+
+        layer = dbsession.query(LayerWMS).first()
 
-        layer_id = dbsession.query(LayerWMS.id).first().id
+        test_app.delete(f"/admin/layers_wms/{layer.id}", status=200)
 
-        test_app.delete("/admin/layers_wms/{}".format(layer_id), status=200)
+        assert dbsession.query(LayerWMS).get(layer.id) is None
+        assert dbsession.query(Layer).get(layer.id) is None
+        assert dbsession.query(TreeItem).get(layer.id) is None
 
-        assert dbsession.query(LayerWMS).get(layer_id) is None
-        assert dbsession.query(Layer).get(layer_id) is None
-        assert dbsession.query(TreeItem).get(layer_id) is None
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.DELETE
+        assert log.element_type == "layer_wms"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
 
-    def test_submit_new_no_layer_name(self, test_app, layer_wms_test_data):
+    def test_submit_new_no_layer_name(self, test_app, layer_wms_test_data, dbsession):
         resp = test_app.post(
             "/admin/layers_wms/new",
             {
@@ -417,5 +439,5 @@ class TestLayerWMSViews(AbstractViewsTests):
             "Errors have been highlighted below" == resp.html.select_one('div[class="error-msg-detail"]').text
         )
         assert ["WMS layer name"] == sorted(
-            [(x.select_one("label").text.strip()) for x in resp.html.select("[class~='has-error']")]
+            (x.select_one("label").text.strip()) for x in resp.html.select("[class~='has-error']")
         )

tests/test_layers_wmts.py

@@ -19,12 +19,12 @@ def layer_wmts_test_data(dbsession, transact):
     server.image_type = "image/png"
 
     def layer_builder(i):
-        name = "layer_wmts_{}".format(i)
+        name = f"layer_wmts_{i}"
         layer = LayerWMTS(name=name)
         layer.layer = name
-        layer.url = "https:///wms.geo.admin.ch_{}.org?service=wms&request=GetCapabilities".format(i)
+        layer.url = f"https:///wms.geo.admin.ch_{i}.org?service=wms&request=GetCapabilities"
         layer.public = 1 == i % 2
-        layer.geo_table = "geotable_{}".format(i)
+        layer.geo_table = f"geotable_{i}"
         layer.image_type = "image/jpeg"
         layer.style = "décontrasté"
         return layer
@@ -39,7 +39,6 @@ def layer_wmts_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("layer_wmts_test_data", "test_app")
 class TestLayerWMTS(AbstractViewsTests):
-
     _prefix = "/admin/layers_wmts"
 
     def test_index_rendering(self, test_app):
@@ -102,6 +101,8 @@ class TestLayerWMTS(AbstractViewsTests):
         assert default_wmts.matrix_set == self.get_first_field_named(form, "matrix_set").value
 
     def test_edit(self, test_app, layer_wmts_test_data, dbsession):
+        from c2cgeoportal_commons.models.main import Log, LogAction
+
         layer = layer_wmts_test_data["layers"][0]
 
         form = self.get_item(test_app, layer.id).form
@@ -121,11 +122,11 @@ class TestLayerWMTS(AbstractViewsTests):
         assert str(layer.image_type or "") == form["image_type"].value
 
         interfaces = layer_wmts_test_data["interfaces"]
-        assert set((interfaces[0].id, interfaces[2].id)) == set(i.id for i in layer.interfaces)
+        assert {interfaces[0].id, interfaces[2].id} == {i.id for i in layer.interfaces}
         self._check_interfaces(form, interfaces, layer)
 
         ras = layer_wmts_test_data["restrictionareas"]
-        assert set((ras[0].id, ras[2].id)) == set(i.id for i in layer.restrictionareas)
+        assert {ras[0].id, ras[2].id} == {i.id for i in layer.restrictionareas}
         self._check_restrictionsareas(form, ras, layer)
 
         new_values = {
@@ -148,7 +149,7 @@ class TestLayerWMTS(AbstractViewsTests):
 
         resp = form.submit("submit")
         assert str(layer.id) == re.match(
-            r"http://localhost{}/(.*)\?msg_col=submit_ok".format(self._prefix), resp.location
+            rf"http://localhost{self._prefix}/(.*)\?msg_col=submit_ok", resp.location
         ).group(1)
 
         dbsession.expire(layer)
@@ -157,17 +158,23 @@ class TestLayerWMTS(AbstractViewsTests):
                 assert value == getattr(layer, key)
             else:
                 assert str(value or "") == str(getattr(layer, key) or "")
-        assert set([interfaces[1].id, interfaces[3].id]) == set(
-            [interface.id for interface in layer.interfaces]
-        )
-        assert set([ras[1].id, ras[3].id]) == set([ra.id for ra in layer.restrictionareas])
+        assert {interfaces[1].id, interfaces[3].id} == {interface.id for interface in layer.interfaces}
+        assert {ras[1].id, ras[3].id} == {ra.id for ra in layer.restrictionareas}
+
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.UPDATE
+        assert log.element_type == "layer_wmts"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
 
     def test_duplicate(self, layer_wmts_test_data, test_app, dbsession):
         from c2cgeoportal_commons.models.main import LayerWMTS
 
         layer = layer_wmts_test_data["layers"][3]
 
-        resp = test_app.get("/admin/layers_wmts/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wmts/{layer.id}/duplicate", status=200)
         form = resp.form
 
         assert "" == self.get_first_field_named(form, "id").value
@@ -192,23 +199,31 @@ class TestLayerWMTS(AbstractViewsTests):
         ).group(1)
 
     def test_delete(self, test_app, dbsession):
-        from c2cgeoportal_commons.models.main import Layer, LayerWMTS, TreeItem
+        from c2cgeoportal_commons.models.main import Layer, LayerWMTS, Log, LogAction, TreeItem
 
-        layer_id = dbsession.query(LayerWMTS.id).first().id
+        layer = dbsession.query(LayerWMTS).first()
 
-        test_app.delete("/admin/layers_wmts/{}".format(layer_id), status=200)
+        test_app.delete(f"/admin/layers_wmts/{layer.id}", status=200)
 
-        assert dbsession.query(LayerWMTS).get(layer_id) is None
-        assert dbsession.query(Layer).get(layer_id) is None
-        assert dbsession.query(TreeItem).get(layer_id) is None
+        assert dbsession.query(LayerWMTS).get(layer.id) is None
+        assert dbsession.query(Layer).get(layer.id) is None
+        assert dbsession.query(TreeItem).get(layer.id) is None
+
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.DELETE
+        assert log.element_type == "layer_wmts"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"
 
     def test_unicity_validator(self, layer_wmts_test_data, test_app):
         layer = layer_wmts_test_data["layers"][2]
-        resp = test_app.get("/admin/layers_wmts/{}/duplicate".format(layer.id), status=200)
+        resp = test_app.get(f"/admin/layers_wmts/{layer.id}/duplicate", status=200)
 
         resp = resp.form.submit("submit")
 
-        self._check_submission_problem(resp, "{} is already used.".format(layer.name))
+        self._check_submission_problem(resp, f"{layer.name} is already used.")
 
     def test_convert_common_fields_copied(self, layer_wmts_test_data, test_app, dbsession):
         from c2cgeoportal_commons.models.main import LayerWMS, LayerWMTS
@@ -218,10 +233,8 @@ class TestLayerWMTS(AbstractViewsTests):
         assert 0 == dbsession.query(LayerWMS).filter(LayerWMS.name == layer.name).count()
         assert 1 == dbsession.query(LayerWMTS).filter(LayerWMTS.name == layer.name).count()
 
-        resp = test_app.post("/admin/layers_wmts/{}/convert_to_wms".format(layer.id), status=200)
-        assert (
-            "http://localhost/admin/layers_wms/{}?msg_col=submit_ok".format(layer.id) == resp.json["redirect"]
-        )
+        resp = test_app.post(f"/admin/layers_wmts/{layer.id}/convert_to_wms", status=200)
+        assert f"http://localhost/admin/layers_wms/{layer.id}?msg_col=submit_ok" == resp.json["redirect"]
 
         assert 1 == dbsession.query(LayerWMS).filter(LayerWMS.name == layer.name).count()
         assert 0 == dbsession.query(LayerWMTS).filter(LayerWMTS.name == layer.name).count()
@@ -252,8 +265,16 @@ class TestLayerWMTS(AbstractViewsTests):
         )
 
     def test_convert_without_wms_defaults(self, test_app, layer_wmts_test_data, dbsession):
-        from c2cgeoportal_commons.models.main import LayerWMS
+        from c2cgeoportal_commons.models.main import LayerWMS, Log, LogAction
 
         dbsession.delete(LayerWMS.get_default(dbsession))
         layer = layer_wmts_test_data["layers"][3]
-        test_app.post("/admin/layers_wmts/{}/convert_to_wms".format(layer.id), status=200)
+        test_app.post(f"/admin/layers_wmts/{layer.id}/convert_to_wms", status=200)
+
+        log = dbsession.query(Log).one()
+        assert log.date != None
+        assert log.action == LogAction.CONVERT_TO_WMS
+        assert log.element_type == "layer_wmts"
+        assert log.element_id == layer.id
+        assert log.element_name == layer.name
+        assert log.username == "test_user"

tests/test_layertree.py

@@ -13,6 +13,7 @@ def layertree_test_data(dbsession, transact):
     del transact
 
     from c2cgeoportal_commons.models.main import (
+        Interface,
         LayerGroup,
         LayergroupTreeitem,
         LayerWMS,
@@ -21,26 +22,39 @@ def layertree_test_data(dbsession, transact):
         Theme,
     )
 
+    interface1 = Interface("interface1")
+    dbsession.add(interface1)
+    interface2 = Interface("interface2")
+    dbsession.add(interface2)
+
     layers_wms = []
     ogc_server = OGCServer(name="ogc_server")
     dbsession.add(ogc_server)
-    for i in range(0, 10):
-        layer_wms = LayerWMS(name="layer_wms_{}".format(i))
+    for i in range(10):
+        layer_wms = LayerWMS(name=f"layer_wms_{i}")
+        if i == 1:
+            layer_wms.interfaces = [interface1]
+        elif i > 1:
+            layer_wms.interfaces = [interface1, interface2]
         layer_wms.ogc_server = ogc_server
         layers_wms.append(layer_wms)
         dbsession.add(layer_wms)
 
     layers_wmts = []
-    for i in range(0, 10):
-        layer_wmts = LayerWMTS(name="layer_wmts_{}".format(i))
+    for i in range(10):
+        layer_wmts = LayerWMTS(name=f"layer_wmts_{i}")
+        if i == 1:
+            layer_wmts.interfaces = [interface1]
+        elif i > 1:
+            layer_wmts.interfaces = [interface1, interface2]
         layer_wmts.url = "http://localhost/wmts"
         layer_wmts.layer = layer_wmts.name
         layers_wmts.append(layer_wmts)
         dbsession.add(layer_wmts)
 
     groups = []
-    for i in range(0, 10):
-        group = LayerGroup(name="layer_group_{}".format(i))
+    for i in range(10):
+        group = LayerGroup(name=f"layer_group_{i}")
         groups.append(group)
         dbsession.add(group)
 
@@ -51,10 +65,14 @@ def layertree_test_data(dbsession, transact):
     dbsession.add(LayergroupTreeitem(group=groups[9], item=groups[8], ordering=3))
 
     themes = []
-    for i in range(0, 5):
-        theme = Theme(name="theme_{}".format(i))
+    for i in range(5):
+        theme = Theme(name=f"theme_{i}")
         themes.append(theme)
         dbsession.add(theme)
+        if i == 1:
+            theme.interfaces = [interface1]
+        elif i > 1:
+            theme.interfaces = [interface1, interface2]
 
         dbsession.add(LayergroupTreeitem(group=theme, item=groups[i], ordering=0))
         dbsession.add(LayergroupTreeitem(group=theme, item=groups[i + 5], ordering=1))
@@ -74,6 +92,7 @@ def layertree_test_data(dbsession, transact):
             "layers_wms": layers_wms,
             "layers_wmts": layers_wmts,
             "ogc_servers": [ogc_server],
+            "interfaces": [interface1, interface2],
         }
     )
 
@@ -84,7 +103,6 @@ def layertree_test_data(dbsession, transact):
 )
 @pytest.mark.usefixtures("layertree_test_data", "test_app")
 class TestLayerTreeView(AbstractViewsTests):
-
     _prefix = "/admin/layertree"
 
     def test_index(self, test_app):
@@ -93,13 +111,13 @@ class TestLayerTreeView(AbstractViewsTests):
     def check_edit_action(self, test_app, nodes, table, item_id):
         node = next(n for n in nodes if n["id"] == item_id)
         action = next(a for a in node["actions"] if a["name"] == "edit")
-        assert "http://localhost/admin/{}/{}".format(table, item_id) == action["url"]
+        assert f"http://localhost/admin/{table}/{item_id}" == action["url"]
         test_app.get(action["url"], status=200)
 
     def check_unlink_action(self, test_app, nodes, group_id, item_id):
         node = next(n for n in nodes if n["id"] == item_id)
         action = next(a for a in node["actions"] if a["name"] == "unlink")
-        assert "http://localhost/admin/layertree/unlink/{}/{}".format(group_id, item_id) == action["url"]
+        assert f"http://localhost/admin/layertree/unlink/{group_id}/{item_id}" == action["url"]
         test_app.delete(action["url"], status=200)
 
     def check_translation(self, nodes, item):
@@ -111,7 +129,7 @@ class TestLayerTreeView(AbstractViewsTests):
         node = next(n for n in nodes if n["id"] == parent_id)
         action = next(a for a in node["actions"] if a["name"] == action_name)
         assert label == action["label"]
-        assert "http://localhost/admin/{}/new?parent_id={}".format(route_table, parent_id) == action["url"]
+        assert f"http://localhost/admin/{route_table}/new?parent_id={parent_id}" == action["url"]
 
         form = test_app.get(action["url"], status=200).form
         assert form["parent_id"].value == str(parent_id)
@@ -150,12 +168,26 @@ class TestLayerTreeView(AbstractViewsTests):
             {"name": "new_name_from_layer_group"},
         )
 
-    def test_groups(self, test_app, layertree_test_data):
+    def test_groups(self, test_app, layertree_test_data, dbsession):
         theme = layertree_test_data["themes"][0]
+
+        # Invert children order (to test ordering)
+        theme.children_relation[0].ordering = 1
+        theme.children_relation[1].ordering = 0
+        dbsession.flush()
+
         resp = self.get(test_app, "/children?group_id={0}&path=_{0}".format(theme.id), status=200)
         nodes = resp.json
         assert 2 == len(nodes)
 
+        # check groups are sorted by ordering
+        expected = [
+            relation.treeitem.name
+            for relation in sorted(theme.children_relation, key=lambda relation: relation.ordering)
+        ]
+        group_names = [node["name"] for node in nodes]
+        assert expected == group_names
+
         group = layertree_test_data["groups"][0]
         self.check_edit_action(test_app, nodes, "layer_groups", group.id)
         self.check_unlink_action(test_app, nodes, theme.id, group.id)
@@ -186,15 +218,29 @@ class TestLayerTreeView(AbstractViewsTests):
             },
         )
 
-    def test_layers(self, test_app, layertree_test_data):
+    def test_layers(self, test_app, layertree_test_data, dbsession):
         theme = layertree_test_data["themes"][0]
         group = layertree_test_data["groups"][0]
+
+        # Invert children order (to test ordering)
+        group.children_relation[0].ordering = 1
+        group.children_relation[1].ordering = 0
+        dbsession.flush()
+
         resp = self.get(
             test_app, "/children?group_id={0}&path=_{1}_{0}".format(group.id, theme.id), status=200
         )
         nodes = resp.json
         assert len(nodes) == 2
 
+        # check layers are sorted by ordering
+        expected = [
+            relation.treeitem.name
+            for relation in sorted(group.children_relation, key=lambda relation: relation.ordering)
+        ]
+        layer_names = [node["name"] for node in nodes]
+        assert expected == layer_names
+
         layer_wms = layertree_test_data["layers_wms"][0]
         layer_wmts = layertree_test_data["layers_wmts"][0]
 
@@ -210,7 +256,7 @@ class TestLayerTreeView(AbstractViewsTests):
     def test_unlink(self, test_app, layertree_test_data, dbsession):
         group = layertree_test_data["groups"][0]
         item = layertree_test_data["layers_wms"][0]
-        test_app.delete("/admin/layertree/unlink/{}/{}".format(group.id, item.id), status=200)
+        test_app.delete(f"/admin/layertree/unlink/{group.id}/{item.id}", status=200)
         dbsession.expire_all()
         assert item not in group.children
 
@@ -226,5 +272,42 @@ class TestLayerTreeView(AbstractViewsTests):
             (layers_wms[1].id, LayerWMS),
             (groups[1].id, LayerGroup),
         ):
-            test_app.delete("/admin/layertree/delete/{}".format(item_id), status=200)
+            test_app.delete(f"/admin/layertree/delete/{item_id}", status=200)
             assert dbsession.query(model).get(item_id) is None
+
+    @pytest.mark.parametrize(
+        "params,expected",
+        [
+            ({}, ["theme_0", "theme_3", "theme_1", "theme_2", "theme_4"]),
+            ({"interface": "interface1"}, ["theme_3", "theme_1", "theme_2", "theme_4"]),
+            ({"interface": "interface2"}, ["theme_3", "theme_2", "theme_4"]),
+        ],
+    )
+    def test_themes_interfaces(self, test_app, layertree_test_data, params, expected):
+        resp = self.get(test_app, "/children", status=200, params=params)
+        nodes = resp.json
+        assert expected == [node["name"] for node in nodes if node["item_type"] == "theme"]
+
+    @pytest.mark.parametrize(
+        "interface,index,length",
+        [
+            (None, 0, 2),
+            (None, 1, 2),
+            (None, 2, 2),
+            ("interface1", 0, 0),
+            ("interface1", 1, 2),
+            ("interface1", 2, 2),
+            ("interface2", 0, 0),
+            ("interface2", 1, 0),
+            ("interface2", 2, 2),
+        ],
+    )
+    def test_layers_interface(self, test_app, layertree_test_data, interface, index, length):
+        theme = layertree_test_data["themes"][index]
+        group = layertree_test_data["groups"][index]
+        params = {"group_id": group.id, "path": f"_{theme.id}_{group.id}"}
+        if interface:
+            params["interface"] = interface
+        resp = self.get(test_app, "/children", status=200, params=params)
+        nodes = resp.json
+        assert length == len(nodes)

tests/test_left_menu.py

@@ -24,7 +24,6 @@ def left_menu_test_data(dbsession, transact):
 
 @pytest.mark.usefixtures("test_app")
 class TestLeftMenu(AbstractViewsTests):
-
     _prefix = "/admin/roles"
 
     def test_index(self, test_app):