add is_product_owner, product_owner, input_scale, input_ref_geo fields (refs PnX-SI#52)

Author: juggler31

.gitignore

@@ -106,6 +106,9 @@ venv.bak/
 
 # vscode
 .vscode/
+
+.idea
+cache
 # config module
 frontend/app/module.config.ts
 

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 (à déterminer)
 
+**🚀 Nouveautés**
+
+- Ajout de 3 nouveau champs "product_owner", "input_scale", "input_ref_geo"(#52, by @juggler31)
+
 **🐛 Corrections**
 
 - Ajout du boutton "quitter" sur l'onglet 9 (#114, by @juggler31)

backend/gn_module_zh/blueprint.py

@@ -19,7 +19,7 @@
 from ref_geo.models import BibAreasTypes, LAreas, LiMunicipalities
 from geonature.utils.config import config
 from geonature.utils.env import DB, ROOT_DIR, BACKEND_DIR
-from pypnnomenclature.models import TNomenclatures
+from pypnnomenclature.models import TNomenclatures, BibNomenclaturesTypes
 from pypnusershub.db.models import Organisme, User
 from sqlalchemy import desc, func, text, select, update, delete
 from sqlalchemy.orm import aliased
@@ -360,6 +360,8 @@ def get_pbf_complete():
                tz.menaces,
                tz.diagnostic_bio,
                tz.diagnostic_hydro,
+               tz.product_owner,
+               tz.input_scale,
                Json_build_object('criteres_delim', tz.criteres_delim,
                          'communes',
                          tz.communes,
@@ -420,32 +422,74 @@ def get_geometries():
         DB.session.close()
 
 
-@blueprint.route("/references/autocomplete", methods=["GET"])
+@blueprint.route("/autocomplete/<string:field>", methods=["GET"])
 @permissions.check_cruved_scope("R", module_code="ZONES_HUMIDES")
 @json_resp
-def get_ref_autocomplete():
+def get_autocomplete(field):
     try:
         params = request.args
-        search_title = params.get("search_title")
-        # search_title = 'MCD'
-        q = select(TReferences, func.similarity(TReferences.title, search_title).label("idx_trgm"))
+        if field == "references":
+            search_title = params.get("search_title")
+            # search_title = 'MCD'
+            q = select(
+                TReferences, func.similarity(TReferences.title, search_title).label("idx_trgm")
+            )
 
-        search_title = search_title.replace(" ", "%")
-        q = q.where(TReferences.title.ilike("%" + search_title + "%")).order_by(desc("idx_trgm"))
+            search_title = search_title.replace(" ", "%")
+            q = q.where(TReferences.title.ilike("%" + search_title + "%")).order_by(
+                desc("idx_trgm")
+            )
+        elif field == "product_owner":
+            search_product_owner = params.get("search_product_owner")
+            q = select(
+                BibOrganismes,
+                func.similarity(BibOrganismes.name, search_product_owner).label("idx_trgm"),
+            )
 
+            search_product_owner = search_product_owner.replace(" ", "%")
+            q = (
+                q.where(BibOrganismes.name.ilike("%" + search_product_owner + "%"))
+                .where(BibOrganismes.is_product_owner == True)
+                .order_by(desc("idx_trgm"))
+            )
+        elif field == "input_scale":
+            search_input_scale = params.get("search_input_scale")
+            id_nommenclature_type = DB.session.execute(
+                select(BibNomenclaturesTypes.id_type).where(
+                    BibNomenclaturesTypes.mnemonique.like("INPUT_SCALE")
+                )
+            ).scalar_one()
+            q = (
+                select(TNomenclatures.mnemonique)
+                .where(TNomenclatures.id_type == id_nommenclature_type)
+                .where(TNomenclatures.mnemonique.ilike("%" + search_input_scale + "%"))
+            )
+        elif field == "input_ref_geo":
+            search_input_ref_geo = params.get("search_input_ref_geo")
+            id_nommenclature_type = DB.session.execute(
+                select(BibNomenclaturesTypes.id_type).where(
+                    BibNomenclaturesTypes.mnemonique.like("INPUT_REF_GEO")
+                )
+            ).scalar_one()
+            q = (
+                select(TNomenclatures.mnemonique)
+                .where(TNomenclatures.id_type == id_nommenclature_type)
+                .where(TNomenclatures.mnemonique.ilike("%" + search_input_ref_geo + "%"))
+            )
+        else:
+            raise NotFound(f"Field {field} not found for autocomplete")
         limit = request.args.get("limit", 20)
-
         data = DB.session.execute(q.limit(limit)).all()
         if data:
-            return [d[0].as_dict() for d in data]
+            return [d[0].as_dict() if hasattr(d[0], "as_dict") else d[0] for d in data]
         else:
             return "No Result", 404
     except Exception as e:
         if e.__class__.__name__ == "ZHApiError":
             raise ZHApiError(message=str(e.message), details=str(e.details))
         exc_type, value, tb = sys.exc_info()
         raise ZHApiError(
-            message="get_ref_autocomplete_error",
+            message=f"get_autocomplete_error on field: {field}",
             details=str(exc_type) + ": " + str(e.with_traceback(tb)),
         )
     finally:
@@ -628,7 +672,6 @@ def get_tab_data(id_tab):
             raise BadRequest(
                 "Géométrie manquante",
             )
-
         # POST / PATCH
         if "id_zh" not in form_data.keys():
             # set geometry from coordinates

backend/gn_module_zh/conf_schema_toml.py

@@ -26,6 +26,7 @@ class MapListConfig(Schema):
     {"prop": "code", "name": "Code"},
     {"prop": "sdage", "name": "Typologie SDAGE", "sortable": True},
     {"prop": "bassin_versant", "name": "Bassin versant", "sortable": True},
+    {"prop": "input_scale", "name": "Échelle de saisie"},
     {"prop": "delims", "name": "Critères délimitation (de la zh)", "sortable": True},
     {"prop": "create_date", "name": "Date de création"},
     {"prop": "author", "name": "Auteur"},