[SUIVI-EOLIEN] Séparation des groupes de sites et sites (db + api), style page d'accueil

backend/gn_module_monitoring/blueprint.py

@@ -4,6 +4,10 @@
 """
 
 from flask import Blueprint, current_app
+from geonature.core.admin.admin import admin as flask_admin
+from geonature.utils.env import DB
+
+from gn_module_monitoring.monitoring.admin import BibTypeSiteView
 from .command.cmd import commands
 
 blueprint = Blueprint("monitorings", __name__)
@@ -12,3 +16,5 @@
 blueprint.cli.short_help = "Commandes pour l" "administration du module MONITORINGS"
 for cmd in commands:
     blueprint.cli.add_command(cmd)
+
+flask_admin.add_view(BibTypeSiteView(DB.session, name="Types de site", category="Monitorings"))

backend/gn_module_monitoring/conf_schema_toml.py

@@ -4,11 +4,14 @@
    Fichier à ne pas modifier. Paramètres surcouchables dans config/config_gn_module.tml
 """
 
-from marshmallow import Schema, fields, validates_schema, ValidationError
+from marshmallow import Schema, fields
 
 
 class GnModuleSchemaConf(Schema):
-    pass
+    DESCRIPTION_MODULE = fields.String(missing="Vous trouverez ici la liste des modules")
+    TITLE_MODULE = fields.String(missing="Module de suivi")
+
+
 #     AREA_TYPE = fields.List(fields.String(), missing=["COM", "M1", "M5", "M10"])
 #     BORNE_OBS = fields.List(fields.Integer(), missing=[1, 20, 40, 60, 80, 100, 120])
 #     BORNE_TAXON = fields.List(fields.Integer(), missing=[1, 5, 10, 15])

backend/gn_module_monitoring/migrations/6673266fb79c_remove_id_module_from_sites_complements.py

@@ -0,0 +1,54 @@
+"""remove_id_module_from_sites_complements
+
+Revision ID: 6673266fb79c
+Revises: a54bafb13ce8
+Create Date: 2022-12-13 16:00:00.512562
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+from gn_module_monitoring import MODULE_CODE
+
+# revision identifiers, used by Alembic.
+revision = "6673266fb79c"
+down_revision = "a54bafb13ce8"
+branch_labels = None
+depends_on = None
+
+monitorings_schema = "gn_monitoring"
+
+
+def upgrade():
+    op.drop_column("t_site_complements", "id_module", schema=monitorings_schema)
+
+
+def downgrade():
+    op.add_column(
+        "t_site_complements",
+        sa.Column(
+            "id_module",
+            sa.Integer(),
+            sa.ForeignKey(
+                f"gn_commons.t_modules.id_module",
+                name="fk_t_site_complements_id_module",
+                ondelete="CASCADE",
+                onupdate="CASCADE",
+            ),
+            nullable=True,
+        ),
+        schema=monitorings_schema,
+    )
+    # Cannot use orm here because need the model to be "downgraded" as well
+    # Need to set nullable True above for existing rows
+    # FIXME: find a better way because need to assign a module...
+    statement = sa.text(
+        f"""
+         update {monitorings_schema}.t_site_complements
+         set id_module = (select id_module 
+                          from gn_commons.t_modules tm 
+                          where module_code = :module_code);
+        """
+    ).bindparams(module_code=MODULE_CODE)
+    op.execute(statement)
+    op.alter_column("t_site_complements", "id_module", nullable=False, schema=monitorings_schema)

backend/gn_module_monitoring/migrations/a54bafb13ce8_create_cor_module_type.py

@@ -0,0 +1,52 @@
+"""create_cor_module_type
+
+Revision ID: a54bafb13ce8
+Revises: ce54ba49ce5c
+Create Date: 2022-12-06 16:18:24.512562
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = "a54bafb13ce8"
+down_revision = "ce54ba49ce5c"
+branch_labels = None
+depends_on = None
+
+monitorings_schema = "gn_monitoring"
+referent_schema = "gn_commons"
+
+
+def upgrade():
+    op.create_table(
+        "cor_module_type",
+        sa.Column(
+            "id_type_site",
+            sa.Integer(),
+            sa.ForeignKey(
+                f"{monitorings_schema}.bib_type_site.id_nomenclature",
+                name="fk_cor_module_type_id_nomenclature",
+                ondelete="CASCADE",
+                onupdate="CASCADE",
+            ),
+            nullable=False,
+        ),
+        sa.Column(
+            "id_module",
+            sa.Integer(),
+            sa.ForeignKey(
+                f"{referent_schema}.t_modules.id_module",
+                name="fk_cor_module_type_id_module",
+                ondelete="CASCADE",
+                onupdate="CASCADE",
+            ),
+            nullable=False,
+        ),
+        sa.PrimaryKeyConstraint("id_type_site", "id_module", name="pk_cor_module_type"),
+        schema=monitorings_schema,
+    )
+
+
+def downgrade():
+    op.drop_table("cor_module_type", schema=monitorings_schema)

backend/gn_module_monitoring/migrations/b53bafb13ce8_create_bib_type_site.py

@@ -0,0 +1,62 @@
+"""create_bib_type_site
+
+Revision ID: b53bafb13ce8
+Revises: e78003460441
+Create Date: 2022-12-06 16:18:24.512562
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = "b53bafb13ce8"
+down_revision = "e78003460441"
+branch_labels = None
+depends_on = None
+
+monitorings_schema = "gn_monitoring"
+nomenclature_schema = "ref_nomenclatures"
+
+
+def upgrade():
+    op.create_table(
+        "bib_type_site",
+        sa.Column(
+            "id_nomenclature",
+            sa.Integer(),
+            sa.ForeignKey(
+                f"{nomenclature_schema}.t_nomenclatures.id_nomenclature",
+                name="fk_t_nomenclatures_id_nomenclature",
+            ),
+            nullable=False,
+            unique=True,
+        ),
+        sa.PrimaryKeyConstraint("id_nomenclature"),
+        sa.Column("config", sa.JSON(), nullable=True),
+        schema=monitorings_schema,
+    )
+
+    # FIXME: if sqlalchemy >= 1.4.32, it should work with postgresql_not_valid=True: cleaner
+    # op.create_check_constraint(
+    #     "ck_bib_type_site_id_nomenclature",
+    #     "bib_type_site",
+    #     f"{nomenclature_schema}.check_nomenclature_type_by_mnemonique(id_nomenclature,'TYPE_SITE')",
+    #     schema=monitorings_schema,
+    #     postgresql_not_valid=True
+    # )
+    statement = sa.text(
+        f"""
+        ALTER TABLE {monitorings_schema}.bib_type_site 
+        ADD
+          CONSTRAINT ck_bib_type_site_id_nomenclature CHECK (
+            {nomenclature_schema}.check_nomenclature_type_by_mnemonique(
+              id_nomenclature, 'TYPE_SITE' :: character varying
+            )
+          ) NOT VALID
+        """
+    )
+    op.execute(statement)
+
+
+def downgrade():
+    op.drop_table("bib_type_site", schema=monitorings_schema)

backend/gn_module_monitoring/migrations/ce54ba49ce5c_create_cor_type_site.py

@@ -0,0 +1,51 @@
+"""create_cor_type_site
+
+Revision ID: ce54ba49ce5c
+Revises: b53bafb13ce8
+Create Date: 2022-12-06 16:18:24.512562
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = "ce54ba49ce5c"
+down_revision = "b53bafb13ce8"
+branch_labels = None
+depends_on = None
+
+monitorings_schema = "gn_monitoring"
+
+
+def upgrade():
+    op.create_table(
+        "cor_type_site",
+        sa.Column(
+            "id_type_site",
+            sa.Integer(),
+            sa.ForeignKey(
+                f"{monitorings_schema}.bib_type_site.id_nomenclature",
+                name="fk_cor_type_site_id_nomenclature",
+                ondelete="CASCADE",
+                onupdate="CASCADE",
+            ),
+            nullable=False,
+        ),
+        sa.Column(
+            "id_base_site",
+            sa.Integer(),
+            sa.ForeignKey(
+                f"{monitorings_schema}.t_base_sites.id_base_site",
+                name="fk_cor_type_site_id_base_site",
+                ondelete="CASCADE",
+                onupdate="CASCADE",
+            ),
+            nullable=False,
+        ),
+        sa.PrimaryKeyConstraint("id_type_site", "id_base_site", name="pk_cor_type_site"),
+        schema=monitorings_schema,
+    )
+
+
+def downgrade():
+    op.drop_table("cor_type_site", schema=monitorings_schema)

backend/gn_module_monitoring/migrations/f24adb481f54_remove_id_module_from_sites_groups.py

@@ -0,0 +1,54 @@
+"""remove_id_module_from_sites_groups
+
+Revision ID: f24adb481f54
+Revises: 6673266fb79c
+Create Date: 2022-12-13 16:00:00.512562
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+from gn_module_monitoring import MODULE_CODE
+
+# revision identifiers, used by Alembic.
+revision = "f24adb481f54"
+down_revision = "6673266fb79c"
+branch_labels = None
+depends_on = None
+
+monitorings_schema = "gn_monitoring"
+
+
+def upgrade():
+    op.drop_column("t_sites_groups", "id_module", schema=monitorings_schema)
+
+
+def downgrade():
+    op.add_column(
+        "t_sites_groups",
+        sa.Column(
+            "id_module",
+            sa.Integer(),
+            sa.ForeignKey(
+                f"gn_commons.t_modules.id_module",
+                name="fk_t_sites_groups_id_module",
+                ondelete="CASCADE",
+                onupdate="CASCADE",
+            ),
+            nullable=True,
+        ),
+        schema=monitorings_schema,
+    )
+    # Cannot use orm here because need the model to be "downgraded" as well
+    # Need to set nullable True above for existing rows
+    # FIXME: find a better way because need to assign a module...
+    statement = sa.text(
+        f"""
+         update {monitorings_schema}.t_sites_groups
+         set id_module = (select id_module 
+                          from gn_commons.t_modules tm 
+                          where module_code = :module_code);
+        """
+    ).bindparams(module_code=MODULE_CODE)
+    op.execute(statement)
+    op.alter_column("t_sites_groups", "id_module", nullable=False, schema=monitorings_schema)

backend/gn_module_monitoring/modules/repositories.py

@@ -4,6 +4,7 @@
     get_modules
 """
 
+from sqlalchemy.orm import Load
 from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
 
 from geonature.utils.env import DB
@@ -87,7 +88,12 @@ def get_modules():
 
     try:
         res = (
-            DB.session.query(TMonitoringModules).order_by(TMonitoringModules.module_label)
+            DB.session.query(TMonitoringModules)
+            .options(
+                # Raise load not to load any relationship
+                Load(TMonitoringModules).raiseload("*")
+            )
+            .order_by(TMonitoringModules.module_label)
             .all()
         )