Backend test : use generic fixture user

amandine-sahl · amandine-sahl · commit 09aa9c2b0c16 · 2025-06-27T14:49:54.000+02:00
diff --git a/backend/gn_module_monitoring/tests/fixtures/generic.py b/backend/gn_module_monitoring/tests/fixtures/generic.py
@@ -9,7 +9,9 @@
     Permission,
 )
 from geonature.core.gn_commons.models import TModules
+from gn_module_monitoring.monitoring.models import TMonitoringModules
 
+from geonature.tests.fixtures import users
 from pypnusershub.db.models import User
 from pypnusershub.db.models import (
     User,
@@ -20,21 +22,60 @@
 )
 
 
-@pytest.fixture(scope="session")
-def monitorings_users(app):
-    app = db.session.execute(
-        select(Application).where(Application.code_application == "GN")
-    ).scalar_one()
-    profil = db.session.execute(select(Profil).where(Profil.nom_profil == "Lecteur")).scalar_one()
+def add_user_permission(module_code, user, scope, type_code_object, code_action="CRUVED"):
+    """
+    Add permissions to a user in a module.
 
-    modules = db.session.scalars(select(TModules)).all()
+    Parameters
+    ----------
+    module_code : str
+        Code of the module to add the permission to.
+    user : User
+        User to add the permission to.
+    scope : int
+        Scope value for the permission.
+    type_code_object : str
+        Type of the object to add the permission to.
+    code_action : str, optional
+        Code of the action to add the permission for. Default is "CRUVED".
 
+    Notes
+    -----
+    The function will add the permission to the specified module and object with the given scope.
+    If the scope is 3, the scope_value will be set to None.
+    """
+    module = db.session.execute(
+        select(TModules).where(TModules.module_code == module_code)
+    ).scalar_one()
     actions = {
         code: db.session.execute(
             select(PermAction).where(PermAction.code_action == code)
         ).scalar_one()
-        for code in "CRUVED"
+        for code in code_action
     }
+    with db.session.begin_nested():
+        if scope > 0:
+            object_all = db.session.scalars(
+                select(PermObject).where(PermObject.code_object == type_code_object)
+            ).all()
+            for action in actions.values():
+                for obj in object_all + module.objects:
+                    permission = Permission(
+                        role=user,
+                        action=action,
+                        module=module,
+                        object=obj,
+                        scope_value=scope if scope != 3 else None,
+                        sensitivity_filter=None,
+                    )
+                    db.session.add(permission)
+
+
+@pytest.fixture
+def monitorings_users(users):
+
+    modules = db.session.scalars(select(TModules)).all()
+
     type_code_object = [
         "MONITORINGS_MODULES",
         "MONITORINGS_GRP_SITES",
@@ -43,60 +84,31 @@ def monitorings_users(app):
         "ALL",
     ]
 
-    def create_user(username, organisme=None, scope=None, sensitivity_filter=False):
-        # do not commit directly on current transaction, as we want to rollback all changes at the end of tests
-        with db.session.begin_nested():
-            user = User(
-                groupe=False,
-                active=True,
-                organisme=organisme,
-                identifiant=username,
-                password=username,
-                nom_role=username,
-                prenom_role=username,
-            )
-            db.session.add(user)
-        # user must have been commited for user.id_role to be defined
-        with db.session.begin_nested():
-            # login right
-            right = UserApplicationRight(
-                id_role=user.id_role, id_application=app.id_application, id_profil=profil.id_profil
-            )
-            db.session.add(right)
-            if scope > 0:
-                for co in type_code_object:
-                    object_all = db.session.scalars(
-                        select(PermObject).where(PermObject.code_object == co)
-                    ).all()
-                    for action in actions.values():
-                        for module in modules:
-                            for obj in object_all + module.objects:
-                                permission = Permission(
-                                    role=user,
-                                    action=action,
-                                    module=module,
-                                    object=obj,
-                                    scope_value=scope if scope != 3 else None,
-                                    sensitivity_filter=sensitivity_filter,
-                                )
-                                db.session.add(permission)
-        return user
+    def add_monitoring_permissions(user, scope=None, sensitivity_filter=False):
+        for code_object in type_code_object:
+            for module in modules:
+                add_user_permission(
+                    module.module_code,
+                    user,
+                    scope=scope,
+                    type_code_object=code_object,
+                    code_action="CRUVD",
+                )
 
-    users = {}
+        return user
 
-    organisme = Organisme(nom_organisme="Autre")
-    db.session.add(organisme)
+    monitoring_users = {}
 
     users_to_create = [
-        ("noright_user", organisme, 0),
-        ("stranger_user", None, 2),
-        ("associate_user", organisme, 2),
-        ("self_user", organisme, 1),
-        ("user", organisme, 2),
-        ("admin_user", organisme, 3),
+        ("noright_user", 0),
+        ("stranger_user", 2),
+        ("associate_user", 2),
+        ("self_user", 1),
+        ("user", 2),
+        ("admin_user", 3),
     ]
 
     for username, *args in users_to_create:
-        users[username] = create_user(username, *args)
+        monitoring_users[username] = add_monitoring_permissions(users[username], *args)
 
