Feat/group3 inpn taxonomie

.github/workflows/pytest.yml

@@ -53,6 +53,7 @@ jobs:
         psql -h localhost -U postgres -d postgres -tc 'CREATE EXTENSION "postgis_raster";'
         psql -h localhost -U postgres -d postgres -tc 'CREATE EXTENSION "uuid-ossp";'
         psql -h localhost -U postgres -d postgres -tc 'CREATE EXTENSION "pg_trgm";'
+        psql -h localhost -U postgres -d postgres -tc 'CREATE EXTENSION "unaccent";'
       env:
         PGPASSWORD: postgres
     - uses: actions/checkout@v2
@@ -73,6 +74,7 @@ jobs:
           -e file:dependencies/UsersHub-authentification-module#egg=pypnusershub
     - name: Install database
       run: |
+        flask db upgrade taxonomie@head -x local-srid=2154
         flask db upgrade ref_geo@head -x local-srid=2154
         flask db upgrade nomenclatures_taxonomie@head
         flask db autoupgrade

requirements.in

@@ -10,4 +10,4 @@ sqlalchemy
 
 utils-flask-sqlalchemy>=0.3.0
 taxhub>=1.10.0
-pypnusershub>=1.6.0
+pypnusershub>=2.0

src/pypnnomenclature/migrations/versions/11e7741319fd_get_default_nomenclature_value.py

@@ -5,6 +5,7 @@
 Create Date: 2021-10-04 17:51:48.491261
 
 """
+
 from alembic import op
 import sqlalchemy as sa
 

src/pypnnomenclature/migrations/versions/6015397d686a_nomenclatures.py

@@ -5,6 +5,7 @@
 Create Date: 2021-09-16 14:15:57.784074
 
 """
+
 import importlib.resources
 
 from alembic import op

src/pypnnomenclature/migrations/versions/618542880d1f_fix_typo_nomenc_type_def.py

@@ -5,6 +5,7 @@
 Create Date: 2022-07-28 14:43:31.883082
 
 """
+
 from alembic import op
 import sqlalchemy as sa
 

src/pypnnomenclature/migrations/versions/803524258bd3_add_group3_inpn_cor_taxref.py

@@ -0,0 +1,136 @@
+"""add group3_inpn cor_taxref_nomenclature
+
+Revision ID: 803524258bd3
+Revises: f5436084bf17
+Create Date: 2023-09-04 07:57:35.371378
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "803524258bd3"
+down_revision = "f5436084bf17"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column(
+        table_name="cor_taxref_nomenclature",
+        column=sa.Column("group3_inpn", sa.VARCHAR(255), server_default="all"),
+        schema="ref_nomenclatures",
+    )
+    op.execute(
+        """ALTER TABLE ref_nomenclatures.cor_taxref_nomenclature 
+               ADD CONSTRAINT check_cor_taxref_nomenclature_isgroup3inpn 
+               CHECK ((taxonomie.check_is_group3inpn((group3_inpn)::text) OR ((group3_inpn)::text = 'all'::text))) NOT VALID   
+        """
+    )
+    with op.batch_alter_table(
+        table_name="cor_taxref_nomenclature", schema="ref_nomenclatures"
+    ) as batch:
+        batch.drop_constraint("pk_cor_taxref_nomenclature")
+        batch.create_primary_key(
+            constraint_name="pk_cor_taxref_nomenclature",
+            columns=["id_nomenclature", "regne", "group2_inpn", "group3_inpn"],
+        )
+    op.execute("DROP VIEW ref_nomenclatures.v_nomenclature_taxonomie")
+    op.execute(
+        """
+CREATE OR REPLACE VIEW ref_nomenclatures.v_nomenclature_taxonomie
+AS SELECT tn.id_type,
+    tn.label_default AS type_label,
+    tn.definition_default AS type_definition,
+    tn.label_fr AS type_label_fr,
+    tn.definition_fr AS type_definition_fr,
+    tn.label_en AS type_label_en,
+    tn.definition_en AS type_definition_en,
+    tn.label_es AS type_label_es,
+    tn.definition_es AS type_definition_es,
+    tn.label_de AS type_label_de,
+    tn.definition_de AS type_definition_de,
+    tn.label_it AS type_label_it,
+    tn.definition_it AS type_definition_it,
+    ctn.regne,
+    ctn.group2_inpn,
+    ctn.group3_inpn,
+    n.id_nomenclature,
+    n.mnemonique,
+    n.label_default AS nomenclature_label,
+    n.definition_default AS nomenclature_definition,
+    n.label_fr AS nomenclature_label_fr,
+    n.definition_fr AS nomenclature_definition_fr,
+    n.label_en AS nomenclature_label_en,
+    n.definition_en AS nomenclature_definition_en,
+    n.label_es AS nomenclature_label_es,
+    n.definition_es AS nomenclature_definition_es,
+    n.label_de AS nomenclature_label_de,
+    n.definition_de AS nomenclature_definition_de,
+    n.label_it AS nomenclature_label_it,
+    n.definition_it AS nomenclature_definition_it,
+    n.id_broader,
+    n.hierarchy
+   FROM ref_nomenclatures.t_nomenclatures n
+     JOIN ref_nomenclatures.bib_nomenclatures_types tn ON tn.id_type = n.id_type
+     JOIN ref_nomenclatures.cor_taxref_nomenclature ctn ON ctn.id_nomenclature = n.id_nomenclature
+  WHERE n.active = true
+  ORDER BY tn.id_type, ctn.regne, ctn.group2_inpn, n.id_nomenclature;
+        """
+    )
+
+
+def downgrade():
+    with op.batch_alter_table(
+        table_name="cor_taxref_nomenclature", schema="ref_nomenclatures"
+    ) as batch:
+        batch.drop_constraint("check_cor_taxref_nomenclature_isgroup3inpn")
+        batch.drop_constraint("pk_cor_taxref_nomenclature")
+        batch.create_primary_key(
+            constraint_name="pk_cor_taxref_nomenclature",
+            columns=["id_nomenclature", "regne", "group2_inpn"],
+        )
+    op.execute("DROP VIEW ref_nomenclatures.v_nomenclature_taxonomie")
+    op.drop_column("cor_taxref_nomenclature", "group3_inpn", schema="ref_nomenclatures")
+    op.execute(
+        """
+               CREATE VIEW ref_nomenclatures.v_nomenclature_taxonomie
+AS SELECT tn.id_type,
+    tn.label_default AS type_label,
+    tn.definition_default AS type_definition,
+    tn.label_fr AS type_label_fr,
+    tn.definition_fr AS type_definition_fr,
+    tn.label_en AS type_label_en,
+    tn.definition_en AS type_definition_en,
+    tn.label_es AS type_label_es,
+    tn.definition_es AS type_definition_es,
+    tn.label_de AS type_label_de,
+    tn.definition_de AS type_definition_de,
+    tn.label_it AS type_label_it,
+    tn.definition_it AS type_definition_it,
+    ctn.regne,
+    ctn.group2_inpn,
+    n.id_nomenclature,
+    n.mnemonique,
+    n.label_default AS nomenclature_label,
+    n.definition_default AS nomenclature_definition,
+    n.label_fr AS nomenclature_label_fr,
+    n.definition_fr AS nomenclature_definition_fr,
+    n.label_en AS nomenclature_label_en,
+    n.definition_en AS nomenclature_definition_en,
+    n.label_es AS nomenclature_label_es,
+    n.definition_es AS nomenclature_definition_es,
+    n.label_de AS nomenclature_label_de,
+    n.definition_de AS nomenclature_definition_de,
+    n.label_it AS nomenclature_label_it,
+    n.definition_it AS nomenclature_definition_it,
+    n.id_broader,
+    n.hierarchy
+   FROM ref_nomenclatures.t_nomenclatures n
+     JOIN ref_nomenclatures.bib_nomenclatures_types tn ON tn.id_type = n.id_type
+     JOIN ref_nomenclatures.cor_taxref_nomenclature ctn ON ctn.id_nomenclature = n.id_nomenclature
+  WHERE n.active = true
+  ORDER BY tn.id_type, ctn.regne, ctn.group2_inpn, n.id_nomenclature;"""
+    )

src/pypnnomenclature/migrations/versions/96a713739fdd_nomenclatures_inpn_data.py

@@ -4,6 +4,7 @@
 Revises:
 Create Date: 2021-09-16 15:36:57.784074
 """
+
 import importlib.resources
 
 from alembic import op, context

src/pypnnomenclature/migrations/versions/a763fb554ff2_nomenclatures_taxonomie_data.py

@@ -4,6 +4,7 @@
 Revises:
 Create Date: 2021-09-16 15:36:57.784074
 """
+
 import importlib.resources
 
 from alembic import op

src/pypnnomenclature/migrations/versions/b820c66d8daa_get_nomenclature_label.py

@@ -5,6 +5,7 @@
 Create Date: 2021-12-10 10:07:09.478526
 
 """
+
 from alembic import op
 import sqlalchemy as sa
 

src/pypnnomenclature/migrations/versions/ee1146f6c0f4_add_uicn_rl.py

@@ -5,6 +5,7 @@
 Create Date: 2022-07-28 15:01:47.927979
 
 """
+
 from alembic import op
 import sqlalchemy as sa
 

src/pypnnomenclature/migrations/versions/f5436084bf17_nomenclatures_taxonomie.py

@@ -4,6 +4,7 @@
 Create Date: 2021-09-16 15:08:57.784074
 
 """
+
 import importlib.resources
 
 from alembic import op

src/pypnnomenclature/migrations/versions/f8c2c8482419_get_default_nomenclature_value.py

@@ -5,6 +5,7 @@
 Create Date: 2021-10-06 10:45:42.264034
 
 """
+
 from alembic import op
 import sqlalchemy as sa
 

src/pypnnomenclature/models.py

@@ -24,6 +24,7 @@ class CorTaxrefNomenclature(db.Model):
     )
     regne = db.Column(db.Unicode, primary_key=True)
     group2_inpn = db.Column(db.Unicode, primary_key=True)
+    group3_inpn = db.Column(db.Unicode, primary_key=True)
 
 
 @serializable(
@@ -166,6 +167,7 @@ class VNomenclatureTaxonomie(db.Model):
     type_definition_it = db.Column(db.Unicode)
     regne = db.Column(db.Unicode, primary_key=True)
     group2_inpn = db.Column(db.Unicode, primary_key=True)
+    group3_inpn = db.Column(db.Unicode, primary_key=True)
     id_nomenclature = db.Column(db.Integer, primary_key=True)
     mnemonique = db.Column(db.Unicode)
     nomenclature_label = db.Column(db.Unicode)

src/pypnnomenclature/repository.py

@@ -1,6 +1,7 @@
 """
     Méthode permettant de manipuler les objets de la nomenclature
 """
+
 from importlib import import_module
 from flask import current_app
 
@@ -21,6 +22,7 @@
     code_type=None,
     regne=None,
     group2_inpn=None,
+    group3_inpn=None,
     hierarchy=None,
     filter_params=None,
 ):
@@ -56,7 +58,10 @@
                 VNomenclatureTaxonomie.id_nomenclature == TNomenclatures.id_nomenclature,
             ).where(VNomenclatureTaxonomie.regne.in_(("all", regne)))
             if group2_inpn:
-                q = q.where(VNomenclatureTaxonomie.group2_inpn.in_(("all", group2_inpn)))
+                q = q.filter(VNomenclatureTaxonomie.group2_inpn.in_(("all", group2_inpn)))
+            if group3_inpn:
+                q = q.where(VNomenclatureTaxonomie.group3_inpn.in_(("all", group3_inpn)))
+
     if "cd_nomenclature" in filter_params:
         q = q.where(TNomenclatures.cd_nomenclature.in_(filter_params.getlist("cd_nomenclature")))
     # Ordonnancement
@@ -146,7 +151,7 @@
                 ]
             )
             nomenclature_dict["taxref"] = [
-                tr.as_dict(fields=["regne", "group2_inpn"]) for tr in n.taxref
+                tr.as_dict(fields=["regne", "group2_inpn", "group3_inpn"]) for tr in n.taxref
             ]
 
             nomenclatures.append(nomenclature_dict)

src/pypnnomenclature/routes.py

@@ -24,12 +24,14 @@
     """
     regne = request.args.get("regne")
     group2inpn = request.args.get("group2_inpn")
+    group3inpn = request.args.get("group3_inpn")
 
     response = repository.get_nomenclature_list(
         **{
             "id_type": id_type,
             "regne": regne,
             "group2_inpn": group2inpn,
+            "group3_inpn": group3inpn,
             "filter_params": request.args,
         }
     )
@@ -50,12 +52,14 @@
     """
     regne = request.args.get("regne")
     group2inpn = request.args.get("group2_inpn")
+    group3inpn = request.args.get("group3_inpn")
 
     response = repository.get_nomenclature_list(
         **{
             "code_type": code_type,
             "regne": regne,
             "group2_inpn": group2inpn,
+            "group3_inpn": group3inpn,
             "filter_params": request.args,
         }
     )
@@ -75,6 +79,7 @@
     """
     regne = request.args.get("regne")
     group2inpn = request.args.get("group2_inpn")
+    group3inpn = request.args.get("group3_inpn")
     types = []
     if "id_type" in request.args:
         types = request.args.getlist("id_type")
@@ -90,6 +95,7 @@
                 param: id_type,
                 "regne": regne,
                 "group2_inpn": group2inpn,
+                "group3_inpn": group3inpn,
                 "filter_params": request.args,
             }
         )