Merge branch 'feat/import-monitoring' into feat/import-monitoring-sites-groups

Author: IdrissaD

backend/gn_module_monitoring/command/imports/destination.py

@@ -1,3 +1,4 @@
+from gn_module_monitoring.command.imports.utils import destination_name
 from sqlalchemy import select, exists
 import sqlalchemy as sa
 
@@ -48,7 +49,7 @@ def upsert_bib_destination(module_data: dict) -> Destination:
     destination_data = {
         "id_module": module_monitoring_code.id_module,
         "code": module_data["module_code"],
-        "label": "Monitoring - " + module_data["module_label"],
+        "label": destination_name(module_data["module_label"]),
         "table_name": f"t_imports_{module_data['module_code'].lower()}",
         "active": True,
     }

backend/gn_module_monitoring/command/imports/protocol.py

@@ -1,4 +1,5 @@
 import os
+from gn_module_monitoring.command.imports.utils import destination_name
 from gn_module_monitoring.config.repositories import get_config
 from gn_module_monitoring.config.utils import (
     json_from_file,
@@ -306,7 +307,7 @@ def get_existing_protocol_state(id_destination: int, module_data):
     destination = DB.session.execute(
         select(Destination).filter_by(id_destination=id_destination)
     ).scalar()
-    new_label = module_data["module"].get("module_label")
+    new_label = destination_name(module_data["module"].get("module_label"))
     return {
         "fields": [field.__dict__ for field in existing_fields],
         "entities": [entity.__dict__ for entity in existing_entities],

backend/gn_module_monitoring/command/imports/utils.py

@@ -13,6 +13,10 @@
 from geonature.utils.env import db
 
 
+def destination_name(module_name: str):
+    return f"Monitoring - {module_name}"
+
+
 def ask_confirmation():
     prompt = "\nVeuillez confirmer que vous souhaitez effectuer ces modifications ? [yes/no]: "
 

backend/gn_module_monitoring/monitoring/import_actions/actions.py

@@ -252,12 +252,6 @@ def import_data_to_destination(imprt: TImports) -> None:
             if entity.code == "visit":
                 core_select_cols.append(sa.literal(imprt.destination.id_module).label("id_module"))
                 core_dest_col_names.append("id_module")
-                # FIXME: should be done automatically :/
-                if "v__observers" in map(lambda x: x.name_field, entity_fields):
-                    core_select_cols.append(
-                        transient_table.c.src_v__observers.label("observers_txt")
-                    )
-                    core_dest_col_names.append("observers_txt")
             core_select_stmt = (
                 sa.select(*core_select_cols)
                 .where(transient_table.c.id_import == imprt.id_import)
@@ -419,6 +413,7 @@ def import_data_to_destination(imprt: TImports) -> None:
                                     ),
                                 )
                             )
+                        )
 
                         if complement_select_stmt is not None:
                             if entity.code == "site" and is_sites_group_id_fields:
@@ -460,16 +455,33 @@ def import_data_to_destination(imprt: TImports) -> None:
                 yield (batch + 1) / batch_count
             imprt.statistics.update({f"{entity.code}_count": row_count})
 
-            if entity.code == "visit":
-                ImportActions.bind_matched_observers(
-                    imprt,
-                    TBaseVisits,
-                    "observers_txt",
-                    "id_base_visit",
-                    CorVisitObserver,
-                    ["id_base_visit", "id_role"],
-                )
-
+            if entity.code == "visit" and MonitoringImportActions.is_observer_mapping_enabled():
+
+                if "v__observers" in imprt.fieldmapping:
+                    if imprt.fieldmapping["v__observers"].get("constant_value", None) is not None:
+                        db.session.execute(
+                            sa.insert(CorVisitObserver).from_select(
+                                ["id_base_visit", "id_role"],
+                                sa.select(
+                                    transient_table.c.id_base_visit,
+                                    sa.func.unnest(transient_table.c["v__observers"]).label(
+                                        "id_role"
+                                    ),
+                                )
+                                .where(transient_table.c["v__observers"] != None)
+                                .where(transient_table.c.id_import == imprt.id_import)
+                                .where(transient_table.c[entity.validity_column] == True),
+                            )
+                        )
+                    else:
+                        ImportActions.bind_matched_observers(
+                            imprt,
+                            transient_table,
+                            "src_v__observers",
+                            "id_base_visit",
+                            CorVisitObserver,
+                            ["id_base_visit", "id_role"],
+                        )
         imprt.statistics.update(ObservationImportActions.compute_taxa_statistics(imprt))
 
         # filter empty statistics

backend/gn_module_monitoring/tests/conftest.py

@@ -1,2 +1,3 @@
 import pytest
 from geonature.tests.test_monitoring import markings, nomenclature_type_markings
+from gn_module_monitoring.tests.fixtures import *

backend/gn_module_monitoring/tests/fixtures/__init__.py

@@ -0,0 +1,8 @@
+from .generic import *
+from .individual import *
+from .module import *
+from .site import *
+from .sites_groups import *
+from .visit import *
+from .observation import *
+from .marking import *

backend/gn_module_monitoring/tests/fixtures/individual.py

@@ -8,7 +8,6 @@
 
 from geonature.core.gn_monitoring.models import corIndividualModule
 from gn_module_monitoring.monitoring.models import TMonitoringIndividuals
-from gn_module_monitoring.tests.fixtures.marking import *
 
 from geonature.tests.fixtures import users
 

backend/gn_module_monitoring/tests/fixtures/module.py

@@ -21,7 +21,6 @@
 )
 from gn_module_monitoring.monitoring.models import TMonitoringModules
 from gn_module_monitoring.tests.fixtures.generic import add_user_permission
-from gn_module_monitoring.tests.fixtures.type_site import types_site
 
 
 @pytest.fixture

backend/gn_module_monitoring/tests/test_commands/test_commands.py

@@ -7,7 +7,6 @@
 from geonature.utils.env import DB
 from geonature.core.imports.models import BibFields, Destination
 
-from gn_module_monitoring.tests.fixtures.generic import *
 from gn_module_monitoring.command.cmd import (
     cmd_remove_monitoring_module_cmd,
     cmd_process_sql,

backend/gn_module_monitoring/tests/test_commands/test_utils.py

@@ -1,10 +1,13 @@
 import pytest
 
 from pathlib import Path
+from flask import url_for, current_app
 
-from gn_module_monitoring.tests.fixtures.generic import *
-from gn_module_monitoring.command.imports.constant import FORBIDDEN_SQL_INSTRUCTION
-from gn_module_monitoring.command.sql import execute_sql_file
+from sqlalchemy import select
+
+from geonature.utils.env import DB
+from gn_module_monitoring.command.utils import execute_sql_file, FORBIDDEN_SQL_INSTRUCTION
+from gn_module_monitoring.monitoring.models import TMonitoringModules
 
 
 class TestCommandsUtils: