Merge pull request #486 from PnX-SI/dev

Dev

Author: hypsug0

CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 1.3.3 - 2026-04-15
+
+> [!WARNING]
+> **Version 1.3.x will be the latest release compatible with python 3.9**
+
+### :bug: Fixes
+
+* Fix taxa set to undefined within validation module when using taxa `select` type input.
+* Fix missing translations on validation modal button (fix [#467 issue comment](https://github.com/PnX-SI/GeoNature-citizen/issues/467#issuecomment-4163231028)).
+* Enable `0` value in count input (fix #472).
+* Improve documentation for validation module (fix #467)
+
+
 ## 1.3.2 - 2025-12-01
 
 > [!WARNING]
@@ -35,12 +48,12 @@
 * Taxons search in programs is now based on observed taxons
 * If no photo is added to an observation and if an image is available for this to taxa in TaxHub, then this image is displayed on the Congrats popup
 * Observation name displayed in program observations list is based on this order:
-  *  'nom_francais'
-  *  'taxref.nom_vern'
-  *  'taxref.nom_valide'
-  *  'taxref.nom_complet'
-  *  'taxref.lb_nom'
-  *  'taxref.cd_nom'
+  * 'nom_francais'
+  * 'taxref.nom_vern'
+  * 'taxref.nom_valide'
+  * 'taxref.nom_complet'
+  * 'taxref.lb_nom'
+  * 'taxref.cd_nom'
 
 ### :technologist: Development
 

VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

backend/gncitizen/core/observations/routes.py

@@ -19,11 +19,11 @@
 from gncitizen.utils.media import save_upload_files
 from gncitizen.utils.taxonomy import (
     get_taxa_by_cd_nom,
-    taxhub_rest_get_taxon_list,
     set_taxa_info_from_taxhub,
+    taxhub_rest_get_taxon_list,
 )
 from server import db
-from shapely.geometry import shape
+from shapely.geometry import Point, shape
 from sqlalchemy import desc
 from utils_flask_sqla.response import json_resp
 
@@ -247,6 +247,7 @@ def post_observation():
                 ObservationMediaModel,
             )
             current_app.logger.debug("[post_observation] ObsTax UPLOAD FILE {}".format(file))
+
             newobs = (
                 db.session.query(ObservationModel)
                 .options(db.joinedload(ObservationModel.medias))
@@ -300,7 +301,6 @@ def get_all_observations() -> Union[FeatureCollection, Tuple[Dict, int]]:
     paginate = "per_page" in args
     per_page = int(args.pop("per_page", 1000))
     page = int(args.pop("page", 1))
-    cd_nom_list = []
     id_role = get_id_role_if_exists()
 
     if validation_process and id_role:
@@ -329,16 +329,18 @@ def get_all_observations() -> Union[FeatureCollection, Tuple[Dict, int]]:
             observations = query.all()
         features = [obs.get_feature() for obs in observations]
 
+        id_taxonomy_list = None
+        params = {}
         if observations:
             id_taxonomy_list = observations[0].program_ref.taxonomy_list
-            cd_nom_list = ",".join(map(str, {obs.cd_nom for obs in observations}))
-            params = {"cd_nom": cd_nom_list} if cd_nom_list else {}
-        else:
-            id_taxonomy_list = None
-            params = {}
-
-        if id_taxonomy_list:
-            taxon_list_data = taxhub_rest_get_taxon_list(id_taxonomy_list, params)
+            cd_nom_list = map(str, {obs.cd_nom for obs in observations})
+            if cd_nom_list:
+                params["cd_nom"] = ",".join(cd_nom_list)
+            if id_taxonomy_list:
+                params["id_liste"] = id_taxonomy_list
+
+        if id_taxonomy_list or cd_nom_list:
+            taxon_list_data = taxhub_rest_get_taxon_list(params_to_update=params)
             features_with_taxhub_info = set_taxa_info_from_taxhub(taxon_list_data, features)
         else:
             features_with_taxhub_info = features
@@ -503,7 +505,10 @@ def update_observation():
                 try:
                     observer = obs_to_update_obj.observer
                     send_user_email(
-                        subject=current_app.config["VALIDATION_EMAIL"]["SUBJECT"],
+                        subject=current_app.config["VALIDATION_EMAIL"]["SUBJECT"].format(
+                            program=f"{obs_to_update_obj.program_ref.title}",
+                            observation=f"{obs_to_update_obj.name} (#{obs_to_update_obj.id_observation})",
+                        ),
                         to=observer.email,
                         html_message=current_app.config["VALIDATION_EMAIL"][
                             "HTML_TEMPLATE"

backend/gncitizen/core/taxonomy/routes.py

@@ -1,19 +1,21 @@
-from flask import Blueprint, request
-from typing import List, Dict, Any, Union
-from utils_flask_sqla.response import json_resp
+from typing import Any, Dict, List, Union
 
+from flask import Blueprint, current_app, request
 from gncitizen.utils.taxonomy import (
-    taxhub_rest_get_all_lists,
-    taxhub_rest_get_taxon_list,
-    reformat_taxa,
-    get_taxa_by_cd_nom,
-    get_all_medias_types,
     get_all_attributes,
+    get_all_medias_types,
+    get_taxa_by_cd_nom,
+    reformat_taxa,
     refresh_taxonlist,
+    taxhub_rest_get_all_lists,
+    taxhub_rest_get_taxon_list,
 )
+from utils_flask_sqla.response import json_resp
 
 taxo_api = Blueprint("taxonomy", __name__)
 
+logger = current_app.logger
+
 
 @taxo_api.route("/taxonomy/refresh", methods=["GET"])
 @json_resp
@@ -257,12 +259,12 @@ def get_list(id) -> Union[List[Dict[str, Any]], Dict[str, str]]:
 
     try:
         params = request.args.to_dict()
-        res = taxhub_rest_get_taxon_list(id, params)
+        res = taxhub_rest_get_taxon_list(taxhub_list_id=id, params_to_update=params)
         if isinstance(res, dict) and "items" in res:
             reformatted_taxa = reformat_taxa(res)
         else:
             reformatted_taxa = []
-        print(reformatted_taxa)
+        logger.debug(reformatted_taxa)
         return reformatted_taxa
     except Exception as e:
         return {"message": str(e)}, 400

backend/gncitizen/utils/mail_check.py

@@ -6,6 +6,8 @@
 from flask import current_app
 from itsdangerous import URLSafeTimedSerializer
 
+logger = current_app.logger
+
 default_mail_from_addr = current_app.config["MAIL"]["MAIL_AUTH_LOGIN"]
 
 
@@ -64,7 +66,7 @@ def send_user_email(
         server.quit()
 
     except Exception as e:
-        current_app.logger.warning("send email failled. %s", str(e))
+        logger.warning("send email failled. %s", str(e))
         return {"message": """ send email failled: "{}".""".format(str(e))}
 
 
@@ -99,7 +101,7 @@ def confirm_user_email(newuser, with_confirm_link=True):
         )
 
     except Exception as e:
-        current_app.logger.warning("send confirm_email failled. %s", str(e))
+        logger.warning("send confirm_email failled. %s", str(e))
         return {"message": """ send confirm_email failled: "{}".""".format(str(e))}
 
 
@@ -116,5 +118,5 @@ def confirm_token(token):
             salt=current_app.config["CONFIRM_MAIL_SALT"],
         )
     except Exception as e:
-        current_app.logger.warning("confirm_token failled. %s", str(e))
+        logger.warning("confirm_token failled. %s", str(e))
     return email

backend/gncitizen/utils/media.py

@@ -13,6 +13,8 @@
 from gncitizen.utils.errors import GeonatureApiError
 from server import db
 
+logger = current_app.logger
+
 
 def allowed_file(filename):
     """Check if uploaded file type is allowed
@@ -67,15 +69,15 @@ def save_upload_files(
             if isinstance(file, FileStorage):
                 i = i + 1
                 filename = file.filename
-                current_app.logger.debug(
+                logger.debug(
                     "[save_upload_files] {} is an allowed filename : {}".format(
                         filename, allowed_file(filename)
                     )
                 )
 
                 if allowed_file(filename):
                     # save file
-                    current_app.logger.debug(
+                    logger.debug(
                         '[save_upload_files] Preparing file "{}" saving'.format(
                             filename
                         )
@@ -85,25 +87,21 @@ def save_upload_files(
                     filename = "{}_{}_{}_{}.{}".format(
                         prefix, str(cdnom), i, timestamp, ext
                     )
-                    current_app.logger.debug(
+                    logger.debug(
                         "[save_upload_files] new filename : {}".format(filename)
                     )
                     file.save(os.path.join(str(MEDIA_DIR), filename))
                     # Save media filename to Database
                     try:
                         newmedia = MediaModel(filename=filename)
-                        current_app.logger.debug(
-                            "[save_upload_files] newmedia {}".format(newmedia)
-                        )
+                        logger.debug("[save_upload_files] newmedia {}".format(newmedia))
                         db.session.add(newmedia)
                         db.session.commit()
                         id_media = newmedia.id_media
-                        current_app.logger.debug(
-                            f"[save_upload_files] id_media : {str(id_media)}]"
-                        )
+                        logger.debug(f"[save_upload_files] id_media : {str(id_media)}]")
                         # return id_media
                     except Exception as e:
-                        current_app.logger.debug(
+                        logger.debug(
                             "[save_upload_files] ERROR MEDIAMODEL: {}".format(e)
                         )
                         raise GeonatureApiError(e)
@@ -115,25 +113,21 @@ def save_upload_files(
                         db.session.add(newmatch)
                         db.session.commit()
                         id_match = newmatch.id_match
-                        current_app.logger.debug(
-                            "[save_upload_files] id_match {}".format(id_match)
-                        )
+                        logger.debug("[save_upload_files] id_match {}".format(id_match))
                     except Exception as e:
-                        current_app.logger.debug(
+                        logger.debug(
                             "[save_upload_files] ERROR MATCH MEDIA: {}".format(e)
                         )
                         raise GeonatureApiError(e)
 
                     # log
-                    current_app.logger.debug(
+                    logger.debug(
                         "[save_upload_files] Fichier {} enregistré".format(filename)
                     )
                     files.append(filename)
 
     except Exception as e:
-        current_app.logger.debug(
-            "[save_upload_files] ERROR save_upload_file : {}".format(e)
-        )
+        logger.debug("[save_upload_files] ERROR save_upload_file : {}".format(e))
         raise GeonatureApiError(e)
 
     return files

backend/gncitizen/utils/taxonomy.py

@@ -3,7 +3,6 @@
 """A module to manage taxonomy"""
 
 from threading import Thread
-import unicodedata
 from typing import Dict, List, Optional, Union
 
 import requests
@@ -39,16 +38,21 @@
 taxonomy_lists = []
 
 
-def taxhub_rest_get_taxon_list(taxhub_list_id: int, params_to_update: Dict = {}) -> Dict:
+def taxhub_rest_get_taxon_list(
+    taxhub_list_id: Optional[int] = None,
+    params_to_update: Dict = {},
+) -> Dict:
     url = f"{TAXHUB_API}taxref"
     params = {
-        "id_liste": taxhub_list_id,
         "fields": "medias,attributs",
         "existing": "true",
         "order": "asc",
         "orderby": "nom_complet",
         "limit": 100,
     }
+    if taxhub_list_id:
+        params["id_liste"] = taxhub_list_id
+
     if params_to_update:
         params.update(params_to_update)
     res = session.get(
@@ -78,7 +82,12 @@ def taxhub_rest_get_all_lists() -> Optional[Dict]:
                         f'[{taxa_list["code_liste"]}] {taxa_list["nom_liste"]} ({taxa_list["nb_taxons"]} taxon(s))',
                     )
                 )
-            print(f"taxonomy_lists {taxonomy_lists}")
+            logger.info(
+                "%s taxonomy lists have been found on %s",
+                len(taxonomy_lists),
+                TAXHUB_API,
+            )
+            logger.debug("Taxonomy list items are %s", taxonomy_lists)
         except Exception as e:
             logger.critical(str(e))
         return res.json().get("data", [])