-    return users
+    return monitoring_users
diff --git a/backend/gn_module_monitoring/tests/test_routes/test_monitoring.py b/backend/gn_module_monitoring/tests/test_routes/test_monitoring.py
@@ -13,35 +13,6 @@
 from pypnusershub.tests.utils import set_logged_user_cookie
 
 from gn_module_monitoring.tests.fixtures.generic import *
-from gn_module_monitoring.monitoring.models import TMonitoringModules
-
-
-def add_user_permission(module_code, user, scope, type_code_object, code_action="CRUVED"):
-    module = db.session.execute(
-        select(TMonitoringModules).where(TMonitoringModules.module_code == module_code)
-    ).scalar_one()
-    actions = {
-        code: db.session.execute(
-            select(PermAction).where(PermAction.code_action == code)
-        ).scalar_one()
-        for code in code_action
-    }
-    with db.session.begin_nested():
-        if scope > 0:
-            object_all = db.session.scalars(
-                select(PermObject).where(PermObject.code_object == type_code_object)
-            ).all()
-            for action in actions.values():
-                for obj in object_all + module.objects:
-                    permission = Permission(
-                        role=user,
-                        action=action,
-                        module=module,
-                        object=obj,
-                        scope_value=scope if scope != 3 else None,
-                        sensitivity_filter=None,
-                    )
-                    db.session.add(permission)
 
 
 @pytest.mark.usefixtures("client_class", "temporary_transaction")
diff --git a/backend/gn_module_monitoring/tests/test_routes/test_site.py b/backend/gn_module_monitoring/tests/test_routes/test_site.py
@@ -7,7 +7,7 @@
 from gn_module_monitoring.tests.fixtures.generic import *
 
 
-@pytest.mark.usefixtures("client_class", "temporary_transaction")
+@pytest.mark.usefixtures("client_class")
 class TestSite:
     def test_get_type_site_by_id(self, types_site):
         for type_site in types_site.values():
@@ -75,26 +75,38 @@ def test_get_sites_order_by_unknown_field(self, sites, monitorings_users):
 
     def test_get_sites_filters(self, sites, visits, monitorings_users):
         set_logged_user_cookie(self.client, monitorings_users["admin_user"])
+
         r = self.client.get(url_for("monitorings.get_sites", last_visit="2025"))
         assert r.json["count"] >= len(sites)
 
         r = self.client.get(url_for("monitorings.get_sites", last_visit="2026"))
         assert r.json["count"] == 0
 
-        r = self.client.get(url_for("monitorings.get_sites", id_inventor="user"))
-        nb_results = r.json["count"]
-        assert r.json["count"] >= 3
+        # Test filters with inventor name
+        resp = self.client.get(url_for("monitorings.get_sites", id_inventor="Bob"))
+        nb_results = resp.json["count"]
+        assert nb_results >= 3
 
-        r = self.client.get(
+        # Test filters  with inventor name with order by
+        resp = self.client.get(
             url_for(
                 "monitorings.get_sites",
-                id_inventor="user",
+                id_inventor="Bob",
                 sort="id_inventor",
                 sort_dir="desc",
             )
         )
-        assert nb_results == r.json["count"]
-        assert r.json["count"] == len(sites)
+        assert nb_results == resp.json["count"]
+
+        # Test get all sites with order by
+        resp = self.client.get(
+            url_for(
+                "monitorings.get_sites",
+                sort="id_base_site",
+                sort_dir="desc",
+            )
+        )
+        assert resp.json["count"] == len(sites)
 
     def test_get_sites_filters_types_site(self, sites, types_site, monitorings_users):
         set_logged_user_cookie(self.client, monitorings_users["admin_user"])
@@ -127,7 +139,7 @@ def test_get_sites_base_site_name(self, sites, monitorings_users):
         base_site_name = site.base_site_name
 
         r = self.client.get(url_for("monitorings.get_sites", base_site_name=base_site_name))
-        print(r.json)
+
         assert len(r.json["items"]) == 1
         assert r.json["items"][0]["base_site_name"] == base_site_name
 
@@ -386,8 +398,6 @@ def test_get_module_sites(self, monitoring_module, monitorings_users):
         set_logged_user_cookie(self.client, monitorings_users["admin_user"])
         module_code = "TEST"
         r = self.client.get(url_for("monitorings.get_module_sites", module_code=module_code))
-        print(url_for("monitorings.get_module_sites", module_code=module_code))
-        print(r.json)
         assert r.json["module_code"] == module_code
 
     def test_get_types_site_by_label(self, types_site, monitorings_users):
diff --git a/backend/gn_module_monitoring/tests/test_routes/test_visit.py b/backend/gn_module_monitoring/tests/test_routes/test_visit.py
@@ -7,7 +7,7 @@
 from gn_module_monitoring.tests.fixtures.generic import *
 
 
-@pytest.mark.usefixtures("client_class", "temporary_transaction")
+@pytest.mark.usefixtures("client_class")
 class TestVisits:
     def test_get_visits(self, visits, monitorings_users):
         set_logged_user_cookie(self.client, monitorings_users["admin_user"])
